@kecan0406/ttheme 1.1.5 → 1.1.6

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.5",
+  "version": "1.1.6",
   "gate": [
     {
       "rule": "foreground",

package/package.json

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

package/shell/adapters/_bg.zsh

@@ -9,14 +9,6 @@ __tt_ghostty_shown() {
   REPLY=${${REPLY/--/@}/--//}
 }
 
-__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
@@ -27,6 +19,8 @@ __tt_bg_saved() {
 
 __tt_bg_refresh() { : }
 
+__tt_bg_lasting() { : }
+
 __tt_bg_aligns() { (( ! ${TTHEME_TERMINALS[(Ie)iterm2]} )) }
 
 __tt_bg_frame() {
@@ -668,7 +662,7 @@ __tt_pv_bg_strip() {
     __tt_bg_send $fill
     id=$REPLY
     want="$id $(( r0 + 2 )) $(( x + 1 )) $tc $tr"
-    [[ ${bgthumb[$slot]} == "$want" ]] && continue
+    __tt_bg_lasting && [[ ${bgthumb[$slot]} == "$want" ]] && continue
     if [[ -n ${bgthumb[$slot]} ]]; then
       printf -v cmd '\e_Ga=d,d=i,i=%d,p=%d,q=2\e\\' ${${=bgthumb[$slot]}[1]} $(( 700000 + slot ))
       buf+=$cmd

package/shell/adapters/terminal-app.zsh

@@ -27,4 +27,7 @@ __tt_osc_reset() {
   return 0
 }
 
-[[ -o interactive && -t 1 ]] && __tt_listen
+() {
+  emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+  [[ -o interactive && -t 1 ]] && __tt_listen
+}

package/shell/adapters/wezterm.zsh

@@ -1,23 +1,73 @@
-typeset -g TTHEME_WEZTERM_SHOWN=""
+source $TTHEME_HOME/adapters/_bg.zsh
+
+typeset -g TTHEME_WEZTERM_SHOWN="" TTHEME_WEZTERM_VIEW=""
 
 __tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)wezterm]} )) }
 
-__tt_wezterm_show() {
+__tt_wezterm_var() {
   local REPLY
-  __tt_b64s "$1"
-  printf '\e]1337;SetUserVar=ttheme_shown=%s\a' "$REPLY"
+  __tt_b64s "$2"
+  __tt_out $'\e]1337;SetUserVar='$1'='$REPLY$'\a'
 }
 
 __tt_shown() {
   [[ $2 != force && $TTHEME_WEZTERM_SHOWN == $1 ]] && return 1
   TTHEME_WEZTERM_SHOWN=$1
-  __tt_wezterm_show $1
+  __tt_wezterm_var ttheme_shown $1
   return 1
 }
 
+__tt_bg_shown() { REPLY=$TTHEME_WEZTERM_SHOWN }
+
+__tt_bg_refresh() { __tt_wezterm_var ttheme_shown $TTHEME_WEZTERM_SHOWN }
+
+__tt_bg_lasting() { return 1 }
+
+__tt_bg_cells() {
+  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#*;}
+}
+
+__tt_pv_bg_findable() { return 1 }
+
 __tt_pv_bg_show() {
-  bgname=$1
-  __tt_wezterm_show $1
+  (( bgcw )) || return 0
+  local name=$1 img="" size fit=contain view="" REPLY
+  local -i W=$(( pw * bgcw )) H=$(( ph * bgch )) focus=-1
+  local -a p=(${=TTHEME_PALETTE[${name%:*}]}) wh
+  (( ${#p} >= 20 )) || return 0
+  (( $2 )) && TTHEME_WEZTERM_VIEW=-
+  bgname=$name
+  __tt_bg_load $name
+  if [[ $name != "$bginc" || "${bgsize[$name]} ${bgpos[$name]} ${bgop[$name]} ${bgoff[$name]}" != "${bgload[$name]}" ]]; then
+    size=${bgsize[$name]}
+    if [[ $size == fill ]]; then
+      img=${bgfill[$name]} size=100 fit=cover
+    elif [[ "$size ${bgpos[$name]}" == "${bgshotkey[$name]}" && -r ${bgshot[$name]} ]]; then
+      img=${bgshot[$name]} size=100 fit=cover
+    else
+      img=${bgsrc[$name]} focus=${bgfocus[$name]}
+    fi
+    (( bgoff[$name] )) && img=""
+    view="$p[1]||1|$W|$H|0|0|0|0|5"
+    if [[ -n $img ]] && __tt_bg_dim "$img"; then
+      wh=(${=bgdim[$img]})
+      __tt_bg_frame $wh[1] $wh[2] $W $H $size ${bgpos[$name]} $fit $focus
+      view="$p[1]|$img|${bgop[$name]}|$W|$H|${REPLY// /|}|${bgpos[$name]}"
+    fi
+  fi
+  [[ $view == "$TTHEME_WEZTERM_VIEW" ]] && return 0
+  TTHEME_WEZTERM_VIEW=$view
+  __tt_wezterm_var ttheme_view "$view"
 }
 
-__tt_pv_bg_close() { [[ -z $TTHEME_WEZTERM_SHOWN ]] || __tt_wezterm_show $TTHEME_WEZTERM_SHOWN }
+__tt_pv_bg_close() {
+  (( bgcw )) && { printf '\e_Ga=d,d=A,q=2\e\\'; __tt_bg_forget }
+  [[ -n $TTHEME_WEZTERM_VIEW ]] || return 0
+  TTHEME_WEZTERM_VIEW=""
+  __tt_wezterm_var ttheme_view ""
+}