1 files changed, 42 insertions, 14 deletions

diff --git a/sway/tree/node.c b/sway/tree/node.c
index ffa7f2cc..7aaf9762 100644
--- a/sway/tree/node.c
+++ b/sway/tree/node.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/tree/container.h"
@@ -18,13 +17,13 @@ void node_init(struct sway_node *node, enum sway_node_type type, void *thing) {
 const char *node_type_to_str(enum sway_node_type type) {
         switch (type) {
         case N_ROOT:
-                return "N_ROOT";
+                return "root";
         case N_OUTPUT:
-                return "N_OUTPUT";
+                return "output";
         case N_WORKSPACE:
-                return "N_WORKSPACE";
+                return "workspace";
         case N_CONTAINER:
-                return "N_CONTAINER";
+                return "container";
         }
         return "";
 }
@@ -75,7 +74,7 @@ void node_get_box(struct sway_node *node, struct wlr_box *box) {
 struct sway_output *node_get_output(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER: {
-                struct sway_workspace *ws = node->sway_container->workspace;
+                struct sway_workspace *ws = node->sway_container->pending.workspace;
                 return ws ? ws->output : NULL;
     }
         case N_WORKSPACE:
@@ -91,7 +90,7 @@ struct sway_output *node_get_output(struct sway_node *node) {
 enum sway_container_layout node_get_layout(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER:
-                return node->sway_container->layout;
+                return node->sway_container->pending.layout;
         case N_WORKSPACE:
                 return node->sway_workspace->layout;
         case N_OUTPUT:
@@ -105,11 +104,11 @@ struct sway_node *node_get_parent(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER: {
                         struct sway_container *con = node->sway_container;
-                        if (con->parent) {
-                                return &con->parent->node;
+                        if (con->pending.parent) {
+                                return &con->pending.parent->node;
                         }
-                        if (con->workspace) {
-                                return &con->workspace->node;
+                        if (con->pending.workspace) {
+                                return &con->pending.workspace->node;
                         }
                 }
                 return NULL;
@@ -131,7 +130,7 @@ struct sway_node *node_get_parent(struct sway_node *node) {
 list_t *node_get_children(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER:
-                return node->sway_container->children;
+                return node->sway_container->pending.children;
         case N_WORKSPACE:
                 return node->sway_workspace->tiling;
         case N_OUTPUT:
@@ -143,7 +142,7 @@ list_t *node_get_children(struct sway_node *node) {
 
 bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
         if (ancestor->type == N_ROOT && node->type == N_CONTAINER &&
-                        node->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                        node->sway_container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 return true;
         }
         struct sway_node *parent = node_get_parent(node);
@@ -152,10 +151,39 @@ bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
                         return true;
                 }
                 if (ancestor->type == N_ROOT && parent->type == N_CONTAINER &&
-                                parent->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                                parent->sway_container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                         return true;
                 }
                 parent = node_get_parent(parent);
         }
         return false;
 }
+
+void scene_node_disown_children(struct wlr_scene_tree *tree) {
+        // this function can be called as part of destruction code that will be invoked
+        // upon an allocation failure. Let's not crash on NULL due to an allocation error.
+        if (!tree) {
+                return;
+        }
+
+        struct wlr_scene_node *child, *tmp_child;
+        wl_list_for_each_safe(child, tmp_child, &tree->children, link) {
+                wlr_scene_node_reparent(child, root->staging);
+        }
+}
+
+struct wlr_scene_tree *alloc_scene_tree(struct wlr_scene_tree *parent,
+                bool *failed) {
+        // fallthrough
+        if (*failed) {
+                return NULL;
+        }
+
+        struct wlr_scene_tree *tree = wlr_scene_tree_create(parent);
+        if (!tree) {
+                sway_log(SWAY_ERROR, "Failed to allocate a scene node");
+                *failed = true;
+        }
+
+        return tree;
+}