stack: Add a function to get a sorted list of focus candidates

Use a static function if a window can be the default focus window, and use such
function to return a filtered list of the stack.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
This commit is contained in:
Marco Trevisan (Treviño) 2019-07-03 18:48:07 +02:00
parent c327b2df95
commit 2439255f32
2 changed files with 57 additions and 13 deletions

View File

@ -1057,6 +1057,27 @@ window_contains_point (MetaWindow *window,
return POINT_IN_RECT (root_x, root_y, rect); return POINT_IN_RECT (root_x, root_y, rect);
} }
static gboolean
window_can_get_default_focus (MetaWindow *window)
{
if (window->unmaps_pending > 0)
return FALSE;
if (window->unmanaging)
return FALSE;
if (!meta_window_is_focusable (window))
return FALSE;
if (!meta_window_should_be_showing (window))
return FALSE;
if (window->type == META_WINDOW_DOCK)
return FALSE;
return TRUE;
}
static MetaWindow* static MetaWindow*
get_default_focus_window (MetaStack *stack, get_default_focus_window (MetaStack *stack,
MetaWorkspace *workspace, MetaWorkspace *workspace,
@ -1084,24 +1105,12 @@ get_default_focus_window (MetaStack *stack,
if (window == not_this_one) if (window == not_this_one)
continue; continue;
if (window->unmaps_pending > 0) if (!window_can_get_default_focus (window))
continue;
if (window->unmanaging)
continue;
if (!meta_window_is_focusable (window))
continue;
if (!meta_window_should_be_showing (window))
continue; continue;
if (must_be_at_point && !window_contains_point (window, root_x, root_y)) if (must_be_at_point && !window_contains_point (window, root_x, root_y))
continue; continue;
if (window->type == META_WINDOW_DOCK)
continue;
return window; return window;
} }
@ -1156,6 +1165,26 @@ meta_stack_list_windows (MetaStack *stack,
return workspace_windows; return workspace_windows;
} }
GList *
meta_stack_get_default_focus_candidates (MetaStack *stack,
MetaWorkspace *workspace)
{
GList *windows = meta_stack_list_windows (stack, workspace);
GList *l;
for (l = windows; l;)
{
GList *next = l->next;
if (!window_can_get_default_focus (l->data))
windows = g_list_delete_link (windows, l);
l = next;
}
return windows;
}
int int
meta_stack_windows_cmp (MetaStack *stack, meta_stack_windows_cmp (MetaStack *stack,
MetaWindow *window_a, MetaWindow *window_a,

View File

@ -308,6 +308,21 @@ MetaWindow* meta_stack_get_default_focus_window_at_point (MetaStack *stack,
int root_x, int root_x,
int root_y); int root_y);
/**
* meta_stack_get_default_focus_candidates:
* @stack: The stack to examine.
* @workspace: If not %NULL, only windows on this workspace will be
* returned; otherwise all windows in the stack will be
* returned.
*
* Returns all the focus candidate windows in the stack, in order.
*
* Returns: (transfer container) (element-type Meta.Window):
* A #GList of #MetaWindow, in stacking order, honouring layers.
*/
GList * meta_stack_get_default_focus_candidates (MetaStack *stack,
MetaWorkspace *workspace);
/** /**
* meta_stack_list_windows: * meta_stack_list_windows:
* @stack: The stack to examine. * @stack: The stack to examine.