diff options
| author | Jasper Lievisse Adriaanse <jasper@openbsd.org> | 2012-10-08 13:30:38 +0200 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2012-10-10 08:23:14 +0200 |
| commit | 8da0452d2c51826fd871520f7a8ba7a43a59401c (patch) | |
| tree | cd58bb88e0e2b098a3143681d72901e5581ea0e3 | |
| parent | 7dcc961fa2d755ed47b29de778a2d2baf8dac7ba (diff) | |
Various fixes for the OpenBSD section of the battery backend.
- fix the battery status printing in %status.
- fix remaining time when we're charging.
- use colors to indicate battery status.
- small cleanups.
| -rw-r--r-- | src/print_battery_info.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/src/print_battery_info.c b/src/print_battery_info.c index e439bc6..6878540 100644 --- a/src/print_battery_info.c +++ b/src/print_battery_info.c @@ -228,7 +228,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char * probing acpi(4) devices. */ struct apm_power_info apm_info; - int apm_fd, ac_status, charging; + int apm_fd; apm_fd = open("/dev/apm", O_RDONLY); if (apm_fd < 0) { @@ -249,26 +249,41 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char switch(apm_info.ac_state) { case APM_AC_OFF: - ac_status = CS_DISCHARGING; + status = CS_DISCHARGING; break; case APM_AC_ON: - ac_status = CS_CHARGING; + status = CS_CHARGING; break; default: /* If we don't know what's going on, just assume we're discharging. */ - ac_status = CS_DISCHARGING; + status = CS_DISCHARGING; break; } (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status)); (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%", apm_info.battery_life); + if (status == CS_DISCHARGING && low_threshold > 0) { + if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0 + && apm_info.battery_life < low_threshold) { + START_COLOR("color_bad"); + colorful_output = true; + } else if (strncmp(threshold_type, "time", strlen(threshold_type)) == 0 + && apm_info.minutes_left < (u_int) low_threshold) { + START_COLOR("color_bad"); + colorful_output = true; + } + } + /* Can't give a meaningful value for remaining minutes if we're charging. */ - if (ac_status == CS_CHARGING) - charging = 1; + if (status != CS_CHARGING) { + (void)snprintf(remainingbuf, sizeof(remainingbuf), "%d", apm_info.minutes_left); + } else { + (void)snprintf(remainingbuf, sizeof(remainingbuf), "%s", "(CHR)"); + } - (void)snprintf(remainingbuf, sizeof(remainingbuf), (charging ? "%s" : "%d"), - (charging ? "(CHR)" : apm_info.minutes_left)); + if (colorful_output) + END_COLOR; #endif #define EAT_SPACE_FROM_OUTPUT_IF_EMPTY(_buf) \ |