first status bar updated

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index b3abafb..64da5cb 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -18,7 +18,7 @@ struct arg {
 };
 
 char buf[1024];
-static int done;
+static volatile sig_atomic_t done;
 static Display *dpy;
 
 #include "config.h"
@@ -26,9 +26,8 @@ static Display *dpy;
 static void
 terminate(const int signo)
 {
-       (void)signo;
-
-       done = 1;
+       if (signo != SIGUSR1)
+               done = 1;
 }
 
 static void
@@ -36,13 +35,13 @@ difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
 {
        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) * 1000000000;
+                      (a->tv_nsec < b->tv_nsec) * 1E9;
 }
 
 static void
 usage(void)
 {
-       die("usage: %s [-so]", argv0);
+       die("usage: %s [-s] [-1]", argv0);
 }
 
 int
@@ -51,18 +50,18 @@ main(int argc, char *argv[])
        struct sigaction act;
        struct timespec start, current, diff, intspec, wait;
        size_t i, len;
-       int sflag, oflag, ret;
+       int sflag, ret;
        char status[MAXLEN];
        const char *res;
 
-       sflag = oflag = 0;
+       sflag = 0;
        ARGBEGIN {
+               case '1':
+                       done = 1;
+                       /* fallthrough */
                case 's':
                        sflag = 1;
                        break;
-               case 'o':
-                       oflag = 1;
-                       break;
                default:
                        usage();
        } ARGEND
@@ -75,16 +74,14 @@ main(int argc, char *argv[])
        act.sa_handler = terminate;
        sigaction(SIGINT,  &act, NULL);
        sigaction(SIGTERM, &act, NULL);
-
-       if (sflag) {
-               setbuf(stdout, NULL);
-       }
+       act.sa_flags |= SA_RESTART;
+       sigaction(SIGUSR1, &act, NULL);
 
        if (!sflag && !(dpy = XOpenDisplay(NULL))) {
                die("XOpenDisplay: Failed to open display");
        }
 
-       while (!done) {
+       do {
                if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) {
                        die("clock_gettime:");
                }
@@ -102,18 +99,18 @@ main(int argc, char *argv[])
                }
 
                if (sflag) {
-                       printf("%s\n", status);
+                       puts(status);
+                       fflush(stdout);
+                       if (ferror(stdout))
+                               die("puts:");
                } else {
-                       if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0) {
+                       if (XStoreName(dpy, DefaultRootWindow(dpy), status)
+                            < 0) {
                                die("XStoreName: Allocation failed");
                        }
                        XFlush(dpy);
                }
 
-               if (oflag) {
-                       done = 1;
-               }
-
                if (!done) {
                        if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) {
                                die("clock_gettime:");
@@ -121,7 +118,7 @@ main(int argc, char *argv[])
                        difftimespec(&diff, &current, &start);
 
                        intspec.tv_sec = interval / 1000;
-                       intspec.tv_nsec = (interval % 1000) * 1000000;
+                       intspec.tv_nsec = (interval % 1000) * 1E6;
                        difftimespec(&wait, &intspec, &diff);
 
                        if (wait.tv_sec >= 0) {
@@ -131,7 +128,7 @@ main(int argc, char *argv[])
                                }
                        }
                }
-       }
+       } while (!done);
 
        if (!sflag) {
                XStoreName(dpy, DefaultRootWindow(dpy), NULL);