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

Merge remote-tracking branch 'upstream/master' into master

Browse source
This commit is contained in:
TheAvidDev 2020-09-06 20:09:34 -04:00
commit 5a06810e1e
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sway/desktop/xwayland.c
View file

@ -92,20 +92,15 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
wl_list_remove(&surface->commit.link); wl_list_remove(&surface->commit.link);
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
if (seat->wlr_seat->keyboard_state.focused_surface == if (seat->wlr_seat->keyboard_state.focused_surface == xsurface->surface) {
xsurface->surface) { // This simply returns focus to the parent surface if there's one available.
// This seems to handle JetBrains issues.
// Try to find another unmanaged surface from the same process to pass if (xsurface->parent &&
// focus to. This is necessary because some applications (e.g. Jetbrains wlr_surface_is_xwayland_surface(xsurface->parent->surface)) {
// IDEs) represent their multi-level menus as unmanaged surfaces, and struct wlr_xwayland_surface *next_surface =
// when closing a submenu, the main menu should get input focus. wlr_xwayland_surface_from_wlr_surface(xsurface->parent->surface);
struct sway_xwayland_unmanaged *current; if (wlr_xwayland_or_surface_wants_focus(next_surface)) {
wl_list_for_each(current, &root->xwayland_unmanaged, link) { seat_set_focus_surface(seat, xsurface->parent->surface, false);
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; return;
} }
} }