Remove wlr_surface::subsurface

2 files changed, 5 insertions, 4 deletions

diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h
index 922d7c0f..7c94123a 100644
--- a/include/wlr/types/wlr_compositor.h
+++ b/include/wlr/types/wlr_compositor.h
@@ -6,6 +6,8 @@
 
 struct wlr_surface;
 
+// TODO: expose subcompositor
+
 struct wlr_compositor {
 	struct wl_global *wl_global;
 	struct wl_list wl_resources;
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index 62f03e37..35d47926 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -56,7 +56,8 @@ struct wlr_subsurface {
 	struct wl_list parent_link;
 	struct wl_list parent_pending_link;
 
-	struct wl_listener parent_destroy_listener;
+	struct wl_listener surface_destroy;
+	struct wl_listener parent_destroy;
 
 	struct {
 		struct wl_signal destroy;
@@ -87,9 +88,7 @@ struct wlr_surface {
 	void (*role_committed)(struct wlr_surface *surface, void *role_data);
 	void *role_data;
 
-	// subsurface properties
-	struct wlr_subsurface *subsurface;
-	struct wl_list subsurface_list; // wlr_subsurface::parent_link
+	struct wl_list subsurfaces; // wlr_subsurface::parent_link
 
 	// wlr_subsurface::parent_pending_link
 	struct wl_list subsurface_pending_list;