Set {r,t}xbytes 0 before incrementing them on OBSD

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index 53d94b5..b086a28 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -5,6 +5,14 @@
 
 #include "../util.h"
 
+static struct {
+       char *state;
+       char *symbol;
+} map[] = {
+       { "Charging",    "+" },
+       { "Discharging", "-" },
+};
+
 #if defined(__linux__)
        #include <limits.h>
 
@@ -16,19 +24,12 @@
 
                snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                         bat, "/capacity");
-               return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;
+               return (pscanf(path, "%d", &perc) == 1) ? bprintf("%d", perc) : NULL;
        }
 
        const char *
        battery_state(const char *bat)
        {
-               struct {
-                       char *state;
-                       char *symbol;
-               } map[] = {
-                       { "Charging",    "+" },
-                       { "Discharging", "-" },
-               };
                size_t i;
                char path[PATH_MAX], state[12];
 
@@ -49,8 +50,36 @@
        const char *
        battery_remaining(const char *bat)
        {
-               /* TODO: Implement */
-               return NULL;
+               int charge_now, current_now, m, h;
+               float timeleft;
+               char path[PATH_MAX], state[12];
+
+               snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+                        bat, "/status");
+               if (pscanf(path, "%12s", state) != 1) {
+                       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) {
+                               return NULL;
+                       }
+                       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+                                        bat, "/current_now");
+                       if (pscanf(path, "%d", &current_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>
@@ -95,13 +124,6 @@
        {
                struct apm_power_info apm_info;
                size_t i;
-               struct {
-                       unsigned int state;
-                       char *symbol;
-               } map[] = {
-                       { APM_AC_ON,      "+" },
-                       { APM_AC_OFF,     "-" },
-               };
 
                if (load_apm_power_info(&apm_info)) {
                        for (i = 0; i < LEN(map); i++) {
@@ -121,8 +143,12 @@
                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;