@kecan0406/ttheme 1.2.14 → 1.2.16

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "schema": 1,
-  "version": "1.2.14",
+  "version": "1.2.16",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.2.14",
+  "version": "1.2.16",
   "type": "module",
   "bin": {
     "ttheme": "bin/ttheme.js"
@@ -45,6 +45,6 @@
   },
   "engines": {
     "bun": ">=1.3",
-    "node": ">=20.11"
+    "node": ">=22"
   }
 }

package/shell/adapters/_bg.zsh

@@ -8,8 +8,6 @@ __tt_bg_saved() {
 
 __tt_bg_refresh() { : }
 
-__tt_bg_hide() { : }
-
 __tt_bg_lasting() { : }
 
 __tt_bg_wipe() { REPLY=$'\e_Ga=d,d=A,q=2\e\\' }

package/shell/adapters/_osc.zsh

@@ -124,6 +124,10 @@ __tt_pv_bg_strip_off() { : }
 
 __tt_pv_bg_close() { : }
 
+__tt_pv_bg_reset() { : }
+
+__tt_bg_hide() { : }
+
 __tt_pv_bg_save() { : }
 
 zmodload zsh/system
@@ -178,6 +182,7 @@ __tt_ask() {
   done
   [[ -n $saved ]] && stty "$saved" <&$fd 2>/dev/null
   exec {fd}>&-
+  [[ $buf == *$'\e[0n'* ]] || __tt_owed
   while [[ $buf == (#b)([^$'\e']#)(${~seqs})(*) ]]; do
     TTHEME_TYPED+=$match[1] REPLY+=$match[2] buf=$match[-1]
   done
@@ -185,6 +190,31 @@ __tt_ask() {
   REPLY=${REPLY%$'\e[0n'}
 }
 
+__tt_owed() {
+  local k
+  [[ -o zle && -z $TTHEME_OWED ]] || return 0
+  typeset -g TTHEME_OWED=1
+  zle -N __tt_late
+  zle -N __tt_quiet
+  for k in emacs viins vicmd; do
+    [[ $(bindkey -M $k '^[]') == *undefined-key ]] && bindkey -M $k '^[]' __tt_late
+    [[ $(bindkey -M $k '^[[0n') == *undefined-key ]] && bindkey -M $k '^[[0n' __tt_quiet
+  done
+}
+
+__tt_late() {
+  emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+  local ch prev=""
+  while read -s -k 1 -t 0.2 ch; do
+    [[ $ch == $'\a' || ( $prev == $'\e' && $ch == \\ ) ]] && return 0
+    prev=$ch
+  done
+}
+
+__tt_quiet() {
+  emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+}
+
 __tt_typed() {
   [[ -n $TTHEME_TYPED ]] || return 0
   zle -U -- "$TTHEME_TYPED"

package/shell/preview.zsh

@@ -2115,7 +2115,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=""
+    tty=$(stty -g 2>/dev/null) && stty -echo -icanon -ixon 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'

package/shell/ttheme.zsh

@@ -218,7 +218,7 @@ __tt_listen() {
   if __tt_recall; then
     TTHEME_RECHECK=1
   else
-    __tt_hear || return 1
+    __tt_hear || { [[ -n $TTHEME_OWED ]] && TTHEME_RECHECK=1; return 1 }
     __tt_remember "$REPLY"
   fi
   TTHEME_HEARD=$REPLY
@@ -757,7 +757,7 @@ __tt_unpin_choose() {
   local -a block=()
   chosen=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 -ixon min 1 time 0 2>/dev/null)
     print -rn -- $'\e[?25l'
     while :; do
       __tt_unpin_block $at
@@ -1426,13 +1426,6 @@ __tt_next() {
   REPLY=${TTHEME_PALETTE[$TTHEME_ORDER[idx]]}
 }
 
-__tt_rotate() {
-  local REPLY
-  __tt_next
-  __tt_wear "$REPLY" "" force
-  __tt_announce
-}
-
 source $TTHEME_HOME/preview.zsh
 
 __tt_hook() {
@@ -1464,7 +1457,7 @@ ttheme() {
   fi
   case $1 in
     -h|--help) __tt_help; return 0 ;;
-    -V|--version) __tt_cli --version; return ;;
+    -v|--version) __tt_cli --version; return ;;
     help) __tt_verb_help $2; return 0 ;;
     -*) print -u2 "ttheme: unknown option $1 — see \`ttheme help\`"; return 1 ;;
   esac
@@ -1502,7 +1495,6 @@ ttheme() {
       __tt_resolve "$2" || return 1
       __tt_wear "${TTHEME_PALETTE[$REPLY]}" "$REPLY" force
       __tt_announce ;;
-    next) __tt_rotate ;;
     default)
       __tt_resolve "$2" || return 1
       __tt_keep "$REPLY" ;;