added blocks.def.h to act as default blocks file so that changes made in

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index 30712432b175e3246463c0a527f7bb43c4099e33..8668f042d77bea8510570564fe82f78de5bc5463 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;
@@ -12,16 +13,17 @@ typedef struct {
        unsigned int interval;
        unsigned int signal;
 } Block;
+void dummysighandler(int num);
 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 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 +32,10 @@ void termhandler(int signum);
 static Display *dpy;
 static int screen;
 static Window root;
-static char statusbar[LENGTH(blocks)][50] = {0};
+static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
 static char statusstr[2][256];
 static int statusContinue = 1;
-<<<<<<< HEAD
 static void (*writestatus) () = setroot;
-=======
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
-
-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;
-}
 
 //opens process *cmd and stores output in *output
 void getcmd(const Block *block, char *output)
@@ -56,8 +47,8 @@ void getcmd(const Block *block, char *output)
                return;
        char c;
        int i = strlen(block->icon);
-       while((c = fgetc(cmdf)) != EOF)
-               output[i++] = c;
+       fgets(output+i, CMDLENGTH-i, cmdf);
+       i = strlen(output);
        if (delim != '\0' && --i)
                output[i++] = delim;
        output[i++] = '\0';
@@ -68,13 +59,14 @@ void getcmds(int time)
 {
        const Block* current;
        for(int i = 0; i < LENGTH(blocks); i++)
-       {       
+       {
                current = blocks + i;
                if ((current->interval != 0 && time % current->interval == 0) || time == -1)
                        getcmd(current,statusbar[i]);
        }
 }
 
+#ifndef __OpenBSD__
 void getsigcmds(int signal)
 {
        const Block *current;
@@ -88,32 +80,26 @@ void getsigcmds(int signal)
 
 void setupsignals()
 {
+    /* initialize all real time signals with dummy handler */
+    for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+        signal(i, dummysighandler);
+
        for(int i = 0; i < LENGTH(blocks); i++)
-       {         
+       {
                if (blocks[i].signal > 0)
                        signal(SIGRTMIN+blocks[i].signal, sighandler);
        }
 
 }
+#endif
 
 int getstatus(char *str, char *last)
 {
        strcpy(last, str);
-<<<<<<< HEAD
        str[0] = '\0';
        for(int i = 0; i < LENGTH(blocks); i++)
-=======
-       int j = 0;
-       for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
-       {       
                strcat(str, statusbar[i]);
-       }
-<<<<<<< HEAD
        str[strlen(str)-1] = '\0';
-=======
-       str[--j] = '\0';
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
        return strcmp(str, last);//0 if they are the same
 }
 
@@ -142,7 +128,9 @@ void pstdout()
 
 void statusloop()
 {
+#ifndef __OpenBSD__
        setupsignals();
+#endif
        int i = 0;
        getcmds(-1);
        while(statusContinue)
@@ -154,17 +142,21 @@ void statusloop()
        }
 }
 
-void statusinit()
+#ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
 {
-       statusloop();
+    return;
 }
+#endif
 
-
+#ifndef __OpenBSD__
 void sighandler(int signum)
 {
        getsigcmds(signum-SIGRTMIN);
        writestatus();
 }
+#endif
 
 void termhandler(int signum)
 {
@@ -175,7 +167,7 @@ void termhandler(int signum)
 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]))
@@ -183,5 +175,5 @@ int main(int argc, char** argv)
        }
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);
-       statusinit();
+       statusloop();
 }