@kecan0406/ttheme 1.2.2 → 1.2.3

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.2",
+  "version": "1.2.3",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "type": "module",
   "bin": {
     "ttheme": "bin/ttheme.js"
@@ -37,6 +37,7 @@
     "@material/material-color-utilities": "^0.4.0",
     "@types/bun": "^1.3.0",
     "@types/pngjs": "6.0.5",
+    "@xterm/headless": "6.0.0",
     "fast-string-width": "^3.0.2",
     "jpeg-js": "^0.4.4",
     "pngjs": "7.0.0",

package/shell/adapters/_osc.zsh

@@ -63,6 +63,8 @@ __tt_unpainted() { : }
 
 __tt_follows_focus() { return 1 }
 
+__tt_takes_default() { return 0 }
+
 __tt_follows_prompt() { return 1 }
 
 __tt_prompted() { : }

package/shell/adapters/alacritty.zsh

@@ -1 +1,3 @@
 __tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)alacritty]} )) }
+
+__tt_follows_focus() { return 0 }

package/shell/adapters/iterm2.zsh

@@ -1,17 +1,35 @@
 source $TTHEME_HOME/adapters/_bg.zsh
 
 if (( ! ${+TTHEME_ITERM_SHOWN} )); then
-  typeset -gx TTHEME_ITERM_SHOWN=""
+  typeset -gx TTHEME_ITERM_SHOWN="" TTHEME_ITERM_DYED=0
   [[ $ITERM_PROFILE == 'ttheme · '* ]] && TTHEME_ITERM_SHOWN=${ITERM_PROFILE#ttheme · }
 fi
 
 __tt_keepable() { return 0 }
 
+__tt_follows_focus() { return 0 }
+
+__tt_takes_default() {
+  local REPLY was=$TTHEME_ITERM_SHOWN
+  (( ! TTHEME_ITERM_DYED )) || return 1
+  (( TTHEME_TMUX )) && was=$(tmux show -qv @ttheme_shown 2>/dev/null)
+  [[ $was == default ]] && return 0
+  [[ -z $was ]] && __tt_hear && [[ $REPLY == ${TTHEME_PALETTE[$TTHEME_STARTUP]%% *} ]] || return 1
+  TTHEME_ITERM_SHOWN=default
+  (( TTHEME_TMUX )) && tmux set -q @ttheme_shown default 2>/dev/null
+  return 0
+}
+
+__tt_worn() { [[ -z $1 ]] || TTHEME_ITERM_DYED=1 }
+
 __tt_pv_paint() {
   local -a p=(${=1})
   if (( ${#p} < 20 )); then
     __tt_out $'\e]110\e\\\e]111\e\\'
-  elif [[ $p[1] == - ]]; then
+    return 0
+  fi
+  TTHEME_ITERM_DYED=1
+  if [[ $p[1] == - ]]; then
     __tt_out $'\e]111\e\\\e]10;'$p[2]$'\e\\'
   else
     __tt_out $'\e]11;'$p[1]$'\e\\\e]10;'$p[2]$'\e\\'
@@ -34,7 +52,7 @@ __tt_shown() {
   [[ -r $dir/${${1/@/--}/\//--}.conf || ( -n $was && -r $dir/${${was/@/--}/\//--}.conf ) ]] || (( TTHEME_MUXED )) || return 1
   (( ${TTHEME_ORDER[(Ie)$1]} )) || return 1
   __tt_out $'\e]1337;SetProfile=ttheme · '$1$'\a'
-  TTHEME_ITERM_SHOWN=$1
+  TTHEME_ITERM_SHOWN=$1 TTHEME_ITERM_DYED=0
   (( TTHEME_TMUX )) && tmux set -q @ttheme_shown $1 2>/dev/null
   return 1
 }
@@ -44,7 +62,7 @@ __tt_unshown() {
   (( TTHEME_TMUX )) && was=$(tmux show -qv @ttheme_shown 2>/dev/null)
   [[ $1 != force && $was == "$want" ]] && return 0
   __tt_out $'\e]1337;SetProfile=\a'
-  TTHEME_ITERM_SHOWN=$want
+  TTHEME_ITERM_SHOWN=$want TTHEME_ITERM_DYED=0
   (( TTHEME_TMUX )) && tmux set -q @ttheme_shown "$want" 2>/dev/null
   return 0
 }

package/shell/adapters/konsole.zsh

@@ -6,6 +6,10 @@ __tt_unpainted() {
 
 __tt_keepable() { __tt_paints }
 
+__tt_takes_default() { __tt_osc_reset }
+
+__tt_follows_focus() { return 0 }
+
 __tt_scheme() {
   local -a p=(${=TTHEME_PALETTE[$1]})
   REPLY="ColorScheme=ttheme-${${1/@/--}/\//--};UseCustomCursorColor=true;customCursorColor=$p[3]"

package/shell/adapters/terminal-app.zsh

@@ -21,6 +21,8 @@ __tt_hear() {
 
 __tt_heard() { TTHEME_TERMINAL_BASE=$1 }
 
+__tt_takes_default() { return 1 }
+
 __tt_osc_reset() {
   [[ -n $TTHEME_TERMINAL_BASE ]] && __tt_osc_apply "$TTHEME_TERMINAL_BASE"
   unset TTHEME_PAINTED

package/shell/adapters/wezterm.zsh

@@ -4,6 +4,8 @@ typeset -g TTHEME_WEZTERM_SHOWN="" TTHEME_WEZTERM_VIEW=""
 
 __tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)wezterm]} )) }
 
+__tt_follows_focus() { return 0 }
+
 __tt_wezterm_var() {
   local REPLY
   __tt_b64s "$2"

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,16 +14,22 @@ __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=
@@ -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
 }
 
@@ -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