1 files changed, 80 insertions, 7 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index e205fbcf..ba305efa 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -2,7 +2,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <wlr/types/wlr_output_layout.h>
+#include "sway/config.h"
 #include "sway/container.h"
 #include "sway/layout.h"
 #include "sway/output.h"
@@ -23,6 +25,30 @@ void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
 	}
 }
 
+static void update_root_geometry() {
+	int width = 0;
+	int height = 0;
+	swayc_t *child;
+	int child_width;
+	int child_height;
+
+	for (int i = 0; i < root_container.children->length; ++i) {
+		child = root_container.children->items[i];
+		child_width = child->width + child->x;
+		child_height = child->height + child->y;
+		if (child_width > width) {
+			width = child_width;
+		}
+
+		if (child_height > height) {
+			height = child_height;
+		}
+	}
+
+	root_container.width = width;
+	root_container.height = height;
+}
+
 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;
@@ -44,19 +70,38 @@ static swayc_t *new_swayc(enum swayc_types type) {
 
 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);
+	wlr_output_effective_resolution(sway_output->wlr_output, &size.width,
+		&size.height);
 	const char *name = sway_output->wlr_output->name;
 
+	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) {
+			sway_log(L_DEBUG, "Matched output config for %s", name);
+			oc = cur;
+		}
+		if (strcasecmp("*", cur->name) == 0) {
+			sway_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;
+	}
+
 	swayc_t *output = new_swayc(C_OUTPUT);
 	output->sway_output = sway_output;
 	output->name = name ? strdup(name) : NULL;
-	output->width = size.width;
-	output->height = size.width;
 
-	// TODO configure output layout position
-	wlr_output_layout_add_auto(root_container.output_layout,
-		sway_output->wlr_output);
+	apply_output_config(oc, output);
 
 	add_child(&root_container, output);
 
@@ -139,6 +184,34 @@ static void free_swayc(swayc_t *cont) {
 	free(cont);
 }
 
+swayc_t *destroy_output(swayc_t *output) {
+	if (!sway_assert(output, "null output passed to destroy_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) {
+				swayc_t *child = output->children->items[0];
+				remove_child(child);
+				add_child(root_container.children->items[p], child);
+			}
+			sort_workspaces(root_container.children->items[p]);
+			// TODO WLR: is this needed anymore?
+			//update_visibility(root_container.children->items[p]);
+			arrange_windows(root_container.children->items[p], -1, -1);
+		}
+	}
+	sway_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
+	free_swayc(output);
+	update_root_geometry();
+	return &root_container;
+}
+
 swayc_t *destroy_view(swayc_t *view) {
 	if (!sway_assert(view, "null view passed to destroy_view")) {
 		return NULL;