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

Revert "window: Update the shape, input, and opaque regions immediately"

Browse Source 
This reverts commit c0d791cd6e25915a36890891940803185f7cc808.
This commit is contained in:
Jasper St. Pierre 2014-02-26 20:45:38 -05:00
parent 640102c03b
commit 98c4b82907
5 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/compositor/compositor.c
View File

@ -917,31 +917,7 @@ is_grabbed_event (MetaDisplay *display,
} }
void void
meta_compositor_update_shape_region (MetaCompositor *compositor, meta_compositor_window_shape_changed (MetaCompositor *compositor,
MetaWindow *window)
{
MetaWindowActor *window_actor;
window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
if (!window_actor)
return;
meta_window_actor_update_shape_region (window_actor);
}
void
meta_compositor_update_input_region (MetaCompositor *compositor,
MetaWindow *window)
{
MetaWindowActor *window_actor;
window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
if (!window_actor)
return;
meta_window_actor_update_input_region (window_actor);
}
void
meta_compositor_update_opaque_region (MetaCompositor *compositor,
MetaWindow *window) MetaWindow *window)
{ {
MetaWindowActor *window_actor; MetaWindowActor *window_actor;
@ -949,7 +925,7 @@ meta_compositor_update_opaque_region (MetaCompositor *compositor,
if (!window_actor) if (!window_actor)
return; return;
meta_window_actor_update_opaque_region (window_actor); meta_window_actor_update_shape (window_actor);
} }
void void

5
src/compositor/meta-window-actor-private.h
View File

@ -50,6 +50,7 @@ gboolean meta_window_actor_effect_in_progress (MetaWindowActor *self);
void meta_window_actor_sync_actor_geometry (MetaWindowActor *self, void meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
gboolean did_placement); gboolean did_placement);
void meta_window_actor_sync_visibility (MetaWindowActor *self); void meta_window_actor_sync_visibility (MetaWindowActor *self);
void meta_window_actor_update_shape (MetaWindowActor *self);
void meta_window_actor_update_opacity (MetaWindowActor *self); void meta_window_actor_update_opacity (MetaWindowActor *self);
void meta_window_actor_mapped (MetaWindowActor *self); void meta_window_actor_mapped (MetaWindowActor *self);
void meta_window_actor_unmapped (MetaWindowActor *self); void meta_window_actor_unmapped (MetaWindowActor *self);
@ -64,8 +65,4 @@ void meta_window_actor_effect_completed (MetaWindowActor *actor,
MetaSurfaceActor *meta_window_actor_get_surface (MetaWindowActor *self); MetaSurfaceActor *meta_window_actor_get_surface (MetaWindowActor *self);
void meta_window_actor_update_surface (MetaWindowActor *self); void meta_window_actor_update_surface (MetaWindowActor *self);
void meta_window_actor_update_shape_region (MetaWindowActor *self);
void meta_window_actor_update_input_region (MetaWindowActor *self);
void meta_window_actor_update_opaque_region (MetaWindowActor *self);
#endif /* META_WINDOW_ACTOR_PRIVATE_H */ #endif /* META_WINDOW_ACTOR_PRIVATE_H */

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

@ -1713,7 +1713,7 @@ build_and_scan_frame_mask (MetaWindowActor *self,
g_free (mask_data); g_free (mask_data);
} }
void static void
meta_window_actor_update_shape_region (MetaWindowActor *self) meta_window_actor_update_shape_region (MetaWindowActor *self)
{ {
MetaWindowActorPrivate *priv = self->priv; MetaWindowActorPrivate *priv = self->priv;
@ -1750,7 +1750,7 @@ meta_window_actor_update_shape_region (MetaWindowActor *self)
meta_window_actor_invalidate_shadow (self); meta_window_actor_invalidate_shadow (self);
} }
void static void
meta_window_actor_update_input_region (MetaWindowActor *self) meta_window_actor_update_input_region (MetaWindowActor *self)
{ {
MetaWindowActorPrivate *priv = self->priv; MetaWindowActorPrivate *priv = self->priv;
@ -1794,7 +1794,7 @@ meta_window_actor_update_input_region (MetaWindowActor *self)
cairo_region_destroy (region); cairo_region_destroy (region);
} }
void static void
meta_window_actor_update_opaque_region (MetaWindowActor *self) meta_window_actor_update_opaque_region (MetaWindowActor *self)
{ {
MetaWindowActorPrivate *priv = self->priv; MetaWindowActorPrivate *priv = self->priv;

6
src/core/window-x11.c
View File

@ -261,7 +261,7 @@ meta_window_set_opaque_region (MetaWindow *window,
window->opaque_region = cairo_region_reference (region); window->opaque_region = cairo_region_reference (region);
if (window->display->compositor) if (window->display->compositor)
meta_compositor_update_opaque_region (window->display->compositor, window); meta_compositor_window_shape_changed (window->display->compositor, window);
} }
void void
@ -347,7 +347,7 @@ meta_window_set_input_region (MetaWindow *window,
window->input_region = cairo_region_reference (region); window->input_region = cairo_region_reference (region);
if (window->display->compositor) if (window->display->compositor)
meta_compositor_update_input_region (window->display->compositor, window); meta_compositor_window_shape_changed (window->display->compositor, window);
} }
#if 0 #if 0
@ -454,7 +454,7 @@ meta_window_set_shape_region (MetaWindow *window,
window->shape_region = cairo_region_reference (region); window->shape_region = cairo_region_reference (region);
if (window->display->compositor) if (window->display->compositor)
meta_compositor_update_shape_region (window->display->compositor, window); meta_compositor_window_shape_changed (window->display->compositor, window);
} }
void void

6
src/meta/compositor.h
View File

@ -62,11 +62,7 @@ void meta_compositor_manage_screen (MetaCompositor *compositor,
void meta_compositor_unmanage_screen (MetaCompositor *compositor, void meta_compositor_unmanage_screen (MetaCompositor *compositor,
MetaScreen *screen); MetaScreen *screen);
void meta_compositor_update_shape_region (MetaCompositor *compositor, void meta_compositor_window_shape_changed (MetaCompositor *compositor,
MetaWindow *window);
void meta_compositor_update_input_region (MetaCompositor *compositor,
MetaWindow *window);
void meta_compositor_update_opaque_region (MetaCompositor *compositor,
MetaWindow *window); MetaWindow *window);
void meta_compositor_window_opacity_changed (MetaCompositor *compositor, void meta_compositor_window_opacity_changed (MetaCompositor *compositor,
MetaWindow *window); MetaWindow *window);