vtimofei
/
dwmblocks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed signal handling on OpenBSD by using SIGUSR1 instead of SIGRTMIN. 

This should not affect other platforms at all.
This commit is contained in:
aidan 2020-08-12 10:24:42 -06:00
parent 5b9f39d697
commit 5dcb2a0d84
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dwmblocks.c
View File

@ -4,6 +4,13 @@
#include<unistd.h> #include<unistd.h>
#include<signal.h> #include<signal.h>
#include<X11/Xlib.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 LENGTH(X) (sizeof(X) / sizeof (X[0]))
#define CMDLENGTH 50 #define CMDLENGTH 50
#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1) #define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
@ -14,14 +21,14 @@ typedef struct {
unsigned int interval; unsigned int interval;
unsigned int signal; unsigned int signal;
} Block; } Block;
#ifndef __OpenBSD__
void dummysighandler(int num); void dummysighandler(int num);
#endif
void sighandler(int num); void sighandler(int num);
void getcmds(int time); void getcmds(int time);
#ifndef __OpenBSD__
void getsigcmds(int signal); void getsigcmds(int signal);
void setupsignals(); void setupsignals();
void sighandler(int signum); void sighandler(int signum);
#endif
int getstatus(char *str, char *last); int getstatus(char *str, char *last);
void setroot(); void setroot();
void statusloop(); void statusloop();
@ -67,7 +74,6 @@ void getcmds(int time)
} }
} }
#ifndef __OpenBSD__
void getsigcmds(int signal) void getsigcmds(int signal)
{ {
const Block *current; const Block *current;
@ -81,18 +87,19 @@ void getsigcmds(int signal)
void setupsignals() void setupsignals()
{ {
#ifndef __OpenBSD__
/* initialize all real time signals with dummy handler */ /* initialize all real time signals with dummy handler */
for(int i = SIGRTMIN; i <= SIGRTMAX; i++) for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
signal(i, dummysighandler); signal(i, dummysighandler);
#endif
for(int i = 0; i < LENGTH(blocks); i++) for(int i = 0; i < LENGTH(blocks); i++)
{ {
if (blocks[i].signal > 0) if (blocks[i].signal > 0)
signal(SIGRTMIN+blocks[i].signal, sighandler); signal(SIGMINUS+blocks[i].signal, sighandler);
} }
} }
#endif
int getstatus(char *str, char *last) int getstatus(char *str, char *last)
{ {
@ -129,9 +136,7 @@ void pstdout()
void statusloop() void statusloop()
{ {
#ifndef __OpenBSD__
setupsignals(); setupsignals();
#endif
int i = 0; int i = 0;
getcmds(-1); getcmds(-1);
while(statusContinue) while(statusContinue)
@ -151,13 +156,11 @@ void dummysighandler(int signum)
} }
#endif #endif
#ifndef __OpenBSD__
void sighandler(int signum) void sighandler(int signum)
{ {
getsigcmds(signum-SIGRTMIN); getsigcmds(signum-SIGPLUS);
writestatus(); writestatus();
} }
#endif
void termhandler(int signum) void termhandler(int signum)
{ {