compositor: Split out a function to update the topmost window actor

This allows this to be used from outside the restacking code in the
follow-up commit.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2413>
This commit is contained in:
Sebastian Keller 2022-05-12 17:39:56 +02:00 committed by Marge Bot
parent 54ba64b9f2
commit 0bc142ec1b

View File

@ -757,12 +757,13 @@ sync_actor_stacking (MetaCompositor *compositor)
* this is to avoid offscreen windows that isn't actually part of the visible * this is to avoid offscreen windows that isn't actually part of the visible
* desktop (such as the UI frames override redirect window). * desktop (such as the UI frames override redirect window).
*/ */
static MetaWindowActor * static void
get_top_visible_window_actor (MetaCompositor *compositor) update_top_window_actor (MetaCompositor *compositor)
{ {
MetaCompositorPrivate *priv = MetaCompositorPrivate *priv =
meta_compositor_get_instance_private (compositor); meta_compositor_get_instance_private (compositor);
GList *l; GList *l;
MetaWindowActor *top_window_actor = NULL;
for (l = g_list_last (priv->windows); l; l = l->prev) for (l = g_list_last (priv->windows); l; l = l->prev)
{ {
@ -779,10 +780,27 @@ get_top_visible_window_actor (MetaCompositor *compositor)
&display_rect.width, &display_rect.height); &display_rect.width, &display_rect.height);
if (meta_rectangle_overlap (&display_rect, &buffer_rect)) if (meta_rectangle_overlap (&display_rect, &buffer_rect))
return window_actor; {
top_window_actor = window_actor;
break;
}
} }
return NULL; if (priv->top_window_actor == top_window_actor)
return;
g_clear_signal_handler (&priv->top_window_actor_destroy_id,
priv->top_window_actor);
priv->top_window_actor = top_window_actor;
if (priv->top_window_actor)
{
priv->top_window_actor_destroy_id =
g_signal_connect (priv->top_window_actor, "destroy",
G_CALLBACK (on_top_window_actor_destroyed),
compositor);
}
} }
static void static void
@ -805,7 +823,6 @@ meta_compositor_sync_stack (MetaCompositor *compositor,
{ {
MetaCompositorPrivate *priv = MetaCompositorPrivate *priv =
meta_compositor_get_instance_private (compositor); meta_compositor_get_instance_private (compositor);
MetaWindowActor *top_window_actor;
GList *old_stack; GList *old_stack;
/* This is painful because hidden windows that we are in the process /* This is painful because hidden windows that we are in the process
@ -889,21 +906,7 @@ meta_compositor_sync_stack (MetaCompositor *compositor,
sync_actor_stacking (compositor); sync_actor_stacking (compositor);
top_window_actor = get_top_visible_window_actor (compositor); update_top_window_actor (compositor);
if (priv->top_window_actor == top_window_actor)
return;
g_clear_signal_handler (&priv->top_window_actor_destroy_id,
priv->top_window_actor);
priv->top_window_actor = top_window_actor;
if (priv->top_window_actor)
priv->top_window_actor_destroy_id =
g_signal_connect (priv->top_window_actor, "destroy",
G_CALLBACK (on_top_window_actor_destroyed),
compositor);
} }
void void