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

wayland/surface: Rename output/protocol_state to applied/committed_state

Browse Source 
This is more consistent with Wayland protocol spec language.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3395>
This commit is contained in:
Michel Dänzer 2023-11-14 11:44:05 +01:00 committed by Marge Bot
parent 31c5525382
commit ca5bf847ee
11 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compositor/meta-surface-actor-wayland.c
View File

@ -184,8 +184,8 @@ meta_surface_actor_wayland_apply_transform (ClutterActor *actor,
goto out; goto out;
root_surface = surface; root_surface = surface;
while (root_surface->output_state.parent) while (root_surface->applied_state.parent)
root_surface = root_surface->output_state.parent; root_surface = root_surface->applied_state.parent;
window = meta_wayland_surface_get_window (root_surface); window = meta_wayland_surface_get_window (root_surface);
if (!window) if (!window)
@ -227,7 +227,7 @@ meta_surface_actor_wayland_apply_transform (ClutterActor *actor,
adj_actor_x += roundf (surface->sub.x * scale) / scale; adj_actor_x += roundf (surface->sub.x * scale) / scale;
adj_actor_y += roundf (surface->sub.y * scale) / scale; adj_actor_y += roundf (surface->sub.y * scale) / scale;
surface = surface->output_state.parent; surface = surface->applied_state.parent;
} }
while (surface); while (surface);
} }

2
src/compositor/meta-window-actor-wayland.c
View File

@ -232,7 +232,7 @@ meta_window_actor_wayland_rebuild_surface_tree (MetaWindowActor *actor)
meta_window_actor_get_surface (actor); meta_window_actor_get_surface (actor);
MetaWaylandSurface *surface = meta_surface_actor_wayland_get_surface ( MetaWaylandSurface *surface = meta_surface_actor_wayland_get_surface (
META_SURFACE_ACTOR_WAYLAND (surface_actor)); META_SURFACE_ACTOR_WAYLAND (surface_actor));
GNode *root_node = surface->output_state.subsurface_branch_node; GNode *root_node = surface->applied_state.subsurface_branch_node;
g_autoptr (GList) surface_actors = NULL; g_autoptr (GList) surface_actors = NULL;
g_autoptr (GList) children = NULL; g_autoptr (GList) children = NULL;
GList *l; GList *l;

4
src/wayland/meta-wayland-actor-surface.c
View File

@ -275,7 +275,7 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
meta_shaped_texture_ensure_size_valid (stex); meta_shaped_texture_ensure_size_valid (stex);
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state,
subsurface_surface) subsurface_surface)
{ {
MetaWaylandActorSurface *actor_surface; MetaWaylandActorSurface *actor_surface;
@ -424,7 +424,7 @@ meta_wayland_actor_surface_reset_actor (MetaWaylandActorSurface *actor_surface)
meta_wayland_surface_role_get_surface (META_WAYLAND_SURFACE_ROLE (actor_surface)); meta_wayland_surface_role_get_surface (META_WAYLAND_SURFACE_ROLE (actor_surface));
MetaWaylandSurface *subsurface_surface; MetaWaylandSurface *subsurface_surface;
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state,
subsurface_surface) subsurface_surface)
{ {
MetaWaylandActorSurface *actor_surface; MetaWaylandActorSurface *actor_surface;

2
src/wayland/meta-wayland-pointer.c
View File

@ -1383,7 +1383,7 @@ pointer_can_grab_surface (MetaWaylandPointer *pointer,
if (pointer->focus_surface == surface) if (pointer->focus_surface == surface)
return TRUE; return TRUE;
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state,
subsurface) subsurface)
{ {
if (pointer_can_grab_surface (pointer, subsurface)) if (pointer_can_grab_surface (pointer, subsurface))

2
src/wayland/meta-wayland-shell-surface.c
View File

@ -58,7 +58,7 @@ meta_wayland_shell_surface_calculate_geometry (MetaWaylandShellSurface *shell_su
.height = meta_wayland_surface_get_height (surface), .height = meta_wayland_surface_get_height (surface),
}; };
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state,
subsurface_surface) subsurface_surface)
{ {
MetaWaylandSubsurface *subsurface; MetaWaylandSubsurface *subsurface;

62
src/wayland/meta-wayland-subsurface.c
View File

@ -48,7 +48,7 @@ transform_subsurface_position (MetaWaylandSurface *surface,
*x += surface->sub.x; *x += surface->sub.x;
*y += surface->sub.y; *y += surface->sub.y;
surface = surface->output_state.parent; surface = surface->applied_state.parent;
} }
while (surface); while (surface);
} }
@ -58,8 +58,8 @@ should_show (MetaWaylandSurface *surface)
{ {
if (!surface->buffer) if (!surface->buffer)
return FALSE; return FALSE;
else if (surface->output_state.parent) else if (surface->applied_state.parent)
return should_show (surface->output_state.parent); return should_show (surface->applied_state.parent);
else else
return TRUE; return TRUE;
} }
@ -96,7 +96,7 @@ static gboolean
is_child (MetaWaylandSurface *surface, is_child (MetaWaylandSurface *surface,
MetaWaylandSurface *sibling) MetaWaylandSurface *sibling)
{ {
return surface->protocol_state.parent == sibling; return surface->committed_state.parent == sibling;
} }
static gboolean static gboolean
@ -104,7 +104,7 @@ is_sibling (MetaWaylandSurface *surface,
MetaWaylandSurface *sibling) MetaWaylandSurface *sibling)
{ {
return surface != sibling && return surface != sibling &&
surface->protocol_state.parent == sibling->protocol_state.parent; surface->committed_state.parent == sibling->committed_state.parent;
} }
void void
@ -129,7 +129,7 @@ meta_wayland_subsurface_union_geometry (MetaWaylandSubsurface *subsurface,
if (surface->buffer) if (surface->buffer)
mtk_rectangle_union (out_geometry, &geometry, out_geometry); mtk_rectangle_union (out_geometry, &geometry, out_geometry);
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state,
subsurface_surface) subsurface_surface)
{ {
MetaWaylandSubsurface *subsurface; MetaWaylandSubsurface *subsurface;
@ -160,7 +160,7 @@ meta_wayland_subsurface_get_toplevel (MetaWaylandSurfaceRole *surface_role)
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurface *parent = surface->output_state.parent; MetaWaylandSurface *parent = surface->applied_state.parent;
if (parent) if (parent)
return meta_wayland_surface_get_toplevel (parent); return meta_wayland_surface_get_toplevel (parent);
@ -175,7 +175,7 @@ meta_wayland_subsurface_get_window (MetaWaylandSurfaceRole *surface_role)
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurface *parent; MetaWaylandSurface *parent;
parent = surface->protocol_state.parent; parent = surface->committed_state.parent;
if (parent) if (parent)
return meta_wayland_surface_get_window (parent); return meta_wayland_surface_get_window (parent);
else else
@ -192,7 +192,7 @@ meta_wayland_subsurface_is_synchronized (MetaWaylandSurfaceRole *surface_role)
if (surface->sub.synchronous) if (surface->sub.synchronous)
return TRUE; return TRUE;
parent = surface->protocol_state.parent; parent = surface->committed_state.parent;
if (parent) if (parent)
return meta_wayland_surface_is_synchronized (parent); return meta_wayland_surface_is_synchronized (parent);
@ -204,7 +204,7 @@ meta_wayland_subsurface_notify_subsurface_state_changed (MetaWaylandSurfaceRole
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurface *parent = surface->output_state.parent; MetaWaylandSurface *parent = surface->applied_state.parent;
if (parent) if (parent)
return meta_wayland_surface_notify_subsurface_state_changed (parent); return meta_wayland_surface_notify_subsurface_state_changed (parent);
@ -217,14 +217,14 @@ meta_wayland_subsurface_get_geometry_scale (MetaWaylandActorSurface *actor_surfa
META_WAYLAND_SURFACE_ROLE (actor_surface); META_WAYLAND_SURFACE_ROLE (actor_surface);
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurface *parent = surface->output_state.parent; MetaWaylandSurface *parent = surface->applied_state.parent;
if (parent) if (parent)
{ {
MetaWaylandActorSurface *parent_actor; MetaWaylandActorSurface *parent_actor;
parent_actor = parent_actor =
META_WAYLAND_ACTOR_SURFACE (surface->output_state.parent->role); META_WAYLAND_ACTOR_SURFACE (surface->applied_state.parent->role);
return meta_wayland_actor_surface_get_geometry_scale (parent_actor); return meta_wayland_actor_surface_get_geometry_scale (parent_actor);
} }
else else
@ -311,7 +311,7 @@ get_subsurface_placement_op (MetaWaylandSurface *surface,
MetaWaylandSurface *sibling, MetaWaylandSurface *sibling,
MetaWaylandSubsurfacePlacement placement) MetaWaylandSubsurfacePlacement placement)
{ {
MetaWaylandSurface *parent = surface->protocol_state.parent; MetaWaylandSurface *parent = surface->committed_state.parent;
MetaWaylandSubsurfacePlacementOp *op = MetaWaylandSubsurfacePlacementOp *op =
g_new0 (MetaWaylandSubsurfacePlacementOp, 1); g_new0 (MetaWaylandSubsurfacePlacementOp, 1);
GNode *sibling_node; GNode *sibling_node;
@ -320,27 +320,27 @@ get_subsurface_placement_op (MetaWaylandSurface *surface,
op->sibling = sibling; op->sibling = sibling;
op->surface = surface; op->surface = surface;
g_node_unlink (surface->protocol_state.subsurface_branch_node); g_node_unlink (surface->committed_state.subsurface_branch_node);
if (!sibling) if (!sibling)
return op; return op;
if (sibling == parent) if (sibling == parent)
sibling_node = parent->protocol_state.subsurface_leaf_node; sibling_node = parent->committed_state.subsurface_leaf_node;
else else
sibling_node = sibling->protocol_state.subsurface_branch_node; sibling_node = sibling->committed_state.subsurface_branch_node;
switch (placement) switch (placement)
{ {
case META_WAYLAND_SUBSURFACE_PLACEMENT_ABOVE: case META_WAYLAND_SUBSURFACE_PLACEMENT_ABOVE:
g_node_insert_after (parent->protocol_state.subsurface_branch_node, g_node_insert_after (parent->committed_state.subsurface_branch_node,
sibling_node, sibling_node,
surface->protocol_state.subsurface_branch_node); surface->committed_state.subsurface_branch_node);
break; break;
case META_WAYLAND_SUBSURFACE_PLACEMENT_BELOW: case META_WAYLAND_SUBSURFACE_PLACEMENT_BELOW:
g_node_insert_before (parent->protocol_state.subsurface_branch_node, g_node_insert_before (parent->committed_state.subsurface_branch_node,
sibling_node, sibling_node,
surface->protocol_state.subsurface_branch_node); surface->committed_state.subsurface_branch_node);
break; break;
} }
@ -374,7 +374,7 @@ subsurface_place (struct wl_client *client,
placement); placement);
pending_state = pending_state =
meta_wayland_surface_get_pending_state (surface->protocol_state.parent); meta_wayland_surface_get_pending_state (surface->committed_state.parent);
pending_state->subsurface_placement_ops = pending_state->subsurface_placement_ops =
g_slist_append (pending_state->subsurface_placement_ops, op); g_slist_append (pending_state->subsurface_placement_ops, op);
} }
@ -435,7 +435,7 @@ permanently_unmap_subsurface (MetaWaylandSurface *surface)
transaction = meta_wayland_transaction_new (surface->compositor); transaction = meta_wayland_transaction_new (surface->compositor);
meta_wayland_transaction_add_placement_op (transaction, meta_wayland_transaction_add_placement_op (transaction,
surface->protocol_state.parent, op); surface->committed_state.parent, op);
meta_wayland_transaction_add_subsurface_position (transaction, surface, 0, 0); meta_wayland_transaction_add_subsurface_position (transaction, surface, 0, 0);
meta_wayland_transaction_commit (transaction); meta_wayland_transaction_commit (transaction);
@ -443,7 +443,7 @@ permanently_unmap_subsurface (MetaWaylandSurface *surface)
meta_wayland_transaction_drop_subsurface_state (surface->sub.transaction, meta_wayland_transaction_drop_subsurface_state (surface->sub.transaction,
surface); surface);
parent = surface->protocol_state.parent; parent = surface->committed_state.parent;
pending_state = meta_wayland_surface_get_pending_state (parent); pending_state = meta_wayland_surface_get_pending_state (parent);
if (pending_state && pending_state->subsurface_placement_ops) if (pending_state && pending_state->subsurface_placement_ops)
meta_wayland_subsurface_drop_placement_ops (pending_state, surface); meta_wayland_subsurface_drop_placement_ops (pending_state, surface);
@ -454,10 +454,10 @@ permanently_unmap_subsurface (MetaWaylandSurface *surface)
meta_wayland_transaction_drop_subsurface_state (parent->sub.transaction, meta_wayland_transaction_drop_subsurface_state (parent->sub.transaction,
surface); surface);
parent = parent->protocol_state.parent; parent = parent->committed_state.parent;
} }
surface->protocol_state.parent = NULL; surface->committed_state.parent = NULL;
} }
static void static void
@ -465,7 +465,7 @@ wl_subsurface_destructor (struct wl_resource *resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
if (surface->protocol_state.parent) if (surface->committed_state.parent)
permanently_unmap_subsurface (surface); permanently_unmap_subsurface (surface);
surface->wl_subsurface = NULL; surface->wl_subsurface = NULL;
@ -491,7 +491,7 @@ meta_wayland_subsurface_parent_desynced (MetaWaylandSurface *surface)
if (surface->sub.transaction) if (surface->sub.transaction)
meta_wayland_transaction_commit (g_steal_pointer (&surface->sub.transaction)); meta_wayland_transaction_commit (g_steal_pointer (&surface->sub.transaction));
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->protocol_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->committed_state,
subsurface_surface) subsurface_surface)
meta_wayland_subsurface_parent_desynced (subsurface_surface); meta_wayland_subsurface_parent_desynced (subsurface_surface);
} }
@ -539,8 +539,8 @@ is_same_or_ancestor (MetaWaylandSurface *surface,
{ {
if (surface == other_surface) if (surface == other_surface)
return TRUE; return TRUE;
if (other_surface->protocol_state.parent) if (other_surface->committed_state.parent)
return is_same_or_ancestor (surface, other_surface->protocol_state.parent); return is_same_or_ancestor (surface, other_surface->committed_state.parent);
return FALSE; return FALSE;
} }
@ -602,12 +602,12 @@ wl_subcompositor_get_subsurface (struct wl_client *client,
wl_subsurface_destructor); wl_subsurface_destructor);
surface->sub.synchronous = TRUE; surface->sub.synchronous = TRUE;
surface->protocol_state.parent = parent; surface->committed_state.parent = parent;
meta_wayland_surface_notify_highest_scale_monitor (surface); meta_wayland_surface_notify_highest_scale_monitor (surface);
reference = reference =
g_node_last_child (parent->protocol_state.subsurface_branch_node)->data; g_node_last_child (parent->committed_state.subsurface_branch_node)->data;
op = get_subsurface_placement_op (surface, reference, op = get_subsurface_placement_op (surface, reference,
META_WAYLAND_SUBSURFACE_PLACEMENT_ABOVE); META_WAYLAND_SUBSURFACE_PLACEMENT_ABOVE);

2
src/wayland/meta-wayland-surface-private.h
View File

@ -187,7 +187,7 @@ struct _MetaWaylandSurface
GNode *subsurface_branch_node; GNode *subsurface_branch_node;
GNode *subsurface_leaf_node; GNode *subsurface_leaf_node;
MetaMultiTexture *texture; MetaMultiTexture *texture;
} output_state, protocol_state; } applied_state, committed_state;
/* Extension resources. */ /* Extension resources. */
struct wl_resource *wl_subsurface; struct wl_resource *wl_subsurface;

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

@ -348,7 +348,7 @@ surface_process_damage (MetaWaylandSurface *surface,
mtk_region_intersect_rectangle (buffer_region, &buffer_rect); mtk_region_intersect_rectangle (buffer_region, &buffer_rect);
meta_wayland_buffer_process_damage (buffer, surface->output_state.texture, meta_wayland_buffer_process_damage (buffer, surface->applied_state.texture,
buffer_region); buffer_region);
actor = meta_wayland_surface_get_actor (surface); actor = meta_wayland_surface_get_actor (surface);
@ -660,32 +660,32 @@ meta_wayland_surface_apply_placement_ops (MetaWaylandSurface *parent,
MetaWaylandSurface *surface = op->surface; MetaWaylandSurface *surface = op->surface;
GNode *sibling_node; GNode *sibling_node;
g_node_unlink (surface->output_state.subsurface_branch_node); g_node_unlink (surface->applied_state.subsurface_branch_node);
if (!op->sibling) if (!op->sibling)
{ {
surface->output_state.parent = NULL; surface->applied_state.parent = NULL;
continue; continue;
} }
surface->output_state.parent = parent; surface->applied_state.parent = parent;
if (op->sibling == parent) if (op->sibling == parent)
sibling_node = parent->output_state.subsurface_leaf_node; sibling_node = parent->applied_state.subsurface_leaf_node;
else else
sibling_node = op->sibling->output_state.subsurface_branch_node; sibling_node = op->sibling->applied_state.subsurface_branch_node;
switch (op->placement) switch (op->placement)
{ {
case META_WAYLAND_SUBSURFACE_PLACEMENT_ABOVE: case META_WAYLAND_SUBSURFACE_PLACEMENT_ABOVE:
g_node_insert_after (parent->output_state.subsurface_branch_node, g_node_insert_after (parent->applied_state.subsurface_branch_node,
sibling_node, sibling_node,
surface->output_state.subsurface_branch_node); surface->applied_state.subsurface_branch_node);
break; break;
case META_WAYLAND_SUBSURFACE_PLACEMENT_BELOW: case META_WAYLAND_SUBSURFACE_PLACEMENT_BELOW:
g_node_insert_before (parent->output_state.subsurface_branch_node, g_node_insert_before (parent->applied_state.subsurface_branch_node,
sibling_node, sibling_node,
surface->output_state.subsurface_branch_node); surface->applied_state.subsurface_branch_node);
break; break;
} }
} }
@ -727,8 +727,8 @@ meta_wayland_surface_apply_state (MetaWaylandSurface *surface,
meta_wayland_buffer_dec_use_count (surface->buffer); meta_wayland_buffer_dec_use_count (surface->buffer);
g_set_object (&surface->buffer, state->buffer); g_set_object (&surface->buffer, state->buffer);
g_clear_object (&surface->output_state.texture); g_clear_object (&surface->applied_state.texture);
surface->output_state.texture = g_steal_pointer (&state->texture); surface->applied_state.texture = g_steal_pointer (&state->texture);
/* If the newly attached buffer is going to be accessed directly without /* If the newly attached buffer is going to be accessed directly without
* making a copy, such as an EGL buffer, mark it as in-use don't release * making a copy, such as an EGL buffer, mark it as in-use don't release
@ -929,7 +929,7 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
meta_wayland_buffer_realize (buffer); meta_wayland_buffer_realize (buffer);
if (!meta_wayland_buffer_attach (buffer, if (!meta_wayland_buffer_attach (buffer,
&surface->protocol_state.texture, &surface->committed_state.texture,
&error)) &error))
{ {
g_warning ("Could not import pending buffer: %s", error->message); g_warning ("Could not import pending buffer: %s", error->message);
@ -941,14 +941,14 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
return; return;
} }
pending->texture = g_object_ref (surface->protocol_state.texture); pending->texture = g_object_ref (surface->committed_state.texture);
g_object_ref (buffer); g_object_ref (buffer);
meta_wayland_buffer_inc_use_count (buffer); meta_wayland_buffer_inc_use_count (buffer);
} }
else if (pending->newly_attached) else if (pending->newly_attached)
{ {
g_clear_object (&surface->protocol_state.texture); g_clear_object (&surface->committed_state.texture);
} }
if (meta_wayland_surface_is_synchronized (surface)) if (meta_wayland_surface_is_synchronized (surface))
@ -961,7 +961,7 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
meta_wayland_transaction_merge_pending_state (transaction, surface); meta_wayland_transaction_merge_pending_state (transaction, surface);
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->protocol_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->committed_state,
subsurface_surface) subsurface_surface)
{ {
if (!subsurface_surface->sub.transaction) if (!subsurface_surface->sub.transaction)
@ -1456,7 +1456,7 @@ meta_wayland_surface_finalize (GObject *object)
if (surface->buffer_held) if (surface->buffer_held)
meta_wayland_buffer_dec_use_count (surface->buffer); meta_wayland_buffer_dec_use_count (surface->buffer);
g_clear_object (&surface->output_state.texture); g_clear_object (&surface->applied_state.texture);
g_clear_object (&surface->buffer); g_clear_object (&surface->buffer);
g_clear_pointer (&surface->opaque_region, mtk_region_unref); g_clear_pointer (&surface->opaque_region, mtk_region_unref);
@ -1478,7 +1478,7 @@ meta_wayland_surface_finalize (GObject *object)
meta_wayland_surface_discard_presentation_feedback (surface); meta_wayland_surface_discard_presentation_feedback (surface);
g_clear_pointer (&surface->output_state.subsurface_branch_node, g_node_destroy); g_clear_pointer (&surface->applied_state.subsurface_branch_node, g_node_destroy);
g_hash_table_destroy (surface->shortcut_inhibited_seats); g_hash_table_destroy (surface->shortcut_inhibited_seats);
@ -1499,14 +1499,14 @@ wl_surface_destructor (struct wl_resource *resource)
if (surface->resource) if (surface->resource)
wl_resource_set_user_data (g_steal_pointer (&surface->resource), NULL); wl_resource_set_user_data (g_steal_pointer (&surface->resource), NULL);
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->protocol_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->committed_state,
subsurface_surface) subsurface_surface)
meta_wayland_subsurface_parent_destroyed (subsurface_surface); meta_wayland_subsurface_parent_destroyed (subsurface_surface);
g_clear_pointer (&surface->wl_subsurface, wl_resource_destroy); g_clear_pointer (&surface->wl_subsurface, wl_resource_destroy);
g_clear_pointer (&surface->protocol_state.subsurface_branch_node, g_node_destroy); g_clear_pointer (&surface->committed_state.subsurface_branch_node, g_node_destroy);
g_clear_object (&surface->protocol_state.texture); g_clear_object (&surface->committed_state.texture);
/* /*
* Any transactions referencing this surface will keep it alive until they get * Any transactions referencing this surface will keep it alive until they get
@ -1743,13 +1743,13 @@ meta_wayland_surface_init (MetaWaylandSurface *surface)
{ {
surface->pending_state = meta_wayland_surface_state_new (); surface->pending_state = meta_wayland_surface_state_new ();
surface->output_state.subsurface_branch_node = g_node_new (surface); surface->applied_state.subsurface_branch_node = g_node_new (surface);
surface->output_state.subsurface_leaf_node = surface->applied_state.subsurface_leaf_node =
g_node_prepend_data (surface->output_state.subsurface_branch_node, surface); g_node_prepend_data (surface->applied_state.subsurface_branch_node, surface);
surface->protocol_state.subsurface_branch_node = g_node_new (surface); surface->committed_state.subsurface_branch_node = g_node_new (surface);
surface->protocol_state.subsurface_leaf_node = surface->committed_state.subsurface_leaf_node =
g_node_prepend_data (surface->protocol_state.subsurface_branch_node, surface); g_node_prepend_data (surface->committed_state.subsurface_branch_node, surface);
} }
static void static void
@ -2122,7 +2122,7 @@ meta_wayland_surface_is_shortcuts_inhibited (MetaWaylandSurface *surface,
MetaMultiTexture * MetaMultiTexture *
meta_wayland_surface_get_texture (MetaWaylandSurface *surface) meta_wayland_surface_get_texture (MetaWaylandSurface *surface)
{ {
return surface->output_state.texture; return surface->applied_state.texture;
} }
MetaSurfaceActor * MetaSurfaceActor *
@ -2194,7 +2194,7 @@ meta_wayland_surface_get_buffer_width (MetaWaylandSurface *surface)
MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface); MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface);
if (buffer) if (buffer)
return meta_multi_texture_get_width (surface->output_state.texture); return meta_multi_texture_get_width (surface->applied_state.texture);
else else
return 0; return 0;
} }
@ -2205,7 +2205,7 @@ meta_wayland_surface_get_buffer_height (MetaWaylandSurface *surface)
MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface); MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface);
if (buffer) if (buffer)
return meta_multi_texture_get_height (surface->output_state.texture); return meta_multi_texture_get_height (surface->applied_state.texture);
else else
return 0; return 0;
} }
@ -2413,7 +2413,7 @@ meta_wayland_surface_is_xwayland (MetaWaylandSurface *surface)
} }
static void static void
protocol_state_handle_highest_scale_monitor (MetaWaylandSurface *surface) committed_state_handle_highest_scale_monitor (MetaWaylandSurface *surface)
{ {
MetaWaylandSurface *subsurface_surface; MetaWaylandSurface *subsurface_surface;
double scale; double scale;
@ -2422,13 +2422,13 @@ protocol_state_handle_highest_scale_monitor (MetaWaylandSurface *surface)
meta_wayland_fractional_scale_maybe_send_preferred_scale (surface, scale); meta_wayland_fractional_scale_maybe_send_preferred_scale (surface, scale);
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->protocol_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->committed_state,
subsurface_surface) subsurface_surface)
protocol_state_handle_highest_scale_monitor (subsurface_surface); committed_state_handle_highest_scale_monitor (subsurface_surface);
} }
static void static void
output_state_handle_highest_scale_monitor (MetaWaylandSurface *surface) applied_state_handle_highest_scale_monitor (MetaWaylandSurface *surface)
{ {
MetaWaylandSurface *subsurface_surface; MetaWaylandSurface *subsurface_surface;
MetaSurfaceActor *actor = meta_wayland_surface_get_actor (surface); MetaSurfaceActor *actor = meta_wayland_surface_get_actor (surface);
@ -2436,16 +2436,16 @@ output_state_handle_highest_scale_monitor (MetaWaylandSurface *surface)
if (actor) if (actor)
clutter_actor_notify_transform_invalid (CLUTTER_ACTOR (actor)); clutter_actor_notify_transform_invalid (CLUTTER_ACTOR (actor));
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state,
subsurface_surface) subsurface_surface)
output_state_handle_highest_scale_monitor (subsurface_surface); applied_state_handle_highest_scale_monitor (subsurface_surface);
} }
void void
meta_wayland_surface_notify_highest_scale_monitor (MetaWaylandSurface *surface) meta_wayland_surface_notify_highest_scale_monitor (MetaWaylandSurface *surface)
{ {
output_state_handle_highest_scale_monitor (surface); applied_state_handle_highest_scale_monitor (surface);
protocol_state_handle_highest_scale_monitor (surface); committed_state_handle_highest_scale_monitor (surface);
} }
void void

2
src/wayland/meta-wayland-tablet-tool.c
View File

@ -912,7 +912,7 @@ tablet_tool_can_grab_surface (MetaWaylandTabletTool *tool,
if (tool->focus_surface == surface) if (tool->focus_surface == surface)
return TRUE; return TRUE;
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state,
subsurface) subsurface)
{ {
if (tablet_tool_can_grab_surface (tool, subsurface)) if (tablet_tool_can_grab_surface (tool, subsurface))

2
src/wayland/meta-wayland-touch.c
View File

@ -578,7 +578,7 @@ touch_can_grab_surface (MetaWaylandTouchInfo *touch_info,
if (touch_info->touch_surface->surface == surface) if (touch_info->touch_surface->surface == surface)
return TRUE; return TRUE;
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state,
subsurface) subsurface)
{ {
if (touch_can_grab_surface (touch_info, subsurface)) if (touch_can_grab_surface (touch_info, subsurface))

12
src/wayland/meta-wayland-transaction.c
View File

@ -73,14 +73,14 @@ meta_wayland_transaction_sync_child_states (MetaWaylandSurface *surface)
MetaWaylandSubsurface *subsurface; MetaWaylandSubsurface *subsurface;
MetaWaylandActorSurface *actor_surface; MetaWaylandActorSurface *actor_surface;
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->output_state, subsurface_surface) META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->applied_state, subsurface_surface)
{ {
subsurface = META_WAYLAND_SUBSURFACE (subsurface_surface->role); subsurface = META_WAYLAND_SUBSURFACE (subsurface_surface->role);
actor_surface = META_WAYLAND_ACTOR_SURFACE (subsurface); actor_surface = META_WAYLAND_ACTOR_SURFACE (subsurface);
meta_wayland_actor_surface_sync_actor_state (actor_surface); meta_wayland_actor_surface_sync_actor_state (actor_surface);
} }
if (!surface->output_state.parent && if (!surface->applied_state.parent &&
surface->role && META_IS_WAYLAND_SUBSURFACE (surface->role)) surface->role && META_IS_WAYLAND_SUBSURFACE (surface->role))
{ {
/* Unmapped sub-surface */ /* Unmapped sub-surface */
@ -105,7 +105,7 @@ void
meta_wayland_transaction_drop_subsurface_state (MetaWaylandTransaction *transaction, meta_wayland_transaction_drop_subsurface_state (MetaWaylandTransaction *transaction,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
{ {
MetaWaylandSurface *parent = surface->protocol_state.parent; MetaWaylandSurface *parent = surface->committed_state.parent;
MetaWaylandTransactionEntry *entry; MetaWaylandTransactionEntry *entry;
entry = meta_wayland_transaction_get_entry (transaction, surface); entry = meta_wayland_transaction_get_entry (transaction, surface);
@ -126,9 +126,9 @@ is_ancestor (MetaWaylandSurface *candidate,
{ {
MetaWaylandSurface *ancestor; MetaWaylandSurface *ancestor;
for (ancestor = reference->output_state.parent; for (ancestor = reference->applied_state.parent;
ancestor; ancestor;
ancestor = ancestor->output_state.parent) ancestor = ancestor->applied_state.parent)
{ {
if (ancestor == candidate) if (ancestor == candidate)
return TRUE; return TRUE;
@ -145,7 +145,7 @@ meta_wayland_transaction_compare (const void *key1,
MetaWaylandSurface *surface2 = *(MetaWaylandSurface **) key2; MetaWaylandSurface *surface2 = *(MetaWaylandSurface **) key2;
/* Order of siblings doesn't matter */ /* Order of siblings doesn't matter */
if (surface1->output_state.parent == surface2->output_state.parent) if (surface1->applied_state.parent == surface2->applied_state.parent)
return 0; return 0;
/* Ancestor surfaces come before descendant surfaces */ /* Ancestor surfaces come before descendant surfaces */