X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwmblocks.c;h=ad8e91cb0f26d865cf87b1c5fd4ccfb22443635b;hb=3906995607d60e2721a03db78d4f3f4b63cd6afb;hp=2db3489144bb57c5bccb6e96d53113ac6c3e5db4;hpb=690475e1e52be120e49f053982249be5ccc59177;p=dwmblocks.git

diff --git a/dwmblocks.c b/dwmblocks.c
index 2db3489..ad8e91c 100644
--- 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;
@@ -17,10 +18,9 @@ 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();
 void sighandler(int signum);
 void termhandler(int signum);
 
@@ -30,13 +30,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;
+static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
+static char statusstr[2][256];
+static int statusContinue = 1;
+static void (*writestatus) () = setroot;
 
 void replace(char *str, char old, char new)
 {
@@ -54,11 +51,10 @@ void getcmd(const Block *block, char *output)
 	FILE *cmdf = popen(cmd,"r");
 	if (!cmdf)
 		return;
-	//int N = strlen(output);
 	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';
@@ -97,30 +93,38 @@ 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(str + j, statusbar[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()
 {
@@ -130,22 +134,17 @@ void statusloop()
 	while(statusContinue)
 	{
 		getcmds(i);
-		setroot();
+		writestatus();
 		sleep(1.0);
 		i++;
 	}
 }
 
-void statusinit()
-{
-	statusloop();
-}
-
 
 void sighandler(int signum)
 {
 	getsigcmds(signum-SIGRTMIN);
-	setroot();
+	writestatus();
 }
 
 void termhandler(int signum)
@@ -160,8 +159,10 @@ int main(int argc, char** argv)
 	{	
 		if (!strcmp("-d",argv[i]))
 			delim = argv[++i][0];
+		else if(!strcmp("-p",argv[i]))
+			writestatus = pstdout;
 	}
 	signal(SIGTERM, termhandler);
 	signal(SIGINT, termhandler);
-	statusinit();
+	statusloop();
 }