@kecan0406/ttheme 1.0.45 → 1.0.47

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.45",
+  "version": "1.0.47",
   "gate": [
     {
       "rule": "foreground",

package/package.json

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

package/shell/adapters/_bg.zsh

@@ -29,18 +29,6 @@ __tt_bg_refresh() { : }
 
 __tt_bg_aligns() { (( ! ${TTHEME_TERMINALS[(Ie)iterm2]} )) }
 
-__tt_b64() {
-  local t=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/ out="" i n
-  local -a b=("$@")
-  for (( i = 1; i <= ${#b}; i += 3 )); do
-    n=$(( (b[i] << 16) | (${b[i+1]:-0} << 8) | ${b[i+2]:-0} ))
-    out+=${t:$(( (n >> 18) & 63 )):1}${t:$(( (n >> 12) & 63 )):1}
-    if (( i + 1 <= ${#b} )); then out+=${t:$(( (n >> 6) & 63 )):1}; else out+='='; fi
-    if (( i + 2 <= ${#b} )); then out+=${t:$(( n & 63 )):1}; else out+='='; fi
-  done
-  REPLY=$out
-}
-
 __tt_bg_frame() {
   local -i iw=$1 ih=$2 W=$3 H=$4 s=$5 ax=$(( ($6 - 1) % 3 )) ay=$(( ($6 - 1) / 3 )) f=${8:--1} wide dw dh ox oy
   wide=$(( W * ih >= H * iw ))
@@ -155,11 +143,22 @@ __tt_bg_label() {
 }
 
 __tt_bg_dim() {
-  local img=$1
-  local -a d
+  setopt localoptions nomultibyte
+  local img=$1 fd hdr="" c
+  local -a d=()
+  local -i i n
   [[ -n $img && -r $img ]] || return 1
   if [[ -z ${bgdim[$img]} ]]; then
-    d=($(od -An -N24 -tu1 -- $img 2>/dev/null))
+    if { exec {fd}<$img } 2>/dev/null; then
+      sysread -s 24 -i $fd hdr
+      exec {fd}<&-
+    fi
+    for (( i = 1; i <= ${#hdr}; i++ )); do
+      c=${hdr[i]}
+      n=$(( #c ))
+      (( n < 0 )) && (( n += 256 ))
+      d+=($n)
+    done
     if (( ${#d} == 24 && d[1] == 137 && d[2] == 80 && d[3] == 78 && d[4] == 71 )); then
       bgdim[$img]="$(( (d[17] << 24) | (d[18] << 16) | (d[19] << 8) | d[20] )) $(( (d[21] << 24) | (d[22] << 16) | (d[23] << 8) | d[24] ))"
     else
@@ -314,7 +313,8 @@ __tt_pv_bg_show() {
 __tt_bg_send() {
   if [[ -z ${bgsent[$1]} ]]; then
     bgsent[$1]=$(( ${#bgsent} + 3 ))
-    printf '\e_Ga=t,t=f,f=100,i=%d,q=2;%s\e\\' ${bgsent[$1]} "$(print -rn -- $1 | base64 | tr -d '\n')"
+    __tt_b64s "$1"
+    printf '\e_Ga=t,t=f,f=100,i=%d,q=2;%s\e\\' ${bgsent[$1]} "$REPLY"
   fi
   REPLY=${bgsent[$1]}
 }
@@ -406,6 +406,7 @@ __tt_pv_bg_findable() {
 __tt_pv_bg_find() {
   local name=$1 err var
   local -i rc
+  [[ $applied == "$painted" ]] || { __tt_apply "$applied" && painted=$applied }
   __tt_pv_bg_close
   err=$(__tt_cli find $name 2>&1 >/dev/tty)
   rc=$?

package/shell/adapters/_osc.zsh

@@ -19,6 +19,7 @@ __tt_osc_apply() {
   out+=$'\e]10;'$p[2]$'\e\\\e]12;'$p[3]$'\e\\\e]17;'$p[4]$'\e\\'
   for i in {0..15}; do out+=$'\e]4;'$i';'$p[i+5]$'\e\\'; done
   __tt_out "$out"
+  export TTHEME_PAINTED=1
   (( TTHEME_TMUX )) && tmux set -q @ttheme_bg "$p[1]" 2>/dev/null
   __tt_worn "$1"
   return 0
@@ -26,6 +27,7 @@ __tt_osc_apply() {
 
 __tt_osc_reset() {
   __tt_out $'\e]104\e\\\e]110\e\\\e]111\e\\\e]112\e\\\e]117\e\\'
+  unset TTHEME_PAINTED
   (( TTHEME_TMUX )) && tmux set -qu @ttheme_bg 2>/dev/null
   __tt_worn ""
   return 0
@@ -43,6 +45,8 @@ __tt_repaint() {
 
 __tt_apply() { __tt_osc_apply "$@" }
 
+__tt_pv_paint() { __tt_apply "$1" && painted=$1 }
+
 __tt_shown() { return 1 }
 
 __tt_unshown() { : }
@@ -78,25 +82,54 @@ __tt_pv_bg_save() { : }
 zmodload zsh/system
 
 typeset -g TTHEME_TYPED=""
+typeset -gi TTHEME_RAW=0
+
+__tt_b64() {
+  local t=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/ out="" i n
+  local -a b=("$@")
+  for (( i = 1; i <= ${#b}; i += 3 )); do
+    n=$(( (b[i] << 16) | (${b[i+1]:-0} << 8) | ${b[i+2]:-0} ))
+    out+=${t:$(( (n >> 18) & 63 )):1}${t:$(( (n >> 12) & 63 )):1}
+    if (( i + 1 <= ${#b} )); then out+=${t:$(( (n >> 6) & 63 )):1}; else out+='='; fi
+    if (( i + 2 <= ${#b} )); then out+=${t:$(( n & 63 )):1}; else out+='='; fi
+  done
+  REPLY=$out
+}
+
+__tt_b64s() {
+  setopt localoptions nomultibyte
+  local s=$1 c
+  local -a b=()
+  local -i i n
+  for (( i = 1; i <= ${#s}; i++ )); do
+    c=${s[i]}
+    n=$(( #c ))
+    (( n < 0 )) && (( n += 256 ))
+    b+=($n)
+  done
+  __tt_b64 $b
+}
 
 __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 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
+  if (( ! TTHEME_RAW )) && ! zle; then
+    saved=$(stty -g <&$fd 2>/dev/null && stty raw -echo <&$fd 2>/dev/null)
+    if [[ -z $saved ]]; then
+      exec {fd}>&-
+      return 1
+    fi
   fi
   printf '%s\e[5n' "$1" >&$fd
-  while sysread -i $fd -s 4096 chunk 2>/dev/null; do
+  while sysread -t 0.3 -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
+  [[ -n $saved ]] && stty "$saved" <&$fd 2>/dev/null
   exec {fd}>&-
   while [[ $buf == (#b)([^$'\e']#)(${~seqs})(*) ]]; do
     TTHEME_TYPED+=$match[1] REPLY+=$match[2] buf=$match[-1]
@@ -111,7 +144,14 @@ __tt_typed() {
   TTHEME_TYPED=
 }
 
-__tt_start_bg() { __tt_query_bg }
+__tt_hear() { __tt_query_bg }
+
+__tt_heard() { : }
+
+__tt_start_bg() {
+  REPLY=${TTHEME_HEARD%% *}
+  [[ -n $REPLY ]]
+}
 
 __tt_query_bg() {
   local resp

package/shell/adapters/iterm2.zsh

@@ -7,6 +7,17 @@ fi
 
 __tt_keepable() { return 0 }
 
+__tt_pv_paint() {
+  local -a p=(${=1})
+  if (( ${#p} < 20 )); then
+    __tt_out $'\e]110\e\\\e]111\e\\'
+  elif [[ $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\\'
+  fi
+}
+
 __tt_bg_shown() {
   REPLY=""
   (( TTHEME_TMUX )) && REPLY=$(tmux show -qv @ttheme_shown 2>/dev/null)
@@ -67,6 +78,6 @@ __tt_bg_crop() {
         sips -c $h $iw --cropOffset 1 1 $bgcut/pad.png --out $band >/dev/null 2>&1 || return 1
     fi
   fi
-  printf '\e_Ga=t,t=f,f=100,i=999997,q=2;%s\e\\' "$(print -rn -- $band | base64 | tr -d '\n')"
-  REPLY="999997 0"
+  __tt_bg_send $band
+  REPLY="$REPLY 0"
 }

package/shell/adapters/kitty.zsh

@@ -4,7 +4,11 @@ typeset -g TTHEME_KITTY_SHOWN=""
 
 __tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)kitty]} )) }
 
-__tt_kitty_var() { __tt_out $'\e]1337;SetUserVar='$1'='"$(print -rn -- $2 | base64)"$'\a' }
+__tt_kitty_var() {
+  local REPLY
+  __tt_b64s "$2"
+  __tt_out $'\e]1337;SetUserVar='$1'='$REPLY$'\a'
+}
 
 __tt_shown() {
   [[ $2 != force && $TTHEME_KITTY_SHOWN == $1 ]] && return 1

package/shell/adapters/terminal-app.zsh

@@ -1,12 +1,13 @@
 typeset -g TTHEME_TERMINAL_BASE=""
 
-__tt_terminal_base() {
-  local REPLY resp q=$'\e]11;?\e\\\e]10;?\e\\\e]12;?\e\\\e]17;?\e\\' e v i
+__tt_hear() {
+  local 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
   __tt_ask $q || return 1
   resp=$REPLY
+  REPLY=""
   for e in ${(ps:\e]:)resp}; do
     [[ $e == *';rgb:'* ]] || continue
     p=(${(s:/:)${${e#*rgb:}%%[^0-9A-Fa-f/]*}})
@@ -14,17 +15,16 @@ __tt_terminal_base() {
   done
   v="$got[11] $got[10] $got[12] ${got[17]:-$got[11]}"
   for i in {0..15}; do v+=" ${got[4;$i]}"; done
-  (( ${#${=v}} == 20 )) && TTHEME_TERMINAL_BASE=$v
+  (( ${#${=v}} == 20 )) || return 1
+  REPLY=$v
 }
 
-__tt_start_bg() {
-  REPLY=${TTHEME_TERMINAL_BASE%% *}
-  [[ -n $REPLY ]]
-}
+__tt_heard() { TTHEME_TERMINAL_BASE=$1 }
 
 __tt_osc_reset() {
   [[ -n $TTHEME_TERMINAL_BASE ]] && __tt_osc_apply "$TTHEME_TERMINAL_BASE"
+  unset TTHEME_PAINTED
   return 0
 }
 
-[[ -o interactive && -t 1 ]] && __tt_terminal_base
+[[ -o interactive && -t 1 ]] && __tt_listen

package/shell/adapters/wezterm.zsh

@@ -2,7 +2,11 @@ typeset -g TTHEME_WEZTERM_SHOWN=""
 
 __tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)wezterm]} )) }
 
-__tt_wezterm_show() { printf '\e]1337;SetUserVar=ttheme_shown=%s\a' "$(print -rn -- $1 | base64)" }
+__tt_wezterm_show() {
+  local REPLY
+  __tt_b64s "$1"
+  printf '\e]1337;SetUserVar=ttheme_shown=%s\a' "$REPLY"
+}
 
 __tt_shown() {
   [[ $2 != force && $TTHEME_WEZTERM_SHOWN == $1 ]] && return 1