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

wayland: Make synchronous subsurface a very special case in commit

Browse Source 
Really, it is a special case. When the subsurface is synchronous,
commit changes meaning from being applied immediately to being
queued up for replay later. Handle this explicit special case
with an explicit special case in the code.

This means that in all other paths, we can unconditionally
apply the actor immediately.
This commit is contained in:
Jasper St. Pierre 2014-04-11 23:40:36 -07:00
parent dbe4fc0e45
commit e1b0c9c756
1 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,42 +290,23 @@ static void
subsurface_surface_commit (MetaWaylandSurface *surface, subsurface_surface_commit (MetaWaylandSurface *surface,
MetaWaylandDoubleBufferedState *pending) MetaWaylandDoubleBufferedState *pending)
{ {
/* actor_surface_commit (surface, pending);
* If the sub-surface is in synchronous mode, post-pone the commit of its
* state until the sub-surface parent commits. if (pending->newly_attached)
*
* This is done by moving the various states (damage, input region, buffer
* etc.) from the buffered state pending commit to the sub-surface's pending
* buffered state.
*
* The sub-surface's pending buffered state will be committed to the
* associated surface when its parent surface is committed, or if the user
* issues a wl_subsurface.set_desync request.
*/
if (surface->sub.synchronous)
{ {
move_double_buffered_state (pending, &surface->sub.pending_surface_state); MetaSurfaceActor *surface_actor = surface->surface_actor;
} MetaWaylandBuffer *buffer = pending->buffer;
else float x, y;
{
actor_surface_commit (surface, pending);
if (pending->newly_attached) if (buffer != NULL)
{ clutter_actor_show (CLUTTER_ACTOR (surface_actor));
MetaSurfaceActor *surface_actor = surface->surface_actor; else
MetaWaylandBuffer *buffer = pending->buffer; clutter_actor_hide (CLUTTER_ACTOR (surface_actor));
float x, y;
if (buffer != NULL) clutter_actor_get_position (CLUTTER_ACTOR (surface_actor), &x, &y);
clutter_actor_show (CLUTTER_ACTOR (surface_actor)); x += pending->dx;
else y += pending->dy;
clutter_actor_hide (CLUTTER_ACTOR (surface_actor)); clutter_actor_set_position (CLUTTER_ACTOR (surface_actor), x, y);
clutter_actor_get_position (CLUTTER_ACTOR (surface_actor), &x, &y);
x += pending->dx;
y += pending->dy;
clutter_actor_set_position (CLUTTER_ACTOR (surface_actor), x, y);
}
} }
} }
@ -344,6 +325,18 @@ commit_double_buffered_state (MetaWaylandSurface *surface,
{ {
MetaWaylandCompositor *compositor = surface->compositor; MetaWaylandCompositor *compositor = surface->compositor;
/* If this surface is a subsurface in in synchronous mode, commit
* has a special-case and should not apply the pending state immediately.
*
* Instead, we move it to another pending state, which will be
* actually committed when the parent commits.
*/
if (surface->sub.synchronous)
{
move_double_buffered_state (pending, &surface->sub.pending_surface_state);
return;
}
if (pending->newly_attached) if (pending->newly_attached)
surface_set_buffer (surface, pending->buffer); surface_set_buffer (surface, pending->buffer);