Address @emersion's feedback

1 files changed, 2 insertions, 12 deletions

diff --git a/include/wlr/types/wlr_layer_shell.h b/include/wlr/types/wlr_layer_shell.h
index c24b391e..e8da8e0f 100644
--- a/include/wlr/types/wlr_layer_shell.h
+++ b/include/wlr/types/wlr_layer_shell.h
@@ -21,7 +21,7 @@
  */
 struct wlr_layer_shell {
 	struct wl_global *wl_global;
-	struct wl_list clients;
+	struct wl_list client_resources; // wl_resource
 
 	struct wl_listener display_destroy;
 
@@ -32,15 +32,6 @@ struct wlr_layer_shell {
 	void *data;
 };
 
-struct wlr_layer_client {
-	struct wlr_layer_shell *shell;
-	struct wl_resource *resource;
-	struct wl_client *client;
-	struct wl_list surfaces;
-
-	struct wl_list link; // wlr_layer_shell::clients
-};
-
 struct wlr_layer_surface_state {
 	uint32_t anchor;
 	int32_t exclusive_zone;
@@ -61,9 +52,8 @@ struct wlr_layer_surface_configure {
 struct wlr_layer_surface {
 	struct wlr_surface *surface;
 	struct wlr_output *output;
-	struct wlr_layer_client *client;
 	struct wl_resource *resource;
-	struct wl_list link; // wlr_layer_client:surfaces
+	struct wlr_layer_shell *shell;
 
 	const char *namespace;
 	enum zwlr_layer_shell_v1_layer layer;