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-display-message.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-display-message.c')
| -rw-r--r-- | cmd-display-message.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/cmd-display-message.c b/cmd-display-message.c index 2e935908..8c1ad5f6 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -39,8 +39,8 @@ const struct cmd_entry cmd_display_message_entry = { .name = "display-message", .alias = "display", - .args = { "ac:pt:F:v", 0, 1 }, - .usage = "[-apv] [-c target-client] [-F format] " + .args = { "ac:Ipt:F:v", 0, 1 }, + .usage = "[-aIpv] [-c target-client] [-F format] " CMD_TARGET_PANE_USAGE " [message]", .target = { 't', CMD_FIND_PANE, 0 }, @@ -66,10 +66,19 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item) struct winlink *wl = item->target.wl; struct window_pane *wp = item->target.wp; const char *template; - char *msg; + char *msg, *cause; struct format_tree *ft; int flags; + if (args_has(args, 'I')) { + if (window_pane_start_input(wp, item, &cause) != 0) { + cmdq_error(item, "%s", cause); + free(cause); + return (CMD_RETURN_ERROR); + } + return (CMD_RETURN_WAIT); + } + if (args_has(args, 'F') && args->argc != 0) { cmdq_error(item, "only one of -F or argument must be given"); return (CMD_RETURN_ERROR); |