diff options
| author |   nicm <nicm@openbsd.org> | 2013-03-24 09:57:59 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2013-03-24 09:57:59 +0000 |
| commit | b4a3311ed2e18a290144fc9d4b326eec29e85f98 (patch) | |
| tree | f860790228b1e2701b5f74a9c885edd023ed22ba /usr.bin/tmux/cmd-join-pane.c | |
| parent | Add a -o option to set-option to prevent setting an option already set, (diff) | |
| download | wireguard-openbsd-b4a3311ed2e18a290144fc9d4b326eec29e85f98.tar.xz wireguard-openbsd-b4a3311ed2e18a290144fc9d4b326eec29e85f98.zip | |
Add resize-pane -Z to temporary zoom the active pane to occupy the full
window or unzoom (restored to the normal layout) if it already zoomed,
bound to C-b z by default. The pane is unzoomed on pretty much any
excuse whatsoever.
We considered making this a new layout but the requirements are quite
different from layouts so decided it is better as a special case. Each
current layout cell is saved, a temporary one-cell layout generated and
all except the active pane set to NULL.
Prompted by suggestions and scripts from several. Thanks to Aaron Jensen
and Thiago Padilha for testing an earlier version.
Diffstat (limited to 'usr.bin/tmux/cmd-join-pane.c')
| -rw-r--r-- | usr.bin/tmux/cmd-join-pane.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/tmux/cmd-join-pane.c b/usr.bin/tmux/cmd-join-pane.c index f9c316e8d71..1cc07806b44 100644 --- a/usr.bin/tmux/cmd-join-pane.c +++ b/usr.bin/tmux/cmd-join-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-join-pane.c,v 1.13 2013/03/24 09:54:10 nicm Exp $ */ +/* $OpenBSD: cmd-join-pane.c,v 1.14 2013/03/24 09:57:59 nicm Exp $ */ /* * Copyright (c) 2011 George Nachman <tmux@georgester.com> @@ -92,11 +92,13 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window) return (CMD_RETURN_ERROR); dst_w = dst_wl->window; dst_idx = dst_wl->idx; + server_unzoom_window(dst_w); src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp); if (src_wl == NULL) return (CMD_RETURN_ERROR); src_w = src_wl->window; + server_unzoom_window(src_w); if (not_same_window && src_w == dst_w) { cmdq_error(cmdq, "can't join a pane to its own window"); |