X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=dwmblocks.c;h=71760aa8f9aa2b1551915f3e22ef2471a625e5ad;hb=5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48;hp=5569531b6de43d67d8bc838d6184aa22819e2128;hpb=5ba902a6663dd298f2967fc7e9d691528c0d9ecd;p=dwmblocks.git

diff --git a/dwmblocks.c b/dwmblocks.c
index 5569531..71760aa 100644
--- 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;
@@ -16,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();
@@ -30,12 +31,8 @@ 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;
 
 void replace(char *str, char old, char new)
 {
@@ -46,16 +43,20 @@ 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 i = strlen(block->icon);
 	while((c = fgetc(cmdf)) != EOF)
 		output[i++] = c;
+	if (delim != '\0' && --i)
+		output[i++] = delim;
 	output[i++] = '\0';
 	pclose(cmdf);
 }
@@ -67,7 +68,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 +79,7 @@ void getsigcmds(int signal)
 	{
 		current = blocks + i;
 		if (current->signal == signal)
-			getcmd(current->command,statusbar[i]);
+			getcmd(current,statusbar[i]);
 	}
 }
 
@@ -92,29 +93,29 @@ void setupsignals()
 
 }
 
-void getstatus(char *str)
+int getstatus(char *str, char *last)
 {
+	strcpy(last, str);
 	int j = 0;
-	for(int i = 0; i < 5; j+=strlen(statusbar[i++]))
+	for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
 	{	
 		strcpy(str + j, statusbar[i]);
 	}
-	str[j] = '\0';
-
+	str[--j] = '\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);
-	replace(statusstr,'\n',' ');//gets rid of newlines from output
-	replace(statusstr,EOF,' ');//gets rid of EOF from output
-	XStoreName(dpy, root, statusstr);
+	XStoreName(dpy, root, statusstr[0]);
 	XCloseDisplay(dpy);
 }
 
@@ -151,8 +152,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][0];
+	}
 	signal(SIGTERM, termhandler);
 	signal(SIGINT, termhandler);
 	statusinit();