summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm>2019-03-19 21:09:51 +0000
committernicm <nicm>2019-03-19 21:09:51 +0000
commit8b74e959efd3b60aa1283b9c1cb1ce943ee90181 (patch)
tree5b700f886885b66e81982cb643945b943a66f438
parent161b57869e12a0fd8a95965e98b4866f6055f860 (diff)
Include window-status-style and window-status-current style in the format.
-rw-r--r--options-table.c42
1 files changed, 30 insertions, 12 deletions
diff --git a/options-table.c b/options-table.c
index d4a64b38..b3bc84da 100644
--- a/options-table.c
+++ b/options-table.c
@@ -74,25 +74,43 @@ static const char *options_table_window_size_list[] = {
"#[list=on align=#{status-justify}]" \
"#[list=left-marker]<#[list=right-marker]>#[list=on]" \
"#{W:" \
- "#[range=window|#{window_index}" \
- "#{?window_last_flag, #{window-status-last-style},}" \
- "#{?window_bell_flag," \
- " #{window-status-bell-style}," \
- "#{?window_activity_flag," \
- " #{window-status-activity-style},}" \
+ "#[range=window|#{window_index} " \
+ "#{window-status-style}" \
+ "#{?#{&&:#{window_last_flag}," \
+ "#{!=:#{window-status-last-style},default}}, " \
+ "#{window-status-last-style}," \
+ "}" \
+ "#{?#{&&:#{window_bell_flag}," \
+ "#{!=:#{window-status-bell-style},default}}, " \
+ "#{window-status-bell-style}," \
+ "#{?#{&&:#{window_activity_flag}," \
+ "#{!=:" \
+ "#{window-status-activity-style}," \
+ "default}}, " \
+ "#{window-status-activity-style}," \
"}" \
+ "}" \
"]" \
"#{T:window-status-format}" \
"#[norange default]" \
"#{?window_end_flag,,#{window-status-separator}}" \
"," \
- "#[range=window|#{window_index} list=focus" \
- "#{?window_last_flag, #{window-status-last-style},}" \
- "#{?window_bell_flag," \
- " #{window-status-bell-style}," \
- "#{?window_activity_flag," \
- " #{window-status-activity-style},}" \
+ "#[range=window|#{window_index} list=focus " \
+ "#{window-status-current-style}" \
+ "#{?#{&&:#{window_last_flag}," \
+ "#{!=:#{window-status-last-style},default}}, " \
+ "#{window-status-last-style}," \
+ "}" \
+ "#{?#{&&:#{window_bell_flag}," \
+ "#{!=:#{window-status-bell-style},default}}, " \
+ "#{window-status-bell-style}," \
+ "#{?#{&&:#{window_activity_flag}," \
+ "#{!=:" \
+ "#{window-status-activity-style}," \
+ "default}}, " \
+ "#{window-status-activity-style}," \
"}" \
+ "}" \
"]" \
"#{T:window-status-current-format}" \
"#[norange list=on default]" \