isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-17 05:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Avoid checks for no_focus_window

Browse Source 
This window is set as the key focus in the MetaX11Display when the
MetaDisplay focus is NULL, we can check for that directly instead of
its aftereffects.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3269>
This commit is contained in:
Carlos Garnacho 2023-09-05 14:16:03 +02:00 committed by Georges Basile Stavracas Neto
parent 7fbc0ccc01
commit 4081d409c6
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/display.c
View File

@ -1492,17 +1492,10 @@ meta_display_sync_wayland_input_focus (MetaDisplay *display)
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
MetaWaylandCompositor *compositor = wayland_compositor_from_display (display); MetaWaylandCompositor *compositor = wayland_compositor_from_display (display);
MetaWindow *focus_window = NULL; MetaWindow *focus_window = NULL;
gboolean is_no_focus_xwindow = FALSE;
#ifdef HAVE_X11_CLIENT
if (display->x11_display)
is_no_focus_xwindow = meta_x11_display_xwindow_is_a_no_focus_window (display->x11_display,
display->x11_display->focus_xwindow);
#endif
if (!meta_display_windows_are_interactable (display)) if (!meta_display_windows_are_interactable (display))
focus_window = NULL; focus_window = NULL;
else if (is_no_focus_xwindow) else if (!display->focus_window)
focus_window = NULL; focus_window = NULL;
else if (display->focus_window && else if (display->focus_window &&
meta_window_get_wayland_surface (display->focus_window)) meta_window_get_wayland_surface (display->focus_window))