From d2454ac6b42ce1ba1c3e7fc28e89cccd3a6a3fd4 Mon Sep 17 00:00:00 2001 From: Jethro Cao Date: Sat, 21 Oct 2023 14:36:52 -0600 Subject: [PATCH 1/3] PoC: add support for all known pane modes (WIP) --- prefix_highlight.tmux | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/prefix_highlight.tmux b/prefix_highlight.tmux index c477ff7..7b54b9d 100755 --- a/prefix_highlight.tmux +++ b/prefix_highlight.tmux @@ -67,8 +67,18 @@ main() { local -r prefix_highlight="$(format_style "fg=$fg_color,bg=$bg_color")" local -r prefix_mode="$prefix_highlight$output_prefix$prefix_prompt$output_suffix" + # add support for all (known) pane modes + local -r pane_mode="#{s/-mode//:#{pane_mode}}" + local -r clock_mode_sub="#{#{?#{==:$pane_mode,clock},clck,#{pane_mode} is not yet supported; please report}}" + local -r options_mode_sub="#{#{?#{==:$pane_mode,options},opts,$clock_mode_sub}}" + local -r client_mode_sub="#{#{?#{==:$pane_mode,client},Clnt,$options_mode_sub}}" + local -r buffer_mode_sub="#{#{?#{==:$pane_mode,buffer},Bufr,$client_mode_sub}}" + local -r tree_mode_sub="#{#{?#{==:$pane_mode,tree},Tree,$buffer_mode_sub}}" + local -r view_mode_sub="#{#{?#{==:$pane_mode,view},View,$tree_mode_sub}}" + local -r copy_mode_sub="#{#{?#{==:$pane_mode,copy},Copy,$view_mode_sub}}" + local -r copy_highlight="$(format_style "${copy_attr:+default,$copy_attr}")" - local -r copy_mode="$copy_highlight$output_prefix$copy_prompt$output_suffix" + local -r copy_mode="$copy_highlight$output_prefix$copy_mode_sub$output_suffix" local -r sync_highlight="$(format_style "${sync_attr:+default,$sync_attr}")" local -r sync_mode="$sync_highlight$output_prefix$sync_prompt$output_suffix" From 1d6463776c5a990e36843543eba1580fa576e598 Mon Sep 17 00:00:00 2001 From: Jethro Cao Date: Sat, 21 Oct 2023 15:27:30 -0600 Subject: [PATCH 2/3] capitalize 'opts' to 'Opts' --- prefix_highlight.tmux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prefix_highlight.tmux b/prefix_highlight.tmux index 7b54b9d..946a8ce 100755 --- a/prefix_highlight.tmux +++ b/prefix_highlight.tmux @@ -70,7 +70,7 @@ main() { # add support for all (known) pane modes local -r pane_mode="#{s/-mode//:#{pane_mode}}" local -r clock_mode_sub="#{#{?#{==:$pane_mode,clock},clck,#{pane_mode} is not yet supported; please report}}" - local -r options_mode_sub="#{#{?#{==:$pane_mode,options},opts,$clock_mode_sub}}" + local -r options_mode_sub="#{#{?#{==:$pane_mode,options},Opts,$clock_mode_sub}}" local -r client_mode_sub="#{#{?#{==:$pane_mode,client},Clnt,$options_mode_sub}}" local -r buffer_mode_sub="#{#{?#{==:$pane_mode,buffer},Bufr,$client_mode_sub}}" local -r tree_mode_sub="#{#{?#{==:$pane_mode,tree},Tree,$buffer_mode_sub}}" From 0722fd5214bd199baf549562cfc66b7e5241d391 Mon Sep 17 00:00:00 2001 From: Jethro Cao Date: Sat, 21 Oct 2023 15:36:16 -0600 Subject: [PATCH 3/3] Use existing copy_prompt variable --- prefix_highlight.tmux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prefix_highlight.tmux b/prefix_highlight.tmux index 946a8ce..d18c46c 100755 --- a/prefix_highlight.tmux +++ b/prefix_highlight.tmux @@ -75,7 +75,7 @@ main() { local -r buffer_mode_sub="#{#{?#{==:$pane_mode,buffer},Bufr,$client_mode_sub}}" local -r tree_mode_sub="#{#{?#{==:$pane_mode,tree},Tree,$buffer_mode_sub}}" local -r view_mode_sub="#{#{?#{==:$pane_mode,view},View,$tree_mode_sub}}" - local -r copy_mode_sub="#{#{?#{==:$pane_mode,copy},Copy,$view_mode_sub}}" + local -r copy_mode_sub="#{#{?#{==:$pane_mode,copy},$copy_prompt,$view_mode_sub}}" local -r copy_highlight="$(format_style "${copy_attr:+default,$copy_attr}")" local -r copy_mode="$copy_highlight$output_prefix$copy_mode_sub$output_suffix"