Consolidated X11 based code into the setroot function

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index e3ac034..ef25785 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -3,7 +3,9 @@
 #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
@@ -31,35 +33,41 @@ void getsigcmds(unsigned int signal);
 void setupsignals();
 void sighandler(int signum);
 int getstatus(char *str, char *last);
-void setroot();
 void statusloop();
 void termhandler();
+void pstdout();
+#ifndef NO_X
+void setroot();
+static void (*writestatus) () = setroot;
+#else
+static void (*writestatus) () = pstdout;
+#endif
 
 
 #include "blocks.h"
 
-static Display *dpy;
-static int screen;
-static Window root;
 static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
 static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
-static void (*writestatus) () = setroot;
+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-delimLen, cmdf);
        i = strlen(output);
-       if (delim[0] != '\0' && --i)
-                strncpy(output+i, delim, delimLen); 
+       if (i == 0)//return if block and command output are both empty
+               return;
+       if (delim[0] != '\0') {
+               //only chop off newline if one is present at the end
+               i = output[i-1] == '\n' ? i-1 : i;
+               strncpy(output+i, delim, delimLen); 
+       }
        else
                output[i++] = '\0';
        pclose(cmdf);
@@ -68,7 +76,7 @@ void getcmd(const Block *block, char *output)
 void getcmds(int time)
 {
        const Block* current;
-       for(unsigned 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)
@@ -91,11 +99,11 @@ void setupsignals()
 {
 #ifndef __OpenBSD__
            /* initialize all real time signals with dummy handler */
-    for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+    for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
         signal(i, dummysighandler);
 #endif
 
-       for(unsigned int i = 0; i < LENGTH(blocks); i++)
+       for (unsigned int i = 0; i < LENGTH(blocks); i++)
        {
                if (blocks[i].signal > 0)
                        signal(SIGMINUS+blocks[i].signal, sighandler);
@@ -107,25 +115,33 @@ int getstatus(char *str, char *last)
 {
        strcpy(last, str);
        str[0] = '\0';
-       for(unsigned int i = 0; i < LENGTH(blocks); i++)
+       for (unsigned int i = 0; i < LENGTH(blocks); i++)
                strcat(str, statusbar[i]);
        str[strlen(str)-strlen(delim)] = '\0';
        return strcmp(str, last);//0 if they are the same
 }
 
+#ifndef NO_X
 void setroot()
 {
+       static Display *dpy;
+       static int screen;
+       static Window root;
        if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
                return;
-       Display *d = XOpenDisplay(NULL);
-       if (d) {
-               dpy = d;
+       dpy = XOpenDisplay(NULL);
+       if (!dpy) {
+               fprintf(stderr, "Failed to open display\n");
+               statusContinue = 0;
+               returnStatus = 1;
+               return;
        }
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        XStoreName(dpy, root, statusstr[0]);
        XCloseDisplay(dpy);
 }
+#endif
 
 void pstdout()
 {
@@ -141,12 +157,13 @@ void statusloop()
        setupsignals();
        int i = 0;
        getcmds(-1);
-       while(statusContinue)
+       while (1)
        {
-               getcmds(i);
+               getcmds(i++);
                writestatus();
+               if (!statusContinue)
+                       break;
                sleep(1.0);
-               i++;
        }
 }
 
@@ -171,15 +188,17 @@ void termhandler()
 
 int main(int argc, char** argv)
 {
-       for(int i = 0; i < argc; i++)
+       for (int i = 0; i < argc; i++) //Handle command line arguments
        {
                if (!strcmp("-d",argv[i]))
                        strncpy(delim, argv[++i], delimLen);
-               else if(!strcmp("-p",argv[i]))
+               else if (!strcmp("-p",argv[i]))
                        writestatus = pstdout;
        }
-       delim[MIN(delimLen, strlen(delim))] = '\0';
+       delimLen = MIN(delimLen, strlen(delim));
+       delim[delimLen++] = '\0';
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);
        statusloop();
+       return returnStatus;
 }