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

wayland: Rename pending_surface_state => pending

Browse Source 
This matches what's normally done.
This commit is contained in:
Jasper St. Pierre 2014-04-18 18:12:54 -04:00
parent de6054d557
commit 2e2dd247ce
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,7 +307,7 @@ commit_pending_state (MetaWaylandSurface *surface,
*/ */
if (surface->sub.synchronous) if (surface->sub.synchronous)
{ {
move_pending_state (pending, &surface->sub.pending_surface_state); move_pending_state (pending, &surface->sub.pending);
return; return;
} }
@ -1430,7 +1430,7 @@ subsurface_parent_surface_committed (MetaWaylandSurface *surface)
} }
if (surface->sub.synchronous) if (surface->sub.synchronous)
commit_pending_state (surface, &surface->sub.pending_surface_state); commit_pending_state (surface, &surface->sub.pending);
} }
static void static void
@ -1455,7 +1455,7 @@ wl_subsurface_destructor (struct wl_resource *resource)
surface->sub.parent = NULL; surface->sub.parent = NULL;
} }
pending_state_destroy (&surface->sub.pending_surface_state); pending_state_destroy (&surface->sub.pending);
destroy_surface_extension (&surface->subsurface); destroy_surface_extension (&surface->subsurface);
} }
@ -1633,7 +1633,7 @@ wl_subcompositor_get_subsurface (struct wl_client *client,
return; return;
} }
pending_state_init (&surface->sub.pending_surface_state); pending_state_init (&surface->sub.pending);
surface->sub.parent = parent; surface->sub.parent = parent;
surface->sub.parent_destroy_listener.notify = surface->sub.parent_destroy_listener.notify =
surface_handle_parent_surface_destroyed; surface_handle_parent_surface_destroyed;

10
src/wayland/meta-wayland-surface.h
View File

@ -89,8 +89,16 @@ struct _MetaWaylandSurface
MetaWaylandSurface *parent; MetaWaylandSurface *parent;
struct wl_listener parent_destroy_listener; struct wl_listener parent_destroy_listener;
/* When the surface is synchronous, its state will be applied
* when the parent is committed. This is done by moving the
* "real" pending state below to here when this surface is
* committed and in synchronous mode.
*
* When the parent surface is committed, we apply the pending
* state here.
*/
gboolean synchronous; gboolean synchronous;
MetaWaylandPendingState pending_surface_state; MetaWaylandPendingState pending;
int32_t pending_x; int32_t pending_x;
int32_t pending_y; int32_t pending_y;