diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-07-19 13:21:40 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-07-19 13:21:40 +0000 |
commit | 6036bdd06cba9fa500098f1f17983d62955b24e5 (patch) | |
tree | f19dc96b0b6f65ca03222018df09defd585bed90 /cmd-resize-pane.c | |
parent | fc6a65c6207dbefcd8b5f187148978f8d4111b2b (diff) | |
download | rtmux-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-resize-pane.c')
-rw-r--r-- | cmd-resize-pane.c | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c index 64ac95b2..5e9f67e3 100644 --- a/cmd-resize-pane.c +++ b/cmd-resize-pane.c @@ -32,7 +32,8 @@ int cmd_resize_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_resize_pane_entry = { "resize-pane", "resizep", CMD_PANE_WINDOW_USAGE "[-DU] [adjustment]", - CMD_ARG01, CMD_CHFLAG('D')|CMD_CHFLAG('U'), + CMD_ARG01, + CMD_CHFLAG('D')|CMD_CHFLAG('L')|CMD_CHFLAG('R')|CMD_CHFLAG('U'), cmd_resize_pane_init, cmd_pane_parse, cmd_resize_pane_exec, @@ -50,15 +51,31 @@ cmd_resize_pane_init(struct cmd *self, int key) cmd_pane_init(self, key); data = self->data; + if (key == KEYC_ADDCTL(KEYC_UP)) + data->chflags |= CMD_CHFLAG('U'); if (key == KEYC_ADDCTL(KEYC_DOWN)) data->chflags |= CMD_CHFLAG('D'); + if (key == KEYC_ADDCTL(KEYC_LEFT)) + data->chflags |= CMD_CHFLAG('L'); + if (key == KEYC_ADDCTL(KEYC_RIGHT)) + data->chflags |= CMD_CHFLAG('R'); - if (key == KEYC_ADDESC(KEYC_UP)) + if (key == KEYC_ADDESC(KEYC_UP)) { + data->chflags |= CMD_CHFLAG('U'); data->arg = xstrdup("5"); + } if (key == KEYC_ADDESC(KEYC_DOWN)) { data->chflags |= CMD_CHFLAG('D'); data->arg = xstrdup("5"); } + if (key == KEYC_ADDESC(KEYC_LEFT)) { + data->chflags |= CMD_CHFLAG('L'); + data->arg = xstrdup("5"); + } + if (key == KEYC_ADDESC(KEYC_RIGHT)) { + data->chflags |= CMD_CHFLAG('R'); + data->arg = xstrdup("5"); + } } int @@ -92,12 +109,14 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx) } } - if (!(data->chflags & CMD_CHFLAG('D'))) - adjust = -adjust; - if (layout_resize(wp, adjust) != 0) { - ctx->error(ctx, "layout %s " - "does not support resizing", layout_name(wp->window)); - return (-1); + if (data->chflags & (CMD_CHFLAG('L')|CMD_CHFLAG('R'))) { + if (data->chflags & CMD_CHFLAG('L')) + adjust = -adjust; + layout_resize_pane(wp, LAYOUT_LEFTRIGHT, adjust); + } else { + if (data->chflags & CMD_CHFLAG('U')) + adjust = -adjust; + layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust); } server_redraw_window(wl->window); |