libweston: Rename weston_surface::configure to ::committed
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Jonas Ã…dahl <jadahl@gmail.com>
Acked-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Differential Revision: https://phabricator.freedesktop.org/D1246
diff --git a/libweston/compositor.c b/libweston/compositor.c
index 2eb3a3b..be3c9fa 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -2843,8 +2843,8 @@
if (state->newly_attached || state->buffer_viewport.changed) {
weston_surface_update_size(surface);
- if (surface->configure)
- surface->configure(surface, state->sx, state->sy);
+ if (surface->committed)
+ surface->committed(surface, state->sx, state->sy);
}
state->sx = 0;
@@ -3268,7 +3268,7 @@
}
static void
-subsurface_configure(struct weston_surface *surface, int32_t dx, int32_t dy)
+subsurface_committed(struct weston_surface *surface, int32_t dx, int32_t dy)
{
struct weston_view *view;
@@ -3302,8 +3302,8 @@
static struct weston_subsurface *
weston_surface_to_subsurface(struct weston_surface *surface)
{
- if (surface->configure == subsurface_configure)
- return surface->configure_private;
+ if (surface->committed == subsurface_committed)
+ return surface->committed_private;
return NULL;
}
@@ -3684,8 +3684,8 @@
weston_surface_state_fini(&sub->cached);
weston_buffer_reference(&sub->cached_buffer_ref, NULL);
- sub->surface->configure = NULL;
- sub->surface->configure_private = NULL;
+ sub->surface->committed = NULL;
+ sub->surface->committed_private = NULL;
weston_surface_set_label_func(sub->surface, NULL);
} else {
/* the dummy weston_subsurface for the parent itself */
@@ -3816,8 +3816,8 @@
return;
}
- surface->configure = subsurface_configure;
- surface->configure_private = sub;
+ surface->committed = subsurface_committed;
+ surface->committed_private = sub;
weston_surface_set_label_func(surface, subsurface_get_label);
}