i3status - Default to acpitz(4) instead of cpu(4) for OpenBSD temperature readings

[i3/i3status] / src / print_battery_info.c

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index 3e130c7946898d199ede5d56fe96692e50f968aa..68785403c953322a31825456020c6b21ec9c34cd 100644 (file)
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -1,4 +1,5 @@
 // vim:ts=8:expandtab
+#include <ctype.h>
 #include <time.h>
 #include <string.h>
 #include <stdlib.h>
@@ -29,7 +30,7 @@
  * worn off your battery is.
  *
  */
-void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int threshold, bool last_full_capacity) {
+void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int low_threshold, char *threshold_type, bool last_full_capacity) {
         time_t empty_time;
         struct tm *empty_tm;
         char buf[1024];
@@ -41,6 +42,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
         const char *walk, *last;
         char *outwalk = buffer;
         bool watt_as_unit;
+        bool colorful_output;
         int full_design = -1,
             remaining = -1,
             present_rate = -1,
@@ -127,8 +129,8 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
 
         (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
 
-        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%",
-                       (((float)remaining / (float)full_design) * 100));
+        float percentage_remaining = (((float)remaining / (float)full_design) * 100);
+        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%", percentage_remaining);
 
         if (present_rate > 0) {
                 float remaining_time;
@@ -146,8 +148,17 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
                 minutes = seconds / 60;
                 seconds -= (minutes * 60);
 
-                if (status == CS_DISCHARGING && threshold > 0 && seconds_remaining < 60 * threshold)
-                        START_COLOR("color_bad");
+                if (status == CS_DISCHARGING && low_threshold > 0) {
+                        if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0
+                                && percentage_remaining < low_threshold) {
+                                START_COLOR("color_bad");
+                                colorful_output = true;
+                        } else if (strncmp(threshold_type, "time", strlen(threshold_type)) == 0
+                                && seconds_remaining < 60 * low_threshold) {
+                                START_COLOR("color_bad");
+                                colorful_output = true;
+                        }
+                }
 
                 (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d:%02d",
                         max(hours, 0), max(minutes, 0), max(seconds, 0));
@@ -162,7 +173,8 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
                 (void)snprintf(consumptionbuf, sizeof(consumptionbuf), "%1.2fW",
                         ((float)present_rate / 1000.0 / 1000.0));
 
-                END_COLOR;
+                if (colorful_output)
+                    END_COLOR;
         }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
         int state;
@@ -216,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) {
@@ -237,28 +249,53 @@ 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) \
+        do { \
+                if (strlen(_buf) == 0) { \
+                        if (outwalk > buffer && isspace(outwalk[-1])) \
+                                outwalk--; \
+                        else if (isspace(*(walk+1))) \
+                                walk++; \
+                } \
+        } while (0)
+
         for (walk = format; *walk != '\0'; walk++) {
                 if (*walk != '%') {
                         *(outwalk++) = *walk;
@@ -274,12 +311,15 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
                 } else if (strncmp(walk+1, "remaining", strlen("remaining")) == 0) {
                         outwalk += sprintf(outwalk, "%s", remainingbuf);
                         walk += strlen("remaining");
+                        EAT_SPACE_FROM_OUTPUT_IF_EMPTY(remainingbuf);
                 } else if (strncmp(walk+1, "emptytime", strlen("emptytime")) == 0) {
                         outwalk += sprintf(outwalk, "%s", emptytimebuf);
                         walk += strlen("emptytime");
+                        EAT_SPACE_FROM_OUTPUT_IF_EMPTY(emptytimebuf);
                 } else if (strncmp(walk+1, "consumption", strlen("consumption")) == 0) {
                         outwalk += sprintf(outwalk, "%s", consumptionbuf);
                         walk += strlen("consumption");
+                        EAT_SPACE_FROM_OUTPUT_IF_EMPTY(consumptionbuf);
                 }
         }