subtraction is unneeded

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 73dc5a3..70d8fbb 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -63,6 +63,7 @@ static char *vol_perc(const char *);
 static char *wifi_perc(const char *);
 static char *wifi_essid(const char *);
 
+static unsigned short int delay;
 static Display *dpy;
 
 #include "config.h"
@@ -139,7 +140,8 @@ cpu_perc(void)
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
        fclose(fp);
 
-       sleep(1);
+       delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1));
+       sleep(delay);
 
        fp = fopen("/proc/stat","r");
        if (fp == NULL) {
@@ -258,7 +260,7 @@ hostname(void)
 
        fgets(hostname, sizeof(hostname), fp);
        /* FIXME: needs improvement */
-       memset(&hostname[strlen(hostname)-1], '\0',
+       memset(&hostname[strlen(hostname)], '\0',
                sizeof(hostname) - strlen(hostname));
        fclose(fp);
 
@@ -470,24 +472,24 @@ uid(void)
 
 static char * 
 vol_perc(const char *snd_card)
-{ /* thanks to botika for this function */
+{ /* FIX THIS SHIT! */
        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, "default");
+       snd_mixer_attach(handle, 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, snd_card);
+       snd_mixer_selem_id_set_name(s_elem, ALSA_CHANNEL);
        elem = snd_mixer_find_selem(handle, s_elem);
 
        if (elem == NULL) {
                snd_mixer_selem_id_free(s_elem);
                snd_mixer_close(handle);
-               perror("alsa error");
+               warn("error: ALSA");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -498,7 +500,7 @@ vol_perc(const char *snd_card)
        snd_mixer_selem_id_free(s_elem);
        snd_mixer_close(handle);
 
-       return smprintf("%d", (vol * 100) / max);
+       return smprintf("%d", ((uint_fast16_t)(vol * 100) / max));
 }
 
 static char *
@@ -510,7 +512,7 @@ wifi_perc(const char *wificard)
        char status[5];
        FILE *fp;
 
-       ccat(3, "/sys/class/net", wificard, "/operstate");
+       ccat(3, "/sys/class/net/", wificard, "/operstate");
 
        fp = fopen(concat, "r");
 
@@ -601,7 +603,14 @@ main(void)
                }
                XStoreName(dpy, DefaultRootWindow(dpy), status_string);
                XSync(dpy, False);
+               /*
+                * subtract delay time spend in function
+                * calls from the actual global delay time
+                */
+               sleep(UPDATE_INTERVAL - delay);
+               delay = 0;
        }
+
        XCloseDisplay(dpy);
 
        return 0;