simplify status_string clearing

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 55bcdf8..6e86092 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"
@@ -126,7 +127,7 @@ battery_perc(const char *battery)
 
 static char *
 cpu_perc(void)
-{ /* FIXME: ugly function, would be better without sleep(), see below */
+{
        int perc;
        long double a[4], b[4];
        FILE *fp = fopen("/proc/stat","r");
@@ -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) {
@@ -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 *
@@ -566,6 +568,8 @@ wifi_essid(const char *wificard)
                return smprintf(UNKNOWN_STR);
        }
 
+       close(sockfd);
+
        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
                return smprintf(UNKNOWN_STR);
        else
@@ -583,7 +587,7 @@ main(void)
        dpy = XOpenDisplay(NULL);
 
        for (;;) {
-               memset(status_string, 0, sizeof(status_string));
+               status_string[0] = '\0';
                for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
                        argument = args[i];
                        if (argument.args == NULL)
@@ -601,7 +605,12 @@ main(void)
                }
                XStoreName(dpy, DefaultRootWindow(dpy), status_string);
                XSync(dpy, False);
-               sleep(UPDATE_INTERVAL - 1); /* FIXME: ugly cpu function which uses 1 second */
+               /*
+                * subtract delay time spend in function
+                * calls from the actual global delay time
+                */
+               sleep(UPDATE_INTERVAL - delay);
+               delay = 0;
        }
 
        XCloseDisplay(dpy);