merged with master
This commit is contained in:
11
dwmblocks.c
11
dwmblocks.c
@@ -114,6 +114,10 @@ void getsigcmds(int signal)
|
||||
void setupsignals()
|
||||
{
|
||||
struct sigaction sa;
|
||||
|
||||
for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
|
||||
signal(i, SIG_IGN);
|
||||
|
||||
for(int i = 0; i < LENGTH(blocks); i++)
|
||||
{
|
||||
if (blocks[i].signal > 0)
|
||||
@@ -210,6 +214,7 @@ void sighandler(int signum)
|
||||
void buttonhandler(int sig, siginfo_t *si, void *ucontext)
|
||||
{
|
||||
char button[2] = {'0' + si->si_value.sival_int & 0xff, '\0'};
|
||||
pid_t process_id = getpid();
|
||||
sig = si->si_value.sival_int >> 8;
|
||||
if (fork() == 0)
|
||||
{
|
||||
@@ -220,14 +225,14 @@ void buttonhandler(int sig, siginfo_t *si, void *ucontext)
|
||||
if (current->signal == sig)
|
||||
break;
|
||||
}
|
||||
char *command[] = { "/bin/sh", "-c", current->command, NULL };
|
||||
char shcmd[1024];
|
||||
sprintf(shcmd,"%s && kill -%d %d",current->command, current->signal+34,process_id);
|
||||
char *command[] = { "/bin/sh", "-c", shcmd, NULL };
|
||||
setenv("BLOCK_BUTTON", button, 1);
|
||||
setsid();
|
||||
execvp(command[0], command);
|
||||
exit(EXIT_SUCCESS);
|
||||
}
|
||||
getsigcmds(sig);
|
||||
writestatus();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user