isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-14 13:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "x11/events: Do not update focus XWindow during grabs"

Browse Source 
This reverts commit 0e6395d932.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2878>
This commit is contained in:
Carlos Garnacho 2023-02-28 17:58:39 +01:00 committed by Marge Bot
parent 7de834b915
commit 92792d6850
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/x11/events.c
View File

@ -1022,9 +1022,6 @@ handle_input_xevent (MetaX11Display *x11_display,
break; break;
case XI_FocusIn: case XI_FocusIn:
case XI_FocusOut: case XI_FocusOut:
if (clutter_stage_get_grab_actor (stage) != NULL)
break;
if (handle_window_focus_event (x11_display, window, enter_event, serial) && if (handle_window_focus_event (x11_display, window, enter_event, serial) &&
enter_event->event == enter_event->root) enter_event->event == enter_event->root)
{ {
@ -1942,8 +1939,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
event->xany.serial > x11_display->focus_serial && event->xany.serial > x11_display->focus_serial &&
display->focus_window && display->focus_window &&
display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 && display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
!window_has_xwindow (display->focus_window, x11_display->server_focus_window) && !window_has_xwindow (display->focus_window, x11_display->server_focus_window))
meta_display_windows_are_interactable (display))
{ {
meta_topic (META_DEBUG_FOCUS, "Earlier attempt to focus %s failed", meta_topic (META_DEBUG_FOCUS, "Earlier attempt to focus %s failed",
display->focus_window->desc); display->focus_window->desc);