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

window-actor: Only recompute shape region and mask if necessary

Browse Source 
Rather than recomputing shape region and mask on every focus change,
re-use the previously computed ones if possible.

https://bugzilla.gnome.org/show_bug.cgi?id=744667
This commit is contained in:
Florian Müllner 2016-10-28 13:03:19 +02:00
parent b35ad080ce
commit 45a273de20
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/compositor/meta-window-actor.c
View File

@ -179,6 +179,8 @@ static gboolean meta_window_actor_has_shadow (MetaWindowActor *self);
static void meta_window_actor_handle_updates (MetaWindowActor *self); static void meta_window_actor_handle_updates (MetaWindowActor *self);
static void check_needs_reshape (MetaWindowActor *self); static void check_needs_reshape (MetaWindowActor *self);
static void meta_window_actor_update_shape_region (MetaWindowActor *self);
static void meta_window_actor_shape_region_changed (MetaWindowActor *self);
static void do_send_frame_drawn (MetaWindowActor *self, FrameData *frame); static void do_send_frame_drawn (MetaWindowActor *self, FrameData *frame);
static void do_send_frame_timings (MetaWindowActor *self, static void do_send_frame_timings (MetaWindowActor *self,
@ -288,7 +290,29 @@ window_appears_focused_notify (MetaWindow *mw,
GParamSpec *arg1, GParamSpec *arg1,
gpointer data) gpointer data)
{ {
meta_window_actor_update_shape (META_WINDOW_ACTOR (data)); MetaWindowActor *self = META_WINDOW_ACTOR (data);
MetaWindowActorPrivate *priv = self->priv;
if (priv->surface)
{
gboolean appears_focused = meta_window_appears_focused (mw);
CoglTexture *mask = appears_focused ? self->priv->focused_mask
: self->priv->unfocused_mask;
if (mask)
{
MetaShapedTexture *stex;
stex = meta_surface_actor_get_texture (priv->surface);
meta_shaped_texture_set_mask_texture (stex, mask);
meta_window_actor_shape_region_changed (self);
}
else if (priv->window->frame)
{
meta_window_actor_update_shape_region (self);
}
}
clutter_actor_queue_redraw (CLUTTER_ACTOR (data)); clutter_actor_queue_redraw (CLUTTER_ACTOR (data));
} }
@ -1892,6 +1916,16 @@ meta_window_actor_update_opaque_region (MetaWindowActor *self)
cairo_region_destroy (opaque_region); cairo_region_destroy (opaque_region);
} }
static void
meta_window_actor_shape_region_changed (MetaWindowActor *self)
{
if (self->priv->window->client_type == META_WINDOW_CLIENT_TYPE_X11)
{
meta_window_actor_update_input_region (self);
meta_window_actor_update_opaque_region (self);
}
}
static void static void
check_needs_reshape (MetaWindowActor *self) check_needs_reshape (MetaWindowActor *self)
{ {
@ -1900,13 +1934,11 @@ check_needs_reshape (MetaWindowActor *self)
if (!priv->needs_reshape) if (!priv->needs_reshape)
return; return;
meta_window_actor_update_shape_region (self); g_clear_pointer (&priv->focused_mask, cogl_object_unref);
g_clear_pointer (&priv->unfocused_mask, cogl_object_unref);
if (priv->window->client_type == META_WINDOW_CLIENT_TYPE_X11) meta_window_actor_update_shape_region (self);
{ meta_window_actor_shape_region_changed (self);
meta_window_actor_update_input_region (self);
meta_window_actor_update_opaque_region (self);
}
priv->needs_reshape = FALSE; priv->needs_reshape = FALSE;
} }