From fecf8dc44ee88bd5aee02035d13b118fa514f253 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 23 Sep 2009 14:42:48 +0000 Subject: [PATCH] Remove PROMPT_HIDDEN code which is now unused. --- status.c | 25 +++++-------------------- tmux.h | 3 +-- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/status.c b/status.c index 6527630c..3ffee331 100644 --- a/status.c +++ b/status.c @@ -673,8 +673,6 @@ status_prompt_clear(struct client *c) xfree(c->prompt_string); c->prompt_string = NULL; - if (c->prompt_flags & PROMPT_HIDDEN) - memset(c->prompt_buffer, 0, strlen(c->prompt_buffer)); xfree(c->prompt_buffer); c->prompt_buffer = NULL; @@ -739,26 +737,17 @@ status_prompt_redraw(struct client *c) left--; size = left; } - if (c->prompt_flags & PROMPT_HIDDEN) - size = 0; - else { - screen_write_puts(&ctx, &gc, - "%.*s", (int) left, c->prompt_buffer + off); - } + screen_write_puts( + &ctx, &gc, "%.*s", (int) left, c->prompt_buffer + off); for (i = len + size; i < c->tty.sx; i++) screen_write_putc(&ctx, &gc, ' '); /* Draw a fake cursor. */ ch = ' '; - if (c->prompt_flags & PROMPT_HIDDEN) - screen_write_cursormove(&ctx, len, 0); - else { - screen_write_cursormove(&ctx, - len + c->prompt_index - off, 0); - if (c->prompt_index < strlen(c->prompt_buffer)) - ch = c->prompt_buffer[c->prompt_index]; - } + screen_write_cursormove(&ctx, len + c->prompt_index - off, 0); + if (c->prompt_index < strlen(c->prompt_buffer)) + ch = c->prompt_buffer[c->prompt_index]; gc.attr ^= GRID_ATTR_REVERSE; screen_write_putc(&ctx, &gc, ch); } @@ -892,8 +881,6 @@ status_prompt_key(struct client *c, int key) case MODEKEYEDIT_HISTORYUP: if (ARRAY_LENGTH(&c->prompt_hdata) == 0) break; - if (c->prompt_flags & PROMPT_HIDDEN) - memset(c->prompt_buffer, 0, strlen(c->prompt_buffer)); xfree(c->prompt_buffer); c->prompt_buffer = xstrdup(ARRAY_ITEM(&c->prompt_hdata, @@ -905,8 +892,6 @@ status_prompt_key(struct client *c, int key) c->flags |= CLIENT_STATUS; break; case MODEKEYEDIT_HISTORYDOWN: - if (c->prompt_flags & PROMPT_HIDDEN) - memset(c->prompt_buffer, 0, strlen(c->prompt_buffer)); xfree(c->prompt_buffer); if (c->prompt_hindex != 0) { diff --git a/tmux.h b/tmux.h index 5ec263e7..46117659 100644 --- a/tmux.h +++ b/tmux.h @@ -958,8 +958,7 @@ struct client { void (*prompt_freefn)(void *); void *prompt_data; -#define PROMPT_HIDDEN 0x1 -#define PROMPT_SINGLE 0x2 +#define PROMPT_SINGLE 0x1 int prompt_flags; u_int prompt_hindex;