Change `cp`/`chmod` to `install`

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index 76e7377a9a84f233e78a69b714305ffa22c7e9f3..2f3b774664cfca6eac7e016b946b1eed3088f9cf 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -5,6 +5,7 @@
 #include<signal.h>
 #include<X11/Xlib.h>
 #define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
+#define CMDLENGTH              50
 
 typedef struct {
        char* icon;
@@ -13,15 +14,15 @@ typedef struct {
        unsigned int signal;
 } Block;
 void sighandler(int num);
-void replace(char *str, char old, char new);
 void getcmds(int time);
+#ifndef __OpenBSD__
 void getsigcmds(int signal);
 void setupsignals();
-void getstatus(char *str);
+void sighandler(int signum);
+#endif
+int getstatus(char *str, char *last);
 void setroot();
 void statusloop();
-void statusinit();
-void sighandler(int signum);
 void termhandler(int signum);
 
 
@@ -30,21 +31,10 @@ void termhandler(int signum);
 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;
-
-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 char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
+static char statusstr[2][256];
+static int statusContinue = 1;
+static void (*writestatus) () = setroot;
 
 //opens process *cmd and stores output in *output
 void getcmd(const Block *block, char *output)
@@ -54,22 +44,14 @@ void getcmd(const Block *block, char *output)
        FILE *cmdf = popen(cmd,"r");
        if (!cmdf)
                return;
-       //int N = strlen(output);
        char c;
-       int sl;
-       int i = sl = strlen(block->icon);
-       while((c = fgetc(cmdf)) != EOF)
-               output[i++] = 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';
        pclose(cmdf);
-       if (i == sl) { //return empty string if command has no output
-               output[0] = '\0';
-               return;
-       }
-       if (delim[0] != '\0' && --i)
-               for (int j = 0; delim[j]; j++)
-                       output[i++] = delim[j];
-       else 
-               output[--i] = '\0';
 }
 
 void getcmds(int time)
@@ -83,6 +65,7 @@ void getcmds(int time)
        }
 }
 
+#ifndef __OpenBSD__
 void getsigcmds(int signal)
 {
        const Block *current;
@@ -103,58 +86,64 @@ void setupsignals()
        }
 
 }
+#endif
 
-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(str + j, statusbar[i]);
-       }
-       for (int i = 0; delim[i]; i++)
-               str[--j] = '\0';
-
+       strcpy(last, str);
+       str[0] = '\0';
+       for(int i = 0; i < LENGTH(blocks); i++)
+               strcat(str, statusbar[i]);
+       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()
 {
+#ifndef __OpenBSD__
        setupsignals();
+#endif
        int i = 0;
        getcmds(-1);
        while(statusContinue)
        {
                getcmds(i);
-               setroot();
+               writestatus();
                sleep(1.0);
                i++;
        }
 }
 
-void statusinit()
-{
-       statusloop();
-}
-
-
+#ifndef __OpenBSD__
 void sighandler(int signum)
 {
        getsigcmds(signum-SIGRTMIN);
-       setroot();
+       writestatus();
 }
+#endif
 
 void termhandler(int signum)
 {
@@ -167,9 +156,11 @@ int main(int argc, char** argv)
        for(int i = 0; i < argc; i++)
        {       
                if (!strcmp("-d",argv[i]))
-                       delim = argv[++i];
+                       delim = argv[++i][0];
+               else if(!strcmp("-p",argv[i]))
+                       writestatus = pstdout;
        }
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);
-       statusinit();
+       statusloop();
 }