X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwmblocks.c;h=f7f23cc51080f8f0325105a4ed8319bfdb50e397;hb=09a00ab345f1c1c4bce5496f7c7d054476e35392;hp=76e7377a9a84f233e78a69b714305ffa22c7e9f3;hpb=3da92ebccb863394a3501ce2d9cbe60ad9aafc8c;p=dwmblocks.git

diff --git a/dwmblocks.c b/dwmblocks.c
index 76e7377..f7f23cc 100644
--- 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,22 +51,18 @@ 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);
+	int i = strlen(block->icon);
 	while((c = fgetc(cmdf)) != EOF)
+	{
 		output[i++] = c;
-	pclose(cmdf);
-	if (i == sl) { //return empty string if command has no output
-		output[0] = '\0';
-		return;
+		if(c == '\n')
+			break;
 	}
-	if (delim[0] != '\0' && --i)
-		for (int j = 0; delim[j]; j++)
-			output[i++] = delim[j];
-	else 
-		output[--i] = '\0';
+	if (delim != '\0' && --i)
+		output[i++] = delim;
+	output[i++] = '\0';
+	pclose(cmdf);
 }
 
 void getcmds(int time)
@@ -104,31 +97,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]);
 	}
-	for (int i = 0; delim[i]; 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()
 {
@@ -138,7 +140,7 @@ void statusloop()
 	while(statusContinue)
 	{
 		getcmds(i);
-		setroot();
+		writestatus();
 		sleep(1.0);
 		i++;
 	}
@@ -153,7 +155,7 @@ void statusinit()
 void sighandler(int signum)
 {
 	getsigcmds(signum-SIGRTMIN);
-	setroot();
+	writestatus();
 }
 
 void termhandler(int signum)
@@ -167,7 +169,9 @@ 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);