diff options
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/main.c | 6 | ||||
| -rw-r--r-- | rootston/seat.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/rootston/main.c b/rootston/main.c index 6f4e2612..cc3ffd3e 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -1,6 +1,5 @@ #define _POSIX_C_SOURCE 200112L #include <assert.h> -#include <signal.h> #include <stdlib.h> #include <unistd.h> #include <wayland-server.h> @@ -16,11 +15,6 @@ struct roots_server server = { 0 }; int main(int argc, char **argv) { - if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) { - wlr_log_errno(WLR_ERROR, "Unable to install SIGCHLD handler"); - return 1; - } - wlr_log_init(WLR_DEBUG, NULL); server.config = roots_config_create_from_args(argc, argv); server.wl_display = wl_display_create(); diff --git a/rootston/seat.c b/rootston/seat.c index cae548d3..27363d8e 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -1124,7 +1124,8 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { #ifdef WLR_HAS_XWAYLAND if (view && view->type == ROOTS_XWAYLAND_VIEW && - view->xwayland_surface->override_redirect) { + !wlr_xwayland_or_surface_wants_focus( + view->xwayland_surface)) { return; } #endif |