X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=dwmblocks.c;h=3af799f751cedaf21970f46ac2456bcb05f0e484;hb=4d92b6ca6caae215a79f00d88404c018b9eac15f;hp=62908daad025a7448b17b9a604b2d5cfe28b20e6;hpb=c97d6d119e83e1fc776fadb185f9d5b2e2fd5b14;p=dwmblocks.git

diff --git a/dwmblocks.c b/dwmblocks.c
index 62908da..3af799f 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -3,49 +3,54 @@
 #include<string.h>
 #include<unistd.h>
 #include<signal.h>
-//#include<X11/Xutil.h>
 #include<X11/Xlib.h>
-//#include <X11/Xatom.h>
 #define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
+#define CMDLENGTH		50
+#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
+
 typedef struct {
+	char* icon;
 	char* command;
 	unsigned int interval;
 	unsigned int signal;
 } Block;
 void sighandler(int num);
+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 termhandler(int signum);
+
 
 #include "blocks.h"
 
 static Display *dpy;
 static int screen;
 static Window root;
-static char statusbar[LENGTH(blocks)][50] = {0};
-static char setrootcmd[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;
-
-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;
-}
-
+static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
+static char statusstr[2][STATUSLENGTH];
+static int statusContinue = 1;
+static void (*writestatus) () = setroot;
 
-void getcmd(char *cmd, char *output)
+//opens process *cmd and stores output in *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);
 	char c;
-	int i = 0;
-	while((c = fgetc(cmdf)) != EOF)
-		output[i++] = c;
+	int i = strlen(block->icon);
+	fgets(output+i, CMDLENGTH-i, cmdf);
+	i = strlen(output);
+	if (delim != '\0' && --i)
+		output[i++] = delim;
 	output[i++] = '\0';
 	pclose(cmdf);
 }
@@ -57,10 +62,11 @@ 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]);
 	}
 }
 
+#ifndef __OpenBSD__
 void getsigcmds(int signal)
 {
 	const Block *current;
@@ -68,7 +74,7 @@ void getsigcmds(int signal)
 	{
 		current = blocks + i;
 		if (current->signal == signal)
-			getcmd(current->command,statusbar[i]);
+			getcmd(current,statusbar[i]);
 	}
 }
 
@@ -81,61 +87,64 @@ void setupsignals()
 	}
 
 }
+#endif
 
-void getstatus(char *str)
+int getstatus(char *str, char *last)
 {
-	int j = 0;//15;
-	for(int i = 0; i < 5; j+=strlen(statusbar[i++]))
-	{	
-		strcpy(str + j, statusbar[i]);
-	}
-	//for (;j < LENGTH(str);j++)
-	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(setrootcmd);
-	replace(setrootcmd,'\n',' ');
-	replace(setrootcmd,EOF,' ');
-	//printf("%s\n",setrootcmd);
-	XStoreName(dpy, root, setrootcmd);
+	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()
+void statusloop()
 {
+#ifndef __OpenBSD__
 	setupsignals();
+#endif
 	int i = 0;
 	getcmds(-1);
 	while(statusContinue)
 	{
 		getcmds(i);
-		setroot();
+		writestatus();
 		sleep(1.0);
 		i++;
 	}
 }
 
-void statusinit()
-{
-	statusloop();
-}
-
-
+#ifndef __OpenBSD__
 void sighandler(int signum)
 {
 	getsigcmds(signum-SIGRTMIN);
-	setroot();
+	writestatus();
 }
+#endif
 
 void termhandler(int signum)
 {
@@ -143,9 +152,16 @@ 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];
+		else if(!strcmp("-p",argv[i]))
+			writestatus = pstdout;
+	}
 	signal(SIGTERM, termhandler);
 	signal(SIGINT, termhandler);
-	statusinit();
+	statusloop();
 }