X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_battery_info.c;h=e439bc6bb29ff3ac862c7c38f6aaf86bf4127b56;hb=59d52ad78759ef7b194f9ca50f9d03d721d14398;hp=36de3c842021d9805f902fe21ecbc02810c56720;hpb=75670ba64a43f3382e5163b6ea7bf27de28d929b;p=i3%2Fi3status diff --git a/src/print_battery_info.c b/src/print_battery_info.c index 36de3c8..e439bc6 100644 --- a/src/print_battery_info.c +++ b/src/print_battery_info.c @@ -1,8 +1,11 @@ // vim:ts=8:expandtab +#include #include #include #include #include +#include +#include #include "i3status.h" @@ -11,13 +14,23 @@ #include #endif +#if defined(__OpenBSD__) +#include +#include +#include +#include +#endif + +#define BATT_STATUS_NAME(status) \ + (status == CS_CHARGING ? "CHR" : \ + (status == CS_DISCHARGING ? "BAT" : "FULL")) /* * 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. * */ -void print_battery_info(int number, const char *format, 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]; @@ -25,22 +38,30 @@ void print_battery_info(int number, const char *format, bool last_full_capacity) char percentagebuf[16]; char remainingbuf[256]; char emptytimebuf[256]; + char consumptionbuf[256]; const char *walk, *last; + char *outwalk = buffer; + bool watt_as_unit; + bool colorful_output; int full_design = -1, remaining = -1, - present_rate = -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)); + + INSTANCE(path); #if defined(LINUX) static char batpath[512]; - sprintf(batpath, "/sys/class/power_supply/BAT%d/uevent", number); + sprintf(batpath, path, number); if (!slurp(batpath, buf, sizeof(buf))) { - printf("No battery"); + OUTPUT_FULL_TEXT("No battery"); return; } @@ -53,11 +74,22 @@ void print_battery_info(int number, const char *format, bool last_full_capacity) if (*walk != '=') continue; - if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW") || - BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_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")) { + watt_as_unit = false; remaining = atoi(walk+1); + } else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW")) present_rate = atoi(walk+1); + else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW")) + voltage = 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 = atoi(walk+1); else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging")) @@ -80,15 +112,25 @@ void print_battery_info(int number, const char *format, bool last_full_capacity) } } - if ((full_design == 1) || (remaining == -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)); + remaining = (((float)voltage / 1000.0) * ((float)remaining / 1000.0)); + full_design = (((float)voltage / 1000.0) * ((float)full_design / 1000.0)); + } + + if ((full_design == -1) || (remaining == -1)) { + OUTPUT_FULL_TEXT("No battery"); return; + } - (void)snprintf(statusbuf, sizeof(statusbuf), "%s", - (status == CS_CHARGING ? "CHR" : - (status == CS_DISCHARGING ? "BAT" : "FULL"))); + (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; @@ -106,6 +148,18 @@ void print_battery_info(int number, const char *format, bool last_full_capacity) minutes = seconds / 60; seconds -= (minutes * 60); + 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)); @@ -115,6 +169,12 @@ void print_battery_info(int number, const char *format, bool last_full_capacity) (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)); + + if (colorful_output) + END_COLOR; } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) int state; @@ -122,19 +182,19 @@ void print_battery_info(int number, const char *format, bool last_full_capacity) size_t sysctl_size = sizeof(sysctl_rslt); if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { - printf("No battery"); + OUTPUT_FULL_TEXT("No battery"); return; } present_rate = sysctl_rslt; if (sysctlbyname(BATT_TIME, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { - printf("No battery"); + OUTPUT_FULL_TEXT("No battery"); return; } remaining = sysctl_rslt; if (sysctlbyname(BATT_STATE, &sysctl_rslt, &sysctl_size, NULL,0) != 0) { - printf("No battery"); + OUTPUT_FULL_TEXT("No battery"); return; } @@ -148,9 +208,7 @@ void print_battery_info(int number, const char *format, bool last_full_capacity) full_design = sysctl_rslt; - (void)snprintf(statusbuf, sizeof(statusbuf), "%s", - (status == CS_CHARGING ? "CHR" : - (status == CS_DISCHARGING ? "BAT" : "FULL"))); + (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status)); (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%", present_rate); @@ -163,26 +221,92 @@ void print_battery_info(int number, const char *format, bool last_full_capacity) (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02dh%02d", max(hours, 0), max(minutes, 0)); } +#elif defined(__OpenBSD__) + /* + * We're using apm(4) here, which is the interface to acpi(4) on amd64/i386 and + * the generic interface on macppc/sparc64/zaurus, instead of using sysctl(3) and + * probing acpi(4) devices. + */ + struct apm_power_info apm_info; + int apm_fd, ac_status, charging; + + apm_fd = open("/dev/apm", O_RDONLY); + if (apm_fd < 0) { + OUTPUT_FULL_TEXT("can't open /dev/apm"); + return; + } + if (ioctl(apm_fd, APM_IOC_GETPOWER, &apm_info) < 0) + OUTPUT_FULL_TEXT("can't read power info"); + + close(apm_fd); + + /* Don't bother to go further if there's no battery present. */ + if ((apm_info.battery_state == APM_BATTERY_ABSENT) || + (apm_info.battery_state == APM_BATT_UNKNOWN)) { + OUTPUT_FULL_TEXT("No battery"); + return; + } + + switch(apm_info.ac_state) { + case APM_AC_OFF: + ac_status = CS_DISCHARGING; + break; + case APM_AC_ON: + ac_status = CS_CHARGING; + break; + default: + /* If we don't know what's going on, just assume we're discharging. */ + ac_status = CS_DISCHARGING; + break; + } + + (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status)); + (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%", apm_info.battery_life); + + /* Can't give a meaningful value for remaining minutes if we're charging. */ + if (ac_status == CS_CHARGING) + charging = 1; + + (void)snprintf(remainingbuf, sizeof(remainingbuf), (charging ? "%s" : "%d"), + (charging ? "(CHR)" : apm_info.minutes_left)); #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 != '%') { - putchar(*walk); + *(outwalk++) = *walk; continue; } if (strncmp(walk+1, "status", strlen("status")) == 0) { - printf("%s", statusbuf); + outwalk += sprintf(outwalk, "%s", statusbuf); walk += strlen("status"); } else if (strncmp(walk+1, "percentage", strlen("percentage")) == 0) { - printf("%s", percentagebuf); + outwalk += sprintf(outwalk, "%s", percentagebuf); walk += strlen("percentage"); } else if (strncmp(walk+1, "remaining", strlen("remaining")) == 0) { - printf("%s", remainingbuf); + outwalk += sprintf(outwalk, "%s", remainingbuf); walk += strlen("remaining"); + EAT_SPACE_FROM_OUTPUT_IF_EMPTY(remainingbuf); } else if (strncmp(walk+1, "emptytime", strlen("emptytime")) == 0) { - printf("%s", emptytimebuf); + 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); } } + + OUTPUT_FULL_TEXT(buffer); }