shell/app: Do not include OR windows in get_windows()

We started tracking all windows to make sure the assumption that any
window can be match to an app holds. It is not expected however to
ever represent OR windows in the UI, so it seems better to exclude
them from get_windows() instead of expecting everyone to filter the
return value themselves.

(The returned list still includes "uninteresting" windows like attached
dialogs, which can be important for cases like the correct MRU order in
alt-tab)

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5233

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2252>
This commit is contained in:
Florian Müllner 2022-03-20 19:15:58 +01:00 committed by Marge Bot
parent 35120dd69c
commit c02ca54943

View File

@ -422,7 +422,7 @@ shell_app_activate_window (ShellApp *app,
MetaWindow *window, MetaWindow *window,
guint32 timestamp) guint32 timestamp)
{ {
GSList *windows; g_autoptr (GSList) windows = NULL;
if (shell_app_get_state (app) != SHELL_APP_STATE_RUNNING) if (shell_app_get_state (app) != SHELL_APP_STATE_RUNNING)
return; return;
@ -782,11 +782,14 @@ shell_app_compare_windows (gconstpointer a,
* active workspace, then by whether they're visible, and finally * active workspace, then by whether they're visible, and finally
* by the time the user last interacted with them. * by the time the user last interacted with them.
* *
* Returns: (transfer none) (element-type MetaWindow): List of windows * Returns: (transfer container) (element-type MetaWindow): List of windows
*/ */
GSList * GSList *
shell_app_get_windows (ShellApp *app) shell_app_get_windows (ShellApp *app)
{ {
GSList *windows = NULL;
GSList *l;
if (app->running_state == NULL) if (app->running_state == NULL)
return NULL; return NULL;
@ -799,7 +802,11 @@ shell_app_get_windows (ShellApp *app)
app->running_state->window_sort_stale = FALSE; app->running_state->window_sort_stale = FALSE;
} }
return app->running_state->windows; for (l = app->running_state->windows; l; l = l->next)
if (!meta_window_is_override_redirect (META_WINDOW (l->data)))
windows = g_slist_prepend (windows, l->data);
return g_slist_reverse (windows);
} }
guint guint
@ -1201,7 +1208,7 @@ GSList *
shell_app_get_pids (ShellApp *app) shell_app_get_pids (ShellApp *app)
{ {
GSList *result; GSList *result;
GSList *iter; g_autoptr (GSList) iter = NULL;
result = NULL; result = NULL;
for (iter = shell_app_get_windows (app); iter; iter = iter->next) for (iter = shell_app_get_windows (app); iter; iter = iter->next)