output: remove node descriptors

diff --git a/include/common/node-type.h b/include/common/node-type.h
index 0ae1c4a939d0d89a7d6b487cb543cb5180091134..41f4d3810121616528b2e70b45469dc73e1ca681 100644 (file)
--- a/include/common/node-type.h
+++ b/include/common/node-type.h
@@ -59,9 +59,6 @@ enum lab_node_type {
        LAB_NODE_LAYER_POPUP,
        LAB_NODE_SESSION_LOCK_SURFACE,
        LAB_NODE_IME_POPUP,
-
-       /* never returned by get_cursor_context() */
-       LAB_NODE_TREE,
 };
 
 enum lab_node_type node_type_parse(const char *context);

diff --git a/src/desktop.c b/src/desktop.c
index 2327c193686568b1efec5a954e8d5ae02203b30d..75c2648e9839c4127f963ba99273fa96ad4c5f61 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -331,9 +331,6 @@ get_cursor_context(struct server *server)
                                ret.node = node;
                                ret.type = LAB_NODE_MENUITEM;
                                return ret;
-                       case LAB_NODE_TREE:
-                               /* Continue to parent node */
-                               break;
                        default:
                                /*
                                 * All other node descriptors (buttons, title,

diff --git a/src/output.c b/src/output.c
index e47da9ca45cf6b3b1b2bb835aa898f3865f90123..22e9fc4ef164af8e971bfec9b424a350086de159 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -509,18 +509,10 @@ handle_new_output(struct wl_listener *listener, void *data)
        for (size_t i = 0; i < ARRAY_SIZE(output->layer_tree); i++) {
                output->layer_tree[i] =
                        wlr_scene_tree_create(&server->scene->tree);
-               node_descriptor_create(&output->layer_tree[i]->node,
-                       LAB_NODE_TREE, /*view*/ NULL, /*data*/ NULL);
        }
        output->layer_popup_tree = wlr_scene_tree_create(&server->scene->tree);
-       node_descriptor_create(&output->layer_popup_tree->node,
-               LAB_NODE_TREE, /*view*/ NULL, /*data*/ NULL);
        output->osd_tree = wlr_scene_tree_create(&server->scene->tree);
-       node_descriptor_create(&output->osd_tree->node,
-               LAB_NODE_TREE, /*view*/ NULL, /*data*/ NULL);
        output->session_lock_tree = wlr_scene_tree_create(&server->scene->tree);
-       node_descriptor_create(&output->session_lock_tree->node,
-               LAB_NODE_TREE, /*view*/ NULL, /*data*/ NULL);
 
        /*
         * Set the z-positions to achieve the following order (from top to