From 8caabe59c2e6f6174678e6c28be3381a7dabff10 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sat, 25 Nov 2017 16:30:15 -0500
Subject: Handle view destruction properly

---
 sway/tree/container.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 sway/tree/layout.c    | 13 +++++++++++++
 2 files changed, 55 insertions(+)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index a83c0f6b..c7bce38a 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -109,6 +109,48 @@ swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
 	return swayc;
 }
 
+static void free_swayc(swayc_t *cont) {
+	if (!sway_assert(cont, "free_swayc passed NULL")) {
+		return;
+	}
+	if (cont->children) {
+		// remove children until there are no more, free_swayc calls
+		// remove_child, which removes child from this container
+		while (cont->children->length) {
+			free_swayc(cont->children->items[0]);
+		}
+		list_free(cont->children);
+	}
+	if (cont->marks) {
+		list_foreach(cont->marks, free);
+		list_free(cont->marks);
+	}
+	if (cont->parent) {
+		remove_child(cont);
+	}
+	if (cont->name) {
+		free(cont->name);
+	}
+	free(cont);
+}
+
+swayc_t *destroy_view(swayc_t *view) {
+	if (!sway_assert(view, "null view passed to destroy_view")) {
+		return NULL;
+	}
+	sway_log(L_DEBUG, "Destroying view '%s'", view->name);
+	swayc_t *parent = view->parent;
+	free_swayc(view);
+
+	// TODO WLR: Destroy empty containers
+	/*
+	if (parent && parent->type == C_CONTAINER) {
+		return destroy_container(parent);
+	}
+	*/
+	return parent;
+}
+
 swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
 	if (!sway_assert(container, "container is NULL")) {
 		return NULL;
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 6e2586a7..ea7bb8bb 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -40,6 +40,19 @@ void add_child(swayc_t *parent, swayc_t *child) {
 	*/
 }
 
+swayc_t *remove_child(swayc_t *child) {
+	int i;
+	swayc_t *parent = child->parent;
+	for (i = 0; i < parent->children->length; ++i) {
+		if (parent->children->items[i] == child) {
+			list_del(parent->children, i);
+			break;
+		}
+	}
+	child->parent = NULL;
+	return parent;
+}
+
 enum swayc_layouts default_layout(swayc_t *output) {
 	/* TODO WLR
 	if (config->default_layout != L_NONE) {
-- 
cgit v1.2.3-54-g00ecf