From 8bb40c24c7b045df0d43e9f22c096d1473f6f9f6 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 11 Sep 2018 21:34:21 +1000
Subject: Implement tiling drag

Hold floating_modifier and drag a tiling view to a new location.
---
 sway/tree/container.c | 12 +++++++++---
 sway/tree/view.c      |  2 +-
 sway/tree/workspace.c | 13 +++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 0a69f8d5..ff10c1ab 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -835,8 +835,14 @@ void container_end_mouse_operation(struct sway_container *container) {
 	struct sway_seat *seat;
 	wl_list_for_each(seat, &input_manager->seats, link) {
 		if (seat->op_container == container) {
+			seat->op_target_node = NULL; // ensure tiling move doesn't apply
 			seat_end_mouse_operation(seat);
 		}
+		// If the user is doing a tiling drag over this container,
+		// keep the operation active but unset the target container.
+		if (seat->op_target_node == &container->node) {
+			seat->op_target_node = NULL;
+		}
 	}
 }
 
@@ -1086,13 +1092,13 @@ void container_insert_child(struct sway_container *parent,
 }
 
 void container_add_sibling(struct sway_container *fixed,
-		struct sway_container *active) {
+		struct sway_container *active, int side) {
 	if (active->workspace) {
 		container_detach(active);
 	}
 	list_t *siblings = container_get_siblings(fixed);
 	int index = list_find(siblings, fixed);
-	list_insert(siblings, index + 1, active);
+	list_insert(siblings, index + side, active);
 	active->parent = fixed->parent;
 	active->workspace = fixed->workspace;
 	container_for_each_child(active, set_workspace, NULL);
@@ -1145,7 +1151,7 @@ void container_detach(struct sway_container *child) {
 
 void container_replace(struct sway_container *container,
 		struct sway_container *replacement) {
-	container_add_sibling(container, replacement);
+	container_add_sibling(container, replacement, 1);
 	container_detach(container);
 }
 
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 65ac8b32..d4ffa06b 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -529,7 +529,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
 
 	view->container = container_create(view);
 	if (target_sibling) {
-		container_add_sibling(target_sibling, view->container);
+		container_add_sibling(target_sibling, view->container, 1);
 	} else {
 		workspace_add_tiling(ws, view->container);
 	}
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index b8e90892..d4b57a0f 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -694,3 +694,16 @@ void workspace_get_box(struct sway_workspace *workspace, struct wlr_box *box) {
 	box->width = workspace->width;
 	box->height = workspace->height;
 }
+
+static void count_tiling_views(struct sway_container *con, void *data) {
+	if (con->view && !container_is_floating_or_child(con)) {
+		size_t *count = data;
+		*count += 1;
+	}
+}
+
+size_t workspace_num_tiling_views(struct sway_workspace *ws) {
+	size_t count = 0;
+	workspace_for_each_container(ws, count_tiling_views, &count);
+	return count;
+}
-- 
cgit v1.2.3-54-g00ecf