fixed (hopefully) the vol_perc() function

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 7b85a23..0906b9d 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -37,6 +37,8 @@ struct arg {
        const char *args;
 };
 
        const char *args;
 };
 

+static unsigned short int delay;
+

 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);


@@ -139,7 +141,8 @@ cpu_perc(void)
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
        fclose(fp);
 
        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) {
 
        fp = fopen("/proc/stat","r");
        if (fp == NULL) {


@@ -277,7 +280,6 @@ ip(const char *interface)
                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 

-       /* get the ip address */

        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
                if (ifa->ifa_addr == NULL)
                        continue;
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
                if (ifa->ifa_addr == NULL)
                        continue;


@@ -294,7 +296,6 @@ ip(const char *interface)
                }
        }
 
                }
        }
 

-       /* free the address */

        freeifaddrs(ifaddr);
 
        return smprintf(UNKNOWN_STR);
        freeifaddrs(ifaddr);
 
        return smprintf(UNKNOWN_STR);


@@ -455,11 +456,12 @@ username(void)
        uid_t uid = geteuid();
        struct passwd *pw = getpwuid(uid);
 
        uid_t uid = geteuid();
        struct passwd *pw = getpwuid(uid);
 

-       if (pw == NULL)
-               return smprintf("%s", pw->pw_name);
+       if (pw == NULL) {
+               warn("Could not get username");
+               return smprintf(UNKNOWN_STR);
+       }

 
 

-       warn("Could not get username");
-       return smprintf(UNKNOWN_STR);
+       return smprintf("%s", pw->pw_name);

 }
 
 static char *
 }
 
 static char *


@@ -471,24 +473,24 @@ uid(void)
 
 static char * 
 vol_perc(const char *snd_card)
 
 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);
        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_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);
        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);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -499,7 +501,7 @@ vol_perc(const char *snd_card)
        snd_mixer_selem_id_free(s_elem);
        snd_mixer_close(handle);
 
        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 *
 }
 
 static char *


@@ -602,7 +604,14 @@ main(void)
                }
                XStoreName(dpy, DefaultRootWindow(dpy), status_string);
                XSync(dpy, False);
                }
                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;
        XCloseDisplay(dpy);
 
        return 0;