first status bar updated

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 7af2f04..64da5cb 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,334 +1,141 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-
-#include <alsa/asoundlib.h>
-#include <stdarg.h>
+#include <errno.h>
+#include <signal.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

-#include <unistd.h>

 #include <X11/Xlib.h>
 
 #include <X11/Xlib.h>
 

-#include "config.h"
-
-char *smprintf(char *fmt, ...);
+#include "arg.h"
+#include "slstatus.h"
+#include "util.h"

 
 

-void setstatus(char *str);
-
-char *wifi_signal();
-char *battery();
-char *cpu_usage();
-char *cpu_temperature();
-char *ram_usage();
-char *volume();
-char *datetime();
+struct arg {
+       const char *(*func)();
+       const char *fmt;
+       const char *args;
+};

 
 

+char buf[1024];
+static volatile sig_atomic_t done;

 static Display *dpy;
 
 static Display *dpy;
 

-/* smprintf function */
-char *
-smprintf(char *fmt, ...)
-{
-       va_list fmtargs;
-       char *ret;
-       int len;
-
-       va_start(fmtargs, fmt);
-       len = vsnprintf(NULL, 0, fmt, fmtargs);
-       va_end(fmtargs);
-
-       ret = malloc(++len);
-       if (ret == NULL) {
-               fprintf(stderr, "Malloc error.");
-               exit(1);
-       }
-
-       va_start(fmtargs, fmt);
-       vsnprintf(ret, len, fmt, fmtargs);
-       va_end(fmtargs);
-
-       return ret;
-}
+#include "config.h"

 
 

-/* set statusbar (WM_NAME) */
-void
-setstatus(char *str)
+static void
+terminate(const int signo)

 {
 {

-       XStoreName(dpy, DefaultRootWindow(dpy), str);
-       XSync(dpy, False);
+       if (signo != SIGUSR1)
+               done = 1;

 }
 
 }
 

-/* alsa volume percentage */
-char *
-volume()
+static void
+difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)

 {
 {

-        int mute = 0;
-        long vol = 0, max = 0, min = 0;
-        
-        /* get volume from alsa */
-        snd_mixer_t *handle;
-        snd_mixer_elem_t *pcm_mixer, *mas_mixer;
-        snd_mixer_selem_id_t *vol_info, *mute_info;
-        snd_mixer_open(&handle, 0);
-        snd_mixer_attach(handle, soundcard);
-        snd_mixer_selem_register(handle, NULL, NULL);
-        snd_mixer_load(handle);
-        snd_mixer_selem_id_malloc(&vol_info);
-        snd_mixer_selem_id_malloc(&mute_info);
-        snd_mixer_selem_id_set_name(vol_info, channel);
-        snd_mixer_selem_id_set_name(mute_info, 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);
-        
-        /* return the string (mute) */
-        if (!mute)
-            return "mute";
-        else
-            return smprintf("%d%%", (vol * 100) / max);
+       res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec);
+       res->tv_nsec = a->tv_nsec - b->tv_nsec +
+                      (a->tv_nsec < b->tv_nsec) * 1E9;

 }
 
 }
 

-/* cpu temperature */
-char *
-cpu_temperature()
+static void
+usage(void)

 {
 {

-    int temperature;
-    FILE *fp;
-
-    /* open temperature file */
-    if (!(fp = fopen(tempfile, "r"))) {
-        fprintf(stderr, "Could not open temperature file.\n");
-        exit(1);
-    }
-
-    /* extract temperature */
-    fscanf(fp, "%d", &temperature);
-
-    /* close temperature file */
-    fclose(fp);
-
-    /* return temperature in degrees */
-    return smprintf("%d°C", temperature / 1000);
+       die("usage: %s [-s] [-1]", argv0);

 }
 
 }
 

-/* wifi percentage */
-char *
-wifi_signal()
+int
+main(int argc, char *argv[])

 {
 {

-    int bufsize = 255;
-       int strength;
-       char buf[bufsize];
-       char *datastart;
-    char path_start[16] = "/sys/class/net/";
-    char path_end[11] = "/operstate";
-    char path[32];
-    char status[5];
-       FILE *fp;
-
-    /* generate the path name */
-    strcat(path, path_start);
-    strcat(path, wificard);
-    strcat(path, path_end);
-
-    /* open wifi file */
-    if(!(fp = fopen(path, "r"))) {
-        fprintf(stderr, "Error opening wifi operstate file.");
-        exit(1);
-    }
-
-    /* read the status */
-    fgets(status, 5, fp);
-
-    /* close wifi file */
-    fclose(fp);
-
-    /* check if interface down */
-    if(strcmp(status, "up\n") != 0){
-        return "n/a";
-    }
-
-    /* open wifi file */
-    if (!(fp = fopen("/proc/net/wireless", "r"))) {
-        fprintf(stderr, "Error opening wireless file.");
-        exit(1);
-    }
-
-    /* extract the signal strength */
-       fgets(buf, bufsize, fp);
-       fgets(buf, bufsize, fp);
-       fgets(buf, bufsize, fp);
-       if ((datastart = strstr(buf, "wlp3s0:")) != NULL) {
-               datastart = strstr(buf, ":");
-               sscanf(datastart + 1, " %*d   %d  %*d  %*d        %*d      %*d      %*d      %*d      %*d        %*d",
-                  &strength);
+       struct sigaction act;
+       struct timespec start, current, diff, intspec, wait;
+       size_t i, len;
+       int sflag, ret;
+       char status[MAXLEN];
+       const char *res;
+
+       sflag = 0;
+       ARGBEGIN {
+               case '1':
+                       done = 1;
+                       /* fallthrough */
+               case 's':
+                       sflag = 1;
+                       break;
+               default:
+                       usage();
+       } ARGEND
+
+       if (argc) {
+               usage();

        }
 
        }
 

-    /* close wifi file */
-       fclose(fp);
-
-    /* return strength in percent */
-    return smprintf("%d%%", strength);
-}
-
-/* battery percentage */
-char *
-battery()
-{
-       int batt_now, batt_full, batt_perc;
-       FILE *fp;
-
-    /* open battery now file */
-       if (!(fp = fopen(batterynowfile, "r"))) {
-        fprintf(stderr, "Error opening battery file.");
-        exit(1);
-    }
-
-    /* read value */
-       fscanf(fp, "%i", &batt_now);
-
-    /* close battery now file */
-       fclose(fp);
-       
-    /* open battery full file */
-       if (!(fp = fopen(batteryfullfile, "r"))) {
-        fprintf(stderr, "Error opening battery file.");
-        exit(1);
-    }
-
-    /* read value */
-       fscanf(fp, "%i", &batt_full);
-
-    /* close battery full file */
-       fclose(fp);
+       memset(&act, 0, sizeof(act));
+       act.sa_handler = terminate;
+       sigaction(SIGINT,  &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
+       act.sa_flags |= SA_RESTART;
+       sigaction(SIGUSR1, &act, NULL);

 
 

-    /* calculate percent */
-       batt_perc = batt_now / (batt_full / 100);
-
-    /* return batt_perc as string */
-       return smprintf("%d%%", batt_perc);
-}
-
-/* date and time */
-char *
-datetime()
-{
-       time_t tm;
-       size_t bufsize = 19;
-       char *buf = malloc(bufsize);
-
-    /* get time in format */
-       time(&tm);
-       if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
-               fprintf(stderr, "Strftime failed.\n");
-               exit(1);
+       if (!sflag && !(dpy = XOpenDisplay(NULL))) {
+               die("XOpenDisplay: Failed to open display");

        }
 
        }
 

-    /* return time */
-       return buf;
-}
-
-/* cpu percentage */
-char *
-cpu_usage()
-{
-    int cpu_perc;
-    long double a[4], b[4];
-    FILE *fp;
-
-    /* open stat file */
-       if (!(fp = fopen("/proc/stat","r"))) {
-        fprintf(stderr, "Error opening stat file.");
-        exit(1);
-    }
-
-    /* read values */
-    fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
-
-    /* close stat file */
-    fclose(fp);
-
-    /* wait a second (for avg values) */
-    sleep(1);
-
-    /* open stat file */
-       if (!(fp = fopen("/proc/stat","r"))) {
-        fprintf(stderr, "Error opening stat file.");
-        exit(1);
-    }
-
-    /* read values */
-    fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
-
-    /* close stat file */
-    fclose(fp);
-
-    /* calculate avg in this second */
-    cpu_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 cpu_perc as string */
-    return smprintf("%d%%", cpu_perc);
-}
-
-/* ram percentage */
-char *
-ram_usage()
-{
-    int ram_perc;
-    long total, free, available;
-    FILE *fp;
-
-    /* open meminfo file */
-       if (!(fp = fopen("/proc/meminfo", "r"))) {
-        fprintf(stderr, "Error opening meminfo file.");
-        exit(1);
-    }
-
-    /* read the values */
-    fscanf(fp, "MemTotal: %ld kB\n", &total);
-    fscanf(fp, "MemFree: %ld kB\n", &free);
-    fscanf(fp, "MemAvailable: %ld kB\n", &available);
-
-    /* close meminfo file */
-    fclose(fp);
-
-    /* calculate percentage */
-    ram_perc = 100 * (total - available) / total;
-
-    /* return ram_perc as string */
-    return smprintf("%d%%",ram_perc);
-}
-
-int
-main()
-{
-    char status[1024];
-
-    /* open display */
-    if (!(dpy = XOpenDisplay(0x0))) {
-        fprintf(stderr, "Cannot open display!\n");
-        exit(1);
-    }
-
-    /* return status every second */   
-       for (;;) {
-               sprintf(status, FORMATSTRING, ARGUMENTS);
-               setstatus(status);
+       do {
+               if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) {
+                       die("clock_gettime:");
+               }
+
+               status[0] = '\0';
+               for (i = len = 0; i < LEN(args); i++) {
+                       if (!(res = args[i].func(args[i].args))) {
+                               res = unknown_str;
+                       }
+                       if ((ret = esnprintf(status + len, sizeof(status) - len,
+                                           args[i].fmt, res)) < 0) {
+                               break;
+                       }
+                       len += ret;
+               }
+
+               if (sflag) {
+                       puts(status);
+                       fflush(stdout);
+                       if (ferror(stdout))
+                               die("puts:");
+               } else {
+                       if (XStoreName(dpy, DefaultRootWindow(dpy), status)
+                            < 0) {
+                               die("XStoreName: Allocation failed");
+                       }
+                       XFlush(dpy);
+               }
+
+               if (!done) {
+                       if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) {
+                               die("clock_gettime:");
+                       }
+                       difftimespec(&diff, &current, &start);
+
+                       intspec.tv_sec = interval / 1000;
+                       intspec.tv_nsec = (interval % 1000) * 1E6;
+                       difftimespec(&wait, &intspec, &diff);
+
+                       if (wait.tv_sec >= 0) {
+                               if (nanosleep(&wait, NULL) < 0 &&
+                                   errno != EINTR) {
+                                       die("nanosleep:");
+                               }
+                       }
+               }
+       } while (!done);
+
+       if (!sflag) {
+               XStoreName(dpy, DefaultRootWindow(dpy), NULL);
+               if (XCloseDisplay(dpy) < 0) {
+                       die("XCloseDisplay: Failed to close display");
+               }

        }
 
        }
 

-    /* close display */
-    XCloseDisplay(dpy);
-
-    /* exit successfully */

        return 0;
 }
        return 0;
 }