From 5425d0489fad8c6c00a7794ca18ac34041bd9308 Mon Sep 17 00:00:00 2001
From: wil <william.barsse@gmail.com>
Date: Mon, 19 Dec 2016 21:45:52 +0100
Subject: Handle resize in auto layouts

---
 sway/commands/resize.c | 397 ++++++++++++++++++++++++-------------------------
 1 file changed, 194 insertions(+), 203 deletions(-)

(limited to 'sway/commands/resize.c')

diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index 2c5b3f6b..c850575b 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -62,225 +62,216 @@ static bool resize_floating(int amount, bool use_width) {
 	return false;
 }
 
-static bool resize_tiled(int amount, bool use_width) {
-	swayc_t *parent = get_focused_view(swayc_active_workspace());
-	swayc_t *focused = parent;
-	swayc_t *sibling;
-	if (!parent) {
-		return true;
-	}
-	// Find the closest parent container which has siblings of the proper layout.
-	// Then apply the resize to all of them.
-	int i;
-	if (use_width) {
-		int lnumber = 0;
-		int rnumber = 0;
-		while (parent->parent) {
-			if (parent->parent->layout == L_HORIZ && parent->parent->children) {
-				for (i = 0; i < parent->parent->children->length; i++) {
-					sibling = parent->parent->children->items[i];
-					if (sibling->x != focused->x) {
-						if (sibling->x < parent->x) {
-							lnumber++;
-						} else if (sibling->x > parent->x) {
-							rnumber++;
-						}
-					}
-				}
-				if (rnumber || lnumber) {
-					break;
+/**
+ * returns the index of the container's child that is first in a group.
+ * This index is > to the <after> argument.
+ * This makes the function usable to walk through the groups in a container.
+ */
+static int next_group_index(swayc_t *container, int after) {
+	if (after < 0) {
+		return 0;
+	} else if (is_auto_layout(container->layout)) {
+		if ((uint_fast32_t) after < container->nb_master) {
+			return container->nb_master;
+		} else {
+			uint_fast32_t grp_idx = 0;
+			for (int i = container->nb_master; i < container->children->length; ) {
+				uint_fast32_t grp_sz = (container->children->length - i) /
+					(container->nb_slave_groups - grp_idx);
+				if (after - i < (int) grp_sz) {
+					return i + grp_sz;
 				}
+				i += grp_sz;
 			}
-			parent = parent->parent;
+			return container->children->length;
+		}
+	} else {
+		//		return after + 1;
+		return container->children->length;
+	}
+}
+
+/**
+ * Return the number of children in the slave groups. This corresponds to the children
+ * that are not members of the master group.
+ */
+static inline uint_fast32_t slave_count(swayc_t *container) {
+	return container->children->length - container->nb_master;
+
+}
+
+/**
+ * given the index of a container's child, return the index of the first child of the group
+ * which index is a member of.
+ */
+static int group_start_index(swayc_t *container, int index) {
+	if (index < 0 || ! is_auto_layout(container->layout) || (uint_fast32_t) index < container->nb_master) {
+		return 0;
+	} else {
+		uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
+		uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
+		if ((index - container->nb_master) / grp_sz < container->nb_slave_groups - remainder) {
+			return ((index - container->nb_master) / grp_sz) * grp_sz + container->nb_master;
+		} else {
+			int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
+			return idx2 + ((idx2 - index) / (grp_sz + 1)) * (grp_sz + 1);
 		}
-		if (parent == &root_container) {
-			return true;
+	}
+}
+
+/**
+ * given the index of a container's child, return the index of the first child of the group
+ * that follows the one which index is a member of.
+ */
+static int group_end_index(swayc_t *container, int index) {
+	if (index < 0 || ! is_auto_layout(container->layout)) {
+		return container->children->length;
+	} else {
+		uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
+		uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
+		if ((index - container->nb_master) / grp_sz < container->nb_slave_groups - remainder) {
+			return ((index - container->nb_master) / grp_sz + 1) * grp_sz + container->nb_master;
+		} else {
+			int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
+			return idx2 + ((idx2 - index) / (grp_sz + 1) + 1) * (grp_sz + 1);
 		}
-		sway_log(L_DEBUG, "Found the proper parent: %p. It has %d l conts, and %d r conts", parent->parent, lnumber, rnumber);
-		//TODO: Ensure rounding is done in such a way that there are NO pixel leaks
-		bool valid = true;
-		for (i = 0; i < parent->parent->children->length; i++) {
-			sibling = parent->parent->children->items[i];
-			if (sibling->x != focused->x) {
-				if (sibling->x < parent->x) {
-					double pixels = -1 * amount;
-					pixels /= lnumber;
-					if (rnumber) {
-						if ((sibling->width + pixels/2) < min_sane_w) {
-							valid = false;
-							break;
-						}
-					} else {
-						if ((sibling->width + pixels) < min_sane_w) {
-							valid = false;
-							break;
-						}
-					}
-				} else if (sibling->x > parent->x) {
-					double pixels = -1 * amount;
-					pixels /= rnumber;
-					if (lnumber) {
-						if ((sibling->width + pixels/2) < min_sane_w) {
-							valid = false;
-							break;
-						}
-					} else {
-						if ((sibling->width + pixels) < min_sane_w) {
-							valid = false;
-							break;
-						}
-					}
-				}
-			} else {
-				double pixels = amount;
-				if (parent->width + pixels < min_sane_w) {
-					valid = false;
-					break;
-				}
+	}
+}
+
+/**
+ * Return the combined number of master and slave groups in the container.
+ */
+static inline uint_fast32_t group_count(swayc_t *container) {
+	return MIN(container->nb_slave_groups, slave_count(container)) + (container->nb_master ? 1 : 0);
+}
+
+/**
+ * return the index of the Group containing <index>th child of <container>.
+ * The index is the order of the group along the container's major axis (starting at 0).
+ */
+static uint_fast32_t group_index(swayc_t *container, int index) {
+	bool master_first = (container->layout == L_AUTO_LEFT || container->layout == L_AUTO_TOP);
+	int nb_slaves = slave_count(container);
+	if (index < (int) container->nb_master) {
+		if (master_first || nb_slaves <= 0) {
+			return 0;
+		} else {
+			return MIN(container->nb_slave_groups, nb_slaves);
+		}
+	} else {
+		uint_fast32_t grp_idx = 0;
+		for (int i = container->nb_master; i < container->children->length; ) {
+			uint_fast32_t grp_sz = (container->children->length - i) /
+				(container->nb_slave_groups - grp_idx);
+			if (index - i < (int) grp_sz) {
+				break;
 			}
 		}
-		if (valid) {
-			for (i = 0; i < parent->parent->children->length; i++) {
-				sibling = parent->parent->children->items[i];
-				if (sibling->x != focused->x) {
-					if (sibling->x < parent->x) {
-						double pixels = -1 * amount;
-						pixels /= lnumber;
-						if (rnumber) {
-							recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_RIGHT);
-						} else {
-							recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_RIGHT);
-						}
-					} else if (sibling->x > parent->x) {
-						double pixels = -1 * amount;
-						pixels /= rnumber;
-						if (lnumber) {
-							recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_LEFT);
-						} else {
-							recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_LEFT);
-						}
-					}
-				} else {
-					if (rnumber != 0 && lnumber != 0) {
-						double pixels = amount;
-						pixels /= 2;
-						recursive_resize(parent, pixels, WLC_RESIZE_EDGE_LEFT);
-						recursive_resize(parent, pixels, WLC_RESIZE_EDGE_RIGHT);
-					} else if (rnumber) {
-						recursive_resize(parent, amount, WLC_RESIZE_EDGE_RIGHT);
-					} else if (lnumber) {
-						recursive_resize(parent, amount, WLC_RESIZE_EDGE_LEFT);
-					}
-				}
+		return grp_idx + (master_first ? 1 : 0);
+	}
+}
+
+static bool resize_tiled(int amount, bool use_width) {
+	swayc_t *container = get_focused_view(swayc_active_workspace());
+	swayc_t *parent = container->parent;
+	int idx_focused = 0;
+	bool use_major = false;
+	uint_fast32_t nb_before = 0;
+	uint_fast32_t nb_after = 0;
+
+	// 1. Identify a container ancestor that will allow the focused child to grow in the requested
+	//    direction.
+	while (container->parent) {
+		parent = container->parent;
+		if ((parent->children && parent->children->length > 1) &&
+		    (is_auto_layout(parent->layout) || (use_width ? parent->layout == L_HORIZ :
+							parent->layout == L_VERT))) {
+			// check if container has siblings that can provide/absorb the space needed for
+			// the resize operation.
+			use_major = use_width
+				? parent->layout == L_AUTO_LEFT || parent->layout == L_AUTO_RIGHT
+				: parent->layout == L_AUTO_TOP || parent->layout == L_AUTO_BOTTOM;
+			// Note: use_major will be false for L_HORIZ and L_VERT
+
+			idx_focused = index_child(container);
+			if (idx_focused < 0) {
+				sway_log(L_ERROR, "Something weird is happening, child container not "
+					 "present in its parent's children list.");
+				continue;
+			}
+			if (use_major) {
+				nb_before = group_index(parent, idx_focused);
+				nb_after = group_count(parent) - nb_before - 1;
+			} else {
+				nb_before = idx_focused - group_start_index(parent, idx_focused);
+				nb_after = next_group_index(parent, idx_focused) - idx_focused - 1;
+			}
+			if (nb_before || nb_after) {
+				break;
 			}
-			// Recursive resize does not handle positions, let arrange_windows
-			// take care of that.
-			arrange_windows(swayc_active_workspace(), -1, -1);
 		}
+		container = parent; /* continue up the tree to the next ancestor */
+	}
+	if (parent == &root_container) {
 		return true;
-	} else {
-		int tnumber = 0;
-		int bnumber = 0;
-		while (parent->parent) {
-			if (parent->parent->layout == L_VERT) {
-				for (i = 0; i < parent->parent->children->length; i++) {
-					sibling = parent->parent->children->items[i];
-					if (sibling->y != focused->y) {
-						if (sibling->y < parent->y) {
-							bnumber++;
-						} else if (sibling->y > parent->y) {
-							tnumber++;
-						}
-					}
-				}
-				if (bnumber || tnumber) {
-					break;
-				}
+	}
+	sway_log(L_DEBUG, "Found the proper parent: %p. It has %" PRIuFAST32 " before conts, and %"
+		 PRIuFAST32 " after conts", parent, nb_before, nb_after);
+	// 2. Ensure that the resize operation will not make one of the resized containers drop
+	//    below the "sane" size threshold.
+	bool valid = true;
+	swayc_t *focused = parent->children->items[idx_focused];
+	int start = use_major ? 0 : group_start_index(parent, idx_focused);
+	int end = use_major ? parent->children->length : group_end_index(parent, idx_focused);
+	for (int i = start; i < end; ) {
+		swayc_t *sibling = parent->children->items[i];
+		double pixels = amount;
+		bool is_before = use_width ? sibling->x < focused->x : sibling->y < focused->y;
+		bool is_after  = use_width ? sibling->x > focused->x : sibling->y > focused->y;
+		if (is_before || is_after) {
+			pixels = -pixels;
+			pixels /= is_before ? nb_before : nb_after;
+			if (nb_after != 0 && nb_before != 0) {
+				pixels /= 2;
 			}
-			parent = parent->parent;
 		}
-		if (parent->parent == NULL || parent->parent->children == NULL) {
-			return true;
+		if (use_width ?
+		    sibling->width + pixels < min_sane_w :
+		    sibling->height + pixels < min_sane_h) {
+			valid = false;
+			break;
 		}
-		sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber);
-		//TODO: Ensure rounding is done in such a way that there are NO pixel leaks
-		bool valid = true;
-		for (i = 0; i < parent->parent->children->length; i++) {
-			sibling = parent->parent->children->items[i];
-			if (sibling->y != focused->y) {
-				if (sibling->y < parent->y) {
-					double pixels = -1 * amount;
-					pixels /= bnumber;
-					if (tnumber) {
-						if ((sibling->height + pixels/2) < min_sane_h) {
-							valid = false;
-							break;
-						}
-					} else {
-						if ((sibling->height + pixels) < min_sane_h) {
-							valid = false;
-							break;
-						}
-					}
-				} else if (sibling->y > parent->y) {
-					double pixels = -1 * amount;
-					pixels /= tnumber;
-					if (bnumber) {
-						if ((sibling->height + pixels/2) < min_sane_h) {
-							valid = false;
-							break;
-						}
-					} else {
-						if ((sibling->height + pixels) < min_sane_h) {
-							valid = false;
-							break;
-						}
-					}
+		i = use_major ? next_group_index(parent, i) : (i + 1);
+	}
+	// 3. Apply the size change
+	if (valid) {
+		for (int i = 0; i < parent->children->length; ++i) {
+			swayc_t *sibling = parent->children->items[i];
+			double pixels = amount;
+			bool is_before = use_width ? sibling->x < focused->x : sibling->y < focused->y;
+			bool is_after  = use_width ? sibling->x > focused->x : sibling->y > focused->y;
+			if (is_before || is_after) {
+				pixels = -pixels;
+				pixels /= is_before ? nb_before : nb_after;
+				if (nb_after != 0 && nb_before != 0) {
+					pixels /= 2;
 				}
+				sway_log(L_DEBUG, "%p: %s", sibling, is_before ? "before" : "after");
+				recursive_resize(sibling, pixels,
+						 use_width ?
+						 (is_before ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_LEFT) :
+						 (is_before ? WLC_RESIZE_EDGE_BOTTOM : WLC_RESIZE_EDGE_TOP));
 			} else {
-				double pixels = amount;
-				if (parent->height + pixels < min_sane_h) {
-					valid = false;
-					break;
-				}
-			}
-		}
-		if (valid) {
-			for (i = 0; i < parent->parent->children->length; i++) {
-				sibling = parent->parent->children->items[i];
-				if (sibling->y != focused->y) {
-					if (sibling->y < parent->y) {
-						double pixels = -1 * amount;
-						pixels /= bnumber;
-						if (tnumber) {
-							recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_BOTTOM);
-						} else {
-							recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_BOTTOM);
-						}
-					} else if (sibling->x > parent->x) {
-						double pixels = -1 * amount;
-						pixels /= tnumber;
-						if (bnumber) {
-							recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_TOP);
-						} else {
-							recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_TOP);
-						}
-					}
-				} else {
-					if (bnumber != 0 && tnumber != 0) {
-						double pixels = amount/2;
-						recursive_resize(parent, pixels, WLC_RESIZE_EDGE_TOP);
-						recursive_resize(parent, pixels, WLC_RESIZE_EDGE_BOTTOM);
-					} else if (tnumber) {
-						recursive_resize(parent, amount, WLC_RESIZE_EDGE_TOP);
-					} else if (bnumber) {
-						recursive_resize(parent, amount, WLC_RESIZE_EDGE_BOTTOM);
-					}
-				}
+				sway_log(L_DEBUG, "%p: same pos", sibling);
+				recursive_resize(sibling, pixels,
+						 use_width ? WLC_RESIZE_EDGE_LEFT : WLC_RESIZE_EDGE_TOP);
+				recursive_resize(sibling, pixels,
+						 use_width ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_BOTTOM);
 			}
-			arrange_windows(swayc_active_workspace(), -1, -1);
 		}
-		return true;
+		// Recursive resize does not handle positions, let arrange_windows
+		// take care of that.
+		arrange_windows(swayc_active_workspace(), -1, -1);
 	}
 	return true;
 }
-- 
cgit v1.2.3


From bc3dc970265dab6e0305975791b5a266bbc390ca Mon Sep 17 00:00:00 2001
From: wil <william.barsse@gmail.com>
Date: Wed, 21 Dec 2016 16:59:50 +0100
Subject: [fix] Handle auto layout resize with multiple slave groups

---
 sway/commands/resize.c | 132 +++++++++++++++++++++++++++----------------------
 1 file changed, 73 insertions(+), 59 deletions(-)

(limited to 'sway/commands/resize.c')

diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index c850575b..9a756e81 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -62,35 +62,6 @@ static bool resize_floating(int amount, bool use_width) {
 	return false;
 }
 
-/**
- * returns the index of the container's child that is first in a group.
- * This index is > to the <after> argument.
- * This makes the function usable to walk through the groups in a container.
- */
-static int next_group_index(swayc_t *container, int after) {
-	if (after < 0) {
-		return 0;
-	} else if (is_auto_layout(container->layout)) {
-		if ((uint_fast32_t) after < container->nb_master) {
-			return container->nb_master;
-		} else {
-			uint_fast32_t grp_idx = 0;
-			for (int i = container->nb_master; i < container->children->length; ) {
-				uint_fast32_t grp_sz = (container->children->length - i) /
-					(container->nb_slave_groups - grp_idx);
-				if (after - i < (int) grp_sz) {
-					return i + grp_sz;
-				}
-				i += grp_sz;
-			}
-			return container->children->length;
-		}
-	} else {
-		//		return after + 1;
-		return container->children->length;
-	}
-}
-
 /**
  * Return the number of children in the slave groups. This corresponds to the children
  * that are not members of the master group.
@@ -105,36 +76,46 @@ static inline uint_fast32_t slave_count(swayc_t *container) {
  * which index is a member of.
  */
 static int group_start_index(swayc_t *container, int index) {
-	if (index < 0 || ! is_auto_layout(container->layout) || (uint_fast32_t) index < container->nb_master) {
+	if ((index < 0) || (! is_auto_layout(container->layout)) ||
+	    ((uint_fast32_t) index < container->nb_master)) {
 		return 0;
 	} else {
 		uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
 		uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
-		if ((index - container->nb_master) / grp_sz < container->nb_slave_groups - remainder) {
-			return ((index - container->nb_master) / grp_sz) * grp_sz + container->nb_master;
+		int start_idx;
+		int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
+		if (index < idx2) {
+			start_idx = ((index - container->nb_master) / grp_sz) * grp_sz + container->nb_master;
 		} else {
-			int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
-			return idx2 + ((idx2 - index) / (grp_sz + 1)) * (grp_sz + 1);
+			start_idx = idx2 + ((index - idx2) / (grp_sz + 1)) * (grp_sz + 1);
 		}
+		return MIN(start_idx, container->children->length);
 	}
 }
 
 /**
  * given the index of a container's child, return the index of the first child of the group
  * that follows the one which index is a member of.
+ * This makes the function usable to walk through the groups in a container.
  */
 static int group_end_index(swayc_t *container, int index) {
 	if (index < 0 || ! is_auto_layout(container->layout)) {
 		return container->children->length;
 	} else {
-		uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
-		uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
-		if ((index - container->nb_master) / grp_sz < container->nb_slave_groups - remainder) {
-			return ((index - container->nb_master) / grp_sz + 1) * grp_sz + container->nb_master;
+		int nxt_idx;
+		if ((uint_fast32_t)index < container->nb_master) {
+			nxt_idx = container->nb_master;
 		} else {
+			uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
+			uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
 			int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
-			return idx2 + ((idx2 - index) / (grp_sz + 1) + 1) * (grp_sz + 1);
+			if (index < idx2) {
+				nxt_idx = ((index - container->nb_master) / grp_sz + 1) * grp_sz + container->nb_master;
+			} else {
+				nxt_idx = idx2 + ((index - idx2) / (grp_sz + 1) + 1) * (grp_sz + 1);
+			}
 		}
+		return MIN(nxt_idx, container->children->length);
 	}
 }
 
@@ -150,22 +131,26 @@ static inline uint_fast32_t group_count(swayc_t *container) {
  * The index is the order of the group along the container's major axis (starting at 0).
  */
 static uint_fast32_t group_index(swayc_t *container, int index) {
+	if (index < 0) {
+		return 0;
+	}
 	bool master_first = (container->layout == L_AUTO_LEFT || container->layout == L_AUTO_TOP);
 	int nb_slaves = slave_count(container);
-	if (index < (int) container->nb_master) {
+	if ((uint_fast32_t) index < container->nb_master) {
 		if (master_first || nb_slaves <= 0) {
 			return 0;
 		} else {
 			return MIN(container->nb_slave_groups, nb_slaves);
 		}
 	} else {
-		uint_fast32_t grp_idx = 0;
-		for (int i = container->nb_master; i < container->children->length; ) {
-			uint_fast32_t grp_sz = (container->children->length - i) /
-				(container->nb_slave_groups - grp_idx);
-			if (index - i < (int) grp_sz) {
-				break;
-			}
+		uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
+		uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
+		uint_fast32_t grp_idx;
+		int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
+		if (index < idx2) {
+			grp_idx = (index - container->nb_master) / grp_sz;
+		} else {
+			grp_idx = (container->nb_slave_groups - remainder) + (index - idx2) / (grp_sz + 1) ;
 		}
 		return grp_idx + (master_first ? 1 : 0);
 	}
@@ -204,7 +189,13 @@ static bool resize_tiled(int amount, bool use_width) {
 				nb_after = group_count(parent) - nb_before - 1;
 			} else {
 				nb_before = idx_focused - group_start_index(parent, idx_focused);
-				nb_after = next_group_index(parent, idx_focused) - idx_focused - 1;
+				nb_after = group_end_index(parent, idx_focused) - idx_focused - 1;
+				sway_log(L_DEBUG, "+++ focused: %d, start: %d, end: %d, before: %d, after: %d",
+					 idx_focused,
+					 (int)group_start_index(parent, idx_focused),
+					 (int)group_end_index(parent, idx_focused),
+					 (int)nb_before, (int)nb_after);
+
 			}
 			if (nb_before || nb_after) {
 				break;
@@ -223,6 +214,7 @@ static bool resize_tiled(int amount, bool use_width) {
 	swayc_t *focused = parent->children->items[idx_focused];
 	int start = use_major ? 0 : group_start_index(parent, idx_focused);
 	int end = use_major ? parent->children->length : group_end_index(parent, idx_focused);
+	sway_log(L_DEBUG, "Check children of container %p [%d,%d[", container, start, end);
 	for (int i = start; i < end; ) {
 		swayc_t *sibling = parent->children->items[i];
 		double pixels = amount;
@@ -235,17 +227,21 @@ static bool resize_tiled(int amount, bool use_width) {
 				pixels /= 2;
 			}
 		}
+		sway_log(L_DEBUG, "Check container %p: width %g vs %d, height %g vs %d", sibling, sibling->width + pixels, min_sane_w, sibling->height + pixels, min_sane_h);
 		if (use_width ?
 		    sibling->width + pixels < min_sane_w :
 		    sibling->height + pixels < min_sane_h) {
 			valid = false;
+			sway_log(L_DEBUG, "Container size no longer sane");
 			break;
 		}
-		i = use_major ? next_group_index(parent, i) : (i + 1);
+		i = use_major ? group_end_index(parent, i) : (i + 1);
+		sway_log(L_DEBUG, "+++++ check %i", i);
 	}
 	// 3. Apply the size change
 	if (valid) {
-		for (int i = 0; i < parent->children->length; ++i) {
+		for (int i = start; i < end; ) {
+			int next_i = use_major ? group_end_index(parent, i) : (i + 1);
 			swayc_t *sibling = parent->children->items[i];
 			double pixels = amount;
 			bool is_before = use_width ? sibling->x < focused->x : sibling->y < focused->y;
@@ -257,17 +253,35 @@ static bool resize_tiled(int amount, bool use_width) {
 					pixels /= 2;
 				}
 				sway_log(L_DEBUG, "%p: %s", sibling, is_before ? "before" : "after");
-				recursive_resize(sibling, pixels,
-						 use_width ?
-						 (is_before ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_LEFT) :
-						 (is_before ? WLC_RESIZE_EDGE_BOTTOM : WLC_RESIZE_EDGE_TOP));
+				if (use_major) {
+					for (int j = i; j < next_i; ++j) {
+						recursive_resize(parent->children->items[j], pixels,
+								 use_width ?
+								 (is_before ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_LEFT) :
+								 (is_before ? WLC_RESIZE_EDGE_BOTTOM : WLC_RESIZE_EDGE_TOP));
+					}
+				} else {
+					recursive_resize(sibling, pixels,
+							use_width ?
+							(is_before ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_LEFT) :
+							(is_before ? WLC_RESIZE_EDGE_BOTTOM : WLC_RESIZE_EDGE_TOP));
+				}
 			} else {
-				sway_log(L_DEBUG, "%p: same pos", sibling);
-				recursive_resize(sibling, pixels,
-						 use_width ? WLC_RESIZE_EDGE_LEFT : WLC_RESIZE_EDGE_TOP);
-				recursive_resize(sibling, pixels,
-						 use_width ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_BOTTOM);
+				if (use_major) {
+					for (int j = i; j < next_i; ++j) {
+						recursive_resize(parent->children->items[j], pixels,
+								 use_width ? WLC_RESIZE_EDGE_LEFT : WLC_RESIZE_EDGE_TOP);
+						recursive_resize(parent->children->items[j], pixels,
+								 use_width ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_BOTTOM);
+					}
+				} else {
+					recursive_resize(sibling, pixels,
+							 use_width ? WLC_RESIZE_EDGE_LEFT : WLC_RESIZE_EDGE_TOP);
+					recursive_resize(sibling, pixels,
+							 use_width ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_BOTTOM);
+				}
 			}
+			i = next_i;
 		}
 		// Recursive resize does not handle positions, let arrange_windows
 		// take care of that.
-- 
cgit v1.2.3


From 97f70987d70315c683fd1e16c731b396679f6b96 Mon Sep 17 00:00:00 2001
From: wil <william.barsse@gmail.com>
Date: Sun, 1 Jan 2017 21:52:49 +0100
Subject: [fix] cleanups suggested by Sway community

---
 README.md                |  5 ----
 include/sway/container.h |  4 +--
 include/sway/layout.h    |  4 +--
 sway/commands/layout.c   | 22 ++++++++++++---
 sway/commands/resize.c   | 70 ++++++++++++++++++++++++------------------------
 sway/layout.c            | 44 +++++++++++++++---------------
 6 files changed, 79 insertions(+), 70 deletions(-)

(limited to 'sway/commands/resize.c')

diff --git a/README.md b/README.md
index 6e714cb9..6b038045 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-
 # sway [![](https://api.travis-ci.org/SirCmpwn/sway.svg)](https://travis-ci.org/SirCmpwn/sway) [![Donate with fosspay](https://drewdevault.com/donate/static/donate-with-fosspay.png)](https://drewdevault.com/donate?project=4)
 
 "**S**irCmpwn's **Way**land compositor" is a **work in progress**
@@ -11,10 +10,6 @@ irc.freenode.net).
 
 [More screenshots](https://github.com/SirCmpwn/sway/wiki/Screenshots-of-Sway)
 
-This fork attempts to add
-[Awesome](http://awesomewm.org)/[Monad](http://xmonad.org) style auto layouts
-to Sway. For us lazies that just want things to happen automatically!
-
 ## Release Signatures
 
 Releases are signed with [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
diff --git a/include/sway/container.h b/include/sway/container.h
index f0574b1b..ff65628c 100644
--- a/include/sway/container.h
+++ b/include/sway/container.h
@@ -158,12 +158,12 @@ struct sway_container {
 	/**
 	 * Number of master views in auto layouts.
 	 */
-	uint32_t nb_master;
+	size_t nb_master;
 
 	/**
 	 * Number of slave groups (e.g. columns) in auto layouts.
 	 */
-	uint32_t nb_slave_groups;
+	size_t nb_slave_groups;
 };
 
 enum visibility_mask {
diff --git a/include/sway/layout.h b/include/sway/layout.h
index a771a72e..8cc513d8 100644
--- a/include/sway/layout.h
+++ b/include/sway/layout.h
@@ -75,7 +75,5 @@ void swayc_log(log_importance_t verbosity, swayc_t *cont, const char* format, ..
  */
 enum swayc_layouts default_layout(swayc_t *output);
 
-inline bool is_auto_layout(enum swayc_layouts layout) {
-	return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST);
-}
+bool is_auto_layout(enum swayc_layouts layout);
 #endif
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 2da65765..0cdac1b4 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -64,11 +64,18 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
 		} else if (strcasecmp(argv[0], "auto_bot") == 0) {
 			swayc_change_layout(parent, L_AUTO_BOTTOM);
 		} else if (strcasecmp(argv[0], "incnmaster") == 0)  {
-			if ((error = checkarg(argc, "layout incnmaster",
+			const char *name = "layout incnmaster";
+			if ((error = checkarg(argc, name,
 					      EXPECTED_EQUAL_TO, 2))) {
 				return error;
 			}
-			int inc = (int) strtol(argv[1], NULL, 10);
+			char *end;
+			int inc = (int) strtol(argv[1], &end, 10);
+			if (*end) {
+				return cmd_results_new(CMD_INVALID, name, "Invalid %s command "
+						       "(argument must be an integer)", name);
+
+			}
 			swayc_t *container = get_focused_view(swayc_active_workspace());
 			if (container && inc &&
 			    is_auto_layout(container->parent->layout) &&
@@ -83,11 +90,18 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
 				container->parent->nb_master += inc;
 			}
 		} else if ((strcasecmp(argv[0], "incncol") == 0) && argc ==2) {
-			if ((error = checkarg(argc, "layout incncol",
+			const char *name = "layout incncol";
+			if ((error = checkarg(argc, name,
 					      EXPECTED_EQUAL_TO, 2))) {
 				return error;
 			}
-			int inc = (int) strtol(argv[1], NULL, 10);
+			char *end;
+			int inc = (int) strtol(argv[1], &end, 10);
+			if (*end) {
+				return cmd_results_new(CMD_INVALID, name, "Invalid %s command "
+						       "(argument must be an integer)", name);
+
+			}
 			swayc_t *container = get_focused_view(swayc_active_workspace());
 			if (container && inc && is_auto_layout(container->parent->layout) &&
 			    ((int)container->parent->nb_slave_groups + inc >= 1)) {
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index 9a756e81..1c052286 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -66,7 +66,7 @@ static bool resize_floating(int amount, bool use_width) {
  * Return the number of children in the slave groups. This corresponds to the children
  * that are not members of the master group.
  */
-static inline uint_fast32_t slave_count(swayc_t *container) {
+static inline size_t auto_slave_count(swayc_t *container) {
 	return container->children->length - container->nb_master;
 
 }
@@ -75,13 +75,13 @@ static inline uint_fast32_t slave_count(swayc_t *container) {
  * given the index of a container's child, return the index of the first child of the group
  * which index is a member of.
  */
-static int group_start_index(swayc_t *container, int index) {
-	if ((index < 0) || (! is_auto_layout(container->layout)) ||
-	    ((uint_fast32_t) index < container->nb_master)) {
+static int auto_group_start_index(swayc_t *container, int index) {
+	if (index < 0 || ! is_auto_layout(container->layout)
+		|| (size_t) index < container->nb_master) {
 		return 0;
 	} else {
-		uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
-		uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
+		size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
+		size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
 		int start_idx;
 		int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
 		if (index < idx2) {
@@ -98,16 +98,16 @@ static int group_start_index(swayc_t *container, int index) {
  * that follows the one which index is a member of.
  * This makes the function usable to walk through the groups in a container.
  */
-static int group_end_index(swayc_t *container, int index) {
+static int auto_group_end_index(swayc_t *container, int index) {
 	if (index < 0 || ! is_auto_layout(container->layout)) {
 		return container->children->length;
 	} else {
 		int nxt_idx;
-		if ((uint_fast32_t)index < container->nb_master) {
+		if ((size_t)index < container->nb_master) {
 			nxt_idx = container->nb_master;
 		} else {
-			uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
-			uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
+			size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
+			size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
 			int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
 			if (index < idx2) {
 				nxt_idx = ((index - container->nb_master) / grp_sz + 1) * grp_sz + container->nb_master;
@@ -122,30 +122,30 @@ static int group_end_index(swayc_t *container, int index) {
 /**
  * Return the combined number of master and slave groups in the container.
  */
-static inline uint_fast32_t group_count(swayc_t *container) {
-	return MIN(container->nb_slave_groups, slave_count(container)) + (container->nb_master ? 1 : 0);
+static inline size_t auto_group_count(swayc_t *container) {
+	return MIN(container->nb_slave_groups, auto_slave_count(container)) + (container->nb_master ? 1 : 0);
 }
 
 /**
  * return the index of the Group containing <index>th child of <container>.
  * The index is the order of the group along the container's major axis (starting at 0).
  */
-static uint_fast32_t group_index(swayc_t *container, int index) {
+static size_t auto_group_index(swayc_t *container, int index) {
 	if (index < 0) {
 		return 0;
 	}
 	bool master_first = (container->layout == L_AUTO_LEFT || container->layout == L_AUTO_TOP);
-	int nb_slaves = slave_count(container);
-	if ((uint_fast32_t) index < container->nb_master) {
+	int nb_slaves = auto_slave_count(container);
+	if ((size_t) index < container->nb_master) {
 		if (master_first || nb_slaves <= 0) {
 			return 0;
 		} else {
 			return MIN(container->nb_slave_groups, nb_slaves);
 		}
 	} else {
-		uint_fast32_t grp_sz = slave_count(container) / container->nb_slave_groups;
-		uint_fast32_t remainder = slave_count(container) % container->nb_slave_groups;
-		uint_fast32_t grp_idx;
+		size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
+		size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
+		size_t grp_idx;
 		int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
 		if (index < idx2) {
 			grp_idx = (index - container->nb_master) / grp_sz;
@@ -161,16 +161,16 @@ static bool resize_tiled(int amount, bool use_width) {
 	swayc_t *parent = container->parent;
 	int idx_focused = 0;
 	bool use_major = false;
-	uint_fast32_t nb_before = 0;
-	uint_fast32_t nb_after = 0;
+	size_t nb_before = 0;
+	size_t nb_after = 0;
 
 	// 1. Identify a container ancestor that will allow the focused child to grow in the requested
 	//    direction.
 	while (container->parent) {
 		parent = container->parent;
-		if ((parent->children && parent->children->length > 1) &&
-		    (is_auto_layout(parent->layout) || (use_width ? parent->layout == L_HORIZ :
-							parent->layout == L_VERT))) {
+		if ((parent->children && parent->children->length > 1)
+			&& (is_auto_layout(parent->layout)
+				|| (use_width ? parent->layout == L_HORIZ : parent->layout == L_VERT))) {
 			// check if container has siblings that can provide/absorb the space needed for
 			// the resize operation.
 			use_major = use_width
@@ -185,15 +185,15 @@ static bool resize_tiled(int amount, bool use_width) {
 				continue;
 			}
 			if (use_major) {
-				nb_before = group_index(parent, idx_focused);
-				nb_after = group_count(parent) - nb_before - 1;
+				nb_before = auto_group_index(parent, idx_focused);
+				nb_after = auto_group_count(parent) - nb_before - 1;
 			} else {
-				nb_before = idx_focused - group_start_index(parent, idx_focused);
-				nb_after = group_end_index(parent, idx_focused) - idx_focused - 1;
+				nb_before = idx_focused - auto_group_start_index(parent, idx_focused);
+				nb_after = auto_group_end_index(parent, idx_focused) - idx_focused - 1;
 				sway_log(L_DEBUG, "+++ focused: %d, start: %d, end: %d, before: %d, after: %d",
 					 idx_focused,
-					 (int)group_start_index(parent, idx_focused),
-					 (int)group_end_index(parent, idx_focused),
+					 (int)auto_group_start_index(parent, idx_focused),
+					 (int)auto_group_end_index(parent, idx_focused),
 					 (int)nb_before, (int)nb_after);
 
 			}
@@ -206,14 +206,14 @@ static bool resize_tiled(int amount, bool use_width) {
 	if (parent == &root_container) {
 		return true;
 	}
-	sway_log(L_DEBUG, "Found the proper parent: %p. It has %" PRIuFAST32 " before conts, and %"
-		 PRIuFAST32 " after conts", parent, nb_before, nb_after);
+	sway_log(L_DEBUG, "Found the proper parent: %p. It has %zu before conts, "
+		 "and %zu after conts", parent, nb_before, nb_after);
 	// 2. Ensure that the resize operation will not make one of the resized containers drop
 	//    below the "sane" size threshold.
 	bool valid = true;
 	swayc_t *focused = parent->children->items[idx_focused];
-	int start = use_major ? 0 : group_start_index(parent, idx_focused);
-	int end = use_major ? parent->children->length : group_end_index(parent, idx_focused);
+	int start = use_major ? 0 : auto_group_start_index(parent, idx_focused);
+	int end = use_major ? parent->children->length : auto_group_end_index(parent, idx_focused);
 	sway_log(L_DEBUG, "Check children of container %p [%d,%d[", container, start, end);
 	for (int i = start; i < end; ) {
 		swayc_t *sibling = parent->children->items[i];
@@ -235,13 +235,13 @@ static bool resize_tiled(int amount, bool use_width) {
 			sway_log(L_DEBUG, "Container size no longer sane");
 			break;
 		}
-		i = use_major ? group_end_index(parent, i) : (i + 1);
+		i = use_major ? auto_group_end_index(parent, i) : (i + 1);
 		sway_log(L_DEBUG, "+++++ check %i", i);
 	}
 	// 3. Apply the size change
 	if (valid) {
 		for (int i = start; i < end; ) {
-			int next_i = use_major ? group_end_index(parent, i) : (i + 1);
+			int next_i = use_major ? auto_group_end_index(parent, i) : (i + 1);
 			swayc_t *sibling = parent->children->items[i];
 			double pixels = amount;
 			bool is_before = use_width ? sibling->x < focused->x : sibling->y < focused->y;
diff --git a/sway/layout.c b/sway/layout.c
index 6212ec75..faab9196 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -253,8 +253,7 @@ void swap_geometry(swayc_t *a, swayc_t *b) {
 void move_container(swayc_t *container, enum movement_direction dir) {
 	enum swayc_layouts layout = L_NONE;
 	swayc_t *parent = container->parent;
-	if (container->is_floating
-			|| (container->type != C_VIEW && container->type != C_CONTAINER)) {
+	if (container->is_floating || (container->type != C_VIEW && container->type != C_CONTAINER)) {
 		return;
 	}
 	if (dir == MOVE_UP || dir == MOVE_DOWN) {
@@ -323,14 +322,14 @@ void move_container(swayc_t *container, enum movement_direction dir) {
 				// if move command makes container change from master to slave
 				// (or the contrary), reset its geometry an the one of the replaced item.
 				if (parent->nb_master &&
-				    (uint_fast32_t) parent->children->length > parent->nb_master) {
+				    (size_t) parent->children->length > parent->nb_master) {
 					swayc_t *swap_geom = NULL;
 					// if child is being promoted/demoted, it will swap geometry
 					// with the sibling being demoted/promoted.
 					if ((dir == MOVE_NEXT && desired == 0)
-					    || (dir == MOVE_PREV && (uint_fast32_t) desired == parent->nb_master - 1)) {
+					    || (dir == MOVE_PREV && (size_t) desired == parent->nb_master - 1)) {
 						swap_geom = parent->children->items[parent->nb_master - 1];
-					} else if ((dir == MOVE_NEXT && (uint_fast32_t) desired == parent->nb_master)
+					} else if ((dir == MOVE_NEXT && (size_t) desired == parent->nb_master)
 						   || (dir == MOVE_PREV && desired == parent->children->length - 1)) {
 						swap_geom = parent->children->items[parent->nb_master];
 					}
@@ -822,20 +821,24 @@ void update_geometry(swayc_t *container) {
 	}
 }
 
+bool is_auto_layout(enum swayc_layouts layout) {
+	return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST);
+}
+
 /**
  * Layout application prototypes
  */
 static void apply_horiz_layout(swayc_t *container, const double x,
-			       const double y, const double width,
-			       const double height, const int start,
-			       const int end);
+				const double y, const double width,
+				const double height, const int start,
+				const int end);
 static void apply_vert_layout(swayc_t *container, const double x,
-			      const double y, const double width,
-			      const double height, const int start,
-			      const int end);
+				const double y, const double width,
+				const double height, const int start,
+				const int end);
 static void apply_tabbed_or_stacked_layout(swayc_t *container, double x,
-					   double y, double width,
-					   double height);
+				double y, double width,
+				double height);
 
 static void apply_auto_layout(swayc_t *container, const double x, const double y,
 			      const double width, const double height,
@@ -1164,8 +1167,8 @@ void apply_auto_layout(swayc_t *container, const double x, const double y,
 	//  a single slave group (containing slave 1 and 2). The master
 	//  group and slave group are layed out using L_VERT.
 
-	uint_fast32_t nb_slaves = container->children->length - container->nb_master;
-	uint_fast32_t nb_groups = (container->nb_master > 0 ? 1 : 0) +
+	size_t nb_slaves = container->children->length - container->nb_master;
+	size_t nb_groups = (container->nb_master > 0 ? 1 : 0) +
 		MIN(container->nb_slave_groups, nb_slaves);
 
 	// the target dimension of the container along the "major" axis, each
@@ -1186,9 +1189,9 @@ void apply_auto_layout(swayc_t *container, const double x, const double y,
 	// height and width of next group to be laid out.
 	const double *group_h, *group_w;
 
-	switch(group_layout) {
+	switch (group_layout) {
 	default:
-		sway_log(L_ERROR, "Unknown layout type (%d) used in %s()",
+		sway_log(L_DEBUG, "Unknown layout type (%d) used in %s()",
 			 group_layout, __func__);
 		/* fall through */
 	case L_VERT:
@@ -1216,7 +1219,7 @@ void apply_auto_layout(swayc_t *container, const double x, const double y,
 	 * layout. */
 	double old_group_dim[nb_groups];
 	double old_dim = 0;
-	uint_fast32_t group = 0;
+	size_t group = 0;
 	for (int i = 0; i < container->children->length;) {
 		swayc_t *child = container->children->items[i];
 		double *dim = group_layout == L_HORIZ ? &child->height : &child->width;
@@ -1252,7 +1255,7 @@ void apply_auto_layout(swayc_t *container, const double x, const double y,
 
 	for (group = 0; group < nb_groups; ++group) {
 		// column to include next by increasing position.
-		uint_fast32_t layout_group = master_first ? group : (group + 1) % nb_groups;
+		size_t layout_group = master_first ? group : (group + 1) % nb_groups;
 
 		// adjusted size of the group
 		group_dim = old_group_dim[layout_group] * scale;
@@ -1270,8 +1273,7 @@ void apply_auto_layout(swayc_t *container, const double x, const double y,
 		if (group == nb_groups - 1) {
 			group_dim = pos_maj + dim_maj - pos; // remaining width
 		}
-		sway_log(L_DEBUG, "Arranging container %p column %" PRIuFAST32
-				  ", children [%d,%d[ (%fx%f+%f,%f)",
+		sway_log(L_DEBUG, "Arranging container %p column %zu, children [%d,%d[ (%fx%f+%f,%f)",
 			 container, group, start, end, *group_w, *group_h, *group_x, *group_y);
 		switch (group_layout) {
 		default:
-- 
cgit v1.2.3


From bd415029ba72425c97647b55fce19213e7909cbc Mon Sep 17 00:00:00 2001
From: wil <william.barsse@gmail.com>
Date: Sat, 7 Jan 2017 17:41:15 +0100
Subject: Moved auto_* layout functions from resize.c to layout.c

---
 include/sway/layout.h  |  4 +++
 sway/commands/resize.c | 98 ++------------------------------------------------
 sway/layout.c          | 93 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 96 deletions(-)

(limited to 'sway/commands/resize.c')

diff --git a/include/sway/layout.h b/include/sway/layout.h
index d7fe748d..c51fece9 100644
--- a/include/sway/layout.h
+++ b/include/sway/layout.h
@@ -76,5 +76,9 @@ void swayc_log(log_importance_t verbosity, swayc_t *cont, const char* format, ..
 enum swayc_layouts default_layout(swayc_t *output);
 
 bool is_auto_layout(enum swayc_layouts layout);
+int auto_group_start_index(swayc_t *container, int index);
+int auto_group_end_index(swayc_t *container, int index);
+size_t auto_group_count(swayc_t *container);
+size_t auto_group_index(swayc_t *container, int index);
 
 #endif
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index 1c052286..c391945f 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -62,100 +62,6 @@ static bool resize_floating(int amount, bool use_width) {
 	return false;
 }
 
-/**
- * Return the number of children in the slave groups. This corresponds to the children
- * that are not members of the master group.
- */
-static inline size_t auto_slave_count(swayc_t *container) {
-	return container->children->length - container->nb_master;
-
-}
-
-/**
- * given the index of a container's child, return the index of the first child of the group
- * which index is a member of.
- */
-static int auto_group_start_index(swayc_t *container, int index) {
-	if (index < 0 || ! is_auto_layout(container->layout)
-		|| (size_t) index < container->nb_master) {
-		return 0;
-	} else {
-		size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
-		size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
-		int start_idx;
-		int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
-		if (index < idx2) {
-			start_idx = ((index - container->nb_master) / grp_sz) * grp_sz + container->nb_master;
-		} else {
-			start_idx = idx2 + ((index - idx2) / (grp_sz + 1)) * (grp_sz + 1);
-		}
-		return MIN(start_idx, container->children->length);
-	}
-}
-
-/**
- * given the index of a container's child, return the index of the first child of the group
- * that follows the one which index is a member of.
- * This makes the function usable to walk through the groups in a container.
- */
-static int auto_group_end_index(swayc_t *container, int index) {
-	if (index < 0 || ! is_auto_layout(container->layout)) {
-		return container->children->length;
-	} else {
-		int nxt_idx;
-		if ((size_t)index < container->nb_master) {
-			nxt_idx = container->nb_master;
-		} else {
-			size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
-			size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
-			int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
-			if (index < idx2) {
-				nxt_idx = ((index - container->nb_master) / grp_sz + 1) * grp_sz + container->nb_master;
-			} else {
-				nxt_idx = idx2 + ((index - idx2) / (grp_sz + 1) + 1) * (grp_sz + 1);
-			}
-		}
-		return MIN(nxt_idx, container->children->length);
-	}
-}
-
-/**
- * Return the combined number of master and slave groups in the container.
- */
-static inline size_t auto_group_count(swayc_t *container) {
-	return MIN(container->nb_slave_groups, auto_slave_count(container)) + (container->nb_master ? 1 : 0);
-}
-
-/**
- * return the index of the Group containing <index>th child of <container>.
- * The index is the order of the group along the container's major axis (starting at 0).
- */
-static size_t auto_group_index(swayc_t *container, int index) {
-	if (index < 0) {
-		return 0;
-	}
-	bool master_first = (container->layout == L_AUTO_LEFT || container->layout == L_AUTO_TOP);
-	int nb_slaves = auto_slave_count(container);
-	if ((size_t) index < container->nb_master) {
-		if (master_first || nb_slaves <= 0) {
-			return 0;
-		} else {
-			return MIN(container->nb_slave_groups, nb_slaves);
-		}
-	} else {
-		size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
-		size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
-		size_t grp_idx;
-		int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
-		if (index < idx2) {
-			grp_idx = (index - container->nb_master) / grp_sz;
-		} else {
-			grp_idx = (container->nb_slave_groups - remainder) + (index - idx2) / (grp_sz + 1) ;
-		}
-		return grp_idx + (master_first ? 1 : 0);
-	}
-}
-
 static bool resize_tiled(int amount, bool use_width) {
 	swayc_t *container = get_focused_view(swayc_active_workspace());
 	swayc_t *parent = container->parent;
@@ -229,8 +135,8 @@ static bool resize_tiled(int amount, bool use_width) {
 		}
 		sway_log(L_DEBUG, "Check container %p: width %g vs %d, height %g vs %d", sibling, sibling->width + pixels, min_sane_w, sibling->height + pixels, min_sane_h);
 		if (use_width ?
-		    sibling->width + pixels < min_sane_w :
-		    sibling->height + pixels < min_sane_h) {
+			sibling->width + pixels < min_sane_w :
+			sibling->height + pixels < min_sane_h) {
 			valid = false;
 			sway_log(L_DEBUG, "Container size no longer sane");
 			break;
diff --git a/sway/layout.c b/sway/layout.c
index 377dad47..5f8da9e6 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -1503,3 +1503,96 @@ enum swayc_layouts default_layout(swayc_t *output) {
 bool is_auto_layout(enum swayc_layouts layout) {
 	return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST);
 }
+
+/**
+ * Return the number of children in the slave groups. This corresponds to the children
+ * that are not members of the master group.
+ */
+static inline size_t auto_slave_count(swayc_t *container) {
+	return container->children->length - container->nb_master;
+}
+
+/**
+ * given the index of a container's child, return the index of the first child of the group
+ * which index is a member of.
+ */
+int auto_group_start_index(swayc_t *container, int index) {
+	if (index < 0 || ! is_auto_layout(container->layout)
+		|| (size_t) index < container->nb_master) {
+		return 0;
+	} else {
+		size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
+		size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
+		int start_idx;
+		int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
+		if (index < idx2) {
+			start_idx = ((index - container->nb_master) / grp_sz) * grp_sz + container->nb_master;
+		} else {
+			start_idx = idx2 + ((index - idx2) / (grp_sz + 1)) * (grp_sz + 1);
+		}
+		return MIN(start_idx, container->children->length);
+	}
+}
+
+/**
+ * given the index of a container's child, return the index of the first child of the group
+ * that follows the one which index is a member of.
+ * This makes the function usable to walk through the groups in a container.
+ */
+int auto_group_end_index(swayc_t *container, int index) {
+	if (index < 0 || ! is_auto_layout(container->layout)) {
+		return container->children->length;
+	} else {
+		int nxt_idx;
+		if ((size_t)index < container->nb_master) {
+			nxt_idx = container->nb_master;
+		} else {
+			size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
+			size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
+			int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
+			if (index < idx2) {
+				nxt_idx = ((index - container->nb_master) / grp_sz + 1) * grp_sz + container->nb_master;
+			} else {
+				nxt_idx = idx2 + ((index - idx2) / (grp_sz + 1) + 1) * (grp_sz + 1);
+			}
+		}
+		return MIN(nxt_idx, container->children->length);
+	}
+}
+
+/**
+ * Return the combined number of master and slave groups in the container.
+ */
+size_t auto_group_count(swayc_t *container) {
+	return MIN(container->nb_slave_groups, auto_slave_count(container)) + (container->nb_master ? 1 : 0);
+}
+
+/**
+ * return the index of the Group containing <index>th child of <container>.
+ * The index is the order of the group along the container's major axis (starting at 0).
+ */
+size_t auto_group_index(swayc_t *container, int index) {
+	if (index < 0) {
+		return 0;
+	}
+	bool master_first = (container->layout == L_AUTO_LEFT || container->layout == L_AUTO_TOP);
+	int nb_slaves = auto_slave_count(container);
+	if ((size_t) index < container->nb_master) {
+		if (master_first || nb_slaves <= 0) {
+			return 0;
+		} else {
+			return MIN(container->nb_slave_groups, nb_slaves);
+		}
+	} else {
+		size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups;
+		size_t remainder = auto_slave_count(container) % container->nb_slave_groups;
+		size_t grp_idx;
+		int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
+		if (index < idx2) {
+			grp_idx = (index - container->nb_master) / grp_sz;
+		} else {
+			grp_idx = (container->nb_slave_groups - remainder) + (index - idx2) / (grp_sz + 1) ;
+		}
+		return grp_idx + (master_first ? 1 : 0);
+	}
+}
-- 
cgit v1.2.3


From 3c84250be8a31ec08f3c8057d589b5b040673b36 Mon Sep 17 00:00:00 2001
From: wil <william.barsse@gmail.com>
Date: Sat, 7 Jan 2017 18:20:13 +0100
Subject: [fix] resize should now preserve surrounding container's dimensions

- prior to this modification, the requested pixels were added/removed
  to both edges of the modified container. To preserve sizes,
  only half the pixels should be added/removed to each edge.
---
 sway/commands/resize.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sway/commands/resize.c')

diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index c391945f..28b20dc4 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -175,15 +175,15 @@ static bool resize_tiled(int amount, bool use_width) {
 			} else {
 				if (use_major) {
 					for (int j = i; j < next_i; ++j) {
-						recursive_resize(parent->children->items[j], pixels,
+						recursive_resize(parent->children->items[j], pixels / 2,
 								 use_width ? WLC_RESIZE_EDGE_LEFT : WLC_RESIZE_EDGE_TOP);
-						recursive_resize(parent->children->items[j], pixels,
+						recursive_resize(parent->children->items[j], pixels / 2,
 								 use_width ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_BOTTOM);
 					}
 				} else {
-					recursive_resize(sibling, pixels,
+					recursive_resize(sibling, pixels / 2,
 							 use_width ? WLC_RESIZE_EDGE_LEFT : WLC_RESIZE_EDGE_TOP);
-					recursive_resize(sibling, pixels,
+					recursive_resize(sibling, pixels / 2,
 							 use_width ? WLC_RESIZE_EDGE_RIGHT : WLC_RESIZE_EDGE_BOTTOM);
 				}
 			}
-- 
cgit v1.2.3