@kecan0406/ttheme 1.0.47 → 1.0.49

package/dist/manifest.json

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

package/package.json

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

package/shell/adapters/_bg.zsh

@@ -265,12 +265,12 @@ __tt_pv_bg_show() {
   local -a p=(${=TTHEME_PALETTE[$name]}) wh at
   local -i cols=$(( pw + 2 * bgmx )) rows=$(( ph + 2 * bgmy ))
   (( ${#p} >= 20 )) || return 0
-  (( $2 )) && { bgsent=(); bgshown="" bganchor=0 }
+  (( $2 )) && { __tt_bg_forget; bgshown="" bganchor=0 }
   bgname=$name
   __tt_bg_load $name
   if (( ! bgrel )) && [[ $name == "$bginc" && "${bgsize[$name]} ${bgpos[$name]} ${bgop[$name]} ${bgoff[$name]}" == "${bgload[$name]}" ]]; then
     printf '\e_Ga=d,d=i,i=1,q=2\e\\\e_Ga=d,d=i,i=2,q=2\e\\'
-    [[ -n $bgshown ]] && printf '\e_Ga=d,d=i,i=%d,q=2\e\\' $bgshown
+    [[ -n $bgshown ]] && printf '\e_Ga=d,d=i,i=%d,p=%d,q=2\e\\' $bgshown $bgshown
     bgshown=""
     return 0
   fi
@@ -304,21 +304,41 @@ __tt_pv_bg_show() {
       __tt_bg_crop $img $wh[1] $wh[2] $at[6] $at[8] && id=${REPLY% *} at[6]=${REPLY##* }
     fi
   fi
-  [[ -n $bgshown && $bgshown != "$id" ]] && printf '\e_Ga=d,d=i,i=%d,q=2\e\\' $bgshown
+  [[ -n $bgshown && $bgshown != "$id" ]] && printf '\e_Ga=d,d=i,i=%d,p=%d,q=2\e\\' $bgshown $bgshown
   bgshown=$id
   [[ -n $id ]] || return 0
   __tt_bg_at $id -1073741826 $(( at[1] - 1 )) $(( at[2] - 1 )) $at[3] $at[4] $at[5] $at[6] $at[7] $at[8]
 }
 
 __tt_bg_send() {
-  if [[ -z ${bgsent[$1]} ]]; then
-    bgsent[$1]=$(( ${#bgsent} + 3 ))
+  local -i cost=0
+  if [[ -n ${bgsent[$1]} ]]; then
+    bgorder=("${(@)bgorder:#${(b)1}}" "$1")
+  else
+    __tt_bg_dim "$1" && cost=$(( ${bgdim[$1]% *} * ${bgdim[$1]#* } * 4 ))
+    bgsent[$1]=$(( ++bgnext + 2 )) bgcost[$1]=$cost
+    (( bgbytes += cost ))
+    bgorder+=("$1")
     __tt_b64s "$1"
     printf '\e_Ga=t,t=f,f=100,i=%d,q=2;%s\e\\' ${bgsent[$1]} "$REPLY"
+    while (( ${#bgorder} > 1 && bgbytes > 134217728 )); do
+      printf '\e_Ga=d,d=I,i=%d,q=2\e\\' ${bgsent[$bgorder[1]]}
+      (( bgbytes -= bgcost[$bgorder[1]] ))
+      unset "bgsent[$bgorder[1]]" "bgcost[$bgorder[1]]"
+      shift bgorder
+    done
   fi
   REPLY=${bgsent[$1]}
 }
 
+__tt_bg_forget() {
+  local id
+  for id in $bgsent; do
+    printf '\e_Ga=d,d=I,i=%d,q=2\e\\' $id
+  done
+  bgsent=() bgcost=() bgorder=() bgbytes=0
+}
+
 __tt_pv_bg_fs() {
   local name=$1
   local -a wh fwh
@@ -415,7 +435,7 @@ __tt_pv_bg_find() {
   done
   [[ -r $TTHEME_CONFIG ]] && source $TTHEME_CONFIG
   err=${${err//$'\n'/ }## #}
-  resized=1 bgname="" bgshown="" bgsent=() bgdim=()
+  resized=1 bgname="" bgshown="" bgdim=()
   if (( rc == 1 )); then
     msg=${err:-"find failed for $name"} msgt=300
   fi
@@ -445,7 +465,7 @@ __tt_pv_bg_image() {
   err=$(__tt_cli image $name $act 2>&1)
   rc=$?
   err=${${err//$'\n'/ }## #}
-  resized=1 bgname="" bgshown="" bgsent=() bgdim=()
+  resized=1 bgname="" bgshown="" bgdim=()
   unset "bgsrc[$name]"
   __tt_bg_load $name
   bgload[$name]="" bgedit[$name]=1
@@ -514,7 +534,7 @@ __tt_pv_bg_panel() {
 }
 
 __tt_pv_bg_close() {
-  (( bgcw )) && printf '\e_Ga=d,d=A,q=2\e\\'
+  (( bgcw )) && { printf '\e_Ga=d,d=A,q=2\e\\'; __tt_bg_forget }
   [[ -z $bgcut ]] || { rm -rf -- $bgcut; bgcut="" }
 }
 

package/shell/ttheme.zsh

@@ -89,6 +89,8 @@ __tt_pins_load
 
 : ${TTHEME_SORT:=abc}
 
+: ${TTHEME_BG_BLUR:=0}
+
 typeset -g TTHEME_STATE_DIR=${XDG_STATE_HOME:-$HOME/.local/state}/ttheme
 
 if [[ $TERM_PROGRAM == WarpTerminal ]]; then
@@ -562,14 +564,27 @@ __tt_switch() {
 }
 
 __tt_config() {
+  local blur
   if [[ ! -e $TTHEME_CONFIG ]]; then
     mkdir -p ${TTHEME_CONFIG:h} || return 1
     print -r -- "$TTHEME_CONFIG_TEMPLATE" > $TTHEME_CONFIG
   fi
+  blur=${(M)${(@f)"$(<$TTHEME_CONFIG)"}:#': ${TTHEME_BG_BLUR:='*}
   ${=${VISUAL:-${EDITOR:-vi}}} $TTHEME_CONFIG || return
+  [[ ${(M)${(@f)"$(<$TTHEME_CONFIG)"}:#': ${TTHEME_BG_BLUR:='*} == "$blur" ]] || __tt_redraw
   print -r -- "settings apply in new tabs — $TTHEME_CONFIG"
 }
 
+__tt_redraw() {
+  local out
+  out=$(__tt_cli redraw 2>&1) || { [[ -n $out ]] && print -ru2 -- "$out"; return 1 }
+  [[ -n $out ]] || return 0
+  print -r -- "$out"
+  __tt_reload
+  (( $+functions[__tt_bg_refresh] )) && __tt_bg_refresh $TTHEME_ORDER
+  return 0
+}
+
 __tt_config_line() {
   REPLY=": \${$1:=$2}"
   [[ -n ${(M)${(@f)TTHEME_CONFIG_TEMPLATE}:#"# $REPLY"} ]] && REPLY="# $REPLY"
@@ -1170,12 +1185,32 @@ __tt_pv_conf_save() {
   __tt_tilde "$TTHEME_CONFIG"
   if __tt_config_write "${pairs[@]}"; then
     conf=0 msg="saved · $REPLY" msgt=200
+    (( ${pairs[(Ie)TTHEME_BG_BLUR]} )) && __tt_pv_redraw
   else
     __tt_pv_unconf
     msg="could not write $REPLY" msgt=200
   fi
 }
 
+__tt_pv_redraw() {
+  local name out
+  if (( $+functions[__tt_bg_write] )); then
+    for name in ${(k)bgedit}; do
+      __tt_bg_write $name
+    done
+  fi
+  bgedit=()
+  msg="drawing the background pictures again" msgt=300
+  printf '\e[?2026h'
+  __tt_pv_draw
+  __tt_pv_bg_close
+  out=$(__tt_cli redraw 2>&1)
+  bgsrc=() resized=1 bgname="" bgshown="" bgdim=()
+  __tt_reload
+  (( $+functions[__tt_bg_refresh] )) && __tt_bg_refresh $TTHEME_ORDER
+  msg=${${out//$'\n'/ }:-"saved · no background pictures to draw"} msgt=300
+}
+
 __tt_pv_conf_panel() {
   local z=$'\e[0m' b=$'\e[1m' d=$'\e[2m' c=$ac on=$'\e[7;1m'$ac var v note
   local -a ch sh
@@ -1219,7 +1254,7 @@ __tt_pv_conf_panel() {
     done
   done
   var=${cvars[cf]}
-  note=${cnote[${(P)var}]}
+  note=${cnote[$var:${(P)var}]}
   [[ -n $note ]] && out+=$'\e['$(( r0 + ${#cvars} + 1 ))';'$col'H'$d${note[1,end-col+1]}$z
   return 0
 }
@@ -1633,17 +1668,21 @@ __tt_preview() {
   fi
   local orig=$TTHEME_SPEC applied=$TTHEME_SPEC painted=$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 tick=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=() bgtunef=() bgofff=() bgimages=()
+  local tune="" tsnap="" tf=1 help=0 msg="" msgt=0 an="" bgrel=0 bgmx=0 bgmy=0 bganchor=0 bgcut="" bgnext=0 bgbytes=0
+  local -a bgorder=()
+  local -A bgfrom=() bgsent=() bgcost=() 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)
-  local -a cchoice=("off seq" "1 0" "typewriter decode glitch" "abc series") cshow=("off seq" "on off" "typewriter decode glitch" "abc series")
+  local -a cvars=(TTHEME_TAB_PALETTE TTHEME_ANNOUNCE TTHEME_FX TTHEME_SORT TTHEME_BG_BLUR) clabel=("new tabs" announce "search fx" sort blur)
+  local -a cchoice=("off seq" "1 0" "typewriter decode glitch" "abc series" "0 1 2 3 4") cshow=("off seq" "on off" "typewriter decode glitch" "abc series" "off 1px 2px 3px 4px")
   local -A cnote=(
-    seq "new tabs rotate through palettes" off "new tabs keep the terminal theme"
-    1 "shows the palette notice" 0 "silences the palette notice"
-    typewriter "the search hint types itself" decode "the search hint decodes" glitch "the search hint glitches in"
-    abc "series and palettes by name" series "series in the order added"
+    TTHEME_TAB_PALETTE:seq "new tabs rotate through palettes" TTHEME_TAB_PALETTE:off "new tabs keep the terminal theme"
+    TTHEME_ANNOUNCE:1 "shows the palette notice" TTHEME_ANNOUNCE:0 "silences the palette notice"
+    TTHEME_FX:typewriter "the search hint types itself" TTHEME_FX:decode "the search hint decodes" TTHEME_FX:glitch "the search hint glitches in"
+    TTHEME_SORT:abc "series and palettes by name" TTHEME_SORT:series "series in the order added"
+    TTHEME_BG_BLUR:0 "pictures stay sharp" TTHEME_BG_BLUR:1 "pictures soften a little behind the text"
+    TTHEME_BG_BLUR:2 "pictures soften behind the text" TTHEME_BG_BLUR:3 "pictures blur behind the text"
+    TTHEME_BG_BLUR:4 "pictures blur well behind the text"
   )
   [[ $mode == pin ]] && pkdef=2 plabel=(" this directory " " and below ")
   [[ $mode == init ]] && pkdef=2