diff options
| -rw-r--r-- | options-table.c | 8 | ||||
| -rw-r--r-- | server-client.c | 4 | ||||
| -rw-r--r-- | status.c | 28 | ||||
| -rw-r--r-- | tmux.h | 3 |
4 files changed, 37 insertions, 6 deletions
diff --git a/options-table.c b/options-table.c index 403509ba..51000a73 100644 --- a/options-table.c +++ b/options-table.c @@ -124,7 +124,7 @@ const struct options_table_entry options_table[] = { .type = OPTIONS_TABLE_ARRAY, .scope = OPTIONS_TABLE_SERVER, .default_str = "xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007" - ":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007" + ":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007" ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT", .separator = "," }, @@ -484,7 +484,7 @@ const struct options_table_entry options_table[] = { .type = OPTIONS_TABLE_ARRAY, .scope = OPTIONS_TABLE_SESSION, .default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID " - "SSH_CONNECTION WINDOWID XAUTHORITY" + "SSH_CONNECTION WINDOWID XAUTHORITY" }, { .name = "visual-activity", @@ -539,7 +539,7 @@ const struct options_table_entry options_table[] = { .type = OPTIONS_TABLE_STRING, .scope = OPTIONS_TABLE_WINDOW, .default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}" - "#{?pane_dead,[dead],}" + "#{?pane_dead,[dead],}" }, { .name = "clock-mode-colour", @@ -697,7 +697,7 @@ const struct options_table_entry options_table[] = { .type = OPTIONS_TABLE_STRING, .scope = OPTIONS_TABLE_WINDOW, .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] " - "\"#{pane_title}\"" + "\"#{pane_title}\"" }, { .name = "pane-border-status", diff --git a/server-client.c b/server-client.c index 18371bd4..6716b503 100644 --- a/server-client.c +++ b/server-client.c @@ -273,6 +273,10 @@ server_client_lost(struct client *c) if (event_initialized(&c->status_timer)) evtimer_del(&c->status_timer); screen_free(&c->status); + if (c->old_status != NULL) { + screen_free(c->old_status); + free(c->old_status); + } free(c->title); free((void *)c->cwd); @@ -301,6 +301,13 @@ status_redraw(struct client *c) size_t llen, rlen, seplen; int larrow, rarrow; + /* Delete the saved status line, if any. */ + if (c->old_status != NULL) { + screen_free(c->old_status); + free(c->old_status); + c->old_status = NULL; + } + /* No status line? */ if (c->tty.sy == 0 || !options_get_number(s->options, "status")) return (1); @@ -568,6 +575,12 @@ status_message_set(struct client *c, const char *fmt, ...) status_message_clear(c); + if (c->old_status == NULL) { + c->old_status = xmalloc(sizeof *c->old_status); + memcpy(c->old_status, &c->status, sizeof *c->old_status); + screen_init(&c->status, c->tty.sx, 1, 0); + } + va_start(ap, fmt); xvasprintf(&c->message_string, fmt, ap); va_end(ap); @@ -664,13 +677,24 @@ status_prompt_set(struct client *c, const char *msg, const char *input, ft = format_create(c, NULL, FORMAT_NONE, 0); format_defaults(ft, c, NULL, NULL, NULL); - t = time(NULL); - tmp = format_expand_time(ft, input, t); + + if (input == NULL) + input = ""; + if (flags & PROMPT_NOFORMAT) + tmp = xstrdup(input); + else + tmp = format_expand_time(ft, input, t); status_message_clear(c); status_prompt_clear(c); + if (c->old_status == NULL) { + c->old_status = xmalloc(sizeof *c->old_status); + memcpy(c->old_status, &c->status, sizeof *c->old_status); + screen_init(&c->status, c->tty.sx, 1, 0); + } + c->prompt_string = format_expand_time(ft, msg, t); c->prompt_buffer = utf8_fromcstr(tmp); @@ -1332,6 +1332,8 @@ struct client { struct event status_timer; struct screen status; + struct screen *old_status; + #define CLIENT_TERMINAL 0x1 #define CLIENT_LOGIN 0x2 #define CLIENT_EXIT 0x4 @@ -1380,6 +1382,7 @@ struct client { #define PROMPT_SINGLE 0x1 #define PROMPT_NUMERIC 0x2 #define PROMPT_INCREMENTAL 0x4 +#define PROMPT_NOFORMAT 0x8 int prompt_flags; struct session *session; |