From eb7645d0e0531a789290e7b0741330427afbd2ba Mon Sep 17 00:00:00 2001
From: Johan Malm <jgm323@gmail.com>
Date: Wed, 2 Mar 2022 22:24:30 +0000
Subject: [PATCH] node.c: use wlr_scene_node instead of node_descriptor

---
 include/node.h | 12 ++++++------
 src/debug.c    |  2 +-
 src/node.c     | 12 +++++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/include/node.h b/include/node.h
index ab222b8d..b1fffb9a 100644
--- a/include/node.h
+++ b/include/node.h
@@ -36,22 +36,22 @@ void node_descriptor_create(struct wlr_scene_node *scene_node,
 
 /**
  * node_view_from_node - return view struct from node
- * @node_descriptor: node_descriptor from which to return data
+ * @wlr_scene_node: wlr_scene_node from which to return data
  */
-struct view *node_view_from_node(struct node_descriptor *node_descriptor);
+struct view *node_view_from_node(struct wlr_scene_node *wlr_scene_node);
 
 /**
  * node_lab_surface_from_node - return lab_layer_surface struct from node
- * @node_descriptor: node_descriptor from which to return data
+ * @wlr_scene_node: wlr_scene_node from which to return data
  */
 struct lab_layer_surface *node_layer_surface_from_node(
-	struct node_descriptor *node_descriptor);
+	struct wlr_scene_node *wlr_scene_node);
 
 /**
  * node_layer_popup_from_node - return lab_layer_popup struct from node
- * @node_descriptor: node_descriptor from which to return data
+ * @wlr_scene_node: wlr_scene_node from which to return data
  */
 struct lab_layer_popup *node_layer_popup_from_node(
-	struct node_descriptor *node_descriptor);
+	struct wlr_scene_node *wlr_scene_node);
 
 #endif /* __LABWC_NODE_DESCRIPTOR_H */
diff --git a/src/debug.c b/src/debug.c
index 0e68adb0..68dcbc2a 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -112,7 +112,7 @@ get_special(struct server *server, struct wlr_scene_node *node,
 		return "server->view_tree";
 	}
 	if (node->parent == &server->view_tree->node) {
-		*last_view = node_view_from_node(node->data);
+		*last_view = node_view_from_node(node);
 	}
 	const char *view_part = get_view_part(*last_view, node);
 	if (view_part) {
diff --git a/src/node.c b/src/node.c
index bd656ea4..c189358a 100644
--- a/src/node.c
+++ b/src/node.c
@@ -38,23 +38,29 @@ node_descriptor_create(struct wlr_scene_node *scene_node,
 }
 
 struct view *
-node_view_from_node(struct node_descriptor *node_descriptor)
+node_view_from_node(struct wlr_scene_node *wlr_scene_node)
 {
+	assert(wlr_scene_node->data);
+	struct node_descriptor *node_descriptor = wlr_scene_node->data;
 	assert(node_descriptor->type == LAB_NODE_DESC_VIEW
 		|| node_descriptor->type == LAB_NODE_DESC_XDG_POPUP);
 	return (struct view *)node_descriptor->data;
 }
 
 struct lab_layer_surface *
-node_layer_surface_from_node(struct node_descriptor *node_descriptor)
+node_layer_surface_from_node(struct wlr_scene_node *wlr_scene_node)
 {
+	assert(wlr_scene_node->data);
+	struct node_descriptor *node_descriptor = wlr_scene_node->data;
 	assert(node_descriptor->type == LAB_NODE_DESC_LAYER_SURFACE);
 	return (struct lab_layer_surface *)node_descriptor->data;
 }
 
 struct lab_layer_popup *
-node_layer_popup_from_node(struct node_descriptor *node_descriptor)
+node_layer_popup_from_node(struct wlr_scene_node *wlr_scene_node)
 {
+	assert(wlr_scene_node->data);
+	struct node_descriptor *node_descriptor = wlr_scene_node->data;
 	assert(node_descriptor->type == LAB_NODE_DESC_LAYER_POPUP);
 	return (struct lab_layer_popup *)node_descriptor->data;
 }