isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-25 19:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Always keep the MetaSurfaceActorWayland up-to-date

Browse Source 
The MetaSurfaceActorWayland should always accurately reflect
the state of the MetaWaylandSurface, even if it's a cursor
surface.
This commit is contained in:
Jasper St. Pierre 2014-04-11 23:42:40 -07:00
parent e1b0c9c756
commit 03cfe602d9
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wayland/meta-wayland-surface.c
View File

@ -177,8 +177,6 @@ static void
toplevel_surface_commit (MetaWaylandSurface *surface, toplevel_surface_commit (MetaWaylandSurface *surface,
MetaWaylandDoubleBufferedState *pending) MetaWaylandDoubleBufferedState *pending)
{ {
actor_surface_commit (surface, pending);
if (pending->newly_attached) if (pending->newly_attached)
{ {
MetaWindow *window = surface->window; MetaWindow *window = surface->window;
@ -290,8 +288,6 @@ static void
subsurface_surface_commit (MetaWaylandSurface *surface, subsurface_surface_commit (MetaWaylandSurface *surface,
MetaWaylandDoubleBufferedState *pending) MetaWaylandDoubleBufferedState *pending)
{ {
actor_surface_commit (surface, pending);
if (pending->newly_attached) if (pending->newly_attached)
{ {
MetaSurfaceActor *surface_actor = surface->surface_actor; MetaSurfaceActor *surface_actor = surface->surface_actor;
@ -340,20 +336,14 @@ commit_double_buffered_state (MetaWaylandSurface *surface,
if (pending->newly_attached) if (pending->newly_attached)
surface_set_buffer (surface, pending->buffer); surface_set_buffer (surface, pending->buffer);
actor_surface_commit (surface, pending);
if (surface == compositor->seat->cursor_surface) if (surface == compositor->seat->cursor_surface)
cursor_surface_commit (surface, pending); cursor_surface_commit (surface, pending);
else if (surface->window) else if (surface->window)
toplevel_surface_commit (surface, pending); toplevel_surface_commit (surface, pending);
else if (surface->subsurface.resource) else if (surface->subsurface.resource)
subsurface_surface_commit (surface, pending); subsurface_surface_commit (surface, pending);
else
{
/* Unknown surface type. In this case, it's most likely a XWayland
* surface that we haven't gotten the ClientMessage for yet. Make
* sure *not* to reset the double-buffered state or do anything too
* fancy. */
return;
}
g_list_foreach (surface->subsurfaces, parent_surface_committed, NULL); g_list_foreach (surface->subsurfaces, parent_surface_committed, NULL);