mirror of
https://github.com/tmux/tmux.git
synced 2024-11-16 01:18:52 +00:00
Add -f for full size to join-pane (like split-window), from Theo Buehler.
This commit is contained in:
parent
4bc445f080
commit
350a434939
@ -36,8 +36,8 @@ const struct cmd_entry cmd_join_pane_entry = {
|
|||||||
.name = "join-pane",
|
.name = "join-pane",
|
||||||
.alias = "joinp",
|
.alias = "joinp",
|
||||||
|
|
||||||
.args = { "bdhvp:l:s:t:", 0, 0 },
|
.args = { "bdfhvp:l:s:t:", 0, 0 },
|
||||||
.usage = "[-bdhv] [-l size] " CMD_SRCDST_PANE_USAGE,
|
.usage = "[-bdfhv] [-l size] " CMD_SRCDST_PANE_USAGE,
|
||||||
|
|
||||||
.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
|
.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
|
||||||
.target = { 't', CMD_FIND_PANE, 0 },
|
.target = { 't', CMD_FIND_PANE, 0 },
|
||||||
@ -143,10 +143,13 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||||||
else
|
else
|
||||||
size = (dst_wp->sx * percentage) / 100;
|
size = (dst_wp->sx * percentage) / 100;
|
||||||
}
|
}
|
||||||
if (args_has(args, 'b'))
|
|
||||||
flags = SPAWN_BEFORE;
|
|
||||||
else
|
|
||||||
flags = 0;
|
flags = 0;
|
||||||
|
if (args_has(args, 'b'))
|
||||||
|
flags |= SPAWN_BEFORE;
|
||||||
|
if (args_has(args, 'f'))
|
||||||
|
flags |= SPAWN_FULLSIZE;
|
||||||
|
|
||||||
lc = layout_split_pane(dst_wp, type, size, flags);
|
lc = layout_split_pane(dst_wp, type, size, flags);
|
||||||
if (lc == NULL) {
|
if (lc == NULL) {
|
||||||
cmdq_error(item, "create pane failed: pane too small");
|
cmdq_error(item, "create pane failed: pane too small");
|
||||||
|
2
tmux.1
2
tmux.1
@ -1890,7 +1890,7 @@ zooms the pane.
|
|||||||
.Pp
|
.Pp
|
||||||
This command works only if at least one client is attached.
|
This command works only if at least one client is attached.
|
||||||
.It Xo Ic join-pane
|
.It Xo Ic join-pane
|
||||||
.Op Fl bdhv
|
.Op Fl bdfhv
|
||||||
.Op Fl l Ar size
|
.Op Fl l Ar size
|
||||||
.Op Fl s Ar src-pane
|
.Op Fl s Ar src-pane
|
||||||
.Op Fl t Ar dst-pane
|
.Op Fl t Ar dst-pane
|
||||||
|
Loading…
Reference in New Issue
Block a user