Revert "Merge pull request #1653 from swaywm/revert-1647-refactor-tree"

This reverts commit 472e81f35d689d67cda241acafda91c688d61046, reversing
changes made to 6b7841b11ff4cd35f54d69dc92029855893e5ce0.

1 files changed, 10 insertions, 10 deletions

diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index b0fc5d66..ebab2a48 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
-#include "sway/container.h"
-#include "sway/layout.h"
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
 #include "log.h"
 
 struct cmd_results *cmd_layout(int argc, char **argv) {
@@ -10,7 +10,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
         if ((error = checkarg(argc, "layout", EXPECTED_MORE_THAN, 0))) {
                 return error;
         }
-        swayc_t *parent = config->handler_context.current_container;
+        struct sway_container *parent = config->handler_context.current_container;
 
         // TODO: floating
         /*
@@ -26,10 +26,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
         // TODO: stacks and tabs
 
         if (strcasecmp(argv[0], "default") == 0) {
-                swayc_change_layout(parent, parent->prev_layout);
+                container_set_layout(parent, parent->prev_layout);
                 if (parent->layout == L_NONE) {
-                        swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT);
-                        swayc_change_layout(parent, default_layout(output));
+                        struct sway_container *output = container_parent(parent, C_OUTPUT);
+                        container_set_layout(parent, container_get_default_layout(output));
                 }
         } else {
                 if (parent->layout != L_TABBED && parent->layout != L_STACKED) {
@@ -37,15 +37,15 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
                 }
 
                 if (strcasecmp(argv[0], "splith") == 0) {
-                        swayc_change_layout(parent, L_HORIZ);
+                        container_set_layout(parent, L_HORIZ);
                 } else if (strcasecmp(argv[0], "splitv") == 0) {
-                        swayc_change_layout(parent, L_VERT);
+                        container_set_layout(parent, L_VERT);
                 } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) {
                         if (parent->layout == L_HORIZ && (parent->workspace_layout == L_NONE
                                         || parent->workspace_layout == L_HORIZ)) {
-                                swayc_change_layout(parent, L_VERT);
+                                container_set_layout(parent, L_VERT);
                         } else {
-                                swayc_change_layout(parent, L_HORIZ);
+                                container_set_layout(parent, L_HORIZ);
                         }
                 }
         }