isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

compositor: do sync actor stack in one pass

Browse Source 
This refactor will simplify a subsequent commit that
introduces more than one background actor to the window
group.

https://bugzilla.gnome.org/show_bug.cgi?id=682427
This commit is contained in:
Ray Strode 2013-02-13 23:10:33 -05:00
parent 112ef93e19
commit aba87407e9
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/compositor/compositor.c
View File

@ -1063,8 +1063,10 @@ static void
sync_actor_stacking (MetaCompScreen *info) sync_actor_stacking (MetaCompScreen *info)
{ {
GList *children; GList *children;
GList *expected_window_node;
GList *tmp; GList *tmp;
GList *old; GList *old;
gboolean has_windows;
gboolean reordered; gboolean reordered;
/* NB: The first entries in the lists are stacked the lowest */ /* NB: The first entries in the lists are stacked the lowest */
@ -1076,49 +1078,41 @@ sync_actor_stacking (MetaCompScreen *info)
children = clutter_container_get_children (CLUTTER_CONTAINER (info->window_group)); children = clutter_container_get_children (CLUTTER_CONTAINER (info->window_group));
reordered = FALSE; reordered = FALSE;
old = children;
/* We allow for actors in the window group other than the actors we /* We allow for actors in the window group other than the actors we
* know about, but it's up to a plugin to try and keep them stacked correctly * know about, but it's up to a plugin to try and keep them stacked correctly
* (we really need extra API to make that reliable.) * (we really need extra API to make that reliable.)
*/ */
/* Of the actors we know, the bottom actor should be the background actor */ /* First we check if the background is at the bottom. Then
* we check if the window actors are in the correct sequence */
while (old && old->data != info->background_actor && !META_IS_WINDOW_ACTOR (old->data)) expected_window_node = info->windows;
old = old->next; for (old = children; old != NULL; old = old->next)
if (old == NULL || old->data != info->background_actor)
{ {
reordered = TRUE; ClutterActor *actor = old->data;
goto done_with_check;
}
/* Then the window actors should follow in sequence */ if (actor == info->background_actor)
old = old->next;
for (tmp = info->windows; tmp != NULL; tmp = tmp->next)
{
while (old && !META_IS_WINDOW_ACTOR (old->data))
old = old->next;
/* old == NULL: someone reparented a window out of the window group,
* order undefined, always restack */
if (old == NULL || old->data != tmp->data)
{ {
reordered = TRUE; if (has_windows)
goto done_with_check; reordered = TRUE;
} }
else if (META_IS_WINDOW_ACTOR (actor) && !reordered)
{
has_windows = TRUE;
old = old->next; if (expected_window_node != NULL && actor == expected_window_node->data)
expected_window_node = expected_window_node->next;
else
reordered = TRUE;
}
} }
done_with_check:
g_list_free (children); g_list_free (children);
if (!reordered) if (!reordered)
return; return;
/* reorder the actors by lowering them in turn to the bottom of the stack.
* windows first, then background */
for (tmp = g_list_last (info->windows); tmp != NULL; tmp = tmp->prev) for (tmp = g_list_last (info->windows); tmp != NULL; tmp = tmp->prev)
{ {
MetaWindowActor *window_actor = tmp->data; MetaWindowActor *window_actor = tmp->data;