Chase wlroots: scene_node.state is now inlined

Chases wlroots cb2dbc327e4d695c2a60a386e116a7dc20b29107
wlr_scene: Inline wlr_scene_node_state

diff --git a/src/debug.c b/src/debug.c
index a22e633d2be5e44b971b1b17dfdae18887fb4e7a..cf681820c4026bc8d1f02619c6120a59ce8c30de 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -173,9 +173,9 @@ dump_tree(struct server *server, struct wlr_scene_node *node,
                return;
        }
        struct wlr_scene_node *child;
-       wl_list_for_each(child, &node->state.children, state.link) {
+       wl_list_for_each(child, &node->children, link) {
                dump_tree(server, child, pos + INDENT_SIZE,
-                       x + child->state.x, y + child->state.y);
+                       x + child->x, y + child->y);
        }
 }
 

diff --git a/src/layers.c b/src/layers.c
index 1a93d691de359e39630a80d8838a139b0e02f7b3..8c11e1f518238255276b9b6e5ad03f308271ed4b 100644 (file)
--- a/src/layers.c
+++ b/src/layers.c
@@ -230,8 +230,8 @@ move_popup_to_top_layer(struct lab_layer_surface *toplevel,
        struct output *output = output_from_wlr_output(server, wlr_output);
        struct wlr_box box = { 0 };
        wlr_output_layout_get_box(server->output_layout, wlr_output, &box);
-       int lx = toplevel->scene_layer_surface->tree->node.state.x + box.x;
-       int ly = toplevel->scene_layer_surface->tree->node.state.y + box.y;
+       int lx = toplevel->scene_layer_surface->tree->node.x + box.x;
+       int ly = toplevel->scene_layer_surface->tree->node.y + box.y;
 
        struct wlr_scene_node *node = &popup->scene_tree->node;
        wlr_scene_node_reparent(node, output->layer_popup_tree);

diff --git a/src/menu/menu.c b/src/menu/menu.c
index d4ad30df49c5020e89c1148dfa2d6ce0556929f1..6b7581faadd89deb30583de18bdb47097f0a2253 100644 (file)
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -435,7 +435,7 @@ menu_configure(struct menu *menu, int lx, int ly, enum menu_align align)
                } else {
                        new_lx = lx;
                }
-               rel_y = item->tree->node.state.y;
+               rel_y = item->tree->node.y;
                new_ly = ly + rel_y - theme->menu_overlap_y;
                menu_configure(item->submenu, new_lx, new_ly, align);
        }

diff --git a/src/osd.c b/src/osd.c
index 29fa07eccd51e833a359c7f734ac67c3ba6d583f..11f03941e3be24c6778a2ff133b9933718eab037 100644 (file)
--- a/src/osd.c
+++ b/src/osd.c
@@ -96,8 +96,8 @@ static void
 destroy_osd_nodes(struct output *output)
 {
        struct wlr_scene_node *child, *next;
-       struct wl_list *children = &output->osd_tree->node.state.children;
-       wl_list_for_each_safe(child, next, children, state.link) {
+       struct wl_list *children = &output->osd_tree->node.children;
+       wl_list_for_each_safe(child, next, children, link) {
                wlr_scene_node_destroy(child);
        }
 }

diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index c60048f7fa1061cfa017416bbf5beb04742655a6..97e804c6e305eda1f10bb5cd66a356561bdadeb0 100644 (file)
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -169,11 +169,11 @@ ssd_update_geometry(struct view *view)
        }
 
        if (!view->ssd.enabled) {
-               if (view->ssd.tree->node.state.enabled) {
+               if (view->ssd.tree->node.enabled) {
                        wlr_scene_node_set_enabled(&view->ssd.tree->node, false);
                }
                return;
-       } else if (!view->ssd.tree->node.state.enabled) {
+       } else if (!view->ssd.tree->node.enabled) {
                wlr_scene_node_set_enabled(&view->ssd.tree->node, true);
        }
 

diff --git a/src/ssd/ssd_extents.c b/src/ssd/ssd_extents.c
index df1c5f45c697e91705cb71075a399e7867bd9133..31e0b337763657458d87badb1dfe1b83084cdcb5 100644 (file)
--- a/src/ssd/ssd_extents.c
+++ b/src/ssd/ssd_extents.c
@@ -99,7 +99,7 @@ ssd_extents_update(struct view *view)
                wlr_scene_node_set_enabled(&view->ssd.extents.tree->node, false);
                return;
        }
-       if (!view->ssd.extents.tree->node.state.enabled) {
+       if (!view->ssd.extents.tree->node.enabled) {
                wlr_scene_node_set_enabled(&view->ssd.extents.tree->node, true);
        }
 
@@ -177,7 +177,7 @@ ssd_extents_update(struct view *view)
                        /* Not visible */
                        wlr_scene_node_set_enabled(part->node, false);
                        continue;
-               } else if (!part->node->state.enabled) {
+               } else if (!part->node->enabled) {
                        wlr_scene_node_set_enabled(part->node, true);
                }
 
@@ -193,8 +193,8 @@ ssd_extents_update(struct view *view)
                }
 
                /* Fully visible */
-               if (target->x != part->node->state.x
-                               || target->y != part->node->state.y) {
+               if (target->x != part->node->x
+                               || target->y != part->node->y) {
                        wlr_scene_node_set_position(part->node, target->x, target->y);
                }
                if (target->width != rect->width || target->height != rect->height) {

diff --git a/src/ssd/ssd_titlebar.c b/src/ssd/ssd_titlebar.c
index 8f98d5192fa34b365d3d51e249ab6eaa1fbeb564..e25238a45fad7e5e426f5b91537e5aeebdeb9c85 100644 (file)
--- a/src/ssd/ssd_titlebar.c
+++ b/src/ssd/ssd_titlebar.c
@@ -287,14 +287,14 @@ ssd_button_hover_enable(struct view *view, enum ssd_part_type type)
        struct ssd_part *part;
        struct ssd_sub_tree *subtree;
        FOR_EACH_STATE(view, subtree) {
-               if (subtree->tree->node.state.enabled) {
+               if (subtree->tree->node.enabled) {
                        part = ssd_get_part(&subtree->parts, type);
                        if (!part) {
                                wlr_log(WLR_ERROR, "hover enable failed to find button");
                                return NULL;
                        }
                        struct wlr_scene_node *child;
-                       wl_list_for_each_reverse(child, &part->node->state.children, state.link) {
+                       wl_list_for_each_reverse(child, &part->node->children, link) {
                                if (child->type == WLR_SCENE_NODE_RECT) {
                                        wlr_scene_node_set_enabled(child, true);
                                        return child;

diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index c954182421fdaf1bf2625fac7292403cda73c783..a6bc15743eff24e1c6fcd8e952512fd438f4e7dc 100644 (file)
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = ccd0f85c2a36308e35b153c7f9653abac7659af3
+revision = cb2dbc327e4d695c2a60a386e116a7dc20b29107
 
 [provide]
 dependency_names = wlroots