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/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c
index 8542e2e..b9c82a8 100644
--- a/fullscreen-shell/fullscreen-shell.c
+++ b/fullscreen-shell/fullscreen-shell.c
@@ -218,7 +218,7 @@
}
static void
-black_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
+black_surface_committed(struct weston_surface *es, int32_t sx, int32_t sy)
{
}
@@ -241,8 +241,8 @@
return NULL;
}
- surface->configure = black_surface_configure;
- surface->configure_private = fsout;
+ surface->committed = black_surface_committed;
+ surface->committed_private = fsout;
weston_surface_set_color(surface, 0.0f, 0.0f, 0.0f, 1.0f);
pixman_region32_fini(&surface->opaque);
pixman_region32_init_rect(&surface->opaque, 0, 0, w, h);
@@ -620,10 +620,10 @@
configure_presented_surface(struct weston_surface *surface, int32_t sx,
int32_t sy)
{
- struct fullscreen_shell *shell = surface->configure_private;
+ struct fullscreen_shell *shell = surface->committed_private;
struct fs_output *fsout;
- if (surface->configure != configure_presented_surface)
+ if (surface->committed != configure_presented_surface)
return;
wl_list_for_each(fsout, &shell->output_list, link)
@@ -644,8 +644,8 @@
fsout->view = NULL;
if (wl_list_empty(&fsout->surface->views)) {
- fsout->surface->configure = NULL;
- fsout->surface->configure_private = NULL;
+ fsout->surface->committed = NULL;
+ fsout->surface->committed_private = NULL;
}
fsout->surface = NULL;
@@ -699,9 +699,9 @@
fs_output_clear_pending(fsout);
if (surface) {
- if (!surface->configure) {
- surface->configure = configure_presented_surface;
- surface->configure_private = fsout->shell;
+ if (!surface->committed) {
+ surface->committed = configure_presented_surface;
+ surface->committed_private = fsout->shell;
}
fsout->pending.surface = surface;
@@ -719,8 +719,8 @@
fsout->view = NULL;
if (wl_list_empty(&fsout->surface->views)) {
- fsout->surface->configure = NULL;
- fsout->surface->configure_private = NULL;
+ fsout->surface->committed = NULL;
+ fsout->surface->committed_private = NULL;
}
fsout->surface = NULL;