From 0f387483fd6b4ce40514578ab008bfabc84b015d Mon Sep 17 00:00:00 2001 From: Taiyu Date: Wed, 12 Aug 2015 20:59:43 -0700 Subject: moving stuff around --- sway/main.c | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index a7814364..7661551d 100644 --- a/sway/main.c +++ b/sway/main.c @@ -12,31 +12,6 @@ int main(int argc, char **argv) { init_log(L_DEBUG); // TODO: Control this with command line arg init_layout(); - static struct wlc_interface interface = { - .output = { - .created = handle_output_created, - .destroyed = handle_output_destroyed, - .resolution = handle_output_resolution_change, - .focus = handle_output_focused - }, - .view = { - .created = handle_view_created, - .destroyed = handle_view_destroyed, - .focus = handle_view_focus, - .request = { - .geometry = handle_view_geometry_request - } - }, - .keyboard = { - .key = handle_key - }, - .pointer = { - .motion = handle_pointer_motion, - .button = handle_pointer_button - } - - }; - setenv("WLC_DIM", "0", 0); if (!wlc_init(&interface, argc, argv)) { return 1; -- cgit v1.2.3 From 5df5b0098971e4d7e278bd7dfc8d5a611a97f467 Mon Sep 17 00:00:00 2001 From: Taiyu Date: Thu, 13 Aug 2015 00:44:56 -0700 Subject: moved signal handling to main --- sway/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index 7661551d..7477b08c 100644 --- a/sway/main.c +++ b/sway/main.c @@ -2,16 +2,23 @@ #include #include #include +#include +#include #include "layout.h" #include "config.h" #include "log.h" #include "handlers.h" +static void sigchld_handle(int signal); int main(int argc, char **argv) { init_log(L_DEBUG); // TODO: Control this with command line arg init_layout(); + /* Signal handling */ + signal(SIGCHLD, sigchld_handle); + + setenv("WLC_DIM", "0", 0); if (!wlc_init(&interface, argc, argv)) { return 1; @@ -25,3 +32,8 @@ int main(int argc, char **argv) { wlc_run(); return 0; } + +static void sigchld_handle(int signal) { + (void) signal; + while (waitpid((pid_t)-1, 0, WNOHANG) > 0); +} -- cgit v1.2.3