aboutsummaryrefslogtreecommitdiff
path: root/cmd-next-layout.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-07-19 13:21:40 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-07-19 13:21:40 +0000
commit6036bdd06cba9fa500098f1f17983d62955b24e5 (patch)
treef19dc96b0b6f65ca03222018df09defd585bed90 /cmd-next-layout.c
parentfc6a65c6207dbefcd8b5f187148978f8d4111b2b (diff)
downloadrtmux-6036bdd06cba9fa500098f1f17983d62955b24e5.tar.gz
rtmux-6036bdd06cba9fa500098f1f17983d62955b24e5.tar.bz2
rtmux-6036bdd06cba9fa500098f1f17983d62955b24e5.zip
Improved layout code.
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.
Diffstat (limited to 'cmd-next-layout.c')
-rw-r--r--cmd-next-layout.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd-next-layout.c b/cmd-next-layout.c
index b89dda3d..088046fa 100644
--- a/cmd-next-layout.c
+++ b/cmd-next-layout.c
@@ -44,12 +44,13 @@ cmd_next_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
{
struct cmd_target_data *data = self->data;
struct winlink *wl;
+ u_int layout;
if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
return (-1);
- layout_next(wl->window);
- ctx->info(ctx, "layout now: %s", layout_name(wl->window));
+ layout = layout_set_next(wl->window);
+ ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
return (0);
}