battery_state() function added

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index bf3c826..1d46674 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -40,6 +40,7 @@ struct arg {
 
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
+static char *battery_state(const char *);
 static char *cpu_perc(void);
 static char *datetime(const char *);
 static char *disk_free(const char *);
@@ -98,36 +99,50 @@ smprintf(const char *fmt, ...)
 static char *
 battery_perc(const char *battery)
 {
-       int now, full;
+       int perc;
        FILE *fp;
 
-       ccat(3, "/sys/class/power_supply/", battery, "/energy_now");
+       ccat(3, "/sys/class/power_supply/", battery, "/capacity");
        fp = fopen(concat, "r");
        if (fp == NULL) {
-               ccat(4, "/sys/class/power_supply/", battery, "/charge_now");
-               fp = fopen(concat, "r");
-               if (fp == NULL) {
-                       warn("Error opening battery file: %s", concat);
-                       return smprintf(UNKNOWN_STR);
-               }
+               warn("Error opening battery file: %s", concat);
+               return smprintf(UNKNOWN_STR);
        }
-       fscanf(fp, "%i", &now);
+       fscanf(fp, "%i", &perc);
        fclose(fp);
 
-       ccat(3, "/sys/class/power_supply/", battery, "/energy_full");
+       return smprintf("%d%%", perc);
+}
+
+static char *
+battery_state(const char *battery)
+{
+       char *state = malloc(sizeof(char)*12);
+       FILE *fp;
+
+       if (!state) {
+               warn("Failed to get battery state.");
+               return smprintf(UNKNOWN_STR);
+       }
+
+
+       ccat(3, "/sys/class/power_supply/", battery, "/status");
        fp = fopen(concat, "r");
        if (fp == NULL) {
-               ccat(4, "/sys/class/power_supply/", battery, "/charge_full");
-               fp = fopen(concat, "r");
-               if (fp == NULL) {
-                       warn("Error opening battery file: %s", concat);
-                       return smprintf(UNKNOWN_STR);
-               }
+               warn("Error opening battery file: %s", concat);
+               return smprintf(UNKNOWN_STR);
        }
-       fscanf(fp, "%i", &full);
+       fscanf(fp, "%s", state);
        fclose(fp);
 
-       return smprintf("%d%%", now / (full / 100));
+       if (strcmp(state, "Charging") == 0)
+               return smprintf("+");
+       else if (strcmp(state, "Discharging") == 0)
+               return smprintf("-");
+       else if (strcmp(state, "Full") == 0)
+               return smprintf("=");
+       else
+               return smprintf("?");
 }
 
 static char *
@@ -476,25 +491,25 @@ uid(void)
 
 
 static char *
-vol_perc(const char *snd_card)
-{ /* FIX THIS SHIT! */
+vol_perc(const char *soundcard)
+{
        long int vol, max, min;
        snd_mixer_t *handle;
        snd_mixer_elem_t *elem;
        snd_mixer_selem_id_t *s_elem;
 
        snd_mixer_open(&handle, 0);
-       snd_mixer_attach(handle, snd_card);
+       snd_mixer_attach(handle, soundcard);
        snd_mixer_selem_register(handle, NULL, NULL);
        snd_mixer_load(handle);
        snd_mixer_selem_id_malloc(&s_elem);
-       snd_mixer_selem_id_set_name(s_elem, ALSA_CHANNEL);
+       snd_mixer_selem_id_set_name(s_elem, "Master");
        elem = snd_mixer_find_selem(handle, s_elem);
 
        if (elem == NULL) {
                snd_mixer_selem_id_free(s_elem);
                snd_mixer_close(handle);
-               warn("error: ALSA");
+               warn("Failed to get volume percentage for: %s.", soundcard);
                return smprintf(UNKNOWN_STR);
        }
 
@@ -505,7 +520,7 @@ vol_perc(const char *snd_card)
        snd_mixer_selem_id_free(s_elem);
        snd_mixer_close(handle);
 
-       return smprintf("%d", ((uint_fast16_t)(vol * 100) / max));
+       return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max));
 }
 
 static char *