Xinqi Bao's Git

fixed (hopefully) the vol_perc() function
[slstatus.git] / slstatus.c
index f070e1d..0906b9d 100644 (file)
@@ -1,12 +1,11 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <alsa/asoundlib.h>
-#include <arpa/inet.h>
+#include <err.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <limits.h>
 #include <linux/wireless.h>
-#include <locale.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <stdarg.h>
 
 #include "strlcat.h"
 #include "strlcpy.h"
+#include "concat.h"
+
+char concat[];
 
-typedef char *(*op_fun)();
 struct arg {
-       op_fun func;
+       char *(*func)();
        const char *format;
        const char *args;
 };
 
-static void setstatus(const char *);
+static unsigned short int delay;
+
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);
@@ -67,14 +69,6 @@ static Display *dpy;
 
 #include "config.h"
 
-static void
-setstatus(const char *str)
-{
-       /* set WM_NAME via X11 */
-       XStoreName(dpy, DefaultRootWindow(dpy), str);
-       XSync(dpy, False);
-}
-
 static char *
 smprintf(const char *fmt, ...)
 {
@@ -103,35 +97,24 @@ static char *
 battery_perc(const char *battery)
 {
        int now, full, perc;
-       char batterynowfile[64];
-       char batteryfullfile[64];
        FILE *fp;
 
-       strlcpy(batterynowfile, BATTERY_PATH, sizeof(batterynowfile));
-       strlcat(batterynowfile, battery, sizeof(batterynowfile));
-       strlcat(batterynowfile, "/", sizeof(batterynowfile));
-       strlcat(batterynowfile, BATTERY_NOW, sizeof(batterynowfile));
-
-       strlcpy(batteryfullfile, BATTERY_PATH, sizeof(batteryfullfile));
-       strlcat(batteryfullfile, battery, sizeof(batteryfullfile));
-       strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
-       strlcat(batteryfullfile, BATTERY_FULL, sizeof(batteryfullfile));
-
-       fp = fopen(batterynowfile, "r");
-       if (fp == NULL ) {
-               fprintf(stderr, "Error opening battery file: %s: %s\n",
-                                               batterynowfile,
-                                               strerror(errno));
+       ccat(4, BATTERY_PATH, battery, "/", BATTERY_NOW);
+
+       fp = fopen(concat, "r");
+       if (fp == NULL) {
+               warn("Error opening battery file: %s", concat);
                return smprintf(UNKNOWN_STR);
        }
 
        fscanf(fp, "%i", &now);
        fclose(fp);
 
-       fp = fopen(batteryfullfile, "r");
+       ccat(4, BATTERY_PATH, battery, "/", BATTERY_FULL);
+
+       fp = fopen(concat, "r");
        if (fp == NULL) {
-               fprintf(stderr, "Error opening battery file: %s\n",
-                                               strerror(errno));
+               warn("Error opening battery file: %s", concat);
                return smprintf(UNKNOWN_STR);
        }
 
@@ -151,27 +134,26 @@ cpu_perc(void)
        FILE *fp = fopen("/proc/stat","r");
 
        if (fp == NULL) {
-               fprintf(stderr, "Error opening stat file: %s\n",
-                                               strerror(errno));
+               warn("Error opening stat file");
                return smprintf(UNKNOWN_STR);
        }
 
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
        fclose(fp);
 
-       /* wait a second (for avg values) */
-       sleep(1);
+       delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1));
+       sleep(delay);
 
        fp = fopen("/proc/stat","r");
        if (fp == NULL) {
-               fprintf(stderr, "Error opening stat file: %s\n",
-                                               strerror(errno));
+               warn("Error opening stat file");
                return smprintf(UNKNOWN_STR);
        }
 
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
        fclose(fp);
        perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
+
        return smprintf("%d%%", perc);
 }
 
@@ -194,10 +176,10 @@ disk_free(const char *mountpoint)
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {
-               fprintf(stderr, "Could not get filesystem info: %s\n",
-                                               strerror(errno));
+               warn("Could not get filesystem info");
                return smprintf(UNKNOWN_STR);
        }
+
        return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
 }
 
@@ -208,12 +190,12 @@ disk_perc(const char *mountpoint)
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {
-               fprintf(stderr, "Could not get filesystem info: %s\n",
-                                               strerror(errno));
+               warn("Could not get filesystem info");
                return smprintf(UNKNOWN_STR);
        }
 
        perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
+
        return smprintf("%d%%", perc);
 }
 
@@ -223,8 +205,7 @@ disk_total(const char *mountpoint)
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {
-               fprintf(stderr, "Could not get filesystem info: %s\n",
-                                               strerror(errno));
+               warn("Could not get filesystem info");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -237,8 +218,7 @@ disk_used(const char *mountpoint)
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {
-               fprintf(stderr, "Could not get filesystem info: %s\n",
-                                               strerror(errno));
+               warn("Could not get filesystem info");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -252,21 +232,20 @@ entropy(void)
        FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
 
        if (fp == NULL) {
-               fprintf(stderr, "Could not open entropy file: %s\n",
-                                               strerror(errno));
+               warn("Could not open entropy file");
                return smprintf(UNKNOWN_STR);
        }
 
        fscanf(fp, "%d", &entropy);
        fclose(fp);
+
        return smprintf("%d", entropy);
 }
 
 static char *
 gid(void)
 {
-       gid_t gid = getgid();
-       return smprintf("%d", gid);
+       return smprintf("%d", getgid());
 }
 
 static char *
@@ -276,8 +255,7 @@ hostname(void)
        FILE *fp = fopen("/proc/sys/kernel/hostname", "r");
 
        if (fp == NULL) {
-               fprintf(stderr, "Could not open hostname file: %s\n",
-                                               strerror(errno));
+               warn("Could not open hostname file");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -286,6 +264,7 @@ hostname(void)
        memset(&hostname[strlen(hostname)-1], '\0',
                sizeof(hostname) - strlen(hostname));
        fclose(fp);
+
        return smprintf("%s", hostname);
 }
 
@@ -297,12 +276,10 @@ ip(const char *interface)
        char host[NI_MAXHOST];
 
        if (getifaddrs(&ifaddr) == -1) {
-               fprintf(stderr, "Error getting IP address: %s\n",
-                                               strerror(errno));
+               warn("Error getting IP address");
                return smprintf(UNKNOWN_STR);
        }
 
-       /* get the ip address */
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
                if (ifa->ifa_addr == NULL)
                        continue;
@@ -312,14 +289,13 @@ ip(const char *interface)
 
                if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
                        if (s != 0) {
-                               fprintf(stderr, "Error getting IP address.\n");
+                               warnx("Error getting IP address.");
                                return smprintf(UNKNOWN_STR);
                        }
                        return smprintf("%s", host);
                }
        }
 
-       /* free the address */
        freeifaddrs(ifaddr);
 
        return smprintf(UNKNOWN_STR);
@@ -331,7 +307,7 @@ load_avg(void)
        double avgs[3];
 
        if (getloadavg(avgs, 3) < 0) {
-               fprintf(stderr, "Error getting load avg.\n");
+               warnx("Error getting load avg.");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -345,13 +321,13 @@ ram_free(void)
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {
-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
+               warn("Error opening meminfo file");
                return smprintf(UNKNOWN_STR);
        }
 
        fscanf(fp, "MemFree: %ld kB\n", &free);
        fclose(fp);
+
        return smprintf("%f", (float)free / 1024 / 1024);
 }
 
@@ -363,8 +339,7 @@ ram_perc(void)
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {
-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
+               warn("Error opening meminfo file");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -375,6 +350,7 @@ ram_perc(void)
 
        fclose(fp);
        perc = 100 * ((total - free) - (buffers + cached)) / total;
+
        return smprintf("%d%%", perc);
 }
 
@@ -385,13 +361,13 @@ ram_total(void)
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {
-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
+               warn("Error opening meminfo file");
                return smprintf(UNKNOWN_STR);
        }
 
        fscanf(fp, "MemTotal: %ld kB\n", &total);
        fclose(fp);
+
        return smprintf("%f", (float)total / 1024 / 1024);
 }
 
@@ -402,8 +378,7 @@ ram_used(void)
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {
-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
+               warn("Error opening meminfo file");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -414,6 +389,7 @@ ram_used(void)
 
        fclose(fp);
        used = total - free - buffers - cached;
+
        return smprintf("%f", (float)used / 1024 / 1024);
 }
 
@@ -422,11 +398,10 @@ run_command(const char* command)
 {
        int good;
        FILE *fp = popen(command, "r");
-       char buffer[64];
+       char buffer[64] = "";
 
        if (fp == NULL) {
-               fprintf(stderr, "Could not get command output for: %s: %s\n",
-                                               command, strerror(errno));
+               warn("Could not get command output for: %s", command);
                return smprintf(UNKNOWN_STR);
        }
 
@@ -440,6 +415,7 @@ run_command(const char* command)
        }
        if (good)
                buffer[strlen(buffer)-1] = '\0';
+
        return smprintf("%s", buffer);
 }
 
@@ -450,13 +426,13 @@ temp(const char *file)
        FILE *fp = fopen(file, "r");
 
        if (fp == NULL) {
-               fprintf(stderr, "Could not open temperature file: %s\n",
-                                                       strerror(errno));
+               warn("Could not open temperature file");
                return smprintf(UNKNOWN_STR);
        }
 
        fscanf(fp, "%d", &temperature);
        fclose(fp);
+
        return smprintf("%d°C", temperature / 1000);
 }
 
@@ -477,82 +453,55 @@ uptime(void)
 static char *
 username(void)
 {
-       register struct passwd *pw;
-       register uid_t uid;
+       uid_t uid = geteuid();
+       struct passwd *pw = getpwuid(uid);
 
-       uid = geteuid();
-       pw = getpwuid(uid);
-
-       if (pw)
-               return smprintf("%s", pw->pw_name);
-       else {
-               fprintf(stderr, "Could not get username: %s\n",
-                                       strerror(errno));
+       if (pw == NULL) {
+               warn("Could not get username");
                return smprintf(UNKNOWN_STR);
        }
 
-       return smprintf(UNKNOWN_STR);
+       return smprintf("%s", pw->pw_name);
 }
 
 static char *
 uid(void)
 {
-       /* FIXME: WHY USE register modifier? */
-       register uid_t uid;
-
-       uid = geteuid();
-
-       if (uid)
-               return smprintf("%d", uid);
-       else {
-               fprintf(stderr, "Could not get uid.\n");
-               return smprintf(UNKNOWN_STR);
-       }
-
-       return smprintf(UNKNOWN_STR);
+       return smprintf("%d", geteuid());
 }
 
 
-static char *
-vol_perc(const char *soundcard)
-{
-       int mute = 0;
-       long vol = 0, max = 0, min = 0;
+static char * 
+vol_perc(const char *snd_card)
+{ /* FIX THIS SHIT! */
+       long int vol, max, min;
        snd_mixer_t *handle;
-       snd_mixer_elem_t *pcm_mixer, *mas_mixer;
-       snd_mixer_selem_id_t *vol_info, *mute_info;
+       snd_mixer_elem_t *elem;
+       snd_mixer_selem_id_t *s_elem;
 
        snd_mixer_open(&handle, 0);
-       snd_mixer_attach(handle, soundcard);
+       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, ALSA_CHANNEL);
+       elem = snd_mixer_find_selem(handle, s_elem);
 
-       snd_mixer_selem_id_malloc(&vol_info);
-       snd_mixer_selem_id_malloc(&mute_info);
-       if (vol_info == NULL || mute_info == NULL) {
-               fprintf(stderr, "Could not get alsa volume.\n");
+       if (elem == NULL) {
+               snd_mixer_selem_id_free(s_elem);
+               snd_mixer_close(handle);
+               warn("error: ALSA");
                return smprintf(UNKNOWN_STR);
        }
-       snd_mixer_selem_id_set_name(vol_info, ALSA_CHANNEL);
-       snd_mixer_selem_id_set_name(mute_info, ALSA_CHANNEL);
-       pcm_mixer = snd_mixer_find_selem(handle, vol_info);
-       mas_mixer = snd_mixer_find_selem(handle, mute_info);
-
-       snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
-       snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
-       snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
-
-       if (vol_info)
-               snd_mixer_selem_id_free(vol_info);
-       if (mute_info)
-               snd_mixer_selem_id_free(mute_info);
-       if (handle)
-               snd_mixer_close(handle);
 
-       if (!mute)
-               return smprintf("mute");
-       else
-               return smprintf("%d%%", (vol * 100) / max);
+       snd_mixer_handle_events(handle);
+       snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
+       snd_mixer_selem_get_playback_volume(elem, 0, &vol);
+
+       snd_mixer_selem_id_free(s_elem);
+       snd_mixer_close(handle);
+
+       return smprintf("%d", ((uint_fast16_t)(vol * 100) / max));
 }
 
 static char *
@@ -561,18 +510,15 @@ wifi_perc(const char *wificard)
        int strength;
        char buf[255];
        char *datastart;
-       char path[64];
        char status[5];
-       char needle[strlen(wificard)+2];
-       FILE *fp = fopen(path, "r");
+       FILE *fp;
+
+       ccat(3, "/sys/class/net", wificard, "/operstate");
 
-       strlcpy(path, "/sys/class/net/", sizeof(path));
-       strlcat(path, wificard, sizeof(path));
-       strlcat(path, "/operstate", sizeof(path));
+       fp = fopen(concat, "r");
 
        if(fp == NULL) {
-               fprintf(stderr, "Error opening wifi operstate file: %s\n",
-                                                       strerror(errno));
+               warn("Error opening wifi operstate file");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -583,24 +529,23 @@ wifi_perc(const char *wificard)
 
        fp = fopen("/proc/net/wireless", "r");
        if (fp == NULL) {
-               fprintf(stderr, "Error opening wireless file: %s\n",
-                                               strerror(errno));
+               warn("Error opening wireless file");
                return smprintf(UNKNOWN_STR);
        }
 
-       strlcpy(needle, wificard, sizeof(needle));
-       strlcat(needle, ":", sizeof(needle));
+       ccat(2, wificard, ":");
        fgets(buf, sizeof(buf), fp);
        fgets(buf, sizeof(buf), fp);
        fgets(buf, sizeof(buf), fp);
 
-       datastart = strstr(buf, needle);
+       datastart = strstr(buf, concat);
        if (datastart != NULL) {
                datastart = strstr(buf, ":");
                sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &strength);
        }
 
        fclose(fp);
+
        return smprintf("%d%%", strength);
 }
 
@@ -615,14 +560,12 @@ wifi_essid(const char *wificard)
        wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
        sprintf(wreq.ifr_name, wificard);
        if(sockfd == -1) {
-               fprintf(stderr, "Cannot open socket for interface: %s: %s\n",
-                                               wificard, strerror(errno));
+               warn("Cannot open socket for interface: %s", wificard);
                return smprintf(UNKNOWN_STR);
        }
        wreq.u.essid.pointer = id;
        if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
-               fprintf(stderr, "Get ESSID ioctl failed for interface %s: %s\n",
-                                               wificard, strerror(errno));
+               warn("Get ESSID ioctl failed for interface %s", wificard);
                return smprintf(UNKNOWN_STR);
        }
 
@@ -640,11 +583,7 @@ main(void)
        char *res, *element;
        struct arg argument;
 
-       dpy = XOpenDisplay(0x0);
-       if (!dpy) {
-               fprintf(stderr, "Cannot open display!\n");
-               exit(1);
-       }
+       dpy = XOpenDisplay(NULL);
 
        for (;;) {
                memset(status_string, 0, sizeof(status_string));
@@ -657,17 +596,23 @@ main(void)
                        element = smprintf(argument.format, res);
                        if (element == NULL) {
                                element = smprintf(UNKNOWN_STR);
-                               fprintf(stderr, "Failed to format output.\n");
+                               warnx("Failed to format output.");
                        }
                        strlcat(status_string, element, sizeof(status_string));
                        free(res);
                        free(element);
                }
-
-               setstatus(status_string);
-               sleep(UPDATE_INTERVAL -1);
+               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;
 }