node.c: use wlr_scene_node instead of node_descriptor

diff --git a/include/node.h b/include/node.h
index ab222b8dea86ee8bf40c9500537647fcee6c1b12..b1fffb9abd18025e9aeae9c12fe0f196e9654066 100644 (file)
--- 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 0e68adb0f492e992474a5fd414b5ece130417291..68dcbc2a669c22e045810e0033a9d44f7d920339 100644 (file)
--- 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 bd656ea47077576d1fe8db0d6d492f80cd08343e..c189358a6a839b4a55ca304d0cbae80c4223c52f 100644 (file)
--- 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;
 }