Reduce refresh time

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index ad8e91cb0f26d865cf87b1c5fd4ccfb22443635b..e6c20dd37d44a682a80cda47c56afd2079abfaae 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -3,9 +3,20 @@
 #include<string.h>
 #include<unistd.h>
 #include<signal.h>
+#ifndef NO_X
 #include<X11/Xlib.h>
+#endif
+#ifdef __OpenBSD__
+#define SIGPLUS                        SIGUSR1+1
+#define SIGMINUS               SIGUSR1-1
+#else
+#define SIGPLUS                        SIGRTMIN
+#define SIGMINUS               SIGRTMIN
+#endif
 #define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
 #define CMDLENGTH              50
+#define MIN( a, b ) ( ( a < b) ? a : b )
+#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
 
 typedef struct {
        char* icon;
@@ -13,70 +24,71 @@ typedef struct {
        unsigned int interval;
        unsigned int signal;
 } Block;
+#ifndef __OpenBSD__
+void dummysighandler(int num);
+#endif
 void sighandler(int num);
-void replace(char *str, char old, char new);
 void getcmds(int time);
-void getsigcmds(int signal);
+void getsigcmds(unsigned int signal);
 void setupsignals();
+void sighandler(int signum);
 int getstatus(char *str, char *last);
-void setroot();
 void statusloop();
-void sighandler(int signum);
-void termhandler(int signum);
-
-
-#include "blocks.h"
-
+void termhandler();
+void pstdout();
+#ifndef NO_X
+void setroot();
+static void (*writestatus) () = setroot;
+static int setupX();
 static Display *dpy;
 static int screen;
 static Window root;
+#else
+static void (*writestatus) () = pstdout;
+#endif
+
+
+#include "config.h"
+
 static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
-static char statusstr[2][256];
+static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
-static void (*writestatus) () = setroot;
-
-void replace(char *str, char old, char new)
-{
-       int N = strlen(str);
-       for(int i = 0; i < N; i++)
-               if(str[i] == old)
-                       str[i] = new;
-}
+static int returnStatus = 0;
 
 //opens process *cmd and stores output in *output
 void getcmd(const Block *block, char *output)
 {
        strcpy(output, block->icon);
-       char *cmd = block->command;
-       FILE *cmdf = popen(cmd,"r");
+       FILE *cmdf = popen(block->command, "r");
        if (!cmdf)
                return;
-       char c;
        int i = strlen(block->icon);
        fgets(output+i, CMDLENGTH-i, cmdf);
        i = strlen(output);
-       if (delim != '\0' && --i)
-               output[i++] = delim;
-       output[i++] = '\0';
+       if (i == 0) {
+               //return if block and command output are both empty
+               pclose(cmdf);
+               return;
+       } else if (output[i-1] == '\n') {
+               output[i-1] = '\0';
+       }
        pclose(cmdf);
 }
 
 void getcmds(int time)
 {
        const Block* current;
-       for(int i = 0; i < LENGTH(blocks); i++)
-       {       
+       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]);
        }
 }
 
-void getsigcmds(int signal)
+void getsigcmds(unsigned int signal)
 {
        const Block *current;
-       for (int i = 0; i < LENGTH(blocks); i++)
-       {
+       for (unsigned int i = 0; i < LENGTH(blocks); i++) {
                current = blocks + i;
                if (current->signal == signal)
                        getcmd(current,statusbar[i]);
@@ -85,10 +97,15 @@ void getsigcmds(int signal)
 
 void setupsignals()
 {
-       for(int i = 0; i < LENGTH(blocks); i++)
-       {         
+#ifndef __OpenBSD__
+           /* initialize all real time signals with dummy handler */
+    for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
+        signal(i, dummysighandler);
+#endif
+
+       for (unsigned int i = 0; i < LENGTH(blocks); i++) {
                if (blocks[i].signal > 0)
-                       signal(SIGRTMIN+blocks[i].signal, sighandler);
+                       signal(SIGMINUS+blocks[i].signal, sighandler);
        }
 
 }
@@ -97,25 +114,33 @@ int getstatus(char *str, char *last)
 {
        strcpy(last, str);
        str[0] = '\0';
-       for(int i = 0; i < LENGTH(blocks); i++)
+       for (unsigned int i = 0; i < LENGTH(blocks); i++)
                strcat(str, statusbar[i]);
-       str[strlen(str)-1] = '\0';
+       str[strlen(str)] = '\0';
        return strcmp(str, last);//0 if they are the same
 }
 
+#ifndef NO_X
 void setroot()
 {
        if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
                return;
-       Display *d = XOpenDisplay(NULL);
-       if (d) {
-               dpy = d;
+       XStoreName(dpy, root, statusstr[0]);
+       XFlush(dpy);
+}
+
+int setupX()
+{
+       dpy = XOpenDisplay(NULL);
+       if (!dpy) {
+               fprintf(stderr, "dwmblocks: Failed to open display\n");
+               return 0;
        }
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
-       XStoreName(dpy, root, statusstr[0]);
-       XCloseDisplay(dpy);
+       return 1;
 }
+#endif
 
 void pstdout()
 {
@@ -131,38 +156,49 @@ void statusloop()
        setupsignals();
        int i = 0;
        getcmds(-1);
-       while(statusContinue)
-       {
-               getcmds(i);
+       while (1) {
+               getcmds(i++);
                writestatus();
+               if (!statusContinue)
+                       break;
                sleep(1.0);
-               i++;
        }
 }
 
+#ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
+{
+    return;
+}
+#endif
 
 void sighandler(int signum)
 {
-       getsigcmds(signum-SIGRTMIN);
+       getsigcmds(signum-SIGPLUS);
        writestatus();
 }
 
-void termhandler(int signum)
+void termhandler()
 {
        statusContinue = 0;
-       exit(0);
 }
 
 int main(int argc, char** argv)
 {
-       for(int i = 0; i < argc; i++)
-       {       
-               if (!strcmp("-d",argv[i]))
-                       delim = argv[++i][0];
-               else if(!strcmp("-p",argv[i]))
+       for (int i = 0; i < argc; i++) {//Handle command line arguments
+               if (!strcmp("-p",argv[i]))
                        writestatus = pstdout;
        }
+#ifndef NO_X
+       if (!setupX())
+               return 1;
+#endif
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);
        statusloop();
+#ifndef NO_X
+       XCloseDisplay(dpy);
+#endif
+       return 0;
 }