4 files changed, 147 insertions, 113 deletions

diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index 8aebc0cc..bdef56ea 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -86,12 +86,14 @@ static void apply_horiz_layout(struct sway_container *parent) {
 	if (!num_children) {
 		return;
 	}
-	size_t parent_height = parent->height;
 	size_t parent_offset = 0;
 	if (parent->parent->layout == L_TABBED) {
-		parent_offset = config->border_thickness * 2 + config->font_height;
-		parent_height -= parent_offset;
+		parent_offset = container_titlebar_height();
+	} else if (parent->parent->layout == L_STACKED) {
+		parent_offset =
+			container_titlebar_height() * parent->parent->children->length;
 	}
+	size_t parent_height = parent->height - parent_offset;
 
 	// Calculate total width of children
 	double total_width = 0;
@@ -132,12 +134,14 @@ static void apply_vert_layout(struct sway_container *parent) {
 	if (!num_children) {
 		return;
 	}
-	size_t parent_height = parent->height;
 	size_t parent_offset = 0;
 	if (parent->parent->layout == L_TABBED) {
-		parent_offset = config->border_thickness * 2 + config->font_height;
-		parent_height -= parent_offset;
+		parent_offset = container_titlebar_height();
+	} else if (parent->parent->layout == L_STACKED) {
+		parent_offset =
+			container_titlebar_height() * parent->parent->children->length;
 	}
+	size_t parent_height = parent->height - parent_offset;
 
 	// Calculate total height of children
 	double total_height = 0;
@@ -173,16 +177,24 @@ static void apply_vert_layout(struct sway_container *parent) {
 	child->height = parent->y + parent_offset + parent_height - child->y;
 }
 
-static void apply_tabbed_layout(struct sway_container *parent) {
+static void apply_tabbed_or_stacked_layout(struct sway_container *parent) {
 	if (!parent->children->length) {
 		return;
 	}
+	size_t parent_offset = 0;
+	if (parent->parent->layout == L_TABBED) {
+		parent_offset = container_titlebar_height();
+	} else if (parent->parent->layout == L_STACKED) {
+		parent_offset =
+			container_titlebar_height() * parent->parent->children->length;
+	}
+	size_t parent_height = parent->height - parent_offset;
 	for (int i = 0; i < parent->children->length; ++i) {
 		struct sway_container *child = parent->children->items[i];
 		child->x = parent->x;
-		child->y = parent->y;
+		child->y = parent->y + parent_offset;
 		child->width = parent->width;
-		child->height = parent->height;
+		child->height = parent_height;
 	}
 }
 
@@ -217,7 +229,8 @@ void arrange_children_of(struct sway_container *parent) {
 		apply_vert_layout(parent);
 		break;
 	case L_TABBED:
-		apply_tabbed_layout(parent);
+	case L_STACKED:
+		apply_tabbed_or_stacked_layout(parent);
 		break;
 	default:
 		wlr_log(L_DEBUG, "TODO: arrange layout type %d", parent->layout);
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 5d88325f..f29a9adc 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -21,6 +21,7 @@
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 #include "log.h"
+#include "stringop.h"
 
 static list_t *bfs_queue;
 
@@ -510,7 +511,7 @@ static struct sway_container *container_at_tabbed(struct sway_container *parent,
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
 
 	// Tab titles
-	int title_height = config->border_thickness * 2 + config->font_height;
+	int title_height = container_titlebar_height();
 	if (oy < parent->y + title_height) {
 		int tab_width = parent->width / parent->children->length;
 		int child_index = (ox - parent->x) / tab_width;
@@ -533,8 +534,23 @@ static struct sway_container *container_at_tabbed(struct sway_container *parent,
 static struct sway_container *container_at_stacked(
 		struct sway_container *parent, double ox, double oy,
 		struct wlr_surface **surface, double *sx, double *sy) {
-	// TODO
-	return NULL;
+	if (oy < parent->y || oy > parent->y + parent->height) {
+		return NULL;
+	}
+	struct sway_seat *seat = input_manager_current_seat(input_manager);
+
+	// Title bars
+	int title_height = container_titlebar_height();
+	int child_index = (oy - parent->y) / title_height;
+	if (child_index < parent->children->length) {
+		struct sway_container *child = parent->children->items[child_index];
+		return seat_get_focus_inactive(seat, child);
+	}
+
+	// Surfaces
+	struct sway_container *current = seat_get_active_child(seat, parent);
+
+	return container_at(current, ox, oy, surface, sx, sy);
 }
 
 /**
@@ -759,42 +775,36 @@ void container_calculate_title_height(struct sway_container *container) {
 }
 
 /**
- * Calculate and return the length of the concatenated child titles.
- * An example concatenated title is: V[Terminal, Firefox]
- * If buffer is not NULL, also populate the buffer with the concatenated title.
+ * Calculate and return the length of the tree representation.
+ * An example tree representation is: V[Terminal, Firefox]
+ * If buffer is not NULL, also populate the buffer with the representation.
  */
-static size_t concatenate_child_titles(struct sway_container *parent,
-		char *buffer) {
-	size_t len = 2; // V[
-	if (buffer) {
-		switch (parent->layout) {
-		case L_VERT:
-			strcpy(buffer, "V[");
-			break;
-		case L_HORIZ:
-			strcpy(buffer, "H[");
-			break;
-		case L_TABBED:
-			strcpy(buffer, "T[");
-			break;
-		case L_STACKED:
-			strcpy(buffer, "S[");
-			break;
-		case L_FLOATING:
-			strcpy(buffer, "F[");
-			break;
-		case L_NONE:
-			strcpy(buffer, "D[");
-			break;
-		}
+static size_t get_tree_representation(struct sway_container *parent, char *buffer) {
+	size_t len = 2;
+	switch (parent->layout) {
+	case L_VERT:
+		lenient_strcat(buffer, "V[");
+		break;
+	case L_HORIZ:
+		lenient_strcat(buffer, "H[");
+		break;
+	case L_TABBED:
+		lenient_strcat(buffer, "T[");
+		break;
+	case L_STACKED:
+		lenient_strcat(buffer, "S[");
+		break;
+	case L_FLOATING:
+		lenient_strcat(buffer, "F[");
+		break;
+	case L_NONE:
+		lenient_strcat(buffer, "D[");
+		break;
 	}
-
 	for (int i = 0; i < parent->children->length; ++i) {
 		if (i != 0) {
-			len += 1;
-			if (buffer) {
-				strcat(buffer, " ");
-			}
+			++len;
+			lenient_strcat(buffer, " ");
 		}
 		struct sway_container *child = parent->children->items[i];
 		const char *identifier = NULL;
@@ -804,46 +814,41 @@ static size_t concatenate_child_titles(struct sway_container *parent,
 				identifier = view_get_app_id(child->sway_view);
 			}
 		} else {
-			identifier = child->name;
+			identifier = child->formatted_title;
 		}
 		if (identifier) {
 			len += strlen(identifier);
-			if (buffer) {
-				strcat(buffer, identifier);
-			}
+			lenient_strcat(buffer, identifier);
 		} else {
 			len += 6;
-			if (buffer) {
-				strcat(buffer, "(null)");
-			}
+			lenient_strcat(buffer, "(null)");
 		}
 	}
-
-	len += 1;
-	if (buffer) {
-		strcat(buffer, "]");
-	}
+	++len;
+	lenient_strcat(buffer, "]");
 	return len;
 }
 
-void container_notify_child_title_changed(struct sway_container *container) {
+void container_notify_subtree_changed(struct sway_container *container) {
 	if (!container || container->type != C_CONTAINER) {
 		return;
 	}
-	if (container->formatted_title) {
-		free(container->formatted_title);
-	}
+	free(container->formatted_title);
+	container->formatted_title = NULL;
 
-	size_t len = concatenate_child_titles(container, NULL);
+	size_t len = get_tree_representation(container, NULL);
 	char *buffer = calloc(len + 1, sizeof(char));
 	if (!sway_assert(buffer, "Unable to allocate title string")) {
 		return;
 	}
-	concatenate_child_titles(container, buffer);
+	get_tree_representation(container, buffer);
 
-	container->name = buffer;
 	container->formatted_title = buffer;
 	container_calculate_title_height(container);
 	container_update_title_textures(container);
-	container_notify_child_title_changed(container->parent);
+	container_notify_subtree_changed(container->parent);
+}
+
+size_t container_titlebar_height() {
+	return config->font_height + TITLEBAR_V_PADDING * 2;
 }
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index f8acdf6c..21cec529 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -149,7 +149,7 @@ struct sway_container *container_remove_child(struct sway_container *child) {
 		}
 	}
 	child->parent = NULL;
-	container_notify_child_title_changed(parent);
+	container_notify_subtree_changed(parent);
 
 	return parent;
 }
@@ -184,12 +184,20 @@ void container_move_to(struct sway_container *container,
 		container_sort_workspaces(new_parent);
 		seat_set_focus(seat, new_parent);
 	}
-	container_notify_child_title_changed(old_parent);
-	container_notify_child_title_changed(new_parent);
+	container_notify_subtree_changed(old_parent);
+	container_notify_subtree_changed(new_parent);
 	if (old_parent) {
-		arrange_children_of(old_parent);
+		if (old_parent->type == C_OUTPUT) {
+			arrange_output(old_parent);
+		} else {
+			arrange_children_of(old_parent);
+		}
+	}
+	if (new_parent->type == C_OUTPUT) {
+		arrange_output(new_parent);
+	} else {
+		arrange_children_of(new_parent);
 	}
-	arrange_children_of(new_parent);
 	// If view was moved to a fullscreen workspace, refocus the fullscreen view
 	struct sway_container *new_workspace = container;
 	if (new_workspace->type != C_WORKSPACE) {
@@ -319,9 +327,11 @@ void container_move(struct sway_container *container,
 		current = container_parent(container, C_OUTPUT);
 	}
 
-	if (parent != container_flatten(parent)) {
+	struct sway_container *new_parent = container_flatten(parent);
+	if (new_parent != parent) {
 		// Special case: we were the last one in this container, so flatten it
 		// and leave
+		arrange_children_of(new_parent);
 		update_debug_tree();
 		return;
 	}
@@ -489,8 +499,8 @@ void container_move(struct sway_container *container,
 		}
 	}
 
-	container_notify_child_title_changed(old_parent);
-	container_notify_child_title_changed(container->parent);
+	container_notify_subtree_changed(old_parent);
+	container_notify_subtree_changed(container->parent);
 
 	if (old_parent) {
 		seat_set_focus(config->handler_context.seat, old_parent);
@@ -578,11 +588,19 @@ static struct sway_container *get_swayc_in_output_direction(
 	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];
+			if (ws->layout == L_HORIZ || ws->layout == L_TABBED) {
+				// get most right child of new output
+				return ws->children->items[ws->children->length-1];
+			} else {
+				return seat_get_focus_inactive(seat, ws);
+			}
 		case MOVE_RIGHT:
-			// get most left child of new output
-			return ws->children->items[0];
+			if (ws->layout == L_HORIZ || ws->layout == L_TABBED) {
+				// get most left child of new output
+				return ws->children->items[0];
+			} else {
+				return seat_get_focus_inactive(seat, ws);
+			}
 		case MOVE_UP:
 		case MOVE_DOWN: {
 			struct sway_container *focused =
@@ -839,7 +857,7 @@ struct sway_container *container_split(struct sway_container *child,
 		container_add_child(cont, child);
 	}
 
-	container_notify_child_title_changed(cont);
+	container_notify_subtree_changed(cont);
 
 	return cont;
 }
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 64597c02..812d7740 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -17,6 +17,7 @@
 #include "sway/tree/workspace.h"
 #include "sway/config.h"
 #include "pango.h"
+#include "stringop.h"
 
 void view_init(struct sway_view *view, enum sway_view_type type,
 		const struct sway_view_impl *impl) {
@@ -141,9 +142,18 @@ void view_autoconfigure(struct sway_view *view) {
 
 	struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
 
-	int other_views = 1;
+	int other_views = 0;
 	if (config->hide_edge_borders == E_SMART) {
-		other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
+		struct sway_container *con = view->swayc;
+		while (con != output) {
+			if (con->layout != L_TABBED && con->layout != L_STACKED) {
+				other_views += con->children ? con->children->length - 1 : 0;
+				if (other_views > 0) {
+					break;
+				}
+			}
+			con = con->parent;
+		}
 	}
 
 	view->border_top = view->border_bottom = true;
@@ -173,11 +183,11 @@ void view_autoconfigure(struct sway_view *view) {
 	// area. We have to offset the surface y by the height of the title bar, and
 	// disable any top border because we'll always have the title bar.
 	if (view->swayc->parent->layout == L_TABBED) {
-		y_offset = config->border_thickness * 2 + config->font_height;
+		y_offset = container_titlebar_height();
 		view->border_top = 0;
 	} else if (view->swayc->parent->layout == L_STACKED) {
-		y_offset = config->border_thickness * 2 + config->font_height;
-		y_offset *= view->swayc->parent->children->length;
+		y_offset = container_titlebar_height()
+			* view->swayc->parent->children->length;
 		view->border_top = 0;
 	}
 
@@ -199,7 +209,7 @@ void view_autoconfigure(struct sway_view *view) {
 			- view->border_thickness * view->border_bottom;
 		break;
 	case B_NORMAL:
-		// Height is: border + title height + border + view height + border
+		// Height is: 1px border + 3px pad + title height + 3px pad + 1px border
 		x = view->swayc->x + view->border_thickness * view->border_left;
 		width = view->swayc->width
 			- view->border_thickness * view->border_left
@@ -209,10 +219,9 @@ void view_autoconfigure(struct sway_view *view) {
 			height = view->swayc->height - y_offset
 				- view->border_thickness * view->border_bottom;
 		} else {
-			y = view->swayc->y + config->font_height + view->border_thickness * 2
-				+ y_offset;
-			height = view->swayc->height - config->font_height
-				- view->border_thickness * (2 + view->border_bottom);
+			y = view->swayc->y + container_titlebar_height();
+			height = view->swayc->height - container_titlebar_height()
+				- view->border_thickness * view->border_bottom;
 		}
 		break;
 	}
@@ -430,10 +439,11 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
 	// Check if there's any `assign` criteria for the view
 	list_t *criterias = criteria_for_view(view,
 			CT_ASSIGN_WORKSPACE | CT_ASSIGN_OUTPUT);
+	struct sway_container *workspace = NULL;
 	if (criterias->length) {
 		struct criteria *criteria = criterias->items[0];
 		if (criteria->type == CT_ASSIGN_WORKSPACE) {
-			struct sway_container *workspace = workspace_by_name(criteria->target);
+			workspace = workspace_by_name(criteria->target);
 			if (!workspace) {
 				workspace = workspace_create(NULL, criteria->target);
 			}
@@ -460,9 +470,12 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
 
 	arrange_children_of(cont->parent);
 	input_manager_set_focus(input_manager, cont);
+	if (workspace) {
+		workspace_switch(workspace);
+	}
 
 	view_update_title(view, false);
-	container_notify_child_title_changed(view->swayc->parent);
+	container_notify_subtree_changed(view->swayc->parent);
 	view_execute_criteria(view);
 
 	container_damage_whole(cont);
@@ -653,49 +666,35 @@ static size_t parse_title_format(struct sway_view *view, char *buffer) {
 	char *format = view->title_format;
 	char *next = strchr(format, '%');
 	while (next) {
-		if (buffer) {
-			// Copy everything up to the %
-			strncat(buffer, format, next - format);
-		}
+		// Copy everything up to the %
+		lenient_strncat(buffer, format, next - format);
 		len += next - format;
 		format = next;
 
 		if (strncmp(next, "%title", 6) == 0) {
-			if (buffer && title) {
-				strcat(buffer, title);
-			}
+			lenient_strcat(buffer, title);
 			len += title_len;
 			format += 6;
 		} else if (strncmp(next, "%class", 6) == 0) {
-			if (buffer && class) {
-				strcat(buffer, class);
-			}
+			lenient_strcat(buffer, class);
 			len += class_len;
 			format += 6;
 		} else if (strncmp(next, "%instance", 9) == 0) {
-			if (buffer && instance) {
-				strcat(buffer, instance);
-			}
+			lenient_strcat(buffer, instance);
 			len += instance_len;
 			format += 9;
 		} else if (strncmp(next, "%shell", 6) == 0) {
-			if (buffer) {
-				strcat(buffer, shell);
-			}
+			lenient_strcat(buffer, shell);
 			len += shell_len;
 			format += 6;
 		} else {
-			if (buffer) {
-				strcat(buffer, "%");
-			}
+			lenient_strcat(buffer, "%");
 			++format;
 			++len;
 		}
 		next = strchr(format, '%');
 	}
-	if (buffer) {
-		strcat(buffer, format);
-	}
+	lenient_strcat(buffer, format);
 	len += strlen(format);
 
 	return len;
@@ -751,7 +750,6 @@ void view_update_title(struct sway_view *view, bool force) {
 	}
 	container_calculate_title_height(view->swayc);
 	container_update_title_textures(view->swayc);
-	container_notify_child_title_changed(view->swayc->parent);
 	config_update_font_height(false);
 }