@kecan0406/ttheme 1.2.1 → 1.2.3

package/shell/adapters/windows-terminal.zsh

@@ -1,5 +1,14 @@
 __tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)windows-terminal]} )) }
 
-__tt_reloaded() { __tt_repaint }
+__tt_reloaded() {
+  local REPLY
+  integer i
+  [[ -n $TTHEME_PAINTED ]] || return 0
+  for (( i = 0; i < 20; i++ )); do
+    __tt_query_bg && [[ ${(L)REPLY} == ${(L)${TTHEME_SPEC%% *}} ]] || break
+    sleep 0.05
+  done
+  __tt_repaint
+}
 
 __tt_follows_focus() { return 0 }

package/shell/ttheme.zsh

@@ -14,23 +14,29 @@ __tt_palettes_load() {
 __tt_fresh() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
   local -a at
-  local was=$TTHEME_STARTUP
+  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
   [[ $at[1] == "$TTHEME_PALETTES_AT" ]] && return 0
-  __tt_palettes_load && __tt_reloaded
+  __tt_palettes_load && { __tt_follow "$start" && __tt_sync; __tt_reloaded }
   [[ -n $was && -z $TTHEME_STARTUP && -n $TTHEME_SPEC ]] && __tt_active && __tt_off_here
 }
 
+__tt_follow() {
+  [[ -n $TTHEME_STARTUP && "$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}" != "$1" && -z $TTHEME_PAINTED ]] || return 1
+  __tt_active && __tt_takes_default || return 1
+  TTHEME_SPEC=${TTHEME_PALETTE[$TTHEME_STARTUP]}
+}
+
 __tt_gone() {
   local bg=${TTHEME_SPEC%% *} hook
   TTHEME_SPEC=
   __tt_reload
   __tt_reset_reloaded $bg
   print -n $'\e[?1004l'
-  for hook in precmd:__tt_fresh precmd:__tt_precmd precmd:__tt_unmux preexec:__tt_preexec preexec:__tt_mux chpwd:__tt_chpwd; do
+  for hook in precmd:__tt_fresh precmd:__tt_precmd precmd:__tt_prompted precmd:__tt_unmux preexec:__tt_preexec preexec:__tt_mux chpwd:__tt_chpwd; do
     add-zsh-hook -d ${hook%%:*} ${hook#*:}
   done
   (( $+functions[add-zle-hook-widget] )) && add-zle-hook-widget -d line-init __tt_line_init
@@ -304,8 +310,7 @@ __tt_dir_sync() {
   [[ -n $spec && $spec != "$TTHEME_SPEC" ]] || return 0
   __tt_apply "$spec"
   TTHEME_SPEC=$spec
-  __tt_name_of "$spec"
-  __tt_shown "$REPLY" && __tt_reload
+  __tt_sync
 }
 
 __tt_chpwd() {
@@ -314,14 +319,16 @@ __tt_chpwd() {
   __tt_dir_sync
 }
 
-__tt_sync() {
+__tt_worn_shown() {
   local REPLY
-  [[ -n $TTHEME_SPEC ]] || return 0
+  [[ -n $TTHEME_SPEC ]] || return 1
   __tt_name_of "$TTHEME_SPEC"
-  [[ -n ${TTHEME_PALETTE[$REPLY]} ]] || return 0
-  __tt_shown "$REPLY" && __tt_reload
+  [[ -n ${TTHEME_PALETTE[$REPLY]} ]] || return 1
+  __tt_shown "$REPLY" $1
 }
 
+__tt_sync() { ! __tt_worn_shown || __tt_reload }
+
 __tt_precmd() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
   __tt_sync
@@ -335,12 +342,13 @@ __tt_preexec() {
 }
 
 __tt_rewear() {
-  local REPLY
   __tt_repaint
-  [[ -n $TTHEME_SPEC ]] || { __tt_unshown $1; return 0 }
-  __tt_name_of "$TTHEME_SPEC"
-  [[ -n ${TTHEME_PALETTE[$REPLY]} ]] || return 0
-  __tt_shown "$REPLY" $1 && __tt_reload
+  if [[ -n $TTHEME_SPEC ]]; then
+    __tt_worn_shown $1 && __tt_reload
+  else
+    __tt_unshown $1
+  fi
+  return 0
 }
 
 __tt_focus() {
@@ -1074,10 +1082,11 @@ __tt_pins_map() {
 }
 
 __tt_keep() {
-  local note
+  local note was="$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}"
   note=$(__tt_cli default "$1") || return 1
-  TTHEME_STARTUP=$1
-  __tt_shown "$1" force
+  [[ -r $TTHEME_HOME/palettes.zsh ]] && __tt_palettes_load && __tt_reloaded
+  __tt_follow "$was"
+  __tt_worn_shown $2
   __tt_reload
   if __tt_color; then
     printf '\033[2m%s\033[0m\n' "${(@f)note}"
@@ -1189,7 +1198,10 @@ __tt_catalog() {
   [[ -r $TTHEME_HOME/palettes.zsh ]] || return 0
   was="$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}"
   __tt_palettes_load && __tt_reloaded
-  [[ "$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}" == "$was" ]] || __tt_reload
+  [[ "$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}" == "$was" ]] && return 0
+  __tt_follow "$was"
+  __tt_worn_shown
+  __tt_reload
 }
 
 __tt_switch() {
@@ -1307,13 +1319,11 @@ __tt_next() {
 }
 
 __tt_rotate() {
-  local REPLY spec
+  local REPLY
   __tt_next
-  spec=$REPLY
-  __tt_apply "$spec"
-  TTHEME_SPEC=$spec
-  __tt_name_of "$spec"
-  __tt_shown "$REPLY" force && __tt_reload
+  __tt_apply "$REPLY"
+  TTHEME_SPEC=$REPLY
+  __tt_worn_shown force && __tt_reload
   __tt_announce
 }
 
@@ -2653,7 +2663,7 @@ __tt_preview() {
   local tty=""
   local -i TTHEME_RAW=0
   {
-    tty=$(stty -g 2>/dev/null && stty -echo -icanon min 1 time 0 2>/dev/null)
+    tty=$(stty -g 2>/dev/null) && stty -echo -icanon min 1 time 0 2>/dev/null || tty=""
     TTHEME_RAW=$(( ${#tty} > 0 ))
     __tt_pv_bg_open
     printf '\e[?2026h\e[?1049h\e[?7l\e[?25l'
@@ -2705,7 +2715,7 @@ __tt_preview() {
         __tt_sync
       elif (( picked == 2 )); then
         __tt_announce
-        __tt_keep "$sel"
+        __tt_keep "$sel" force
       else
         __tt_announce
         __tt_shown "$sel" force && __tt_reload
@@ -2733,6 +2743,8 @@ ttheme() {
     print -u2 "ttheme: unknown command '$1' — see \`ttheme help\`"
     return 1
   fi
+  __tt_fresh
+  (( $+functions[ttheme] )) || { print -u2 "ttheme: uninstalled — \`npx @kecan0406/ttheme@latest init\` sets it up again"; return 1 }
   if ! __tt_paints && (( ! $# || ${TTHEME_TAB_VERBS[(Ie)$1]} )); then
     __tt_unpainted
     return 1
@@ -2841,6 +2853,7 @@ fi
   else
     __tt_sync
   fi
+  __tt_follows_prompt && add-zsh-hook precmd __tt_prompted
   __tt_announce
 }