Changed delimeter to accept multiple characters.

[dwmblocks.git] / dwmblocks.c

diff --git a/dwmblocks.c b/dwmblocks.c
index 88ee9529587d8fca6aff864e2cf82c8fb305b5ef..76e7377a9a84f233e78a69b714305ffa22c7e9f3 100644 (file)
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -7,6 +7,7 @@
 #define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
 
 typedef struct {
+       char* icon;
        char* command;
        unsigned int interval;
        unsigned int signal;
@@ -46,18 +47,29 @@ void replace(char *str, char old, char new)
 }
 
 //opens process *cmd and stores output in *output
-void getcmd(char *cmd, char *output)
+void getcmd(const Block *block, char *output)
 {
+       strcpy(output, block->icon);
+       char *cmd = block->command;
        FILE *cmdf = popen(cmd,"r");
        if (!cmdf)
                return;
-       int N = strlen(output);
+       //int N = strlen(output);
        char c;
-       int i = 0;
+       int sl;
+       int i = sl = strlen(block->icon);
        while((c = fgetc(cmdf)) != EOF)
                output[i++] = c;
-       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)
@@ -67,7 +79,7 @@ void getcmds(int time)
        {       
                current = blocks + i;
                if ((current->interval != 0 && time % current->interval == 0) || time == -1)
-                       getcmd(current->command,statusbar[i]);
+                       getcmd(current,statusbar[i]);
        }
 }
 
@@ -78,7 +90,7 @@ void getsigcmds(int signal)
        {
                current = blocks + i;
                if (current->signal == signal)
-                       getcmd(current->command,statusbar[i]);
+                       getcmd(current,statusbar[i]);
        }
 }
 
@@ -99,7 +111,8 @@ void getstatus(char *str)
        {       
                strcpy(str + j, statusbar[i]);
        }
-       str[j] = '\0';
+       for (int i = 0; delim[i]; i++)
+               str[--j] = '\0';
 
 }
 
@@ -112,8 +125,6 @@ void setroot()
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        getstatus(statusstr);
-       replace(statusstr,'\n',' ');//gets rid of newlines from output
-       replace(statusstr,EOF,' ');//gets rid of EOF from output
        XStoreName(dpy, root, statusstr);
        XCloseDisplay(dpy);
 }
@@ -151,8 +162,13 @@ void termhandler(int signum)
        exit(0);
 }
 
-int main()
+int main(int argc, char** argv)
 {
+       for(int i = 0; i < argc; i++)
+       {       
+               if (!strcmp("-d",argv[i]))
+                       delim = argv[++i];
+       }
        signal(SIGTERM, termhandler);
        signal(SIGINT, termhandler);
        statusinit();