From ad93cb761c7ce0cd484a102a180dedbd5d7938ec Mon Sep 17 00:00:00 2001
From: Determinant <tederminant@gmail.com>
Date: Sat, 23 May 2020 14:36:16 -0400
Subject: ...

---
 README.rst         |  3 ++-
 tmux-colortag.tmux | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/README.rst b/README.rst
index 575000e..c45c955 100644
--- a/README.rst
+++ b/README.rst
@@ -93,8 +93,9 @@ Customization
 - Other tweakable variables:
 
   - ``TMUX_COLORTAG_TAG_BOLD``: specify ``yes`` if you want bold tag text
-  - ``TMUX_COLORTAG_TAG_FOCUS_HIGHLIGHT``: specify ``yes`` if you want highlighted text for the active tag
   - ``TMUX_COLORTAG_TAG_FOCUS_UNDERLINE``: specify ``yes`` if you want underlined text for the active tag
+  - ``TMUX_COLORTAG_TAG_TEXT_COLOR``
+  - ``TMUX_COLORTAG_TAG_FOCUS_TEXT_COLOR``
   - ``TMUX_ARROW_SYMBOL_L1``
   - ``TMUX_ARROW_SYMBOL_L2``
   - ``TMUX_ARROW_SYMBOL_R1``
diff --git a/tmux-colortag.tmux b/tmux-colortag.tmux
index b24d809..4ddd255 100755
--- a/tmux-colortag.tmux
+++ b/tmux-colortag.tmux
@@ -6,7 +6,6 @@ TMUX_COLORTAG_TAG_ONLY="${TMUX_COLORTAG_TAG_ONLY:-no}"
 TMUX_COLORTAG_USE_POWERLINE="${TMUX_COLORTAG_USE_POWERLINE:-no}"
 TMUX_COLORTAG_KEY="${TMUX_COLORTAG_KEY:-C}"
 TMUX_COLORTAG_TAG_BOLD="${TMUX_COLORTAG_TAG_BOLD:-no}"
-TMUX_COLORTAG_TAG_FOCUS_HIGHLIGHT="${TMUX_COLORTAG_TAG_FOCUS_HIGHLIGHT:-yes}"
 TMUX_COLORTAG_TAG_FOCUS_UNDERLINE="${TMUX_COLORTAG_TAG_FOCUS_UNDERLINE:-yes}"
 
 if [[ "$TMUX_COLORTAG_SET_INTERVAL" == yes ]]; then
@@ -30,8 +29,11 @@ white1=${colortag_white1:-colour250}
 lightgray=${colortag_lightgray:-colour248}
 darkgray=${colortag_darkgray:-colour241}
 
+TMUX_COLORTAG_TAG_FOCUS_TEXT_COLOR="${TMUX_COLORTAG_TAG_FOCUS_TEXT_COLOR:-$white0}"
+TMUX_COLORTAG_TAG_TEXT_COLOR="${TMUX_COLORTAG_TAG_TEXT_COLOR:-$bg1}"
+
 if [[ "$TMUX_COLORTAG_TAG_FOCUS_HIGHLIGHT" == yes ]]; then
-    tab_focus_fg="$white0"
+    tab_focus_fg="$TMUX_COLORTAG_TAG_FOCUS_HIGHLIGHT"
 fi
 
 if [[ "$TMUX_COLORTAG_TAG_ONLY" != yes ]]; then
@@ -59,11 +61,12 @@ RIGHTBAR_HOST="#[fg=$bg1,bg=$lightgray]"
 RIGHTBAR_HOST0="#[fg=$lightgray,bg=$darkgray]"
 LOAD_DISP="#(awk '{print \$1, \$2, \$3}' /proc/loadavg)"
 TAB_COLOR="#(\"$CURRENT_DIR/name2color.py\" #S #I #W)"
-TAB_NORMAL_BEGIN="#[fg=$bg1,bg=${TAB_COLOR}$tab_text_attr]"
-TAB_END="#[fg=$TAB_COLOR,bg=$bg1]"
+TAB_PREBEGIN="#[fg=$bg1,bg=${TAB_COLOR}]"
+TAB_NORMAL_BEGIN="#[fg=${TMUX_COLORTAG_TAG_TEXT_COLOR}$tab_text_attr]"
+TAB_END="#[fg=$TAB_COLOR,bg=$bg1,none]"
 TAB_FOCUS_BEGIN_BG="#[bg=$TAB_COLOR]"
-TAB_FOCUS_BEGIN_FG="#[fg=$tab_focus_fg$focus_tab_text_attr]"
-TAB_FOCUS_PREEND_FG="#[fg=$tab_focus_fg,none]"
+TAB_FOCUS_BEGIN_FG="#[fg=$TMUX_COLORTAG_TAG_FOCUS_TEXT_COLOR$focus_tab_text_attr]"
+TAB_PREEND_FG="#[fg=${TMUX_COLORTAG_TAG_TEXT_COLOR},none]"
 TAB_FOCUS_BEGIN="${TAB_FOCUS_BEGIN_BG}${TAB_FOCUS_BEGIN_FG}"
 
 if [[ "$TMUX_COLORTAG_USE_POWERLINE" == no ]]; then
@@ -72,8 +75,8 @@ if [[ "$TMUX_COLORTAG_USE_POWERLINE" == no ]]; then
         tmux set -g status-left  "${LEFTBAR_FORMAT} ${RECOVER_BG} "
         tmux set -g status-right "${RIGHTBAR_DEFAULT} ${LOAD_DISP} ${RIGHTBAR_HOST} #h "
     fi
-    tmux set -g window-status-format "${TAB_NORMAL_BEGIN} #I${TMUX_COLORTAG_IDX_SEP}#W ${TAB_END} "
-    tmux set -g window-status-current-format "${TAB_FOCUS_BEGIN} #I${TMUX_COLORTAG_IDX_SEP}#W ${TAB_END} "
+    tmux set -g window-status-format "${TAB_PREBEGIN} ${TAB_NORMAL_BEGIN}#I${TMUX_COLORTAG_IDX_SEP}#W ${TAB_END} "
+    tmux set -g window-status-current-format "${TAB_PREBEGIN} ${TAB_FOCUS_BEGIN}#I${TMUX_COLORTAG_IDX_SEP}#W${TAB_PREEND_FG} ${TAB_END} "
 else
     TMUX_ARROW_SYMBOL_L1="${TMUX_ARROW_SYMBOL_L1:-$(printf '\ue0b6')}"
     TMUX_ARROW_SYMBOL_L2="${TMUX_ARROW_SYMBOL_L2:-$(printf '\ue0b7')}"
@@ -90,11 +93,11 @@ else
             "${RIGHTBAR_HOST}#h ")"
     fi
     tmux set -g window-status-format "$(printf %s \
-        "${TAB_NORMAL_BEGIN}$TMUX_ARROW_SYMBOL_R1 " \
+        "${TAB_PREBEGIN}$TMUX_ARROW_SYMBOL_R1 ${TAB_NORMAL_BEGIN}" \
         "#I${TMUX_COLORTAG_IDX_SEP}#W${TAB_END}$TMUX_ARROW_SYMBOL_R1 ")"
     tmux set -g window-status-current-format "$(printf %s \
         "${TAB_FOCUS_BEGIN_BG}$TMUX_ARROW_SYMBOL_R1 " \
-        "${TAB_FOCUS_BEGIN_FG}#I${TMUX_COLORTAG_IDX_SEP}#W${TAB_FOCUS_PREEND_FG}${TAB_END}$TMUX_ARROW_SYMBOL_R1 ")"
+        "${TAB_FOCUS_BEGIN_FG}#I${TMUX_COLORTAG_IDX_SEP}#W${TAB_PREEND_FG}${TAB_END}$TMUX_ARROW_SYMBOL_R1 ")"
 fi
 
 tmux bind-key "$TMUX_COLORTAG_KEY" run-shell "'$CURRENT_DIR/tmux-colortag-prompt.sh' prompt"
-- 
cgit v1.2.3