From 4081d409c68aa7ceb52f62d11b620be9fe054616 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 5 Sep 2023 14:16:03 +0200 Subject: [PATCH] core: Avoid checks for no_focus_window 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: --- src/core/display.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/core/display.c b/src/core/display.c index 694e2cd44..92cdddca2 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1492,17 +1492,10 @@ meta_display_sync_wayland_input_focus (MetaDisplay *display) #ifdef HAVE_WAYLAND MetaWaylandCompositor *compositor = wayland_compositor_from_display (display); 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)) focus_window = NULL; - else if (is_no_focus_xwindow) + else if (!display->focus_window) focus_window = NULL; else if (display->focus_window && meta_window_get_wayland_surface (display->focus_window))