simplified vol_perc() (and with that config.def.h is super clean)

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index cb5f1f2..1b45f64 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -98,33 +98,18 @@ smprintf(const char *fmt, ...)
 static char *
 battery_perc(const char *battery)
 {
-       int now, full, perc;
+       int perc;
        FILE *fp;
 
-       ccat(4, BATTERY_PATH, battery, "/", BATTERY_NOW);
-
+       ccat(3, "/sys/class/power_supply/", battery, "/capacity");
        fp = fopen(concat, "r");
        if (fp == NULL) {
                warn("Error opening battery file: %s", concat);
                return smprintf(UNKNOWN_STR);
        }
-
-       fscanf(fp, "%i", &now);
+       fscanf(fp, "%i", &perc);
        fclose(fp);
 
-       ccat(4, BATTERY_PATH, battery, "/", BATTERY_FULL);
-
-       fp = fopen(concat, "r");
-       if (fp == NULL) {
-               warn("Error opening battery file: %s", concat);
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%i", &full);
-       fclose(fp);
-
-       perc = now / (full / 100);
-
        return smprintf("%d%%", perc);
 }
 
@@ -474,7 +459,7 @@ uid(void)
 
 
 static char *
-vol_perc(const char *snd_card)
+vol_perc(const char *soundcard)
 { /* FIX THIS SHIT! */
        long int vol, max, min;
        snd_mixer_t *handle;
@@ -486,7 +471,7 @@ vol_perc(const char *snd_card)
        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) {
@@ -580,7 +565,7 @@ wifi_essid(const char *wificard)
 }
 
 static void
-sighandler(int signo)
+sighandler(const int signo)
 {
        if (signo == SIGTERM || signo == SIGINT) {
                done = 1;
@@ -592,7 +577,7 @@ main(void)
 {
        size_t i;
        char status_string[4096];
-       char *res, *element;
+       char *res, *element, *status_old;
        struct arg argument;
        struct sigaction act;
 
@@ -603,6 +588,8 @@ main(void)
 
        dpy = XOpenDisplay(NULL);
 
+       XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
+
        while (!done) {
                status_string[0] = '\0';
                for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
@@ -630,6 +617,9 @@ main(void)
                delay = 0;
        }
 
+       XStoreName(dpy, DefaultRootWindow(dpy), status_old);
+       XSync(dpy, False);
+
        XCloseDisplay(dpy);
 
        return 0;