alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Re-focus on parent surface if it is available

Browse source 
My primary issue was IntelliJ IDEA's code suggestion pop-up not returning focus
to the active editing window.

I have spent some time looking at the changes of @Xyene (#5398) and
@RyanDwyer (#2103). I think my proposed change maintains the status
quo for the most part whilst fixing my focus issue.

I have verified that @Xyene's fix for IntelliJ sub-menus still works.

I have done basic testing which consists of:

- Chrome
- IntelliJ IDEA 2020.2.1
- VSCode
- Alacritty

It seems to hold up. I at least didn't see any obvious errors.

Relates to #3007
This commit is contained in:
BrassyPanache 2020-08-26 17:33:40 +10:00 committed by Tudor Brindus
parent a543fa35ff
commit 7ca9ef12f8
1 changed files with 9 additions and 14 deletions
Show stats 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;
} }
} }