X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/aac29e2bba1d34762971718c40004f37415d411e..d518472e6235dde0164115cd68f383f3db3427f2:/components/battery.c diff --git a/components/battery.c b/components/battery.c index b086a28..07b6ac1 100644 --- a/components/battery.c +++ b/components/battery.c @@ -1,20 +1,30 @@ /* See LICENSE file for copyright and license details. */ -#include #include #include #include "../util.h" -static struct { - char *state; - char *symbol; -} map[] = { - { "Charging", "+" }, - { "Discharging", "-" }, -}; - #if defined(__linux__) #include + #include + #include + + static const char * + pick(const char *bat, const char *f1, const char *f2, char *path, + size_t length) + { + if (esnprintf(path, length, f1, bat) > 0 && + access(path, R_OK) == 0) { + return f1; + } + + if (esnprintf(path, length, f2, bat) > 0 && + access(path, R_OK) == 0) { + return f2; + } + + return NULL; + } const char * battery_perc(const char *bat) @@ -22,19 +32,34 @@ static struct { int perc; char path[PATH_MAX]; - snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", - bat, "/capacity"); - return (pscanf(path, "%d", &perc) == 1) ? bprintf("%d", perc) : NULL; + if (esnprintf(path, sizeof(path), + "/sys/class/power_supply/%s/capacity", bat) < 0) { + return NULL; + } + if (pscanf(path, "%d", &perc) != 1) { + return NULL; + } + + return bprintf("%d", perc); } const char * battery_state(const char *bat) { + static struct { + char *state; + char *symbol; + } map[] = { + { "Charging", "+" }, + { "Discharging", "-" }, + }; size_t i; char path[PATH_MAX], state[12]; - snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", - bat, "/status"); + if (esnprintf(path, sizeof(path), + "/sys/class/power_supply/%s/status", bat) < 0) { + return NULL; + } if (pscanf(path, "%12s", state) != 1) { return NULL; } @@ -50,33 +75,42 @@ static struct { const char * battery_remaining(const char *bat) { - int charge_now, current_now, m, h; - float timeleft; + uintmax_t charge_now, current_now, m, h; + double timeleft; char path[PATH_MAX], state[12]; - snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", - bat, "/status"); + if (esnprintf(path, sizeof(path), + "/sys/class/power_supply/%s/status", bat) < 0) { + return NULL; + } if (pscanf(path, "%12s", state) != 1) { return NULL; } + if (!pick(bat, "/sys/class/power_supply/%s/charge_now", + "/sys/class/power_supply/%s/energy_now", path, + sizeof(path)) || + pscanf(path, "%ju", &charge_now) < 0) { + return NULL; + } + if (!strcmp(state, "Discharging")) { - snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", - bat, "/charge_now"); - if (pscanf(path, "%d", &charge_now) != 1) { + if (!pick(bat, "/sys/class/power_supply/%s/current_now", + "/sys/class/power_supply/%s/power_now", path, + sizeof(path)) || + pscanf(path, "%ju", ¤t_now) < 0) { return NULL; } - snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", - bat, "/current_now"); - if (pscanf(path, "%d", ¤t_now) != 1) { + + if (current_now == 0) { return NULL; } - timeleft = (float)charge_now / (float)current_now; + timeleft = (double)charge_now / (double)current_now; h = timeleft; - m = (timeleft - (float)h) * 60; + m = (timeleft - (double)h) * 60; - return bprintf("%dh %dm", h, m); + return bprintf("%juh %jum", h, m); } return ""; @@ -122,6 +156,13 @@ static struct { const char * battery_state(const char *unused) { + struct { + unsigned int state; + char *symbol; + } map[] = { + { APM_AC_ON, "+" }, + { APM_AC_OFF, "-" }, + }; struct apm_power_info apm_info; size_t i; @@ -144,7 +185,8 @@ static struct { if (load_apm_power_info(&apm_info)) { if (apm_info.ac_state != APM_AC_ON) { - return bprintf("%uh %02um", apm_info.minutes_left / 60, + return bprintf("%uh %02um", + apm_info.minutes_left / 60, apm_info.minutes_left % 60); } else { return ""; @@ -153,4 +195,57 @@ static struct { return NULL; } +#elif defined(__FreeBSD__) + #include + + const char * + battery_perc(const char *unused) + { + int cap; + size_t len; + + len = sizeof(cap); + if (sysctlbyname("hw.acpi.battery.life", &cap, &len, NULL, 0) == -1 + || !len) + return NULL; + + return bprintf("%d", cap); + } + + const char * + battery_state(const char *unused) + { + int state; + size_t len; + + len = sizeof(state); + if (sysctlbyname("hw.acpi.battery.state", &state, &len, NULL, 0) == -1 + || !len) + return NULL; + + switch(state) { + case 0: + case 2: + return "+"; + case 1: + return "-"; + default: + return "?"; + } + } + + const char * + battery_remaining(const char *unused) + { + int rem; + size_t len; + + len = sizeof(rem); + if (sysctlbyname("hw.acpi.battery.time", &rem, &len, NULL, 0) == -1 + || !len + || rem == -1) + return NULL; + + return bprintf("%uh %02um", rem / 60, rem % 60); + } #endif