mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

When display-message used in config file, show the message after the

Browse Source 
config file finishes. GitHub issue 2637.
This commit is contained in:
nicm
2021-04-07 12:49:33 +00:00
parent ba99996676
commit 1ac47400d2
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd-display-message.c
View File

@@ -43,7 +43,7 @@ const struct cmd_entry cmd_display_message_entry = {
.usage = "[-aIpv] [-c target-client] [-d delay] [-F format] " .usage = "[-aIpv] [-c target-client] [-d delay] [-F format] "
CMD_TARGET_PANE_USAGE " [message]", CMD_TARGET_PANE_USAGE " [message]",
.target = { 't', CMD_FIND_PANE, 0 }, .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
.flags = CMD_AFTERHOOK|CMD_CLIENT_CFLAG|CMD_CLIENT_CANFAIL, .flags = CMD_AFTERHOOK|CMD_CLIENT_CFLAG|CMD_CLIENT_CANFAIL,
.exec = cmd_display_message_exec .exec = cmd_display_message_exec
@@ -73,6 +73,8 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
int flags; int flags;
if (args_has(args, 'I')) { if (args_has(args, 'I')) {
if (wp == NULL)
return (CMD_RETURN_NORMAL);
if (window_pane_start_input(wp, item, &cause) != 0) { if (window_pane_start_input(wp, item, &cause) != 0) {
cmdq_error(item, "%s", cause); cmdq_error(item, "%s", cause);
free(cause); free(cause);
@@ -109,8 +111,10 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
*/ */
if (tc != NULL && tc->session == s) if (tc != NULL && tc->session == s)
c = tc; c = tc;
else else if (s != NULL)
c = cmd_find_best_client(s); c = cmd_find_best_client(s);
else
c = NULL;
if (args_has(args, 'v')) if (args_has(args, 'v'))
flags = FORMAT_VERBOSE; flags = FORMAT_VERBOSE;
else else
@@ -124,7 +128,9 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
} }
msg = format_expand_time(ft, template); msg = format_expand_time(ft, template);
if (args_has(args, 'p')) if (cmdq_get_client(item) == NULL)
cmdq_error(item, "%s", msg);
else if (args_has(args, 'p'))
cmdq_print(item, "%s", msg); cmdq_print(item, "%s", msg);
else if (tc != NULL) else if (tc != NULL)
status_message_set(tc, delay, 0, "%s", msg); status_message_set(tc, delay, 0, "%s", msg);