Fixed garbled last commit

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index 2db3489144bb57c5bccb6e96d53113ac6c3e5db4..395b5654aa80d70b848b26214857bd353067e43d 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -17,7 +17,7 @@ void replace(char *str, char old, char new);
 void getcmds(int time);
 void getsigcmds(int signal);
 void setupsignals();
-void getstatus(char *str);
+int getstatus(char *str, char *last);
 void setroot();
 void statusloop();
 void statusinit();
@@ -31,12 +31,9 @@ static Display *dpy;
 static int screen;
 static Window root;
 static char statusbar[LENGTH(blocks)][50] = {0};
-static char statusstr[256];
-static char *statuscat;
-static const char *volupcmd[]  = { "volup", NULL };
-static const char *voldowncmd[]  = { "voldown", NULL };
-static const char *volmutecmd[]  = { "volmute", NULL };
-static int statusContinue = 1,volmuted = 0;
+static char statusstr[2][256];
+static int statusContinue = 1;
+static void (*writestatus) () = setroot;
 
 void replace(char *str, char old, char new)
 {
@@ -54,7 +51,6 @@ void getcmd(const Block *block, char *output)
        FILE *cmdf = popen(cmd,"r");
        if (!cmdf)
                return;
-       //int N = strlen(output);
        char c;
        int i = strlen(block->icon);
        while((c = fgetc(cmdf)) != EOF)
@@ -97,30 +93,40 @@ void setupsignals()
 
 }
 
-void getstatus(char *str)
+int getstatus(char *str, char *last)
 {
-       int j = 0;
-       for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
+       strcpy(last, str);
+       str[0] = '\0';
+       for(int i = 0; i < LENGTH(blocks); i++)
        {       
-               strcpy(str + j, statusbar[i]);
+               strcat(str, statusbar[i]);
        }
-       str[--j] = '\0';
-
+       str[strlen(str)-1] = '\0';
+       return strcmp(str, last);//0 if they are the same
 }
 
 void setroot()
 {
+       if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
+               return;
        Display *d = XOpenDisplay(NULL);
        if (d) {
                dpy = d;
        }
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
-       getstatus(statusstr);
-       XStoreName(dpy, root, statusstr);
+       XStoreName(dpy, root, statusstr[0]);
        XCloseDisplay(dpy);
 }
 
+void pstdout()
+{
+       if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed.
+               return;
+       printf("%s\n",statusstr[0]);
+       fflush(stdout);
+}
+
 
 void statusloop()
 {
@@ -130,7 +136,7 @@ void statusloop()
        while(statusContinue)
        {
                getcmds(i);
-               setroot();
+               writestatus();
                sleep(1.0);
                i++;
        }
@@ -145,7 +151,7 @@ void statusinit()
 void sighandler(int signum)
 {
        getsigcmds(signum-SIGRTMIN);
-       setroot();
+       writestatus();
 }
 
 void termhandler(int signum)
@@ -160,6 +166,8 @@ int main(int argc, char** argv)
        {       
                if (!strcmp("-d",argv[i]))
                        delim = argv[++i][0];
+               else if(!strcmp("-p",argv[i]))
+                       writestatus = pstdout;
        }
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);