@kecan0406/ttheme 1.0.37 → 1.0.40

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.37",
+  "version": "1.0.40",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.0.37",
+  "version": "1.0.40",
   "type": "module",
   "bin": {
     "ttheme": "bin/ttheme.js"

package/shell/adapters/_bg.zsh

@@ -8,6 +8,14 @@ __tt_ghostty_shown() {
   REPLY=${REPLY%.conf}
 }
 
+__tt_put() {
+  local f=$1
+  shift
+  print -rl -- "$@" > $f.$$ && mv -f -- $f.$$ $f && return 0
+  rm -f -- $f.$$
+  return 1
+}
+
 __tt_bg_saved() {
   local REPLY
   (( ${TTHEME_TERMINALS[(Ie)iterm2]} )) && __tt_cli image $1 tuned
@@ -85,10 +93,18 @@ __tt_bg_path() {
 __tt_bg_load() {
   local name=$1 dir=${TTHEME_CONFIG:h}/backgrounds img="" fit=contain op=1 pos=center f line stem="" size=100 REPLY
   local -i at=5
-  local -a fills
+  local -a fills lines
   (( ${+bgsrc[$name]} )) && return 0
-  bgfrom[$name]=""
-  for f in $dir/$name.conf $dir/$name.tune.conf; do
+  bgfrom[$name]="" bgtunef[$name]=$name.tune.conf bgofff[$name]=$name.off.conf bgimages[$name]=1
+  [[ -r $dir/$name.conf ]] && lines=("${(@f)$(<$dir/$name.conf)}")
+  for line in $lines; do
+    case $line in
+      'config-file = ?'*.tune.conf) bgtunef[$name]=${line#config-file = \?} ;;
+      'config-file = ?'*.off.conf) bgofff[$name]=${line#config-file = \?} ;;
+      '# image '*/<->) bgimages[$name]=${line##*/} ;;
+    esac
+  done
+  for f in $dir/$name.conf $dir/${bgtunef[$name]}; do
     if [[ -r $f ]]; then
       for line in "${(@f)$(<$f)}"; do
         case $line in
@@ -114,7 +130,7 @@ __tt_bg_load() {
     [[ $f == *.tune.conf ]] || bgdef[$name]="$size $at $op" bgbase[$name]=$REPLY
   done
   bgsize[$name]=$size bgpos[$name]=$at bgop[$name]=$op bgoff[$name]=0 bgshot[$name]="" bgshotkey[$name]="" bgfocus[$name]=50
-  [[ -e $dir/$name.off.conf ]] && bgoff[$name]=1
+  [[ -e $dir/${bgofff[$name]} ]] && bgoff[$name]=1
   bgload[$name]="$size $at $op ${bgoff[$name]}"
   [[ $REPLY == *@<20-999>-*-<->x<->.png ]] && bgshot[$name]=$REPLY bgshotkey[$name]="$size $at"
   if [[ -n $stem ]]; then
@@ -175,11 +191,11 @@ __tt_bg_include() {
   local conf=${TTHEME_CONFIG:h}/backgrounds/$1.conf line
   local -a lines=() add=()
   [[ -r $conf ]] && lines=("${(@f)$(<$conf)}")
-  for line in "config-file = ?$1.tune.conf" "config-file = ?$1.off.conf"; do
+  for line in "config-file = ?${bgtunef[$1]:-$1.tune.conf}" "config-file = ?${bgofff[$1]:-$1.off.conf}"; do
     (( ${lines[(Ie)$line]} )) || add+=("$line")
   done
   (( ${#add} )) || return 0
-  mkdir -p ${conf:h} && print -rl -- "${lines[@]}" "${add[@]}" > $conf
+  mkdir -p ${conf:h} && __tt_put $conf "${lines[@]}" "${add[@]}"
 }
 
 __tt_bg_write() {
@@ -190,7 +206,7 @@ __tt_bg_write() {
   [[ -r $dir/$name.conf ]] || return 0
   __tt_bg_include $name || return 1
   if [[ "$size ${bgpos[$1]} ${bgop[$1]}" == "${bgdef[$1]}" ]]; then
-    rm -f -- $dir/$name.tune.conf
+    rm -f -- $dir/${bgtunef[$1]}
   else
     shape=$size
     [[ $size == <20-100> && $pos != center ]] && ! __tt_bg_aligns && shape=window
@@ -220,12 +236,12 @@ __tt_bg_write() {
         ;;
     esac
     __tt_tilde "$img"
-    print -rl -- "background-image = $REPLY" "background-image-fit = $fit" "background-image-position = $pos" "background-image-opacity = ${bgop[$1]}" > $dir/$name.tune.conf || return 1
+    __tt_put $dir/${bgtunef[$1]} "background-image = $REPLY" "background-image-fit = $fit" "background-image-position = $pos" "background-image-opacity = ${bgop[$1]}" || return 1
   fi
   if (( bgoff[$1] )); then
-    print -r -- "background-image =" > $dir/$name.off.conf || return 1
+    __tt_put $dir/${bgofff[$1]} "background-image =" || return 1
   else
-    rm -f -- $dir/$name.off.conf
+    rm -f -- $dir/${bgofff[$1]}
   fi
   if [[ $src == /*.png ]]; then
     for f in ${src%.png}@<20-999>-*.png(N); do
@@ -239,7 +255,7 @@ __tt_pv_bg_open() {
   bgcw=0 bgch=0 bginc="" bgrel=0 bgmx=0 bgmy=0 bganchor=0
   local REPLY
   __tt_bg_shown && bginc=$REPLY
-  (( TTHEME_TMUX )) || __tt_bg_cells
+  (( TTHEME_TMUX )) || { __tt_bg_cells; TTHEME_TYPED= }
 }
 
 __tt_pv_bg_show() {
@@ -409,8 +425,8 @@ __tt_pv_bg_find() {
 }
 
 __tt_pv_bg_images() {
-  local -a shelf=(${TTHEME_CONFIG:h}/backgrounds/shelf/$1/*(N/))
-  REPLY=$(( ${#shelf} + 1 ))
+  __tt_bg_load $1
+  REPLY=${bgimages[$1]:-1}
 }
 
 __tt_pv_bg_image() {

package/shell/adapters/_osc.zsh

@@ -75,32 +75,55 @@ __tt_pv_bg_close() { : }
 
 __tt_pv_bg_save() { : }
 
-__tt_query_bg() {
-  local saved resp="" c fd
-  REPLY=""
-  if (( TTHEME_TMUX )); then
-    REPLY=$(tmux show -qv @ttheme_bg 2>/dev/null)
-    [[ $REPLY == \#* ]] && return 0
-    REPLY=""
-  fi
-  exec {fd}<>/dev/tty 2>/dev/null || return 1
+zmodload zsh/system
+
+typeset -g TTHEME_TYPED=""
 
-  saved=$(stty -g <&$fd 2>/dev/null)
+__tt_ask() {
+  setopt localoptions extendedglob
+  local fd saved buf="" chunk seqs=$'\e[]_P][^\a\e]#(\a|\e\\\\)|\e\\[[0-?]#[ -/]#[@-~]|\e[^][_P]'
+  local -a match mbegin mend
+  REPLY=""
+  { exec {fd}<>/dev/tty } 2>/dev/null || return 1
+  saved=$(stty -g <&$fd 2>/dev/null && stty raw -echo min 0 time 3 <&$fd 2>/dev/null)
   if [[ -z $saved ]]; then
     exec {fd}>&-
     return 1
   fi
-
-  stty raw -echo min 0 time 3 <&$fd 2>/dev/null
-  printf '\033]11;?\033\\' >&$fd
-  while IFS= read -r -k 1 -u $fd c 2>/dev/null; do
-    resp+=$c
-    [[ $resp == *$'\e\\' || $resp == *$'\a' ]] && break
-    (( ${#resp} < 64 )) || break
+  printf '%s\e[5n' "$1" >&$fd
+  while sysread -i $fd -s 4096 chunk 2>/dev/null; do
+    buf+=$chunk
+    [[ $buf == *$'\e[0n'* ]] && break
+    (( ${#buf} < 16384 )) || break
   done
   stty "$saved" <&$fd 2>/dev/null
   exec {fd}>&-
+  while [[ $buf == (#b)([^$'\e']#)(${~seqs})(*) ]]; do
+    TTHEME_TYPED+=$match[1] REPLY+=$match[2] buf=$match[-1]
+  done
+  [[ $buf == $'\e'* ]] || TTHEME_TYPED+=$buf
+  REPLY=${REPLY%$'\e[0n'}
+}
 
+__tt_typed() {
+  [[ -n $TTHEME_TYPED ]] || return 0
+  zle -U -- "$TTHEME_TYPED"
+  TTHEME_TYPED=
+}
+
+__tt_start_bg() { __tt_query_bg }
+
+__tt_query_bg() {
+  local resp
+  REPLY=""
+  if (( TTHEME_TMUX )); then
+    REPLY=$(tmux show -qv @ttheme_bg 2>/dev/null)
+    [[ $REPLY == \#* ]] && return 0
+    REPLY=""
+  fi
+  __tt_ask $'\e]11;?\e\\' || return 1
+  resp=$REPLY
+  REPLY=""
   [[ $resp == *rgb:* ]] || return 1
   local -a parts=(${(s:/:)${${resp#*rgb:}%%[^0-9A-Fa-f/]*}})
   (( ${#parts} >= 3 )) || return 1

package/shell/adapters/ghostty.zsh

@@ -24,11 +24,11 @@ __tt_shown() {
   [[ $was == $1 ]] && return 1
   [[ -r $dir/$1.conf || ( -n $was && -r $dir/$was.conf ) ]] || return 1
   [[ -d $dir ]] || mkdir -p $dir || return 1
-  print -r -- "config-file = ?$1.conf" > $dir/shown.conf
+  __tt_put $dir/shown.conf "config-file = ?$1.conf"
 }
 
 __tt_bg_cells() {
-  local fd saved resp="" line c v f
+  local REPLY resp line v f
   local -i px=2 py=2 fs=0 sc=2
   for f in ${XDG_CONFIG_HOME:-$HOME/.config}/ghostty/config; do
     [[ -r $f ]] || continue
@@ -41,16 +41,8 @@ __tt_bg_cells() {
       esac
     done
   done
-  exec {fd}<>/dev/tty 2>/dev/null || return 0
-  saved=$(stty -g <&$fd 2>/dev/null)
-  stty raw -echo min 0 time 3 <&$fd 2>/dev/null
-  printf '\e_Ga=t,f=24,s=1,v=1,i=1,q=2;AAAA\e\\\e_Ga=p,i=1,p=9,P=999998,Q=1,C=1,q=1\e\\\e_Ga=d,d=i,i=1,p=9,q=2\e\\\e[16t' >&$fd
-  while IFS= read -r -s -k 1 -t 1 -u $fd c 2>/dev/null; do
-    resp+=$c
-    [[ $resp == *'[6;'<1->';'<1->t ]] && break
-  done
-  stty "$saved" <&$fd 2>/dev/null
-  exec {fd}>&-
+  __tt_ask $'\e_Ga=t,f=24,s=1,v=1,i=1,q=2;AAAA\e\\\e_Ga=p,i=1,p=9,P=999998,Q=1,C=1,q=1\e\\\e_Ga=d,d=i,i=1,p=9,q=2\e\\\e[16t' || return 0
+  resp=$REPLY
   [[ $resp == *'[6;'<1->';'<1->t ]] || return 0
   [[ $resp == *$'\e_G'*';E'* ]] && bgrel=1
   resp=${${resp##*\[6;}%t}

package/shell/adapters/iterm2.zsh

@@ -39,18 +39,10 @@ __tt_unshown() {
 }
 
 __tt_bg_cells() {
-  local fd saved resp="" c
+  local REPLY resp
   local -a p
-  exec {fd}<>/dev/tty 2>/dev/null || return 0
-  saved=$(stty -g <&$fd 2>/dev/null)
-  stty raw -echo min 0 time 3 <&$fd 2>/dev/null
-  printf '\e]1337;ReportCellSize\a' >&$fd
-  while IFS= read -r -s -k 1 -t 1 -u $fd c 2>/dev/null; do
-    resp+=$c
-    [[ $resp == *ReportCellSize=*($'\a'|$'\e\\') ]] && break
-  done
-  stty "$saved" <&$fd 2>/dev/null
-  exec {fd}>&-
+  __tt_ask $'\e]1337;ReportCellSize\a' || return 0
+  resp=$REPLY
   [[ $resp == *ReportCellSize=*($'\a'|$'\e\\') ]] || return 0
   p=(${(s:;:)${${resp##*ReportCellSize=}%%($'\a'|$'\e\\')*}})
   (( ${#p} == 3 )) || return 0

package/shell/adapters/kitty.zsh

@@ -32,17 +32,9 @@ __tt_bg_shown() { REPLY=$TTHEME_KITTY_SHOWN }
 __tt_bg_refresh() { (( ${@[(Ie)$TTHEME_KITTY_SHOWN]} )) && __tt_kitty_var ttheme_shown $TTHEME_KITTY_SHOWN }
 
 __tt_bg_cells() {
-  local fd saved resp="" c
-  exec {fd}<>/dev/tty 2>/dev/null || return 0
-  saved=$(stty -g <&$fd 2>/dev/null)
-  stty raw -echo min 0 time 3 <&$fd 2>/dev/null
-  printf '\e[16t' >&$fd
-  while IFS= read -r -s -k 1 -t 1 -u $fd c 2>/dev/null; do
-    resp+=$c
-    [[ $resp == *'[6;'<1->';'<1->t ]] && break
-  done
-  stty "$saved" <&$fd 2>/dev/null
-  exec {fd}>&-
+  local REPLY resp
+  __tt_ask $'\e[16t' || return 0
+  resp=$REPLY
   [[ $resp == *'[6;'<1->';'<1->t ]] || return 0
   resp=${${resp##*\[6;}%t}
   bgch=${resp%;*} bgcw=${resp#*;}

package/shell/adapters/terminal-app.zsh

@@ -1,22 +1,12 @@
 typeset -g TTHEME_TERMINAL_BASE=""
 
 __tt_terminal_base() {
-  local fd saved resp="" c q=$'\e]11;?\e\\\e]10;?\e\\\e]12;?\e\\\e]17;?\e\\' e v i
+  local REPLY resp q=$'\e]11;?\e\\\e]10;?\e\\\e]12;?\e\\\e]17;?\e\\' e v i
   local -a p
   local -A got
   for i in {0..15}; do q+=$'\e]4;'$i$';?\e\\'; done
-  exec {fd}<>/dev/tty 2>/dev/null || return 1
-  saved=$(stty -g <&$fd 2>/dev/null)
-  [[ -n $saved ]] || { exec {fd}>&-; return 1 }
-  stty raw -echo min 0 time 3 <&$fd 2>/dev/null
-  printf '%s\e[5n' $q >&$fd
-  while IFS= read -r -k 1 -u $fd c 2>/dev/null; do
-    resp+=$c
-    [[ $resp == *$'\e[0n' ]] && break
-    (( ${#resp} < 2048 )) || break
-  done
-  stty "$saved" <&$fd 2>/dev/null
-  exec {fd}>&-
+  __tt_ask $q || return 1
+  resp=$REPLY
   for e in ${(ps:\e]:)resp}; do
     [[ $e == *';rgb:'* ]] || continue
     p=(${(s:/:)${${e#*rgb:}%%[^0-9A-Fa-f/]*}})
@@ -27,6 +17,11 @@ __tt_terminal_base() {
   (( ${#${=v}} == 20 )) && TTHEME_TERMINAL_BASE=$v
 }
 
+__tt_start_bg() {
+  REPLY=${TTHEME_TERMINAL_BASE%% *}
+  [[ -n $REPLY ]]
+}
+
 __tt_osc_reset() {
   [[ -n $TTHEME_TERMINAL_BASE ]] && __tt_osc_apply "$TTHEME_TERMINAL_BASE"
   return 0

package/shell/ttheme.zsh

@@ -31,7 +31,10 @@ __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
-  (( $+functions[add-zle-hook-widget] )) && add-zle-hook-widget -d line-init __tt_focus_on
+  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
   unfunction ttheme
 }
 
@@ -1546,7 +1549,7 @@ __tt_preview() {
   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 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=()
+  local -A bgfrom=() bgsent=() bgdim=() bgsrc=() bgfill=() bgfocus=() bgsize=() bgpos=() bgop=() bgdef=() bgoff=() bgbase=() bgload=() bgshot=() bgshotkey=() bgedit=() bgtunef=() bgofff=() bgimages=()
   local conf=0 cf=1
   local -a plabel=(" this tab " " default ") csnap=()
   local -a cvars=(TTHEME_TAB_PALETTE TTHEME_ANNOUNCE TTHEME_FX TTHEME_SORT) clabel=("new tabs" announce "search fx" sort)
@@ -1691,7 +1694,7 @@ if __tt_active; then
     if [[ -n $TTHEME_SPEC ]]; then
       :
     elif [[ $TTHEME_TAB_PALETTE == off ]]; then
-      if __tt_query_bg; then
+      if __tt_start_bg; then
         for k in ${(k)TTHEME_PALETTE}; do
           [[ ${TTHEME_PALETTE[$k]%% *} == "$REPLY" ]] && { TTHEME_SPEC=$TTHEME_PALETTE[$k]; break }
         done
@@ -1703,7 +1706,9 @@ if __tt_active; then
     fi
     __tt_dir_sync
   }
-  autoload -Uz add-zsh-hook
+  autoload -Uz add-zsh-hook add-zle-hook-widget
+  zle -N __tt_typed
+  add-zle-hook-widget line-init __tt_typed
   add-zsh-hook chpwd __tt_chpwd
   add-zsh-hook precmd __tt_fresh
   if (( ! TTHEME_TMUX )); then