diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-05-03 23:02:28 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-05-03 23:02:28 +0100 |
| commit | d4177e954c8433469f5ac4cade15bafb1675117e (patch) | |
| tree | 76ff287b770ec8e217c6839e0afae2a7dd716961 /cmd-split-window.c | |
| parent | 4d505574dc515d6e554b3f37e9aa5bdb8930c6cb (diff) | |
| parent | 45ae9a8e3520d73c795bb993ced4fe43d06ad6f1 (diff) | |
| download | rtmux-d4177e954c8433469f5ac4cade15bafb1675117e.tar.gz rtmux-d4177e954c8433469f5ac4cade15bafb1675117e.tar.bz2 rtmux-d4177e954c8433469f5ac4cade15bafb1675117e.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-split-window.c')
| -rw-r--r-- | cmd-split-window.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c index b06c48f2..8d63473f 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -39,9 +39,10 @@ const struct cmd_entry cmd_split_window_entry = { .name = "split-window", .alias = "splitw", - .args = { "bc:de:fF:l:hp:Pt:v", 0, -1 }, - .usage = "[-bdefhvP] [-c start-directory] [-e environment] [-F format] " - "[-p percentage|-l size] " CMD_TARGET_PANE_USAGE " [command]", + .args = { "bc:de:fF:hIl:p:Pt:v", 0, -1 }, + .usage = "[-bdefhIPv] [-c start-directory] [-e environment] " + "[-F format] [-p percentage|-l size] " CMD_TARGET_PANE_USAGE + " [command]", .target = { 't', CMD_FIND_PANE, 0 }, @@ -62,7 +63,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) enum layout_type type; struct layout_cell *lc; struct cmd_find_state fs; - int size, percentage, flags; + int size, percentage, flags, input; const char *template, *add; char *cause, *cp; struct args_value *value; @@ -93,12 +94,15 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) size = -1; server_unzoom_window(wp->window); + input = (args_has(args, 'I') && args->argc == 0); flags = 0; if (args_has(args, 'b')) flags |= SPAWN_BEFORE; if (args_has(args, 'f')) flags |= SPAWN_FULLSIZE; + if (input || (args->argc == 1 && *args->argv[0] == '\0')) + flags |= SPAWN_EMPTY; lc = layout_split_pane(wp, type, size, flags); if (lc == NULL) { @@ -133,10 +137,18 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) sc.flags |= SPAWN_DETACHED; if ((new_wp = spawn_pane(&sc, &cause)) == NULL) { + layout_close_pane(new_wp); cmdq_error(item, "create pane failed: %s", cause); free(cause); return (CMD_RETURN_ERROR); } + if (input && window_pane_start_input(new_wp, item, &cause) != 0) { + layout_close_pane(new_wp); + window_remove_pane(wp->window, new_wp); + cmdq_error(item, "%s", cause); + free(cause); + return (CMD_RETURN_ERROR); + } if (!args_has(args, 'd')) cmd_find_from_winlink_pane(current, wl, new_wp, 0); server_redraw_window(wp->window); @@ -154,5 +166,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) cmdq_insert_hook(s, item, &fs, "after-split-window"); environ_free(sc.environ); + if (input) + return (CMD_RETURN_WAIT); return (CMD_RETURN_NORMAL); } |