X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/8c8326f793549dcc685f0e4ec3e29f1f3790d6d8..10bdf01b715dcc994f3fe32a6881d5e0b2613a6c:/components/battery.c diff --git a/components/battery.c b/components/battery.c index 152777e..07b6ac1 100644 --- a/components/battery.c +++ b/components/battery.c @@ -1,5 +1,4 @@ /* See LICENSE file for copyright and license details. */ -#include #include #include @@ -7,6 +6,25 @@ #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) @@ -14,15 +32,21 @@ int perc; char path[PATH_MAX]; - snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", - bat, "/capacity"); - return (pscanf(path, "%i", &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) { - struct { + static struct { char *state; char *symbol; } map[] = { @@ -32,8 +56,10 @@ 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; } @@ -49,8 +75,45 @@ const char * battery_remaining(const char *bat) { - /* TODO: Implement */ - return NULL; + uintmax_t charge_now, current_now, m, h; + double timeleft; + char path[PATH_MAX], state[12]; + + 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")) { + 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; + } + + if (current_now == 0) { + return NULL; + } + + timeleft = (double)charge_now / (double)current_now; + h = timeleft; + m = (timeleft - (double)h) * 60; + + return bprintf("%juh %jum", h, m); + } + + return ""; } #elif defined(__OpenBSD__) #include @@ -93,8 +156,6 @@ const char * battery_state(const char *unused) { - struct apm_power_info apm_info; - size_t i; struct { unsigned int state; char *symbol; @@ -102,6 +163,8 @@ { APM_AC_ON, "+" }, { APM_AC_OFF, "-" }, }; + struct apm_power_info apm_info; + size_t i; if (load_apm_power_info(&apm_info)) { for (i = 0; i < LEN(map); i++) { @@ -121,10 +184,68 @@ struct apm_power_info apm_info; if (load_apm_power_info(&apm_info)) { - return bprintf("%u:%02u", apm_info.minutes_left / 60, - apm_info.minutes_left % 60); + if (apm_info.ac_state != APM_AC_ON) { + return bprintf("%uh %02um", + apm_info.minutes_left / 60, + apm_info.minutes_left % 60); + } else { + return ""; + } } 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