compositor: destroy subsurface resources with wlr_subcompositor

include/wlr/types/wlr_compositor.h

@@ -9,6 +9,7 @@ struct wlr_surface;
 struct wlr_subcompositor {
 	struct wl_global *wl_global;
 	struct wl_list wl_resources;
+	struct wl_list subsurface_resources;
 };
 
 struct wlr_compositor {

include/wlr/types/wlr_surface.h

@@ -121,7 +121,7 @@ bool wlr_surface_has_buffer(struct wlr_surface *surface);
 /**
  * Create the subsurface implementation for this surface.
  */
-void wlr_surface_make_subsurface(struct wlr_surface *surface,
+struct wlr_subsurface *wlr_surface_make_subsurface(struct wlr_surface *surface,
 		struct wlr_surface *parent, uint32_t id);
 
 /**

types/wlr_compositor.c

@@ -20,6 +20,15 @@ struct wlr_subsurface *wlr_subsurface_from_surface(
 	return (struct wlr_subsurface *)surface->role_data;
 }
 
+static const struct wl_subcompositor_interface subcompositor_impl;
+
+static struct wlr_subcompositor *subcompositor_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_subcompositor_interface,
+		&subcompositor_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void subcompositor_handle_destroy(struct wl_client *client,
 		struct wl_resource *resource) {
 	wl_resource_destroy(resource);
@@ -29,6 +38,8 @@ static void subcompositor_handle_get_subsurface(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id,
 		struct wl_resource *surface_resource,
 		struct wl_resource *parent_resource) {
+	struct wlr_subcompositor *subcompositor =
+		subcompositor_from_resource(resource);
 	struct wlr_surface *surface = wlr_surface_from_resource(surface_resource);
 	struct wlr_surface *parent = wlr_surface_from_resource(parent_resource);
 
@@ -64,14 +75,25 @@ static void subcompositor_handle_get_subsurface(struct wl_client *client,
 		return;
 	}
 
+	struct wlr_subsurface *subsurface =
 		wlr_surface_make_subsurface(surface, parent, id);
+	if (subsurface == NULL) {
+		return;
+	}
+
+	wl_list_insert(&subcompositor->subsurface_resources,
+		wl_resource_get_link(subsurface->resource));
 }
 
-static const struct wl_subcompositor_interface subcompositor_interface = {
+static const struct wl_subcompositor_interface subcompositor_impl = {
 	.destroy = subcompositor_handle_destroy,
 	.get_subsurface = subcompositor_handle_get_subsurface,
 };
 
+static void subcompositor_resource_destroy(struct wl_resource *resource) {
+	wl_list_remove(wl_resource_get_link(resource));
+}
+
 static void subcompositor_bind(struct wl_client *client, void *data,
 		uint32_t version, uint32_t id) {
 	struct wlr_subcompositor *subcompositor = data;
@@ -81,8 +103,8 @@ static void subcompositor_bind(struct wl_client *client, void *data,
 		wl_client_post_no_memory(client);
 		return;
 	}
-	wl_resource_set_implementation(resource, &subcompositor_interface,
-		subcompositor, NULL);
+	wl_resource_set_implementation(resource, &subcompositor_impl,
+		subcompositor, subcompositor_resource_destroy);
 	wl_list_insert(&subcompositor->wl_resources, wl_resource_get_link(resource));
 }
 
@@ -95,23 +117,28 @@ static void subcompositor_init(struct wlr_subcompositor *subcompositor,
 		return;
 	}
 	wl_list_init(&subcompositor->wl_resources);
+	wl_list_init(&subcompositor->subsurface_resources);
 }
 
 static void subcompositor_finish(struct wlr_subcompositor *subcompositor) {
 	wl_global_destroy(subcompositor->wl_global);
 	struct wl_resource *resource, *tmp;
+	wl_resource_for_each_safe(resource, tmp,
+			&subcompositor->subsurface_resources) {
+		wl_resource_destroy(resource);
+	}
 	wl_resource_for_each_safe(resource, tmp, &subcompositor->wl_resources) {
 		wl_resource_destroy(resource);
 	}
 }
 
 
-static const struct wl_compositor_interface wl_compositor_impl;
+static const struct wl_compositor_interface compositor_impl;
 
 static struct wlr_compositor *compositor_from_resource(
 		struct wl_resource *resource) {
 	assert(wl_resource_instance_of(resource, &wl_compositor_interface,
-		&wl_compositor_impl));
+		&compositor_impl));
 	return wl_resource_get_user_data(resource);
 }
 
@@ -162,12 +189,12 @@ static void wl_compositor_create_region(struct wl_client *client,
 		wl_resource_get_link(region_resource));
 }
 
-static const struct wl_compositor_interface wl_compositor_impl = {
+static const struct wl_compositor_interface compositor_impl = {
 	.create_surface = wl_compositor_create_surface,
 	.create_region = wl_compositor_create_region,
 };
 
-static void wl_compositor_destroy(struct wl_resource *resource) {
+static void compositor_resource_destroy(struct wl_resource *resource) {
 	wl_list_remove(wl_resource_get_link(resource));
 }
 
@@ -182,8 +209,8 @@ static void wl_compositor_bind(struct wl_client *wl_client, void *data,
 		wl_client_post_no_memory(wl_client);
 		return;
 	}
-	wl_resource_set_implementation(resource, &wl_compositor_impl,
-		compositor, wl_compositor_destroy);
+	wl_resource_set_implementation(resource, &compositor_impl,
+		compositor, compositor_resource_destroy);
 	wl_list_insert(&compositor->wl_resources, wl_resource_get_link(resource));
 }
 

types/wlr_surface.c

@@ -827,7 +827,7 @@ static void subsurface_handle_surface_destroy(struct wl_listener *listener,
 	wlr_subsurface_destroy(subsurface);
 }
 
-void wlr_surface_make_subsurface(struct wlr_surface *surface,
+struct wlr_subsurface *wlr_surface_make_subsurface(struct wlr_surface *surface,
 		struct wlr_surface *parent, uint32_t id) {
 	struct wl_client *client = wl_resource_get_client(surface->resource);
 
@@ -835,13 +835,13 @@ void wlr_surface_make_subsurface(struct wlr_surface *surface,
 		calloc(1, sizeof(struct wlr_subsurface));
 	if (!subsurface) {
 		wl_client_post_no_memory(client);
-		return;
+		return NULL;
 	}
 	subsurface->cached = wlr_surface_state_create();
 	if (subsurface->cached == NULL) {
 		free(subsurface);
 		wl_client_post_no_memory(client);
-		return;
+		return NULL;
 	}
 	subsurface->synchronized = true;
 	subsurface->surface = surface;
@@ -863,7 +863,7 @@ void wlr_surface_make_subsurface(struct wlr_surface *surface,
 		wlr_surface_state_destroy(subsurface->cached);
 		free(subsurface);
 		wl_client_post_no_memory(client);
-		return;
+		return NULL;
 	}
 
 	wl_resource_set_implementation(subsurface->resource,
@@ -873,6 +873,8 @@ void wlr_surface_make_subsurface(struct wlr_surface *surface,
 	surface->role_data = subsurface;
 
 	wlr_signal_emit_safe(&parent->events.new_subsurface, subsurface);
+
+	return subsurface;
 }