diff options
| author | nicm <nicm> | 2021-08-12 20:44:49 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2021-08-12 20:44:49 +0000 |
| commit | db9195463d454d076328e69543194452da26c691 (patch) | |
| tree | 82e042c7cdf55e388238bbbbe15dcb932d4c6f31 /options-table.c | |
| parent | 6feb8f6505441583bb9f289da2227954c8335ce4 (diff) | |
Now that styles can contain formats, they need to be expanded when
inserted into the status line.
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/options-table.c b/options-table.c index 2a6f262a..607a90b6 100644 --- a/options-table.c +++ b/options-table.c @@ -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]" \ |