diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-03-19 22:02:36 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-03-19 22:02:36 +0000 |
| commit | 46f642b030e949b23de482ea1f9a27ace6f4cf92 (patch) | |
| tree | da092c35f02b2b8e3528f4f786a23fcb627edfde /options-table.c | |
| parent | 320237fdb83e18f5c2a83d89ebf043a3c516998e (diff) | |
| parent | 8b74e959efd3b60aa1283b9c1cb1ce943ee90181 (diff) | |
Merge branch 'obsd-master'
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/options-table.c b/options-table.c index 4afe7e52..541e66f2 100644 --- a/options-table.c +++ b/options-table.c @@ -73,25 +73,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]" \ |