circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 22:43:58 +00:00
Code Issues Projects Releases Wiki Activity

Store a copy of the old status line, will be needed soon for new choose mode.

Browse Source
This commit is contained in:
nicm
2017-05-29 20:41:29 +00:00
parent 8a214b2f8e
commit b95e5827c1
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
options-table.c
View File

@ -125,7 +125,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_ARRAY, .type = OPTIONS_TABLE_ARRAY,
.scope = OPTIONS_TABLE_SERVER, .scope = OPTIONS_TABLE_SERVER,
.default_str = "xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007" .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", ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT",
.separator = "," .separator = ","
}, },
@ -485,7 +485,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_ARRAY, .type = OPTIONS_TABLE_ARRAY,
.scope = OPTIONS_TABLE_SESSION, .scope = OPTIONS_TABLE_SESSION,
.default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID " .default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID "
"SSH_CONNECTION WINDOWID XAUTHORITY" "SSH_CONNECTION WINDOWID XAUTHORITY"
}, },
{ .name = "visual-activity", { .name = "visual-activity",
@ -540,7 +540,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_STRING, .type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW, .scope = OPTIONS_TABLE_WINDOW,
.default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}" .default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}"
"#{?pane_dead,[dead],}" "#{?pane_dead,[dead],}"
}, },
{ .name = "clock-mode-colour", { .name = "clock-mode-colour",
@ -698,7 +698,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_STRING, .type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW, .scope = OPTIONS_TABLE_WINDOW,
.default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] " .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] "
"\"#{pane_title}\"" "\"#{pane_title}\""
}, },
{ .name = "pane-border-status", { .name = "pane-border-status",

4
server-client.c
View File

@ -275,6 +275,10 @@ server_client_lost(struct client *c)
if (event_initialized(&c->status_timer)) if (event_initialized(&c->status_timer))
evtimer_del(&c->status_timer); evtimer_del(&c->status_timer);
screen_free(&c->status); screen_free(&c->status);
if (c->old_status != NULL) {
screen_free(c->old_status);
free(c->old_status);
}
free(c->title); free(c->title);
free((void *)c->cwd); free((void *)c->cwd);