brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: Do not move X11 input focus during grabs

Browse Source 
On X11, the stage itself is backed by an XWindow, and moving the
input focus elsewhere will bypass any Clutter-level grabs.

This effectively allows newly opened windows to steal the focus
from gnome-shell itself, which is clearly undesirable. To prevent
that, only allow moving the X11 focus to a Window when no grab is
in place, just like commit 50e89e376 did for the stage focus.

But particularly the updating of x11_display->focus_xwindow is not
prevented. Since it's more consistent to the MetaDisplay/MetaX11Display
dual focus tracking and across Wayland/X11 backends, ensure the X11
input focus is actually set on the last focus Window after the
grabs are gone and windows became interactable again.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2832>
This commit is contained in:
Carlos Garnacho 2023-02-08 15:25:32 +01:00 committed by Marge Bot
parent df16cb9fb7
commit a68b8e9595
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/events.c
View File

@ -34,6 +34,7 @@
#include "core/display-private.h" #include "core/display-private.h"
#include "core/window-private.h" #include "core/window-private.h"
#include "meta/meta-backend.h" #include "meta/meta-backend.h"
#include "x11/meta-x11-display-private.h"
#ifdef HAVE_NATIVE_BACKEND #ifdef HAVE_NATIVE_BACKEND
#include "backends/native/meta-backend-native.h" #include "backends/native/meta-backend-native.h"
@ -241,6 +242,9 @@ meta_display_handle_event (MetaDisplay *display,
display->grabbed_in_clutter = FALSE; display->grabbed_in_clutter = FALSE;
meta_compositor_grab_end (compositor); meta_compositor_grab_end (compositor);
} }
if (display->x11_display)
meta_x11_display_sync_input_focus (display->x11_display);
} }
device = clutter_event_get_device (event); device = clutter_event_get_device (event);

2
src/x11/meta-x11-display-private.h
View File

@ -278,6 +278,8 @@ void meta_x11_display_set_input_focus (MetaX11Display *x11_display,
gboolean focus_frame, gboolean focus_frame,
uint32_t timestamp); uint32_t timestamp);
void meta_x11_display_sync_input_focus (MetaX11Display *x11_display);
MetaDisplay * meta_x11_display_get_display (MetaX11Display *x11_display); MetaDisplay * meta_x11_display_get_display (MetaX11Display *x11_display);
#endif /* META_X11_DISPLAY_PRIVATE_H */ #endif /* META_X11_DISPLAY_PRIVATE_H */

20
src/x11/meta-x11-display.c
View File

@ -2011,6 +2011,10 @@ meta_x11_display_set_input_focus_internal (MetaX11Display *x11_display,
Window xwindow, Window xwindow,
uint32_t timestamp) uint32_t timestamp)
{ {
if (xwindow != None &&
!meta_display_windows_are_interactable (x11_display->display))
return;
meta_x11_error_trap_push (x11_display); meta_x11_error_trap_push (x11_display);
/* In order for mutter to know that the focus request succeeded, we track /* In order for mutter to know that the focus request succeeded, we track
@ -2083,6 +2087,22 @@ meta_x11_display_set_input_focus_xwindow (MetaX11Display *x11_display,
x11_display->display->last_focus_time = timestamp; x11_display->display->last_focus_time = timestamp;
} }
void
meta_x11_display_sync_input_focus (MetaX11Display *x11_display)
{
guint timestamp;
if (!meta_display_windows_are_interactable (x11_display->display))
return;
meta_x11_error_trap_push (x11_display);
timestamp = meta_display_get_current_time (x11_display->display);
meta_x11_display_set_input_focus_internal (x11_display,
x11_display->focus_xwindow,
timestamp);
meta_x11_error_trap_pop (x11_display);
}
static MetaX11DisplayLogicalMonitorData * static MetaX11DisplayLogicalMonitorData *
get_x11_display_logical_monitor_data (MetaLogicalMonitor *logical_monitor) get_x11_display_logical_monitor_data (MetaLogicalMonitor *logical_monitor)
{ {