Remove units from numbers

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index 152777e..ff06f40 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -7,6 +7,26 @@
 
 #if defined(__linux__)
        #include <limits.h>
 
 #if defined(__linux__)
        #include <limits.h>

+       #include <unistd.h>
+
+       #define CHARGE_NOW    "/sys/class/power_supply/%s/charge_now"
+       #define ENERGY_NOW    "/sys/class/power_supply/%s/energy_now"
+       #define CURRENT_NOW   "/sys/class/power_supply/%s/current_now"
+       #define POWER_NOW     "/sys/class/power_supply/%s/power_now"
+
+       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)
 
        const char *
        battery_perc(const char *bat)


@@ -14,15 +34,22 @@
                int perc;
                char path[PATH_MAX];
 
                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)
        {
        }
 
        const char *
        battery_state(const char *bat)
        {

-               struct {
+               static struct {

                        char *state;
                        char *symbol;
                } map[] = {
                        char *state;
                        char *symbol;
                } map[] = {


@@ -32,8 +59,11 @@
                size_t i;
                char path[PATH_MAX], state[12];
 
                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;
                }
                if (pscanf(path, "%12s", state) != 1) {
                        return NULL;
                }


@@ -49,8 +79,38 @@
        const char *
        battery_remaining(const char *bat)
        {
        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];
+
+               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, CHARGE_NOW, ENERGY_NOW, path, sizeof (path)) == NULL ||
+                   pscanf(path, "%d", &charge_now) < 0) {
+                       return NULL;
+               }
+
+               if (!strcmp(state, "Discharging")) {
+                       if (pick(bat, CURRENT_NOW, POWER_NOW, path, sizeof (path)) == NULL ||
+                           pscanf(path, "%d", &current_now) < 0) {
+                               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>
        }
 #elif defined(__OpenBSD__)
        #include <fcntl.h>


@@ -93,8 +153,6 @@
        const char *
        battery_state(const char *unused)
        {
        const char *
        battery_state(const char *unused)
        {

-               struct apm_power_info apm_info;
-               size_t i;

                struct {
                        unsigned int state;
                        char *symbol;
                struct {
                        unsigned int state;
                        char *symbol;


@@ -102,6 +160,8 @@
                        { APM_AC_ON,      "+" },
                        { APM_AC_OFF,     "-" },
                };
                        { 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++) {
 
                if (load_apm_power_info(&apm_info)) {
                        for (i = 0; i < LEN(map); i++) {


@@ -121,8 +181,12 @@
                struct apm_power_info apm_info;
 
                if (load_apm_power_info(&apm_info)) {
                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;
                }
 
                return NULL;