@kecan0406/ttheme 1.0.46 → 1.0.48

package/shell/ttheme.zsh

@@ -31,10 +31,7 @@ __tt_gone() {
   for hook in precmd:__tt_fresh precmd:__tt_precmd precmd:__tt_unmux preexec:__tt_preexec preexec:__tt_mux chpwd:__tt_chpwd; do
     add-zsh-hook -d ${hook%%:*} ${hook#*:}
   done
-  if (( $+functions[add-zle-hook-widget] )); then
-    add-zle-hook-widget -d line-init __tt_focus_on
-    add-zle-hook-widget -d line-init __tt_typed
-  fi
+  (( $+functions[add-zle-hook-widget] )) && add-zle-hook-widget -d line-init __tt_line_init
   unfunction ttheme
 }
 
@@ -143,16 +140,79 @@ __tt_tmux() {
   TTHEME_TMUX=1 TTHEME_SPEC=
 }
 
-source $TTHEME_HOME/adapters/_osc.zsh
-[[ -r $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh ]] &&
-  source $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh
-
 __tt_active() {
   [[ -o interactive ]] || return 1
   (( ${#TTHEME_PALETTE} )) || return 1
   [[ $TTHEME_ADAPTER != (unknown|warp) || -n $TTHEME_FORCE ]]
 }
 
+typeset -g TTHEME_HEARD=""
+typeset -gi TTHEME_RECHECK=0 TTHEME_FOCUS=0
+
+__tt_recall() {
+  local f=$TTHEME_STATE_DIR/colors.$TTHEME_ADAPTER line
+  REPLY=""
+  [[ -o zle && -r $f && -z $TTHEME_PAINTED && $TTHEME_TAB_PALETTE == off ]] && (( ! TTHEME_TMUX )) && __tt_active || return 1
+  line=$(<$f)
+  [[ $line == "${TTHEME_STARTUP:--} "?* ]] || return 1
+  REPLY=${line#* }
+}
+
+__tt_remember() {
+  local f=$TTHEME_STATE_DIR/colors.$TTHEME_ADAPTER line="${TTHEME_STARTUP:--} $1"
+  [[ -n $1 && -z $TTHEME_PAINTED ]] && (( ! TTHEME_TMUX )) || return 0
+  [[ -r $f && "$(<$f)" == "$line" ]] && return 0
+  [[ -d $TTHEME_STATE_DIR ]] || mkdir -p $TTHEME_STATE_DIR 2>/dev/null
+  print -r -- "$line" 2>/dev/null > $f
+}
+
+__tt_listen() {
+  local REPLY
+  if __tt_recall; then
+    TTHEME_RECHECK=1
+  else
+    __tt_hear || return 1
+    __tt_remember "$REPLY"
+  fi
+  TTHEME_HEARD=$REPLY
+  __tt_heard "$REPLY"
+}
+
+__tt_wearing() {
+  local k
+  [[ -n $1 ]] || return 1
+  [[ -n $TTHEME_STARTUP && ${TTHEME_PALETTE[$TTHEME_STARTUP]%% *} == "$1" ]] && { REPLY=$TTHEME_PALETTE[$TTHEME_STARTUP]; return 0 }
+  for k in ${(k)TTHEME_PALETTE}; do
+    [[ ${TTHEME_PALETTE[$k]%% *} == "$1" ]] && { REPLY=$TTHEME_PALETTE[$k]; return 0 }
+  done
+  return 1
+}
+
+__tt_recheck() {
+  local REPLY heard=$TTHEME_HEARD was="" now
+  TTHEME_RECHECK=0
+  [[ -z $TTHEME_PAINTED ]] && __tt_hear || return 0
+  [[ $REPLY == "$heard" ]] && return 0
+  now=$REPLY
+  __tt_remember "$now"
+  TTHEME_HEARD=$now
+  __tt_heard "$now"
+  [[ $TTHEME_TAB_PALETTE == off ]] || return 0
+  __tt_wearing "${heard%% *}" && was=$REPLY
+  REPLY=""
+  __tt_wearing "${now%% *}"
+  if [[ -n $TTHEME_PIN ]]; then
+    [[ $TTHEME_BASE_SPEC == "$was" ]] && TTHEME_BASE_SPEC=$REPLY
+  elif [[ $TTHEME_SPEC == "$was" ]]; then
+    TTHEME_SPEC=$REPLY
+    __tt_sync
+  fi
+}
+
+source $TTHEME_HOME/adapters/_osc.zsh
+[[ -r $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh ]] &&
+  source $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh
+
 __tt_empty() {
   print -u2 'ttheme: no palettes installed yet — run `ttheme browse` to pick some'
   return 1
@@ -288,13 +348,17 @@ __tt_unmux() {
 
 __tt_blur() { : }
 
+__tt_line_init() {
+  (( TTHEME_RECHECK )) && __tt_recheck
+  __tt_typed
+  (( TTHEME_FOCUS )) && __tt_focus_on
+}
+
 __tt_bind_focus() {
   local k
   zle -N __tt_focus
   zle -N __tt_blur
-  zle -N __tt_focus_on
-  autoload -Uz add-zle-hook-widget
-  add-zle-hook-widget line-init __tt_focus_on
+  TTHEME_FOCUS=1
   for k in emacs viins vicmd; do
     bindkey -M $k '^[[I' __tt_focus
     bindkey -M $k '^[[O' __tt_blur
@@ -461,7 +525,7 @@ __tt_arity() {
 
 __tt_cli() {
   local k
-  local -a pass=()
+  local -a pass=(NODE_COMPILE_CACHE=${XDG_CACHE_HOME:-$HOME/.cache}/ttheme/node)
   for k in $TTHEME_SETTINGS; do
     (( $+parameters[$k] )) && pass+=("$k=${(P)k}")
   done
@@ -642,7 +706,7 @@ __tt_pv_focus() {
   (( resized )) || [[ ${rval[cur]} == "$bgname" ]] || __tt_pv_bg_show "${rval[cur]}"
   local spec=${TTHEME_PALETTE[${rval[cur]}]}
   [[ $spec == "$applied" ]] && return 0
-  __tt_apply "$spec"
+  __tt_pv_paint "$spec"
   applied=$spec
 }
 
@@ -791,10 +855,14 @@ __tt_pv_head() {
 
 __tt_pv_foot() {
   setopt localoptions extendedglob
-  local b=$'\e[1m' d=$'\e[2m' z=$'\e[0m' y=$'\e[33m' on=$'\e[7;1m'$ac badge="" lead="" note="" right="" text line plain
+  local b=$'\e[1m' d=$'\e[2m' z=$'\e[0m' y=$'\e[33m' on=$'\e[7;1m'$ac badge="" lead="" note="" right="" text line plain hex
   local -a kk=() kl=() seg=()
   local -i end=$1 i lwid rwid room
   (( color )) || b= d= z= y= on=
+  if (( color )) && [[ -n $applied && $applied != "$painted" ]]; then
+    hex=${${=applied}[8]#\#}
+    printf -v y '\e[38;2;%d;%d;%dm' $((16#${hex:0:2})) $((16#${hex:2:2})) $((16#${hex:4:2}))
+  fi
   if (( help )); then
     badge=KEYS right=$b"? esc"$z$d" close"$z
   elif [[ -n $pick ]]; then
@@ -949,10 +1017,21 @@ __tt_pv_help() {
 }
 
 __tt_pv_specimen() {
-  local -a sp=(${=applied}) ln=()
+  local -a sp=(${=applied}) ln=() fg=()
   (( ${#sp} >= 20 )) || return 0
-  local z=$'\e[0m' d=$'\e[2m' pr=$'\e[32m❯\e[0m ' sel cu cell line="" lo hi
+  local z=$'\e[0m' d=$'\e[2m' sel cu cell line="" lo hi pr bd
   local -i i r cw=4
+  if [[ $applied == "$painted" ]]; then
+    fg=($'\e[31m' $'\e[32m' $'\e[33m' $'\e[34m' $'\e[35m') bd=$'\e[1;34m'
+  else
+    for i in 6 7 8 9 10 17; do
+      lo=${sp[i]#\#}
+      printf -v cell '\e[38;2;%d;%d;%dm' $((16#${lo:0:2})) $((16#${lo:2:2})) $((16#${lo:4:2}))
+      fg+=($cell)
+    done
+    bd=$'\e[1m'$fg[6]
+  fi
+  pr=$fg[2]'❯'$z' '
   (( sw < 44 )) && cw=3
   (( sw >= 56 )) && cw=$(( (sw + 1) / 8 - 1 ))
   (( cw > 7 )) && cw=7
@@ -966,12 +1045,12 @@ __tt_pv_specimen() {
     line+=$cell
   done
   out+=$'\e[4;'$sc'H'$line
-  ln=($'\e[1;34m~/code/demo\e[0m'$d' on '$z$'\e[35mmain\e[32m +2\e[33m ~1\e[0m' "${pr}git status -sb")
-  (( sw >= 44 )) && ln+=($'## \e[32mmain\e[0m...\e[31morigin/main\e[33m [ahead 1]\e[0m')
-  ln+=($'\e[31m M\e[0m src/main.rs' $'\e[31m??\e[0m notes.md' "")
-  (( sw >= 44 )) && ln+=("${pr}ls" $'\e[1;34mdocs\e[0m  \e[1;34msrc\e[0m  \e[1;34mtests\e[0m  Cargo.toml  README.md' "")
-  ln+=("${pr}cargo test" $'\e[32m ✓\e[0m parses config' $'\e[31m ✗\e[0m renders frame')
-  (( sw >= 44 )) && ln[-1]+=$d'  expected '$z$'\e[32m3\e[0m'$d', received '$z$'\e[31m2\e[0m'
+  ln=($bd'~/code/demo'$z$d' on '$z$fg[5]'main'$fg[2]' +2'$fg[3]' ~1'$z "${pr}git status -sb")
+  (( sw >= 44 )) && ln+=('## '$fg[2]'main'$z'...'$fg[1]'origin/main'$fg[3]' [ahead 1]'$z)
+  ln+=($fg[1]' M'$z' src/main.rs' $fg[1]'??'$z' notes.md' "")
+  (( sw >= 44 )) && ln+=("${pr}ls" $bd'docs'$z'  '$bd'src'$z'  '$bd'tests'$z'  Cargo.toml  README.md' "")
+  ln+=("${pr}cargo test" $fg[2]' ✓'$z' parses config' $fg[1]' ✗'$z' renders frame')
+  (( sw >= 44 )) && ln[-1]+=$d'  expected '$z$fg[2]'3'$z$d', received '$z$fg[1]'2'$z
   ln+=("" "${pr}echo ${sel}selected text${z} ${cu} ${z}")
   for (( r = 1; r <= ${#ln}; r++ )); do
     (( r + 5 < ph )) || break
@@ -1228,13 +1307,14 @@ __tt_pv_draw() {
     fi
     line="   "$dd"search… e.g. $ex"$zz
   fi
-  out+=$line$'\e[K\e['$(( lw - ${#cnt} ))'G'
-  if [[ -n $flt ]]; then
-    out+=$cnt
-  else
-    out+=$dd$cnt$zz
+  local tail=$'\e['$(( lw - ${#cnt} ))'G'$dd$cnt$zz
+  [[ -n $flt ]] && tail=$'\e['$(( lw - ${#cnt} ))'G'$cnt
+  if [[ $1 == hint ]] && (( ! wiped )); then
+    print -rn -- $'\e[H\e[0m\e['$lw'X'$line$tail
+    printf '\e[?2026l'
+    return 0
   fi
-  out+=$'\n\e[K\n'
+  out+=$line$'\e[K'$tail$'\n\e[K\n'
   (( N > h && top > 1 )) && out+="   "$dd"…"$zz
   out+=$'\e[K\n'
   for (( k = 0; k < ph - 4; k++ )); do
@@ -1377,8 +1457,8 @@ __tt_pv_getch() {
       (( msgt -= gstep ? 6 : 20 ))
       (( msgt > 0 )) || return 1
     fi
-    (( gstep )) && { gstep=$(( gstep - 1 )); return 1 }
-    (( SECONDS >= exnext )) && { __tt_pv_roll; gstep=8; return 1 }
+    (( gstep )) && { gstep=$(( gstep - 1 )); tick=1; return 1 }
+    (( SECONDS >= exnext )) && { __tt_pv_roll; gstep=8; tick=1; return 1 }
   done
   return 0
 }
@@ -1551,10 +1631,11 @@ __tt_preview() {
     print -u2 "ttheme ${mode:-preview}: needs a terminal"
     return 1
   fi
-  local orig=$TTHEME_SPEC applied=$TTHEME_SPEC flt="" sel="" cn="" cdot="" key="" REPLY="" cur=1 top=1 color=0 pw=80 ph=24 resized=1 expal="" exgrp="" exnext=0 gstep=0 gseed=0
+  local orig=$TTHEME_SPEC applied=$TTHEME_SPEC painted=$TTHEME_SPEC flt="" sel="" cn="" cdot="" key="" REPLY="" cur=1 top=1 color=0 pw=80 ph=24 resized=1 expal="" exgrp="" exnext=0 gstep=0 gseed=0 tick=0
   local pick="" pk=1 pkdef=1 picked=0 canpick=0 bgcw=0 bgch=0 bgname="" bgshown="" bginc="" osd="" osdt=0
-  local tune="" tsnap="" tf=1 help=0 msg="" msgt=0 an="" bgrel=0 bgmx=0 bgmy=0 bganchor=0 bgcut=""
-  local -A bgfrom=() bgsent=() bgdim=() bgsrc=() bgfill=() bgfocus=() bgsize=() bgpos=() bgop=() bgdef=() bgoff=() bgbase=() bgload=() bgshot=() bgshotkey=() bgedit=() bgtunef=() bgofff=() bgimages=()
+  local tune="" tsnap="" tf=1 help=0 msg="" msgt=0 an="" bgrel=0 bgmx=0 bgmy=0 bganchor=0 bgcut="" bgnext=0 bgbytes=0
+  local -a bgorder=()
+  local -A bgfrom=() bgsent=() bgcost=() bgdim=() bgsrc=() bgfill=() bgfocus=() bgsize=() bgpos=() bgop=() bgdef=() bgoff=() bgbase=() bgload=() bgshot=() bgshotkey=() bgedit=() bgtunef=() bgofff=() bgimages=()
   local conf=0 cf=1
   local -a plabel=(" this tab " " default ") csnap=()
   local -a cvars=(TTHEME_TAB_PALETTE TTHEME_ANNOUNCE TTHEME_FX TTHEME_SORT) clabel=("new tabs" announce "search fx" sort)
@@ -1576,14 +1657,23 @@ __tt_preview() {
   __tt_pv_roll
   __tt_pv_rows
   [[ -n ${TTHEME_PALETTE[$cn]} ]] && __tt_pv_goto "$cn"
-  printf '\e[?2026h\e[?1049h\e[?7l\e[?25l'
-  __tt_pv_bg_open
+  local tty=""
+  local -i TTHEME_RAW=0
   {
+    tty=$(stty -g 2>/dev/null && stty -echo -icanon min 1 time 0 2>/dev/null)
+    TTHEME_RAW=$(( ${#tty} > 0 ))
+    printf '\e[?2026h\e[?1049h\e[?7l\e[?25l'
+    __tt_pv_bg_open
     while :; do
       printf '\e[?2026h'
-      __tt_pv_focus
-      [[ ${rtype[cur]} == thm ]] && an=${rval[cur]}
-      __tt_pv_draw
+      if (( tick )); then
+        __tt_pv_draw hint
+      else
+        __tt_pv_focus
+        [[ ${rtype[cur]} == thm ]] && an=${rval[cur]}
+        __tt_pv_draw
+      fi
+      tick=0
       if ! __tt_pv_read; then
         [[ -t 0 ]] && continue
         break
@@ -1594,15 +1684,27 @@ __tt_preview() {
       done
     done
   } always {
+    local spec=${sel:+${TTHEME_PALETTE[$sel]}}
     printf '\e[?2026h'
     __tt_pv_bg_close
+    if [[ -n $spec ]]; then
+      [[ $spec == "$painted" ]] || __tt_apply "$spec"
+    elif [[ $painted != "$orig" ]]; then
+      if [[ -z $orig ]]; then
+        __tt_osc_reset
+      else
+        __tt_apply "$orig"
+      fi
+    elif [[ $applied != "$orig" ]]; then
+      __tt_pv_paint "${TTHEME_PAINTED:+$orig}"
+    fi
     printf '\e[?7h\e[?1049l\e[?25h\e[?2026l'
+    [[ -n $tty ]] && stty "$tty" 2>/dev/null
+    TTHEME_RAW=0
     [[ -n $tune ]] && __tt_pv_untune
     (( conf )) && __tt_pv_unconf
     __tt_pv_bg_save
-    if [[ -n $sel ]]; then
-      local spec=${TTHEME_PALETTE[$sel]}
-      [[ $spec == "$applied" ]] || __tt_apply "$spec"
+    if [[ -n $spec ]]; then
       TTHEME_SPEC=$spec
       __tt_announce
       if [[ $mode == pin ]]; then
@@ -1614,11 +1716,6 @@ __tt_preview() {
         __tt_shown "$sel" force && __tt_reload
       fi
     else
-      if [[ -z $orig && -n $applied ]]; then
-        __tt_osc_reset
-      elif [[ $orig != "$applied" ]]; then
-        __tt_apply "$orig"
-      fi
       (( ${#bgedit} )) && [[ -n ${TTHEME_PALETTE[$cn]} ]] && { __tt_shown "$cn" && __tt_reload }
     fi
   }
@@ -1705,15 +1802,12 @@ fi
 if __tt_active; then
   [[ -n $TMUX ]] && __tt_tmux
   () {
-    local REPLY k
+    local REPLY
     if [[ -n $TTHEME_SPEC ]]; then
       :
     elif [[ $TTHEME_TAB_PALETTE == off ]]; then
-      if __tt_start_bg; then
-        for k in ${(k)TTHEME_PALETTE}; do
-          [[ ${TTHEME_PALETTE[$k]%% *} == "$REPLY" ]] && { TTHEME_SPEC=$TTHEME_PALETTE[$k]; break }
-        done
-      fi
+      [[ -n $TTHEME_HEARD ]] || __tt_listen
+      __tt_start_bg && __tt_wearing $REPLY && TTHEME_SPEC=$REPLY
     else
       __tt_next
       TTHEME_SPEC=$REPLY
@@ -1722,8 +1816,8 @@ if __tt_active; then
     __tt_dir_sync
   }
   autoload -Uz add-zsh-hook add-zle-hook-widget
-  zle -N __tt_typed
-  add-zle-hook-widget line-init __tt_typed
+  zle -N __tt_line_init
+  add-zle-hook-widget line-init __tt_line_init
   add-zsh-hook chpwd __tt_chpwd
   add-zsh-hook precmd __tt_fresh
   if (( ! TTHEME_TMUX )); then