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[] = {
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;
}
}
return (i == LEN(map)) ? "?" : map[i].symbol;
}
+
+ const char *
+ battery_remaining(const char *bat)
+ {
+ int charge_now, current_now, m, h;
+ float 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 (!strcmp(state, "Discharging")) {
+ if (esnprintf(path, sizeof(path),
+ "/sys/class/power_supply/%s/charge_now",
+ bat) < 0) {
+ return NULL;
+ }
+ if (pscanf(path, "%d", &charge_now) != 1) {
+ return NULL;
+ }
+ if (esnprintf(path, sizeof(path),
+ "/sys/class/power_supply/%s/current_now",
+ bat) < 0) {
+ return NULL;
+ }
+ if (pscanf(path, "%d", ¤t_now) != 1) {
+ return NULL;
+ }
+
+ timeleft = (float)charge_now / (float)current_now;
+ h = timeleft;
+ m = (timeleft - (float)h) * 60;
+
+ return bprintf("%dh %dm", h, m);
+ }
+
+ return "";
+ }
#elif defined(__OpenBSD__)
#include <fcntl.h>
#include <machine/apmvar.h>
#include <sys/ioctl.h>
#include <unistd.h>
- const char *
- battery_perc(const char *null)
+ static int
+ load_apm_power_info(struct apm_power_info *apm_info)
{
- struct apm_power_info apm_info;
int fd;
fd = open("/dev/apm", O_RDONLY);
if (fd < 0) {
- fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
- return NULL;
+ warn("open '/dev/apm':");
+ return 0;
}
- if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
- fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n",
- strerror(errno));
+ memset(apm_info, 0, sizeof(struct apm_power_info));
+ if (ioctl(fd, APM_IOC_GETPOWER, apm_info) < 0) {
+ warn("ioctl 'APM_IOC_GETPOWER':");
close(fd);
- return NULL;
+ return 0;
}
- close(fd);
-
- return bprintf("%d", apm_info.battery_life);
+ return close(fd), 1;
}
const char *
- battery_state(const char *bat)
+ battery_perc(const char *unused)
{
- int fd;
- size_t i;
struct apm_power_info apm_info;
+
+ if (load_apm_power_info(&apm_info)) {
+ return bprintf("%d%%", apm_info.battery_life);
+ }
+
+ return NULL;
+ }
+
+ const char *
+ battery_state(const char *unused)
+ {
struct {
unsigned int state;
char *symbol;
{ APM_AC_ON, "+" },
{ APM_AC_OFF, "-" },
};
+ struct apm_power_info apm_info;
+ size_t i;
- fd = open("/dev/apm", O_RDONLY);
- if (fd < 0) {
- fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
- return NULL;
+ if (load_apm_power_info(&apm_info)) {
+ for (i = 0; i < LEN(map); i++) {
+ if (map[i].state == apm_info.ac_state) {
+ break;
+ }
+ }
+ return (i == LEN(map)) ? "?" : map[i].symbol;
}
- if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
- fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n",
- strerror(errno));
- close(fd);
- return NULL;
- }
- close(fd);
+ return NULL;
+ }
- for (i = 0; i < LEN(map); i++) {
- if (map[i].state == apm_info.ac_state) {
- break;
+ const char *
+ battery_remaining(const char *unused)
+ {
+ struct apm_power_info apm_info;
+
+ if (load_apm_power_info(&apm_info)) {
+ 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 (i == LEN(map)) ? "?" : map[i].symbol;
+
+ return NULL;
}
#endif