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

wayland: Use helper to access pending state from the outside

Browse Source 
With the eventual aim of exposing the internals of MetaWaylandSurface
outside of meta-wayland-surface.c, make users of the pending state use a
helper to fetch it. While at it, rename the struct field to something
more descriptive.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/907
This commit is contained in:
Jonas Ådahl 2019-03-13 12:47:48 +01:00
parent 8dc730e5ca
commit d60d671fec
6 changed files with 108 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/wayland/meta-wayland-legacy-xdg-shell.c
View File

@ -340,6 +340,7 @@ zxdg_toplevel_v6_set_max_size (struct wl_client *client,
int32_t height) int32_t height)
{ {
MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource); MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource);
MetaWaylandPendingState *pending;
MetaWindow *window; MetaWindow *window;
window = surface->window; window = surface->window;
@ -355,9 +356,10 @@ zxdg_toplevel_v6_set_max_size (struct wl_client *client,
return; return;
} }
surface->pending->has_new_max_size = TRUE; pending = meta_wayland_surface_get_pending_state (surface);
surface->pending->new_max_width = width; pending->has_new_max_size = TRUE;
surface->pending->new_max_height = height; pending->new_max_width = width;
pending->new_max_height = height;
} }
static void static void
@ -367,6 +369,7 @@ zxdg_toplevel_v6_set_min_size (struct wl_client *client,
int32_t height) int32_t height)
{ {
MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource); MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource);
MetaWaylandPendingState *pending;
MetaWindow *window; MetaWindow *window;
window = surface->window; window = surface->window;
@ -382,9 +385,10 @@ zxdg_toplevel_v6_set_min_size (struct wl_client *client,
return; return;
} }
surface->pending->has_new_min_size = TRUE; pending = meta_wayland_surface_get_pending_state (surface);
surface->pending->new_min_width = width; pending->has_new_min_size = TRUE;
surface->pending->new_min_height = height; pending->new_min_width = width;
pending->new_min_height = height;
} }
static void static void
@ -1288,12 +1292,14 @@ zxdg_surface_v6_set_window_geometry (struct wl_client *client,
int32_t height) int32_t height)
{ {
MetaWaylandSurface *surface = surface_from_xdg_surface_resource (resource); MetaWaylandSurface *surface = surface_from_xdg_surface_resource (resource);
MetaWaylandPendingState *pending;
surface->pending->has_new_geometry = TRUE; pending = meta_wayland_surface_get_pending_state (surface);
surface->pending->new_geometry.x = x; pending->has_new_geometry = TRUE;
surface->pending->new_geometry.y = y; pending->new_geometry.x = x;
surface->pending->new_geometry.width = width; pending->new_geometry.y = y;
surface->pending->new_geometry.height = height; pending->new_geometry.width = width;
pending->new_geometry.height = height;
} }
static void static void

6
src/wayland/meta-wayland-pointer-constraints.c
View File

@ -670,10 +670,11 @@ get_pending_constraint_state_container (MetaWaylandPendingState *pending)
static MetaWaylandPendingConstraintState * static MetaWaylandPendingConstraintState *
get_pending_constraint_state (MetaWaylandPointerConstraint *constraint) get_pending_constraint_state (MetaWaylandPointerConstraint *constraint)
{ {
MetaWaylandPendingState *pending = constraint->surface->pending; MetaWaylandPendingState *pending;
MetaWaylandPendingConstraintStateContainer *container; MetaWaylandPendingConstraintStateContainer *container;
GList *l; GList *l;
pending = meta_wayland_surface_get_pending_state (constraint->surface);
container = get_pending_constraint_state_container (pending); container = get_pending_constraint_state_container (pending);
for (l = container->pending_constraint_states; l; l = l->next) for (l = container->pending_constraint_states; l; l = l->next)
{ {
@ -765,10 +766,11 @@ pending_constraint_state_applied (MetaWaylandPendingState *pending,
static MetaWaylandPendingConstraintState * static MetaWaylandPendingConstraintState *
ensure_pending_constraint_state (MetaWaylandPointerConstraint *constraint) ensure_pending_constraint_state (MetaWaylandPointerConstraint *constraint)
{ {
MetaWaylandPendingState *pending = constraint->surface->pending; MetaWaylandPendingState *pending;
MetaWaylandPendingConstraintStateContainer *container; MetaWaylandPendingConstraintStateContainer *container;
MetaWaylandPendingConstraintState *constraint_pending; MetaWaylandPendingConstraintState *constraint_pending;
pending = meta_wayland_surface_get_pending_state (constraint->surface);
container = ensure_pending_constraint_state_container (pending); container = ensure_pending_constraint_state_container (pending);
constraint_pending = get_pending_constraint_state (constraint); constraint_pending = get_pending_constraint_state (constraint);
if (!constraint_pending) if (!constraint_pending)

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

@ -817,15 +817,23 @@ cleanup:
} }
} }
MetaWaylandPendingState *
meta_wayland_surface_get_pending_state (MetaWaylandSurface *surface)
{
return surface->pending_state;
}
static void static void
meta_wayland_surface_commit (MetaWaylandSurface *surface) meta_wayland_surface_commit (MetaWaylandSurface *surface)
{ {
MetaWaylandPendingState *pending = surface->pending_state;
COGL_TRACE_BEGIN_SCOPED (MetaWaylandSurfaceCommit, COGL_TRACE_BEGIN_SCOPED (MetaWaylandSurfaceCommit,
"WaylandSurface (commit)"); "WaylandSurface (commit)");
if (surface->pending->buffer && if (pending->buffer &&
!meta_wayland_buffer_is_realized (surface->pending->buffer)) !meta_wayland_buffer_is_realized (pending->buffer))
meta_wayland_buffer_realize (surface->pending->buffer); meta_wayland_buffer_realize (pending->buffer);
/* /*
* If this is a sub-surface and it is in effective synchronous mode, only * If this is a sub-surface and it is in effective synchronous mode, only
@ -836,9 +844,9 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
* surface is in effective desynchronized mode. * surface is in effective desynchronized mode.
*/ */
if (meta_wayland_surface_should_cache_state (surface)) if (meta_wayland_surface_should_cache_state (surface))
merge_pending_state (surface->pending, surface->sub.pending); merge_pending_state (pending, surface->sub.pending);
else else
meta_wayland_surface_apply_pending_state (surface, surface->pending); meta_wayland_surface_apply_pending_state (surface, pending);
} }
static void static void
@ -856,6 +864,7 @@ wl_surface_attach (struct wl_client *client,
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
wl_resource_get_user_data (surface_resource); wl_resource_get_user_data (surface_resource);
MetaWaylandPendingState *pending = surface->pending_state;
MetaWaylandBuffer *buffer; MetaWaylandBuffer *buffer;
/* X11 unmanaged window */ /* X11 unmanaged window */
@ -867,23 +876,23 @@ wl_surface_attach (struct wl_client *client,
else else
buffer = NULL; buffer = NULL;
if (surface->pending->buffer) if (surface->pending_state->buffer)
{ {
g_clear_signal_handler (&surface->pending->buffer_destroy_handler_id, g_clear_signal_handler (&pending->buffer_destroy_handler_id,
surface->pending->buffer); pending->buffer);
} }
surface->pending->newly_attached = TRUE; pending->newly_attached = TRUE;
surface->pending->buffer = buffer; pending->buffer = buffer;
surface->pending->dx = dx; pending->dx = dx;
surface->pending->dy = dy; pending->dy = dy;
if (buffer) if (buffer)
{ {
surface->pending->buffer_destroy_handler_id = pending->buffer_destroy_handler_id =
g_signal_connect (buffer, "resource-destroyed", g_signal_connect (buffer, "resource-destroyed",
G_CALLBACK (pending_buffer_resource_destroyed), G_CALLBACK (pending_buffer_resource_destroyed),
surface->pending); pending);
} }
} }
@ -896,6 +905,7 @@ wl_surface_damage (struct wl_client *client,
int32_t height) int32_t height)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandPendingState *pending = surface->pending_state;
cairo_rectangle_int_t rectangle; cairo_rectangle_int_t rectangle;
/* X11 unmanaged window */ /* X11 unmanaged window */
@ -908,7 +918,7 @@ wl_surface_damage (struct wl_client *client,
.width = width, .width = width,
.height = height .height = height
}; };
cairo_region_union_rectangle (surface->pending->surface_damage, &rectangle); cairo_region_union_rectangle (pending->surface_damage, &rectangle);
} }
static void static void
@ -928,6 +938,7 @@ wl_surface_frame (struct wl_client *client,
{ {
MetaWaylandFrameCallback *callback; MetaWaylandFrameCallback *callback;
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandPendingState *pending = surface->pending_state;
/* X11 unmanaged window */ /* X11 unmanaged window */
if (!surface) if (!surface)
@ -942,7 +953,7 @@ wl_surface_frame (struct wl_client *client,
wl_resource_set_implementation (callback->resource, NULL, callback, wl_resource_set_implementation (callback->resource, NULL, callback,
destroy_frame_callback); destroy_frame_callback);
wl_list_insert (surface->pending->frame_callback_list.prev, &callback->link); wl_list_insert (pending->frame_callback_list.prev, &callback->link);
} }
static void static void
@ -951,19 +962,20 @@ wl_surface_set_opaque_region (struct wl_client *client,
struct wl_resource *region_resource) struct wl_resource *region_resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandPendingState *pending = surface->pending_state;
/* X11 unmanaged window */ /* X11 unmanaged window */
if (!surface) if (!surface)
return; return;
g_clear_pointer (&surface->pending->opaque_region, cairo_region_destroy); g_clear_pointer (&pending->opaque_region, cairo_region_destroy);
if (region_resource) if (region_resource)
{ {
MetaWaylandRegion *region = wl_resource_get_user_data (region_resource); MetaWaylandRegion *region = wl_resource_get_user_data (region_resource);
cairo_region_t *cr_region = meta_wayland_region_peek_cairo_region (region); cairo_region_t *cr_region = meta_wayland_region_peek_cairo_region (region);
surface->pending->opaque_region = cairo_region_copy (cr_region); pending->opaque_region = cairo_region_copy (cr_region);
} }
surface->pending->opaque_region_set = TRUE; pending->opaque_region_set = TRUE;
} }
static void static void
@ -972,19 +984,20 @@ wl_surface_set_input_region (struct wl_client *client,
struct wl_resource *region_resource) struct wl_resource *region_resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandPendingState *pending = surface->pending_state;
/* X11 unmanaged window */ /* X11 unmanaged window */
if (!surface) if (!surface)
return; return;
g_clear_pointer (&surface->pending->input_region, cairo_region_destroy); g_clear_pointer (&pending->input_region, cairo_region_destroy);
if (region_resource) if (region_resource)
{ {
MetaWaylandRegion *region = wl_resource_get_user_data (region_resource); MetaWaylandRegion *region = wl_resource_get_user_data (region_resource);
cairo_region_t *cr_region = meta_wayland_region_peek_cairo_region (region); cairo_region_t *cr_region = meta_wayland_region_peek_cairo_region (region);
surface->pending->input_region = cairo_region_copy (cr_region); pending->input_region = cairo_region_copy (cr_region);
} }
surface->pending->input_region_set = TRUE; pending->input_region_set = TRUE;
} }
static void static void
@ -1034,6 +1047,7 @@ wl_surface_set_buffer_transform (struct wl_client *client,
int32_t transform) int32_t transform)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
MetaWaylandPendingState *pending = surface->pending_state;
MetaMonitorTransform buffer_transform; MetaMonitorTransform buffer_transform;
buffer_transform = transform_from_wl_output_transform (transform); buffer_transform = transform_from_wl_output_transform (transform);
@ -1047,8 +1061,8 @@ wl_surface_set_buffer_transform (struct wl_client *client,
return; return;
} }
surface->pending->buffer_transform = buffer_transform; pending->buffer_transform = buffer_transform;
surface->pending->has_new_buffer_transform = TRUE; pending->has_new_buffer_transform = TRUE;
} }
static void static void
@ -1057,6 +1071,7 @@ wl_surface_set_buffer_scale (struct wl_client *client,
int scale) int scale)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
MetaWaylandPendingState *pending = surface->pending_state;
if (scale <= 0) if (scale <= 0)
{ {
@ -1067,7 +1082,7 @@ wl_surface_set_buffer_scale (struct wl_client *client,
return; return;
} }
surface->pending->scale = scale; pending->scale = scale;
} }
static void static void
@ -1079,6 +1094,7 @@ wl_surface_damage_buffer (struct wl_client *client,
int32_t height) int32_t height)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandPendingState *pending = surface->pending_state;
cairo_rectangle_int_t rectangle; cairo_rectangle_int_t rectangle;
/* X11 unmanaged window */ /* X11 unmanaged window */
@ -1091,7 +1107,7 @@ wl_surface_damage_buffer (struct wl_client *client,
.width = width, .width = width,
.height = height .height = height
}; };
cairo_region_union_rectangle (surface->pending->buffer_damage, &rectangle); cairo_region_union_rectangle (pending->buffer_damage, &rectangle);
} }
static const struct wl_surface_interface meta_wayland_wl_surface_interface = { static const struct wl_surface_interface meta_wayland_wl_surface_interface = {
@ -1328,7 +1344,7 @@ wl_surface_destructor (struct wl_resource *resource)
g_clear_pointer (&surface->texture, cogl_object_unref); g_clear_pointer (&surface->texture, cogl_object_unref);
g_clear_object (&surface->buffer_ref.buffer); g_clear_object (&surface->buffer_ref.buffer);
g_clear_object (&surface->pending); g_clear_object (&surface->pending_state);
if (surface->opaque_region) if (surface->opaque_region)
cairo_region_destroy (surface->opaque_region); cairo_region_destroy (surface->opaque_region);
@ -1631,7 +1647,7 @@ meta_wayland_surface_get_absolute_coordinates (MetaWaylandSurface *surface,
static void static void
meta_wayland_surface_init (MetaWaylandSurface *surface) meta_wayland_surface_init (MetaWaylandSurface *surface)
{ {
surface->pending = g_object_new (META_TYPE_WAYLAND_PENDING_STATE, NULL); surface->pending_state = g_object_new (META_TYPE_WAYLAND_PENDING_STATE, NULL);
surface->subsurface_branch_node = g_node_new (surface); surface->subsurface_branch_node = g_node_new (surface);
surface->subsurface_leaf_node = surface->subsurface_leaf_node =
g_node_prepend_data (surface->subsurface_branch_node, surface); g_node_prepend_data (surface->subsurface_branch_node, surface);

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

@ -177,7 +177,7 @@ struct _MetaWaylandSurface
} dnd; } dnd;
/* All the pending state that wl_surface.commit will apply. */ /* All the pending state that wl_surface.commit will apply. */
MetaWaylandPendingState *pending; MetaWaylandPendingState *pending_state;
/* Extension resources. */ /* Extension resources. */
struct wl_resource *wl_subsurface; struct wl_resource *wl_subsurface;
@ -231,6 +231,9 @@ MetaWaylandSurface *meta_wayland_surface_create (MetaWaylandCompositor *composit
struct wl_resource *compositor_resource, struct wl_resource *compositor_resource,
guint32 id); guint32 id);
MetaWaylandPendingState *
meta_wayland_surface_get_pending_state (MetaWaylandSurface *surface);
void meta_wayland_surface_apply_pending_state (MetaWaylandSurface *surface, void meta_wayland_surface_apply_pending_state (MetaWaylandSurface *surface,
MetaWaylandPendingState *pending); MetaWaylandPendingState *pending);

32
src/wayland/meta-wayland-viewporter.c
View File

@ -37,6 +37,7 @@ static void
wp_viewport_destructor (struct wl_resource *resource) wp_viewport_destructor (struct wl_resource *resource)
{ {
MetaWaylandSurface *surface; MetaWaylandSurface *surface;
MetaWaylandPendingState *pending;
surface = wl_resource_get_user_data (resource); surface = wl_resource_get_user_data (resource);
if (!surface) if (!surface)
@ -44,10 +45,11 @@ wp_viewport_destructor (struct wl_resource *resource)
g_clear_signal_handler (&surface->viewport.destroy_handler_id, surface); g_clear_signal_handler (&surface->viewport.destroy_handler_id, surface);
surface->pending->viewport_src_rect.size.width = -1; pending = meta_wayland_surface_get_pending_state (surface);
surface->pending->viewport_dst_width = -1; pending->viewport_src_rect.size.width = -1;
surface->pending->has_new_viewport_src_rect = TRUE; pending->viewport_dst_width = -1;
surface->pending->has_new_viewport_dst_size = TRUE; pending->has_new_viewport_src_rect = TRUE;
pending->has_new_viewport_dst_size = TRUE;
surface->viewport.resource = NULL; surface->viewport.resource = NULL;
} }
@ -98,11 +100,14 @@ wp_viewport_set_source (struct wl_client *client,
(new_x == -1 && new_y == -1 && (new_x == -1 && new_y == -1 &&
new_width == -1 && new_height == -1)) new_width == -1 && new_height == -1))
{ {
surface->pending->viewport_src_rect.origin.x = new_x; MetaWaylandPendingState *pending;
surface->pending->viewport_src_rect.origin.y = new_y;
surface->pending->viewport_src_rect.size.width = new_width; pending = meta_wayland_surface_get_pending_state (surface);
surface->pending->viewport_src_rect.size.height = new_height; pending->viewport_src_rect.origin.x = new_x;
surface->pending->has_new_viewport_src_rect = TRUE; pending->viewport_src_rect.origin.y = new_y;
pending->viewport_src_rect.size.width = new_width;
pending->viewport_src_rect.size.height = new_height;
pending->has_new_viewport_src_rect = TRUE;
} }
else else
{ {
@ -134,9 +139,12 @@ wp_viewport_set_destination (struct wl_client *client,
if ((dst_width > 0 && dst_height > 0) || if ((dst_width > 0 && dst_height > 0) ||
(dst_width == -1 && dst_height == -1)) (dst_width == -1 && dst_height == -1))
{ {
surface->pending->viewport_dst_width = dst_width; MetaWaylandPendingState *pending;
surface->pending->viewport_dst_height = dst_height;
surface->pending->has_new_viewport_dst_size = TRUE; pending = meta_wayland_surface_get_pending_state (surface);
pending->viewport_dst_width = dst_width;
pending->viewport_dst_height = dst_height;
pending->has_new_viewport_dst_size = TRUE;
} }
else else
{ {

30
src/wayland/meta-wayland-xdg-shell.c
View File

@ -346,6 +346,7 @@ xdg_toplevel_set_max_size (struct wl_client *client,
int32_t height) int32_t height)
{ {
MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource); MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource);
MetaWaylandPendingState *pending;
if (width < 0 || height < 0) if (width < 0 || height < 0)
{ {
@ -356,9 +357,11 @@ xdg_toplevel_set_max_size (struct wl_client *client,
return; return;
} }
surface->pending->has_new_max_size = TRUE;
surface->pending->new_max_width = width; pending = meta_wayland_surface_get_pending_state (surface);
surface->pending->new_max_height = height; pending->has_new_max_size = TRUE;
pending->new_max_width = width;
pending->new_max_height = height;
} }
static void static void
@ -368,6 +371,7 @@ xdg_toplevel_set_min_size (struct wl_client *client,
int32_t height) int32_t height)
{ {
MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource); MetaWaylandSurface *surface = surface_from_xdg_toplevel_resource (resource);
MetaWaylandPendingState *pending;
if (width < 0 || height < 0) if (width < 0 || height < 0)
{ {
@ -378,9 +382,11 @@ xdg_toplevel_set_min_size (struct wl_client *client,
return; return;
} }
surface->pending->has_new_min_size = TRUE;
surface->pending->new_min_width = width; pending = meta_wayland_surface_get_pending_state (surface);
surface->pending->new_min_height = height; pending->has_new_min_size = TRUE;
pending->new_min_width = width;
pending->new_min_height = height;
} }
static void static void
@ -1377,12 +1383,14 @@ xdg_surface_set_window_geometry (struct wl_client *client,
int32_t height) int32_t height)
{ {
MetaWaylandSurface *surface = surface_from_xdg_surface_resource (resource); MetaWaylandSurface *surface = surface_from_xdg_surface_resource (resource);
MetaWaylandPendingState *pending;
surface->pending->has_new_geometry = TRUE; pending = meta_wayland_surface_get_pending_state (surface);
surface->pending->new_geometry.x = x; pending->has_new_geometry = TRUE;
surface->pending->new_geometry.y = y; pending->new_geometry.x = x;
surface->pending->new_geometry.width = width; pending->new_geometry.y = y;
surface->pending->new_geometry.height = height; pending->new_geometry.width = width;
pending->new_geometry.height = height;
} }
static void static void