@kecan0406/ttheme 1.2.17 → 1.2.19

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "schema": 1,
-  "version": "1.2.17",
+  "version": "1.2.19",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "type": "module",
   "bin": {
     "ttheme": "bin/ttheme.js"
@@ -11,7 +11,7 @@
     "shell",
     "!shell/check.zsh"
   ],
-  "description": "Character terminal palettes for Ghostty, kitty, Alacritty, WezTerm, iTerm2, Windows Terminal, Warp and Konsole",
+  "description": "Character terminal palettes for Ghostty, iTerm2, kitty, Alacritty, WezTerm, Windows Terminal, Warp, Konsole and Terminal.app",
   "license": "MIT",
   "author": "kecan0406",
   "repository": {
@@ -28,20 +28,22 @@
     "alacritty",
     "wezterm",
     "iterm2",
-    "konsole"
+    "konsole",
+    "warp",
+    "windows-terminal"
   ],
   "devDependencies": {
-    "@biomejs/biome": "^2.3.0",
-    "@clack/prompts": "^1.7.0",
+    "@biomejs/biome": "^2.5.15",
+    "@clack/prompts": "^1.8.1",
     "@jsquash/jpeg": "^1.6.0",
     "@material/material-color-utilities": "^0.4.0",
-    "@types/bun": "^1.3.0",
+    "@types/bun": "^1.4.2",
     "@types/pngjs": "6.0.5",
     "@xterm/headless": "6.0.0",
     "fast-string-width": "^3.0.2",
     "pngjs": "7.0.0",
     "smol-toml": "^1.9.0",
-    "typescript": "^5.8.2",
+    "typescript": "^7.0.2",
     "uqr": "^0.1.3"
   },
   "engines": {

package/shell/adapters/_bg.zsh

@@ -476,7 +476,8 @@ __tt_pv_bg_find() {
   __tt_bg_hide $name
   err=$(__tt_cli find $name 2>&1 >/dev/tty)
   rc=$?
-  printf %s "$pvmouse"
+  printf '\e[?2004h%s' "$pvmouse"
+  __tt_pv_size
   for var in ${(k)parameters[(I)TTHEME_FIND_*]}; do
     [[ ${parameters[$var]} == *export* ]] || unset $var
   done
@@ -620,7 +621,7 @@ __tt_pv_bg_recolor() {
 }
 
 __tt_pv_bg_panel() {
-  local name=$1 z=$'\e[0m' b=$'\e[1m' d=$'\e[2m' c=$ac val sty mark choice REPLY
+  local name=$1 z=$TTHEME_SGR[reset] b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] c=$ac val sty mark choice REPLY
   local -a labs=(Size Position Opacity Colors) at=(1 4 7 0) def=(${=bgdef[$1]})
   local -i r0=$2 col=$3 end=$4 off=${bgoff[$1]} T=$(( $4 - $3 - 21 )) lo=100 hi=100 k i r knob pos=${bgpos[$1]} o tuned
   (( color )) || z= b= d= c=
@@ -650,7 +651,7 @@ __tt_pv_bg_panel() {
         elif [[ $choice != $val ]]; then
           out+=$d" $choice "$z" "
         elif (( tf == k && ! off )); then
-          out+=$'\e[7;1m'$c" $choice "$z" "
+          out+=$pl" $choice "$z" "
         else
           out+=$sty" $choice "$z" "
         fi
@@ -710,7 +711,7 @@ __tt_pv_bg_panel() {
 }
 
 __tt_pv_bg_strip() {
-  local pal=$tune dir=${TTHEME_CONFIG:h}/backgrounds cur fill want sty top side bot cmd buf="" z=$'\e[0m' d=$'\e[2m' REPLY
+  local pal=$tune dir=${TTHEME_CONFIG:h}/backgrounds cur fill want sty top side bot cmd buf="" z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] REPLY
   local -a keys=(${=bgpics[$tune]}) wh pd
   local -i r0=$1 col=$2 end=$3 n=${#keys} at show tc tr=3 i k x r id slot first
   if (( n < 1 )); then
@@ -741,7 +742,7 @@ __tt_pv_bg_strip() {
     x=$(( col + i * (tc + 3) ))
     slot=$(( i + 1 ))
     if (( k == at )); then
-      sty=$'\e[1m'$ac top="┏${(l:tc::━:)}┓" side="┃" bot="┗${(l:tc::━:)}┛"
+      sty=$TTHEME_SGR[bold]$ac top="┏${(l:tc::━:)}┓" side="┃" bot="┗${(l:tc::━:)}┛"
     else
       sty=$d top="╭${(l:tc::─:)}╮" side="│" bot="╰${(l:tc::─:)}╯"
     fi
@@ -816,7 +817,7 @@ __tt_pv_bg_save() {
       note="Background · $name $REPLY"
     fi
     if __tt_color; then
-      printf '\033[2m%s\033[0m\n' "$note"
+      printf "${TTHEME_SGR[dim]}%s${TTHEME_SGR[reset]}\n" "$note"
     else
       print -r -- "$note"
     fi

package/shell/adapters/_osc.zsh

@@ -165,7 +165,7 @@ __tt_b64s() {
 
 __tt_ask() {
   setopt localoptions extendedglob
-  local fd saved="" buf="" chunk seqs=$'\e[]_P][^\a\e]#(\a|\e\\\\)|\e\\[[0-?]#[ -/]#[@-~]|\e[^][_P]'
+  local fd saved="" buf="" chunk seq
   local -a match mbegin mend
   REPLY=""
   { exec {fd}<>/dev/tty } 2>/dev/null || return 1
@@ -185,10 +185,26 @@ __tt_ask() {
   [[ -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]
+  while [[ -n $buf ]]; do
+    if [[ $buf == (#b)([^$'\e']##)(*) ]]; then
+      TTHEME_TYPED+=$match[1] buf=$match[2]
+    elif [[ $buf == (#b)($'\e'[]P_^X][^$'\a\e']#($'\a'|$'\e\\'))(*) ]]; then
+      REPLY+=$match[1] buf=$match[-1]
+    elif [[ $buf == (#b)($'\e['[0-?]#[ -/]#[@-~])(*) ]]; then
+      seq=$match[1] buf=$match[-1]
+      if [[ $seq == *[nt] || $seq == $'\e['[?\>]*c || $seq == *'$y' ]]; then
+        REPLY+=$seq
+      else
+        TTHEME_TYPED+=$seq
+      fi
+    elif [[ $buf == (#b)($'\e'(O?|[^][P_^XO$'\e']))(*) ]]; then
+      TTHEME_TYPED+=$match[1] buf=$match[-1]
+    elif [[ $buf == $'\e\e'* ]]; then
+      TTHEME_TYPED+=$'\e' buf=${buf:1}
+    else
+      break
+    fi
   done
-  [[ $buf == $'\e'* ]] || TTHEME_TYPED+=$buf
   REPLY=${REPLY%$'\e[0n'}
 }
 

package/shell/adapters/ghostty.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 typeset -g TTHEME_GHOSTTY_TABS=$TTHEME_STATE_DIR/ghostty TTHEME_GHOSTTY_FRONT="" TTHEME_GHOSTTY_BLUR="" TTHEME_GHOSTTY_HEARD="" TTHEME_GHOSTTY_CODE=""
 typeset -gF TTHEME_GHOSTTY_ASKED=0 TTHEME_GHOSTTY_WANT=0 TTHEME_GHOSTTY_HUSH=0 TTHEME_GHOSTTY_TOLD=0 TTHEME_GHOSTTY_NONE_AT=0

package/shell/adapters/iterm2.zsh

@@ -1,11 +1,14 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 zmodload -F zsh/datetime p:EPOCHREALTIME 2>/dev/null
 
-if (( ! ${+TTHEME_ITERM_SHOWN} )); then
+() {
+  emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+  (( ${+TTHEME_ITERM_SHOWN} )) && return 0
   typeset -gx TTHEME_ITERM_SHOWN="" TTHEME_ITERM_DYED=0
   [[ $ITERM_PROFILE == 'ttheme · '* ]] && TTHEME_ITERM_SHOWN=${ITERM_PROFILE#ttheme · }
-fi
+  return 0
+}
 
 __tt_keepable() { return 0 }
 

package/shell/adapters/kitty.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 __tt_follows_focus() { return 0 }
 

package/shell/adapters/konsole.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 zmodload -F zsh/files b:zf_rm b:zf_mkdir 2>/dev/null
 

package/shell/adapters/terminal-app.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 typeset -g TTHEME_TERMINAL_BASE="" TTHEME_TERMINAL_VIEW=""
 typeset -gi TTHEME_TERMINAL_RFD=0 TTHEME_TERMINAL_WFD=0 TTHEME_TERMINAL_PID=0 TTHEME_TERMINAL_VIEWS=0 TTHEME_TERMINAL_RESHAPE=0

package/shell/adapters/warp.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 typeset -g TTHEME_WARP_SETTINGS=$HOME/.warp/settings.toml TTHEME_WARP_THEMES=$HOME/.warp/themes TTHEME_WARP_WORN=""
 typeset -g TTHEME_WARP_TABS=$TTHEME_STATE_DIR/warp TTHEME_WARP_DB="" TTHEME_WARP_ID="" TTHEME_WARP_LAST="" TTHEME_WARP_LOOK="" TTHEME_WARP_SEEN=""

package/shell/adapters/wezterm.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 typeset -g TTHEME_WEZTERM_SHOWN="" TTHEME_WEZTERM_VIEW=""