Make pulse listener built in

dwmblocks.c

@@ -5,6 +5,7 @@
 #include<signal.h>
 #include <time.h>
 #include <math.h>
+#include <pthread.h>
 #ifndef NO_X
 #include<X11/Xlib.h>
 #endif
@@ -27,6 +28,7 @@ typedef struct {
     unsigned int interval;
     unsigned int signal;
 } Block;
+typedef void(*ThreadCallback)(pthread_t *);
 void getcmd(const Block *block, char *output);
 void getcmds(int time);
 void getsigcmds(unsigned int signal);
@@ -38,7 +40,9 @@ void setupsignals(void);
 int getstatus(char *str, char *last);
 void pstdout(void);
 int gcd(int n1, int n2);
+void startthreads(void);
 void statusloop(void);
+void stopthreads(void);
 void termhandler(void);
 #ifndef NO_X
 void setroot(void);
@@ -57,6 +61,10 @@ static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
 static char statusstr[2][STATUSLENGTH];
 static int statuscontinue = 1;
 
+static pthread_t main_thread;
+static pthread_t threads[LENGTH(thread_callbacks)];
+static int initdone = 0;
+
 //opens process *cmd and stores output in *output
 void getcmd(const Block *block, char *output) {
     strcpy(output, block->icon);
@@ -87,7 +95,7 @@ void getcmds(int time) {
     for (unsigned int i = 0; i < LENGTH(blocks); ++i) {
         current = blocks + i;
         if ((current->interval != 0 && time % current->interval == 0) || time == -1) {
-            getcmd(current,statusbar[i]);
+            getcmd(current, statusbar[i]);
         }
     }
 }
@@ -97,7 +105,7 @@ void getsigcmds(unsigned int signal) {
     for (unsigned int i = 0; i < LENGTH(blocks); ++i) {
         current = blocks + i;
         if (current->signal == signal) {
-            getcmd(current,statusbar[i]);
+            getcmd(current, statusbar[i]);
         }
     }
 }
@@ -141,10 +149,18 @@ int getstatus(char *str, char *last) {
 }
 
 void pstdout() {
-    if (!getstatus(statusstr[0], statusstr[1])) { //Only write out if text has changed.
+    if (!initdone || !getstatus(statusstr[0], statusstr[1])) { //Only write out if text has changed.
         return;
     }
-    printf("%s\n",statusstr[0]);
+    printf("%s\n", statusstr[0]);
+    fflush(stdout);
+}
+
+void somebar_pstdout() {
+    if (!initdone || !getstatus(statusstr[0], statusstr[1])) { //Only write out if text has changed.
+        return;
+    }
+    printf("status %s\n", statusstr[0]);
     fflush(stdout);
 }
 
@@ -158,6 +174,16 @@ int gcd(int n1, int n2) {
 	return n1;
 }
 
+void startthreads() {
+    main_thread = pthread_self();
+    for (int i = 0; i < LENGTH(thread_callbacks); ++i) {
+        pthread_create(&threads[i],
+                       NULL,
+                       (void *(*)(void *)) thread_callbacks[i],
+                       &main_thread);
+    }
+}
+
 void statusloop() {
     setupsignals();
     unsigned int interval = -1;
@@ -166,6 +192,7 @@ void statusloop() {
             interval = gcd(blocks[i].interval, interval);
         }
     }
+    startthreads();
     int i = 0;
     getcmds(-1);
     long nsec_part = interval * 1000000;
@@ -174,6 +201,7 @@ void statusloop() {
     const struct timespec sleeptime = { sec_part, nsec_part };
     struct timespec tosleep = sleeptime;
     while (statuscontinue) {
+        initdone = 1;
         if (nanosleep(&tosleep, &tosleep) < 0) {
             continue;
         }
@@ -183,13 +211,19 @@ void statusloop() {
     }
 }
 
+void stopthreads() {
+    for (int i = 0; i < LENGTH(thread_callbacks); ++i) {
+        pthread_kill(threads[i], SIGTERM);
+    }
+}
+
 void termhandler() {
     statuscontinue = 0;
 }
 
 #ifndef NO_X
 void setroot() {
-    if (!getstatus(statusstr[0], statusstr[1])) { //Only set root if text has changed.
+    if (!initdone || !getstatus(statusstr[0], statusstr[1])) { //Only set root if text has changed.
         return;
     }
     XStoreName(dpy, root, statusstr[0]);
@@ -214,6 +248,8 @@ int main(int argc, char** argv) {
             strncpy(delim, argv[++i], delimLen);
         } else if (strcmp("-p", argv[i]) == 0) {
             writestatus = pstdout;
+        } else if (strcmp("-s", argv[i]) == 0) {
+            writestatus = somebar_pstdout;
         }
     }
 #ifndef NO_X
@@ -229,5 +265,6 @@ int main(int argc, char** argv) {
 #ifndef NO_X
     XCloseDisplay(dpy);
 #endif
+    stopthreads();
     return 0;
 }