From 74799937cf95205c2ff16da9dc7dcaea47ce7116 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 4 Jun 2018 11:30:26 +1000 Subject: Restore focus when unmapping unmanaged xwayland surfaces --- sway/desktop/xwayland.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'sway/desktop/xwayland.c') diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 75bfb7b2..55c42227 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -77,6 +77,18 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) { desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true); wl_list_remove(&surface->link); wl_list_remove(&surface->commit.link); + + if (!wlr_xwayland_surface_is_unmanaged(xsurface)) { + // Restore focus + struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_container *previous = + seat_get_focus_inactive(seat, &root_container); + if (previous) { + // Hack to get seat to re-focus the return value of get_focus + seat_set_focus(seat, previous->parent); + seat_set_focus(seat, previous); + } + } } static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { -- cgit v1.2.3 From 1206a6097711556b22418db5043dc7c22d8b9a3e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 4 Jun 2018 13:31:09 +1000 Subject: Don't restore focus if unmapping surface wasn't focused --- sway/desktop/xwayland.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'sway/desktop/xwayland.c') diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 55c42227..6447b711 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -79,14 +79,17 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) { wl_list_remove(&surface->commit.link); if (!wlr_xwayland_surface_is_unmanaged(xsurface)) { - // Restore focus struct sway_seat *seat = input_manager_current_seat(input_manager); - struct sway_container *previous = - seat_get_focus_inactive(seat, &root_container); - if (previous) { - // Hack to get seat to re-focus the return value of get_focus - seat_set_focus(seat, previous->parent); - seat_set_focus(seat, previous); + if (seat->wlr_seat->keyboard_state.focused_surface == + xsurface->surface) { + // Restore focus + struct sway_container *previous = + seat_get_focus_inactive(seat, &root_container); + if (previous) { + // Hack to get seat to re-focus the return value of get_focus + seat_set_focus(seat, previous->parent); + seat_set_focus(seat, previous); + } } } } -- cgit v1.2.3