X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwmblocks.c;h=e3e34a18878b825764c83ebf107ff53165f01302;hb=3d308cafb0f3a56e9247e6a9aaf9da6e279a5bc6;hp=88bdfb0b08f23616f70b6e2b08c643824eeea3a3;hpb=fefab14beea22fa83ddee6b4d196ead0c9a34a28;p=dwmblocks.git

diff --git a/dwmblocks.c b/dwmblocks.c
index 88bdfb0..e3e34a1 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -4,8 +4,17 @@
 #include<unistd.h>
 #include<signal.h>
 #include<X11/Xlib.h>
+#ifdef __OpenBSD__
+#define SIGPLUS			SIGUSR1+1
+#define SIGMINUS		SIGUSR1-1
+#else
+#define SIGPLUS			SIGRTMIN
+#define SIGMINUS		SIGRTMIN
+#endif
 #define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
 #define CMDLENGTH		50
+#define MIN( a, b ) ( ( a < b) ? a : b )
+#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
 
 typedef struct {
 	char* icon;
@@ -13,18 +22,18 @@ typedef struct {
 	unsigned int interval;
 	unsigned int signal;
 } Block;
+#ifndef __OpenBSD__
+void dummysighandler(int num);
+#endif
 void sighandler(int num);
-void replace(char *str, char old, char new);
 void getcmds(int time);
-#ifndef __OpenBSD__
-void getsigcmds(int signal);
+void getsigcmds(unsigned int signal);
 void setupsignals();
 void sighandler(int signum);
-#endif
 int getstatus(char *str, char *last);
 void setroot();
 void statusloop();
-void termhandler(int signum);
+void termhandler();
 
 
 #include "blocks.h"
@@ -33,52 +42,45 @@ static Display *dpy;
 static int screen;
 static Window root;
 static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
-static char statusstr[2][256];
+static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
 static void (*writestatus) () = setroot;
 
-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;
-}
-
 //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");
+	FILE *cmdf = popen(block->command, "r");
 	if (!cmdf)
 		return;
-	char c;
 	int i = strlen(block->icon);
-	fgets(output+i, CMDLENGTH-i, cmdf);
+	fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
 	i = strlen(output);
-	if (delim != '\0' && --i)
-		output[i++] = delim;
-	output[i++] = '\0';
+	if (delim[0] != '\0') {
+		//only chop off newline if one is present at the end
+		i = output[i-1] == '\n' ? i-1 : i;
+		strncpy(output+i, delim, delimLen); 
+	}
+	else
+		output[i++] = '\0';
 	pclose(cmdf);
 }
 
 void getcmds(int time)
 {
 	const Block* current;
-	for(int i = 0; i < LENGTH(blocks); i++)
-	{	
+	for (unsigned int i = 0; i < LENGTH(blocks); i++)
+	{
 		current = blocks + i;
 		if ((current->interval != 0 && time % current->interval == 0) || time == -1)
 			getcmd(current,statusbar[i]);
 	}
 }
 
-#ifndef __OpenBSD__
-void getsigcmds(int signal)
+void getsigcmds(unsigned int signal)
 {
 	const Block *current;
-	for (int i = 0; i < LENGTH(blocks); i++)
+	for (unsigned int i = 0; i < LENGTH(blocks); i++)
 	{
 		current = blocks + i;
 		if (current->signal == signal)
@@ -88,22 +90,27 @@ void getsigcmds(int signal)
 
 void setupsignals()
 {
-	for(int i = 0; i < LENGTH(blocks); i++)
-	{	  
+#ifndef __OpenBSD__
+	    /* initialize all real time signals with dummy handler */
+    for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
+        signal(i, dummysighandler);
+#endif
+
+	for (unsigned int i = 0; i < LENGTH(blocks); i++)
+	{
 		if (blocks[i].signal > 0)
-			signal(SIGRTMIN+blocks[i].signal, sighandler);
+			signal(SIGMINUS+blocks[i].signal, sighandler);
 	}
 
 }
-#endif
 
 int getstatus(char *str, char *last)
 {
 	strcpy(last, str);
 	str[0] = '\0';
-	for(int i = 0; i < LENGTH(blocks); i++)
+	for (unsigned int i = 0; i < LENGTH(blocks); i++)
 		strcat(str, statusbar[i]);
-	str[strlen(str)-1] = '\0';
+	str[strlen(str)-strlen(delim)] = '\0';
 	return strcmp(str, last);//0 if they are the same
 }
 
@@ -132,43 +139,47 @@ void pstdout()
 
 void statusloop()
 {
-#ifndef __OpenBSD__
 	setupsignals();
-#endif
 	int i = 0;
 	getcmds(-1);
-	while(statusContinue)
+	while (statusContinue)
 	{
-		getcmds(i);
+		getcmds(i++);
 		writestatus();
 		sleep(1.0);
-		i++;
 	}
 }
 
 #ifndef __OpenBSD__
+/* this signal handler should do nothing */
+void dummysighandler(int signum)
+{
+    return;
+}
+#endif
+
 void sighandler(int signum)
 {
-	getsigcmds(signum-SIGRTMIN);
+	getsigcmds(signum-SIGPLUS);
 	writestatus();
 }
-#endif
 
-void termhandler(int signum)
+void termhandler()
 {
 	statusContinue = 0;
-	exit(0);
 }
 
 int main(int argc, char** argv)
 {
-	for(int i = 0; i < argc; i++)
-	{	
+	for (int i = 0; i < argc; i++) //Handle command line arguments
+	{
 		if (!strcmp("-d",argv[i]))
-			delim = argv[++i][0];
-		else if(!strcmp("-p",argv[i]))
+			strncpy(delim, argv[++i], delimLen);
+		else if (!strcmp("-p",argv[i]))
 			writestatus = pstdout;
 	}
+	delimLen = MIN(delimLen, strlen(delim));
+	delim[delimLen++] = '\0';
 	signal(SIGTERM, termhandler);
 	signal(SIGINT, termhandler);
 	statusloop();