From 874f009866abaf8ca43ed4cd88a69d22a3fbfc5a Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 12:15:31 -0400
Subject: move tree includes to their own directory

---
 sway/tree/container.c | 10 ++++------
 sway/tree/layout.c    |  6 +++---
 sway/tree/view.c      |  7 ++++---
 sway/tree/workspace.c |  4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index bbafe9ec..805d5644 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -7,14 +7,14 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_wl_shell.h>
 #include "sway/config.h"
-#include "sway/container.h"
+#include "sway/tree/container.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/layout.h"
+#include "sway/tree/layout.h"
 #include "sway/output.h"
 #include "sway/server.h"
-#include "sway/view.h"
-#include "sway/workspace.h"
+#include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
 #include "sway/ipc-server.h"
 #include "log.h"
 
@@ -82,8 +82,6 @@ static swayc_t *new_swayc(enum swayc_types type) {
 	c->layout = L_NONE;
 	c->workspace_layout = L_NONE;
 	c->type = type;
-	c->nb_master = 1;
-	c->nb_slave_groups = 1;
 	if (type != C_VIEW) {
 		c->children = create_list();
 	}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index de9e7b58..5a15f3a2 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -6,10 +6,10 @@
 #include <string.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/container.h"
-#include "sway/layout.h"
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
 #include "sway/output.h"
-#include "sway/view.h"
+#include "sway/tree/view.h"
 #include "sway/input/seat.h"
 #include "list.h"
 #include "log.h"
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 9499adca..20e657a2 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,8 +1,8 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/container.h"
-#include "sway/layout.h"
-#include "sway/view.h"
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
+#include "sway/tree/view.h"
 
 const char *view_get_title(struct sway_view *view) {
 	if (view->iface.get_prop) {
@@ -45,6 +45,7 @@ void view_set_size(struct sway_view *view, int width, int height) {
 	}
 }
 
+// TODO make view coordinates
 void view_set_position(struct sway_view *view, double ox, double oy) {
 	if (view->iface.set_position) {
 		struct wlr_box box = {
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 861fda4d..3da3fde6 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -3,10 +3,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <strings.h>
-#include "sway/container.h"
+#include "sway/tree/container.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/workspace.h"
+#include "sway/tree/workspace.h"
 #include "log.h"
 #include "util.h"
 
-- 
cgit v1.2.3


From b90099b4b7df8068446c658ab99b58ff83648954 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 16:17:55 -0400
Subject: rename container functions

---
 sway/tree/container.c | 182 +++++++++++++++++++++++++-------------------------
 sway/tree/layout.c    |  86 ++++++++++++------------
 sway/tree/workspace.c |  70 +++++++++----------
 3 files changed, 169 insertions(+), 169 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 805d5644..d31966b3 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -33,48 +33,15 @@ static list_t *get_bfs_queue() {
 	return bfs_queue;
 }
 
-static void notify_new_container(swayc_t *container) {
+static void notify_new_container(struct sway_container *container) {
 	wl_signal_emit(&root_container.sway_root->events.new_container, container);
 	ipc_event_window(container, "new");
 }
 
-swayc_t *swayc_by_test(swayc_t *container,
-		bool (*test)(swayc_t *view, void *data), void *data) {
-	if (!container->children) {
-		return NULL;
-	}
-	// TODO: floating windows
-	for (int i = 0; i < container->children->length; ++i) {
-		swayc_t *child = container->children->items[i];
-		if (test(child, data)) {
-			return child;
-		} else {
-			swayc_t *res = swayc_by_test(child, test, data);
-			if (res) {
-				return res;
-			}
-		}
-	}
-	return NULL;
-}
-
-void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
-		void (*func)(swayc_t *item, void *data), void *data) {
-	for (int i = 0; i < root->children->length; ++i) {
-		swayc_t *item = root->children->items[i];
-		if (item->type == type) {
-			func(item, data);
-		}
-		if (item->children && item->children->length) {
-			swayc_descendants_of_type(item, type, func, data);
-		}
-	}
-}
-
-static swayc_t *new_swayc(enum swayc_types type) {
+static struct sway_container *new_swayc(enum sway_container_type type) {
 	// next id starts at 1 because 0 is assigned to root_container in layout.c
 	static size_t next_id = 1;
-	swayc_t *c = calloc(1, sizeof(swayc_t));
+	struct sway_container *c = calloc(1, sizeof(struct sway_container));
 	if (!c) {
 		return NULL;
 	}
@@ -91,7 +58,7 @@ static swayc_t *new_swayc(enum swayc_types type) {
 	return c;
 }
 
-static void free_swayc(swayc_t *cont) {
+static void free_swayc(struct sway_container *cont) {
 	if (!sway_assert(cont, "free_swayc passed NULL")) {
 		return;
 	}
@@ -119,7 +86,7 @@ static void free_swayc(swayc_t *cont) {
 	free(cont);
 }
 
-swayc_t *new_output(struct sway_output *sway_output) {
+struct sway_container *sway_container_output_create(struct sway_output *sway_output) {
 	struct wlr_box size;
 	wlr_output_effective_resolution(sway_output->wlr_output, &size.width,
 		&size.height);
@@ -154,7 +121,7 @@ swayc_t *new_output(struct sway_output *sway_output) {
 		return NULL;
 	}
 
-	swayc_t *output = new_swayc(C_OUTPUT);
+	struct sway_container *output = new_swayc(C_OUTPUT);
 	output->sway_output = sway_output;
 	output->name = strdup(name);
 	if (output->name == NULL) {
@@ -169,7 +136,7 @@ swayc_t *new_output(struct sway_output *sway_output) {
 	// Create workspace
 	char *ws_name = workspace_next_name(output->name);
 	wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
-	swayc_t *ws = new_workspace(output, ws_name);
+	struct sway_container *ws = sway_container_workspace_create(output, ws_name);
 	// Set each seat's focus if not already set
 	struct sway_seat *seat = NULL;
 	wl_list_for_each(seat, &input_manager->seats, link) {
@@ -183,12 +150,12 @@ swayc_t *new_output(struct sway_output *sway_output) {
 	return output;
 }
 
-swayc_t *new_workspace(swayc_t *output, const char *name) {
-	if (!sway_assert(output, "new_workspace called with null output")) {
+struct sway_container *sway_container_workspace_create(struct sway_container *output, const char *name) {
+	if (!sway_assert(output, "sway_container_workspace_create called with null output")) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
-	swayc_t *workspace = new_swayc(C_WORKSPACE);
+	struct sway_container *workspace = new_swayc(C_WORKSPACE);
 
 	workspace->x = output->x;
 	workspace->y = output->y;
@@ -205,12 +172,12 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
 	return workspace;
 }
 
-swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
-	if (!sway_assert(sibling, "new_view called with NULL sibling/parent")) {
+struct sway_container *sway_container_view_create(struct sway_container *sibling, struct sway_view *sway_view) {
+	if (!sway_assert(sibling, "sway_container_view_create called with NULL sibling/parent")) {
 		return NULL;
 	}
 	const char *title = view_get_title(sway_view);
-	swayc_t *swayc = new_swayc(C_VIEW);
+	struct sway_container *swayc = new_swayc(C_VIEW);
 	wlr_log(L_DEBUG, "Adding new view %p:%s to container %p %d %s",
 		swayc, title, sibling, sibling ? sibling->type : 0, sibling->name);
 	// Setup values
@@ -230,8 +197,8 @@ swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
 	return swayc;
 }
 
-swayc_t *destroy_output(swayc_t *output) {
-	if (!sway_assert(output, "null output passed to destroy_output")) {
+struct sway_container *sway_container_output_destroy(struct sway_container *output) {
+	if (!sway_assert(output, "null output passed to sway_container_output_destroy")) {
 		return NULL;
 	}
 
@@ -243,7 +210,7 @@ swayc_t *destroy_output(swayc_t *output) {
 			int p = root_container.children->items[0] == output;
 			// Move workspace from this output to another output
 			while (output->children->length) {
-				swayc_t *child = output->children->items[0];
+				struct sway_container *child = output->children->items[0];
 				remove_child(child);
 				add_child(root_container.children->items[p], child);
 			}
@@ -262,12 +229,12 @@ swayc_t *destroy_output(swayc_t *output) {
 	return &root_container;
 }
 
-swayc_t *destroy_view(swayc_t *view) {
+struct sway_container *sway_container_view_destroy(struct sway_container *view) {
 	if (!view) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
-	swayc_t *parent = view->parent;
+	struct sway_container *parent = view->parent;
 	free_swayc(view);
 
 	// TODO WLR: Destroy empty containers
@@ -279,7 +246,52 @@ swayc_t *destroy_view(swayc_t *view) {
 	return parent;
 }
 
-swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
+struct sway_container *swayc_change_layout(struct sway_container *container, enum sway_container_layout layout) {
+	if (container->type == C_WORKSPACE) {
+		container->workspace_layout = layout;
+		if (layout == L_HORIZ || layout == L_VERT) {
+			container->layout = layout;
+		}
+	} else {
+		container->layout = layout;
+	}
+	return container;
+}
+
+void sway_container_descendents(struct sway_container *root, enum sway_container_type type,
+		void (*func)(struct sway_container *item, void *data), void *data) {
+	for (int i = 0; i < root->children->length; ++i) {
+		struct sway_container *item = root->children->items[i];
+		if (item->type == type) {
+			func(item, data);
+		}
+		if (item->children && item->children->length) {
+			sway_container_descendents(item, type, func, data);
+		}
+	}
+}
+
+struct sway_container *sway_container_find(struct sway_container *container,
+		bool (*test)(struct sway_container *view, void *data), void *data) {
+	if (!container->children) {
+		return NULL;
+	}
+	// TODO: floating windows
+	for (int i = 0; i < container->children->length; ++i) {
+		struct sway_container *child = container->children->items[i];
+		if (test(child, data)) {
+			return child;
+		} else {
+			struct sway_container *res = sway_container_find(child, test, data);
+			if (res) {
+				return res;
+			}
+		}
+	}
+	return NULL;
+}
+
+struct sway_container *sway_container_parent(struct sway_container *container, enum sway_container_type type) {
 	if (!sway_assert(container, "container is NULL")) {
 		return NULL;
 	}
@@ -292,7 +304,29 @@ swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
 	return container;
 }
 
-swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
+void sway_container_for_each(struct sway_container *container, void (*f)(struct sway_container *view, void *data), void *data) {
+	if (container) {
+		int i;
+		if (container->children)  {
+			for (i = 0; i < container->children->length; ++i) {
+				struct sway_container *child = container->children->items[i];
+				sway_container_for_each(child, f, data);
+			}
+		}
+		// TODO
+		/*
+		if (container->floating) {
+			for (i = 0; i < container->floating->length; ++i) {
+				struct sway_container *child = container->floating->items[i];
+				container_map(child, f, data);
+			}
+		}
+		*/
+		f(container, data);
+	}
+}
+
+struct sway_container *sway_container_at(struct sway_container *parent, double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
@@ -301,13 +335,13 @@ swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
 
 	list_add(queue, parent);
 
-	swayc_t *swayc = NULL;
+	struct sway_container *swayc = NULL;
 	while (queue->length) {
 		swayc = queue->items[0];
 		list_del(queue, 0);
 		if (swayc->type == C_VIEW) {
 			struct sway_view *sview = swayc->sway_view;
-			swayc_t *soutput = swayc_parent_by_type(swayc, C_OUTPUT);
+			struct sway_container *soutput = sway_container_parent(swayc, C_OUTPUT);
 			struct wlr_box *output_box =
 				wlr_output_layout_get_box(
 					root_container.sway_root->output_layout,
@@ -377,29 +411,7 @@ swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
 	return NULL;
 }
 
-void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
-	if (container) {
-		int i;
-		if (container->children)  {
-			for (i = 0; i < container->children->length; ++i) {
-				swayc_t *child = container->children->items[i];
-				container_map(child, f, data);
-			}
-		}
-		// TODO
-		/*
-		if (container->floating) {
-			for (i = 0; i < container->floating->length; ++i) {
-				swayc_t *child = container->floating->items[i];
-				container_map(child, f, data);
-			}
-		}
-		*/
-		f(container, data);
-	}
-}
-
-void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
+void sway_container_for_each_bfs(struct sway_container *con, void (*f)(struct sway_container *con, void *data),
 		void *data) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
@@ -413,7 +425,7 @@ void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
 
 	list_add(queue, con);
 
-	swayc_t *current = NULL;
+	struct sway_container *current = NULL;
 	while (queue->length) {
 		current = queue->items[0];
 		list_del(queue, 0);
@@ -422,15 +434,3 @@ void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
 		list_cat(queue, current->children);
 	}
 }
-
-swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
-	if (container->type == C_WORKSPACE) {
-		container->workspace_layout = layout;
-		if (layout == L_HORIZ || layout == L_VERT) {
-			container->layout = layout;
-		}
-	} else {
-		container->layout = layout;
-	}
-	return container;
-}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 5a15f3a2..068fb39c 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -14,7 +14,7 @@
 #include "list.h"
 #include "log.h"
 
-swayc_t root_container;
+struct sway_container root_container;
 
 static void output_layout_change_notify(struct wl_listener *listener, void *data) {
 	struct wlr_box *layout_box = wlr_output_layout_get_box(
@@ -23,7 +23,7 @@ static void output_layout_change_notify(struct wl_listener *listener, void *data
 	root_container.height = layout_box->height;
 
 	for (int i = 0 ; i < root_container.children->length; ++i) {
-		swayc_t *output_container = root_container.children->items[i];
+		struct sway_container *output_container = root_container.children->items[i];
 		if (output_container->type != C_OUTPUT) {
 			continue;
 		}
@@ -62,9 +62,9 @@ void init_layout(void) {
 		&root_container.sway_root->output_layout_change);
 }
 
-static int index_child(const swayc_t *child) {
+static int index_child(const struct sway_container *child) {
 	// TODO handle floating
-	swayc_t *parent = child->parent;
+	struct sway_container *parent = child->parent;
 	int i, len;
 	len = parent->children->length;
 	for (i = 0; i < len; ++i) {
@@ -79,16 +79,16 @@ static int index_child(const swayc_t *child) {
 	return i;
 }
 
-swayc_t *add_sibling(swayc_t *fixed, swayc_t *active) {
+struct sway_container *add_sibling(struct sway_container *fixed, struct sway_container *active) {
 	// TODO handle floating
-	swayc_t *parent = fixed->parent;
+	struct sway_container *parent = fixed->parent;
 	int i = index_child(fixed);
 	list_insert(parent->children, i + 1, active);
 	active->parent = parent;
 	return active->parent;
 }
 
-void add_child(swayc_t *parent, swayc_t *child) {
+void add_child(struct sway_container *parent, struct sway_container *child) {
 	wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
 			child, child->type, child->width, child->height,
 			parent, parent->type, parent->width, parent->height);
@@ -102,9 +102,9 @@ void add_child(swayc_t *parent, swayc_t *child) {
 	*/
 }
 
-swayc_t *remove_child(swayc_t *child) {
+struct sway_container *remove_child(struct sway_container *child) {
 	int i;
-	swayc_t *parent = child->parent;
+	struct sway_container *parent = child->parent;
 	for (i = 0; i < parent->children->length; ++i) {
 		if (parent->children->items[i] == child) {
 			list_del(parent->children, i);
@@ -115,7 +115,7 @@ swayc_t *remove_child(swayc_t *child) {
 	return parent;
 }
 
-enum swayc_layouts default_layout(swayc_t *output) {
+enum sway_container_layout default_layout(struct sway_container *output) {
 	/* TODO WLR
 	if (config->default_layout != L_NONE) {
 		//return config->default_layout;
@@ -129,8 +129,8 @@ enum swayc_layouts default_layout(swayc_t *output) {
 }
 
 static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
-	swayc_t *a = *(void **)_a;
-	swayc_t *b = *(void **)_b;
+	struct sway_container *a = *(void **)_a;
+	struct sway_container *b = *(void **)_b;
 	int retval = 0;
 
 	if (isdigit(a->name[0]) && isdigit(b->name[0])) {
@@ -146,21 +146,21 @@ static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
 	return retval;
 }
 
-void sort_workspaces(swayc_t *output) {
+void sort_workspaces(struct sway_container *output) {
 	list_stable_sort(output->children, sort_workspace_cmp_qsort);
 }
 
-static void apply_horiz_layout(swayc_t *container, const double x,
+static void apply_horiz_layout(struct sway_container *container, const double x,
 				const double y, const double width,
 				const double height, const int start,
 				const int end);
 
-static void apply_vert_layout(swayc_t *container, const double x,
+static void apply_vert_layout(struct sway_container *container, const double x,
 				const double y, const double width,
 				const double height, const int start,
 				const int end);
 
-void arrange_windows(swayc_t *container, double width, double height) {
+void arrange_windows(struct sway_container *container, double width, double height) {
 	int i;
 	if (width == -1 || height == -1) {
 		width = container->width;
@@ -181,7 +181,7 @@ void arrange_windows(swayc_t *container, double width, double height) {
 	case C_ROOT:
 		// TODO: wlr_output_layout probably
 		for (i = 0; i < container->children->length; ++i) {
-			swayc_t *output = container->children->items[i];
+			struct sway_container *output = container->children->items[i];
 			wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
 					output->name, output->x, output->y);
 			arrange_windows(output, -1, -1);
@@ -197,13 +197,13 @@ void arrange_windows(swayc_t *container, double width, double height) {
 		}
 		// arrange all workspaces:
 		for (i = 0; i < container->children->length; ++i) {
-			swayc_t *child = container->children->items[i];
+			struct sway_container *child = container->children->items[i];
 			arrange_windows(child, -1, -1);
 		}
 		return;
 	case C_WORKSPACE:
 		{
-			swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
+			struct sway_container *output = sway_container_parent(container, C_OUTPUT);
 			struct wlr_box *area = &output->sway_output->usable_area;
 			wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
 					area->width, area->height, area->x, area->y);
@@ -252,14 +252,14 @@ void arrange_windows(swayc_t *container, double width, double height) {
 	}
 }
 
-static void apply_horiz_layout(swayc_t *container,
+static void apply_horiz_layout(struct sway_container *container,
 		const double x, const double y,
 		const double width, const double height,
 		const int start, const int end) {
 	double scale = 0;
 	// Calculate total width
 	for (int i = start; i < end; ++i) {
-		double *old_width = &((swayc_t *)container->children->items[i])->width;
+		double *old_width = &((struct sway_container *)container->children->items[i])->width;
 		if (*old_width <= 0) {
 			if (end - start > 1) {
 				*old_width = width / (end - start - 1);
@@ -276,7 +276,7 @@ static void apply_horiz_layout(swayc_t *container,
 	if (scale > 0.1) {
 		wlr_log(L_DEBUG, "Arranging %p horizontally", container);
 		for (int i = start; i < end; ++i) {
-			swayc_t *child = container->children->items[i];
+			struct sway_container *child = container->children->items[i];
 			wlr_log(L_DEBUG,
 				"Calculating arrangement for %p:%d (will scale %f by %f)",
 				child, child->type, width, scale);
@@ -301,7 +301,7 @@ static void apply_horiz_layout(swayc_t *container,
 	}
 }
 
-void apply_vert_layout(swayc_t *container,
+void apply_vert_layout(struct sway_container *container,
 		const double x, const double y,
 		const double width, const double height, const int start,
 		const int end) {
@@ -309,7 +309,7 @@ void apply_vert_layout(swayc_t *container,
 	double scale = 0;
 	// Calculate total height
 	for (i = start; i < end; ++i) {
-		double *old_height = &((swayc_t *)container->children->items[i])->height;
+		double *old_height = &((struct sway_container *)container->children->items[i])->height;
 		if (*old_height <= 0) {
 			if (end - start > 1) {
 				*old_height = height / (end - start - 1);
@@ -326,7 +326,7 @@ void apply_vert_layout(swayc_t *container,
 	if (scale > 0.1) {
 		wlr_log(L_DEBUG, "Arranging %p vertically", container);
 		for (i = start; i < end; ++i) {
-			swayc_t *child = container->children->items[i];
+			struct sway_container *child = container->children->items[i];
 			wlr_log(L_DEBUG,
 				"Calculating arrangement for %p:%d (will scale %f by %f)",
 				child, child->type, height, scale);
@@ -354,15 +354,15 @@ void apply_vert_layout(swayc_t *container,
 /**
  * Get swayc in the direction of newly entered output.
  */
-static swayc_t *get_swayc_in_output_direction(swayc_t *output,
+static struct sway_container *get_swayc_in_output_direction(struct sway_container *output,
 		enum movement_direction dir, struct sway_seat *seat) {
 	if (!output) {
 		return NULL;
 	}
 
-	swayc_t *ws = sway_seat_get_focus_inactive(seat, output);
+	struct sway_container *ws = sway_seat_get_focus_inactive(seat, output);
 	if (ws->type != C_WORKSPACE) {
-		ws = swayc_parent_by_type(ws, C_WORKSPACE);
+		ws = sway_container_parent(ws, C_WORKSPACE);
 	}
 
 	if (ws == NULL) {
@@ -380,9 +380,9 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
 			return ws->children->items[0];
 		case MOVE_UP:
 		case MOVE_DOWN: {
-			swayc_t *focused = sway_seat_get_focus_inactive(seat, ws);
+			struct sway_container *focused = sway_seat_get_focus_inactive(seat, ws);
 			if (focused && focused->parent) {
-				swayc_t *parent = focused->parent;
+				struct sway_container *parent = focused->parent;
 				if (parent->layout == L_VERT) {
 					if (dir == MOVE_UP) {
 						// get child furthest down on new output
@@ -404,13 +404,13 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
 	return ws;
 }
 
-static void get_layout_center_position(swayc_t *container, int *x, int *y) {
+static void get_layout_center_position(struct sway_container *container, int *x, int *y) {
 	// FIXME view coords are inconsistently referred to in layout/output systems
 	if (container->type == C_OUTPUT) {
 		*x = container->x + container->width/2;
 		*y = container->y + container->height/2;
 	} else {
-		swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
+		struct sway_container *output = sway_container_parent(container, C_OUTPUT);
 		if (container->type == C_WORKSPACE) {
 			// Workspace coordinates are actually wrong/arbitrary, but should
 			// be same as output.
@@ -444,12 +444,12 @@ static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out
 	return true;
 }
 
-static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
+static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
 	if (output == NULL) {
 		return NULL;
 	}
 	for (int i = 0; i < root_container.children->length; ++i) {
-		swayc_t *o = root_container.children->items[i];
+		struct sway_container *o = root_container.children->items[i];
 		if (o->type == C_OUTPUT && o->sway_output->wlr_output == output) {
 			return o;
 		}
@@ -457,13 +457,13 @@ static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
 	return NULL;
 }
 
-static swayc_t *get_swayc_in_direction_under(swayc_t *container,
-		enum movement_direction dir, struct sway_seat *seat, swayc_t *limit) {
+static struct sway_container *get_swayc_in_direction_under(struct sway_container *container,
+		enum movement_direction dir, struct sway_seat *seat, struct sway_container *limit) {
 	if (dir == MOVE_CHILD) {
 		return sway_seat_get_focus_inactive(seat, container);
 	}
 
-	swayc_t *parent = container->parent;
+	struct sway_container *parent = container->parent;
 	if (dir == MOVE_PARENT) {
 		if (parent->type == C_OUTPUT) {
 			return NULL;
@@ -496,9 +496,9 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 	/*
 	if (container->type == C_VIEW && swayc_is_fullscreen(container)) {
 		wlr_log(L_DEBUG, "Moving from fullscreen view, skipping to output");
-		container = swayc_parent_by_type(container, C_OUTPUT);
+		container = sway_container_parent(container, C_OUTPUT);
 		get_layout_center_position(container, &abs_pos);
-		swayc_t *output = swayc_adjacent_output(container, dir, &abs_pos, true);
+		struct sway_container *output = swayc_adjacent_output(container, dir, &abs_pos, true);
 		return get_swayc_in_output_direction(output, dir);
 	}
 	if (container->type == C_WORKSPACE && container->fullscreen) {
@@ -507,7 +507,7 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 	}
 	*/
 
-	swayc_t *wrap_candidate = NULL;
+	struct sway_container *wrap_candidate = NULL;
 	while (true) {
 		// Test if we can even make a difference here
 		bool can_move = false;
@@ -525,12 +525,12 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 			struct wlr_output *wlr_adjacent =
 				wlr_output_layout_adjacent_output(layout, wlr_dir,
 					container->sway_output->wlr_output, lx, ly);
-			swayc_t *adjacent = sway_output_from_wlr(wlr_adjacent);
+			struct sway_container *adjacent = sway_output_from_wlr(wlr_adjacent);
 
 			if (!adjacent || adjacent == container) {
 				return wrap_candidate;
 			}
-			swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat);
+			struct sway_container *next = get_swayc_in_output_direction(adjacent, dir, seat);
 			if (next == NULL) {
 				return NULL;
 			}
@@ -587,7 +587,7 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 	}
 }
 
-swayc_t *get_swayc_in_direction(swayc_t *container, struct sway_seat *seat,
+struct sway_container *get_swayc_in_direction(struct sway_container *container, struct sway_seat *seat,
 		enum movement_direction dir) {
 	return get_swayc_in_direction_under(container, dir, seat, NULL);
 }
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 3da3fde6..32e82845 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -17,7 +17,7 @@ struct workspace_by_number_data {
 	const char *name;
 };
 
-void next_name_map(swayc_t *ws, void *data) {
+void next_name_map(struct sway_container *ws, void *data) {
 	int *count = data;
 	++count;
 }
@@ -37,7 +37,7 @@ char *workspace_next_name(const char *output_name) {
 	return name;
 }
 
-static bool _workspace_by_number(swayc_t *view, void *data) {
+static bool _workspace_by_number(struct sway_container *view, void *data) {
 	if (view->type != C_WORKSPACE) {
 		return false;
 	}
@@ -46,27 +46,27 @@ static bool _workspace_by_number(swayc_t *view, void *data) {
 	return a == wbnd->len && strncmp(view->name, wbnd->name, a) == 0;
 }
 
-swayc_t *workspace_by_number(const char* name) {
+struct sway_container *workspace_by_number(const char* name) {
 	struct workspace_by_number_data wbnd = {0, "1234567890", name};
 	wbnd.len = strspn(name, wbnd.cset);
 	if (wbnd.len <= 0) {
 		return NULL;
 	}
-	return swayc_by_test(&root_container, _workspace_by_number, (void *) &wbnd);
+	return sway_container_find(&root_container, _workspace_by_number, (void *) &wbnd);
 }
 
-static bool _workspace_by_name(swayc_t *view, void *data) {
+static bool _workspace_by_name(struct sway_container *view, void *data) {
 	return (view->type == C_WORKSPACE) &&
 		   (strcasecmp(view->name, (char *) data) == 0);
 }
 
-swayc_t *workspace_by_name(const char *name) {
+struct sway_container *workspace_by_name(const char *name) {
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *current_workspace = NULL, *current_output = NULL;
-	swayc_t *focus = sway_seat_get_focus(seat);
+	struct sway_container *current_workspace = NULL, *current_output = NULL;
+	struct sway_container *focus = sway_seat_get_focus(seat);
 	if (focus) {
-		current_workspace = swayc_parent_by_type(focus, C_WORKSPACE);
-		current_output = swayc_parent_by_type(focus, C_OUTPUT);
+		current_workspace = sway_container_parent(focus, C_WORKSPACE);
+		current_output = sway_container_parent(focus, C_OUTPUT);
 	}
 	if (strcmp(name, "prev") == 0) {
 		return workspace_prev(current_workspace);
@@ -79,12 +79,12 @@ swayc_t *workspace_by_name(const char *name) {
 	} else if (strcmp(name, "current") == 0) {
 		return current_workspace;
 	} else {
-		return swayc_by_test(&root_container, _workspace_by_name, (void *) name);
+		return sway_container_find(&root_container, _workspace_by_name, (void *) name);
 	}
 }
 
-swayc_t *workspace_create(const char *name) {
-	swayc_t *parent;
+struct sway_container *workspace_create(const char *name) {
+	struct sway_container *parent;
 	// Search for workspace<->output pair
 	int i, e = config->workspace_outputs->length;
 	for (i = 0; i < e; ++i) {
@@ -95,7 +95,7 @@ swayc_t *workspace_create(const char *name) {
 			for (i = 0; i < e; ++i) {
 				parent = root_container.children->items[i];
 				if (strcmp(parent->name, wso->output) == 0) {
-					return new_workspace(parent, name);
+					return sway_container_workspace_create(parent, name);
 				}
 			}
 			break;
@@ -103,10 +103,10 @@ swayc_t *workspace_create(const char *name) {
 	}
 	// Otherwise create a new one
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
+	struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
 	parent = focus;
-	parent = swayc_parent_by_type(parent, C_OUTPUT);
-	return new_workspace(parent, name);
+	parent = sway_container_parent(parent, C_OUTPUT);
+	return sway_container_workspace_create(parent, name);
 }
 
 /**
@@ -114,17 +114,17 @@ swayc_t *workspace_create(const char *name) {
  * the end and beginning.  If next is false, the previous workspace is returned,
  * otherwise the next one is returned.
  */
-swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
+struct sway_container *workspace_output_prev_next_impl(struct sway_container *output, bool next) {
 	if (!sway_assert(output->type == C_OUTPUT,
 				"Argument must be an output, is %d", output->type)) {
 		return NULL;
 	}
 
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus_inactive(seat, output);
-	swayc_t *workspace = (focus->type == C_WORKSPACE ?
+	struct sway_container *focus = sway_seat_get_focus_inactive(seat, output);
+	struct sway_container *workspace = (focus->type == C_WORKSPACE ?
 			focus :
-			swayc_parent_by_type(focus, C_WORKSPACE));
+			sway_container_parent(focus, C_WORKSPACE));
 
 	int i;
 	for (i = 0; i < output->children->length; i++) {
@@ -144,13 +144,13 @@ swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
  * next is false, the previous workspace is returned, otherwise the next one is
  * returned.
  */
-swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
+struct sway_container *workspace_prev_next_impl(struct sway_container *workspace, bool next) {
 	if (!sway_assert(workspace->type == C_WORKSPACE,
 				"Argument must be a workspace, is %d", workspace->type)) {
 		return NULL;
 	}
 
-	swayc_t *current_output = workspace->parent;
+	struct sway_container *current_output = workspace->parent;
 	int offset = next ? 1 : -1;
 	int start = next ? 0 : 1;
 	int end;
@@ -170,7 +170,7 @@ swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
 	int num_outputs = root_container.children->length;
 	for (i = 0; i < num_outputs; i++) {
 		if (root_container.children->items[i] == current_output) {
-			swayc_t *next_output = root_container.children->items[
+			struct sway_container *next_output = root_container.children->items[
 				wrap(i + offset, num_outputs)];
 			return workspace_output_prev_next_impl(next_output, next);
 		}
@@ -180,40 +180,40 @@ swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
 	return NULL;
 }
 
-swayc_t *workspace_output_next(swayc_t *current) {
+struct sway_container *workspace_output_next(struct sway_container *current) {
 	return workspace_output_prev_next_impl(current, true);
 }
 
-swayc_t *workspace_next(swayc_t *current) {
+struct sway_container *workspace_next(struct sway_container *current) {
 	return workspace_prev_next_impl(current, true);
 }
 
-swayc_t *workspace_output_prev(swayc_t *current) {
+struct sway_container *workspace_output_prev(struct sway_container *current) {
 	return workspace_output_prev_next_impl(current, false);
 }
 
-swayc_t *workspace_prev(swayc_t *current) {
+struct sway_container *workspace_prev(struct sway_container *current) {
 	return workspace_prev_next_impl(current, false);
 }
 
-bool workspace_switch(swayc_t *workspace) {
+bool workspace_switch(struct sway_container *workspace) {
 	if (!workspace) {
 		return false;
 	}
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
+	struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
 	if (!seat || !focus) {
 		return false;
 	}
-	swayc_t *active_ws = focus;
+	struct sway_container *active_ws = focus;
 	if (active_ws->type != C_WORKSPACE) {
-		swayc_parent_by_type(focus, C_WORKSPACE);
+		sway_container_parent(focus, C_WORKSPACE);
 	}
 
 	if (config->auto_back_and_forth
 			&& active_ws == workspace
 			&& prev_workspace_name) {
-		swayc_t *new_ws = workspace_by_name(prev_workspace_name);
+		struct sway_container *new_ws = workspace_by_name(prev_workspace_name);
 		workspace = new_ws ? new_ws : workspace_create(prev_workspace_name);
 	}
 
@@ -231,12 +231,12 @@ bool workspace_switch(swayc_t *workspace) {
 	// TODO: Deal with sticky containers
 
 	wlr_log(L_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name);
-	swayc_t *next = sway_seat_get_focus_inactive(seat, workspace);
+	struct sway_container *next = sway_seat_get_focus_inactive(seat, workspace);
 	if (next == NULL) {
 		next = workspace;
 	}
 	sway_seat_set_focus(seat, next);
-	swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT);
+	struct sway_container *output = sway_container_parent(workspace, C_OUTPUT);
 	arrange_windows(output, -1, -1);
 	return true;
 }
-- 
cgit v1.2.3


From eca029f218fbb54ddf7316845be5d296e834358e Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 17:06:29 -0400
Subject: more renaming things

---
 sway/tree/container.c | 58 +++++++++++++++++++++++++--------------------------
 sway/tree/layout.c    | 34 +++++++++++++++---------------
 sway/tree/workspace.c | 22 +++++++++----------
 3 files changed, 57 insertions(+), 57 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index d31966b3..b41626e1 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -67,7 +67,7 @@ static void free_swayc(struct sway_container *cont) {
 
 	if (cont->children) {
 		// remove children until there are no more, free_swayc calls
-		// remove_child, which removes child from this container
+		// container_remove_child, which removes child from this container
 		while (cont->children->length) {
 			free_swayc(cont->children->items[0]);
 		}
@@ -78,7 +78,7 @@ static void free_swayc(struct sway_container *cont) {
 		list_free(cont->marks);
 	}
 	if (cont->parent) {
-		remove_child(cont);
+		container_remove_child(cont);
 	}
 	if (cont->name) {
 		free(cont->name);
@@ -86,7 +86,7 @@ static void free_swayc(struct sway_container *cont) {
 	free(cont);
 }
 
-struct sway_container *sway_container_output_create(struct sway_output *sway_output) {
+struct sway_container *container_output_create(struct sway_output *sway_output) {
 	struct wlr_box size;
 	wlr_output_effective_resolution(sway_output->wlr_output, &size.width,
 		&size.height);
@@ -131,12 +131,12 @@ struct sway_container *sway_container_output_create(struct sway_output *sway_out
 
 	apply_output_config(oc, output);
 
-	add_child(&root_container, output);
+	container_add_child(&root_container, output);
 
 	// Create workspace
 	char *ws_name = workspace_next_name(output->name);
 	wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
-	struct sway_container *ws = sway_container_workspace_create(output, ws_name);
+	struct sway_container *ws = container_workspace_create(output, ws_name);
 	// Set each seat's focus if not already set
 	struct sway_seat *seat = NULL;
 	wl_list_for_each(seat, &input_manager->seats, link) {
@@ -150,8 +150,8 @@ struct sway_container *sway_container_output_create(struct sway_output *sway_out
 	return output;
 }
 
-struct sway_container *sway_container_workspace_create(struct sway_container *output, const char *name) {
-	if (!sway_assert(output, "sway_container_workspace_create called with null output")) {
+struct sway_container *container_workspace_create(struct sway_container *output, const char *name) {
+	if (!sway_assert(output, "container_workspace_create called with null output")) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
@@ -163,17 +163,17 @@ struct sway_container *sway_container_workspace_create(struct sway_container *ou
 	workspace->height = output->height;
 	workspace->name = !name ? NULL : strdup(name);
 	workspace->prev_layout = L_NONE;
-	workspace->layout = default_layout(output);
-	workspace->workspace_layout = default_layout(output);
+	workspace->layout = container_get_default_layout(output);
+	workspace->workspace_layout = container_get_default_layout(output);
 
-	add_child(output, workspace);
-	sort_workspaces(output);
+	container_add_child(output, workspace);
+	container_sort_workspaces(output);
 	notify_new_container(workspace);
 	return workspace;
 }
 
-struct sway_container *sway_container_view_create(struct sway_container *sibling, struct sway_view *sway_view) {
-	if (!sway_assert(sibling, "sway_container_view_create called with NULL sibling/parent")) {
+struct sway_container *container_view_create(struct sway_container *sibling, struct sway_view *sway_view) {
+	if (!sway_assert(sibling, "container_view_create called with NULL sibling/parent")) {
 		return NULL;
 	}
 	const char *title = view_get_title(sway_view);
@@ -188,17 +188,17 @@ struct sway_container *sway_container_view_create(struct sway_container *sibling
 
 	if (sibling->type == C_WORKSPACE) {
 		// Case of focused workspace, just create as child of it
-		add_child(sibling, swayc);
+		container_add_child(sibling, swayc);
 	} else {
 		// Regular case, create as sibling of current container
-		add_sibling(sibling, swayc);
+		container_add_sibling(sibling, swayc);
 	}
 	notify_new_container(swayc);
 	return swayc;
 }
 
-struct sway_container *sway_container_output_destroy(struct sway_container *output) {
-	if (!sway_assert(output, "null output passed to sway_container_output_destroy")) {
+struct sway_container *container_output_destroy(struct sway_container *output) {
+	if (!sway_assert(output, "null output passed to container_output_destroy")) {
 		return NULL;
 	}
 
@@ -211,11 +211,11 @@ struct sway_container *sway_container_output_destroy(struct sway_container *outp
 			// Move workspace from this output to another output
 			while (output->children->length) {
 				struct sway_container *child = output->children->items[0];
-				remove_child(child);
-				add_child(root_container.children->items[p], child);
+				container_remove_child(child);
+				container_add_child(root_container.children->items[p], child);
 			}
-			sort_workspaces(root_container.children->items[p]);
-			arrange_windows(root_container.children->items[p], -1, -1);
+			container_sort_workspaces(root_container.children->items[p]);
+			container_arrange_windows(root_container.children->items[p], -1, -1);
 		}
 	}
 
@@ -229,7 +229,7 @@ struct sway_container *sway_container_output_destroy(struct sway_container *outp
 	return &root_container;
 }
 
-struct sway_container *sway_container_view_destroy(struct sway_container *view) {
+struct sway_container *container_view_destroy(struct sway_container *view) {
 	if (!view) {
 		return NULL;
 	}
@@ -246,7 +246,7 @@ struct sway_container *sway_container_view_destroy(struct sway_container *view)
 	return parent;
 }
 
-struct sway_container *swayc_change_layout(struct sway_container *container, enum sway_container_layout layout) {
+struct sway_container *container_set_layout(struct sway_container *container, enum sway_container_layout layout) {
 	if (container->type == C_WORKSPACE) {
 		container->workspace_layout = layout;
 		if (layout == L_HORIZ || layout == L_VERT) {
@@ -258,7 +258,7 @@ struct sway_container *swayc_change_layout(struct sway_container *container, enu
 	return container;
 }
 
-void sway_container_descendents(struct sway_container *root, enum sway_container_type type,
+void container_descendents(struct sway_container *root, enum sway_container_type type,
 		void (*func)(struct sway_container *item, void *data), void *data) {
 	for (int i = 0; i < root->children->length; ++i) {
 		struct sway_container *item = root->children->items[i];
@@ -266,12 +266,12 @@ void sway_container_descendents(struct sway_container *root, enum sway_container
 			func(item, data);
 		}
 		if (item->children && item->children->length) {
-			sway_container_descendents(item, type, func, data);
+			container_descendents(item, type, func, data);
 		}
 	}
 }
 
-struct sway_container *sway_container_find(struct sway_container *container,
+struct sway_container *container_find(struct sway_container *container,
 		bool (*test)(struct sway_container *view, void *data), void *data) {
 	if (!container->children) {
 		return NULL;
@@ -282,7 +282,7 @@ struct sway_container *sway_container_find(struct sway_container *container,
 		if (test(child, data)) {
 			return child;
 		} else {
-			struct sway_container *res = sway_container_find(child, test, data);
+			struct sway_container *res = container_find(child, test, data);
 			if (res) {
 				return res;
 			}
@@ -291,7 +291,7 @@ struct sway_container *sway_container_find(struct sway_container *container,
 	return NULL;
 }
 
-struct sway_container *sway_container_parent(struct sway_container *container, enum sway_container_type type) {
+struct sway_container *container_parent(struct sway_container *container, enum sway_container_type type) {
 	if (!sway_assert(container, "container is NULL")) {
 		return NULL;
 	}
@@ -341,7 +341,7 @@ struct sway_container *sway_container_at(struct sway_container *parent, double l
 		list_del(queue, 0);
 		if (swayc->type == C_VIEW) {
 			struct sway_view *sview = swayc->sway_view;
-			struct sway_container *soutput = sway_container_parent(swayc, C_OUTPUT);
+			struct sway_container *soutput = container_parent(swayc, C_OUTPUT);
 			struct wlr_box *output_box =
 				wlr_output_layout_get_box(
 					root_container.sway_root->output_layout,
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 068fb39c..07534620 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -40,7 +40,7 @@ static void output_layout_change_notify(struct wl_listener *listener, void *data
 		output_container->height = output_box->height;
 	}
 
-	arrange_windows(&root_container, -1, -1);
+	container_arrange_windows(&root_container, -1, -1);
 }
 
 void init_layout(void) {
@@ -79,7 +79,7 @@ static int index_child(const struct sway_container *child) {
 	return i;
 }
 
-struct sway_container *add_sibling(struct sway_container *fixed, struct sway_container *active) {
+struct sway_container *container_add_sibling(struct sway_container *fixed, struct sway_container *active) {
 	// TODO handle floating
 	struct sway_container *parent = fixed->parent;
 	int i = index_child(fixed);
@@ -88,7 +88,7 @@ struct sway_container *add_sibling(struct sway_container *fixed, struct sway_con
 	return active->parent;
 }
 
-void add_child(struct sway_container *parent, struct sway_container *child) {
+void container_add_child(struct sway_container *parent, struct sway_container *child) {
 	wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
 			child, child->type, child->width, child->height,
 			parent, parent->type, parent->width, parent->height);
@@ -102,7 +102,7 @@ void add_child(struct sway_container *parent, struct sway_container *child) {
 	*/
 }
 
-struct sway_container *remove_child(struct sway_container *child) {
+struct sway_container *container_remove_child(struct sway_container *child) {
 	int i;
 	struct sway_container *parent = child->parent;
 	for (i = 0; i < parent->children->length; ++i) {
@@ -115,7 +115,7 @@ struct sway_container *remove_child(struct sway_container *child) {
 	return parent;
 }
 
-enum sway_container_layout default_layout(struct sway_container *output) {
+enum sway_container_layout container_get_default_layout(struct sway_container *output) {
 	/* TODO WLR
 	if (config->default_layout != L_NONE) {
 		//return config->default_layout;
@@ -146,7 +146,7 @@ static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
 	return retval;
 }
 
-void sort_workspaces(struct sway_container *output) {
+void container_sort_workspaces(struct sway_container *output) {
 	list_stable_sort(output->children, sort_workspace_cmp_qsort);
 }
 
@@ -160,7 +160,7 @@ static void apply_vert_layout(struct sway_container *container, const double x,
 				const double height, const int start,
 				const int end);
 
-void arrange_windows(struct sway_container *container, double width, double height) {
+void container_arrange_windows(struct sway_container *container, double width, double height) {
 	int i;
 	if (width == -1 || height == -1) {
 		width = container->width;
@@ -184,7 +184,7 @@ void arrange_windows(struct sway_container *container, double width, double heig
 			struct sway_container *output = container->children->items[i];
 			wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
 					output->name, output->x, output->y);
-			arrange_windows(output, -1, -1);
+			container_arrange_windows(output, -1, -1);
 		}
 		return;
 	case C_OUTPUT:
@@ -198,12 +198,12 @@ void arrange_windows(struct sway_container *container, double width, double heig
 		// arrange all workspaces:
 		for (i = 0; i < container->children->length; ++i) {
 			struct sway_container *child = container->children->items[i];
-			arrange_windows(child, -1, -1);
+			container_arrange_windows(child, -1, -1);
 		}
 		return;
 	case C_WORKSPACE:
 		{
-			struct sway_container *output = sway_container_parent(container, C_OUTPUT);
+			struct sway_container *output = container_parent(container, C_OUTPUT);
 			struct wlr_box *area = &output->sway_output->usable_area;
 			wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
 					area->width, area->height, area->x, area->y);
@@ -284,9 +284,9 @@ static void apply_horiz_layout(struct sway_container *container,
 
 			if (i == end - 1) {
 				double remaining_width = x + width - child_x;
-				arrange_windows(child, remaining_width, height);
+				container_arrange_windows(child, remaining_width, height);
 			} else {
-				arrange_windows(child, child->width * scale, height);
+				container_arrange_windows(child, child->width * scale, height);
 			}
 			child_x += child->width;
 		}
@@ -334,9 +334,9 @@ void apply_vert_layout(struct sway_container *container,
 
 			if (i == end - 1) {
 				double remaining_height = y + height - child_y;
-				arrange_windows(child, width, remaining_height);
+				container_arrange_windows(child, width, remaining_height);
 			} else {
-				arrange_windows(child, width, child->height * scale);
+				container_arrange_windows(child, width, child->height * scale);
 			}
 			child_y += child->height;
 		}
@@ -362,7 +362,7 @@ static struct sway_container *get_swayc_in_output_direction(struct sway_containe
 
 	struct sway_container *ws = sway_seat_get_focus_inactive(seat, output);
 	if (ws->type != C_WORKSPACE) {
-		ws = sway_container_parent(ws, C_WORKSPACE);
+		ws = container_parent(ws, C_WORKSPACE);
 	}
 
 	if (ws == NULL) {
@@ -410,7 +410,7 @@ static void get_layout_center_position(struct sway_container *container, int *x,
 		*x = container->x + container->width/2;
 		*y = container->y + container->height/2;
 	} else {
-		struct sway_container *output = sway_container_parent(container, C_OUTPUT);
+		struct sway_container *output = container_parent(container, C_OUTPUT);
 		if (container->type == C_WORKSPACE) {
 			// Workspace coordinates are actually wrong/arbitrary, but should
 			// be same as output.
@@ -496,7 +496,7 @@ static struct sway_container *get_swayc_in_direction_under(struct sway_container
 	/*
 	if (container->type == C_VIEW && swayc_is_fullscreen(container)) {
 		wlr_log(L_DEBUG, "Moving from fullscreen view, skipping to output");
-		container = sway_container_parent(container, C_OUTPUT);
+		container = container_parent(container, C_OUTPUT);
 		get_layout_center_position(container, &abs_pos);
 		struct sway_container *output = swayc_adjacent_output(container, dir, &abs_pos, true);
 		return get_swayc_in_output_direction(output, dir);
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 32e82845..0fdd9975 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -52,7 +52,7 @@ struct sway_container *workspace_by_number(const char* name) {
 	if (wbnd.len <= 0) {
 		return NULL;
 	}
-	return sway_container_find(&root_container, _workspace_by_number, (void *) &wbnd);
+	return container_find(&root_container, _workspace_by_number, (void *) &wbnd);
 }
 
 static bool _workspace_by_name(struct sway_container *view, void *data) {
@@ -65,8 +65,8 @@ struct sway_container *workspace_by_name(const char *name) {
 	struct sway_container *current_workspace = NULL, *current_output = NULL;
 	struct sway_container *focus = sway_seat_get_focus(seat);
 	if (focus) {
-		current_workspace = sway_container_parent(focus, C_WORKSPACE);
-		current_output = sway_container_parent(focus, C_OUTPUT);
+		current_workspace = container_parent(focus, C_WORKSPACE);
+		current_output = container_parent(focus, C_OUTPUT);
 	}
 	if (strcmp(name, "prev") == 0) {
 		return workspace_prev(current_workspace);
@@ -79,7 +79,7 @@ struct sway_container *workspace_by_name(const char *name) {
 	} else if (strcmp(name, "current") == 0) {
 		return current_workspace;
 	} else {
-		return sway_container_find(&root_container, _workspace_by_name, (void *) name);
+		return container_find(&root_container, _workspace_by_name, (void *) name);
 	}
 }
 
@@ -95,7 +95,7 @@ struct sway_container *workspace_create(const char *name) {
 			for (i = 0; i < e; ++i) {
 				parent = root_container.children->items[i];
 				if (strcmp(parent->name, wso->output) == 0) {
-					return sway_container_workspace_create(parent, name);
+					return container_workspace_create(parent, name);
 				}
 			}
 			break;
@@ -105,8 +105,8 @@ struct sway_container *workspace_create(const char *name) {
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
 	struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
 	parent = focus;
-	parent = sway_container_parent(parent, C_OUTPUT);
-	return sway_container_workspace_create(parent, name);
+	parent = container_parent(parent, C_OUTPUT);
+	return container_workspace_create(parent, name);
 }
 
 /**
@@ -124,7 +124,7 @@ struct sway_container *workspace_output_prev_next_impl(struct sway_container *ou
 	struct sway_container *focus = sway_seat_get_focus_inactive(seat, output);
 	struct sway_container *workspace = (focus->type == C_WORKSPACE ?
 			focus :
-			sway_container_parent(focus, C_WORKSPACE));
+			container_parent(focus, C_WORKSPACE));
 
 	int i;
 	for (i = 0; i < output->children->length; i++) {
@@ -207,7 +207,7 @@ bool workspace_switch(struct sway_container *workspace) {
 	}
 	struct sway_container *active_ws = focus;
 	if (active_ws->type != C_WORKSPACE) {
-		sway_container_parent(focus, C_WORKSPACE);
+		container_parent(focus, C_WORKSPACE);
 	}
 
 	if (config->auto_back_and_forth
@@ -236,7 +236,7 @@ bool workspace_switch(struct sway_container *workspace) {
 		next = workspace;
 	}
 	sway_seat_set_focus(seat, next);
-	struct sway_container *output = sway_container_parent(workspace, C_OUTPUT);
-	arrange_windows(output, -1, -1);
+	struct sway_container *output = container_parent(workspace, C_OUTPUT);
+	container_arrange_windows(output, -1, -1);
 	return true;
 }
-- 
cgit v1.2.3


From ed2cedb54430af0c1400846cf36c9cf539801067 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 17:13:37 -0400
Subject: rename layout init

---
 sway/tree/layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sway/tree')

diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 07534620..5152e523 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -43,7 +43,7 @@ static void output_layout_change_notify(struct wl_listener *listener, void *data
 	container_arrange_windows(&root_container, -1, -1);
 }
 
-void init_layout(void) {
+void layout_init(void) {
 	root_container.id = 0; // normally assigned in new_swayc()
 	root_container.type = C_ROOT;
 	root_container.layout = L_NONE;
-- 
cgit v1.2.3


From e5491bf4981934736b43e239404550c3b66bb1f4 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 18:17:03 -0400
Subject: rename container destroy func

---
 sway/tree/container.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index b41626e1..b343d236 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -58,18 +58,18 @@ static struct sway_container *new_swayc(enum sway_container_type type) {
 	return c;
 }
 
-static void free_swayc(struct sway_container *cont) {
-	if (!sway_assert(cont, "free_swayc passed NULL")) {
+static void container_destroy(struct sway_container *cont) {
+	if (cont == NULL) {
 		return;
 	}
 
 	wl_signal_emit(&cont->events.destroy, cont);
 
 	if (cont->children) {
-		// remove children until there are no more, free_swayc calls
+		// remove children until there are no more, container_destroy calls
 		// container_remove_child, which removes child from this container
 		while (cont->children->length) {
-			free_swayc(cont->children->items[0]);
+			container_destroy(cont->children->items[0]);
 		}
 		list_free(cont->children);
 	}
@@ -125,7 +125,7 @@ struct sway_container *container_output_create(struct sway_output *sway_output)
 	output->sway_output = sway_output;
 	output->name = strdup(name);
 	if (output->name == NULL) {
-		free_swayc(output);
+		container_destroy(output);
 		return NULL;
 	}
 
@@ -224,7 +224,7 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
 	wl_list_remove(&output->sway_output->mode.link);
 
 	wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
-	free_swayc(output);
+	container_destroy(output);
 
 	return &root_container;
 }
@@ -235,7 +235,7 @@ struct sway_container *container_view_destroy(struct sway_container *view) {
 	}
 	wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
 	struct sway_container *parent = view->parent;
-	free_swayc(view);
+	container_destroy(view);
 
 	// TODO WLR: Destroy empty containers
 	/*
-- 
cgit v1.2.3


From 62d1b4cb96f87274d695a9c11a041c42cf59ddc1 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 18:17:31 -0400
Subject: fix container_get_in_direction name

---
 sway/tree/layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sway/tree')

diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 5152e523..fb34573f 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -587,7 +587,7 @@ static struct sway_container *get_swayc_in_direction_under(struct sway_container
 	}
 }
 
-struct sway_container *get_swayc_in_direction(struct sway_container *container, struct sway_seat *seat,
+struct sway_container *container_get_in_direction(struct sway_container *container, struct sway_seat *seat,
 		enum movement_direction dir) {
 	return get_swayc_in_direction_under(container, dir, seat, NULL);
 }
-- 
cgit v1.2.3


From 4ec8bf4ceead0b78407c92bf90a42b95740123f9 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 18:38:43 -0400
Subject: 80col

---
 sway/tree/container.c | 40 ++++++++++++++++++----------
 sway/tree/layout.c    | 73 +++++++++++++++++++++++++++++++++------------------
 sway/tree/workspace.c | 30 ++++++++++++++-------
 3 files changed, 94 insertions(+), 49 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index b343d236..1f537025 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -86,7 +86,8 @@ static void container_destroy(struct sway_container *cont) {
 	free(cont);
 }
 
-struct sway_container *container_output_create(struct sway_output *sway_output) {
+struct sway_container *container_output_create(
+		struct sway_output *sway_output) {
 	struct wlr_box size;
 	wlr_output_effective_resolution(sway_output->wlr_output, &size.width,
 		&size.height);
@@ -150,8 +151,10 @@ struct sway_container *container_output_create(struct sway_output *sway_output)
 	return output;
 }
 
-struct sway_container *container_workspace_create(struct sway_container *output, const char *name) {
-	if (!sway_assert(output, "container_workspace_create called with null output")) {
+struct sway_container *container_workspace_create(struct sway_container
+		*output, const char *name) {
+	if (!sway_assert(output,
+				"container_workspace_create called with null output")) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
@@ -172,8 +175,10 @@ struct sway_container *container_workspace_create(struct sway_container *output,
 	return workspace;
 }
 
-struct sway_container *container_view_create(struct sway_container *sibling, struct sway_view *sway_view) {
-	if (!sway_assert(sibling, "container_view_create called with NULL sibling/parent")) {
+struct sway_container *container_view_create(struct sway_container *sibling,
+		struct sway_view *sway_view) {
+	if (!sway_assert(sibling,
+				"container_view_create called with NULL sibling/parent")) {
 		return NULL;
 	}
 	const char *title = view_get_title(sway_view);
@@ -198,7 +203,8 @@ struct sway_container *container_view_create(struct sway_container *sibling, str
 }
 
 struct sway_container *container_output_destroy(struct sway_container *output) {
-	if (!sway_assert(output, "null output passed to container_output_destroy")) {
+	if (!sway_assert(output,
+				"null output passed to container_output_destroy")) {
 		return NULL;
 	}
 
@@ -215,7 +221,8 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
 				container_add_child(root_container.children->items[p], child);
 			}
 			container_sort_workspaces(root_container.children->items[p]);
-			container_arrange_windows(root_container.children->items[p], -1, -1);
+			container_arrange_windows(root_container.children->items[p],
+				-1, -1);
 		}
 	}
 
@@ -246,7 +253,8 @@ struct sway_container *container_view_destroy(struct sway_container *view) {
 	return parent;
 }
 
-struct sway_container *container_set_layout(struct sway_container *container, enum sway_container_layout layout) {
+struct sway_container *container_set_layout(struct sway_container *container,
+		enum sway_container_layout layout) {
 	if (container->type == C_WORKSPACE) {
 		container->workspace_layout = layout;
 		if (layout == L_HORIZ || layout == L_VERT) {
@@ -258,7 +266,8 @@ struct sway_container *container_set_layout(struct sway_container *container, en
 	return container;
 }
 
-void container_descendents(struct sway_container *root, enum sway_container_type type,
+void container_descendents(struct sway_container *root,
+		enum sway_container_type type,
 		void (*func)(struct sway_container *item, void *data), void *data) {
 	for (int i = 0; i < root->children->length; ++i) {
 		struct sway_container *item = root->children->items[i];
@@ -291,7 +300,8 @@ struct sway_container *container_find(struct sway_container *container,
 	return NULL;
 }
 
-struct sway_container *container_parent(struct sway_container *container, enum sway_container_type type) {
+struct sway_container *container_parent(struct sway_container *container,
+		enum sway_container_type type) {
 	if (!sway_assert(container, "container is NULL")) {
 		return NULL;
 	}
@@ -304,7 +314,8 @@ struct sway_container *container_parent(struct sway_container *container, enum s
 	return container;
 }
 
-void sway_container_for_each(struct sway_container *container, void (*f)(struct sway_container *view, void *data), void *data) {
+void sway_container_for_each(struct sway_container *container,
+		void (*f)(struct sway_container *view, void *data), void *data) {
 	if (container) {
 		int i;
 		if (container->children)  {
@@ -326,7 +337,8 @@ void sway_container_for_each(struct sway_container *container, void (*f)(struct
 	}
 }
 
-struct sway_container *sway_container_at(struct sway_container *parent, double lx, double ly,
+struct sway_container *sway_container_at(struct sway_container *parent,
+		double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
@@ -411,8 +423,8 @@ struct sway_container *sway_container_at(struct sway_container *parent, double l
 	return NULL;
 }
 
-void sway_container_for_each_bfs(struct sway_container *con, void (*f)(struct sway_container *con, void *data),
-		void *data) {
+void sway_container_for_each_bfs(struct sway_container *con,
+		void (*f)(struct sway_container *con, void *data), void *data) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
 		return;
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index fb34573f..53ff9ffa 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -16,14 +16,16 @@
 
 struct sway_container root_container;
 
-static void output_layout_change_notify(struct wl_listener *listener, void *data) {
+static void output_layout_change_notify(struct wl_listener *listener,
+		void *data) {
 	struct wlr_box *layout_box = wlr_output_layout_get_box(
 		root_container.sway_root->output_layout, NULL);
 	root_container.width = layout_box->width;
 	root_container.height = layout_box->height;
 
 	for (int i = 0 ; i < root_container.children->length; ++i) {
-		struct sway_container *output_container = root_container.children->items[i];
+		struct sway_container *output_container =
+			root_container.children->items[i];
 		if (output_container->type != C_OUTPUT) {
 			continue;
 		}
@@ -79,7 +81,8 @@ static int index_child(const struct sway_container *child) {
 	return i;
 }
 
-struct sway_container *container_add_sibling(struct sway_container *fixed, struct sway_container *active) {
+struct sway_container *container_add_sibling(struct sway_container *fixed,
+		struct sway_container *active) {
 	// TODO handle floating
 	struct sway_container *parent = fixed->parent;
 	int i = index_child(fixed);
@@ -88,7 +91,8 @@ struct sway_container *container_add_sibling(struct sway_container *fixed, struc
 	return active->parent;
 }
 
-void container_add_child(struct sway_container *parent, struct sway_container *child) {
+void container_add_child(struct sway_container *parent,
+		struct sway_container *child) {
 	wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
 			child, child->type, child->width, child->height,
 			parent, parent->type, parent->width, parent->height);
@@ -96,7 +100,9 @@ void container_add_child(struct sway_container *parent, struct sway_container *c
 	child->parent = parent;
 	// set focus for this container
 	/* TODO WLR
-	if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
+	if (parent->type == C_WORKSPACE && child->type == C_VIEW &&
+	(parent->workspace_layout == L_TABBED || parent->workspace_layout ==
+	L_STACKED)) {
 		child = new_container(child, parent->workspace_layout);
 	}
 	*/
@@ -115,7 +121,8 @@ struct sway_container *container_remove_child(struct sway_container *child) {
 	return parent;
 }
 
-enum sway_container_layout container_get_default_layout(struct sway_container *output) {
+enum sway_container_layout container_get_default_layout(
+		struct sway_container *output) {
 	/* TODO WLR
 	if (config->default_layout != L_NONE) {
 		//return config->default_layout;
@@ -160,7 +167,8 @@ static void apply_vert_layout(struct sway_container *container, const double x,
 				const double height, const int start,
 				const int end);
 
-void container_arrange_windows(struct sway_container *container, double width, double height) {
+void container_arrange_windows(struct sway_container *container,
+		double width, double height) {
 	int i;
 	if (width == -1 || height == -1) {
 		width = container->width;
@@ -203,7 +211,8 @@ void container_arrange_windows(struct sway_container *container, double width, d
 		return;
 	case C_WORKSPACE:
 		{
-			struct sway_container *output = container_parent(container, C_OUTPUT);
+			struct sway_container *output =
+				container_parent(container, C_OUTPUT);
 			struct wlr_box *area = &output->sway_output->usable_area;
 			wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
 					area->width, area->height, area->x, area->y);
@@ -259,7 +268,8 @@ static void apply_horiz_layout(struct sway_container *container,
 	double scale = 0;
 	// Calculate total width
 	for (int i = start; i < end; ++i) {
-		double *old_width = &((struct sway_container *)container->children->items[i])->width;
+		double *old_width =
+			&((struct sway_container *)container->children->items[i])->width;
 		if (*old_width <= 0) {
 			if (end - start > 1) {
 				*old_width = width / (end - start - 1);
@@ -309,7 +319,8 @@ void apply_vert_layout(struct sway_container *container,
 	double scale = 0;
 	// Calculate total height
 	for (i = start; i < end; ++i) {
-		double *old_height = &((struct sway_container *)container->children->items[i])->height;
+		double *old_height =
+			&((struct sway_container *)container->children->items[i])->height;
 		if (*old_height <= 0) {
 			if (end - start > 1) {
 				*old_height = height / (end - start - 1);
@@ -354,8 +365,9 @@ void apply_vert_layout(struct sway_container *container,
 /**
  * Get swayc in the direction of newly entered output.
  */
-static struct sway_container *get_swayc_in_output_direction(struct sway_container *output,
-		enum movement_direction dir, struct sway_seat *seat) {
+static struct sway_container *get_swayc_in_output_direction(
+		struct sway_container *output, enum movement_direction dir,
+		struct sway_seat *seat) {
 	if (!output) {
 		return NULL;
 	}
@@ -380,13 +392,15 @@ static struct sway_container *get_swayc_in_output_direction(struct sway_containe
 			return ws->children->items[0];
 		case MOVE_UP:
 		case MOVE_DOWN: {
-			struct sway_container *focused = sway_seat_get_focus_inactive(seat, ws);
+			struct sway_container *focused =
+				sway_seat_get_focus_inactive(seat, ws);
 			if (focused && focused->parent) {
 				struct sway_container *parent = focused->parent;
 				if (parent->layout == L_VERT) {
 					if (dir == MOVE_UP) {
 						// get child furthest down on new output
-						return parent->children->items[parent->children->length-1];
+						int idx = parent->children->length - 1;
+						return parent->children->items[idx];
 					} else if (dir == MOVE_DOWN) {
 						// get child furthest up on new output
 						return parent->children->items[0];
@@ -404,7 +418,8 @@ static struct sway_container *get_swayc_in_output_direction(struct sway_containe
 	return ws;
 }
 
-static void get_layout_center_position(struct sway_container *container, int *x, int *y) {
+static void get_layout_center_position(struct sway_container *container,
+		int *x, int *y) {
 	// FIXME view coords are inconsistently referred to in layout/output systems
 	if (container->type == C_OUTPUT) {
 		*x = container->x + container->width/2;
@@ -423,7 +438,8 @@ static void get_layout_center_position(struct sway_container *container, int *x,
 	}
 }
 
-static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out) {
+static bool sway_dir_to_wlr(enum movement_direction dir,
+		enum wlr_direction *out) {
 	switch (dir) {
 	case MOVE_UP:
 		*out = WLR_DIRECTION_UP;
@@ -457,8 +473,9 @@ static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
 	return NULL;
 }
 
-static struct sway_container *get_swayc_in_direction_under(struct sway_container *container,
-		enum movement_direction dir, struct sway_seat *seat, struct sway_container *limit) {
+static struct sway_container *get_swayc_in_direction_under(
+		struct sway_container *container, enum movement_direction dir,
+		struct sway_seat *seat, struct sway_container *limit) {
 	if (dir == MOVE_CHILD) {
 		return sway_seat_get_focus_inactive(seat, container);
 	}
@@ -498,7 +515,8 @@ static struct sway_container *get_swayc_in_direction_under(struct sway_container
 		wlr_log(L_DEBUG, "Moving from fullscreen view, skipping to output");
 		container = container_parent(container, C_OUTPUT);
 		get_layout_center_position(container, &abs_pos);
-		struct sway_container *output = swayc_adjacent_output(container, dir, &abs_pos, true);
+		struct sway_container *output =
+		swayc_adjacent_output(container, dir, &abs_pos, true);
 		return get_swayc_in_output_direction(output, dir);
 	}
 	if (container->type == C_WORKSPACE && container->fullscreen) {
@@ -521,16 +539,19 @@ static struct sway_container *get_swayc_in_direction_under(struct sway_container
 			}
 			int lx, ly;
 			get_layout_center_position(container, &lx, &ly);
-			struct wlr_output_layout *layout = root_container.sway_root->output_layout;
+			struct wlr_output_layout *layout =
+				root_container.sway_root->output_layout;
 			struct wlr_output *wlr_adjacent =
 				wlr_output_layout_adjacent_output(layout, wlr_dir,
 					container->sway_output->wlr_output, lx, ly);
-			struct sway_container *adjacent = sway_output_from_wlr(wlr_adjacent);
+			struct sway_container *adjacent =
+				sway_output_from_wlr(wlr_adjacent);
 
 			if (!adjacent || adjacent == container) {
 				return wrap_candidate;
 			}
-			struct sway_container *next = get_swayc_in_output_direction(adjacent, dir, seat);
+			struct sway_container *next =
+				get_swayc_in_output_direction(adjacent, dir, seat);
 			if (next == NULL) {
 				return NULL;
 			}
@@ -570,8 +591,9 @@ static struct sway_container *get_swayc_in_direction_under(struct sway_container
 					}
 				}
 			} else {
-				wlr_log(L_DEBUG, "%s cont %d-%p dir %i sibling %d: %p", __func__,
-						idx, container, dir, desired, parent->children->items[desired]);
+				wlr_log(L_DEBUG,
+					"%s cont %d-%p dir %i sibling %d: %p", __func__, idx,
+					container, dir, desired, parent->children->items[desired]);
 				return parent->children->items[desired];
 			}
 		}
@@ -587,7 +609,8 @@ static struct sway_container *get_swayc_in_direction_under(struct sway_container
 	}
 }
 
-struct sway_container *container_get_in_direction(struct sway_container *container, struct sway_seat *seat,
+struct sway_container *container_get_in_direction(
+		struct sway_container *container, struct sway_seat *seat,
 		enum movement_direction dir) {
 	return get_swayc_in_direction_under(container, dir, seat, NULL);
 }
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 0fdd9975..369cf14c 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -52,7 +52,8 @@ struct sway_container *workspace_by_number(const char* name) {
 	if (wbnd.len <= 0) {
 		return NULL;
 	}
-	return container_find(&root_container, _workspace_by_number, (void *) &wbnd);
+	return container_find(&root_container,
+			_workspace_by_number, (void *) &wbnd);
 }
 
 static bool _workspace_by_name(struct sway_container *view, void *data) {
@@ -79,7 +80,8 @@ struct sway_container *workspace_by_name(const char *name) {
 	} else if (strcmp(name, "current") == 0) {
 		return current_workspace;
 	} else {
-		return container_find(&root_container, _workspace_by_name, (void *) name);
+		return container_find(&root_container, _workspace_by_name,
+				(void *)name);
 	}
 }
 
@@ -103,7 +105,8 @@ struct sway_container *workspace_create(const char *name) {
 	}
 	// Otherwise create a new one
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
+	struct sway_container *focus =
+		sway_seat_get_focus_inactive(seat, &root_container);
 	parent = focus;
 	parent = container_parent(parent, C_OUTPUT);
 	return container_workspace_create(parent, name);
@@ -114,7 +117,8 @@ struct sway_container *workspace_create(const char *name) {
  * the end and beginning.  If next is false, the previous workspace is returned,
  * otherwise the next one is returned.
  */
-struct sway_container *workspace_output_prev_next_impl(struct sway_container *output, bool next) {
+struct sway_container *workspace_output_prev_next_impl(
+		struct sway_container *output, bool next) {
 	if (!sway_assert(output->type == C_OUTPUT,
 				"Argument must be an output, is %d", output->type)) {
 		return NULL;
@@ -134,7 +138,8 @@ struct sway_container *workspace_output_prev_next_impl(struct sway_container *ou
 		}
 	}
 
-	// Doesn't happen, at worst the for loop returns the previously active workspace
+	// Doesn't happen, at worst the for loop returns the previously active
+	// workspace
 	return NULL;
 }
 
@@ -144,7 +149,8 @@ struct sway_container *workspace_output_prev_next_impl(struct sway_container *ou
  * next is false, the previous workspace is returned, otherwise the next one is
  * returned.
  */
-struct sway_container *workspace_prev_next_impl(struct sway_container *workspace, bool next) {
+struct sway_container *workspace_prev_next_impl(
+		struct sway_container *workspace, bool next) {
 	if (!sway_assert(workspace->type == C_WORKSPACE,
 				"Argument must be a workspace, is %d", workspace->type)) {
 		return NULL;
@@ -166,7 +172,8 @@ struct sway_container *workspace_prev_next_impl(struct sway_container *workspace
 		}
 	}
 
-	// Given workspace is the first/last on the output, jump to the previous/next output
+	// Given workspace is the first/last on the output, jump to the
+	// previous/next output
 	int num_outputs = root_container.children->length;
 	for (i = 0; i < num_outputs; i++) {
 		if (root_container.children->items[i] == current_output) {
@@ -176,7 +183,8 @@ struct sway_container *workspace_prev_next_impl(struct sway_container *workspace
 		}
 	}
 
-	// Doesn't happen, at worst the for loop returns the previously active workspace on the active output
+	// Doesn't happen, at worst the for loop returns the previously active
+	// workspace on the active output
 	return NULL;
 }
 
@@ -201,7 +209,8 @@ bool workspace_switch(struct sway_container *workspace) {
 		return false;
 	}
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
+	struct sway_container *focus =
+		sway_seat_get_focus_inactive(seat, &root_container);
 	if (!seat || !focus) {
 		return false;
 	}
@@ -230,7 +239,8 @@ bool workspace_switch(struct sway_container *workspace) {
 
 	// TODO: Deal with sticky containers
 
-	wlr_log(L_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name);
+	wlr_log(L_DEBUG, "Switching to workspace %p:%s",
+		workspace, workspace->name);
 	struct sway_container *next = sway_seat_get_focus_inactive(seat, workspace);
 	if (next == NULL) {
 		next = workspace;
-- 
cgit v1.2.3


From 4c394a0e9ee04b46ed349f7b3ddf67c53719b3b6 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 21:19:57 -0400
Subject: address feedback

---
 sway/tree/container.c | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 1f537025..dade8f54 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -38,7 +38,7 @@ static void notify_new_container(struct sway_container *container) {
 	ipc_event_window(container, "new");
 }
 
-static struct sway_container *new_swayc(enum sway_container_type type) {
+static struct sway_container *container_create(enum sway_container_type type) {
 	// next id starts at 1 because 0 is assigned to root_container in layout.c
 	static size_t next_id = 1;
 	struct sway_container *c = calloc(1, sizeof(struct sway_container));
@@ -122,7 +122,7 @@ struct sway_container *container_output_create(
 		return NULL;
 	}
 
-	struct sway_container *output = new_swayc(C_OUTPUT);
+	struct sway_container *output = container_create(C_OUTPUT);
 	output->sway_output = sway_output;
 	output->name = strdup(name);
 	if (output->name == NULL) {
@@ -151,14 +151,14 @@ struct sway_container *container_output_create(
 	return output;
 }
 
-struct sway_container *container_workspace_create(struct sway_container
-		*output, const char *name) {
+struct sway_container *container_workspace_create(
+		struct sway_container *output, const char *name) {
 	if (!sway_assert(output,
 				"container_workspace_create called with null output")) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
-	struct sway_container *workspace = new_swayc(C_WORKSPACE);
+	struct sway_container *workspace = container_create(C_WORKSPACE);
 
 	workspace->x = output->x;
 	workspace->y = output->y;
@@ -182,7 +182,7 @@ struct sway_container *container_view_create(struct sway_container *sibling,
 		return NULL;
 	}
 	const char *title = view_get_title(sway_view);
-	struct sway_container *swayc = new_swayc(C_VIEW);
+	struct sway_container *swayc = container_create(C_VIEW);
 	wlr_log(L_DEBUG, "Adding new view %p:%s to container %p %d %s",
 		swayc, title, sibling, sibling ? sibling->type : 0, sibling->name);
 	// Setup values
@@ -314,30 +314,7 @@ struct sway_container *container_parent(struct sway_container *container,
 	return container;
 }
 
-void sway_container_for_each(struct sway_container *container,
-		void (*f)(struct sway_container *view, void *data), void *data) {
-	if (container) {
-		int i;
-		if (container->children)  {
-			for (i = 0; i < container->children->length; ++i) {
-				struct sway_container *child = container->children->items[i];
-				sway_container_for_each(child, f, data);
-			}
-		}
-		// TODO
-		/*
-		if (container->floating) {
-			for (i = 0; i < container->floating->length; ++i) {
-				struct sway_container *child = container->floating->items[i];
-				container_map(child, f, data);
-			}
-		}
-		*/
-		f(container, data);
-	}
-}
-
-struct sway_container *sway_container_at(struct sway_container *parent,
+struct sway_container *container_at(struct sway_container *parent,
 		double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
 	list_t *queue = get_bfs_queue();
@@ -423,7 +400,7 @@ struct sway_container *sway_container_at(struct sway_container *parent,
 	return NULL;
 }
 
-void sway_container_for_each_bfs(struct sway_container *con,
+void container_for_each(struct sway_container *con,
 		void (*f)(struct sway_container *con, void *data), void *data) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
-- 
cgit v1.2.3


From 92c58b1e63d41d48cfb487b04a2cb105c990bc4c Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 23:08:59 -0400
Subject: rename container_for_each_descendent

---
 sway/tree/container.c | 6 +++---
 sway/tree/layout.c    | 2 +-
 sway/tree/view.c      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index dade8f54..fe97d645 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -154,7 +154,7 @@ struct sway_container *container_output_create(
 struct sway_container *container_workspace_create(
 		struct sway_container *output, const char *name) {
 	if (!sway_assert(output,
-				"container_workspace_create called with null output")) {
+			"container_workspace_create called with null output")) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
@@ -178,7 +178,7 @@ struct sway_container *container_workspace_create(
 struct sway_container *container_view_create(struct sway_container *sibling,
 		struct sway_view *sway_view) {
 	if (!sway_assert(sibling,
-				"container_view_create called with NULL sibling/parent")) {
+			"container_view_create called with NULL sibling/parent")) {
 		return NULL;
 	}
 	const char *title = view_get_title(sway_view);
@@ -400,7 +400,7 @@ struct sway_container *container_at(struct sway_container *parent,
 	return NULL;
 }
 
-void container_for_each(struct sway_container *con,
+void container_for_each_descendent(struct sway_container *con,
 		void (*f)(struct sway_container *con, void *data), void *data) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 53ff9ffa..614d0505 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -592,7 +592,7 @@ static struct sway_container *get_swayc_in_direction_under(
 				}
 			} else {
 				wlr_log(L_DEBUG,
-					"%s cont %d-%p dir %i sibling %d: %p", __func__, idx,
+					"cont %d-%p dir %i sibling %d: %p", idx,
 					container, dir, desired, parent->children->items[desired]);
 				return parent->children->items[desired];
 			}
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 20e657a2..d5325c31 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -45,7 +45,7 @@ void view_set_size(struct sway_view *view, int width, int height) {
 	}
 }
 
-// TODO make view coordinates
+// TODO make view coordinates in layout coordinates
 void view_set_position(struct sway_view *view, double ox, double oy) {
 	if (view->iface.set_position) {
 		struct wlr_box box = {
-- 
cgit v1.2.3


From 2778edef976a669dd0019ebb5327bcfeb4de13c5 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 23:15:39 -0400
Subject: arrange windows

---
 sway/tree/container.c |  2 +-
 sway/tree/layout.c    | 16 ++++++++--------
 sway/tree/workspace.c |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index fe97d645..40047dcf 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -221,7 +221,7 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
 				container_add_child(root_container.children->items[p], child);
 			}
 			container_sort_workspaces(root_container.children->items[p]);
-			container_arrange_windows(root_container.children->items[p],
+			arrange_windows(root_container.children->items[p],
 				-1, -1);
 		}
 	}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 614d0505..dc0ee5b4 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -42,7 +42,7 @@ static void output_layout_change_notify(struct wl_listener *listener,
 		output_container->height = output_box->height;
 	}
 
-	container_arrange_windows(&root_container, -1, -1);
+	arrange_windows(&root_container, -1, -1);
 }
 
 void layout_init(void) {
@@ -167,7 +167,7 @@ static void apply_vert_layout(struct sway_container *container, const double x,
 				const double height, const int start,
 				const int end);
 
-void container_arrange_windows(struct sway_container *container,
+void arrange_windows(struct sway_container *container,
 		double width, double height) {
 	int i;
 	if (width == -1 || height == -1) {
@@ -192,7 +192,7 @@ void container_arrange_windows(struct sway_container *container,
 			struct sway_container *output = container->children->items[i];
 			wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
 					output->name, output->x, output->y);
-			container_arrange_windows(output, -1, -1);
+			arrange_windows(output, -1, -1);
 		}
 		return;
 	case C_OUTPUT:
@@ -206,7 +206,7 @@ void container_arrange_windows(struct sway_container *container,
 		// arrange all workspaces:
 		for (i = 0; i < container->children->length; ++i) {
 			struct sway_container *child = container->children->items[i];
-			container_arrange_windows(child, -1, -1);
+			arrange_windows(child, -1, -1);
 		}
 		return;
 	case C_WORKSPACE:
@@ -294,9 +294,9 @@ static void apply_horiz_layout(struct sway_container *container,
 
 			if (i == end - 1) {
 				double remaining_width = x + width - child_x;
-				container_arrange_windows(child, remaining_width, height);
+				arrange_windows(child, remaining_width, height);
 			} else {
-				container_arrange_windows(child, child->width * scale, height);
+				arrange_windows(child, child->width * scale, height);
 			}
 			child_x += child->width;
 		}
@@ -345,9 +345,9 @@ void apply_vert_layout(struct sway_container *container,
 
 			if (i == end - 1) {
 				double remaining_height = y + height - child_y;
-				container_arrange_windows(child, width, remaining_height);
+				arrange_windows(child, width, remaining_height);
 			} else {
-				container_arrange_windows(child, width, child->height * scale);
+				arrange_windows(child, width, child->height * scale);
 			}
 			child_y += child->height;
 		}
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 369cf14c..ba04c55c 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -247,6 +247,6 @@ bool workspace_switch(struct sway_container *workspace) {
 	}
 	sway_seat_set_focus(seat, next);
 	struct sway_container *output = container_parent(workspace, C_OUTPUT);
-	container_arrange_windows(output, -1, -1);
+	arrange_windows(output, -1, -1);
 	return true;
 }
-- 
cgit v1.2.3


From d0c7f66e950689b70196a890b62b82ff3c66e103 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 23:29:29 -0400
Subject: Revert "Refactor tree"

---
 sway/tree/container.c | 221 ++++++++++++++++++++++++++------------------------
 sway/tree/layout.c    | 133 +++++++++++++-----------------
 sway/tree/view.c      |   7 +-
 sway/tree/workspace.c |  92 ++++++++++-----------
 4 files changed, 216 insertions(+), 237 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 40047dcf..bbafe9ec 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -7,14 +7,14 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_wl_shell.h>
 #include "sway/config.h"
-#include "sway/tree/container.h"
+#include "sway/container.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/tree/layout.h"
+#include "sway/layout.h"
 #include "sway/output.h"
 #include "sway/server.h"
-#include "sway/tree/view.h"
-#include "sway/tree/workspace.h"
+#include "sway/view.h"
+#include "sway/workspace.h"
 #include "sway/ipc-server.h"
 #include "log.h"
 
@@ -33,15 +33,48 @@ static list_t *get_bfs_queue() {
 	return bfs_queue;
 }
 
-static void notify_new_container(struct sway_container *container) {
+static void notify_new_container(swayc_t *container) {
 	wl_signal_emit(&root_container.sway_root->events.new_container, container);
 	ipc_event_window(container, "new");
 }
 
-static struct sway_container *container_create(enum sway_container_type type) {
+swayc_t *swayc_by_test(swayc_t *container,
+		bool (*test)(swayc_t *view, void *data), void *data) {
+	if (!container->children) {
+		return NULL;
+	}
+	// TODO: floating windows
+	for (int i = 0; i < container->children->length; ++i) {
+		swayc_t *child = container->children->items[i];
+		if (test(child, data)) {
+			return child;
+		} else {
+			swayc_t *res = swayc_by_test(child, test, data);
+			if (res) {
+				return res;
+			}
+		}
+	}
+	return NULL;
+}
+
+void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
+		void (*func)(swayc_t *item, void *data), void *data) {
+	for (int i = 0; i < root->children->length; ++i) {
+		swayc_t *item = root->children->items[i];
+		if (item->type == type) {
+			func(item, data);
+		}
+		if (item->children && item->children->length) {
+			swayc_descendants_of_type(item, type, func, data);
+		}
+	}
+}
+
+static swayc_t *new_swayc(enum swayc_types type) {
 	// next id starts at 1 because 0 is assigned to root_container in layout.c
 	static size_t next_id = 1;
-	struct sway_container *c = calloc(1, sizeof(struct sway_container));
+	swayc_t *c = calloc(1, sizeof(swayc_t));
 	if (!c) {
 		return NULL;
 	}
@@ -49,6 +82,8 @@ static struct sway_container *container_create(enum sway_container_type type) {
 	c->layout = L_NONE;
 	c->workspace_layout = L_NONE;
 	c->type = type;
+	c->nb_master = 1;
+	c->nb_slave_groups = 1;
 	if (type != C_VIEW) {
 		c->children = create_list();
 	}
@@ -58,18 +93,18 @@ static struct sway_container *container_create(enum sway_container_type type) {
 	return c;
 }
 
-static void container_destroy(struct sway_container *cont) {
-	if (cont == NULL) {
+static void free_swayc(swayc_t *cont) {
+	if (!sway_assert(cont, "free_swayc passed NULL")) {
 		return;
 	}
 
 	wl_signal_emit(&cont->events.destroy, cont);
 
 	if (cont->children) {
-		// remove children until there are no more, container_destroy calls
-		// container_remove_child, which removes child from this container
+		// remove children until there are no more, free_swayc calls
+		// remove_child, which removes child from this container
 		while (cont->children->length) {
-			container_destroy(cont->children->items[0]);
+			free_swayc(cont->children->items[0]);
 		}
 		list_free(cont->children);
 	}
@@ -78,7 +113,7 @@ static void container_destroy(struct sway_container *cont) {
 		list_free(cont->marks);
 	}
 	if (cont->parent) {
-		container_remove_child(cont);
+		remove_child(cont);
 	}
 	if (cont->name) {
 		free(cont->name);
@@ -86,8 +121,7 @@ static void container_destroy(struct sway_container *cont) {
 	free(cont);
 }
 
-struct sway_container *container_output_create(
-		struct sway_output *sway_output) {
+swayc_t *new_output(struct sway_output *sway_output) {
 	struct wlr_box size;
 	wlr_output_effective_resolution(sway_output->wlr_output, &size.width,
 		&size.height);
@@ -122,22 +156,22 @@ struct sway_container *container_output_create(
 		return NULL;
 	}
 
-	struct sway_container *output = container_create(C_OUTPUT);
+	swayc_t *output = new_swayc(C_OUTPUT);
 	output->sway_output = sway_output;
 	output->name = strdup(name);
 	if (output->name == NULL) {
-		container_destroy(output);
+		free_swayc(output);
 		return NULL;
 	}
 
 	apply_output_config(oc, output);
 
-	container_add_child(&root_container, output);
+	add_child(&root_container, output);
 
 	// Create workspace
 	char *ws_name = workspace_next_name(output->name);
 	wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
-	struct sway_container *ws = container_workspace_create(output, ws_name);
+	swayc_t *ws = new_workspace(output, ws_name);
 	// Set each seat's focus if not already set
 	struct sway_seat *seat = NULL;
 	wl_list_for_each(seat, &input_manager->seats, link) {
@@ -151,14 +185,12 @@ struct sway_container *container_output_create(
 	return output;
 }
 
-struct sway_container *container_workspace_create(
-		struct sway_container *output, const char *name) {
-	if (!sway_assert(output,
-			"container_workspace_create called with null output")) {
+swayc_t *new_workspace(swayc_t *output, const char *name) {
+	if (!sway_assert(output, "new_workspace called with null output")) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
-	struct sway_container *workspace = container_create(C_WORKSPACE);
+	swayc_t *workspace = new_swayc(C_WORKSPACE);
 
 	workspace->x = output->x;
 	workspace->y = output->y;
@@ -166,23 +198,21 @@ struct sway_container *container_workspace_create(
 	workspace->height = output->height;
 	workspace->name = !name ? NULL : strdup(name);
 	workspace->prev_layout = L_NONE;
-	workspace->layout = container_get_default_layout(output);
-	workspace->workspace_layout = container_get_default_layout(output);
+	workspace->layout = default_layout(output);
+	workspace->workspace_layout = default_layout(output);
 
-	container_add_child(output, workspace);
-	container_sort_workspaces(output);
+	add_child(output, workspace);
+	sort_workspaces(output);
 	notify_new_container(workspace);
 	return workspace;
 }
 
-struct sway_container *container_view_create(struct sway_container *sibling,
-		struct sway_view *sway_view) {
-	if (!sway_assert(sibling,
-			"container_view_create called with NULL sibling/parent")) {
+swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
+	if (!sway_assert(sibling, "new_view called with NULL sibling/parent")) {
 		return NULL;
 	}
 	const char *title = view_get_title(sway_view);
-	struct sway_container *swayc = container_create(C_VIEW);
+	swayc_t *swayc = new_swayc(C_VIEW);
 	wlr_log(L_DEBUG, "Adding new view %p:%s to container %p %d %s",
 		swayc, title, sibling, sibling ? sibling->type : 0, sibling->name);
 	// Setup values
@@ -193,18 +223,17 @@ struct sway_container *container_view_create(struct sway_container *sibling,
 
 	if (sibling->type == C_WORKSPACE) {
 		// Case of focused workspace, just create as child of it
-		container_add_child(sibling, swayc);
+		add_child(sibling, swayc);
 	} else {
 		// Regular case, create as sibling of current container
-		container_add_sibling(sibling, swayc);
+		add_sibling(sibling, swayc);
 	}
 	notify_new_container(swayc);
 	return swayc;
 }
 
-struct sway_container *container_output_destroy(struct sway_container *output) {
-	if (!sway_assert(output,
-				"null output passed to container_output_destroy")) {
+swayc_t *destroy_output(swayc_t *output) {
+	if (!sway_assert(output, "null output passed to destroy_output")) {
 		return NULL;
 	}
 
@@ -216,13 +245,12 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
 			int p = root_container.children->items[0] == output;
 			// Move workspace from this output to another output
 			while (output->children->length) {
-				struct sway_container *child = output->children->items[0];
-				container_remove_child(child);
-				container_add_child(root_container.children->items[p], child);
+				swayc_t *child = output->children->items[0];
+				remove_child(child);
+				add_child(root_container.children->items[p], child);
 			}
-			container_sort_workspaces(root_container.children->items[p]);
-			arrange_windows(root_container.children->items[p],
-				-1, -1);
+			sort_workspaces(root_container.children->items[p]);
+			arrange_windows(root_container.children->items[p], -1, -1);
 		}
 	}
 
@@ -231,18 +259,18 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
 	wl_list_remove(&output->sway_output->mode.link);
 
 	wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
-	container_destroy(output);
+	free_swayc(output);
 
 	return &root_container;
 }
 
-struct sway_container *container_view_destroy(struct sway_container *view) {
+swayc_t *destroy_view(swayc_t *view) {
 	if (!view) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
-	struct sway_container *parent = view->parent;
-	container_destroy(view);
+	swayc_t *parent = view->parent;
+	free_swayc(view);
 
 	// TODO WLR: Destroy empty containers
 	/*
@@ -253,55 +281,7 @@ struct sway_container *container_view_destroy(struct sway_container *view) {
 	return parent;
 }
 
-struct sway_container *container_set_layout(struct sway_container *container,
-		enum sway_container_layout layout) {
-	if (container->type == C_WORKSPACE) {
-		container->workspace_layout = layout;
-		if (layout == L_HORIZ || layout == L_VERT) {
-			container->layout = layout;
-		}
-	} else {
-		container->layout = layout;
-	}
-	return container;
-}
-
-void container_descendents(struct sway_container *root,
-		enum sway_container_type type,
-		void (*func)(struct sway_container *item, void *data), void *data) {
-	for (int i = 0; i < root->children->length; ++i) {
-		struct sway_container *item = root->children->items[i];
-		if (item->type == type) {
-			func(item, data);
-		}
-		if (item->children && item->children->length) {
-			container_descendents(item, type, func, data);
-		}
-	}
-}
-
-struct sway_container *container_find(struct sway_container *container,
-		bool (*test)(struct sway_container *view, void *data), void *data) {
-	if (!container->children) {
-		return NULL;
-	}
-	// TODO: floating windows
-	for (int i = 0; i < container->children->length; ++i) {
-		struct sway_container *child = container->children->items[i];
-		if (test(child, data)) {
-			return child;
-		} else {
-			struct sway_container *res = container_find(child, test, data);
-			if (res) {
-				return res;
-			}
-		}
-	}
-	return NULL;
-}
-
-struct sway_container *container_parent(struct sway_container *container,
-		enum sway_container_type type) {
+swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
 	if (!sway_assert(container, "container is NULL")) {
 		return NULL;
 	}
@@ -314,8 +294,7 @@ struct sway_container *container_parent(struct sway_container *container,
 	return container;
 }
 
-struct sway_container *container_at(struct sway_container *parent,
-		double lx, double ly,
+swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
@@ -324,13 +303,13 @@ struct sway_container *container_at(struct sway_container *parent,
 
 	list_add(queue, parent);
 
-	struct sway_container *swayc = NULL;
+	swayc_t *swayc = NULL;
 	while (queue->length) {
 		swayc = queue->items[0];
 		list_del(queue, 0);
 		if (swayc->type == C_VIEW) {
 			struct sway_view *sview = swayc->sway_view;
-			struct sway_container *soutput = container_parent(swayc, C_OUTPUT);
+			swayc_t *soutput = swayc_parent_by_type(swayc, C_OUTPUT);
 			struct wlr_box *output_box =
 				wlr_output_layout_get_box(
 					root_container.sway_root->output_layout,
@@ -400,8 +379,30 @@ struct sway_container *container_at(struct sway_container *parent,
 	return NULL;
 }
 
-void container_for_each_descendent(struct sway_container *con,
-		void (*f)(struct sway_container *con, void *data), void *data) {
+void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
+	if (container) {
+		int i;
+		if (container->children)  {
+			for (i = 0; i < container->children->length; ++i) {
+				swayc_t *child = container->children->items[i];
+				container_map(child, f, data);
+			}
+		}
+		// TODO
+		/*
+		if (container->floating) {
+			for (i = 0; i < container->floating->length; ++i) {
+				swayc_t *child = container->floating->items[i];
+				container_map(child, f, data);
+			}
+		}
+		*/
+		f(container, data);
+	}
+}
+
+void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
+		void *data) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
 		return;
@@ -414,7 +415,7 @@ void container_for_each_descendent(struct sway_container *con,
 
 	list_add(queue, con);
 
-	struct sway_container *current = NULL;
+	swayc_t *current = NULL;
 	while (queue->length) {
 		current = queue->items[0];
 		list_del(queue, 0);
@@ -423,3 +424,15 @@ void container_for_each_descendent(struct sway_container *con,
 		list_cat(queue, current->children);
 	}
 }
+
+swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
+	if (container->type == C_WORKSPACE) {
+		container->workspace_layout = layout;
+		if (layout == L_HORIZ || layout == L_VERT) {
+			container->layout = layout;
+		}
+	} else {
+		container->layout = layout;
+	}
+	return container;
+}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index dc0ee5b4..de9e7b58 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -6,26 +6,24 @@
 #include <string.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
+#include "sway/container.h"
+#include "sway/layout.h"
 #include "sway/output.h"
-#include "sway/tree/view.h"
+#include "sway/view.h"
 #include "sway/input/seat.h"
 #include "list.h"
 #include "log.h"
 
-struct sway_container root_container;
+swayc_t root_container;
 
-static void output_layout_change_notify(struct wl_listener *listener,
-		void *data) {
+static void output_layout_change_notify(struct wl_listener *listener, void *data) {
 	struct wlr_box *layout_box = wlr_output_layout_get_box(
 		root_container.sway_root->output_layout, NULL);
 	root_container.width = layout_box->width;
 	root_container.height = layout_box->height;
 
 	for (int i = 0 ; i < root_container.children->length; ++i) {
-		struct sway_container *output_container =
-			root_container.children->items[i];
+		swayc_t *output_container = root_container.children->items[i];
 		if (output_container->type != C_OUTPUT) {
 			continue;
 		}
@@ -45,7 +43,7 @@ static void output_layout_change_notify(struct wl_listener *listener,
 	arrange_windows(&root_container, -1, -1);
 }
 
-void layout_init(void) {
+void init_layout(void) {
 	root_container.id = 0; // normally assigned in new_swayc()
 	root_container.type = C_ROOT;
 	root_container.layout = L_NONE;
@@ -64,9 +62,9 @@ void layout_init(void) {
 		&root_container.sway_root->output_layout_change);
 }
 
-static int index_child(const struct sway_container *child) {
+static int index_child(const swayc_t *child) {
 	// TODO handle floating
-	struct sway_container *parent = child->parent;
+	swayc_t *parent = child->parent;
 	int i, len;
 	len = parent->children->length;
 	for (i = 0; i < len; ++i) {
@@ -81,18 +79,16 @@ static int index_child(const struct sway_container *child) {
 	return i;
 }
 
-struct sway_container *container_add_sibling(struct sway_container *fixed,
-		struct sway_container *active) {
+swayc_t *add_sibling(swayc_t *fixed, swayc_t *active) {
 	// TODO handle floating
-	struct sway_container *parent = fixed->parent;
+	swayc_t *parent = fixed->parent;
 	int i = index_child(fixed);
 	list_insert(parent->children, i + 1, active);
 	active->parent = parent;
 	return active->parent;
 }
 
-void container_add_child(struct sway_container *parent,
-		struct sway_container *child) {
+void add_child(swayc_t *parent, swayc_t *child) {
 	wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
 			child, child->type, child->width, child->height,
 			parent, parent->type, parent->width, parent->height);
@@ -100,17 +96,15 @@ void container_add_child(struct sway_container *parent,
 	child->parent = parent;
 	// set focus for this container
 	/* TODO WLR
-	if (parent->type == C_WORKSPACE && child->type == C_VIEW &&
-	(parent->workspace_layout == L_TABBED || parent->workspace_layout ==
-	L_STACKED)) {
+	if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
 		child = new_container(child, parent->workspace_layout);
 	}
 	*/
 }
 
-struct sway_container *container_remove_child(struct sway_container *child) {
+swayc_t *remove_child(swayc_t *child) {
 	int i;
-	struct sway_container *parent = child->parent;
+	swayc_t *parent = child->parent;
 	for (i = 0; i < parent->children->length; ++i) {
 		if (parent->children->items[i] == child) {
 			list_del(parent->children, i);
@@ -121,8 +115,7 @@ struct sway_container *container_remove_child(struct sway_container *child) {
 	return parent;
 }
 
-enum sway_container_layout container_get_default_layout(
-		struct sway_container *output) {
+enum swayc_layouts default_layout(swayc_t *output) {
 	/* TODO WLR
 	if (config->default_layout != L_NONE) {
 		//return config->default_layout;
@@ -136,8 +129,8 @@ enum sway_container_layout container_get_default_layout(
 }
 
 static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
-	struct sway_container *a = *(void **)_a;
-	struct sway_container *b = *(void **)_b;
+	swayc_t *a = *(void **)_a;
+	swayc_t *b = *(void **)_b;
 	int retval = 0;
 
 	if (isdigit(a->name[0]) && isdigit(b->name[0])) {
@@ -153,22 +146,21 @@ static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
 	return retval;
 }
 
-void container_sort_workspaces(struct sway_container *output) {
+void sort_workspaces(swayc_t *output) {
 	list_stable_sort(output->children, sort_workspace_cmp_qsort);
 }
 
-static void apply_horiz_layout(struct sway_container *container, const double x,
+static void apply_horiz_layout(swayc_t *container, const double x,
 				const double y, const double width,
 				const double height, const int start,
 				const int end);
 
-static void apply_vert_layout(struct sway_container *container, const double x,
+static void apply_vert_layout(swayc_t *container, const double x,
 				const double y, const double width,
 				const double height, const int start,
 				const int end);
 
-void arrange_windows(struct sway_container *container,
-		double width, double height) {
+void arrange_windows(swayc_t *container, double width, double height) {
 	int i;
 	if (width == -1 || height == -1) {
 		width = container->width;
@@ -189,7 +181,7 @@ void arrange_windows(struct sway_container *container,
 	case C_ROOT:
 		// TODO: wlr_output_layout probably
 		for (i = 0; i < container->children->length; ++i) {
-			struct sway_container *output = container->children->items[i];
+			swayc_t *output = container->children->items[i];
 			wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
 					output->name, output->x, output->y);
 			arrange_windows(output, -1, -1);
@@ -205,14 +197,13 @@ void arrange_windows(struct sway_container *container,
 		}
 		// arrange all workspaces:
 		for (i = 0; i < container->children->length; ++i) {
-			struct sway_container *child = container->children->items[i];
+			swayc_t *child = container->children->items[i];
 			arrange_windows(child, -1, -1);
 		}
 		return;
 	case C_WORKSPACE:
 		{
-			struct sway_container *output =
-				container_parent(container, C_OUTPUT);
+			swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
 			struct wlr_box *area = &output->sway_output->usable_area;
 			wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
 					area->width, area->height, area->x, area->y);
@@ -261,15 +252,14 @@ void arrange_windows(struct sway_container *container,
 	}
 }
 
-static void apply_horiz_layout(struct sway_container *container,
+static void apply_horiz_layout(swayc_t *container,
 		const double x, const double y,
 		const double width, const double height,
 		const int start, const int end) {
 	double scale = 0;
 	// Calculate total width
 	for (int i = start; i < end; ++i) {
-		double *old_width =
-			&((struct sway_container *)container->children->items[i])->width;
+		double *old_width = &((swayc_t *)container->children->items[i])->width;
 		if (*old_width <= 0) {
 			if (end - start > 1) {
 				*old_width = width / (end - start - 1);
@@ -286,7 +276,7 @@ static void apply_horiz_layout(struct sway_container *container,
 	if (scale > 0.1) {
 		wlr_log(L_DEBUG, "Arranging %p horizontally", container);
 		for (int i = start; i < end; ++i) {
-			struct sway_container *child = container->children->items[i];
+			swayc_t *child = container->children->items[i];
 			wlr_log(L_DEBUG,
 				"Calculating arrangement for %p:%d (will scale %f by %f)",
 				child, child->type, width, scale);
@@ -311,7 +301,7 @@ static void apply_horiz_layout(struct sway_container *container,
 	}
 }
 
-void apply_vert_layout(struct sway_container *container,
+void apply_vert_layout(swayc_t *container,
 		const double x, const double y,
 		const double width, const double height, const int start,
 		const int end) {
@@ -319,8 +309,7 @@ void apply_vert_layout(struct sway_container *container,
 	double scale = 0;
 	// Calculate total height
 	for (i = start; i < end; ++i) {
-		double *old_height =
-			&((struct sway_container *)container->children->items[i])->height;
+		double *old_height = &((swayc_t *)container->children->items[i])->height;
 		if (*old_height <= 0) {
 			if (end - start > 1) {
 				*old_height = height / (end - start - 1);
@@ -337,7 +326,7 @@ void apply_vert_layout(struct sway_container *container,
 	if (scale > 0.1) {
 		wlr_log(L_DEBUG, "Arranging %p vertically", container);
 		for (i = start; i < end; ++i) {
-			struct sway_container *child = container->children->items[i];
+			swayc_t *child = container->children->items[i];
 			wlr_log(L_DEBUG,
 				"Calculating arrangement for %p:%d (will scale %f by %f)",
 				child, child->type, height, scale);
@@ -365,16 +354,15 @@ void apply_vert_layout(struct sway_container *container,
 /**
  * Get swayc in the direction of newly entered output.
  */
-static struct sway_container *get_swayc_in_output_direction(
-		struct sway_container *output, enum movement_direction dir,
-		struct sway_seat *seat) {
+static swayc_t *get_swayc_in_output_direction(swayc_t *output,
+		enum movement_direction dir, struct sway_seat *seat) {
 	if (!output) {
 		return NULL;
 	}
 
-	struct sway_container *ws = sway_seat_get_focus_inactive(seat, output);
+	swayc_t *ws = sway_seat_get_focus_inactive(seat, output);
 	if (ws->type != C_WORKSPACE) {
-		ws = container_parent(ws, C_WORKSPACE);
+		ws = swayc_parent_by_type(ws, C_WORKSPACE);
 	}
 
 	if (ws == NULL) {
@@ -392,15 +380,13 @@ static struct sway_container *get_swayc_in_output_direction(
 			return ws->children->items[0];
 		case MOVE_UP:
 		case MOVE_DOWN: {
-			struct sway_container *focused =
-				sway_seat_get_focus_inactive(seat, ws);
+			swayc_t *focused = sway_seat_get_focus_inactive(seat, ws);
 			if (focused && focused->parent) {
-				struct sway_container *parent = focused->parent;
+				swayc_t *parent = focused->parent;
 				if (parent->layout == L_VERT) {
 					if (dir == MOVE_UP) {
 						// get child furthest down on new output
-						int idx = parent->children->length - 1;
-						return parent->children->items[idx];
+						return parent->children->items[parent->children->length-1];
 					} else if (dir == MOVE_DOWN) {
 						// get child furthest up on new output
 						return parent->children->items[0];
@@ -418,14 +404,13 @@ static struct sway_container *get_swayc_in_output_direction(
 	return ws;
 }
 
-static void get_layout_center_position(struct sway_container *container,
-		int *x, int *y) {
+static void get_layout_center_position(swayc_t *container, int *x, int *y) {
 	// FIXME view coords are inconsistently referred to in layout/output systems
 	if (container->type == C_OUTPUT) {
 		*x = container->x + container->width/2;
 		*y = container->y + container->height/2;
 	} else {
-		struct sway_container *output = container_parent(container, C_OUTPUT);
+		swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
 		if (container->type == C_WORKSPACE) {
 			// Workspace coordinates are actually wrong/arbitrary, but should
 			// be same as output.
@@ -438,8 +423,7 @@ static void get_layout_center_position(struct sway_container *container,
 	}
 }
 
-static bool sway_dir_to_wlr(enum movement_direction dir,
-		enum wlr_direction *out) {
+static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out) {
 	switch (dir) {
 	case MOVE_UP:
 		*out = WLR_DIRECTION_UP;
@@ -460,12 +444,12 @@ static bool sway_dir_to_wlr(enum movement_direction dir,
 	return true;
 }
 
-static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
+static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
 	if (output == NULL) {
 		return NULL;
 	}
 	for (int i = 0; i < root_container.children->length; ++i) {
-		struct sway_container *o = root_container.children->items[i];
+		swayc_t *o = root_container.children->items[i];
 		if (o->type == C_OUTPUT && o->sway_output->wlr_output == output) {
 			return o;
 		}
@@ -473,14 +457,13 @@ static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
 	return NULL;
 }
 
-static struct sway_container *get_swayc_in_direction_under(
-		struct sway_container *container, enum movement_direction dir,
-		struct sway_seat *seat, struct sway_container *limit) {
+static swayc_t *get_swayc_in_direction_under(swayc_t *container,
+		enum movement_direction dir, struct sway_seat *seat, swayc_t *limit) {
 	if (dir == MOVE_CHILD) {
 		return sway_seat_get_focus_inactive(seat, container);
 	}
 
-	struct sway_container *parent = container->parent;
+	swayc_t *parent = container->parent;
 	if (dir == MOVE_PARENT) {
 		if (parent->type == C_OUTPUT) {
 			return NULL;
@@ -513,10 +496,9 @@ static struct sway_container *get_swayc_in_direction_under(
 	/*
 	if (container->type == C_VIEW && swayc_is_fullscreen(container)) {
 		wlr_log(L_DEBUG, "Moving from fullscreen view, skipping to output");
-		container = container_parent(container, C_OUTPUT);
+		container = swayc_parent_by_type(container, C_OUTPUT);
 		get_layout_center_position(container, &abs_pos);
-		struct sway_container *output =
-		swayc_adjacent_output(container, dir, &abs_pos, true);
+		swayc_t *output = swayc_adjacent_output(container, dir, &abs_pos, true);
 		return get_swayc_in_output_direction(output, dir);
 	}
 	if (container->type == C_WORKSPACE && container->fullscreen) {
@@ -525,7 +507,7 @@ static struct sway_container *get_swayc_in_direction_under(
 	}
 	*/
 
-	struct sway_container *wrap_candidate = NULL;
+	swayc_t *wrap_candidate = NULL;
 	while (true) {
 		// Test if we can even make a difference here
 		bool can_move = false;
@@ -539,19 +521,16 @@ static struct sway_container *get_swayc_in_direction_under(
 			}
 			int lx, ly;
 			get_layout_center_position(container, &lx, &ly);
-			struct wlr_output_layout *layout =
-				root_container.sway_root->output_layout;
+			struct wlr_output_layout *layout = root_container.sway_root->output_layout;
 			struct wlr_output *wlr_adjacent =
 				wlr_output_layout_adjacent_output(layout, wlr_dir,
 					container->sway_output->wlr_output, lx, ly);
-			struct sway_container *adjacent =
-				sway_output_from_wlr(wlr_adjacent);
+			swayc_t *adjacent = sway_output_from_wlr(wlr_adjacent);
 
 			if (!adjacent || adjacent == container) {
 				return wrap_candidate;
 			}
-			struct sway_container *next =
-				get_swayc_in_output_direction(adjacent, dir, seat);
+			swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat);
 			if (next == NULL) {
 				return NULL;
 			}
@@ -591,9 +570,8 @@ static struct sway_container *get_swayc_in_direction_under(
 					}
 				}
 			} else {
-				wlr_log(L_DEBUG,
-					"cont %d-%p dir %i sibling %d: %p", idx,
-					container, dir, desired, parent->children->items[desired]);
+				wlr_log(L_DEBUG, "%s cont %d-%p dir %i sibling %d: %p", __func__,
+						idx, container, dir, desired, parent->children->items[desired]);
 				return parent->children->items[desired];
 			}
 		}
@@ -609,8 +587,7 @@ static struct sway_container *get_swayc_in_direction_under(
 	}
 }
 
-struct sway_container *container_get_in_direction(
-		struct sway_container *container, struct sway_seat *seat,
+swayc_t *get_swayc_in_direction(swayc_t *container, struct sway_seat *seat,
 		enum movement_direction dir) {
 	return get_swayc_in_direction_under(container, dir, seat, NULL);
 }
diff --git a/sway/tree/view.c b/sway/tree/view.c
index d5325c31..9499adca 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,8 +1,8 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
-#include "sway/tree/view.h"
+#include "sway/container.h"
+#include "sway/layout.h"
+#include "sway/view.h"
 
 const char *view_get_title(struct sway_view *view) {
 	if (view->iface.get_prop) {
@@ -45,7 +45,6 @@ void view_set_size(struct sway_view *view, int width, int height) {
 	}
 }
 
-// TODO make view coordinates in layout coordinates
 void view_set_position(struct sway_view *view, double ox, double oy) {
 	if (view->iface.set_position) {
 		struct wlr_box box = {
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index ba04c55c..861fda4d 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -3,10 +3,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <strings.h>
-#include "sway/tree/container.h"
+#include "sway/container.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/tree/workspace.h"
+#include "sway/workspace.h"
 #include "log.h"
 #include "util.h"
 
@@ -17,7 +17,7 @@ struct workspace_by_number_data {
 	const char *name;
 };
 
-void next_name_map(struct sway_container *ws, void *data) {
+void next_name_map(swayc_t *ws, void *data) {
 	int *count = data;
 	++count;
 }
@@ -37,7 +37,7 @@ char *workspace_next_name(const char *output_name) {
 	return name;
 }
 
-static bool _workspace_by_number(struct sway_container *view, void *data) {
+static bool _workspace_by_number(swayc_t *view, void *data) {
 	if (view->type != C_WORKSPACE) {
 		return false;
 	}
@@ -46,28 +46,27 @@ static bool _workspace_by_number(struct sway_container *view, void *data) {
 	return a == wbnd->len && strncmp(view->name, wbnd->name, a) == 0;
 }
 
-struct sway_container *workspace_by_number(const char* name) {
+swayc_t *workspace_by_number(const char* name) {
 	struct workspace_by_number_data wbnd = {0, "1234567890", name};
 	wbnd.len = strspn(name, wbnd.cset);
 	if (wbnd.len <= 0) {
 		return NULL;
 	}
-	return container_find(&root_container,
-			_workspace_by_number, (void *) &wbnd);
+	return swayc_by_test(&root_container, _workspace_by_number, (void *) &wbnd);
 }
 
-static bool _workspace_by_name(struct sway_container *view, void *data) {
+static bool _workspace_by_name(swayc_t *view, void *data) {
 	return (view->type == C_WORKSPACE) &&
 		   (strcasecmp(view->name, (char *) data) == 0);
 }
 
-struct sway_container *workspace_by_name(const char *name) {
+swayc_t *workspace_by_name(const char *name) {
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	struct sway_container *current_workspace = NULL, *current_output = NULL;
-	struct sway_container *focus = sway_seat_get_focus(seat);
+	swayc_t *current_workspace = NULL, *current_output = NULL;
+	swayc_t *focus = sway_seat_get_focus(seat);
 	if (focus) {
-		current_workspace = container_parent(focus, C_WORKSPACE);
-		current_output = container_parent(focus, C_OUTPUT);
+		current_workspace = swayc_parent_by_type(focus, C_WORKSPACE);
+		current_output = swayc_parent_by_type(focus, C_OUTPUT);
 	}
 	if (strcmp(name, "prev") == 0) {
 		return workspace_prev(current_workspace);
@@ -80,13 +79,12 @@ struct sway_container *workspace_by_name(const char *name) {
 	} else if (strcmp(name, "current") == 0) {
 		return current_workspace;
 	} else {
-		return container_find(&root_container, _workspace_by_name,
-				(void *)name);
+		return swayc_by_test(&root_container, _workspace_by_name, (void *) name);
 	}
 }
 
-struct sway_container *workspace_create(const char *name) {
-	struct sway_container *parent;
+swayc_t *workspace_create(const char *name) {
+	swayc_t *parent;
 	// Search for workspace<->output pair
 	int i, e = config->workspace_outputs->length;
 	for (i = 0; i < e; ++i) {
@@ -97,7 +95,7 @@ struct sway_container *workspace_create(const char *name) {
 			for (i = 0; i < e; ++i) {
 				parent = root_container.children->items[i];
 				if (strcmp(parent->name, wso->output) == 0) {
-					return container_workspace_create(parent, name);
+					return new_workspace(parent, name);
 				}
 			}
 			break;
@@ -105,11 +103,10 @@ struct sway_container *workspace_create(const char *name) {
 	}
 	// Otherwise create a new one
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	struct sway_container *focus =
-		sway_seat_get_focus_inactive(seat, &root_container);
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
 	parent = focus;
-	parent = container_parent(parent, C_OUTPUT);
-	return container_workspace_create(parent, name);
+	parent = swayc_parent_by_type(parent, C_OUTPUT);
+	return new_workspace(parent, name);
 }
 
 /**
@@ -117,18 +114,17 @@ struct sway_container *workspace_create(const char *name) {
  * the end and beginning.  If next is false, the previous workspace is returned,
  * otherwise the next one is returned.
  */
-struct sway_container *workspace_output_prev_next_impl(
-		struct sway_container *output, bool next) {
+swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
 	if (!sway_assert(output->type == C_OUTPUT,
 				"Argument must be an output, is %d", output->type)) {
 		return NULL;
 	}
 
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	struct sway_container *focus = sway_seat_get_focus_inactive(seat, output);
-	struct sway_container *workspace = (focus->type == C_WORKSPACE ?
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, output);
+	swayc_t *workspace = (focus->type == C_WORKSPACE ?
 			focus :
-			container_parent(focus, C_WORKSPACE));
+			swayc_parent_by_type(focus, C_WORKSPACE));
 
 	int i;
 	for (i = 0; i < output->children->length; i++) {
@@ -138,8 +134,7 @@ struct sway_container *workspace_output_prev_next_impl(
 		}
 	}
 
-	// Doesn't happen, at worst the for loop returns the previously active
-	// workspace
+	// Doesn't happen, at worst the for loop returns the previously active workspace
 	return NULL;
 }
 
@@ -149,14 +144,13 @@ struct sway_container *workspace_output_prev_next_impl(
  * next is false, the previous workspace is returned, otherwise the next one is
  * returned.
  */
-struct sway_container *workspace_prev_next_impl(
-		struct sway_container *workspace, bool next) {
+swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
 	if (!sway_assert(workspace->type == C_WORKSPACE,
 				"Argument must be a workspace, is %d", workspace->type)) {
 		return NULL;
 	}
 
-	struct sway_container *current_output = workspace->parent;
+	swayc_t *current_output = workspace->parent;
 	int offset = next ? 1 : -1;
 	int start = next ? 0 : 1;
 	int end;
@@ -172,57 +166,54 @@ struct sway_container *workspace_prev_next_impl(
 		}
 	}
 
-	// Given workspace is the first/last on the output, jump to the
-	// previous/next output
+	// Given workspace is the first/last on the output, jump to the previous/next output
 	int num_outputs = root_container.children->length;
 	for (i = 0; i < num_outputs; i++) {
 		if (root_container.children->items[i] == current_output) {
-			struct sway_container *next_output = root_container.children->items[
+			swayc_t *next_output = root_container.children->items[
 				wrap(i + offset, num_outputs)];
 			return workspace_output_prev_next_impl(next_output, next);
 		}
 	}
 
-	// Doesn't happen, at worst the for loop returns the previously active
-	// workspace on the active output
+	// Doesn't happen, at worst the for loop returns the previously active workspace on the active output
 	return NULL;
 }
 
-struct sway_container *workspace_output_next(struct sway_container *current) {
+swayc_t *workspace_output_next(swayc_t *current) {
 	return workspace_output_prev_next_impl(current, true);
 }
 
-struct sway_container *workspace_next(struct sway_container *current) {
+swayc_t *workspace_next(swayc_t *current) {
 	return workspace_prev_next_impl(current, true);
 }
 
-struct sway_container *workspace_output_prev(struct sway_container *current) {
+swayc_t *workspace_output_prev(swayc_t *current) {
 	return workspace_output_prev_next_impl(current, false);
 }
 
-struct sway_container *workspace_prev(struct sway_container *current) {
+swayc_t *workspace_prev(swayc_t *current) {
 	return workspace_prev_next_impl(current, false);
 }
 
-bool workspace_switch(struct sway_container *workspace) {
+bool workspace_switch(swayc_t *workspace) {
 	if (!workspace) {
 		return false;
 	}
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	struct sway_container *focus =
-		sway_seat_get_focus_inactive(seat, &root_container);
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
 	if (!seat || !focus) {
 		return false;
 	}
-	struct sway_container *active_ws = focus;
+	swayc_t *active_ws = focus;
 	if (active_ws->type != C_WORKSPACE) {
-		container_parent(focus, C_WORKSPACE);
+		swayc_parent_by_type(focus, C_WORKSPACE);
 	}
 
 	if (config->auto_back_and_forth
 			&& active_ws == workspace
 			&& prev_workspace_name) {
-		struct sway_container *new_ws = workspace_by_name(prev_workspace_name);
+		swayc_t *new_ws = workspace_by_name(prev_workspace_name);
 		workspace = new_ws ? new_ws : workspace_create(prev_workspace_name);
 	}
 
@@ -239,14 +230,13 @@ bool workspace_switch(struct sway_container *workspace) {
 
 	// TODO: Deal with sticky containers
 
-	wlr_log(L_DEBUG, "Switching to workspace %p:%s",
-		workspace, workspace->name);
-	struct sway_container *next = sway_seat_get_focus_inactive(seat, workspace);
+	wlr_log(L_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name);
+	swayc_t *next = sway_seat_get_focus_inactive(seat, workspace);
 	if (next == NULL) {
 		next = workspace;
 	}
 	sway_seat_set_focus(seat, next);
-	struct sway_container *output = container_parent(workspace, C_OUTPUT);
+	swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT);
 	arrange_windows(output, -1, -1);
 	return true;
 }
-- 
cgit v1.2.3


From dc8c9fbeb664518c76066cc28ee29452c6c30128 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 23:41:33 -0400
Subject: Revert "Merge pull request #1653 from
 swaywm/revert-1647-refactor-tree"

This reverts commit 472e81f35d689d67cda241acafda91c688d61046, reversing
changes made to 6b7841b11ff4cd35f54d69dc92029855893e5ce0.
---
 sway/tree/container.c | 221 ++++++++++++++++++++++++--------------------------
 sway/tree/layout.c    | 133 +++++++++++++++++-------------
 sway/tree/view.c      |   7 +-
 sway/tree/workspace.c |  92 +++++++++++----------
 4 files changed, 237 insertions(+), 216 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index bbafe9ec..40047dcf 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -7,14 +7,14 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_wl_shell.h>
 #include "sway/config.h"
-#include "sway/container.h"
+#include "sway/tree/container.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/layout.h"
+#include "sway/tree/layout.h"
 #include "sway/output.h"
 #include "sway/server.h"
-#include "sway/view.h"
-#include "sway/workspace.h"
+#include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
 #include "sway/ipc-server.h"
 #include "log.h"
 
@@ -33,48 +33,15 @@ static list_t *get_bfs_queue() {
 	return bfs_queue;
 }
 
-static void notify_new_container(swayc_t *container) {
+static void notify_new_container(struct sway_container *container) {
 	wl_signal_emit(&root_container.sway_root->events.new_container, container);
 	ipc_event_window(container, "new");
 }
 
-swayc_t *swayc_by_test(swayc_t *container,
-		bool (*test)(swayc_t *view, void *data), void *data) {
-	if (!container->children) {
-		return NULL;
-	}
-	// TODO: floating windows
-	for (int i = 0; i < container->children->length; ++i) {
-		swayc_t *child = container->children->items[i];
-		if (test(child, data)) {
-			return child;
-		} else {
-			swayc_t *res = swayc_by_test(child, test, data);
-			if (res) {
-				return res;
-			}
-		}
-	}
-	return NULL;
-}
-
-void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
-		void (*func)(swayc_t *item, void *data), void *data) {
-	for (int i = 0; i < root->children->length; ++i) {
-		swayc_t *item = root->children->items[i];
-		if (item->type == type) {
-			func(item, data);
-		}
-		if (item->children && item->children->length) {
-			swayc_descendants_of_type(item, type, func, data);
-		}
-	}
-}
-
-static swayc_t *new_swayc(enum swayc_types type) {
+static struct sway_container *container_create(enum sway_container_type type) {
 	// next id starts at 1 because 0 is assigned to root_container in layout.c
 	static size_t next_id = 1;
-	swayc_t *c = calloc(1, sizeof(swayc_t));
+	struct sway_container *c = calloc(1, sizeof(struct sway_container));
 	if (!c) {
 		return NULL;
 	}
@@ -82,8 +49,6 @@ static swayc_t *new_swayc(enum swayc_types type) {
 	c->layout = L_NONE;
 	c->workspace_layout = L_NONE;
 	c->type = type;
-	c->nb_master = 1;
-	c->nb_slave_groups = 1;
 	if (type != C_VIEW) {
 		c->children = create_list();
 	}
@@ -93,18 +58,18 @@ static swayc_t *new_swayc(enum swayc_types type) {
 	return c;
 }
 
-static void free_swayc(swayc_t *cont) {
-	if (!sway_assert(cont, "free_swayc passed NULL")) {
+static void container_destroy(struct sway_container *cont) {
+	if (cont == NULL) {
 		return;
 	}
 
 	wl_signal_emit(&cont->events.destroy, cont);
 
 	if (cont->children) {
-		// remove children until there are no more, free_swayc calls
-		// remove_child, which removes child from this container
+		// remove children until there are no more, container_destroy calls
+		// container_remove_child, which removes child from this container
 		while (cont->children->length) {
-			free_swayc(cont->children->items[0]);
+			container_destroy(cont->children->items[0]);
 		}
 		list_free(cont->children);
 	}
@@ -113,7 +78,7 @@ static void free_swayc(swayc_t *cont) {
 		list_free(cont->marks);
 	}
 	if (cont->parent) {
-		remove_child(cont);
+		container_remove_child(cont);
 	}
 	if (cont->name) {
 		free(cont->name);
@@ -121,7 +86,8 @@ static void free_swayc(swayc_t *cont) {
 	free(cont);
 }
 
-swayc_t *new_output(struct sway_output *sway_output) {
+struct sway_container *container_output_create(
+		struct sway_output *sway_output) {
 	struct wlr_box size;
 	wlr_output_effective_resolution(sway_output->wlr_output, &size.width,
 		&size.height);
@@ -156,22 +122,22 @@ swayc_t *new_output(struct sway_output *sway_output) {
 		return NULL;
 	}
 
-	swayc_t *output = new_swayc(C_OUTPUT);
+	struct sway_container *output = container_create(C_OUTPUT);
 	output->sway_output = sway_output;
 	output->name = strdup(name);
 	if (output->name == NULL) {
-		free_swayc(output);
+		container_destroy(output);
 		return NULL;
 	}
 
 	apply_output_config(oc, output);
 
-	add_child(&root_container, output);
+	container_add_child(&root_container, output);
 
 	// Create workspace
 	char *ws_name = workspace_next_name(output->name);
 	wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
-	swayc_t *ws = new_workspace(output, ws_name);
+	struct sway_container *ws = container_workspace_create(output, ws_name);
 	// Set each seat's focus if not already set
 	struct sway_seat *seat = NULL;
 	wl_list_for_each(seat, &input_manager->seats, link) {
@@ -185,12 +151,14 @@ swayc_t *new_output(struct sway_output *sway_output) {
 	return output;
 }
 
-swayc_t *new_workspace(swayc_t *output, const char *name) {
-	if (!sway_assert(output, "new_workspace called with null output")) {
+struct sway_container *container_workspace_create(
+		struct sway_container *output, const char *name) {
+	if (!sway_assert(output,
+			"container_workspace_create called with null output")) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
-	swayc_t *workspace = new_swayc(C_WORKSPACE);
+	struct sway_container *workspace = container_create(C_WORKSPACE);
 
 	workspace->x = output->x;
 	workspace->y = output->y;
@@ -198,21 +166,23 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
 	workspace->height = output->height;
 	workspace->name = !name ? NULL : strdup(name);
 	workspace->prev_layout = L_NONE;
-	workspace->layout = default_layout(output);
-	workspace->workspace_layout = default_layout(output);
+	workspace->layout = container_get_default_layout(output);
+	workspace->workspace_layout = container_get_default_layout(output);
 
-	add_child(output, workspace);
-	sort_workspaces(output);
+	container_add_child(output, workspace);
+	container_sort_workspaces(output);
 	notify_new_container(workspace);
 	return workspace;
 }
 
-swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
-	if (!sway_assert(sibling, "new_view called with NULL sibling/parent")) {
+struct sway_container *container_view_create(struct sway_container *sibling,
+		struct sway_view *sway_view) {
+	if (!sway_assert(sibling,
+			"container_view_create called with NULL sibling/parent")) {
 		return NULL;
 	}
 	const char *title = view_get_title(sway_view);
-	swayc_t *swayc = new_swayc(C_VIEW);
+	struct sway_container *swayc = container_create(C_VIEW);
 	wlr_log(L_DEBUG, "Adding new view %p:%s to container %p %d %s",
 		swayc, title, sibling, sibling ? sibling->type : 0, sibling->name);
 	// Setup values
@@ -223,17 +193,18 @@ swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
 
 	if (sibling->type == C_WORKSPACE) {
 		// Case of focused workspace, just create as child of it
-		add_child(sibling, swayc);
+		container_add_child(sibling, swayc);
 	} else {
 		// Regular case, create as sibling of current container
-		add_sibling(sibling, swayc);
+		container_add_sibling(sibling, swayc);
 	}
 	notify_new_container(swayc);
 	return swayc;
 }
 
-swayc_t *destroy_output(swayc_t *output) {
-	if (!sway_assert(output, "null output passed to destroy_output")) {
+struct sway_container *container_output_destroy(struct sway_container *output) {
+	if (!sway_assert(output,
+				"null output passed to container_output_destroy")) {
 		return NULL;
 	}
 
@@ -245,12 +216,13 @@ swayc_t *destroy_output(swayc_t *output) {
 			int p = root_container.children->items[0] == output;
 			// Move workspace from this output to another output
 			while (output->children->length) {
-				swayc_t *child = output->children->items[0];
-				remove_child(child);
-				add_child(root_container.children->items[p], child);
+				struct sway_container *child = output->children->items[0];
+				container_remove_child(child);
+				container_add_child(root_container.children->items[p], child);
 			}
-			sort_workspaces(root_container.children->items[p]);
-			arrange_windows(root_container.children->items[p], -1, -1);
+			container_sort_workspaces(root_container.children->items[p]);
+			arrange_windows(root_container.children->items[p],
+				-1, -1);
 		}
 	}
 
@@ -259,18 +231,18 @@ swayc_t *destroy_output(swayc_t *output) {
 	wl_list_remove(&output->sway_output->mode.link);
 
 	wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
-	free_swayc(output);
+	container_destroy(output);
 
 	return &root_container;
 }
 
-swayc_t *destroy_view(swayc_t *view) {
+struct sway_container *container_view_destroy(struct sway_container *view) {
 	if (!view) {
 		return NULL;
 	}
 	wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
-	swayc_t *parent = view->parent;
-	free_swayc(view);
+	struct sway_container *parent = view->parent;
+	container_destroy(view);
 
 	// TODO WLR: Destroy empty containers
 	/*
@@ -281,7 +253,55 @@ swayc_t *destroy_view(swayc_t *view) {
 	return parent;
 }
 
-swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
+struct sway_container *container_set_layout(struct sway_container *container,
+		enum sway_container_layout layout) {
+	if (container->type == C_WORKSPACE) {
+		container->workspace_layout = layout;
+		if (layout == L_HORIZ || layout == L_VERT) {
+			container->layout = layout;
+		}
+	} else {
+		container->layout = layout;
+	}
+	return container;
+}
+
+void container_descendents(struct sway_container *root,
+		enum sway_container_type type,
+		void (*func)(struct sway_container *item, void *data), void *data) {
+	for (int i = 0; i < root->children->length; ++i) {
+		struct sway_container *item = root->children->items[i];
+		if (item->type == type) {
+			func(item, data);
+		}
+		if (item->children && item->children->length) {
+			container_descendents(item, type, func, data);
+		}
+	}
+}
+
+struct sway_container *container_find(struct sway_container *container,
+		bool (*test)(struct sway_container *view, void *data), void *data) {
+	if (!container->children) {
+		return NULL;
+	}
+	// TODO: floating windows
+	for (int i = 0; i < container->children->length; ++i) {
+		struct sway_container *child = container->children->items[i];
+		if (test(child, data)) {
+			return child;
+		} else {
+			struct sway_container *res = container_find(child, test, data);
+			if (res) {
+				return res;
+			}
+		}
+	}
+	return NULL;
+}
+
+struct sway_container *container_parent(struct sway_container *container,
+		enum sway_container_type type) {
 	if (!sway_assert(container, "container is NULL")) {
 		return NULL;
 	}
@@ -294,7 +314,8 @@ swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
 	return container;
 }
 
-swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
+struct sway_container *container_at(struct sway_container *parent,
+		double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
@@ -303,13 +324,13 @@ swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
 
 	list_add(queue, parent);
 
-	swayc_t *swayc = NULL;
+	struct sway_container *swayc = NULL;
 	while (queue->length) {
 		swayc = queue->items[0];
 		list_del(queue, 0);
 		if (swayc->type == C_VIEW) {
 			struct sway_view *sview = swayc->sway_view;
-			swayc_t *soutput = swayc_parent_by_type(swayc, C_OUTPUT);
+			struct sway_container *soutput = container_parent(swayc, C_OUTPUT);
 			struct wlr_box *output_box =
 				wlr_output_layout_get_box(
 					root_container.sway_root->output_layout,
@@ -379,30 +400,8 @@ swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
 	return NULL;
 }
 
-void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
-	if (container) {
-		int i;
-		if (container->children)  {
-			for (i = 0; i < container->children->length; ++i) {
-				swayc_t *child = container->children->items[i];
-				container_map(child, f, data);
-			}
-		}
-		// TODO
-		/*
-		if (container->floating) {
-			for (i = 0; i < container->floating->length; ++i) {
-				swayc_t *child = container->floating->items[i];
-				container_map(child, f, data);
-			}
-		}
-		*/
-		f(container, data);
-	}
-}
-
-void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
-		void *data) {
+void container_for_each_descendent(struct sway_container *con,
+		void (*f)(struct sway_container *con, void *data), void *data) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
 		return;
@@ -415,7 +414,7 @@ void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
 
 	list_add(queue, con);
 
-	swayc_t *current = NULL;
+	struct sway_container *current = NULL;
 	while (queue->length) {
 		current = queue->items[0];
 		list_del(queue, 0);
@@ -424,15 +423,3 @@ void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
 		list_cat(queue, current->children);
 	}
 }
-
-swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
-	if (container->type == C_WORKSPACE) {
-		container->workspace_layout = layout;
-		if (layout == L_HORIZ || layout == L_VERT) {
-			container->layout = layout;
-		}
-	} else {
-		container->layout = layout;
-	}
-	return container;
-}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index de9e7b58..dc0ee5b4 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -6,24 +6,26 @@
 #include <string.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/container.h"
-#include "sway/layout.h"
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
 #include "sway/output.h"
-#include "sway/view.h"
+#include "sway/tree/view.h"
 #include "sway/input/seat.h"
 #include "list.h"
 #include "log.h"
 
-swayc_t root_container;
+struct sway_container root_container;
 
-static void output_layout_change_notify(struct wl_listener *listener, void *data) {
+static void output_layout_change_notify(struct wl_listener *listener,
+		void *data) {
 	struct wlr_box *layout_box = wlr_output_layout_get_box(
 		root_container.sway_root->output_layout, NULL);
 	root_container.width = layout_box->width;
 	root_container.height = layout_box->height;
 
 	for (int i = 0 ; i < root_container.children->length; ++i) {
-		swayc_t *output_container = root_container.children->items[i];
+		struct sway_container *output_container =
+			root_container.children->items[i];
 		if (output_container->type != C_OUTPUT) {
 			continue;
 		}
@@ -43,7 +45,7 @@ static void output_layout_change_notify(struct wl_listener *listener, void *data
 	arrange_windows(&root_container, -1, -1);
 }
 
-void init_layout(void) {
+void layout_init(void) {
 	root_container.id = 0; // normally assigned in new_swayc()
 	root_container.type = C_ROOT;
 	root_container.layout = L_NONE;
@@ -62,9 +64,9 @@ void init_layout(void) {
 		&root_container.sway_root->output_layout_change);
 }
 
-static int index_child(const swayc_t *child) {
+static int index_child(const struct sway_container *child) {
 	// TODO handle floating
-	swayc_t *parent = child->parent;
+	struct sway_container *parent = child->parent;
 	int i, len;
 	len = parent->children->length;
 	for (i = 0; i < len; ++i) {
@@ -79,16 +81,18 @@ static int index_child(const swayc_t *child) {
 	return i;
 }
 
-swayc_t *add_sibling(swayc_t *fixed, swayc_t *active) {
+struct sway_container *container_add_sibling(struct sway_container *fixed,
+		struct sway_container *active) {
 	// TODO handle floating
-	swayc_t *parent = fixed->parent;
+	struct sway_container *parent = fixed->parent;
 	int i = index_child(fixed);
 	list_insert(parent->children, i + 1, active);
 	active->parent = parent;
 	return active->parent;
 }
 
-void add_child(swayc_t *parent, swayc_t *child) {
+void container_add_child(struct sway_container *parent,
+		struct sway_container *child) {
 	wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
 			child, child->type, child->width, child->height,
 			parent, parent->type, parent->width, parent->height);
@@ -96,15 +100,17 @@ void add_child(swayc_t *parent, swayc_t *child) {
 	child->parent = parent;
 	// set focus for this container
 	/* TODO WLR
-	if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
+	if (parent->type == C_WORKSPACE && child->type == C_VIEW &&
+	(parent->workspace_layout == L_TABBED || parent->workspace_layout ==
+	L_STACKED)) {
 		child = new_container(child, parent->workspace_layout);
 	}
 	*/
 }
 
-swayc_t *remove_child(swayc_t *child) {
+struct sway_container *container_remove_child(struct sway_container *child) {
 	int i;
-	swayc_t *parent = child->parent;
+	struct sway_container *parent = child->parent;
 	for (i = 0; i < parent->children->length; ++i) {
 		if (parent->children->items[i] == child) {
 			list_del(parent->children, i);
@@ -115,7 +121,8 @@ swayc_t *remove_child(swayc_t *child) {
 	return parent;
 }
 
-enum swayc_layouts default_layout(swayc_t *output) {
+enum sway_container_layout container_get_default_layout(
+		struct sway_container *output) {
 	/* TODO WLR
 	if (config->default_layout != L_NONE) {
 		//return config->default_layout;
@@ -129,8 +136,8 @@ enum swayc_layouts default_layout(swayc_t *output) {
 }
 
 static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
-	swayc_t *a = *(void **)_a;
-	swayc_t *b = *(void **)_b;
+	struct sway_container *a = *(void **)_a;
+	struct sway_container *b = *(void **)_b;
 	int retval = 0;
 
 	if (isdigit(a->name[0]) && isdigit(b->name[0])) {
@@ -146,21 +153,22 @@ static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
 	return retval;
 }
 
-void sort_workspaces(swayc_t *output) {
+void container_sort_workspaces(struct sway_container *output) {
 	list_stable_sort(output->children, sort_workspace_cmp_qsort);
 }
 
-static void apply_horiz_layout(swayc_t *container, const double x,
+static void apply_horiz_layout(struct sway_container *container, const double x,
 				const double y, const double width,
 				const double height, const int start,
 				const int end);
 
-static void apply_vert_layout(swayc_t *container, const double x,
+static void apply_vert_layout(struct sway_container *container, const double x,
 				const double y, const double width,
 				const double height, const int start,
 				const int end);
 
-void arrange_windows(swayc_t *container, double width, double height) {
+void arrange_windows(struct sway_container *container,
+		double width, double height) {
 	int i;
 	if (width == -1 || height == -1) {
 		width = container->width;
@@ -181,7 +189,7 @@ void arrange_windows(swayc_t *container, double width, double height) {
 	case C_ROOT:
 		// TODO: wlr_output_layout probably
 		for (i = 0; i < container->children->length; ++i) {
-			swayc_t *output = container->children->items[i];
+			struct sway_container *output = container->children->items[i];
 			wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
 					output->name, output->x, output->y);
 			arrange_windows(output, -1, -1);
@@ -197,13 +205,14 @@ void arrange_windows(swayc_t *container, double width, double height) {
 		}
 		// arrange all workspaces:
 		for (i = 0; i < container->children->length; ++i) {
-			swayc_t *child = container->children->items[i];
+			struct sway_container *child = container->children->items[i];
 			arrange_windows(child, -1, -1);
 		}
 		return;
 	case C_WORKSPACE:
 		{
-			swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
+			struct sway_container *output =
+				container_parent(container, C_OUTPUT);
 			struct wlr_box *area = &output->sway_output->usable_area;
 			wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
 					area->width, area->height, area->x, area->y);
@@ -252,14 +261,15 @@ void arrange_windows(swayc_t *container, double width, double height) {
 	}
 }
 
-static void apply_horiz_layout(swayc_t *container,
+static void apply_horiz_layout(struct sway_container *container,
 		const double x, const double y,
 		const double width, const double height,
 		const int start, const int end) {
 	double scale = 0;
 	// Calculate total width
 	for (int i = start; i < end; ++i) {
-		double *old_width = &((swayc_t *)container->children->items[i])->width;
+		double *old_width =
+			&((struct sway_container *)container->children->items[i])->width;
 		if (*old_width <= 0) {
 			if (end - start > 1) {
 				*old_width = width / (end - start - 1);
@@ -276,7 +286,7 @@ static void apply_horiz_layout(swayc_t *container,
 	if (scale > 0.1) {
 		wlr_log(L_DEBUG, "Arranging %p horizontally", container);
 		for (int i = start; i < end; ++i) {
-			swayc_t *child = container->children->items[i];
+			struct sway_container *child = container->children->items[i];
 			wlr_log(L_DEBUG,
 				"Calculating arrangement for %p:%d (will scale %f by %f)",
 				child, child->type, width, scale);
@@ -301,7 +311,7 @@ static void apply_horiz_layout(swayc_t *container,
 	}
 }
 
-void apply_vert_layout(swayc_t *container,
+void apply_vert_layout(struct sway_container *container,
 		const double x, const double y,
 		const double width, const double height, const int start,
 		const int end) {
@@ -309,7 +319,8 @@ void apply_vert_layout(swayc_t *container,
 	double scale = 0;
 	// Calculate total height
 	for (i = start; i < end; ++i) {
-		double *old_height = &((swayc_t *)container->children->items[i])->height;
+		double *old_height =
+			&((struct sway_container *)container->children->items[i])->height;
 		if (*old_height <= 0) {
 			if (end - start > 1) {
 				*old_height = height / (end - start - 1);
@@ -326,7 +337,7 @@ void apply_vert_layout(swayc_t *container,
 	if (scale > 0.1) {
 		wlr_log(L_DEBUG, "Arranging %p vertically", container);
 		for (i = start; i < end; ++i) {
-			swayc_t *child = container->children->items[i];
+			struct sway_container *child = container->children->items[i];
 			wlr_log(L_DEBUG,
 				"Calculating arrangement for %p:%d (will scale %f by %f)",
 				child, child->type, height, scale);
@@ -354,15 +365,16 @@ void apply_vert_layout(swayc_t *container,
 /**
  * Get swayc in the direction of newly entered output.
  */
-static swayc_t *get_swayc_in_output_direction(swayc_t *output,
-		enum movement_direction dir, struct sway_seat *seat) {
+static struct sway_container *get_swayc_in_output_direction(
+		struct sway_container *output, enum movement_direction dir,
+		struct sway_seat *seat) {
 	if (!output) {
 		return NULL;
 	}
 
-	swayc_t *ws = sway_seat_get_focus_inactive(seat, output);
+	struct sway_container *ws = sway_seat_get_focus_inactive(seat, output);
 	if (ws->type != C_WORKSPACE) {
-		ws = swayc_parent_by_type(ws, C_WORKSPACE);
+		ws = container_parent(ws, C_WORKSPACE);
 	}
 
 	if (ws == NULL) {
@@ -380,13 +392,15 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
 			return ws->children->items[0];
 		case MOVE_UP:
 		case MOVE_DOWN: {
-			swayc_t *focused = sway_seat_get_focus_inactive(seat, ws);
+			struct sway_container *focused =
+				sway_seat_get_focus_inactive(seat, ws);
 			if (focused && focused->parent) {
-				swayc_t *parent = focused->parent;
+				struct sway_container *parent = focused->parent;
 				if (parent->layout == L_VERT) {
 					if (dir == MOVE_UP) {
 						// get child furthest down on new output
-						return parent->children->items[parent->children->length-1];
+						int idx = parent->children->length - 1;
+						return parent->children->items[idx];
 					} else if (dir == MOVE_DOWN) {
 						// get child furthest up on new output
 						return parent->children->items[0];
@@ -404,13 +418,14 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
 	return ws;
 }
 
-static void get_layout_center_position(swayc_t *container, int *x, int *y) {
+static void get_layout_center_position(struct sway_container *container,
+		int *x, int *y) {
 	// FIXME view coords are inconsistently referred to in layout/output systems
 	if (container->type == C_OUTPUT) {
 		*x = container->x + container->width/2;
 		*y = container->y + container->height/2;
 	} else {
-		swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
+		struct sway_container *output = container_parent(container, C_OUTPUT);
 		if (container->type == C_WORKSPACE) {
 			// Workspace coordinates are actually wrong/arbitrary, but should
 			// be same as output.
@@ -423,7 +438,8 @@ static void get_layout_center_position(swayc_t *container, int *x, int *y) {
 	}
 }
 
-static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out) {
+static bool sway_dir_to_wlr(enum movement_direction dir,
+		enum wlr_direction *out) {
 	switch (dir) {
 	case MOVE_UP:
 		*out = WLR_DIRECTION_UP;
@@ -444,12 +460,12 @@ static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out
 	return true;
 }
 
-static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
+static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
 	if (output == NULL) {
 		return NULL;
 	}
 	for (int i = 0; i < root_container.children->length; ++i) {
-		swayc_t *o = root_container.children->items[i];
+		struct sway_container *o = root_container.children->items[i];
 		if (o->type == C_OUTPUT && o->sway_output->wlr_output == output) {
 			return o;
 		}
@@ -457,13 +473,14 @@ static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
 	return NULL;
 }
 
-static swayc_t *get_swayc_in_direction_under(swayc_t *container,
-		enum movement_direction dir, struct sway_seat *seat, swayc_t *limit) {
+static struct sway_container *get_swayc_in_direction_under(
+		struct sway_container *container, enum movement_direction dir,
+		struct sway_seat *seat, struct sway_container *limit) {
 	if (dir == MOVE_CHILD) {
 		return sway_seat_get_focus_inactive(seat, container);
 	}
 
-	swayc_t *parent = container->parent;
+	struct sway_container *parent = container->parent;
 	if (dir == MOVE_PARENT) {
 		if (parent->type == C_OUTPUT) {
 			return NULL;
@@ -496,9 +513,10 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 	/*
 	if (container->type == C_VIEW && swayc_is_fullscreen(container)) {
 		wlr_log(L_DEBUG, "Moving from fullscreen view, skipping to output");
-		container = swayc_parent_by_type(container, C_OUTPUT);
+		container = container_parent(container, C_OUTPUT);
 		get_layout_center_position(container, &abs_pos);
-		swayc_t *output = swayc_adjacent_output(container, dir, &abs_pos, true);
+		struct sway_container *output =
+		swayc_adjacent_output(container, dir, &abs_pos, true);
 		return get_swayc_in_output_direction(output, dir);
 	}
 	if (container->type == C_WORKSPACE && container->fullscreen) {
@@ -507,7 +525,7 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 	}
 	*/
 
-	swayc_t *wrap_candidate = NULL;
+	struct sway_container *wrap_candidate = NULL;
 	while (true) {
 		// Test if we can even make a difference here
 		bool can_move = false;
@@ -521,16 +539,19 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 			}
 			int lx, ly;
 			get_layout_center_position(container, &lx, &ly);
-			struct wlr_output_layout *layout = root_container.sway_root->output_layout;
+			struct wlr_output_layout *layout =
+				root_container.sway_root->output_layout;
 			struct wlr_output *wlr_adjacent =
 				wlr_output_layout_adjacent_output(layout, wlr_dir,
 					container->sway_output->wlr_output, lx, ly);
-			swayc_t *adjacent = sway_output_from_wlr(wlr_adjacent);
+			struct sway_container *adjacent =
+				sway_output_from_wlr(wlr_adjacent);
 
 			if (!adjacent || adjacent == container) {
 				return wrap_candidate;
 			}
-			swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat);
+			struct sway_container *next =
+				get_swayc_in_output_direction(adjacent, dir, seat);
 			if (next == NULL) {
 				return NULL;
 			}
@@ -570,8 +591,9 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 					}
 				}
 			} else {
-				wlr_log(L_DEBUG, "%s cont %d-%p dir %i sibling %d: %p", __func__,
-						idx, container, dir, desired, parent->children->items[desired]);
+				wlr_log(L_DEBUG,
+					"cont %d-%p dir %i sibling %d: %p", idx,
+					container, dir, desired, parent->children->items[desired]);
 				return parent->children->items[desired];
 			}
 		}
@@ -587,7 +609,8 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
 	}
 }
 
-swayc_t *get_swayc_in_direction(swayc_t *container, struct sway_seat *seat,
+struct sway_container *container_get_in_direction(
+		struct sway_container *container, struct sway_seat *seat,
 		enum movement_direction dir) {
 	return get_swayc_in_direction_under(container, dir, seat, NULL);
 }
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 9499adca..d5325c31 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,8 +1,8 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/container.h"
-#include "sway/layout.h"
-#include "sway/view.h"
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
+#include "sway/tree/view.h"
 
 const char *view_get_title(struct sway_view *view) {
 	if (view->iface.get_prop) {
@@ -45,6 +45,7 @@ void view_set_size(struct sway_view *view, int width, int height) {
 	}
 }
 
+// TODO make view coordinates in layout coordinates
 void view_set_position(struct sway_view *view, double ox, double oy) {
 	if (view->iface.set_position) {
 		struct wlr_box box = {
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 861fda4d..ba04c55c 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -3,10 +3,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <strings.h>
-#include "sway/container.h"
+#include "sway/tree/container.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/workspace.h"
+#include "sway/tree/workspace.h"
 #include "log.h"
 #include "util.h"
 
@@ -17,7 +17,7 @@ struct workspace_by_number_data {
 	const char *name;
 };
 
-void next_name_map(swayc_t *ws, void *data) {
+void next_name_map(struct sway_container *ws, void *data) {
 	int *count = data;
 	++count;
 }
@@ -37,7 +37,7 @@ char *workspace_next_name(const char *output_name) {
 	return name;
 }
 
-static bool _workspace_by_number(swayc_t *view, void *data) {
+static bool _workspace_by_number(struct sway_container *view, void *data) {
 	if (view->type != C_WORKSPACE) {
 		return false;
 	}
@@ -46,27 +46,28 @@ static bool _workspace_by_number(swayc_t *view, void *data) {
 	return a == wbnd->len && strncmp(view->name, wbnd->name, a) == 0;
 }
 
-swayc_t *workspace_by_number(const char* name) {
+struct sway_container *workspace_by_number(const char* name) {
 	struct workspace_by_number_data wbnd = {0, "1234567890", name};
 	wbnd.len = strspn(name, wbnd.cset);
 	if (wbnd.len <= 0) {
 		return NULL;
 	}
-	return swayc_by_test(&root_container, _workspace_by_number, (void *) &wbnd);
+	return container_find(&root_container,
+			_workspace_by_number, (void *) &wbnd);
 }
 
-static bool _workspace_by_name(swayc_t *view, void *data) {
+static bool _workspace_by_name(struct sway_container *view, void *data) {
 	return (view->type == C_WORKSPACE) &&
 		   (strcasecmp(view->name, (char *) data) == 0);
 }
 
-swayc_t *workspace_by_name(const char *name) {
+struct sway_container *workspace_by_name(const char *name) {
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *current_workspace = NULL, *current_output = NULL;
-	swayc_t *focus = sway_seat_get_focus(seat);
+	struct sway_container *current_workspace = NULL, *current_output = NULL;
+	struct sway_container *focus = sway_seat_get_focus(seat);
 	if (focus) {
-		current_workspace = swayc_parent_by_type(focus, C_WORKSPACE);
-		current_output = swayc_parent_by_type(focus, C_OUTPUT);
+		current_workspace = container_parent(focus, C_WORKSPACE);
+		current_output = container_parent(focus, C_OUTPUT);
 	}
 	if (strcmp(name, "prev") == 0) {
 		return workspace_prev(current_workspace);
@@ -79,12 +80,13 @@ swayc_t *workspace_by_name(const char *name) {
 	} else if (strcmp(name, "current") == 0) {
 		return current_workspace;
 	} else {
-		return swayc_by_test(&root_container, _workspace_by_name, (void *) name);
+		return container_find(&root_container, _workspace_by_name,
+				(void *)name);
 	}
 }
 
-swayc_t *workspace_create(const char *name) {
-	swayc_t *parent;
+struct sway_container *workspace_create(const char *name) {
+	struct sway_container *parent;
 	// Search for workspace<->output pair
 	int i, e = config->workspace_outputs->length;
 	for (i = 0; i < e; ++i) {
@@ -95,7 +97,7 @@ swayc_t *workspace_create(const char *name) {
 			for (i = 0; i < e; ++i) {
 				parent = root_container.children->items[i];
 				if (strcmp(parent->name, wso->output) == 0) {
-					return new_workspace(parent, name);
+					return container_workspace_create(parent, name);
 				}
 			}
 			break;
@@ -103,10 +105,11 @@ swayc_t *workspace_create(const char *name) {
 	}
 	// Otherwise create a new one
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
+	struct sway_container *focus =
+		sway_seat_get_focus_inactive(seat, &root_container);
 	parent = focus;
-	parent = swayc_parent_by_type(parent, C_OUTPUT);
-	return new_workspace(parent, name);
+	parent = container_parent(parent, C_OUTPUT);
+	return container_workspace_create(parent, name);
 }
 
 /**
@@ -114,17 +117,18 @@ swayc_t *workspace_create(const char *name) {
  * the end and beginning.  If next is false, the previous workspace is returned,
  * otherwise the next one is returned.
  */
-swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
+struct sway_container *workspace_output_prev_next_impl(
+		struct sway_container *output, bool next) {
 	if (!sway_assert(output->type == C_OUTPUT,
 				"Argument must be an output, is %d", output->type)) {
 		return NULL;
 	}
 
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus_inactive(seat, output);
-	swayc_t *workspace = (focus->type == C_WORKSPACE ?
+	struct sway_container *focus = sway_seat_get_focus_inactive(seat, output);
+	struct sway_container *workspace = (focus->type == C_WORKSPACE ?
 			focus :
-			swayc_parent_by_type(focus, C_WORKSPACE));
+			container_parent(focus, C_WORKSPACE));
 
 	int i;
 	for (i = 0; i < output->children->length; i++) {
@@ -134,7 +138,8 @@ swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
 		}
 	}
 
-	// Doesn't happen, at worst the for loop returns the previously active workspace
+	// Doesn't happen, at worst the for loop returns the previously active
+	// workspace
 	return NULL;
 }
 
@@ -144,13 +149,14 @@ swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
  * next is false, the previous workspace is returned, otherwise the next one is
  * returned.
  */
-swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
+struct sway_container *workspace_prev_next_impl(
+		struct sway_container *workspace, bool next) {
 	if (!sway_assert(workspace->type == C_WORKSPACE,
 				"Argument must be a workspace, is %d", workspace->type)) {
 		return NULL;
 	}
 
-	swayc_t *current_output = workspace->parent;
+	struct sway_container *current_output = workspace->parent;
 	int offset = next ? 1 : -1;
 	int start = next ? 0 : 1;
 	int end;
@@ -166,54 +172,57 @@ swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
 		}
 	}
 
-	// Given workspace is the first/last on the output, jump to the previous/next output
+	// Given workspace is the first/last on the output, jump to the
+	// previous/next output
 	int num_outputs = root_container.children->length;
 	for (i = 0; i < num_outputs; i++) {
 		if (root_container.children->items[i] == current_output) {
-			swayc_t *next_output = root_container.children->items[
+			struct sway_container *next_output = root_container.children->items[
 				wrap(i + offset, num_outputs)];
 			return workspace_output_prev_next_impl(next_output, next);
 		}
 	}
 
-	// Doesn't happen, at worst the for loop returns the previously active workspace on the active output
+	// Doesn't happen, at worst the for loop returns the previously active
+	// workspace on the active output
 	return NULL;
 }
 
-swayc_t *workspace_output_next(swayc_t *current) {
+struct sway_container *workspace_output_next(struct sway_container *current) {
 	return workspace_output_prev_next_impl(current, true);
 }
 
-swayc_t *workspace_next(swayc_t *current) {
+struct sway_container *workspace_next(struct sway_container *current) {
 	return workspace_prev_next_impl(current, true);
 }
 
-swayc_t *workspace_output_prev(swayc_t *current) {
+struct sway_container *workspace_output_prev(struct sway_container *current) {
 	return workspace_output_prev_next_impl(current, false);
 }
 
-swayc_t *workspace_prev(swayc_t *current) {
+struct sway_container *workspace_prev(struct sway_container *current) {
 	return workspace_prev_next_impl(current, false);
 }
 
-bool workspace_switch(swayc_t *workspace) {
+bool workspace_switch(struct sway_container *workspace) {
 	if (!workspace) {
 		return false;
 	}
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
+	struct sway_container *focus =
+		sway_seat_get_focus_inactive(seat, &root_container);
 	if (!seat || !focus) {
 		return false;
 	}
-	swayc_t *active_ws = focus;
+	struct sway_container *active_ws = focus;
 	if (active_ws->type != C_WORKSPACE) {
-		swayc_parent_by_type(focus, C_WORKSPACE);
+		container_parent(focus, C_WORKSPACE);
 	}
 
 	if (config->auto_back_and_forth
 			&& active_ws == workspace
 			&& prev_workspace_name) {
-		swayc_t *new_ws = workspace_by_name(prev_workspace_name);
+		struct sway_container *new_ws = workspace_by_name(prev_workspace_name);
 		workspace = new_ws ? new_ws : workspace_create(prev_workspace_name);
 	}
 
@@ -230,13 +239,14 @@ bool workspace_switch(swayc_t *workspace) {
 
 	// TODO: Deal with sticky containers
 
-	wlr_log(L_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name);
-	swayc_t *next = sway_seat_get_focus_inactive(seat, workspace);
+	wlr_log(L_DEBUG, "Switching to workspace %p:%s",
+		workspace, workspace->name);
+	struct sway_container *next = sway_seat_get_focus_inactive(seat, workspace);
 	if (next == NULL) {
 		next = workspace;
 	}
 	sway_seat_set_focus(seat, next);
-	swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT);
+	struct sway_container *output = container_parent(workspace, C_OUTPUT);
 	arrange_windows(output, -1, -1);
 	return true;
 }
-- 
cgit v1.2.3


From 8f490d7d2dbadfe85dcf3dcd972471e86671442a Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 23:53:38 -0400
Subject: Fix oversights from previous pull request

---
 sway/tree/container.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 40047dcf..6a6861f3 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -266,7 +266,7 @@ struct sway_container *container_set_layout(struct sway_container *container,
 	return container;
 }
 
-void container_descendents(struct sway_container *root,
+void container_descendants(struct sway_container *root,
 		enum sway_container_type type,
 		void (*func)(struct sway_container *item, void *data), void *data) {
 	for (int i = 0; i < root->children->length; ++i) {
@@ -275,7 +275,7 @@ void container_descendents(struct sway_container *root,
 			func(item, data);
 		}
 		if (item->children && item->children->length) {
-			container_descendents(item, type, func, data);
+			container_descendants(item, type, func, data);
 		}
 	}
 }
@@ -400,7 +400,22 @@ struct sway_container *container_at(struct sway_container *parent,
 	return NULL;
 }
 
-void container_for_each_descendent(struct sway_container *con,
+void container_for_each_descendant_dfs(struct sway_container *container,
+		void (*f)(struct sway_container *container, void *data),
+		void *data) {
+	if (container) {
+		if (container->children)  {
+			for (int i = 0; i < container->children->length; ++i) {
+				struct sway_container *child =
+					container->children->items[i];
+				container_for_each_descendant_dfs(child, f, data);
+			}
+		}
+		f(container, data);
+	}
+}
+
+void container_for_each_descendant_bfs(struct sway_container *con,
 		void (*f)(struct sway_container *con, void *data), void *data) {
 	list_t *queue = get_bfs_queue();
 	if (!queue) {
-- 
cgit v1.2.3