marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display 0 instead of negative values for remaining time

Browse Source 
This could happen with new batteries which are charged further than
their design capacity is
This commit is contained in:
Michael Stapelberg 2009-05-01 15:32:51 +02:00
parent b844bd0eb3
commit ac39765685
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
i3status.c
View File

@ -93,6 +93,10 @@ static const char **run_watches;
static unsigned int num_run_watches; static unsigned int num_run_watches;
static unsigned int interval = 1; static unsigned int interval = 1;
static int max(int a, int b) {
return (a > b ? a : b);
}
/* /*
* This function just concats two strings in place, it should only be used * This function just concats two strings in place, it should only be used
* for concatting order to the name of a file or concatting color codes. * for concatting order to the name of a file or concatting color codes.
@ -340,7 +344,7 @@ static char *get_battery_info(const char *path) {
(status == CS_CHARGING ? "CHR" : (status == CS_CHARGING ? "CHR" :
(status == CS_DISCHARGING ? "BAT" : "FULL")), (status == CS_DISCHARGING ? "BAT" : "FULL")),
(((float)remaining / (float)full_design) * 100), (((float)remaining / (float)full_design) * 100),
hours, minutes, seconds); max(hours, 0), max(minutes, 0), max(seconds, 0));
} else { } else {
(void)snprintf(part, sizeof(part), "%s %.02f%%", (void)snprintf(part, sizeof(part), "%s %.02f%%",
(status == CS_CHARGING ? "CHR" : (status == CS_CHARGING ? "CHR" :