@kecan0406/ttheme 1.2.7 → 1.2.8

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.7",
+  "version": "1.2.8",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "type": "module",
   "bin": {
     "ttheme": "bin/ttheme.js"
@@ -34,12 +34,12 @@
     "@biomejs/biome": "^2.3.0",
     "@clack/core": "^1.4.3",
     "@clack/prompts": "^1.7.0",
+    "@jsquash/jpeg": "^1.6.0",
     "@material/material-color-utilities": "^0.4.0",
     "@types/bun": "^1.3.0",
     "@types/pngjs": "6.0.5",
     "@xterm/headless": "6.0.0",
     "fast-string-width": "^3.0.2",
-    "jpeg-js": "^0.4.4",
     "pngjs": "7.0.0",
     "smol-toml": "^1.9.0",
     "typescript": "^5.8.2"

package/shell/adapters/_bg.zsh

@@ -506,6 +506,19 @@ __tt_pv_img() {
   [[ -z $2 || $2 == "${bgact[$1]}" ]] || REPLY=$1:$2
 }
 
+__tt_pv_bg_prepare() {
+  local key=${tpick##*:} want REPLY
+  [[ $tpick == *:* ]] || key=${bgact[$tune]}
+  [[ -n $key ]] || return 0
+  __tt_bg_coloring $tpick
+  want=$tune:$key:$REPLY
+  (( ${+bgprep[$want]} )) && return 0
+  (( bgprepid )) && kill -0 $bgprepid 2>/dev/null && return 0
+  bgprep[$want]=1
+  __tt_cli image $tune prepare $key </dev/null >/dev/null 2>&1 &!
+  bgprepid=$!
+}
+
 __tt_pv_tune_open() {
   local REPLY
   __tt_bg_load $1
@@ -513,6 +526,7 @@ __tt_pv_tune_open() {
   tpick=$REPLY tune=$1 tf=1 tsnaps=()
   __tt_bg_load $tpick
   tsnaps[$tpick]="${bgsize[$tpick]} ${bgpos[$tpick]} ${bgop[$tpick]} ${bgoff[$tpick]}"
+  __tt_pv_bg_prepare
 }
 
 __tt_pv_bg_pick() {
@@ -532,6 +546,7 @@ __tt_pv_bg_pick() {
   __tt_bg_load $tpick
   (( ${+tsnaps[$tpick]} )) || tsnaps[$tpick]="${bgsize[$tpick]} ${bgpos[$tpick]} ${bgop[$tpick]} ${bgoff[$tpick]}"
   bgname=""
+  __tt_pv_bg_prepare
 }
 
 __tt_pv_bg_drop() {
@@ -560,14 +575,13 @@ __tt_pv_bg_recolor() {
   __tt_bg_coloring $tpick
   want=original
   [[ $REPLY == original ]] && want=tone
-  __tt_pv_tune_keep
-  __tt_pv_bg_commit $name
   msg="Drawing in its own colors"
   [[ $want == tone ]] && msg="Drawing in the palette's tone"
   msgt=300
   printf '\e[?2026h'
   __tt_pv_draw
-  __tt_pv_bg_close
+  __tt_pv_tune_stage
+  __tt_pv_bg_commit $name
   err=$(__tt_cli image $name $want $key 2>&1)
   rc=$?
   err=${${err//$'\n'/ }## #}
@@ -577,6 +591,7 @@ __tt_pv_bg_recolor() {
   bgload[$name]="" bgedit[$name]=1
   msg=${err:-"Background · $name"} msgt=$(( rc ? 300 : 200 ))
   [[ -r ${TTHEME_CONFIG:h}/backgrounds/${${name/@/--}/\//--}.conf ]] || return 0
+  (( rc )) || bgprep[$name:$key:$want]=1
   __tt_pv_tune_open $name
   if [[ $was != "$tpick" ]]; then
     tpick=$was
@@ -588,7 +603,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 -a labs=(Size Position Opacity Colors) at=(0 3 6 7) def=(${=bgdef[$1]})
+  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=
   (( T < 8 )) && T=8
@@ -624,7 +639,7 @@ __tt_pv_bg_panel() {
     fi
     if (( k == 2 )); then
       for (( i = 1; i <= 9; i++ )); do
-        out+=$'\e['$(( r0 + 2 + (i - 1) / 3 ))';'$(( col + 12 + (i - 1) % 3 * 3 ))'H'
+        out+=$'\e['$(( r0 + at[2] - 1 + (i - 1) / 3 ))';'$(( col + 12 + (i - 1) % 3 * 3 ))'H'
         if (( ! color )); then
           if (( i == pos )); then out+="#"; else out+="."; fi
         elif (( i == pos && ! off )); then
@@ -669,14 +684,13 @@ __tt_pv_bg_panel() {
       out+=$'\e['$r';'$end'H'$mark"↺"$z
     fi
   done
-  (( split )) && bgstrip="$(( r0 + 9 )) $col $end"
 }
 
 __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 -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 < 2 )); then
+  if (( n < 1 )); then
     __tt_pv_bg_strip_off
     return 0
   fi
@@ -684,10 +698,8 @@ __tt_pv_bg_strip() {
   [[ $tpick == *:* ]] || cur=${bgact[$pal]}
   at=${keys[(Ie)$cur]}
   (( at )) || at=1
-  buf+=$'\e['$r0';'$(( col + 2 ))'H'$d"Images"$z$'\e['$r0';'$(( end - ${#at} - ${#n} ))'H'$d"$at/$n"$z
   pd=(${=bgpic[$pal:$keys[at]]})
   if (( r0 + tr + 3 >= ph )) || ! __tt_bg_dim $dir/$pd[2]; then
-    print -rn -- "$buf"
     __tt_pv_bg_strip_off
     return 0
   fi