From 7a95e9bf7ec80c7b87dda73749e59f359371d78a Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 6 May 2020 13:43:22 +0100 Subject: Change message log to be per server rather than per client and include every command that is run. --- cmd-show-messages.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'cmd-show-messages.c') diff --git a/cmd-show-messages.c b/cmd-show-messages.c index 02fdb9cd..d2f8289f 100644 --- a/cmd-show-messages.c +++ b/cmd-show-messages.c @@ -18,16 +18,19 @@ #include +#include #include -#include #include #include "tmux.h" /* - * Show client message log. + * Show message log. */ +#define SHOW_MESSAGES_TEMPLATE \ + "#{t/p:message_time}: #{message_text}" + static enum cmd_retval cmd_show_messages_exec(struct cmd *, struct cmdq_item *); @@ -71,10 +74,10 @@ static enum cmd_retval cmd_show_messages_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = cmd_get_args(self); - struct client *tc = cmdq_get_target_client(item); struct message_entry *msg; - char *tim; + char *s; int done, blank; + struct format_tree *ft; done = blank = 0; if (args_has(args, 'T')) { @@ -88,11 +91,17 @@ cmd_show_messages_exec(struct cmd *self, struct cmdq_item *item) if (done) return (CMD_RETURN_NORMAL); - TAILQ_FOREACH(msg, &tc->message_log, entry) { - tim = ctime(&msg->msg_time); - *strchr(tim, '\n') = '\0'; - cmdq_print(item, "%s %s", tim, msg->msg); + ft = format_create_from_target(item); + TAILQ_FOREACH_REVERSE(msg, &message_log, message_list, entry) { + format_add(ft, "message_text", "%s", msg->msg); + format_add(ft, "message_number", "%u", msg->msg_num); + format_add_tv(ft, "message_time", &msg->msg_time); + + s = format_expand(ft, SHOW_MESSAGES_TEMPLATE); + cmdq_print(item, "%s", s); + free(s); } + format_free(ft); return (CMD_RETURN_NORMAL); } -- cgit v1.2.3