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

workspace: Focus only ancestors that are focusable

Browse Source 
When destroying a window that has a parent, we initially try to focus one of
its ancestors. However if no ancestor can be focused, then we should instead
focus the default focus window instead of trying to request focus for a window
that can't get focus anyways.

Fixes https://gitlab.gnome.org/GNOME/mutter/issues/308
This commit is contained in:
Marco Trevisan (Treviño) 2018-11-13 08:31:52 +01:00 committed by Jonas Ådahl
parent 6055f04814
commit eccc791f3b
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/workspace.c
View File

@ -83,6 +83,12 @@ typedef struct _MetaWorkspaceLogicalMonitorData
MetaRectangle logical_monitor_work_area; MetaRectangle logical_monitor_work_area;
} MetaWorkspaceLogicalMonitorData; } MetaWorkspaceLogicalMonitorData;
typedef struct _MetaWorkspaceFocusableAncestorData
{
MetaWorkspace *workspace;
MetaWindow *out_window;
} MetaWorkspaceFocusableAncestorData;
static MetaWorkspaceLogicalMonitorData * static MetaWorkspaceLogicalMonitorData *
meta_workspace_get_logical_monitor_data (MetaWorkspace *workspace, meta_workspace_get_logical_monitor_data (MetaWorkspace *workspace,
MetaLogicalMonitor *logical_monitor) MetaLogicalMonitor *logical_monitor)
@ -1314,13 +1320,20 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
} }
static gboolean static gboolean
record_ancestor (MetaWindow *window, find_focusable_ancestor (MetaWindow *window,
void *data) gpointer user_data)
{ {
MetaWindow **result = data; MetaWorkspaceFocusableAncestorData *data = user_data;
*result = window; if (!window->unmanaging && meta_window_is_focusable (window) &&
return FALSE; /* quit with the first ancestor we find */ meta_window_located_on_workspace (window, data->workspace) &&
meta_window_showing_on_its_workspace (window))
{
data->out_window = window;
return FALSE;
}
return TRUE;
} }
/* Focus ancestor of not_this_one if there is one */ /* Focus ancestor of not_this_one if there is one */
@ -1342,11 +1355,15 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
if (not_this_one) if (not_this_one)
{ {
MetaWindow *ancestor; MetaWindow *ancestor;
ancestor = NULL; MetaWorkspaceFocusableAncestorData data;
meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor);
if (ancestor != NULL && data = (MetaWorkspaceFocusableAncestorData) {
meta_window_located_on_workspace (ancestor, workspace) && .workspace = workspace,
meta_window_showing_on_its_workspace (ancestor)) };
meta_window_foreach_ancestor (not_this_one, find_focusable_ancestor, &data);
ancestor = data.out_window;
if (ancestor)
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Focusing %s, ancestor of %s\n", "Focusing %s, ancestor of %s\n",