Sync OpenBSD patchset 142:

Each window now has a tree of layout cells associated with it. In this tree,
each node is either a horizontal or vertical cell containing a list of other
cells running from left-to-right or top-to-bottom, or a leaf cell which is
associated with a pane.

The major functional changes are:

- panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and
  vertically (splitw -v, C-b ");
- panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D,
  bound to C-b left/right/up/down and C-b M-left/right/up/down);
- layouts are now applied and then may be modified by resizing or splitting
  panes, rather than being fixed and reapplied when the window is resized or
  panes are added;
- manual-vertical layout is no longer necessary, and active-only layout is gone
  (but may return in future);
- the main-pane layouts now reduce the size of the main pane to fit all panes
  if possible.

Thanks to all who tested.

1 files changed, 12 insertions, 12 deletions

diff --git a/cmd-select-layout.c b/cmd-select-layout.c
index 20e2ad28..acca099f 100644
--- a/cmd-select-layout.c
+++ b/cmd-select-layout.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-select-layout.c,v 1.4 2009-07-14 06:43:32 nicm Exp $ */
+/* $Id: cmd-select-layout.c,v 1.5 2009-07-20 15:42:05 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -49,17 +49,17 @@ cmd_select_layout_init(struct cmd *self, int key)
 	data = self->data;
 
 	switch (key) {
-	case KEYC_ADDESC('0'):
-		data->arg = xstrdup("manual-vertical");
-		break;
 	case KEYC_ADDESC('1'):
 		data->arg = xstrdup("even-horizontal");
 		break;
 	case KEYC_ADDESC('2'):
 		data->arg = xstrdup("even-vertical");
 		break;
-	case KEYC_ADDESC('9'):
-		data->arg = xstrdup("active-only");
+	case KEYC_ADDESC('3'):
+		data->arg = xstrdup("main-horizontal");
+		break;
+	case KEYC_ADDESC('4'):
+		data->arg = xstrdup("main-vertical");
 		break;
 	}
 }
@@ -74,13 +74,13 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
 
-	if ((layout = layout_lookup(data->arg)) == -1) {
-		ctx->error(ctx, "unknown or ambiguous layout: %s", data->arg);
-		return (-1);
-	}
+	if ((layout = layout_set_lookup(data->arg)) == -1) {
+ 		ctx->error(ctx, "unknown or ambiguous layout: %s", data->arg);
+ 		return (-1);
+ 	}
 
-	if (layout_select(wl->window, layout) == 0)
-		ctx->info(ctx, "layout now: %s", layout_name(wl->window));
+	layout = layout_set_select(wl->window, layout);
+	ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
 
 	return (0);
 }