@kecan0406/ttheme 1.2.16 → 1.2.18

package/shell/ttheme.zsh

@@ -2,6 +2,21 @@ typeset -g TTHEME_HOME=${${(%):-%x}:A:h} TTHEME_PALETTES_AT=""
 
 zmodload -F zsh/stat b:zstat 2>/dev/null
 
+typeset -gA TTHEME_SGR=(
+  reset $'\e[0m' /fg $'\e[39m' /bg $'\e[49m' /ink $'\e[39;49m'
+  dim $'\e[2m' /dim $'\e[22m'
+  bold $'\e[1m' /bold $'\e[22m'
+  under $'\e[4m' /under $'\e[24m'
+  reverse $'\e[7m' /reverse $'\e[27m'
+  accent $'\e[36m' /accent $'\e[39m'
+  pill $'\e[7;1;36m' /pill $'\e[22;27;39m'
+  match $'\e[1;4;36m' /match $'\e[22;24;39m'
+  ok $'\e[32m' /ok $'\e[39m'
+  warn $'\e[33m' /warn $'\e[39m'
+  error $'\e[31m' /error $'\e[39m'
+  fg0 $'\e[30m' fg1 $'\e[31m' fg2 $'\e[32m' fg3 $'\e[33m' fg4 $'\e[34m' fg5 $'\e[35m' fg6 $'\e[36m' fg7 $'\e[37m'
+)
+
 __tt_palettes_load() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
   local -a at
@@ -11,16 +26,38 @@ __tt_palettes_load() {
   TTHEME_PALETTES_AT=$at[1]
 }
 
+__tt_specs_named() {
+  local v REPLY
+  reply=()
+  for v in TTHEME_SPEC TTHEME_PIN_SPEC TTHEME_BASE_SPEC TTHEME_SSH_SPEC TTHEME_SSH_BACK; do
+    [[ -n ${(P)v} ]] || continue
+    __tt_name_of "${(P)v}"
+    [[ -n ${TTHEME_PALETTE[$REPLY]} ]] && reply+=($v $REPLY)
+  done
+}
+
+__tt_respec() {
+  local spec=$TTHEME_SPEC v n worn
+  for v n in "$@"; do
+    [[ -n ${TTHEME_PALETTE[$n]} ]] || continue
+    typeset -g $v=${TTHEME_PALETTE[$n]}
+    [[ $v == TTHEME_SPEC ]] && worn=$n
+  done
+  [[ -n $worn && -n $TTHEME_PAINTED && $TTHEME_SPEC != "$spec" ]] && __tt_wear "$TTHEME_SPEC" $worn
+  return 0
+}
+
 __tt_fresh() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
-  local -a at
+  local -a at reply
   local was=$TTHEME_STARTUP start="$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}"
   if ! zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/palettes.zsh 2>/dev/null; then
     [[ -e $TTHEME_HOME ]] || __tt_gone
     return 0
   fi
   if [[ $at[1] != "$TTHEME_PALETTES_AT" ]]; then
-    __tt_palettes_load && { __tt_follow "$start" && __tt_sync; __tt_reloaded }
+    __tt_specs_named
+    __tt_palettes_load && { __tt_respec $reply; __tt_follow "$start" && __tt_sync; __tt_reloaded }
     [[ -n $was && -z $TTHEME_STARTUP && -n $TTHEME_SPEC ]] && __tt_active && __tt_off_here
   fi
   at=("")
@@ -274,7 +311,7 @@ source $TTHEME_HOME/adapters/_wired.zsh
   source $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh
 
 __tt_empty() {
-  print -u2 'ttheme: no palettes installed yet — run `ttheme browse` to pick some'
+  print -u2 'ttheme: no palettes installed yet — run `ttheme` in a terminal to pick some, or `ttheme add <palette>`'
   return 1
 }
 
@@ -283,7 +320,7 @@ __tt_name_of() { REPLY=${${(k)TTHEME_PALETTE[(re)$1]}:-custom} }
 __tt_color() { [[ -t 1 && -z $NO_COLOR && $TERM != dumb ]] }
 
 __tt_announce() {
-  (( TTHEME_ANNOUNCE )) || return 0
+  (( TTHEME_ANNOUNCE )) && [[ -t 1 ]] || return 0
   local -a p=(${=TTHEME_SPEC})
   (( ${#p} >= 20 )) || return 0
   local REPLY
@@ -296,7 +333,7 @@ __tt_announce() {
     return 0
   fi
   local cur=${p[3]#\#} sel=${p[4]#\#}
-  printf '\033[48;2;%d;%d;%dm %s \033[0m\n\033[7;1;38;2;%d;%d;%dm %s \033[0m \033[2m· ANSI %s\033[0m\n' \
+  printf "\033[48;2;%d;%d;%dm %s ${TTHEME_SGR[reset]}\n${TTHEME_SGR[reverse]}${TTHEME_SGR[bold]}\033[38;2;%d;%d;%dm %s ${TTHEME_SGR[reset]} ${TTHEME_SGR[dim]}· ANSI %s${TTHEME_SGR[reset]}\n" \
     $((16#${sel:0:2})) $((16#${sel:2:2})) $((16#${sel:4:2})) "$grp" \
     $((16#${cur:0:2})) $((16#${cur:2:2})) $((16#${cur:4:2})) "$name" "$src"
 }
@@ -626,7 +663,7 @@ __tt_pin_save() {
   k=$REPLY
   __tt_pin_scope "$key"
   if __tt_color; then
-    printf '\033[2mPinned · %s → %s · %s\033[0m\n' "$name" "$k" "$REPLY"
+    printf "${TTHEME_SGR[dim]}Pinned · %s → %s · %s${TTHEME_SGR[reset]}\n" "$name" "$k" "$REPLY"
   else
     print -r -- "Pinned · $name → $k · $REPLY"
   fi
@@ -656,7 +693,7 @@ __tt_unpin_drop() {
   __tt_dir_sync
   for k in $gone; do
     if __tt_color; then
-      print -r -- $'\e[2m'"$k"$'\e[0m'
+      print -r -- $TTHEME_SGR[dim]"$k"$TTHEME_SGR[reset]
     else
       print -r -- "$k"
     fi
@@ -706,13 +743,13 @@ __tt_key() {
 }
 
 __tt_unpin_block() {
-  local b=$'\e[1m' d=$'\e[2m' z=$'\e[0m' on=$'\e[7;1m' bar plain keys top k home=${HOME:a} here=${PWD:a} htip="" REPLY
+  local b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] z=$TTHEME_SGR[reset] on=$TTHEME_SGR[pill] bar plain keys top k home=${HOME:a} here=${PWD:a} htip="" REPLY
   local -A own=() below=() parent=() mark=() tstrip=()
   local -a roots=() lp=() lpw=() ll=() lat=() lpal=() lnote=() lflag=() reply gone=(${(f)drops[$1]})
   local -i i width=$(( (COLUMNS > 0 ? COLUMNS : 80) - 1 )) room=$(( (LINES > 0 ? LINES : 24) - 3 ))
   (( color )) || b= d= z= on=
   if (( color )); then
-    bar=$'\e[7;1m UNPIN \e[0m ' plain="  UNPIN  "
+    bar=$TTHEME_SGR[pill]" UNPIN "$TTHEME_SGR[reset]" " plain="  UNPIN  "
   else
     bar="[UNPIN]" plain=$bar
   fi
@@ -738,7 +775,7 @@ __tt_unpin_block() {
   [[ -n $cover ]] && __tt_pin_base "$cover" && top=$REPLY
   __tt_map_build "$top"
   __tt_map_fit $width
-  (( ${#reply} > room )) && reply=("${(@)reply[1,room-1]}" "   …")
+  (( ${#reply} > room )) && reply=("${(@)reply[1,room-1]}" "    …")
   block=("$bar" "${reply[@]}")
   __tt_unpin_then $width $gone
   block+=("${reply[@]}")
@@ -909,7 +946,7 @@ __tt_clip() {
     (( w += cw ))
   done
   REPLY=$out…
-  [[ $1 == *$'\e'* ]] && REPLY+=$'\e[0m'
+  [[ $1 == *$'\e'* ]] && REPLY+=$TTHEME_SGR[reset]
   return 1
 }
 
@@ -927,10 +964,10 @@ __tt_map_chip() {
   if (( ! color )); then
     printf -v REPLY '%-*s' $2 "$1"
   elif (( ${#p} >= 20 )); then
-    printf -v REPLY '\e[48;2;%d;%d;%d;38;2;%d;%d;%dm %-*s \e[0m' $((16#${bg:0:2})) $((16#${bg:2:2})) $((16#${bg:4:2})) \
+    printf -v REPLY "\e[48;2;%d;%d;%d;38;2;%d;%d;%dm %-*s ${TTHEME_SGR[/ink]}" $((16#${bg:0:2})) $((16#${bg:2:2})) $((16#${bg:4:2})) \
       $((16#${fg:0:2})) $((16#${fg:2:2})) $((16#${fg:4:2})) $2 "$1"
   else
-    printf -v REPLY '\e[2m %-*s \e[0m' $2 "$1"
+    printf -v REPLY "${TTHEME_SGR[dim]} %-*s ${TTHEME_SGR[reset]}" $2 "$1"
   fi
 }
 
@@ -1016,22 +1053,22 @@ __tt_map_line() {
 }
 
 __tt_map_walk() {
-  local at=$1 pre=$2 tip z=$'\e[0m' REPLY
+  local at=$1 pre=$2 tip z=$TTHEME_SGR[reset] REPLY
   local -i i
   local -a ks=(${(oi)${(k)parent[(Re)$1]}}) reply
   (( color )) || z=
   __tt_map_under "$at"
   __tt_map_tip "$REPLY"
   tip=$REPLY
-  (( color )) && [[ -z $tip ]] && tip=$'\e[2m'
+  (( color )) && [[ -z $tip ]] && tip=$TTHEME_SGR[dim]
   for (( i = 1; i <= ${#ks}; i++ )); do
     __tt_map_chain "$ks[i]" "${ks[i]:t}"
     if (( i < ${#ks} )); then
-      __tt_map_line "$reply[1]" "$pre$tip├─ $z" $(( $3 + 3 )) "$reply[2]"
-      __tt_map_walk "$reply[1]" "$pre$tip│  $z" $(( $3 + 3 ))
+      __tt_map_line "$reply[1]" "$pre$tip├── $z" $(( $3 + 4 )) "$reply[2]/"
+      __tt_map_walk "$reply[1]" "$pre$tip│   $z" $(( $3 + 4 ))
     else
-      __tt_map_line "$reply[1]" "$pre$tip└─ $z" $(( $3 + 3 )) "$reply[2]"
-      __tt_map_walk "$reply[1]" "$pre   " $(( $3 + 3 ))
+      __tt_map_line "$reply[1]" "$pre$tip└── $z" $(( $3 + 4 )) "$reply[2]/"
+      __tt_map_walk "$reply[1]" "$pre    " $(( $3 + 4 ))
     fi
   done
 }
@@ -1072,7 +1109,7 @@ __tt_map_build() {
 }
 
 __tt_map_fit() {
-  local b=$'\e[1m' d=$'\e[2m' y=$'\e[33m' r=$'\e[31m' z=$'\e[0m' lab line tag tip note REPLY
+  local b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] y=$TTHEME_SGR[warn] r=$TTHEME_SGR[error] z=$TTHEME_SGR[reset] lab line tag tip note REPLY
   local -i width=$1 i lvl maxw namew need wr cap
   local -a lw=() rw=() cut=()
   (( color )) || b= d= y= r= z=
@@ -1170,11 +1207,21 @@ __tt_map_fit() {
 }
 
 __tt_map_ssh() {
-  local k name flag
-  for k in ${(oi)${(M)${(k)TTHEME_PINS}:#ssh:*}}; do
-    name=$TTHEME_PINS[$k] flag=""
+  local k name flag tip=$TTHEME_SGR[dim] z=$TTHEME_SGR[reset]
+  local -a ks=(${(oi)${(M)${(k)TTHEME_PINS}:#ssh:*}})
+  local -i i
+  (( ${#ks} )) || return 0
+  (( color )) || tip= z=
+  lp+=("") lpw+=(0) ll+=(ssh) lat+=(ssh:) lpal+=("") lnote+=("") lflag+=("")
+  for (( i = 1; i <= ${#ks}; i++ )); do
+    k=$ks[i] name=$TTHEME_PINS[$ks[i]] flag=""
     [[ -n ${TTHEME_PALETTE[$name]} ]] || flag="not installed"
-    lp+=("") lpw+=(0) ll+=("ssh ${k#ssh:}") lat+=("$k") lpal+=("$name") lnote+=("while connected") lflag+=("$flag")
+    if (( i < ${#ks} )); then
+      lp+=("$tip├── $z")
+    else
+      lp+=("$tip└── $z")
+    fi
+    lpw+=(4) ll+=("${k#ssh:}") lat+=("$k") lpal+=("$name") lnote+=("while connected") lflag+=("$flag")
   done
 }
 
@@ -1193,7 +1240,7 @@ __tt_map_tree() {
   print -r -- "$REPLY"
   __tt_tilde "$TTHEME_PINS_FILE"
   if (( color )); then
-    __tt_clip $'\e[2m'"ttheme pin picks one here · ttheme unpin drops one · $REPLY"$'\e[0m' $width
+    __tt_clip $TTHEME_SGR[dim]"ttheme pin picks one here · ttheme unpin drops one · $REPLY"$TTHEME_SGR[reset] $width
   else
     __tt_clip "ttheme pin picks one here · ttheme unpin drops one · $REPLY" $width
   fi
@@ -1228,7 +1275,7 @@ __tt_keep() {
   __tt_worn_shown $2
   __tt_reload
   if __tt_color; then
-    printf '\033[2m%s\033[0m\n' "${(@f)note}"
+    printf "${TTHEME_SGR[dim]}%s${TTHEME_SGR[reset]}\n" "${(@f)note}"
   else
     print -r -- "$note"
   fi
@@ -1310,7 +1357,13 @@ __tt_catalog() {
 
 __tt_catalog_done() {
   [[ -r $TTHEME_HOME/palettes.zsh ]] || return 0
-  __tt_palettes_load && __tt_reloaded
+  local was=$TTHEME_PALETTES_AT
+  local -a reply
+  __tt_specs_named
+  if __tt_palettes_load && [[ $TTHEME_PALETTES_AT != "$was" ]]; then
+    __tt_respec $reply
+    __tt_reloaded
+  fi
   [[ "$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}" == "$1" ]] && return 0
   __tt_follow "$1"
   __tt_worn_shown
@@ -1332,14 +1385,16 @@ __tt_switch() {
 }
 
 __tt_config() {
-  local blur
+  local blur tab
   if [[ ! -e $TTHEME_CONFIG ]]; then
     mkdir -p ${TTHEME_CONFIG:h} || return 1
     __tt_put $TTHEME_CONFIG "$TTHEME_CONFIG_TEMPLATE"
   fi
   blur=${(M)${(@f)"$(<$TTHEME_CONFIG)"}:#': ${TTHEME_BG_BLUR:='*}
+  tab=${(M)${(@f)"$(<$TTHEME_CONFIG)"}:#': ${TTHEME_TAB_PALETTE:='*}
   ${=${VISUAL:-${EDITOR:-vi}}} $TTHEME_CONFIG || return
   [[ ${(M)${(@f)"$(<$TTHEME_CONFIG)"}:#': ${TTHEME_BG_BLUR:='*} == "$blur" ]] || __tt_redraw
+  [[ ${(M)${(@f)"$(<$TTHEME_CONFIG)"}:#': ${TTHEME_TAB_PALETTE:='*} == "$tab" ]] || { __tt_cli sync && __tt_reload }
   print -r -- "Settings apply in new tabs — $TTHEME_CONFIG"
 }
 
@@ -1471,17 +1526,26 @@ ttheme() {
     __tt_unpainted && __tt_paints || return 1
   fi
   if (( ! $# )); then
-    (( ${#TTHEME_PALETTE} )) || { __tt_empty; return }
     if [[ -t 0 && -t 1 ]]; then
-      __tt_preview hub
+      if (( ${#TTHEME_PALETTE} )); then
+        __tt_preview hub
+      else
+        __tt_catalog browse
+      fi
     else
+      (( ${#TTHEME_PALETTE} )) || { __tt_empty; return }
       __tt_menu
     fi
     return 0
   fi
 
   case $1 in
-    browse|list|add|remove|update|market|new|edit|check|share) __tt_catalog "$@"; return ;;
+    list|add|remove|update|market|new) __tt_catalog "$@"; return ;;
+    edit|check|share)
+      local REPLY
+      __tt_name_of "$TTHEME_SPEC"
+      TTHEME_WORN=${TTHEME_PALETTE[$REPLY]:+$REPLY} __tt_catalog "$@"
+      return ;;
     on|off) __tt_switch "$@"; return ;;
     info) TTHEME_ZSH=$ZSH_VERSION __tt_cli "$@"; return ;;
   esac
@@ -1498,7 +1562,6 @@ ttheme() {
     default)
       __tt_resolve "$2" || return 1
       __tt_keep "$REPLY" ;;
-    preview) __tt_preview ;;
     pin)
       if [[ $2 == ssh:* ]]; then
         REPLY=ssh:${(L)2#ssh:}