X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_battery_info.c;h=7a462f7fcf29dd0148d19f3a3189e09f24b5bc48;hb=451ff9be0b87946778250fdffcc62b04817b6394;hp=d0e69c41b2344a4adb83e18fd512b8dcbd0d4941;hpb=52f0dd6a36099d238796eccd16410be79325c806;p=i3%2Fi3status diff --git a/src/print_battery_info.c b/src/print_battery_info.c index d0e69c4..7a462f7 100644 --- a/src/print_battery_info.c +++ b/src/print_battery_info.c @@ -9,6 +9,12 @@ #include "i3status.h" +#if defined(LINUX) +#include +#include +#include +#endif + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include #include @@ -28,33 +34,96 @@ #include #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(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_unk, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds) { +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]; const char *walk, *last; - char *outwalk = buffer; bool watt_as_unit = false; - int full_design = -1, - remaining = -1, - present_rate = -1, - voltage = -1, - seconds_remaining = -1; - float percentage_remaining = -1; - charging_status_t status = CS_DISCHARGING; - - static char batpath[512]; + int voltage = -1; + char batpath[512]; sprintf(batpath, path, number); INSTANCE(batpath); -#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++) { @@ -66,84 +135,59 @@ 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; + batt_info->status = CS_FULL; else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Discharging")) - status = CS_DISCHARGING; + batt_info->status = CS_DISCHARGING; else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=")) - status = CS_UNKNOWN; - 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_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 (batt_info->remaining > 0) { + batt_info->remaining = (((float)voltage / 1000.0) * ((float)batt_info->remaining / 1000.0)); + } + 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)); } - } - - if ((full_design == -1) || (remaining == -1)) { - OUTPUT_FULL_TEXT(format_down); - return; - } - - percentage_remaining = (((float)remaining / (float)full_design) * 100); - /* Some batteries report POWER_SUPPLY_CHARGE_NOW= 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 (present_rate > 0 && status != CS_FULL) { - float remaining_time; - 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); } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) int state; @@ -152,32 +196,28 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { OUTPUT_FULL_TEXT(format_down); - return; + return false; } - integer_battery_capacity = true; - percentage_remaining = 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; } - hide_seconds = true; - seconds_remaining = sysctl_rslt * 60; + 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 && percentage_remaining == 100) - status = CS_FULL; - else if ((state & ACPI_BATT_STAT_CHARGING) && percentage_remaining < 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; + 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 @@ -190,7 +230,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"); @@ -201,37 +241,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; } - integer_battery_capacity = true; - percentage_remaining = apm_info.battery_life; + 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) { - seconds_remaining = apm_info.minutes_left * 60; + if (batt_info->status != CS_CHARGING) { + batt_info->seconds_remaining = apm_info.minutes_left * 60; } #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; @@ -239,24 +277,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); @@ -268,11 +307,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; @@ -281,7 +326,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); @@ -289,84 +334,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); - - if (remaining == full_design) - is_full = true; + batt_buf.remaining = prop_number_integer_value(obj3); + batt_buf.full_design = prop_number_integer_value(obj4); - 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); @@ -375,60 +408,163 @@ 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 - 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)); - } + return true; +} - percentage_remaining = - (((float)remaining / (float)full_design) * 100); +/* + * 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 (is_full) - status = CS_FULL; + char *placeholder; + char *globpath = sstrdup(path); + if ((placeholder = strstr(path, "%d")) != NULL) { + char *globplaceholder = globpath + (placeholder - path); + *globplaceholder = '*'; + strcpy(globplaceholder + 1, placeholder + 2); + } - /* - * The envsys(4) ACPI routines do not appear to provide a 'time - * remaining' figure, so we must deduce it. - */ - float remaining_time; + if (!strcmp(globpath, path)) { + OUTPUT_FULL_TEXT("no '%d' in battery path"); + 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; + 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)) + return false; + + is_found = true; + add_battery_info(batt_info, &batt_buf); + } + } + globfree(&globbuf); + free(globpath); + + if (!is_found) { + OUTPUT_FULL_TEXT(format_down); + return false; + } - seconds_remaining = (int)(remaining_time * 3600.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 + return true; +} + +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_DISCHARGING && low_threshold > 0) { - if (percentage_remaining >= 0 && strcasecmp(threshold_type, "percentage") == 0 && percentage_remaining < low_threshold) { +#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 (number < 0) { + if (!slurp_all_batteries(&batt_info, json_gen, buffer, path, format_down)) + return; + } else { + if (!slurp_battery_info(&batt_info, json_gen, buffer, number, path, format_down)) + return; + } + + // *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= 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; + } + } + + 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 + batt_info.seconds_remaining = 0; + } + + 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 (seconds_remaining >= 0 && strcasecmp(threshold_type, "time") == 0 && seconds_remaining < 60 * low_threshold) { + } 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_NO_OUTPUT() \ - do { \ - if (outwalk == prevoutwalk) { \ - 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++) { @@ -441,7 +577,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char if (BEGINS_WITH(walk + 1, "status")) { const char *statusstr; - switch (status) { + switch (batt_info.status) { case CS_CHARGING: statusstr = status_chr; break; @@ -459,17 +595,17 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char walk += strlen("status"); } else if (BEGINS_WITH(walk + 1, "percentage")) { if (integer_battery_capacity) { - outwalk += sprintf(outwalk, "%.00f%s", percentage_remaining, pct_mark); + outwalk += sprintf(outwalk, "%.00f%s", batt_info.percentage_remaining, pct_mark); } else { - outwalk += sprintf(outwalk, "%.02f%s", percentage_remaining, pct_mark); + outwalk += sprintf(outwalk, "%.02f%s", batt_info.percentage_remaining, pct_mark); } walk += strlen("percentage"); } else if (BEGINS_WITH(walk + 1, "remaining")) { - if (seconds_remaining >= 0) { + if (batt_info.seconds_remaining >= 0) { int seconds, hours, minutes; - hours = seconds_remaining / 3600; - seconds = seconds_remaining - (hours * 3600); + hours = batt_info.seconds_remaining / 3600; + seconds = batt_info.seconds_remaining - (hours * 3600); minutes = seconds / 60; seconds -= (minutes * 60); @@ -483,8 +619,9 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char walk += strlen("remaining"); EAT_SPACE_FROM_OUTPUT_IF_NO_OUTPUT(); } else if (BEGINS_WITH(walk + 1, "emptytime")) { - if (seconds_remaining >= 0) { - time_t empty_time = time(NULL) + seconds_remaining; + 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) @@ -497,8 +634,8 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char walk += strlen("emptytime"); EAT_SPACE_FROM_OUTPUT_IF_NO_OUTPUT(); } else if (BEGINS_WITH(walk + 1, "consumption")) { - if (present_rate >= 0) - outwalk += sprintf(outwalk, "%1.2fW", present_rate / 1e6); + if (batt_info.present_rate >= 0) + outwalk += sprintf(outwalk, "%1.2fW", batt_info.present_rate / 1e6); walk += strlen("consumption"); EAT_SPACE_FROM_OUTPUT_IF_NO_OUTPUT();