diff options
Diffstat (limited to 'usr.bin/tmux/status.c')
| -rw-r--r-- | usr.bin/tmux/status.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 4046cdca43c..f8f9145d6c4 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.75 2011/04/29 07:07:31 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.76 2011/07/02 21:05:44 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -815,7 +815,7 @@ status_message_redraw(struct client *c) /* Enable status line prompt. */ void -status_prompt_set(struct client *c, const char *msg, +status_prompt_set(struct client *c, const char *msg, const char *input, int (*callbackfn)(void *, const char *), void (*freefn)(void *), void *data, int flags) { @@ -826,8 +826,11 @@ status_prompt_set(struct client *c, const char *msg, c->prompt_string = xstrdup(msg); - c->prompt_buffer = xstrdup(""); - c->prompt_index = 0; + if (input != NULL) + c->prompt_buffer = xstrdup(input); + else + c->prompt_buffer = xstrdup(""); + c->prompt_index = strlen(c->prompt_buffer); c->prompt_callbackfn = callbackfn; c->prompt_freefn = freefn; @@ -871,13 +874,17 @@ status_prompt_clear(struct client *c) /* Update status line prompt with a new prompt string. */ void -status_prompt_update(struct client *c, const char *msg) +status_prompt_update(struct client *c, const char *msg, const char *input) { xfree(c->prompt_string); c->prompt_string = xstrdup(msg); - *c->prompt_buffer = '\0'; - c->prompt_index = 0; + xfree(c->prompt_buffer); + if (input != NULL) + c->prompt_buffer = xstrdup(input); + else + c->prompt_buffer = xstrdup(""); + c->prompt_index = strlen(c->prompt_buffer); c->prompt_hindex = 0; |