scaled-buffer: remove *_from_node() functions

diff --git a/include/common/node-type.h b/include/common/node-type.h
index 0afa5f58aca306146b54efdd3bf6e78158dd10c3..0ae1c4a939d0d89a7d6b487cb543cb5180091134 100644 (file)
--- a/include/common/node-type.h
+++ b/include/common/node-type.h
@@ -62,7 +62,6 @@ enum lab_node_type {
 
        /* never returned by get_cursor_context() */
        LAB_NODE_TREE,
-       LAB_NODE_SCALED_BUFFER,
 };
 
 enum lab_node_type node_type_parse(const char *context);

diff --git a/include/node.h b/include/node.h
index 52ebed96651409250638d106611a80b7ef61c81d..d6d177f0b37254381869e94925bac99299f416b3 100644 (file)
--- a/include/node.h
+++ b/include/node.h
@@ -59,13 +59,6 @@ struct lab_layer_popup *node_layer_popup_from_node(
 struct menuitem *node_menuitem_from_node(
        struct wlr_scene_node *wlr_scene_node);
 
-/**
- * node_scaled_buffer_from_node - return scaled_buffer from node
- * @wlr_scene_node: wlr_scene_node from which to return data
- */
-struct scaled_buffer *node_scaled_buffer_from_node(
-       struct wlr_scene_node *wlr_scene_node);
-
 /**
  * node_try_ssd_button_from_node - return ssd_button or NULL from node
  * @wlr_scene_node: wlr_scene_node from which to return data

diff --git a/include/scaled-buffer/scaled-icon-buffer.h b/include/scaled-buffer/scaled-icon-buffer.h
index b6830f3ecdbcd2efe2fd6f86e607b01397343d0a..45492ec26fce9d74509d994b39bd1afe3afa0b1d 100644 (file)
--- a/include/scaled-buffer/scaled-icon-buffer.h
+++ b/include/scaled-buffer/scaled-icon-buffer.h
@@ -48,7 +48,4 @@ void scaled_icon_buffer_set_view(struct scaled_icon_buffer *self,
 void scaled_icon_buffer_set_icon_name(struct scaled_icon_buffer *self,
        const char *icon_name);
 
-/* Obtain scaled_icon_buffer from wlr_scene_node */
-struct scaled_icon_buffer *scaled_icon_buffer_from_node(struct wlr_scene_node *node);
-
 #endif /* LABWC_SCALED_ICON_BUFFER_H */

diff --git a/include/scaled-buffer/scaled-img-buffer.h b/include/scaled-buffer/scaled-img-buffer.h
index 23fb9e1797038f1e2b6773cdbf56b21d537f09cd..e8784eb0fe5ed540215831cf213683bfe9fa6bcf 100644 (file)
--- a/include/scaled-buffer/scaled-img-buffer.h
+++ b/include/scaled-buffer/scaled-img-buffer.h
@@ -64,7 +64,4 @@ struct scaled_img_buffer {
 struct scaled_img_buffer *scaled_img_buffer_create(struct wlr_scene_tree *parent,
        struct lab_img *img, int width, int height);
 
-/* Obtain scaled_img_buffer from wlr_scene_node */
-struct scaled_img_buffer *scaled_img_buffer_from_node(struct wlr_scene_node *node);
-
 #endif /* LABWC_SCALED_IMG_BUFFER_H */

diff --git a/src/desktop.c b/src/desktop.c
index efd46dc5651ae444916c54fcb273612f3bfe3c61..2327c193686568b1efec5a954e8d5ae02203b30d 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -332,7 +332,6 @@ get_cursor_context(struct server *server)
                                ret.type = LAB_NODE_MENUITEM;
                                return ret;
                        case LAB_NODE_TREE:
-                       case LAB_NODE_SCALED_BUFFER:
                                /* Continue to parent node */
                                break;
                        default:

diff --git a/src/node.c b/src/node.c
index 046fa5e286fcfcdaa9bf2649bb9dd2e84adb3c56..025789e86da4b85fdfe11cf25c1c4c3e20bbab27 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -68,15 +68,6 @@ node_menuitem_from_node(struct wlr_scene_node *wlr_scene_node)
        return (struct menuitem *)node_descriptor->data;
 }
 
-struct scaled_buffer *
-node_scaled_buffer_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_SCALED_BUFFER);
-       return (struct scaled_buffer *)node_descriptor->data;
-}
-
 struct ssd_button *
 node_try_ssd_button_from_node(struct wlr_scene_node *wlr_scene_node)
 {

diff --git a/src/scaled-buffer/scaled-buffer.c b/src/scaled-buffer/scaled-buffer.c
index c4a3219c3f2e8014f096ab2815c0a491c6c87dbc..8bef0a7541204b19f9196731c4dc984298946cfa 100644 (file)
--- a/src/scaled-buffer/scaled-buffer.c
+++ b/src/scaled-buffer/scaled-buffer.c
@@ -197,8 +197,6 @@ scaled_buffer_create(struct wlr_scene_tree *parent,
                free(self);
                return NULL;
        }
-       node_descriptor_create(&self->scene_buffer->node,
-               LAB_NODE_SCALED_BUFFER, /*view*/ NULL, self);
 
        self->impl = impl;
        /*

diff --git a/src/scaled-buffer/scaled-icon-buffer.c b/src/scaled-buffer/scaled-icon-buffer.c
index b712433697b9599e967ae13495999beb8b91cfbf..0cd09b22bcae955dbeb40b3bab869101e771722b 100644 (file)
--- a/src/scaled-buffer/scaled-icon-buffer.c
+++ b/src/scaled-buffer/scaled-icon-buffer.c
@@ -349,12 +349,3 @@ scaled_icon_buffer_set_icon_name(struct scaled_icon_buffer *self,
        xstrdup_replace(self->icon_name, icon_name);
        scaled_buffer_request_update(self->scaled_buffer, self->width, self->height);
 }
-
-struct scaled_icon_buffer *
-scaled_icon_buffer_from_node(struct wlr_scene_node *node)
-{
-       struct scaled_buffer *scaled_buffer =
-               node_scaled_buffer_from_node(node);
-       assert(scaled_buffer->impl == &impl);
-       return scaled_buffer->data;
-}

diff --git a/src/scaled-buffer/scaled-img-buffer.c b/src/scaled-buffer/scaled-img-buffer.c
index 4ce9618a852d4a0fc4d1c6da35756b89e30fb034..50baa961ed5adcd51db664255c70777488888667 100644 (file)
--- a/src/scaled-buffer/scaled-img-buffer.c
+++ b/src/scaled-buffer/scaled-img-buffer.c
@@ -65,12 +65,3 @@ scaled_img_buffer_create(struct wlr_scene_tree *parent, struct lab_img *img,
 
        return self;
 }
-
-struct scaled_img_buffer *
-scaled_img_buffer_from_node(struct wlr_scene_node *node)
-{
-       struct scaled_buffer *scaled_buffer =
-               node_scaled_buffer_from_node(node);
-       assert(scaled_buffer->impl == &impl);
-       return scaled_buffer->data;
-}