Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2025-01-14 08:01:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

moved signal handling to main

Browse source
This commit is contained in:
Taiyu 2015-08-13 00:44:56 -07:00
parent f798e9bb0b
commit 5df5b00989
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sway/commands.c
View file

@ -5,7 +5,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/wait.h>
#include <ctype.h> #include <ctype.h>
#include "stringop.h" #include "stringop.h"
#include "layout.h" #include "layout.h"
@ -109,19 +108,7 @@ static bool cmd_bindsym(struct sway_config *config, int argc, char **argv) {
return true; return true;
} }
static void cmd_exec_cleanup(int signal) {
while (waitpid((pid_t)-1, 0, WNOHANG) > 0){};
}
static bool cmd_exec_always(struct sway_config *config, int argc, char **argv) { static bool cmd_exec_always(struct sway_config *config, int argc, char **argv) {
/* setup signal handler to cleanup dead proccesses */
/* TODO: replace this with a function that has constructor attribute? */
static bool cleanup = false;
if (cleanup == false) {
signal(SIGCHLD, cmd_exec_cleanup);
cleanup = true;
}
if (checkarg(argc, "exec_always", EXPECTED_MORE_THEN, 0) == false) { if (checkarg(argc, "exec_always", EXPECTED_MORE_THEN, 0) == false) {
return false; return false;
} }

12
sway/main.c
View file

@ -2,16 +2,23 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <wlc/wlc.h> #include <wlc/wlc.h>
#include <sys/wait.h>
#include <signal.h>
#include "layout.h" #include "layout.h"
#include "config.h" #include "config.h"
#include "log.h" #include "log.h"
#include "handlers.h" #include "handlers.h"
static void sigchld_handle(int signal);
int main(int argc, char **argv) { int main(int argc, char **argv) {
init_log(L_DEBUG); // TODO: Control this with command line arg init_log(L_DEBUG); // TODO: Control this with command line arg
init_layout(); init_layout();
/* Signal handling */
signal(SIGCHLD, sigchld_handle);
setenv("WLC_DIM", "0", 0); setenv("WLC_DIM", "0", 0);
if (!wlc_init(&interface, argc, argv)) { if (!wlc_init(&interface, argc, argv)) {
return 1; return 1;
@ -25,3 +32,8 @@ int main(int argc, char **argv) {
wlc_run(); wlc_run();
return 0; return 0;
} }
static void sigchld_handle(int signal) {
(void) signal;
while (waitpid((pid_t)-1, 0, WNOHANG) > 0);
}