Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-26 08:38:26 +00:00
Code Issues Releases Activity

add more checking in libmpdclient; make battery stuff look the same for sysfs and proc

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1082 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-03-30 03:26:55 +00:00
parent 675b9fac96
commit fbb58187b5
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libmpdclient.c
View File

@ -226,6 +226,9 @@ static int mpd_connect(mpd_Connection *connection, const char *host, int port,
break;
}
if (connection->sock > -1) {
closesocket(connection->sock);
}
if ((connection->sock = socket(dest->sa_family, SOCK_STREAM, 0)) < 0) {
strcpy(connection->errorStr, "problems creating socket");
connection->error = MPD_ERROR_SYSTEM;
@ -362,6 +365,7 @@ mpd_Connection *mpd_newConnection(const char *host, int port, float timeout)
connection->commandList = 0;
connection->listOks = 0;
connection->doneListOk = 0;
connection->sock = -1;
connection->returnElement = NULL;
connection->request = NULL;

16
src/linux.c
View File

@ -1606,13 +1606,13 @@ void get_battery_stuff(char *buffer, unsigned int n, const char *bat, int item)
else if (strcmp(charging_state, "Charging") == 0) {
if (acpi_last_full[idx] != 0 && present_rate > 0) {
/* e.g. charging 75% */
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "Charging %i%%",
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "charging %i%%",
(int) (((float) remaining_capacity / acpi_last_full[idx]) * 100 ));
/* e.g. 2h 37m */
format_seconds(last_battery_time_str[idx], sizeof(last_battery_time_str[idx])-1,
(long) (((float)(acpi_last_full[idx] - remaining_capacity) / present_rate) * 3600));
} else if (acpi_last_full[idx] != 0 && present_rate <= 0) {
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "Charging %d%%",
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "charging %d%%",
(int) (((float)remaining_capacity / acpi_last_full[idx]) * 100));
} else {
strncpy(last_battery_str[idx], "Charging", sizeof(last_battery_str[idx])-1);
@ -1622,16 +1622,16 @@ void get_battery_stuff(char *buffer, unsigned int n, const char *bat, int item)
else if (strncmp(charging_state, "Discharging", 64) == 0) {
if (present_rate > 0) {
/* e.g. discharging 35% */
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "Discharging %i%%",
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "discharging %i%%",
(int) (((float) remaining_capacity / acpi_last_full[idx]) * 100 ));
/* e.g. 1h 12m */
format_seconds(last_battery_time_str[idx], sizeof(last_battery_time_str[idx])-1,
(long) (((float)(acpi_last_full[idx] - remaining_capacity) / present_rate) * 3600));
} else if (present_rate == 0) { /* Thanks to Nexox for this one */
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "Full");
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1, "full");
} else {
snprintf(last_battery_str[idx], sizeof(last_battery_str[idx])-1,
"Discharging %d%%",
"discharging %d%%",
(int) (((float)remaining_capacity / acpi_last_full[idx]) * 100));
}
}
@ -1642,15 +1642,15 @@ void get_battery_stuff(char *buffer, unsigned int n, const char *bat, int item)
* when the second one is empty and the first one
* being charged. */
if (remaining_capacity == 0)
strcpy(last_battery_str[idx], "Empty");
strcpy(last_battery_str[idx], "empty");
else
strcpy(last_battery_str[idx], "Charged");
strcpy(last_battery_str[idx], "charged");
}
/* unknown, probably full / AC */
else {
if (acpi_last_full[idx] != 0
&& remaining_capacity != acpi_last_full[idx])
snprintf(last_battery_str[idx], 64, "Unknown %d%%",
snprintf(last_battery_str[idx], 64, "unknown %d%%",
(int) (((float)remaining_capacity / acpi_last_full[idx]) * 100));
else
strncpy(last_battery_str[idx], "AC", 64);