From 4ef719c416c4e455b6b29b7c1e60df1d3fa26fe4 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Tue, 5 Jul 2016 20:44:33 +0200 Subject: [PATCH] libweston: Implement wl_output version 3 (release request) Signed-off-by: Quentin Glidic Reviewed-by: Emre Ucan Reviewed-by: Pekka Paalanen --- libweston/compositor.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libweston/compositor.c b/libweston/compositor.c index 783ff7e5..2eb3a3b0 100644 --- a/libweston/compositor.c +++ b/libweston/compositor.c @@ -4018,6 +4018,17 @@ weston_compositor_stack_plane(struct weston_compositor *ec, wl_list_insert(&ec->plane_list, &plane->link); } +static void +output_release(struct wl_client *client, struct wl_resource *resource) +{ + wl_resource_destroy(resource); +} + +static const struct wl_output_interface output_interface = { + output_release, +}; + + static void unbind_resource(struct wl_resource *resource) { wl_list_remove(wl_resource_get_link(resource)); @@ -4039,7 +4050,7 @@ bind_output(struct wl_client *client, } wl_list_insert(&output->resource_list, wl_resource_get_link(resource)); - wl_resource_set_implementation(resource, NULL, data, unbind_resource); + wl_resource_set_implementation(resource, &output_interface, data, unbind_resource); wl_output_send_geometry(resource, output->x, @@ -4312,7 +4323,7 @@ weston_output_init(struct weston_output *output, struct weston_compositor *c, output->compositor->output_id_pool |= 1u << output->id; output->global = - wl_global_create(c->wl_display, &wl_output_interface, 2, + wl_global_create(c->wl_display, &wl_output_interface, 3, output, bind_output); }