mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 08:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't restore focus if unmapping surface wasn't focused

Browse source
This commit is contained in:
Ryan Dwyer 2018-06-04 13:31:09 +10:00
parent bcdb676abb
commit 1206a60977
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/desktop/xwayland.c
View file

@ -79,14 +79,17 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
wl_list_remove(&surface->commit.link); wl_list_remove(&surface->commit.link);
if (!wlr_xwayland_surface_is_unmanaged(xsurface)) { if (!wlr_xwayland_surface_is_unmanaged(xsurface)) {
// Restore focus
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *previous = if (seat->wlr_seat->keyboard_state.focused_surface ==
seat_get_focus_inactive(seat, &root_container); xsurface->surface) {
if (previous) { // Restore focus
// Hack to get seat to re-focus the return value of get_focus struct sway_container *previous =
seat_set_focus(seat, previous->parent); seat_get_focus_inactive(seat, &root_container);
seat_set_focus(seat, previous); 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);
}
} }
} }
} }