From 08518513cc9a12042e53f82fa40048a6d942261b Mon Sep 17 00:00:00 2001
From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Sun, 5 Jun 2022 15:55:18 +0200
Subject: [PATCH] Chase wlroots: scene_node.state is now inlined

Chases wlroots cb2dbc327e4d695c2a60a386e116a7dc20b29107
wlr_scene: Inline wlr_scene_node_state
---
 src/debug.c              | 4 ++--
 src/layers.c             | 4 ++--
 src/menu/menu.c          | 2 +-
 src/osd.c                | 4 ++--
 src/ssd/ssd.c            | 4 ++--
 src/ssd/ssd_extents.c    | 8 ++++----
 src/ssd/ssd_titlebar.c   | 4 ++--
 subprojects/wlroots.wrap | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/debug.c b/src/debug.c
index a22e633d..cf681820 100644
--- 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 1a93d691..8c11e1f5 100644
--- 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 d4ad30df..6b7581fa 100644
--- 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 29fa07ec..11f03941 100644
--- 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 c60048f7..97e804c6 100644
--- 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 df1c5f45..31e0b337 100644
--- 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 8f98d519..e25238a4 100644
--- 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 c9541824..a6bc1574 100644
--- 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
-- 
2.52.0