@kecan0406/ttheme 1.0.45 → 1.0.47

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
@@ -169,15 +229,22 @@ __tt_name_of() { REPLY=${${(k)TTHEME_PALETTE[(re)$1]}:-custom} }
 __tt_color() { [[ -t 1 && -z $NO_COLOR && $TERM != dumb ]] }
 
 __tt_palette_line() {
-  local name=$1 marker=$2
-  local -a p=(${=TTHEME_PALETTE[$name]})
+  local name=$1 width=$2 on=$3 hex cell="" bar=""
+  local -a p=(${=TTHEME_PALETTE[$name]}) sw=(${=TTHEME_SWATCH[$name]})
   (( ${#p} >= 20 )) || return 1
-  local bg=${p[1]#\#} cur=${p[3]#\#}
-  printf '%s\033[48;2;%d;%d;%d;38;2;%d;%d;%dm ● \033[0m %-8s \033[2m· ANSI %s\033[0m\n' \
-    "$marker" \
-    $((16#${bg:0:2})) $((16#${bg:2:2})) $((16#${bg:4:2})) \
-    $((16#${cur:0:2})) $((16#${cur:2:2})) $((16#${cur:4:2})) \
-    "$name" "${TTHEME_SRC[$name]:-unknown}"
+  for hex in $sw; do
+    hex=${hex#\#}
+    cell+=$'\e[38;2;'$((16#${hex:0:2}))';'$((16#${hex:2:2}))';'$((16#${hex:4:2}))'m■ '
+  done
+  if [[ -n $on ]]; then
+    local cur=${p[3]#\#} sel=${p[4]#\#} fg=${p[2]#\#} ac
+    printf -v ac '\e[38;2;%d;%d;%dm' $((16#${cur:0:2})) $((16#${cur:2:2})) $((16#${cur:4:2}))
+    printf -v bar '\e[48;2;%d;%d;%d;38;2;%d;%d;%dm' \
+      $((16#${sel:0:2})) $((16#${sel:2:2})) $((16#${sel:4:2})) $((16#${fg:0:2})) $((16#${fg:2:2})) $((16#${fg:4:2}))
+    printf '%s▌\e[39m %s %s■\e[39m \e[1m%-*s\e[22m  %s\e[0m\n' "$ac" "$bar" "$ac" "$width" "$name" "$cell"
+  else
+    printf '     %-*s  %s\e[0m\n' "$width" "$name" "$cell"
+  fi
 }
 
 __tt_announce() {
@@ -281,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
@@ -384,8 +455,9 @@ __tt_order() {
 }
 
 __tt_menu() {
-  local k cur="" mark grp last_grp="" REPLY
+  local k cur="" grp last_grp="" REPLY
   local -a reply
+  local -i width=0
   __tt_order
   if ! __tt_color; then
     for k in $reply; do
@@ -394,27 +466,21 @@ __tt_menu() {
     return 0
   fi
   [[ -n $TTHEME_SPEC ]] && __tt_name_of "$TTHEME_SPEC" && cur=$REPLY
-  local gutter=""
-  if [[ -n ${TTHEME_PALETTE[$cur]} ]]; then
-    local -a cp=(${=TTHEME_PALETTE[$cur]})
-    local ch=${cp[3]#\#}
-    printf -v gutter '\033[38;2;%d;%d;%dm◆\033[0m ' \
-      $((16#${ch:0:2})) $((16#${ch:2:2})) $((16#${ch:4:2}))
-  fi
+  for k in $reply; do
+    (( ${#k} > width )) && width=${#k}
+  done
   for k in $reply; do
     grp=${TTHEME_GROUP[$k]:-Other}
     if [[ $grp != $last_grp ]]; then
-      [[ $grp == *@* && $last_grp != *@* && -n $last_grp ]] && printf '\033[2m── markets ──────────\033[0m\n'
-      printf '\033[1m%s\033[0m' "$grp"
+      [[ $grp == *@* && $last_grp != *@* && -n $last_grp ]] && printf '  \033[2m── markets ──────────\033[0m\n'
+      printf '  \033[1m%s\033[0m' "$grp"
       [[ -n ${TTHEME_NATIVE[$k]} ]] && printf ' \033[2m%s\033[0m' "${TTHEME_NATIVE[$k]}"
       printf '\n'
       last_grp=$grp
     fi
-    mark="  "
-    [[ $k == $cur ]] && mark=$gutter
-    __tt_palette_line "$k" "$mark"
+    __tt_palette_line "$k" $width ${${(M)k:#$cur}:+1}
   done
-  printf '\n\033[2mttheme use <palette> paints this tab · ttheme preview · ttheme help\033[0m\n'
+  printf '\n  \033[2mttheme use <palette> paints this tab · ttheme preview · ttheme help\033[0m\n'
 }
 
 __tt_help() {
@@ -459,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
@@ -640,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
 }
 
@@ -734,19 +800,22 @@ __tt_pv_hl() {
 }
 
 __tt_pv_row() {
-  local t=${rval[$1]} b=$'\e[1m' d=$'\e[2m' r=$'\e[22;24;39m' z=$'\e[0m' on="" base="" lead=$'\e[2m' mark=" " name arrow=▸
+  local t=${rval[$1]} b=$'\e[1m' d=$'\e[2m' r=$'\e[22;24;39m' z=$'\e[0m' on="" gut="  " base="" lead=$'\e[2m' mark=" " name arrow=▸
   local -i w
   (( color )) || b= d= r= z= lead=
-  (( $1 == cur && color )) && on=$sb
+  if (( $1 == cur )); then
+    gut=$ac"▌"$r" "
+    (( color )) && on=$sb
+  fi
   if [[ ${rtype[$1]} == rule ]]; then
     name='── markets '
-    REPLY=$d$name${(l:lw - 2 - ${#name}::─:)}$z
+    REPLY="   "$d$name${(l:lw - 4 - ${#name}::─:)}$z
     return 0
   fi
   if [[ ${rtype[$1]} == hdr ]]; then
     [[ -n $flt || -n ${exp[$t]} ]] && arrow=▾
     name=$t
-    (( ${(m)#name} > lw - 8 )) && name="${name[1,lw-9]}…"
+    (( ${(m)#name} > lw - 10 )) && name="${name[1,lw-11]}…"
     base=$b
     if (( color )) && [[ $t == "$ag" ]]; then
       base+=$ac lead=$ac
@@ -754,24 +823,24 @@ __tt_pv_row() {
       lead=""
     fi
     __tt_pv_hl "$name" "$base"
-    w=$(( lw - 2 - ${(m)#name} - ${#rcnt[$1]} ))
+    w=$(( lw - 6 - ${(m)#name} - ${#rcnt[$1]} ))
     (( w < 1 )) && w=1
-    REPLY=$on$lead$arrow$r" "$base$REPLY$r${(l:w:: :)}$d${rcnt[$1]}$z
+    REPLY=$gut$on" "$lead$arrow$r" "$base$REPLY$r${(l:w:: :)}$d${rcnt[$1]}$r" "$z
     return 0
   fi
   if (( $1 == cur )); then
-    mark=$cmark base=$b
+    mark=$ac"■"$r base=$b
   elif [[ -n $cdot && $t == "$cn" ]]; then
     mark=$cdot
   fi
   __tt_pv_hl "$t" "$base"
   if (( color )); then
     [[ -n ${tstrip[$t]} ]] || __tt_pv_strip $t
-    w=$(( lw - 20 - ${#t} ))
+    w=$(( lw - 19 - ${#t} ))
     (( w < 1 )) && w=1
-    REPLY="$on  $mark $base$REPLY$r${(l:w:: :)}${tstrip[$t]}"
+    REPLY=$gut$on"   $mark $base$REPLY$r${(l:w:: :)}${tstrip[$t]} "$z
   else
-    REPLY="  $mark $REPLY"
+    REPLY="$gut   $mark $REPLY"
   fi
 }
 
@@ -786,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
@@ -944,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
@@ -961,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
@@ -1151,8 +1235,8 @@ __tt_pv_flush() {
 }
 
 __tt_pv_draw() {
-  local out line cnt ex ag="" ac="" sb="" cmark="▶" rthumb="#" rtrack="." dd="" zz="" state=on src="" REPLY
-  local -i lw sw split sc se=$(( pw - 2 )) h k i N=${#rval} rail=0 rl=0 rs=0 mt=${#TTHEME_ORDER} wiped=0
+  local out line cnt ex ag="" ac="" sb="" dd="" zz="" state=on src="" REPLY
+  local -i lw sw split sc se=$(( pw - 2 )) h k i N=${#rval} mt=${#TTHEME_ORDER} wiped=0
   __tt_pv_lw
   lw=$reply[1] sw=$reply[2]
   split=$(( sw > 0 )) sc=$(( pw - 1 - sw ))
@@ -1164,21 +1248,14 @@ __tt_pv_draw() {
   (( cur >= top + h )) && top=$(( cur - h + 1 ))
   (( top < 1 )) && top=1
   (( N > h && top > N - h + 1 )) && top=$(( N - h + 1 ))
-  if (( N > h )); then
-    rail=1
-    rl=$(( h * h / N ))
-    (( rl < 1 )) && rl=1
-    rs=$(( 1 + (top - 1) * (h - rl) / (N - h) ))
-  fi
   if (( color )); then
-    dd=$'\e[2m' zz=$'\e[0m' rtrack=$'\e[2m░\e[0m'
+    dd=$'\e[2m' zz=$'\e[0m'
     if [[ -n $applied ]]; then
       local -a ap=(${=applied})
       local acx=${ap[3]#\#} sbx=${ap[4]#\#}
       printf -v ac '\e[38;2;%d;%d;%dm' $((16#${acx:0:2})) $((16#${acx:2:2})) $((16#${acx:4:2}))
       printf -v sb '\e[48;2;%d;%d;%dm' $((16#${sbx:0:2})) $((16#${sbx:2:2})) $((16#${sbx:4:2}))
     fi
-    rthumb=$ac"█"$zz cmark=$ac"▶"$'\e[39m'
     [[ ${rtype[cur]} == thm ]] && ag=${TTHEME_GROUP[${rval[cur]}]:-Other}
   fi
   if [[ -n $flt ]]; then
@@ -1204,13 +1281,13 @@ __tt_pv_draw() {
   fi
   if [[ -n $flt ]]; then
     if (( color )); then
-      line="⌕ "$'\e[1m'$flt$zz$ac$'\e[7m \e[0m'
+      line="   "$'\e[1m'$flt$zz$ac$'\e[7m \e[0m'
     else
-      line="⌕ ${flt}_"
+      line="   ${flt}_"
     fi
   else
     ex="$expal | $exgrp"
-    (( ${#ex} > lw - 17 - ${#cnt} )) && ex="${ex[1,lw-18-${#cnt}]}…"
+    (( ${#ex} > lw - 19 - ${#cnt} )) && ex="${ex[1,lw-20-${#cnt}]}…"
     if (( gstep > 0 )); then
       local gkeep=$(( ${#ex} * (8 - gstep) / 8 ))
       if [[ $TTHEME_FX == (decode|glitch) ]]; then
@@ -1228,39 +1305,35 @@ __tt_pv_draw() {
         ex="${ex[1,gkeep]}▏"
       fi
     fi
-    line="⌕ "$dd"search… e.g. $ex"$zz
+    line="   "$dd"search… e.g. $ex"$zz
   fi
-  out+=$line$'\e[K\e['$(( lw - ${#cnt} + 1 ))'G'
-  if [[ -n $flt ]]; then
-    out+=$cnt$'\n'$ac
-  else
-    out+=$dd$cnt$zz$'\n'$dd
+  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+=${(l:lw::─:)}$zz$'\e[K\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
     i=$(( top + k ))
     line=""
     if (( k < h )); then
       if (( ! N )); then
-        (( k == 0 )) && line="  ${dd}no palettes match '$flt'$zz"
+        (( k == 0 )) && line="   ${dd}no palettes match '$flt'$zz"
       elif (( i <= N )); then
         __tt_pv_row $i
         line=$REPLY
       fi
+    elif (( k == h && N > h && top + h <= N )); then
+      line="   "$dd"…"$zz
     fi
-    out+=$line$'\e[K'
-    if (( rail && k < h )); then
-      if (( k + 1 >= rs && k + 1 < rs + rl )); then
-        out+=$'\e['$(( lw + 2 ))'G'$rthumb
-      else
-        out+=$'\e['$(( lw + 2 ))'G'$rtrack
-      fi
-    fi
-    out+=$'\n'
+    out+=$line$'\e[K\n'
   done
   __tt_pv_foot $(( split ? se : pw ))
   if (( split )); then
-    out+=$'\e[2;'$sc'H'$dd${(l:$(( se - sc + 1 ))::─:)}$zz
     if (( help && sw >= 48 )); then
       __tt_pv_head 1 $sc $se keys
       __tt_pv_help
@@ -1323,15 +1396,19 @@ __tt_pv_canpick() {
 }
 
 __tt_pv_strip() {
-  local lo hi cell
-  local -a tp=(${=TTHEME_PALETTE[$1]}) v=()
+  local hex cell=""
+  local -a sw=(${=TTHEME_SWATCH[$1]})
   local -i j
-  for (( j = 5; j <= 12; j++ )); do
-    lo=${tp[j]#\#} hi=${tp[j+8]#\#}
-    v+=($((16#${lo:0:2})) $((16#${lo:2:2})) $((16#${lo:4:2})) $((16#${hi:0:2})) $((16#${hi:2:2})) $((16#${hi:4:2})))
+  for (( j = 1; j <= 6; j++ )); do
+    hex=${sw[j]#\#}
+    (( j > 1 )) && cell+=" "
+    if [[ -n $hex ]]; then
+      cell+=$'\e[38;2;'$((16#${hex:0:2}))';'$((16#${hex:2:2}))';'$((16#${hex:4:2}))'m■'
+    else
+      cell+=" "
+    fi
   done
-  printf -v cell '\e[38;2;%d;%d;%d;48;2;%d;%d;%dm▀▀' $v
-  tstrip[$1]=$cell$'\e[0m'
+  tstrip[$1]=$cell$'\e[39m'
 }
 
 __tt_pv_init() {
@@ -1380,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
 }
@@ -1554,7 +1631,7 @@ __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=()
@@ -1579,14 +1656,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
@@ -1597,15 +1683,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
@@ -1617,11 +1715,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
   }
@@ -1708,15 +1801,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
@@ -1725,8 +1815,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