chase: use wlroots tree node getters

diff --git a/include/common/scene-helpers.h b/include/common/scene-helpers.h
index 98c1bbd6a8dbd04406f4bb52a10911537e890b26..11697a94c745ce9a1a4b7c36626c4f726592d821 100644 (file)
--- a/include/common/scene-helpers.h
+++ b/include/common/scene-helpers.h
@@ -5,13 +5,9 @@
 #include <stdbool.h>
 
 struct wlr_scene_node;
-struct wlr_scene_rect;
-struct wlr_scene_tree;
 struct wlr_surface;
 struct wlr_scene_output;
 
-struct wlr_scene_rect *lab_wlr_scene_get_rect(struct wlr_scene_node *node);
-struct wlr_scene_tree *lab_scene_tree_from_node(struct wlr_scene_node *node);
 struct wlr_surface *lab_wlr_surface_from_node(struct wlr_scene_node *node);
 
 /**

diff --git a/src/common/scene-helpers.c b/src/common/scene-helpers.c
index 7f9a7d0b79af436d094088e436618bb5008ec699..b8a7ac476edddde098eb30b8e03556e21388744c 100644 (file)
--- a/src/common/scene-helpers.c
+++ b/src/common/scene-helpers.c
@@ -6,20 +6,6 @@
 #include <wlr/util/log.h>
 #include "common/scene-helpers.h"
 
-struct wlr_scene_rect *
-lab_wlr_scene_get_rect(struct wlr_scene_node *node)
-{
-       assert(node->type == WLR_SCENE_NODE_RECT);
-       return (struct wlr_scene_rect *)node;
-}
-
-struct wlr_scene_tree *
-lab_scene_tree_from_node(struct wlr_scene_node *node)
-{
-       assert(node->type == WLR_SCENE_NODE_TREE);
-       return (struct wlr_scene_tree *)node;
-}
-
 struct wlr_surface *
 lab_wlr_surface_from_node(struct wlr_scene_node *node)
 {

diff --git a/src/debug.c b/src/debug.c
index b0548e740fa15cbcee0f5c8d652a3ccfb67f1285..bac6cbaaae485663d29a2e53fb620137360e576e 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -170,7 +170,7 @@ dump_tree(struct server *server, struct wlr_scene_node *node,
 
        if (node->type == WLR_SCENE_NODE_TREE) {
                struct wlr_scene_node *child;
-               struct wlr_scene_tree *tree = lab_scene_tree_from_node(node);
+               struct wlr_scene_tree *tree = wlr_scene_tree_from_node(node);
                wl_list_for_each(child, &tree->children, link) {
                        dump_tree(server, child, pos + INDENT_SIZE,
                                x + child->x, y + child->y);

diff --git a/src/menu/menu.c b/src/menu/menu.c
index 3e36d3ad80cc1f4b6b83a6a57bf4b719a4e1b707..35f00b9fbf2c85757222c5a5168463dcffe49a7c 100644 (file)
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -87,19 +87,19 @@ menu_update_width(struct menu *menu)
        /* Update all items for the new size */
        wl_list_for_each(item, &menu->menuitems, link) {
                wlr_scene_rect_set_size(
-                       lab_wlr_scene_get_rect(item->normal.background),
+                       wlr_scene_rect_from_node(item->normal.background),
                        menu->size.width, item->height);
 
                if (!item->selected.background) {
                        /* This is a separator. They don't have a selected background. */
                        wlr_scene_rect_set_size(
-                               lab_wlr_scene_get_rect(item->normal.text),
+                               wlr_scene_rect_from_node(item->normal.text),
                                menu->size.width - 2 * theme->menu_separator_padding_width,
                                theme->menu_separator_line_thickness);
                } else {
                        /* Usual menu item */
                        wlr_scene_rect_set_size(
-                               lab_wlr_scene_get_rect(item->selected.background),
+                               wlr_scene_rect_from_node(item->selected.background),
                                menu->size.width, item->height);
                        if (item->native_width > max_width || item->submenu) {
                                scaled_font_buffer_set_max_width(item->normal.buffer,

diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index 4580ec2f7b5b158bd41dea267be7fa0a70ed1e60..0f1eafca45b44e3488c53ac796ce114a73431dd4 100644 (file)
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -339,7 +339,7 @@ ssd_enable_keybind_inhibit_indicator(struct ssd *ssd, bool enable)
                : rc.theme->window_active_border_color;
 
        struct ssd_part *part = ssd_get_part(&ssd->border.active.parts, LAB_SSD_PART_TOP);
-       struct wlr_scene_rect *rect = lab_wlr_scene_get_rect(part->node);
+       struct wlr_scene_rect *rect = wlr_scene_rect_from_node(part->node);
        wlr_scene_rect_set_color(rect, color);
 }
 

diff --git a/src/ssd/ssd_border.c b/src/ssd/ssd_border.c
index 40be4f39ba3a31e5eadbe489678590533c91d7f0..c12b07b26d404dfa38d89605bc6e58ba27cbd1a0 100644 (file)
--- a/src/ssd/ssd_border.c
+++ b/src/ssd/ssd_border.c
@@ -91,7 +91,7 @@ ssd_border_update(struct ssd *ssd)
        struct ssd_sub_tree *subtree;
        FOR_EACH_STATE(ssd, subtree) {
                wl_list_for_each(part, &subtree->parts, link) {
-                       rect = lab_wlr_scene_get_rect(part->node);
+                       rect = wlr_scene_rect_from_node(part->node);
                        switch (part->type) {
                        case LAB_SSD_PART_LEFT:
                                wlr_scene_rect_set_size(rect,

diff --git a/src/ssd/ssd_extents.c b/src/ssd/ssd_extents.c
index 05869e2129fb0cd3db4776b75aae18a203b1453a..22bfa579d863bd4bc7f500534b77e823148d270c 100644 (file)
--- a/src/ssd/ssd_extents.c
+++ b/src/ssd/ssd_extents.c
@@ -138,7 +138,7 @@ ssd_extents_update(struct ssd *ssd)
 
        struct wlr_box *target;
        wl_list_for_each(part, &ssd->extents.parts, link) {
-               rect = lab_wlr_scene_get_rect(part->node);
+               rect = wlr_scene_rect_from_node(part->node);
                target = part->geometry;
                switch (part->type) {
                case LAB_SSD_PART_TOP:

diff --git a/src/ssd/ssd_titlebar.c b/src/ssd/ssd_titlebar.c
index 62ac232cb7dd98a27130ddf0eef7a6e6a1bdd463..55cfe51b1ca65a71a41dc33e47d0730fd81d134e 100644 (file)
--- a/src/ssd/ssd_titlebar.c
+++ b/src/ssd/ssd_titlebar.c
@@ -110,7 +110,7 @@ set_squared_corners(struct ssd *ssd, bool enable)
                        struct ssd_button *button = node_ssd_button_from_node(part->node);
 
                        /* Toggle background between invisible and titlebar background color */
-                       struct wlr_scene_rect *rect = lab_wlr_scene_get_rect(button->background);
+                       struct wlr_scene_rect *rect = wlr_scene_rect_from_node(button->background);
                        wlr_scene_rect_set_color(rect, !enable ? (float[4]) {0, 0, 0, 0} : (
                                subtree == &ssd->titlebar.active
                                        ? rc.theme->window_active_title_bg_color
@@ -149,7 +149,7 @@ ssd_titlebar_update(struct ssd *ssd)
                        switch (part->type) {
                        case LAB_SSD_PART_TITLEBAR:
                                wlr_scene_rect_set_size(
-                                       lab_wlr_scene_get_rect(part->node),
+                                       wlr_scene_rect_from_node(part->node),
                                        width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT,
                                        theme->title_height);
                                continue;