From fb3dcb7959470fb9179b3782640fea9c287577b8 Mon Sep 17 00:00:00 2001 From: tokyo4j Date: Sun, 7 Sep 2025 21:45:29 +0900 Subject: [PATCH] scaled-buffer: remove *_from_node() functions --- include/common/node-type.h | 1 - include/node.h | 7 ------- include/scaled-buffer/scaled-icon-buffer.h | 3 --- include/scaled-buffer/scaled-img-buffer.h | 3 --- src/desktop.c | 1 - src/node.c | 9 --------- src/scaled-buffer/scaled-buffer.c | 2 -- src/scaled-buffer/scaled-icon-buffer.c | 9 --------- src/scaled-buffer/scaled-img-buffer.c | 9 --------- 9 files changed, 44 deletions(-) diff --git a/include/common/node-type.h b/include/common/node-type.h index 0afa5f58..0ae1c4a9 100644 --- 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 52ebed96..d6d177f0 100644 --- 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 b6830f3e..45492ec2 100644 --- 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 23fb9e17..e8784eb0 100644 --- 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 efd46dc5..2327c193 100644 --- 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 046fa5e2..025789e8 100644 --- 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 c4a3219c..8bef0a75 100644 --- 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 b7124336..0cd09b22 100644 --- 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 4ce9618a..50baa961 100644 --- 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; -} -- 2.52.0