mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-23 06:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temporary fix of menu dropdown focus in xwayland

Browse source 
Re-use of 7ca9ef12f8.

Co-authored-by: Tuomas Yrjölä <contact@yrhki.com>
Resolves: #6324
See also: #2103, #5398
This commit is contained in:
salkin-mada 2021-10-16 14:47:47 +02:00
parent bb3fd0abc5
commit 31cf437944
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sway/desktop/xwayland.c
View file

@ -111,10 +111,24 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
return;
}
// Try to find another unmanaged surface from the same process to pass
// focus to. This is necessary because some applications (e.g. Jetbrains
// IDEs) represent their multi-level menus as unmanaged surfaces, and
// when closing a submenu, the main menu should get input focus.
struct sway_xwayland_unmanaged *current;
wl_list_for_each(current, &root->xwayland_unmanaged, link) {
struct wlr_xwayland_surface *prev_xsurface =
current->wlr_xwayland_surface;
if (prev_xsurface->pid == xsurface->pid &&
wlr_xwayland_or_surface_wants_focus(prev_xsurface)) {
seat_set_focus_surface(seat, prev_xsurface->surface, false);
return;
}
}
// Restore focus
struct sway_node *previous = seat_get_focus_inactive(seat, &root->node);
if (previous) {
// Hack to get seat to re-focus the return value of get_focus
seat_set_focus(seat, NULL);
seat_set_focus(seat, previous);
}