]> git.sur5r.net Git - i3/i3status/blobdiff - src/print_battery_info.c
able to print percentage
[i3/i3status] / src / print_battery_info.c
index 0853e18a862f92829233619e9d9a46e8ac6d8c3d..8c85192f20f916b6544921e2740b0e0ce0424f58 100644 (file)
@@ -1,24 +1,35 @@
 // vim:ts=4:sw=4:expandtab
 #include <ctype.h>
-#include <time.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_version.h>
 
 #include "i3status.h"
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#if defined(LINUX)
+#include <errno.h>
+#include <glob.h>
 #include <sys/types.h>
-#include <sys/sysctl.h>
 #endif
 
-#if defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#include <dev/acpica/acpiio.h>
+#include <sys/sysctl.h>
 #include <sys/types.h>
-#include <sys/ioctl.h>
+#endif
+
+#if defined(__DragonFly__)
 #include <sys/fcntl.h>
+#endif
+
+#if defined(__OpenBSD__)
 #include <machine/apmvar.h>
+#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
 #endif
 
 #if defined(__NetBSD__)
 #include <sys/envsys.h>
 #endif
 
+typedef enum {
+    CS_UNKNOWN,
+    CS_DISCHARGING,
+    CS_CHARGING,
+    CS_FULL,
+} charging_status_t;
+
+/* A description of the state of one or more batteries. */
+struct battery_info {
+    /* measured properties */
+    int full_design;  /* in uAh */
+    int full_last;    /* in uAh */
+    int remaining;    /* in uAh */
+    int present_rate; /* in uA, always non-negative */
+
+    /* derived properties */
+    int seconds_remaining;
+    float percentage_remaining;
+    charging_status_t status;
+};
+
+#if defined(__DragonFly__)
+#define ACPIDEV "/dev/acpi"
+static int acpifd;
+
+static bool acpi_init(void) {
+    if (acpifd == 0) {
+        acpifd = open(ACPIDEV, O_RDWR);
+        if (acpifd == -1)
+            acpifd = open(ACPIDEV, O_RDONLY);
+        if (acpifd == -1)
+            return false;
+    }
+    return true;
+}
+#endif
+
+#if defined(LINUX) || defined(__NetBSD__)
 /*
- * Get battery information from /sys. Note that it uses the design capacity to
- * calculate the percentage, not the last full capacity, so you can see how
- * worn off your battery is.
- *
+ * Add batt_info data to acc.
  */
-void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds) {
-    time_t empty_time;
-    struct tm *empty_tm;
+static void add_battery_info(struct battery_info *acc, const struct battery_info *batt_info) {
+    if (acc->remaining < 0) {
+        /* initialize accumulator so we can add to it */
+        acc->full_design = 0;
+        acc->full_last = 0;
+        acc->remaining = 0;
+        acc->present_rate = 0;
+    }
+
+    acc->full_design += batt_info->full_design;
+    acc->full_last += batt_info->full_last;
+    acc->remaining += batt_info->remaining;
+
+    /* make present_rate negative for discharging and positive for charging */
+    int present_rate = (acc->status == CS_DISCHARGING ? -1 : 1) * acc->present_rate;
+    present_rate += (batt_info->status == CS_DISCHARGING ? -1 : 1) * batt_info->present_rate;
+
+    /* merge status */
+    switch (acc->status) {
+        case CS_UNKNOWN:
+            acc->status = batt_info->status;
+            break;
+
+        case CS_DISCHARGING:
+            if (present_rate > 0)
+                acc->status = CS_CHARGING;
+            /* else if batt_info is DISCHARGING: no conflict
+             * else if batt_info is CHARGING: present_rate should indicate that
+             * else if batt_info is FULL: but something else is discharging */
+            break;
+
+        case CS_CHARGING:
+            if (present_rate < 0)
+                acc->status = CS_DISCHARGING;
+            /* else if batt_info is DISCHARGING: present_rate should indicate that
+             * else if batt_info is CHARGING: no conflict
+             * else if batt_info is FULL: but something else is charging */
+            break;
+
+        case CS_FULL:
+            if (batt_info->status != CS_UNKNOWN)
+                acc->status = batt_info->status;
+            /* else: retain FULL, since it is more specific than UNKNOWN */
+            break;
+    }
+
+    acc->present_rate = abs(present_rate);
+}
+#endif
+
+static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen, char *buffer, int number, const char *path, const char *format_down) {
+    char *outwalk = buffer;
+
+#if defined(LINUX)
     char buf[1024];
-    char statusbuf[16];
-    char percentagebuf[16];
-    char remainingbuf[256];
-    char emptytimebuf[256];
-    char consumptionbuf[256];
     const char *walk, *last;
-    char *outwalk = buffer;
     bool watt_as_unit = false;
-    bool colorful_output = false;
-    int full_design = -1,
-        remaining = -1,
-        present_rate = -1,
-        voltage = -1;
-    charging_status_t status = CS_DISCHARGING;
-
-    memset(statusbuf, '\0', sizeof(statusbuf));
-    memset(percentagebuf, '\0', sizeof(percentagebuf));
-    memset(remainingbuf, '\0', sizeof(remainingbuf));
-    memset(emptytimebuf, '\0', sizeof(emptytimebuf));
-    memset(consumptionbuf, '\0', sizeof(consumptionbuf));
-
-    static char batpath[512];
+    int voltage = -1;
+    char batpath[512];
     sprintf(batpath, path, number);
     INSTANCE(batpath);
 
-#define BATT_STATUS_NAME(status) \
-    (status == CS_CHARGING ? status_chr : (status == CS_DISCHARGING ? status_bat : status_full))
-
-#if defined(LINUX)
     if (!slurp(batpath, buf, sizeof(buf))) {
         OUTPUT_FULL_TEXT(format_down);
-        return;
+        return false;
     }
 
     for (walk = buf, last = buf; (walk - buf) < 1024; walk++) {
@@ -80,189 +155,116 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
         if (*walk != '=')
             continue;
 
-        if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW")) {
+        if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW=")) {
             watt_as_unit = true;
-            remaining = atoi(walk + 1);
-        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW")) {
+            batt_info->remaining = atoi(walk + 1);
+            batt_info->percentage_remaining = -1;
+        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW=")) {
             watt_as_unit = false;
-            remaining = atoi(walk + 1);
-        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW"))
-            present_rate = abs(atoi(walk + 1));
-        else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW"))
+            batt_info->remaining = atoi(walk + 1);
+            batt_info->percentage_remaining = -1;
+        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CAPACITY=") && batt_info->remaining == -1) {
+            batt_info->percentage_remaining = atoi(walk + 1);
+        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW="))
+            batt_info->present_rate = abs(atoi(walk + 1));
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW="))
             voltage = abs(atoi(walk + 1));
         /* on some systems POWER_SUPPLY_POWER_NOW does not exist, but actually
          * it is the same as POWER_SUPPLY_CURRENT_NOW but with μWh as
          * unit instead of μAh. We will calculate it as we need it
          * later. */
-        else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW"))
-            present_rate = abs(atoi(walk + 1));
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW="))
+            batt_info->present_rate = abs(atoi(walk + 1));
         else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging"))
-            status = CS_CHARGING;
+            batt_info->status = CS_CHARGING;
         else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Full"))
-            status = CS_FULL;
-        else {
-            /* The only thing left is the full capacity */
-            if (last_full_capacity) {
-                if (!BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL") &&
-                    !BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL"))
-                    continue;
-            } else {
-                if (!BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN") &&
-                    !BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN"))
-                    continue;
-            }
-
-            full_design = atoi(walk + 1);
-        }
+            batt_info->status = CS_FULL;
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Discharging"))
+            batt_info->status = CS_DISCHARGING;
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS="))
+            batt_info->status = CS_UNKNOWN;
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN=") ||
+                 BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN="))
+            batt_info->full_design = atoi(walk + 1);
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL=") ||
+                 BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL="))
+            batt_info->full_last = atoi(walk + 1);
     }
 
     /* the difference between POWER_SUPPLY_ENERGY_NOW and
      * POWER_SUPPLY_CHARGE_NOW is the unit of measurement. The energy is
      * given in mWh, the charge in mAh. So calculate every value given in
      * ampere to watt */
-    if (!watt_as_unit) {
-        present_rate = (((float)voltage / 1000.0) * ((float)present_rate / 1000.0));
-
-        if (voltage != -1) {
-            remaining = (((float)voltage / 1000.0) * ((float)remaining / 1000.0));
-            full_design = (((float)voltage / 1000.0) * ((float)full_design / 1000.0));
+    if (!watt_as_unit && voltage >= 0) {
+        if (batt_info->present_rate > 0) {
+            batt_info->present_rate = (((float)voltage / 1000.0) * ((float)batt_info->present_rate / 1000.0));
         }
-    }
-
-    if ((full_design == -1) || (remaining == -1)) {
-        OUTPUT_FULL_TEXT(format_down);
-        return;
-    }
-
-    (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
-
-    float percentage_remaining = (((float)remaining / (float)full_design) * 100);
-    /* Some batteries report POWER_SUPPLY_CHARGE_NOW=<full_design> when fully
-     * charged, even though that’s plainly wrong. For people who chose to see
-     * the percentage calculated based on the last full capacity, we clamp the
-     * value to 100%, as that makes more sense.
-     * See http://bugs.debian.org/785398 */
-    if (last_full_capacity && percentage_remaining > 100) {
-        percentage_remaining = 100;
-    }
-    if (integer_battery_capacity) {
-        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.00f%%", percentage_remaining);
-    } else {
-        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%", percentage_remaining);
-    }
-
-    if (present_rate > 0) {
-        float remaining_time;
-        int seconds, hours, minutes, seconds_remaining;
-        if (status == CS_CHARGING)
-            remaining_time = ((float)full_design - (float)remaining) / (float)present_rate;
-        else if (status == CS_DISCHARGING)
-            remaining_time = ((float)remaining / (float)present_rate);
-        else
-            remaining_time = 0;
-
-        seconds_remaining = (int)(remaining_time * 3600.0);
-
-        hours = seconds_remaining / 3600;
-        seconds = seconds_remaining - (hours * 3600);
-        minutes = seconds / 60;
-        seconds -= (minutes * 60);
-
-        if (status == CS_DISCHARGING && low_threshold > 0) {
-            if (strcasecmp(threshold_type, "percentage") == 0 && percentage_remaining < low_threshold) {
-                START_COLOR("color_bad");
-                colorful_output = true;
-            } else if (strcasecmp(threshold_type, "time") == 0 && seconds_remaining < 60 * low_threshold) {
-                START_COLOR("color_bad");
-                colorful_output = true;
-            } else {
-                colorful_output = false;
-            }
+        if (batt_info->remaining > 0) {
+            batt_info->remaining = (((float)voltage / 1000.0) * ((float)batt_info->remaining / 1000.0));
         }
-
-        if (hide_seconds)
-            (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d",
-                           max(hours, 0), max(minutes, 0));
-        else
-            (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d:%02d",
-                           max(hours, 0), max(minutes, 0), max(seconds, 0));
-
-        empty_time = time(NULL);
-        empty_time += seconds_remaining;
-        empty_tm = localtime(&empty_time);
-
-        if (hide_seconds)
-            (void)snprintf(emptytimebuf, sizeof(emptytimebuf), "%02d:%02d",
-                           max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0));
-        else
-            (void)snprintf(emptytimebuf, sizeof(emptytimebuf), "%02d:%02d:%02d",
-                           max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0), max(empty_tm->tm_sec, 0));
-
-        (void)snprintf(consumptionbuf, sizeof(consumptionbuf), "%1.2fW",
-                       ((float)present_rate / 1000.0 / 1000.0));
-    } else {
-        /* On some systems, present_rate may not exist. Still, make sure
-         * we colorize the output if threshold_type is set to percentage
-         * (since we don't have any information on remaining time). */
-        if (status == CS_DISCHARGING && low_threshold > 0) {
-            if (strcasecmp(threshold_type, "percentage") == 0 && percentage_remaining < low_threshold) {
-                START_COLOR("color_bad");
-                colorful_output = true;
-            }
+        if (batt_info->full_design > 0) {
+            batt_info->full_design = (((float)voltage / 1000.0) * ((float)batt_info->full_design / 1000.0));
+        }
+        if (batt_info->full_last > 0) {
+            batt_info->full_last = (((float)voltage / 1000.0) * ((float)batt_info->full_last / 1000.0));
+        }
+    }
+#elif defined(__DragonFly__)
+    union acpi_battery_ioctl_arg battio;
+    if (acpi_init()) {
+        battio.unit = number;
+        ioctl(acpifd, ACPIIO_BATT_GET_BIF, &battio);
+        batt_info->full_design = battio.bif.dcap;
+        batt_info->full_last = battio.bif.lfcap;
+        battio.unit = number;
+        ioctl(acpifd, ACPIIO_BATT_GET_BATTINFO, &battio);
+        batt_info->percentage_remaining = battio.battinfo.cap;
+        batt_info->present_rate = battio.battinfo.rate;
+        batt_info->seconds_remaining = battio.battinfo.min * 60;
+        switch (battio.battinfo.state) {
+            case 0:
+                batt_info->status = CS_FULL;
+                break;
+            case ACPI_BATT_STAT_CHARGING:
+                batt_info->status = CS_CHARGING;
+                break;
+            case ACPI_BATT_STAT_DISCHARG:
+                batt_info->status = CS_DISCHARGING;
+                break;
+            default:
+                batt_info->status = CS_UNKNOWN;
         }
+        OUTPUT_FULL_TEXT(format_down);
     }
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     int state;
     int sysctl_rslt;
     size_t sysctl_size = sizeof(sysctl_rslt);
 
     if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
         OUTPUT_FULL_TEXT(format_down);
-        return;
+        return false;
     }
 
-    present_rate = sysctl_rslt;
+    batt_info->percentage_remaining = sysctl_rslt;
     if (sysctlbyname(BATT_TIME, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
         OUTPUT_FULL_TEXT(format_down);
-        return;
+        return false;
     }
 
-    remaining = sysctl_rslt;
+    batt_info->seconds_remaining = sysctl_rslt * 60;
     if (sysctlbyname(BATT_STATE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
         OUTPUT_FULL_TEXT(format_down);
-        return;
+        return false;
     }
 
     state = sysctl_rslt;
-    if (state == 0 && present_rate == 100)
-        status = CS_FULL;
-    else if (state == 0 && present_rate < 100)
-        status = CS_CHARGING;
+    if (state == 0 && batt_info->percentage_remaining == 100)
+        batt_info->status = CS_FULL;
+    else if ((state & ACPI_BATT_STAT_CHARGING) && batt_info->percentage_remaining < 100)
+        batt_info->status = CS_CHARGING;
     else
-        status = CS_DISCHARGING;
-
-    full_design = sysctl_rslt;
-
-    (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
-
-    (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%",
-                   present_rate);
-
-    if (state == 1) {
-        int hours, minutes;
-        minutes = remaining;
-        hours = minutes / 60;
-        minutes -= (hours * 60);
-        (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d",
-                       max(hours, 0), max(minutes, 0));
-        if (strcasecmp(threshold_type, "percentage") == 0 && present_rate < low_threshold) {
-            START_COLOR("color_bad");
-            colorful_output = true;
-        } else if (strcasecmp(threshold_type, "time") == 0 && remaining < (u_int)low_threshold) {
-            START_COLOR("color_bad");
-            colorful_output = true;
-        }
-    }
+        batt_info->status = CS_DISCHARGING;
 #elif defined(__OpenBSD__)
     /*
         * We're using apm(4) here, which is the interface to acpi(4) on amd64/i386 and
@@ -275,7 +277,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
     apm_fd = open("/dev/apm", O_RDONLY);
     if (apm_fd < 0) {
         OUTPUT_FULL_TEXT("can't open /dev/apm");
-        return;
+        return false;
     }
     if (ioctl(apm_fd, APM_IOC_GETPOWER, &apm_info) < 0)
         OUTPUT_FULL_TEXT("can't read power info");
@@ -286,53 +288,35 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
     if ((apm_info.battery_state == APM_BATTERY_ABSENT) ||
         (apm_info.battery_state == APM_BATT_UNKNOWN)) {
         OUTPUT_FULL_TEXT(format_down);
-        return;
+        return false;
     }
 
     switch (apm_info.ac_state) {
         case APM_AC_OFF:
-            status = CS_DISCHARGING;
+            batt_info->status = CS_DISCHARGING;
             break;
         case APM_AC_ON:
-            status = CS_CHARGING;
+            batt_info->status = CS_CHARGING;
             break;
         default:
             /* If we don't know what's going on, just assume we're discharging. */
-            status = CS_DISCHARGING;
+            batt_info->status = CS_DISCHARGING;
             break;
     }
 
-    (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
-    /* integer_battery_capacity is implied as battery_life is already in whole numbers. */
-    (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.00d%%", apm_info.battery_life);
-
-    if (status == CS_DISCHARGING && low_threshold > 0) {
-        if (strcasecmp(threshold_type, "percentage") == 0 && apm_info.battery_life < low_threshold) {
-            START_COLOR("color_bad");
-            colorful_output = true;
-        } else if (strcasecmp(threshold_type, "time") == 0 && apm_info.minutes_left < (u_int)low_threshold) {
-            START_COLOR("color_bad");
-            colorful_output = true;
-        }
-    }
+    batt_info->percentage_remaining = apm_info.battery_life;
 
     /* Can't give a meaningful value for remaining minutes if we're charging. */
-    if (status != CS_CHARGING) {
-        (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d", apm_info.minutes_left / 60, apm_info.minutes_left % 60);
-    } else {
-        (void)snprintf(remainingbuf, sizeof(remainingbuf), "%s", "(CHR)");
+    if (batt_info->status != CS_CHARGING) {
+        batt_info->seconds_remaining = apm_info.minutes_left * 60;
     }
-
-    if (colorful_output)
-        END_COLOR;
 #elif defined(__NetBSD__)
     /*
      * Using envsys(4) via sysmon(4).
      */
-    int fd, rval, last_full_cap;
+    int fd, rval;
     bool is_found = false;
-    char *sensor_desc;
-    bool is_full = false;
+    char sensor_desc[16];
 
     prop_dictionary_t dict;
     prop_array_t array;
@@ -340,24 +324,25 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
     prop_object_iterator_t iter2;
     prop_object_t obj, obj2, obj3, obj4, obj5;
 
-    asprintf(&sensor_desc, "acpibat%d", number);
+    if (number >= 0)
+        (void)snprintf(sensor_desc, sizeof(sensor_desc), "acpibat%d", number);
 
     fd = open("/dev/sysmon", O_RDONLY);
     if (fd < 0) {
         OUTPUT_FULL_TEXT("can't open /dev/sysmon");
-        return;
+        return false;
     }
 
     rval = prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &dict);
     if (rval == -1) {
         close(fd);
-        return;
+        return false;
     }
 
     if (prop_dictionary_count(dict) == 0) {
         prop_object_release(dict);
         close(fd);
-        return;
+        return false;
     }
 
     iter = prop_dictionary_iterator(dict);
@@ -369,11 +354,17 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
     /* iterate over the dictionary returned by the kernel */
     while ((obj = prop_object_iterator_next(iter)) != NULL) {
         /* skip this dict if it's not what we're looking for */
-        if ((strlen(prop_dictionary_keysym_cstring_nocopy(obj)) == strlen(sensor_desc)) &&
-            (strncmp(sensor_desc,
-                     prop_dictionary_keysym_cstring_nocopy(obj),
-                     strlen(sensor_desc)) != 0))
-            continue;
+        if (number < 0) {
+            /* we want all batteries */
+            if (!BEGINS_WITH(prop_dictionary_keysym_cstring_nocopy(obj),
+                             "acpibat"))
+                continue;
+        } else {
+            /* we want a specific battery */
+            if (strcmp(sensor_desc,
+                       prop_dictionary_keysym_cstring_nocopy(obj)) != 0)
+                continue;
+        }
 
         is_found = true;
 
@@ -382,7 +373,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
             prop_object_iterator_release(iter);
             prop_object_release(dict);
             close(fd);
-            return;
+            return false;
         }
 
         iter2 = prop_array_iterator(array);
@@ -390,84 +381,72 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
             prop_object_iterator_release(iter);
             prop_object_release(dict);
             close(fd);
-            return;
+            return false;
         }
 
+        struct battery_info batt_buf = {
+            .full_design = 0,
+            .full_last = 0,
+            .remaining = 0,
+            .present_rate = 0,
+            .status = CS_UNKNOWN,
+        };
+        int voltage = -1;
+        bool watt_as_unit = false;
+
         /* iterate over array of dicts specific to target battery */
         while ((obj2 = prop_object_iterator_next(iter2)) != NULL) {
             obj3 = prop_dictionary_get(obj2, "description");
 
-            if (obj3 &&
-                strlen(prop_string_cstring_nocopy(obj3)) == 8 &&
-                strncmp("charging",
-                        prop_string_cstring_nocopy(obj3),
-                        8) == 0) {
+            if (obj3 == NULL)
+                continue;
+
+            if (strcmp("charging", prop_string_cstring_nocopy(obj3)) == 0) {
                 obj3 = prop_dictionary_get(obj2, "cur-value");
 
                 if (prop_number_integer_value(obj3))
-                    status = CS_CHARGING;
+                    batt_buf.status = CS_CHARGING;
                 else
-                    status = CS_DISCHARGING;
-
-                continue;
-            }
-
-            if (obj3 &&
-                strlen(prop_string_cstring_nocopy(obj3)) == 6 &&
-                strncmp("charge",
-                        prop_string_cstring_nocopy(obj3),
-                        6) == 0) {
+                    batt_buf.status = CS_DISCHARGING;
+            } else if (strcmp("charge", prop_string_cstring_nocopy(obj3)) == 0) {
                 obj3 = prop_dictionary_get(obj2, "cur-value");
                 obj4 = prop_dictionary_get(obj2, "max-value");
                 obj5 = prop_dictionary_get(obj2, "type");
 
-                remaining = prop_number_integer_value(obj3);
-                full_design = prop_number_integer_value(obj4);
+                batt_buf.remaining = prop_number_integer_value(obj3);
+                batt_buf.full_design = prop_number_integer_value(obj4);
 
-                if (remaining == full_design)
-                    is_full = true;
-
-                if (strncmp("Ampere hour",
-                            prop_string_cstring_nocopy(obj5),
-                            11) == 0)
+                if (strcmp("Ampere hour", prop_string_cstring_nocopy(obj5)) == 0)
                     watt_as_unit = false;
                 else
                     watt_as_unit = true;
-
-                continue;
-            }
-
-            if (obj3 &&
-                strlen(prop_string_cstring_nocopy(obj3)) == 14 &&
-                strncmp("discharge rate",
-                        prop_string_cstring_nocopy(obj3),
-                        14) == 0) {
+            } else if (strcmp("discharge rate", prop_string_cstring_nocopy(obj3)) == 0) {
                 obj3 = prop_dictionary_get(obj2, "cur-value");
-                present_rate = prop_number_integer_value(obj3);
-                continue;
-            }
-
-            if (obj3 &&
-                strlen(prop_string_cstring_nocopy(obj3)) == 13 &&
-                strncmp("last full cap",
-                        prop_string_cstring_nocopy(obj3),
-                        13) == 0) {
+                batt_buf.present_rate = prop_number_integer_value(obj3);
+            } else if (strcmp("charge rate", prop_string_cstring_nocopy(obj3)) == 0) {
                 obj3 = prop_dictionary_get(obj2, "cur-value");
-                last_full_cap = prop_number_integer_value(obj3);
-                continue;
-            }
-
-            if (obj3 &&
-                strlen(prop_string_cstring_nocopy(obj3)) == 7 &&
-                strncmp("voltage",
-                        prop_string_cstring_nocopy(obj3),
-                        7) == 0) {
+                batt_info->present_rate = prop_number_integer_value(obj3);
+            } else if (strcmp("last full cap", prop_string_cstring_nocopy(obj3)) == 0) {
+                obj3 = prop_dictionary_get(obj2, "cur-value");
+                batt_buf.full_last = prop_number_integer_value(obj3);
+            } else if (strcmp("voltage", prop_string_cstring_nocopy(obj3)) == 0) {
                 obj3 = prop_dictionary_get(obj2, "cur-value");
                 voltage = prop_number_integer_value(obj3);
-                continue;
             }
         }
         prop_object_iterator_release(iter2);
+
+        if (!watt_as_unit && voltage != -1) {
+            batt_buf.present_rate = (((float)voltage / 1000.0) * ((float)batt_buf.present_rate / 1000.0));
+            batt_buf.remaining = (((float)voltage / 1000.0) * ((float)batt_buf.remaining / 1000.0));
+            batt_buf.full_design = (((float)voltage / 1000.0) * ((float)batt_buf.full_design / 1000.0));
+            batt_buf.full_last = (((float)voltage / 1000.0) * ((float)batt_buf.full_last / 1000.0));
+        }
+
+        if (batt_buf.remaining == batt_buf.full_design)
+            batt_buf.status = CS_FULL;
+
+        add_battery_info(batt_info, &batt_buf);
     }
 
     prop_object_iterator_release(iter);
@@ -476,144 +455,245 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
 
     if (!is_found) {
         OUTPUT_FULL_TEXT(format_down);
-        return;
+        return false;
     }
 
-    if (last_full_capacity)
-        full_design = last_full_cap;
+    batt_info->present_rate = abs(batt_info->present_rate);
+#endif
+
+    return true;
+}
+
+/*
+ * Populate batt_info with aggregate information about all batteries.
+ * Returns false on error, and an error message will have been written.
+ */
+static bool slurp_all_batteries(struct battery_info *batt_info, yajl_gen json_gen, char *buffer, const char *path, const char *format_down) {
+#if defined(LINUX)
+    char *outwalk = buffer;
+    bool is_found = false;
 
-    if (!watt_as_unit) {
-        present_rate = (((float)voltage / 1000.0) * ((float)present_rate / 1000.0));
-        remaining = (((float)voltage / 1000.0) * ((float)remaining / 1000.0));
-        full_design = (((float)voltage / 1000.0) * ((float)full_design / 1000.0));
+    char *placeholder;
+    char *globpath = sstrdup(path);
+    if ((placeholder = strstr(path, "%d")) != NULL) {
+        char *globplaceholder = globpath + (placeholder - path);
+        *globplaceholder = '*';
+        strcpy(globplaceholder + 1, placeholder + 2);
     }
 
-    float percentage_remaining =
-        (((float)remaining / (float)full_design) * 100);
+    if (!strcmp(globpath, path)) {
+        OUTPUT_FULL_TEXT("no '%d' in battery path");
+        return false;
+    }
 
-    if (integer_battery_capacity)
-        (void)snprintf(percentagebuf,
-                       sizeof(percentagebuf),
-                       "%d%%",
-                       (int)percentage_remaining);
-    else
-        (void)snprintf(percentagebuf,
-                       sizeof(percentagebuf),
-                       "%.02f%%",
-                       percentage_remaining);
+    glob_t globbuf;
+    if (glob(globpath, 0, NULL, &globbuf) == 0) {
+        for (size_t i = 0; i < globbuf.gl_pathc; i++) {
+            /* Probe to see if there is such a battery. */
+            struct battery_info batt_buf = {
+                .full_design = 0,
+                .full_last = 0,
+                .remaining = 0,
+                .present_rate = 0,
+                .status = CS_UNKNOWN,
+            };
+            if (!slurp_battery_info(&batt_buf, json_gen, buffer, i, globbuf.gl_pathv[i], format_down)) {
+                globfree(&globbuf);
+                free(globpath);
+                return false;
+            }
 
-    /*
-     * Handle percentage low_threshold here, and time low_threshold when
-     * we have it.
-     */
-    if (status == CS_DISCHARGING && low_threshold > 0) {
-        if (strcasecmp(threshold_type, "percentage") == 0 && (((float)remaining / (float)full_design) * 100) < low_threshold) {
-            START_COLOR("color_bad");
-            colorful_output = true;
+            is_found = true;
+            add_battery_info(batt_info, &batt_buf);
         }
+        globfree(&globbuf);
     }
+    free(globpath);
 
-    if (is_full)
-        (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(CS_FULL));
-    else
-        (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
-
-    /*
-     * The envsys(4) ACPI routines do not appear to provide a 'time
-     * remaining' figure, so we must deduce it.
-     */
-    float remaining_time;
-    int seconds, hours, minutes, seconds_remaining;
+    if (!is_found) {
+        OUTPUT_FULL_TEXT(format_down);
+        return false;
+    }
 
-    if (status == CS_CHARGING)
-        remaining_time = ((float)full_design - (float)remaining) / (float)present_rate;
-    else if (status == CS_DISCHARGING)
-        remaining_time = ((float)remaining / (float)present_rate);
-    else
-        remaining_time = 0;
+    batt_info->present_rate = abs(batt_info->present_rate);
+#else
+    /* FreeBSD and OpenBSD only report aggregates. NetBSD always
+     * iterates through all batteries, so it's more efficient to
+     * aggregate in slurp_battery_info. */
+    return slurp_battery_info(batt_info, json_gen, buffer, -1, path, format_down);
+#endif
 
-    seconds_remaining = (int)(remaining_time * 3600.0);
+    return true;
+}
 
-    hours = seconds_remaining / 3600;
-    seconds = seconds_remaining - (hours * 3600);
-    minutes = seconds / 60;
-    seconds -= (minutes * 60);
+void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_unk, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds) {
+    const char *walk;
+    char *outwalk = buffer;
+    struct battery_info batt_info = {
+        .full_design = -1,
+        .full_last = -1,
+        .remaining = -1,
+        .present_rate = -1,
+        .seconds_remaining = -1,
+        .percentage_remaining = -1,
+        .status = CS_UNKNOWN,
+    };
+    bool colorful_output = false;
 
-    if (status != CS_CHARGING) {
-        if (hide_seconds)
-            (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d",
-                           max(hours, 0), max(minutes, 0));
-        else
-            (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d:%02d",
-                           max(hours, 0), max(minutes, 0), max(seconds, 0));
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__OpenBSD__)
+    /* These OSes report battery stats in whole percent. */
+    integer_battery_capacity = true;
+#endif
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__OpenBSD__)
+    /* These OSes report battery time in minutes. */
+    hide_seconds = true;
+#endif
 
-        if (low_threshold > 0) {
-            if (strcasecmp(threshold_type, "time") == 0 && ((float)seconds_remaining / 60.0) < (u_int)low_threshold) {
-                START_COLOR("color_bad");
-                colorful_output = true;
-            }
-        }
+    if (number < 0) {
+        if (!slurp_all_batteries(&batt_info, json_gen, buffer, path, format_down))
+            return;
     } else {
-        if (hide_seconds)
-            (void)snprintf(remainingbuf, sizeof(remainingbuf), "(%02d:%02d until full)",
-                           max(hours, 0), max(minutes, 0));
-        else
-            (void)snprintf(remainingbuf, sizeof(remainingbuf), "(%02d:%02d:%02d until full)",
-                           max(hours, 0), max(minutes, 0), max(seconds, 0));
+        if (!slurp_battery_info(&batt_info, json_gen, buffer, number, path, format_down))
+            return;
     }
 
-    empty_time = time(NULL);
-    empty_time += seconds_remaining;
-    empty_tm = localtime(&empty_time);
+    // *Choose* a measure of the 'full' battery. It is whichever is better of
+    // the battery's (hardware-given) design capacity (batt_info.full_design)
+    // and the battery's last known good charge (batt_info.full_last).
+    // We prefer the design capacity, but use the last capacity if we don't have it,
+    // or if we are asked to (last_full_capacity == true); but similarly we use
+    // the design capacity if we don't have the last capacity.
+    // If we don't have either then both full_design and full_last <= 0,
+    // which implies full <= 0, which bails out on the following line.
+    int full = batt_info.full_design;
+    if (full <= 0 || (last_full_capacity && batt_info.full_last > 0)) {
+        full = batt_info.full_last;
+    }
+    if (full <= 0 && batt_info.remaining < 0 && batt_info.percentage_remaining < 0) {
+        /* We have no physical measurements and no estimates. Nothing
+         * much we can report, then. */
+        OUTPUT_FULL_TEXT(format_down);
+        return;
+    }
+
+    if (batt_info.percentage_remaining < 0) {
+        batt_info.percentage_remaining = (((float)batt_info.remaining / (float)full) * 100);
+        /* Some batteries report POWER_SUPPLY_CHARGE_NOW=<full_design> when fully
+         * charged, even though that’s plainly wrong. For people who chose to see
+         * the percentage calculated based on the last full capacity, we clamp the
+         * value to 100%, as that makes more sense.
+         * See http://bugs.debian.org/785398 */
+        if (last_full_capacity && batt_info.percentage_remaining > 100) {
+            batt_info.percentage_remaining = 100;
+        }
+    }
 
-    /* No need to show empty time if battery is charging */
-    if (status != CS_CHARGING) {
-        if (hide_seconds)
-            (void)snprintf(emptytimebuf, sizeof(emptytimebuf), "%02d:%02d",
-                           max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0));
+    if (batt_info.seconds_remaining < 0 && batt_info.present_rate > 0 && batt_info.status != CS_FULL) {
+        if (batt_info.status == CS_CHARGING)
+            batt_info.seconds_remaining = 3600.0 * (full - batt_info.remaining) / batt_info.present_rate;
+        else if (batt_info.status == CS_DISCHARGING)
+            batt_info.seconds_remaining = 3600.0 * batt_info.remaining / batt_info.present_rate;
         else
-            (void)snprintf(emptytimebuf, sizeof(emptytimebuf), "%02d:%02d:%02d",
-                           max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0), max(empty_tm->tm_sec, 0));
+            batt_info.seconds_remaining = 0;
     }
 
-    (void)snprintf(consumptionbuf, sizeof(consumptionbuf), "%1.2fW",
-                   ((float)present_rate / 1000.0 / 1000.0));
-#endif
+    if (batt_info.status == CS_DISCHARGING && low_threshold > 0) {
+        if (batt_info.percentage_remaining >= 0 && strcasecmp(threshold_type, "percentage") == 0 && batt_info.percentage_remaining < low_threshold) {
+            START_COLOR("color_bad");
+            colorful_output = true;
+        } else if (batt_info.seconds_remaining >= 0 && strcasecmp(threshold_type, "time") == 0 && batt_info.seconds_remaining < 60 * low_threshold) {
+            START_COLOR("color_bad");
+            colorful_output = true;
+        }
+    }
 
-#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++;                                   \
-        }                                                 \
+#define EAT_SPACE_FROM_OUTPUT_IF_NO_OUTPUT()                   \
+    do {                                                       \
+        if (outwalk == prevoutwalk) {                          \
+            if (outwalk > buffer && isspace((int)outwalk[-1])) \
+                outwalk--;                                     \
+            else if (isspace((int)*(walk + 1)))                \
+                walk++;                                        \
+        }                                                      \
     } while (0)
 
     for (walk = format; *walk != '\0'; walk++) {
+        char *prevoutwalk = outwalk;
+
         if (*walk != '%') {
             *(outwalk++) = *walk;
-            continue;
-        }
 
-        if (BEGINS_WITH(walk + 1, "status")) {
-            outwalk += sprintf(outwalk, "%s", statusbuf);
+        } else if (BEGINS_WITH(walk + 1, "status")) {
+            const char *statusstr;
+            switch (batt_info.status) {
+                case CS_CHARGING:
+                    statusstr = status_chr;
+                    break;
+                case CS_DISCHARGING:
+                    statusstr = status_bat;
+                    break;
+                case CS_FULL:
+                    statusstr = status_full;
+                    break;
+                default:
+                    statusstr = status_unk;
+            }
+
+            outwalk += sprintf(outwalk, "%s", statusstr);
             walk += strlen("status");
+
         } else if (BEGINS_WITH(walk + 1, "percentage")) {
-            outwalk += sprintf(outwalk, "%s", percentagebuf);
+            if (integer_battery_capacity) {
+                outwalk += sprintf(outwalk, "%.00f%s", batt_info.percentage_remaining, pct_mark);
+            } else {
+                outwalk += sprintf(outwalk, "%.02f%s", batt_info.percentage_remaining, pct_mark);
+            }
             walk += strlen("percentage");
+
         } else if (BEGINS_WITH(walk + 1, "remaining")) {
-            outwalk += sprintf(outwalk, "%s", remainingbuf);
+            if (batt_info.seconds_remaining >= 0) {
+                int seconds, hours, minutes;
+
+                hours = batt_info.seconds_remaining / 3600;
+                seconds = batt_info.seconds_remaining - (hours * 3600);
+                minutes = seconds / 60;
+                seconds -= (minutes * 60);
+
+                if (hide_seconds)
+                    outwalk += sprintf(outwalk, "%02d:%02d",
+                                       max(hours, 0), max(minutes, 0));
+                else
+                    outwalk += sprintf(outwalk, "%02d:%02d:%02d",
+                                       max(hours, 0), max(minutes, 0), max(seconds, 0));
+            }
             walk += strlen("remaining");
-            EAT_SPACE_FROM_OUTPUT_IF_EMPTY(remainingbuf);
+            EAT_SPACE_FROM_OUTPUT_IF_NO_OUTPUT();
+
         } else if (BEGINS_WITH(walk + 1, "emptytime")) {
-            outwalk += sprintf(outwalk, "%s", emptytimebuf);
+            if (batt_info.seconds_remaining >= 0) {
+                time_t empty_time = time(NULL) + batt_info.seconds_remaining;
+                set_timezone(NULL); /* Use local time. */
+                struct tm *empty_tm = localtime(&empty_time);
+
+                if (hide_seconds)
+                    outwalk += sprintf(outwalk, "%02d:%02d",
+                                       max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0));
+                else
+                    outwalk += sprintf(outwalk, "%02d:%02d:%02d",
+                                       max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0), max(empty_tm->tm_sec, 0));
+            }
             walk += strlen("emptytime");
-            EAT_SPACE_FROM_OUTPUT_IF_EMPTY(emptytimebuf);
+            EAT_SPACE_FROM_OUTPUT_IF_NO_OUTPUT();
+
         } else if (BEGINS_WITH(walk + 1, "consumption")) {
-            outwalk += sprintf(outwalk, "%s", consumptionbuf);
+            if (batt_info.present_rate >= 0)
+                outwalk += sprintf(outwalk, "%1.2fW", batt_info.present_rate / 1e6);
+
             walk += strlen("consumption");
-            EAT_SPACE_FROM_OUTPUT_IF_EMPTY(consumptionbuf);
+            EAT_SPACE_FROM_OUTPUT_IF_NO_OUTPUT();
+
+        } else {
+            *(outwalk++) = '%';
         }
     }