diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2011-05-20 19:29:14 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2011-05-20 19:29:14 +0000 |
| commit | d7481c5bb0fe6be22dc89d485225a4f2a4634754 (patch) | |
| tree | 67b154436f869303e7847aa846f2179244416f7e /usr.bin | |
| parent | ff8ad25ad14b0c0f9380db5b7d122417e2e90751 (diff) | |
Pass prompts through status_replace so that they can be more helpful
(such as showing the previous session name when renaming). From Tiago
Cunha.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/cmd-command-prompt.c | 19 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 11 |
2 files changed, 23 insertions, 7 deletions
diff --git a/usr.bin/tmux/cmd-command-prompt.c b/usr.bin/tmux/cmd-command-prompt.c index 480afdccdeb..3b5f0f793f8 100644 --- a/usr.bin/tmux/cmd-command-prompt.c +++ b/usr.bin/tmux/cmd-command-prompt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-command-prompt.c,v 1.15 2011/01/05 22:38:28 nicm Exp $ */ +/* $OpenBSD: cmd-command-prompt.c,v 1.16 2011/05/20 19:29:13 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -82,7 +82,7 @@ cmd_command_prompt_exec(struct cmd *self, struct cmd_ctx *ctx) const char *prompts; struct cmd_command_prompt_cdata *cdata; struct client *c; - char *prompt, *ptr; + char *prompt, *prompt_replaced, *ptr; size_t n; if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) @@ -116,8 +116,12 @@ cmd_command_prompt_exec(struct cmd *self, struct cmd_ctx *ctx) ptr = strsep(&cdata->next_prompt, ","); if (prompts == NULL) prompt = xstrdup(ptr); - else - xasprintf(&prompt, "%s ", ptr); + else { + prompt_replaced = status_replace(c, NULL, NULL, NULL, ptr, + time(NULL), 0); + xasprintf(&prompt, "%s ", prompt_replaced); + xfree(prompt_replaced); + } status_prompt_set(c, prompt, cmd_command_prompt_callback, cmd_command_prompt_free, cdata, 0); xfree(prompt); @@ -133,6 +137,7 @@ cmd_command_prompt_callback(void *data, const char *s) struct cmd_list *cmdlist; struct cmd_ctx ctx; char *cause, *newtempl, *prompt, *ptr; + char *prompt_replaced; if (s == NULL) return (0); @@ -142,8 +147,12 @@ cmd_command_prompt_callback(void *data, const char *s) cdata->template = newtempl; if ((ptr = strsep(&cdata->next_prompt, ",")) != NULL) { - xasprintf(&prompt, "%s ", ptr); + prompt_replaced = status_replace(c, NULL, NULL, NULL, ptr, + time(NULL), 0); + xasprintf(&prompt, "%s ", prompt_replaced); status_prompt_update(c, prompt); + + xfree(prompt_replaced); xfree(prompt); cdata->idx++; return (1); diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 7b243c66532..e86cdf9d610 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.230 2011/05/20 19:17:39 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.231 2011/05/20 19:29:13 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -1255,7 +1255,7 @@ The .Ar shell-command string may contain the special character sequences supported by the .Ic status-left -command. +option. If no .Ar shell-command is given, the current pipe (if any) is closed. @@ -2624,6 +2624,7 @@ Open the command prompt in a client. This may be used from inside .Nm to execute commands interactively. +.Pp If .Ar template is specified, it is used as the command. @@ -2637,6 +2638,12 @@ a single prompt is displayed, constructed from if it is present, or .Ql \&: if not. +The +.Ar prompts +may contain the special character sequences supported by the +.Ic status-left +option. +.Pp Before the command is executed, the first occurrence of the string .Ql %% and all occurrences of |