mirror of
https://github.com/tmux/tmux.git
synced 2025-03-29 10:18:49 +00:00
Now that styles can contain formats, they need to be expanded when
inserted into the status line.
This commit is contained in:
parent
6feb8f6505
commit
db9195463d
@ -81,7 +81,7 @@ static const char *options_table_extended_keys_list[] = {
|
||||
|
||||
/* Status line format. */
|
||||
#define OPTIONS_TABLE_STATUS_FORMAT1 \
|
||||
"#[align=left range=left #{status-left-style}]" \
|
||||
"#[align=left range=left #{E:status-left-style}]" \
|
||||
"#[push-default]" \
|
||||
"#{T;=/#{status-left-length}:status-left}" \
|
||||
"#[pop-default]" \
|
||||
@ -90,20 +90,20 @@ static const char *options_table_extended_keys_list[] = {
|
||||
"#[list=left-marker]<#[list=right-marker]>#[list=on]" \
|
||||
"#{W:" \
|
||||
"#[range=window|#{window_index} " \
|
||||
"#{window-status-style}" \
|
||||
"#{E:window-status-style}" \
|
||||
"#{?#{&&:#{window_last_flag}," \
|
||||
"#{!=:#{window-status-last-style},default}}, " \
|
||||
"#{window-status-last-style}," \
|
||||
"#{!=:#{E:window-status-last-style},default}}, " \
|
||||
"#{E:window-status-last-style}," \
|
||||
"}" \
|
||||
"#{?#{&&:#{window_bell_flag}," \
|
||||
"#{!=:#{window-status-bell-style},default}}, " \
|
||||
"#{window-status-bell-style}," \
|
||||
"#{!=:#{E:window-status-bell-style},default}}, " \
|
||||
"#{E:window-status-bell-style}," \
|
||||
"#{?#{&&:#{||:#{window_activity_flag}," \
|
||||
"#{window_silence_flag}}," \
|
||||
"#{!=:" \
|
||||
"#{window-status-activity-style}," \
|
||||
"#{E:window-status-activity-style}," \
|
||||
"default}}, " \
|
||||
"#{window-status-activity-style}," \
|
||||
"#{E:window-status-activity-style}," \
|
||||
"}" \
|
||||
"}" \
|
||||
"]" \
|
||||
@ -114,23 +114,23 @@ static const char *options_table_extended_keys_list[] = {
|
||||
"#{?window_end_flag,,#{window-status-separator}}" \
|
||||
"," \
|
||||
"#[range=window|#{window_index} list=focus " \
|
||||
"#{?#{!=:#{window-status-current-style},default}," \
|
||||
"#{window-status-current-style}," \
|
||||
"#{window-status-style}" \
|
||||
"#{?#{!=:#{E:window-status-current-style},default}," \
|
||||
"#{E:window-status-current-style}," \
|
||||
"#{E:window-status-style}" \
|
||||
"}" \
|
||||
"#{?#{&&:#{window_last_flag}," \
|
||||
"#{!=:#{window-status-last-style},default}}, " \
|
||||
"#{window-status-last-style}," \
|
||||
"#{!=:#{E:window-status-last-style},default}}, " \
|
||||
"#{E:window-status-last-style}," \
|
||||
"}" \
|
||||
"#{?#{&&:#{window_bell_flag}," \
|
||||
"#{!=:#{window-status-bell-style},default}}, " \
|
||||
"#{window-status-bell-style}," \
|
||||
"#{!=:#{E:window-status-bell-style},default}}, " \
|
||||
"#{E:window-status-bell-style}," \
|
||||
"#{?#{&&:#{||:#{window_activity_flag}," \
|
||||
"#{window_silence_flag}}," \
|
||||
"#{!=:" \
|
||||
"#{window-status-activity-style}," \
|
||||
"#{E:window-status-activity-style}," \
|
||||
"default}}, " \
|
||||
"#{window-status-activity-style}," \
|
||||
"#{E:window-status-activity-style}," \
|
||||
"}" \
|
||||
"}" \
|
||||
"]" \
|
||||
@ -140,7 +140,7 @@ static const char *options_table_extended_keys_list[] = {
|
||||
"#[norange list=on default]" \
|
||||
"#{?window_end_flag,,#{window-status-separator}}" \
|
||||
"}" \
|
||||
"#[nolist align=right range=right #{status-right-style}]" \
|
||||
"#[nolist align=right range=right #{E:status-right-style}]" \
|
||||
"#[push-default]" \
|
||||
"#{T;=/#{status-right-length}:status-right}" \
|
||||
"#[pop-default]" \
|
||||
|
Loading…
Reference in New Issue
Block a user