Merge branch 'wlroots'

5 files changed, 2367 insertions, 0 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
new file mode 100644
index 00000000..ea1c93bb
--- /dev/null
+++ b/sway/tree/container.c
@@ -0,0 +1,534 @@
+#define _POSIX_C_SOURCE 200809L
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <wayland-server.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_wl_shell.h>
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
+#include "sway/ipc-server.h"
+#include "sway/output.h"
+#include "sway/server.h"
+#include "sway/tree/layout.h"
+#include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
+#include "log.h"
+
+static list_t *bfs_queue;
+
+static list_t *get_bfs_queue() {
+	if (!bfs_queue) {
+		bfs_queue = create_list();
+		if (!bfs_queue) {
+			wlr_log(L_ERROR, "could not allocate list for bfs queue");
+			return NULL;
+		}
+	}
+	bfs_queue->length = 0;
+
+	return bfs_queue;
+}
+
+const char *container_type_to_str(enum sway_container_type type) {
+	switch (type) {
+	case C_ROOT:
+		return "C_ROOT";
+	case C_OUTPUT:
+		return "C_OUTPUT";
+	case C_WORKSPACE:
+		return "C_WORKSPACE";
+	case C_CONTAINER:
+		return "C_CONTAINER";
+	case C_VIEW:
+		return "C_VIEW";
+	default:
+		return "C_UNKNOWN";
+	}
+}
+
+void container_create_notify(struct sway_container *container) {
+	// TODO send ipc event type based on the container type
+	wl_signal_emit(&root_container.sway_root->events.new_container, container);
+
+	if (container->type == C_VIEW || container->type == C_CONTAINER) {
+		ipc_event_window(container, "new");
+	}
+}
+
+static void container_close_notify(struct sway_container *container) {
+	if (container == NULL) {
+		return;
+	}
+	// TODO send ipc event type based on the container type
+	if (container->type == C_VIEW || container->type == C_WORKSPACE) {
+		ipc_event_window(container, "close");
+	}
+}
+
+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));
+	if (!c) {
+		return NULL;
+	}
+	c->id = next_id++;
+	c->layout = L_NONE;
+	c->workspace_layout = L_NONE;
+	c->type = type;
+	c->alpha = 1.0f;
+
+	if (type != C_VIEW) {
+		c->children = create_list();
+	}
+
+	wl_signal_init(&c->events.destroy);
+	wl_signal_init(&c->events.reparent);
+
+	return c;
+}
+
+static void _container_destroy(struct sway_container *cont) {
+	if (cont == NULL) {
+		return;
+	}
+
+	wl_signal_emit(&cont->events.destroy, cont);
+	container_close_notify(cont);
+
+	struct sway_container *parent = cont->parent;
+	if (cont->children != NULL && cont->children->length) {
+		// remove children until there are no more, container_destroy calls
+		// container_remove_child, which removes child from this container
+		while (cont->children != NULL) {
+			struct sway_container *child = cont->children->items[0];
+			container_remove_child(child);
+			_container_destroy(child);
+		}
+	}
+	if (cont->marks) {
+		list_foreach(cont->marks, free);
+		list_free(cont->marks);
+	}
+	if (parent) {
+		parent = container_remove_child(cont);
+	}
+	if (cont->name) {
+		free(cont->name);
+	}
+	list_free(cont->children);
+	cont->children = NULL;
+	free(cont);
+}
+
+static struct sway_container *container_output_destroy(
+		struct sway_container *output) {
+	if (!sway_assert(output, "cannot destroy null output")) {
+		return NULL;
+	}
+
+	if (output->children->length > 0) {
+		// TODO save workspaces when there are no outputs.
+		// TODO also check if there will ever be no outputs except for exiting
+		// program
+		if (root_container.children->length > 1) {
+			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);
+			}
+			container_sort_workspaces(root_container.children->items[p]);
+			arrange_windows(root_container.children->items[p],
+				-1, -1);
+		}
+	}
+
+	wl_list_remove(&output->sway_output->destroy.link);
+	wl_list_remove(&output->sway_output->mode.link);
+	wl_list_remove(&output->sway_output->transform.link);
+	wl_list_remove(&output->sway_output->scale.link);
+
+	wl_list_remove(&output->sway_output->damage_destroy.link);
+	wl_list_remove(&output->sway_output->damage_frame.link);
+
+	wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
+	_container_destroy(output);
+	return &root_container;
+}
+
+static struct sway_container *container_workspace_destroy(
+		struct sway_container *workspace) {
+	if (!sway_assert(workspace, "cannot destroy null workspace")) {
+		return NULL;
+	}
+
+	// Do not destroy this if it's the last workspace on this output
+	struct sway_container *output = container_parent(workspace, C_OUTPUT);
+	if (output && output->children->length == 1) {
+		return NULL;
+	}
+
+	struct sway_container *parent = workspace->parent;
+	if (workspace->children->length == 0) {
+		// destroy the WS if there are no children (TODO check for floating)
+		wlr_log(L_DEBUG, "destroying workspace '%s'", workspace->name);
+		ipc_event_workspace(workspace, NULL, "empty");
+	} else {
+		// Move children to a different workspace on this output
+		struct sway_container *new_workspace = NULL;
+		// TODO move floating
+		for (int i = 0; i < output->children->length; i++) {
+			if (output->children->items[i] != workspace) {
+				new_workspace = output->children->items[i];
+				break;
+			}
+		}
+
+		wlr_log(L_DEBUG, "moving children to different workspace '%s' -> '%s'",
+			workspace->name, new_workspace->name);
+		for (int i = 0; i < workspace->children->length; i++) {
+			container_move_to(workspace->children->items[i], new_workspace);
+		}
+	}
+
+	_container_destroy(workspace);
+
+	output_damage_whole(output->sway_output);
+
+	return parent;
+}
+
+static void container_root_finish(struct sway_container *con) {
+	wlr_log(L_ERROR, "TODO: destroy the root container");
+}
+
+bool container_reap_empty(struct sway_container *con) {
+	switch (con->type) {
+	case C_ROOT:
+	case C_OUTPUT:
+		// dont reap these
+		break;
+	case C_WORKSPACE:
+		if (!workspace_is_visible(con) && con->children->length == 0) {
+			wlr_log(L_DEBUG, "Destroying workspace via reaper");
+			container_workspace_destroy(con);
+			return true;
+		}
+		break;
+	case C_CONTAINER:
+		if (con->children->length == 0) {
+			_container_destroy(con);
+			return true;
+		}
+	case C_VIEW:
+		break;
+	case C_TYPES:
+		sway_assert(false, "container_reap_empty called on an invalid "
+			"container");
+		break;
+	}
+
+	return false;
+}
+
+struct sway_container *container_reap_empty_recursive(
+		struct sway_container *con) {
+	while (con) {
+		struct sway_container *next = con->parent;
+		if (!container_reap_empty(con)) {
+			break;
+		}
+		con = next;
+	}
+	return con;
+}
+
+struct sway_container *container_flatten(struct sway_container *container) {
+	while (container->type == C_CONTAINER && container->children->length == 1) {
+		struct sway_container *child = container->children->items[0];
+		struct sway_container *parent = container->parent;
+		container_replace_child(container, child);
+		container_destroy(container);
+		container = parent;
+	}
+	return container;
+}
+
+struct sway_container *container_destroy(struct sway_container *con) {
+	if (con == NULL) {
+		return NULL;
+	}
+
+	struct sway_container *parent = con->parent;
+
+	switch (con->type) {
+		case C_ROOT:
+			container_root_finish(con);
+			break;
+		case C_OUTPUT:
+			// dont try to reap the root after this
+			container_output_destroy(con);
+			break;
+		case C_WORKSPACE:
+			// dont try to reap the output after this
+			container_workspace_destroy(con);
+			break;
+		case C_CONTAINER:
+			if (con->children->length) {
+				for (int i = 0; i < con->children->length; ++i) {
+					struct sway_container *child = con->children->items[0];
+					container_remove_child(child);
+					container_add_child(parent, child);
+				}
+			}
+			_container_destroy(con);
+			break;
+		case C_VIEW:
+			_container_destroy(con);
+			break;
+		case C_TYPES:
+			wlr_log(L_ERROR, "container_destroy called on an invalid "
+				"container");
+			break;
+	}
+
+	return container_reap_empty_recursive(parent);
+}
+
+static void container_close_func(struct sway_container *container, void *data) {
+	if (container->type == C_VIEW) {
+		view_close(container->sway_view);
+	}
+}
+
+struct sway_container *container_close(struct sway_container *con) {
+	if (!sway_assert(con != NULL,
+			"container_close called with a NULL container")) {
+		return NULL;
+	}
+
+	struct sway_container *parent = con->parent;
+
+	if (con->type == C_VIEW) {
+		view_close(con->sway_view);
+	} else {
+		container_for_each_descendant_dfs(con, container_close_func, NULL);
+	}
+
+	return 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);
+	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
+	swayc->sway_view = sway_view;
+	swayc->name = title ? strdup(title) : NULL;
+	swayc->width = 0;
+	swayc->height = 0;
+
+	if (sibling->type == C_WORKSPACE) {
+		// Case of focused workspace, just create as child of it
+		container_add_child(sibling, swayc);
+	} else {
+		// Regular case, create as sibling of current container
+		container_add_sibling(sibling, swayc);
+	}
+	container_create_notify(swayc);
+	return swayc;
+}
+
+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) {
+		struct sway_container *item = root->children->items[i];
+		if (item->type == type) {
+			func(item, data);
+		}
+		if (item->children && item->children->length) {
+			container_descendants(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;
+	}
+	if (!sway_assert(type < C_TYPES && type >= C_ROOT, "invalid type")) {
+		return NULL;
+	}
+	do {
+		container = container->parent;
+	} while (container && container->type != type);
+	return container;
+}
+
+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) {
+		return NULL;
+	}
+
+	list_add(queue, parent);
+
+	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;
+			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,
+					soutput->sway_output->wlr_output);
+			double ox = lx - output_box->x;
+			double oy = ly - output_box->y;
+			double view_sx = ox - swayc->x;
+			double view_sy = oy - swayc->y;
+
+			double _sx, _sy;
+			struct wlr_surface *_surface;
+			switch (sview->type) {
+			case SWAY_VIEW_XWAYLAND:
+				_surface = wlr_surface_surface_at(sview->surface,
+					view_sx, view_sy, &_sx, &_sy);
+				break;
+			case SWAY_VIEW_WL_SHELL:
+				_surface = wlr_wl_shell_surface_surface_at(
+					sview->wlr_wl_shell_surface,
+					view_sx, view_sy, &_sx, &_sy);
+				break;
+			case SWAY_VIEW_XDG_SHELL_V6:
+				// the top left corner of the sway container is the
+				// coordinate of the top left corner of the window geometry
+				view_sx += sview->wlr_xdg_surface_v6->geometry.x;
+				view_sy += sview->wlr_xdg_surface_v6->geometry.y;
+
+				_surface = wlr_xdg_surface_v6_surface_at(
+					sview->wlr_xdg_surface_v6,
+					view_sx, view_sy, &_sx, &_sy);
+				break;
+			}
+			if (_surface) {
+				*sx = _sx;
+				*sy = _sy;
+				*surface = _surface;
+				return swayc;
+			}
+		} else {
+			list_cat(queue, swayc->children);
+		}
+	}
+
+	return NULL;
+}
+
+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) {
+		return;
+	}
+
+	if (queue == NULL) {
+		wlr_log(L_ERROR, "could not allocate list");
+		return;
+	}
+
+	list_add(queue, con);
+
+	struct sway_container *current = NULL;
+	while (queue->length) {
+		current = queue->items[0];
+		list_del(queue, 0);
+		f(current, data);
+		// TODO floating containers
+		list_cat(queue, current->children);
+	}
+}
+
+bool container_has_anscestor(struct sway_container *descendant,
+		struct sway_container *anscestor) {
+	while (descendant->type != C_ROOT) {
+		descendant = descendant->parent;
+		if (descendant == anscestor) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static bool find_child_func(struct sway_container *con, void *data) {
+	struct sway_container *child = data;
+	return con == child;
+}
+
+bool container_has_child(struct sway_container *con,
+		struct sway_container *child) {
+	if (con == NULL || con->type == C_VIEW || con->children->length == 0) {
+		return false;
+	}
+	return container_find(con, find_child_func, child);
+}
+
+void container_damage_whole(struct sway_container *con) {
+	struct sway_container *output = con;
+	if (output->type != C_OUTPUT) {
+		output = container_parent(output, C_OUTPUT);
+	}
+	output_damage_whole_container(output->sway_output, con);
+}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
new file mode 100644
index 00000000..ae76ca26
--- /dev/null
+++ b/sway/tree/layout.c
@@ -0,0 +1,1030 @@
+#define _POSIX_C_SOURCE 200809L
+#include <ctype.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
+#include "sway/debug.h"
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
+#include "sway/output.h"
+#include "sway/tree/workspace.h"
+#include "sway/tree/view.h"
+#include "sway/input/seat.h"
+#include "sway/ipc-server.h"
+#include "list.h"
+#include "log.h"
+
+struct sway_container root_container;
+
+static void output_layout_handle_change(struct wl_listener *listener,
+		void *data) {
+	struct wlr_output_layout *output_layout =
+		root_container.sway_root->output_layout;
+	const struct wlr_box *layout_box =
+		wlr_output_layout_get_box(output_layout, NULL);
+	root_container.x = layout_box->x;
+	root_container.y = layout_box->y;
+	root_container.width = layout_box->width;
+	root_container.height = layout_box->height;
+
+	arrange_windows(&root_container, layout_box->width, layout_box->height);
+}
+
+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 layout_init(void) {
+	root_container.id = 0; // normally assigned in new_swayc()
+	root_container.type = C_ROOT;
+	root_container.layout = L_NONE;
+	root_container.name = strdup("root");
+	root_container.children = create_list();
+	wl_signal_init(&root_container.events.destroy);
+
+	root_container.sway_root = calloc(1, sizeof(*root_container.sway_root));
+	root_container.sway_root->output_layout = wlr_output_layout_create();
+	wl_list_init(&root_container.sway_root->xwayland_unmanaged);
+	wl_signal_init(&root_container.sway_root->events.new_container);
+
+	root_container.sway_root->output_layout_change.notify =
+		output_layout_handle_change;
+	wl_signal_add(&root_container.sway_root->output_layout->events.change,
+		&root_container.sway_root->output_layout_change);
+}
+
+static int index_child(const struct sway_container *child) {
+	// TODO handle floating
+	struct sway_container *parent = child->parent;
+	int i, len;
+	len = parent->children->length;
+	for (i = 0; i < len; ++i) {
+		if (parent->children->items[i] == child) {
+			break;
+		}
+	}
+
+	if (!sway_assert(i < len, "Stray container")) {
+		return -1;
+	}
+	return i;
+}
+
+void container_insert_child(struct sway_container *parent,
+		struct sway_container *child, int i) {
+	struct sway_container *old_parent = child->parent;
+	if (old_parent) {
+		container_remove_child(child);
+	}
+	wlr_log(L_DEBUG, "Inserting id:%zd at index %d", child->id, i);
+	list_insert(parent->children, i, child);
+	child->parent = parent;
+	wl_signal_emit(&child->events.reparent, old_parent);
+}
+
+struct sway_container *container_add_sibling(struct sway_container *fixed,
+		struct sway_container *active) {
+	// TODO handle floating
+	struct sway_container *old_parent = NULL;
+	if (active->parent) {
+		old_parent = active->parent;
+		container_remove_child(active);
+	}
+	struct sway_container *parent = fixed->parent;
+	int i = index_child(fixed);
+	list_insert(parent->children, i + 1, active);
+	active->parent = parent;
+	wl_signal_emit(&active->events.reparent, old_parent);
+	return active->parent;
+}
+
+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);
+	list_add(parent->children, child);
+	child->parent = parent;
+}
+
+struct sway_container *container_remove_child(struct sway_container *child) {
+	struct sway_container *parent = child->parent;
+	for (int i = 0; i < parent->children->length; ++i) {
+		if (parent->children->items[i] == child) {
+			list_del(parent->children, i);
+			break;
+		}
+	}
+	child->parent = NULL;
+	return parent;
+}
+
+void container_move_to(struct sway_container *container,
+		struct sway_container *destination) {
+	if (container == destination
+			|| container_has_anscestor(container, destination)) {
+		return;
+	}
+	struct sway_container *old_parent = container_remove_child(container);
+	container->width = container->height = 0;
+	struct sway_container *new_parent;
+	if (destination->type == C_VIEW) {
+		new_parent = container_add_sibling(destination, container);
+	} else {
+		new_parent = destination;
+		container_add_child(destination, container);
+	}
+	wl_signal_emit(&container->events.reparent, old_parent);
+	if (container->type == C_WORKSPACE) {
+		struct sway_seat *seat = input_manager_get_default_seat(
+				input_manager);
+		if (old_parent->children->length == 0) {
+			char *ws_name = workspace_next_name(old_parent->name);
+			struct sway_container *ws =
+				workspace_create(old_parent, ws_name);
+			free(ws_name);
+			seat_set_focus(seat, ws);
+		}
+		container_sort_workspaces(new_parent);
+		seat_set_focus(seat, new_parent);
+	}
+	if (old_parent) {
+		arrange_windows(old_parent, -1, -1);
+	}
+	arrange_windows(new_parent, -1, -1);
+}
+
+static bool sway_dir_to_wlr(enum movement_direction dir,
+		enum wlr_direction *out) {
+	switch (dir) {
+	case MOVE_UP:
+		*out = WLR_DIRECTION_UP;
+		break;
+	case MOVE_DOWN:
+		*out = WLR_DIRECTION_DOWN;
+		break;
+	case MOVE_LEFT:
+		*out = WLR_DIRECTION_LEFT;
+		break;
+	case MOVE_RIGHT:
+		*out = WLR_DIRECTION_RIGHT;
+		break;
+	default:
+		return false;
+	}
+
+	return true;
+}
+
+static bool is_parallel(enum sway_container_layout layout,
+		enum movement_direction dir) {
+	switch (layout) {
+	case L_TABBED:
+	case L_STACKED:
+	case L_HORIZ:
+		return dir == MOVE_LEFT || dir == MOVE_RIGHT;
+	case L_VERT:
+		return dir == MOVE_UP || dir == MOVE_DOWN;
+	default:
+		return false;
+	}
+}
+
+static enum movement_direction invert_movement(enum movement_direction dir) {
+	switch (dir) {
+	case MOVE_LEFT:
+		return MOVE_RIGHT;
+	case MOVE_RIGHT:
+		return MOVE_LEFT;
+	case MOVE_UP:
+		return MOVE_DOWN;
+	case MOVE_DOWN:
+		return MOVE_UP;
+	default:
+		sway_assert(0, "This function expects left|right|up|down");
+		return MOVE_LEFT;
+	}
+}
+
+static int move_offs(enum movement_direction move_dir) {
+	return move_dir == MOVE_LEFT || move_dir == MOVE_UP ? -1 : 1;
+}
+
+/* Gets the index of the most extreme member based on the movement offset */
+static int container_limit(struct sway_container *container,
+		enum movement_direction move_dir) {
+	return move_offs(move_dir) < 0 ? 0 : container->children->length;
+}
+
+/* Takes one child, sets it aside, wraps the rest of the children in a new
+ * container, switches the layout of the workspace, and drops the child back in.
+ * In other words, rejigger it. */
+static void workspace_rejigger(struct sway_container *ws,
+		struct sway_container *child, enum movement_direction move_dir) {
+	struct sway_container *original_parent = child->parent;
+	struct sway_container *new_parent =
+		container_split(ws, ws->layout);
+
+	container_remove_child(child);
+	for (int i = 0; i < ws->children->length; ++i) {
+		struct sway_container *_child = ws->children->items[i];
+		container_move_to(new_parent, _child);
+	}
+
+	int index = move_offs(move_dir);
+	container_insert_child(ws, child, index < 0 ? 0 : 1);
+	container_set_layout(ws,
+			move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT);
+
+	container_flatten(ws);
+	container_reap_empty_recursive(original_parent);
+	wl_signal_emit(&child->events.reparent, original_parent);
+	container_create_notify(new_parent);
+	arrange_windows(ws, -1, -1);
+}
+
+void container_move(struct sway_container *container,
+		enum movement_direction move_dir, int move_amt) {
+	if (!sway_assert(
+				container->type != C_CONTAINER || container->type != C_VIEW,
+				"Can only move containers and views")) {
+		return;
+	}
+	int offs = move_offs(move_dir);
+
+	struct sway_container *sibling = NULL;
+	struct sway_container *current = container;
+	struct sway_container *parent = current->parent;
+
+	if (parent != container_flatten(parent)) {
+		// Special case: we were the last one in this container, so flatten it
+		// and leave
+		update_debug_tree();
+		return;
+	}
+
+	while (!sibling) {
+		if (current->type == C_ROOT) {
+			return;
+		}
+
+		parent = current->parent;
+		wlr_log(L_DEBUG, "Visiting %p %s '%s'", current,
+				container_type_to_str(current->type), current->name);
+
+		int index = index_child(current);
+
+		switch (current->type) {
+		case C_OUTPUT: {
+			enum wlr_direction wlr_dir;
+			sway_dir_to_wlr(move_dir, &wlr_dir);
+			double ref_lx = current->x + current->width / 2;
+			double ref_ly = current->y + current->height / 2;
+			struct wlr_output *next = wlr_output_layout_adjacent_output(
+				root_container.sway_root->output_layout, wlr_dir,
+				current->sway_output->wlr_output, ref_lx, ref_ly);
+			if (!next) {
+				wlr_log(L_DEBUG, "Hit edge of output, nowhere else to go");
+				return;
+			}
+			struct sway_output *next_output = next->data;
+			current = next_output->swayc;
+			wlr_log(L_DEBUG, "Selected next output (%s)", current->name);
+			// Select workspace and get outta here
+			current = seat_get_focus_inactive(
+					config->handler_context.seat, current);
+			if (current->type != C_WORKSPACE) {
+				current = container_parent(current, C_WORKSPACE);
+			}
+			sibling = current;
+			break;
+		}
+		case C_WORKSPACE:
+			if (!is_parallel(current->layout, move_dir)) {
+				if (current->children->length > 2) {
+					wlr_log(L_DEBUG, "Rejiggering the workspace (%d kiddos)",
+							current->children->length);
+					workspace_rejigger(current, container, move_dir);
+				} else if (current->children->length == 2) {
+					wlr_log(L_DEBUG, "Changing workspace layout");
+					container_set_layout(current,
+						move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ?
+						L_HORIZ : L_VERT);
+					container_insert_child(current, container, offs < 0 ? 0 : 1);
+					arrange_windows(current, -1, -1);
+				}
+				return;
+			} else {
+				wlr_log(L_DEBUG, "Selecting output");
+				current = current->parent;
+			}
+			break;
+		case C_CONTAINER:
+		case C_VIEW:
+			if (is_parallel(parent->layout, move_dir)) {
+				if ((index == parent->children->length - 1 && offs > 0)
+						|| (index == 0 && offs < 0)) {
+					if (current->parent == container->parent) {
+						wlr_log(L_DEBUG, "Hit limit, selecting parent");
+						current = current->parent;
+					} else {
+						wlr_log(L_DEBUG, "Hit limit, "
+								"promoting descendant to sibling");
+						// Special case
+						struct sway_container *old_parent = container->parent;
+						container_insert_child(current->parent, container,
+								index + (offs < 0 ? 0 : 1));
+						container->width = container->height = 0;
+						arrange_windows(current->parent, -1, -1);
+						arrange_windows(old_parent, -1, -1);
+						return;
+					}
+				} else {
+					sibling = parent->children->items[index + offs];
+					wlr_log(L_DEBUG, "Selecting sibling id:%zd", sibling->id);
+				}
+			} else {
+				wlr_log(L_DEBUG, "Moving up to find a parallel container");
+				current = current->parent;
+			}
+			break;
+		default:
+			sway_assert(0, "Not expecting to see container of type %s here",
+					container_type_to_str(current->type));
+			return;
+		}
+	}
+
+	// Part two: move stuff around
+	int index = index_child(container);
+	struct sway_container *old_parent = container->parent;
+
+	while (sibling) {
+		switch (sibling->type) {
+		case C_VIEW:
+			if (sibling->parent == container->parent) {
+				wlr_log(L_DEBUG, "Swapping siblings");
+				sibling->parent->children->items[index + offs] = container;
+				sibling->parent->children->items[index] = sibling;
+				arrange_windows(sibling->parent, -1, -1);
+			} else {
+				wlr_log(L_DEBUG, "Promoting to sibling of cousin");
+				container_insert_child(sibling->parent, container,
+						index_child(sibling) + (offs > 0 ? 0 : 1));
+				container->width = container->height = 0;
+				arrange_windows(sibling->parent, -1, -1);
+				arrange_windows(old_parent, -1, -1);
+			}
+			sibling = NULL;
+			break;
+		case C_WORKSPACE: // Note: only in the case of moving between outputs
+		case C_CONTAINER:
+			if (is_parallel(sibling->layout, move_dir)) {
+				int limit = container_limit(sibling, invert_movement(move_dir));
+				wlr_log(L_DEBUG, "limit: %d", limit);
+				wlr_log(L_DEBUG,
+						"Reparenting container (parallel) to index %d "
+						"(move dir: %d)", limit, move_dir);
+				container_insert_child(sibling, container, limit);
+				container->width = container->height = 0;
+				arrange_windows(sibling, -1, -1);
+				arrange_windows(old_parent, -1, -1);
+				sibling = NULL;
+			} else {
+				wlr_log(L_DEBUG, "Reparenting container (perpendicular)");
+				container_remove_child(container);
+				struct sway_container *focus_inactive = seat_get_focus_inactive(
+						config->handler_context.seat, sibling);
+				if (focus_inactive) {
+					while (focus_inactive->parent != sibling) {
+						focus_inactive = focus_inactive->parent;
+					}
+					wlr_log(L_DEBUG, "Focus inactive: id:%zd",
+							focus_inactive->id);
+					sibling = focus_inactive;
+					continue;
+				} else if (sibling->children->length) {
+					wlr_log(L_DEBUG, "No focus-inactive, adding arbitrarily");
+					container_add_sibling(sibling->children->items[0], container);
+				} else {
+					wlr_log(L_DEBUG, "No kiddos, adding container alone");
+					container_add_child(sibling, container);
+				}
+				container->width = container->height = 0;
+				arrange_windows(sibling, -1, -1);
+				arrange_windows(old_parent, -1, -1);
+				sibling = NULL;
+			}
+			break;
+		default:
+			sway_assert(0, "Not expecting to see container of type %s here",
+					container_type_to_str(sibling->type));
+			return;
+		}
+	}
+
+	if (old_parent) {
+		seat_set_focus(config->handler_context.seat, old_parent);
+		seat_set_focus(config->handler_context.seat, container);
+	}
+
+	struct sway_container *last_ws = old_parent;
+	struct sway_container *next_ws = container->parent;
+	if (last_ws && last_ws->type != C_WORKSPACE) {
+		last_ws = container_parent(last_ws, C_WORKSPACE);
+	}
+	if (next_ws && next_ws->type != C_WORKSPACE) {
+		next_ws = container_parent(next_ws, C_WORKSPACE);
+	}
+	if (last_ws && next_ws && last_ws != next_ws) {
+		ipc_event_workspace(last_ws, container, "focus");
+	}
+}
+
+enum sway_container_layout container_get_default_layout(
+		struct sway_container *con) {
+	if (con->type != C_OUTPUT) {
+		con = container_parent(con, C_OUTPUT);
+	}
+
+	if (!sway_assert(con != NULL,
+			"container_get_default_layout must be called on an attached"
+			" container below the root container")) {
+		return 0;
+	}
+
+	if (config->default_layout != L_NONE) {
+		return config->default_layout;
+	} else if (config->default_orientation != L_NONE) {
+		return config->default_orientation;
+	} else if (con->width >= con->height) {
+		return L_HORIZ;
+	} else {
+		return L_VERT;
+	}
+}
+
+static int sort_workspace_cmp_qsort(const void *_a, const 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])) {
+		int a_num = strtol(a->name, NULL, 10);
+		int b_num = strtol(b->name, NULL, 10);
+		retval = (a_num < b_num) ? -1 : (a_num > b_num);
+	} else if (isdigit(a->name[0])) {
+		retval = -1;
+	} else if (isdigit(b->name[0])) {
+		retval = 1;
+	}
+
+	return retval;
+}
+
+void container_sort_workspaces(struct sway_container *output) {
+	list_stable_sort(output->children, sort_workspace_cmp_qsort);
+}
+
+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(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(struct sway_container *container,
+		double width, double height) {
+	if (config->reloading) {
+		return;
+	}
+	int i;
+	if (width == -1 || height == -1) {
+		width = container->width;
+		height = container->height;
+	}
+	// pixels are indivisible. if we don't round the pixels, then the view
+	// calculations will be off (e.g. 50.5 + 50.5 = 101, but in reality it's
+	// 50 + 50 = 100). doing it here cascades properly to all width/height/x/y.
+	width = floor(width);
+	height = floor(height);
+
+	wlr_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", container,
+		container->name, container->width, container->height, container->x,
+		container->y);
+
+	double x = 0, y = 0;
+	switch (container->type) {
+	case C_ROOT:
+		for (i = 0; i < container->children->length; ++i) {
+			struct sway_container *output = container->children->items[i];
+			const struct wlr_box *output_box = wlr_output_layout_get_box(
+				container->sway_root->output_layout,
+				output->sway_output->wlr_output);
+			output->x = output_box->x;
+			output->y = output_box->y;
+			output->width = output_box->width;
+			output->height = output_box->height;
+			wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
+					output->name, output->x, output->y);
+			arrange_windows(output, output_box->width, output_box->height);
+		}
+		return;
+	case C_OUTPUT:
+		// arrange all workspaces:
+		for (i = 0; i < container->children->length; ++i) {
+			struct sway_container *child = container->children->items[i];
+			arrange_windows(child, -1, -1);
+		}
+		return;
+	case C_WORKSPACE:
+		{
+			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);
+			container->width = width = area->width;
+			container->height = height = area->height;
+			container->x = x = area->x;
+			container->y = y = area->y;
+			wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f",
+					container->name, container->x, container->y);
+		}
+		// children are properly handled below
+		break;
+	case C_VIEW:
+		{
+			container->width = width;
+			container->height = height;
+			view_configure(container->sway_view, container->x, container->y,
+				container->width, container->height);
+			wlr_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f",
+					container->width, container->height,
+					container->x, container->y);
+		}
+		return;
+	default:
+		container->width = width;
+		container->height = height;
+		x = container->x;
+		y = container->y;
+		break;
+	}
+
+	switch (container->layout) {
+	case L_HORIZ:
+		apply_horiz_layout(container, x, y, width, height, 0,
+			container->children->length);
+		break;
+	case L_VERT:
+		apply_vert_layout(container, x, y, width, height, 0,
+			container->children->length);
+		break;
+	default:
+		wlr_log(L_DEBUG, "TODO: arrange layout type %d", container->layout);
+		apply_horiz_layout(container, x, y, width, height, 0,
+			container->children->length);
+		break;
+	}
+	container_damage_whole(container);
+	// TODO: Make this less shitty
+	update_debug_tree();
+}
+
+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 =
+			&((struct sway_container *)container->children->items[i])->width;
+		if (*old_width <= 0) {
+			if (end - start > 1) {
+				*old_width = width / (end - start - 1);
+			} else {
+				*old_width = width;
+			}
+		}
+		scale += *old_width;
+	}
+	scale = width / scale;
+
+	// Resize windows
+	double child_x = x;
+	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];
+			wlr_log(L_DEBUG,
+				"Calculating arrangement for %p:%d (will scale %f by %f)",
+				child, child->type, width, scale);
+
+			if (child->type == C_VIEW) {
+				view_configure(child->sway_view, child_x, y, child->width,
+					child->height);
+			} else {
+				child->x = child_x;
+				child->y = y;
+			}
+
+			if (i == end - 1) {
+				double remaining_width = x + width - child_x;
+				arrange_windows(child, remaining_width, height);
+			} else {
+				arrange_windows(child, child->width * scale, height);
+			}
+			child_x += child->width;
+		}
+
+		// update focused view border last because it may
+		// depend on the title bar geometry of its siblings.
+		/* TODO WLR
+		if (focused && container->children->length > 1) {
+			update_container_border(focused);
+		}
+		*/
+	}
+}
+
+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) {
+	int i;
+	double scale = 0;
+	// Calculate total height
+	for (i = start; i < end; ++i) {
+		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);
+			} else {
+				*old_height = height;
+			}
+		}
+		scale += *old_height;
+	}
+	scale = height / scale;
+
+	// Resize
+	double child_y = y;
+	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];
+			wlr_log(L_DEBUG,
+				"Calculating arrangement for %p:%d (will scale %f by %f)",
+				child, child->type, height, scale);
+			if (child->type == C_VIEW) {
+				view_configure(child->sway_view, x, child_y, child->width,
+					child->height);
+			} else {
+				child->x = x;
+				child->y = child_y;
+			}
+
+			if (i == end - 1) {
+				double remaining_height = y + height - child_y;
+				arrange_windows(child, width, remaining_height);
+			} else {
+				arrange_windows(child, width, child->height * scale);
+			}
+			child_y += child->height;
+		}
+
+		// update focused view border last because it may
+		// depend on the title bar geometry of its siblings.
+		/* TODO WLR
+		if (focused && container->children->length > 1) {
+			update_container_border(focused);
+		}
+		*/
+	}
+}
+
+/**
+ * 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) {
+	if (!output) {
+		return NULL;
+	}
+
+	struct sway_container *ws = seat_get_focus_inactive(seat, output);
+	if (ws->type != C_WORKSPACE) {
+		ws = container_parent(ws, C_WORKSPACE);
+	}
+
+	if (ws == NULL) {
+		wlr_log(L_ERROR, "got an output without a workspace");
+		return NULL;
+	}
+
+	if (ws->children->length > 0) {
+		switch (dir) {
+		case MOVE_LEFT:
+			// get most right child of new output
+			return ws->children->items[ws->children->length-1];
+		case MOVE_RIGHT:
+			// get most left child of new output
+			return ws->children->items[0];
+		case MOVE_UP:
+		case MOVE_DOWN: {
+			struct sway_container *focused =
+				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
+						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];
+					}
+				}
+				return focused;
+			}
+			break;
+		}
+		default:
+			break;
+		}
+	}
+
+	return ws;
+}
+
+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 {
+		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.
+			*x = output->x;
+			*y = output->y;
+		} else {
+			*x = output->x + container->x;
+			*y = output->y + container->y;
+		}
+	}
+}
+
+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) {
+		struct sway_container *o = root_container.children->items[i];
+		if (o->type == C_OUTPUT && o->sway_output->wlr_output == output) {
+			return o;
+		}
+	}
+	return NULL;
+}
+
+struct sway_container *container_get_in_direction(
+		struct sway_container *container, struct sway_seat *seat,
+		enum movement_direction dir) {
+	if (dir == MOVE_CHILD) {
+		return seat_get_focus_inactive(seat, container);
+	}
+
+	struct sway_container *parent = container->parent;
+	if (dir == MOVE_PARENT) {
+		if (parent->type == C_OUTPUT) {
+			return NULL;
+		} else {
+			return parent;
+		}
+	}
+
+	// TODO WLR fullscreen
+	/*
+	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);
+		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);
+	}
+	if (container->type == C_WORKSPACE && container->fullscreen) {
+		sway_log(L_DEBUG, "Moving to fullscreen view");
+		return container->fullscreen;
+	}
+	*/
+
+	struct sway_container *wrap_candidate = NULL;
+	while (true) {
+		bool can_move = false;
+		int desired;
+		int idx = index_child(container);
+		if (parent->type == C_ROOT) {
+			enum wlr_direction wlr_dir = 0;
+			if (!sway_assert(sway_dir_to_wlr(dir, &wlr_dir),
+						"got invalid direction: %d", dir)) {
+				return NULL;
+			}
+			int lx, ly;
+			get_layout_center_position(container, &lx, &ly);
+			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);
+
+			if (!adjacent || adjacent == container) {
+				return wrap_candidate;
+			}
+			struct sway_container *next =
+				get_swayc_in_output_direction(adjacent, dir, seat);
+			if (next == NULL) {
+				return NULL;
+			}
+			if (next->children && next->children->length) {
+				// TODO consider floating children as well
+				return seat_get_focus_inactive_view(seat, next);
+			} else {
+				return next;
+			}
+		} else {
+			if (dir == MOVE_LEFT || dir == MOVE_RIGHT) {
+				if (parent->layout == L_HORIZ || parent->layout == L_TABBED) {
+					can_move = true;
+					desired = idx + (dir == MOVE_LEFT ? -1 : 1);
+				}
+			} else {
+				if (parent->layout == L_VERT || parent->layout == L_STACKED) {
+					can_move = true;
+					desired = idx + (dir == MOVE_UP ? -1 : 1);
+				}
+			}
+		}
+
+		if (can_move) {
+			// TODO handle floating
+			if (desired < 0 || desired >= parent->children->length) {
+				can_move = false;
+				int len = parent->children->length;
+				if (!wrap_candidate && len > 1) {
+					if (desired < 0) {
+						wrap_candidate = parent->children->items[len-1];
+					} else {
+						wrap_candidate = parent->children->items[0];
+					}
+					if (config->force_focus_wrapping) {
+						 return wrap_candidate;
+					}
+				}
+			} else {
+				struct sway_container *desired_con = parent->children->items[desired];
+				wlr_log(L_DEBUG,
+					"cont %d-%p dir %i sibling %d: %p", idx,
+					container, dir, desired, desired_con);
+				struct sway_container *next = seat_get_focus_inactive_view(seat, desired_con);
+				return next;
+			}
+		}
+
+		if (!can_move) {
+			container = parent;
+			parent = parent->parent;
+			if (!parent) {
+				// wrapping is the last chance
+				return wrap_candidate;
+			}
+		}
+	}
+}
+
+struct sway_container *container_replace_child(struct sway_container *child,
+		struct sway_container *new_child) {
+	struct sway_container *parent = child->parent;
+	if (parent == NULL) {
+		return NULL;
+	}
+	int i = index_child(child);
+
+	// TODO floating
+	if (new_child->parent) {
+		container_remove_child(new_child);
+	}
+	parent->children->items[i] = new_child;
+	new_child->parent = parent;
+	child->parent = NULL;
+
+	// Set geometry for new child
+	new_child->x = child->x;
+	new_child->y = child->y;
+	new_child->width = child->width;
+	new_child->height = child->height;
+
+	// reset geometry for child
+	child->width = 0;
+	child->height = 0;
+
+	return parent;
+}
+
+struct sway_container *container_split(struct sway_container *child,
+		enum sway_container_layout layout) {
+	// TODO floating: cannot split a floating container
+	if (!sway_assert(child, "child cannot be null")) {
+		return NULL;
+	}
+	if (child->type == C_WORKSPACE && child->children->length == 0) {
+		// Special case: this just behaves like splitt
+		child->prev_layout = child->layout;
+		child->layout = layout;
+		arrange_windows(child, -1, -1);
+		return child;
+	}
+
+	struct sway_container *cont = container_create(C_CONTAINER);
+
+	wlr_log(L_DEBUG, "creating container %p around %p", cont, child);
+
+	cont->prev_layout = L_NONE;
+	cont->width = child->width;
+	cont->height = child->height;
+	cont->x = child->x;
+	cont->y = child->y;
+
+	if (child->type == C_WORKSPACE) {
+		struct sway_seat *seat = input_manager_get_default_seat(input_manager);
+		struct sway_container *workspace = child;
+		bool set_focus = (seat_get_focus(seat) == workspace);
+
+		while (workspace->children->length) {
+			struct sway_container *ws_child = workspace->children->items[0];
+			container_remove_child(ws_child);
+			container_add_child(cont, ws_child);
+		}
+
+		container_add_child(workspace, cont);
+		enum sway_container_layout old_layout = workspace->layout;
+		container_set_layout(workspace, layout);
+		cont->layout = old_layout;
+
+		if (set_focus) {
+			seat_set_focus(seat, cont);
+		}
+	} else {
+		cont->layout = layout;
+		container_replace_child(child, cont);
+		container_add_child(cont, child);
+	}
+
+	return cont;
+}
+
+void container_recursive_resize(struct sway_container *container,
+		double amount, enum resize_edge edge) {
+	bool layout_match = true;
+	wlr_log(L_DEBUG, "Resizing %p with amount: %f", container, amount);
+	if (edge == RESIZE_EDGE_LEFT || edge == RESIZE_EDGE_RIGHT) {
+		container->width += amount;
+		layout_match = container->layout == L_HORIZ;
+	} else if (edge == RESIZE_EDGE_TOP || edge == RESIZE_EDGE_BOTTOM) {
+		container->height += amount;
+		layout_match = container->layout == L_VERT;
+	}
+	if (container->children) {
+		for (int i = 0; i < container->children->length; i++) {
+			struct sway_container *child = container->children->items[i];
+			double amt = layout_match ?
+				amount / container->children->length : amount;
+			container_recursive_resize(child, amt, edge);
+		}
+	}
+}
diff --git a/sway/tree/output.c b/sway/tree/output.c
new file mode 100644
index 00000000..6c7044a2
--- /dev/null
+++ b/sway/tree/output.c
@@ -0,0 +1,73 @@
+#define _POSIX_C_SOURCE 200809L
+#include <string.h>
+#include <strings.h>
+#include "sway/output.h"
+#include "sway/tree/output.h"
+#include "sway/tree/workspace.h"
+#include "log.h"
+
+struct 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);
+
+	const char *name = sway_output->wlr_output->name;
+	char identifier[128];
+	output_get_identifier(identifier, sizeof(identifier), sway_output);
+
+	struct output_config *oc = NULL, *all = NULL;
+	for (int i = 0; i < config->output_configs->length; ++i) {
+		struct output_config *cur = config->output_configs->items[i];
+
+		if (strcasecmp(name, cur->name) == 0 ||
+				strcasecmp(identifier, cur->name) == 0) {
+			wlr_log(L_DEBUG, "Matched output config for %s", name);
+			oc = cur;
+		}
+		if (strcasecmp("*", cur->name) == 0) {
+			wlr_log(L_DEBUG, "Matched wildcard output config for %s", name);
+			all = cur;
+		}
+
+		if (oc && all) {
+			break;
+		}
+	}
+	if (!oc) {
+		oc = all;
+	}
+
+	if (oc && !oc->enabled) {
+		return NULL;
+	}
+
+	struct sway_container *output = container_create(C_OUTPUT);
+	output->sway_output = sway_output;
+	output->name = strdup(name);
+	if (output->name == NULL) {
+		container_destroy(output);
+		return NULL;
+	}
+
+	apply_output_config(oc, output);
+	container_add_child(&root_container, output);
+	load_swaybars();
+
+	// Create workspace
+	char *ws_name = workspace_next_name(output->name);
+	wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
+	struct sway_container *ws = 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) {
+		if (!seat->has_focus) {
+			seat_set_focus(seat, ws);
+		}
+	}
+
+	free(ws_name);
+	container_create_notify(output);
+	return output;
+}
+
diff --git a/sway/tree/view.c b/sway/tree/view.c
new file mode 100644
index 00000000..99b44720
--- /dev/null
+++ b/sway/tree/view.c
@@ -0,0 +1,329 @@
+#include <stdlib.h>
+#include <wayland-server.h>
+#include <wlr/types/wlr_output_layout.h>
+#include "log.h"
+#include "sway/output.h"
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
+#include "sway/tree/view.h"
+
+void view_init(struct sway_view *view, enum sway_view_type type,
+		const struct sway_view_impl *impl) {
+	view->type = type;
+	view->impl = impl;
+	wl_signal_init(&view->events.unmap);
+}
+
+void view_destroy(struct sway_view *view) {
+	if (view == NULL) {
+		return;
+	}
+
+	if (view->surface != NULL) {
+		view_unmap(view);
+	}
+
+	container_destroy(view->swayc);
+
+	if (view->impl->destroy) {
+		view->impl->destroy(view);
+	} else {
+		free(view);
+	}
+}
+
+const char *view_get_title(struct sway_view *view) {
+	if (view->impl->get_prop) {
+		return view->impl->get_prop(view, VIEW_PROP_TITLE);
+	}
+	return NULL;
+}
+
+const char *view_get_app_id(struct sway_view *view) {
+	if (view->impl->get_prop) {
+		return view->impl->get_prop(view, VIEW_PROP_APP_ID);
+	}
+	return NULL;
+}
+
+const char *view_get_class(struct sway_view *view) {
+	if (view->impl->get_prop) {
+		return view->impl->get_prop(view, VIEW_PROP_CLASS);
+	}
+	return NULL;
+}
+
+const char *view_get_instance(struct sway_view *view) {
+	if (view->impl->get_prop) {
+		return view->impl->get_prop(view, VIEW_PROP_INSTANCE);
+	}
+	return NULL;
+}
+
+void view_configure(struct sway_view *view, double ox, double oy, int width,
+		int height) {
+	if (view->impl->configure) {
+		view->impl->configure(view, ox, oy, width, height);
+	}
+}
+
+void view_set_activated(struct sway_view *view, bool activated) {
+	if (view->impl->set_activated) {
+		view->impl->set_activated(view, activated);
+	}
+}
+
+void view_close(struct sway_view *view) {
+	if (view->impl->close) {
+		view->impl->close(view);
+	}
+}
+
+void view_damage(struct sway_view *view, bool whole) {
+	for (int i = 0; i < root_container.children->length; ++i) {
+		struct sway_container *cont = root_container.children->items[i];
+		if (cont->type == C_OUTPUT) {
+			output_damage_view(cont->sway_output, view, whole);
+		}
+	}
+}
+
+static void view_get_layout_box(struct sway_view *view, struct wlr_box *box) {
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+
+	box->x = output->x + view->swayc->x;
+	box->y = output->y + view->swayc->y;
+	box->width = view->width;
+	box->height = view->height;
+}
+
+void view_for_each_surface(struct sway_view *view,
+		wlr_surface_iterator_func_t iterator, void *user_data) {
+	if (view->impl->for_each_surface) {
+		view->impl->for_each_surface(view, iterator, user_data);
+	} else {
+		wlr_surface_for_each_surface(view->surface, iterator, user_data);
+	}
+}
+
+static void view_subsurface_create(struct sway_view *view,
+	struct wlr_subsurface *subsurface);
+
+static void view_init_subsurfaces(struct sway_view *view,
+	struct wlr_surface *surface);
+
+static void view_handle_surface_new_subsurface(struct wl_listener *listener,
+		void *data) {
+	struct sway_view *view =
+		wl_container_of(listener, view, surface_new_subsurface);
+	struct wlr_subsurface *subsurface = data;
+	view_subsurface_create(view, subsurface);
+}
+
+static void surface_send_enter_iterator(struct wlr_surface *surface,
+		int x, int y, void *data) {
+	struct wlr_output *wlr_output = data;
+	wlr_surface_send_enter(surface, wlr_output);
+}
+
+static void surface_send_leave_iterator(struct wlr_surface *surface,
+		int x, int y, void *data) {
+	struct wlr_output *wlr_output = data;
+	wlr_surface_send_leave(surface, wlr_output);
+}
+
+static void view_handle_container_reparent(struct wl_listener *listener,
+		void *data) {
+	struct sway_view *view =
+		wl_container_of(listener, view, container_reparent);
+	struct sway_container *old_parent = data;
+
+	struct sway_container *old_output = old_parent;
+	if (old_output != NULL && old_output->type != C_OUTPUT) {
+		old_output = container_parent(old_output, C_OUTPUT);
+	}
+
+	struct sway_container *new_output = view->swayc->parent;
+	if (new_output != NULL && new_output->type != C_OUTPUT) {
+		new_output = container_parent(new_output, C_OUTPUT);
+	}
+
+	if (old_output == new_output) {
+		return;
+	}
+
+	if (old_output != NULL) {
+		view_for_each_surface(view, surface_send_leave_iterator,
+			old_output->sway_output->wlr_output);
+	}
+	if (new_output != NULL) {
+		view_for_each_surface(view, surface_send_enter_iterator,
+			new_output->sway_output->wlr_output);
+	}
+}
+
+void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
+	if (!sway_assert(view->surface == NULL, "cannot map mapped view")) {
+		return;
+	}
+
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	struct sway_container *focus = seat_get_focus_inactive(seat,
+		&root_container);
+	struct sway_container *cont = container_view_create(focus, view);
+
+	view->surface = wlr_surface;
+	view->swayc = cont;
+
+	view_init_subsurfaces(view, wlr_surface);
+	wl_signal_add(&wlr_surface->events.new_subsurface,
+		&view->surface_new_subsurface);
+	view->surface_new_subsurface.notify = view_handle_surface_new_subsurface;
+
+	wl_signal_add(&view->swayc->events.reparent, &view->container_reparent);
+	view->container_reparent.notify = view_handle_container_reparent;
+
+	arrange_windows(cont->parent, -1, -1);
+	input_manager_set_focus(input_manager, cont);
+
+	view_damage(view, true);
+	view_handle_container_reparent(&view->container_reparent, NULL);
+}
+
+void view_unmap(struct sway_view *view) {
+	if (!sway_assert(view->surface != NULL, "cannot unmap unmapped view")) {
+		return;
+	}
+
+	wl_signal_emit(&view->events.unmap, view);
+
+	view_damage(view, true);
+
+	wl_list_remove(&view->surface_new_subsurface.link);
+	wl_list_remove(&view->container_reparent.link);
+
+	struct sway_container *parent = container_destroy(view->swayc);
+
+	view->swayc = NULL;
+	view->surface = NULL;
+
+	arrange_windows(parent, -1, -1);
+}
+
+void view_update_position(struct sway_view *view, double ox, double oy) {
+	if (view->swayc->x == ox && view->swayc->y == oy) {
+		return;
+	}
+
+	view_damage(view, true);
+	view->swayc->x = ox;
+	view->swayc->y = oy;
+	view_damage(view, true);
+}
+
+void view_update_size(struct sway_view *view, int width, int height) {
+	if (view->width == width && view->height == height) {
+		return;
+	}
+
+	view_damage(view, true);
+	view->width = width;
+	view->height = height;
+	view_damage(view, true);
+}
+
+
+static void view_subsurface_create(struct sway_view *view,
+		struct wlr_subsurface *subsurface) {
+	struct sway_view_child *child = calloc(1, sizeof(struct sway_view_child));
+	if (child == NULL) {
+		wlr_log(L_ERROR, "Allocation failed");
+		return;
+	}
+	view_child_init(child, NULL, view, subsurface->surface);
+}
+
+static void view_child_handle_surface_commit(struct wl_listener *listener,
+		void *data) {
+	struct sway_view_child *child =
+		wl_container_of(listener, child, surface_commit);
+	// TODO: only accumulate damage from the child
+	view_damage(child->view, false);
+}
+
+static void view_child_handle_surface_new_subsurface(
+		struct wl_listener *listener, void *data) {
+	struct sway_view_child *child =
+		wl_container_of(listener, child, surface_new_subsurface);
+	struct wlr_subsurface *subsurface = data;
+	view_subsurface_create(child->view, subsurface);
+}
+
+static void view_child_handle_surface_destroy(struct wl_listener *listener,
+		void *data) {
+	struct sway_view_child *child =
+		wl_container_of(listener, child, surface_destroy);
+	view_child_destroy(child);
+}
+
+static void view_child_handle_view_unmap(struct wl_listener *listener,
+		void *data) {
+	struct sway_view_child *child =
+		wl_container_of(listener, child, view_unmap);
+	view_child_destroy(child);
+}
+
+static void view_init_subsurfaces(struct sway_view *view,
+		struct wlr_surface *surface) {
+	struct wlr_subsurface *subsurface;
+	wl_list_for_each(subsurface, &surface->subsurface_list, parent_link) {
+		view_subsurface_create(view, subsurface);
+	}
+}
+
+void view_child_init(struct sway_view_child *child,
+		const struct sway_view_child_impl *impl, struct sway_view *view,
+		struct wlr_surface *surface) {
+	child->impl = impl;
+	child->view = view;
+	child->surface = surface;
+
+	wl_signal_add(&surface->events.commit, &child->surface_commit);
+	child->surface_commit.notify = view_child_handle_surface_commit;
+	wl_signal_add(&surface->events.new_subsurface,
+		&child->surface_new_subsurface);
+	child->surface_new_subsurface.notify =
+		view_child_handle_surface_new_subsurface;
+	wl_signal_add(&surface->events.destroy, &child->surface_destroy);
+	child->surface_destroy.notify = view_child_handle_surface_destroy;
+	wl_signal_add(&view->events.unmap, &child->view_unmap);
+	child->view_unmap.notify = view_child_handle_view_unmap;
+
+	struct sway_container *output = child->view->swayc->parent;
+	if (output != NULL) {
+		if (output->type != C_OUTPUT) {
+			output = container_parent(output, C_OUTPUT);
+		}
+		wlr_surface_send_enter(child->surface, output->sway_output->wlr_output);
+	}
+
+	view_init_subsurfaces(child->view, surface);
+
+	// TODO: only damage the whole child
+	view_damage(child->view, true);
+}
+
+void view_child_destroy(struct sway_view_child *child) {
+	// TODO: only damage the whole child
+	view_damage(child->view, true);
+
+	wl_list_remove(&child->surface_commit.link);
+	wl_list_remove(&child->surface_destroy.link);
+	wl_list_remove(&child->view_unmap.link);
+
+	if (child->impl && child->impl->destroy) {
+		child->impl->destroy(child);
+	} else {
+		free(child);
+	}
+}
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
new file mode 100644
index 00000000..316f01e4
--- /dev/null
+++ b/sway/tree/workspace.c
@@ -0,0 +1,401 @@
+#define _XOPEN_SOURCE 500
+#include <ctype.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <strings.h>
+#include "stringop.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
+#include "sway/ipc-server.h"
+#include "sway/tree/container.h"
+#include "sway/tree/workspace.h"
+#include "log.h"
+#include "util.h"
+
+static struct sway_container *get_workspace_initial_output(const char *name) {
+	struct sway_container *parent;
+	// Search for workspace<->output pair
+	int e = config->workspace_outputs->length;
+	for (int i = 0; i < config->workspace_outputs->length; ++i) {
+		struct workspace_output *wso = config->workspace_outputs->items[i];
+		if (strcasecmp(wso->workspace, name) == 0) {
+			// Find output to use if it exists
+			e = root_container.children->length;
+			for (i = 0; i < e; ++i) {
+				parent = root_container.children->items[i];
+				if (strcmp(parent->name, wso->output) == 0) {
+					return parent;
+				}
+			}
+			break;
+		}
+	}
+	// Otherwise put it on the focused output
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	struct sway_container *focus =
+		seat_get_focus_inactive(seat, &root_container);
+	parent = focus;
+	parent = container_parent(parent, C_OUTPUT);
+	return parent;
+}
+
+struct sway_container *workspace_create(struct sway_container *output,
+		const char *name) {
+	if (output == NULL) {
+		output = get_workspace_initial_output(name);
+	}
+
+	wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
+	struct sway_container *workspace = container_create(C_WORKSPACE);
+
+	workspace->x = output->x;
+	workspace->y = output->y;
+	workspace->width = output->width;
+	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 = workspace->layout;
+
+	container_add_child(output, workspace);
+	container_sort_workspaces(output);
+	container_create_notify(workspace);
+
+	return workspace;
+}
+
+char *prev_workspace_name = NULL;
+struct workspace_by_number_data {
+	int len;
+	const char *cset;
+	const char *name;
+};
+
+void next_name_map(struct sway_container *ws, void *data) {
+	int *count = data;
+	++count;
+}
+
+static bool workspace_valid_on_output(const char *output_name,
+		const char *ws_name) {
+	int i;
+	for (i = 0; i < config->workspace_outputs->length; ++i) {
+		struct workspace_output *wso = config->workspace_outputs->items[i];
+		if (strcasecmp(wso->workspace, ws_name) == 0) {
+			if (strcasecmp(wso->output, output_name) != 0) {
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+char *workspace_next_name(const char *output_name) {
+	wlr_log(L_DEBUG, "Workspace: Generating new workspace name for output %s",
+			output_name);
+	int l = 1;
+	// Scan all workspace bindings to find the next available workspace name,
+	// if none are found/available then default to a number
+	struct sway_mode *mode = config->current_mode;
+
+	// TODO: iterate over keycode bindings too
+	int order = INT_MAX;
+	char *target = NULL;
+	for (int i = 0; i < mode->keysym_bindings->length; ++i) {
+		struct sway_binding *binding = mode->keysym_bindings->items[i];
+		char *cmdlist = strdup(binding->command);
+		char *dup = cmdlist;
+		char *name = NULL;
+
+		// workspace n
+		char *cmd = argsep(&cmdlist, " ");
+		if (cmdlist) {
+			name = argsep(&cmdlist, ",;");
+		}
+
+		if (strcmp("workspace", cmd) == 0 && name) {
+			wlr_log(L_DEBUG, "Got valid workspace command for target: '%s'", name);
+			char *_target = strdup(name);
+			strip_quotes(_target);
+			while (isspace(*_target)) {
+				memmove(_target, _target+1, strlen(_target+1));
+			}
+
+			// Make sure that the command references an actual workspace
+			// not a command about workspaces
+			if (strcmp(_target, "next") == 0 ||
+				strcmp(_target, "prev") == 0 ||
+				strcmp(_target, "next_on_output") == 0 ||
+				strcmp(_target, "prev_on_output") == 0 ||
+				strcmp(_target, "number") == 0 ||
+				strcmp(_target, "back_and_forth") == 0 ||
+				strcmp(_target, "current") == 0)
+			{
+				free(_target);
+				free(dup);
+				continue;
+			}
+
+			// If the command is workspace number <name>, isolate the name
+			if (strncmp(_target, "number ", strlen("number ")) == 0) {
+				size_t length = strlen(_target) - strlen("number ") + 1;
+				char *temp = malloc(length);
+				strncpy(temp, _target + strlen("number "), length - 1);
+				temp[length - 1] = '\0';
+				free(_target);
+				_target = temp;
+				wlr_log(L_DEBUG, "Isolated name from workspace number: '%s'", _target);
+
+				// Make sure the workspace number doesn't already exist
+				if (workspace_by_number(_target)) {
+					free(_target);
+					free(dup);
+					continue;
+				}
+			}
+
+			// Make sure that the workspace doesn't already exist
+			if (workspace_by_name(_target)) {
+				free(_target);
+				free(dup);
+				continue;
+			}
+
+			// make sure that the workspace can appear on the given
+			// output
+			if (!workspace_valid_on_output(output_name, _target)) {
+				free(_target);
+				free(dup);
+				continue;
+			}
+
+			if (binding->order < order) {
+				order = binding->order;
+				free(target);
+				target = _target;
+				wlr_log(L_DEBUG, "Workspace: Found free name %s", _target);
+			}
+		}
+		free(dup);
+	}
+	if (target != NULL) {
+		return target;
+	}
+	// As a fall back, get the current number of active workspaces
+	// and return that + 1 for the next workspace's name
+	int ws_num = root_container.children->length;
+	if (ws_num >= 10) {
+		l = 2;
+	} else if (ws_num >= 100) {
+		l = 3;
+	}
+	char *name = malloc(l + 1);
+	if (!name) {
+		wlr_log(L_ERROR, "Could not allocate workspace name");
+		return NULL;
+	}
+	sprintf(name, "%d", ws_num++);
+	return name;
+}
+
+static bool _workspace_by_number(struct sway_container *view, void *data) {
+	if (view->type != C_WORKSPACE) {
+		return false;
+	}
+	struct workspace_by_number_data *wbnd = data;
+	int a = strspn(view->name, wbnd->cset);
+	return a == wbnd->len && strncmp(view->name, wbnd->name, a) == 0;
+}
+
+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 container_find(&root_container,
+			_workspace_by_number, (void *) &wbnd);
+}
+
+static bool _workspace_by_name(struct sway_container *view, void *data) {
+	return (view->type == C_WORKSPACE) &&
+		   (strcasecmp(view->name, (char *) data) == 0);
+}
+
+struct sway_container *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 = seat_get_focus(seat);
+	if (focus) {
+		current_workspace = container_parent(focus, C_WORKSPACE);
+		current_output = container_parent(focus, C_OUTPUT);
+	}
+	if (strcmp(name, "prev") == 0) {
+		return workspace_prev(current_workspace);
+	} else if (strcmp(name, "prev_on_output") == 0) {
+		return workspace_output_prev(current_output);
+	} else if (strcmp(name, "next") == 0) {
+		return workspace_next(current_workspace);
+	} else if (strcmp(name, "next_on_output") == 0) {
+		return workspace_output_next(current_output);
+	} else if (strcmp(name, "current") == 0) {
+		return current_workspace;
+	} else {
+		return container_find(&root_container, _workspace_by_name,
+				(void *)name);
+	}
+}
+
+/**
+ * Get the previous or next workspace on the specified output. Wraps around at
+ * 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) {
+	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 = seat_get_focus_inactive(seat, output);
+	struct sway_container *workspace = (focus->type == C_WORKSPACE ?
+			focus :
+			container_parent(focus, C_WORKSPACE));
+
+	int i;
+	for (i = 0; i < output->children->length; i++) {
+		if (output->children->items[i] == workspace) {
+			return output->children->items[
+				wrap(i + (next ? 1 : -1), output->children->length)];
+		}
+	}
+
+	// Doesn't happen, at worst the for loop returns the previously active
+	// workspace
+	return NULL;
+}
+
+/**
+ * Get the previous or next workspace. If the first/last workspace on an output
+ * is active, proceed to the previous/next output's previous/next workspace. If
+ * 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) {
+	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;
+	int offset = next ? 1 : -1;
+	int start = next ? 0 : 1;
+	int end;
+	if (next) {
+		end = current_output->children->length - 1;
+	} else {
+		end = current_output->children->length;
+	}
+	int i;
+	for (i = start; i < end; i++) {
+		if (current_output->children->items[i] == workspace) {
+			return current_output->children->items[i + offset];
+		}
+	}
+
+	// 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[
+				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
+	return NULL;
+}
+
+struct sway_container *workspace_output_next(struct sway_container *current) {
+	return workspace_output_prev_next_impl(current, true);
+}
+
+struct sway_container *workspace_next(struct sway_container *current) {
+	return workspace_prev_next_impl(current, true);
+}
+
+struct sway_container *workspace_output_prev(struct sway_container *current) {
+	return workspace_output_prev_next_impl(current, false);
+}
+
+struct sway_container *workspace_prev(struct sway_container *current) {
+	return workspace_prev_next_impl(current, false);
+}
+
+bool workspace_switch(struct sway_container *workspace) {
+	if (!workspace) {
+		return false;
+	}
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	struct sway_container *focus =
+		seat_get_focus_inactive(seat, &root_container);
+	if (!seat || !focus) {
+		return false;
+	}
+	struct sway_container *active_ws = focus;
+	if (active_ws->type != C_WORKSPACE) {
+		active_ws = container_parent(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);
+		workspace = new_ws ?
+			new_ws :
+			workspace_create(NULL, prev_workspace_name);
+	}
+
+	if (!prev_workspace_name || (strcmp(prev_workspace_name, active_ws->name)
+				&& active_ws != workspace)) {
+		free(prev_workspace_name);
+		prev_workspace_name = malloc(strlen(active_ws->name) + 1);
+		if (!prev_workspace_name) {
+			wlr_log(L_ERROR, "Unable to allocate previous workspace name");
+			return false;
+		}
+		strcpy(prev_workspace_name, active_ws->name);
+	}
+
+	// TODO: Deal with sticky containers
+
+	wlr_log(L_DEBUG, "Switching to workspace %p:%s",
+		workspace, workspace->name);
+	struct sway_container *next = seat_get_focus_inactive(seat, workspace);
+	if (next == NULL) {
+		next = workspace;
+	}
+	seat_set_focus(seat, next);
+	struct sway_container *output = container_parent(workspace, C_OUTPUT);
+	arrange_windows(output, -1, -1);
+	return true;
+}
+
+bool workspace_is_visible(struct sway_container *ws) {
+	struct sway_container *output = container_parent(ws, C_OUTPUT);
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+	struct sway_container *focus = seat_get_focus_inactive(seat, output);
+	if (focus->type != C_WORKSPACE) {
+		focus = container_parent(focus, C_WORKSPACE);
+	}
+	return focus == ws;
+}