From 3bbff537d9f95ba2f7fe328bcf3bd2c1d9de5900 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Fri, 10 Mar 2023 21:34:05 +0100 Subject: [PATCH] Revert "workspace: Focus the default window only if no window is focused" This reverts commit 058981dc12b294b84040147eab247ac72da3011c. Part-of: --- src/core/workspace.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/core/workspace.c b/src/core/workspace.c index 6b668ff9a..75915a9e6 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -1339,40 +1339,15 @@ meta_workspace_get_name (MetaWorkspace *workspace) return meta_prefs_get_workspace_name (meta_workspace_index (workspace)); } -static MetaWindow * -get_focused_workspace_window (MetaWorkspace *workspace) -{ - g_autoptr (GList) windows = NULL; - GList *l; - - windows = meta_workspace_list_windows (workspace); - - for (l = windows; l != NULL; l = l->next) - { - MetaWindow *window = l->data; - - if (meta_window_has_focus (window)) - return window; - } - - return NULL; -} - void meta_workspace_focus_default_window (MetaWorkspace *workspace, MetaWindow *not_this_one, guint32 timestamp) { - MetaWindow *focus; - if (timestamp == META_CURRENT_TIME) meta_warning ("META_CURRENT_TIME used to choose focus window; " "focus window may not be correct."); - focus = get_focused_workspace_window (workspace); - if (focus != NULL && focus != not_this_one) - return; - if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK || !workspace->display->mouse_mode) {