diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2023-02-28 17:58:39 +0100 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2023-03-19 23:20:09 +0100 |
| commit | 9ca231abb0d727babd3f2d9a32cab3cd0aa07c56 (patch) | |
| tree | c5bac4f1fff07ff695ebcd5500a4d87a747fd00c | |
| parent | 25b591533117b586777cc0d5023cd9a5b1b9ea4a (diff) | |
| download | mutter-9ca231abb0d727babd3f2d9a32cab3cd0aa07c56.tar.gz | |
Revert "x11/events: Do not update focus XWindow during grabs"
This reverts commit 0e6395d93284422848ca3a5ffb88d48fbce7d471.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2878>
(cherry picked from commit 92792d6850aec1347152d1b0209a233d4af15252)
| -rw-r--r-- | src/x11/events.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/x11/events.c b/src/x11/events.c index 01002dcd9..2c574d575 100644 --- a/src/x11/events.c +++ b/src/x11/events.c @@ -1009,9 +1009,6 @@ handle_input_xevent (MetaX11Display *x11_display, break; case XI_FocusIn: case XI_FocusOut: - if (clutter_stage_get_grab_actor (stage) != NULL) - break; - if (handle_window_focus_event (x11_display, window, enter_event, serial) && enter_event->event == enter_event->root) { @@ -1922,8 +1919,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display, if (x11_display->focused_by_us && event->xany.serial > x11_display->focus_serial && display->focus_window && - !window_has_xwindow (display->focus_window, x11_display->server_focus_window) && - meta_display_windows_are_interactable (display)) + !window_has_xwindow (display->focus_window, x11_display->server_focus_window)) { meta_topic (META_DEBUG_FOCUS, "Earlier attempt to focus %s failed", display->focus_window->desc); |