diff options
| author | aidan <aidan@Edward.localdomain> | 2020-08-12 10:24:42 -0600 |
|---|---|---|
| committer | aidan <aidan@Edward.localdomain> | 2020-08-12 10:24:42 -0600 |
| commit | 5dcb2a0d8413b6e12dfcd188567f95d3832bb2bb (patch) | |
| tree | fdbd9a3e8ddd91f0505a20deb6c401ba56534c49 | |
| parent | 5b9f39d697ce5a0ade037b11dcddd6a37000ef43 (diff) | |
fixed signal handling on OpenBSD by using SIGUSR1 instead of SIGRTMIN.
This should not affect other platforms at all.
| -rw-r--r-- | dwmblocks.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/dwmblocks.c b/dwmblocks.c index 21c1482..3e27b0b 100644 --- a/dwmblocks.c +++ b/dwmblocks.c @@ -4,6 +4,13 @@ #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) @@ -14,14 +21,14 @@ typedef struct { unsigned int interval; unsigned int signal; } Block; +#ifndef __OpenBSD__ void dummysighandler(int num); +#endif 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(); @@ -67,7 +74,6 @@ void getcmds(int time) } } -#ifndef __OpenBSD__ void getsigcmds(int signal) { const Block *current; @@ -81,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) { @@ -129,9 +136,7 @@ void pstdout() void statusloop() { -#ifndef __OpenBSD__ setupsignals(); -#endif int i = 0; getcmds(-1); while(statusContinue) @@ -151,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) { |