X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=dwmblocks.c;h=3e27b0b833c21928304a69b917f13a60dc176dbf;hb=661f3eb4bcdf20dfa97ae58fa8e6f343b07a909e;hp=7d4616d1d2506f3388091e6adaa6ede473218b8f;hpb=06710ebd054f2658f2b46e7c784eea51d58bb72d;p=dwmblocks.git

diff --git a/dwmblocks.c b/dwmblocks.c
index 7d4616d..3e27b0b 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -4,8 +4,16 @@
 #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 STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
 
 typedef struct {
 	char* icon;
@@ -13,15 +21,14 @@ 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 setupsignals();
 void sighandler(int signum);
-#endif
 int getstatus(char *str, char *last);
 void setroot();
 void statusloop();
@@ -34,18 +41,10 @@ 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)
 {
@@ -75,7 +74,6 @@ void getcmds(int time)
 	}
 }
 
-#ifndef __OpenBSD__
 void getsigcmds(int signal)
 {
 	const Block *current;
@@ -89,18 +87,19 @@ void getsigcmds(int signal)
 
 void setupsignals()
 {
-    /* initialize all real time signals with dummy handler */
+#ifndef __OpenBSD__
+	    /* initialize all real time signals with dummy handler */
     for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
         signal(i, dummysighandler);
+#endif
 
 	for(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)
 {
@@ -137,9 +136,7 @@ void pstdout()
 
 void statusloop()
 {
-#ifndef __OpenBSD__
 	setupsignals();
-#endif
 	int i = 0;
 	getcmds(-1);
 	while(statusContinue)
@@ -159,13 +156,11 @@ void dummysighandler(int signum)
 }
 #endif
 
-#ifndef __OpenBSD__
 void sighandler(int signum)
 {
-	getsigcmds(signum-SIGRTMIN);
+	getsigcmds(signum-SIGPLUS);
 	writestatus();
 }
-#endif
 
 void termhandler(int signum)
 {