Add Awesome/Monad style automatic layouts to Sway

samples/awesome-like.config

@@ -0,0 +1,63 @@
+#
+# Replicate some of Awesome's default layout manipulation configuration for Sway
+#
+# Differences:
+# - Layout switching doesn't use the spacebar (i.e. i3/Sway behavior to switch to/from floating windows)
+#   and uses the 'A' key instead (as in auto)
+# - Resizing windows uses i3/Sway's more versatile Mod4+r
+# - no tags
+# - no Maximize/Minize, alternatives to Maximize would be to switch to Stacked/Tabbed layouts
+#   via Mod4+w or Mod4+s.
+# - kill focused client is available on Mod4+Shift+q (instead of Mod4+Shift+c, which maps to Sway's
+#   config reload)
+# - probably many more ...
+
+# Awesome-style container traversal using Vim-like binding
+set $next j
+set $prev k
+
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+$next focus next
+    bindsym $mod+$prev focus prev
+
+    # _move_ the focused window with the same, but add Shift
+    bindsym $mod+Shift+$next move next
+    bindsym $mod+Shift+$prev move prev
+
+#
+# Layout:
+#
+    workspace_layout auto left
+
+    # This is usually bound to $mod+space, but this works well in practice by keeping
+    # all the layout switching keys grouped together.
+    bindsym $mod+a layout auto next
+    bindsym $mod+Shift+a layout auto prev
+
+    # Promote a child to master position in an auto layout
+    bindsym $mod+Control+Return move first
+
+    # Increase/decrease number of master elements in auto layout
+    bindsym $mod+Shift+h layout auto master inc 1
+    bindsym $mod+Shift+l layout auto master inc -1
+
+    # Increase/decrease number of slave element groups in auto layout
+    bindsym $mod+Control+h layout auto ncol inc 1
+    bindsym $mod+Control+l layout auto ncol inc -1
+
+#
+# Resizing containers:
+# Again, not really the way Awesome works well, but in spirit with i3/Sway and it works well.
+#
+mode "resize" {
+    bindsym Left resize shrink width 20 px
+    bindsym Down resize grow height 20 px
+    bindsym Up resize shrink height 20 px
+    bindsym Right resize grow width 20 px
+}
+bindsym $mod+r mode "resize"
+
+new_window pixel 1

sway/commands/layout.c

@@ -78,7 +78,7 @@ static struct cmd_results *cmd_layout_auto(swayc_t *container, int argc, char **
 	struct cmd_results *error = NULL;
 	const char *cmd_name = "layout auto";
 	const char *set_inc_cmd_name = "layout auto [master|ncol] [set|inc]";
-	const char *err_msg = "Allowed arguments are <right|left|top|bot|next|prev|master|ncol>";
+	const char *err_msg = "Allowed arguments are <right|left|top|bottom|next|prev|master|ncol>";
 
 	bool need_layout_update = false;
 	enum swayc_layouts old_layout = container->layout;
@@ -90,7 +90,7 @@ static struct cmd_results *cmd_layout_auto(swayc_t *container, int argc, char **
 		layout = L_AUTO_RIGHT;
 	} else if (strcasecmp(argv[1], "top") == 0) {
 		layout = L_AUTO_TOP;
-	} else if (strcasecmp(argv[1], "bot") == 0) {
+	} else if (strcasecmp(argv[1], "bottom") == 0) {
 		layout = L_AUTO_BOTTOM;
 	} else if (strcasecmp(argv[1], "next") == 0) {
 		if (is_auto_layout(container->layout) && container->layout < L_AUTO_LAST) {

sway/commands/workspace_layout.c

@@ -3,7 +3,7 @@
 
 struct cmd_results *cmd_workspace_layout(int argc, char **argv) {
 	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "workspace_layout", EXPECTED_EQUAL_TO, 1))) {
+	if ((error = checkarg(argc, "workspace_layout", EXPECTED_AT_LEAST, 1))) {
 		return error;
 	}
 
@@ -13,16 +13,27 @@ struct cmd_results *cmd_workspace_layout(int argc, char **argv) {
 		config->default_layout = L_STACKED;
 	} else if (strcasecmp(argv[0], "tabbed") == 0) {
 		config->default_layout = L_TABBED;
-	} else if (strcasecmp(argv[0], "auto_left") == 0) {
-		config->default_layout = L_AUTO_LEFT;
-	} else if (strcasecmp(argv[0], "auto_right") == 0) {
-		config->default_layout = L_AUTO_RIGHT;
-	} else if (strcasecmp(argv[0], "auto_top") == 0) {
-		config->default_layout = L_AUTO_TOP;
-	} else if (strcasecmp(argv[0], "auto_bottom") == 0) {
-		config->default_layout = L_AUTO_BOTTOM;
+	} else if (strcasecmp(argv[0], "auto") == 0) {
+		if (argc == 1) {
+			config->default_layout = L_AUTO_FIRST;
+		} else {
+			if ((error = checkarg(argc, "workspace_layout auto", EXPECTED_EQUAL_TO, 2))) {
+				return error;
+			}
+			if (strcasecmp(argv[0], "left") == 0) {
+				config->default_layout = L_AUTO_LEFT;
+			} else if (strcasecmp(argv[0], "right") == 0) {
+				config->default_layout = L_AUTO_RIGHT;
+			} else if (strcasecmp(argv[0], "top") == 0) {
+				config->default_layout = L_AUTO_TOP;
+			} else if (strcasecmp(argv[0], "bottom") == 0) {
+				config->default_layout = L_AUTO_BOTTOM;
+			} else {
+				return cmd_results_new(CMD_INVALID, "workspace_layout auto", "Expected 'workspace_layout auto <left|right|top|bottom>'");
+			}
+		}
 	} else {
-		return cmd_results_new(CMD_INVALID, "workspace_layout", "Expected 'workspace_layout <default|stacking|tabbed|auto_left|auto_right|auto_top|auto_bottom>'");
+		return cmd_results_new(CMD_INVALID, "workspace_layout", "Expected 'workspace_layout <default|stacking|tabbed|auto|auto left|auto right|auto top|auto bottom>'");
 	}
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }

sway/layout.c

@@ -71,6 +71,14 @@ void add_child(swayc_t *parent, swayc_t *child) {
 	}
 }
 
+static double *get_height(swayc_t *cont) {
+	return &cont->height;
+}
+
+static double *get_width(swayc_t *cont) {
+	return &cont->width;
+}
+
 void insert_child(swayc_t *parent, swayc_t *child, int index) {
 	if (index > parent->children->length) {
 		index = parent->children->length;
@@ -86,7 +94,44 @@ void insert_child(swayc_t *parent, swayc_t *child, int index) {
 	if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
 		child = new_container(child, parent->workspace_layout);
 	}
-
+	if (is_auto_layout(parent->layout)) {
+		/* go through each group, adjust the size of the first child of each group */
+		double *(*get_maj_dim)(swayc_t *cont);
+		double *(*get_min_dim)(swayc_t *cont);
+		if (parent->layout == L_AUTO_LEFT || parent->layout == L_AUTO_RIGHT) {
+			get_maj_dim = get_width;
+			get_min_dim = get_height;
+		} else {
+			get_maj_dim = get_height;
+			get_min_dim = get_width;
+		}
+		for (int i = index; i < parent->children->length;) {
+			int start = auto_group_start_index(parent, i);
+			int end = auto_group_end_index(parent, i);
+			swayc_t *first = parent->children->items[start];
+			if (start + 1 < parent->children->length) {
+				/* preserve the group's dimension along major axis */
+				*get_maj_dim(first) = *get_maj_dim(parent->children->items[start + 1]);
+			} else {
+				/* new group, let the apply_layout handle it */
+				first->height = first->width = 0;
+				break;
+			}
+			double remaining = *get_min_dim(parent);
+			for (int j = end - 1; j > start; --j) {
+				swayc_t *sibling = parent->children->items[j];
+				if (sibling == child) {
+					/* the inserted child won't yet have its minor
+					   dimension set */
+					remaining -= *get_min_dim(parent) / (end - start);
+				} else {
+					remaining -= *get_min_dim(sibling);
+				}
+			}
+			*get_min_dim(first) = remaining;
+			i = end;
+		}
+	}
 }
 
 void add_floating(swayc_t *ws, swayc_t *child) {
@@ -185,6 +230,42 @@ swayc_t *remove_child(swayc_t *child) {
 				break;
 			}
 		}
+		if (is_auto_layout(parent->layout) && parent->children->length) {
+			/* go through each group, adjust the size of the last child of each group */
+			double *(*get_maj_dim)(swayc_t *cont);
+			double *(*get_min_dim)(swayc_t *cont);
+			if (parent->layout == L_AUTO_LEFT || parent->layout == L_AUTO_RIGHT) {
+				get_maj_dim = get_width;
+				get_min_dim = get_height;
+			} else {
+				get_maj_dim = get_height;
+				get_min_dim = get_width;
+			}
+			for (int j = parent->children->length - 1; j >= i;) {
+				int start = auto_group_start_index(parent, j);
+				int end = auto_group_end_index(parent, j);
+				swayc_t *first = parent->children->items[start];
+				if (i == start) {
+					/* removed element was first child in the current group,
+					   use its size along the major axis */
+					*get_maj_dim(first) = *get_maj_dim(child);
+				} else if (start > i) {
+					/* preserve the group's dimension along major axis */
+					*get_maj_dim(first) = *get_maj_dim(parent->children->items[start - 1]);
+				}
+				if (end != parent->children->length) {
+					double remaining = *get_min_dim(parent);
+					for (int k = start; k < end - 1; ++k) {
+						swayc_t *sibling = parent->children->items[k];
+						remaining -= *get_min_dim(sibling);
+					}
+					/* last element of the group gets remaining size, elements
+					   that don't change groups keep their ratio */
+					*get_min_dim((swayc_t *) parent->children->items[end - 1]) = remaining;
+				} /* else last group, let apply_layout handle it */
+				j = start - 1;
+			}
+		}
 	}
 	// Set focused to new container
 	if (parent->focused == child) {
@@ -250,6 +331,24 @@ void swap_geometry(swayc_t *a, swayc_t *b) {
 	b->height = h;
 }
 
+static void swap_children(swayc_t *container, int a, int b) {
+	if (a >= 0 && b >= 0 && a < container->children->length
+			&& b < container->children->length
+		&& a != b) {
+		swayc_t *pa = (swayc_t *)container->children->items[a];
+		swayc_t *pb = (swayc_t *)container->children->items[b];
+		container->children->items[a] = container->children->items[b];
+		container->children->items[b] = pa;
+		if (is_auto_layout(container->layout)) {
+			size_t ga = auto_group_index(container, a);
+			size_t gb = auto_group_index(container, b);
+			if (ga != gb) {
+				swap_geometry(pa, pb);
+			}
+		}
+	}
+}
+
 void move_container(swayc_t *container, enum movement_direction dir) {
 	enum swayc_layouts layout = L_NONE;
 	swayc_t *parent = container->parent;
@@ -319,29 +418,6 @@ void move_container(swayc_t *container, enum movement_direction dir) {
 				} else if (desired >= parent->children->length) {
 					desired = 0;
 				}
-				// 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
-						&& (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 && (size_t)desired == parent->nb_master - 1)) {
-						swap_geom = parent->children->items[parent->nb_master - 1];
-					} 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];
-					}
-					if (swap_geom) {
-						double h = child->height;
-						double w = child->width;
-						child->width = swap_geom->width;
-						child->height = swap_geom->height;
-						swap_geom->width = w;
-						swap_geom->height = h;
-					}
-				}
 			}
 			// when it has ascended, legal insertion position is 0:len
 			// when it has not, legal insertion position is 0:len-1
@@ -365,10 +441,14 @@ void move_container(swayc_t *container, enum movement_direction dir) {
 						container->width = container->height = 0;
 					}
 				}
-				swayc_t *old_parent = remove_child(container);
-				insert_child(parent, container, desired);
-				destroy_container(old_parent);
-				sway_log(L_DEBUG,"Moving to %p %d", parent, desired);
+				if (container->parent == parent) {
+					swap_children(parent, idx, desired);
+				} else {
+					swayc_t *old_parent = remove_child(container);
+					insert_child(parent, container, desired);
+					destroy_container(old_parent);
+					sway_log(L_DEBUG,"Moving to %p %d", parent, desired);
+				}
 				break;
 			}
 		}
@@ -1535,7 +1615,8 @@ size_t auto_slave_group_count(const swayc_t *container) {
  * Return the combined number of master and slave groups in the container.
  */
 size_t auto_group_count(const swayc_t *container) {
-	return auto_slave_group_count(container) + (container->nb_master ? 1 : 0);
+	return auto_slave_group_count(container)
+		+ (container->children->length && container->nb_master ? 1 : 0);
 }
 
 /**

sway/sway.5.txt

@@ -64,12 +64,11 @@ They are expected to be used with **bindsym** or at runtime through **swaymsg**(
 **focus** <direction>::
 	Direction may be one of _up_, _down_, _left_, _right_, _next_, _prev_,
 	_parent_, or _child_. The directional focus commands will move the focus
-	in that direction. The auto_next and auto_prev will focus the next,
-	respectively previous, element in the current container if it is using
-	one of the _auto_ layouts. The parent focus command will change the
-	focus to the parent of the currently focused container, which is useful,
-	for example, to open a sibling of the parent container, or to move the
-	entire container around.
+	in that direction. The _next_ and _prev_ directions will focus the next,
+	respectively previous, element in the current container. The parent
+	focus command will change the focus to the parent of the currently
+	focused container, which is useful, for example, to open a sibling of
+	the parent container, or to move the entire container around.
 
 **focus** output <direction|name>::
 	Direction may be one of _up_, _down_, _left_, _right_. The directional focus
@@ -88,7 +87,7 @@ They are expected to be used with **bindsym** or at runtime through **swaymsg**(
 
 **layout** auto <mode>::
 	Sets layout to one of the auto modes, i.e. one of _left_, right_, _top_,
-	or _bot_.
+	or _bottom_.
 
 **layout** auto <next|prev>::
 	Cycles between available auto layouts.
@@ -381,8 +380,8 @@ The default colors are:
 	switch to workspace 2, then invoke the "workspace 2" command again, you
 	will be returned to workspace 1. Defaults to _no_.
 
-**workspace_layout** <default|stacking|tabbed|auto_left|auto_right|auto_top|auto_bottom>::
-	Specifies the start layout for new workspaces.
+**workspace_layout** <default|stacking|tabbed|auto|auto left|auto right|auto
+	top|auto bottom>:: Specifies the start layout for new workspaces.
 
 **include** <path>::
 	Includes a sub config file by _path_. _path_ can be either a full path or a