@kecan0406/ttheme 1.2.0 → 1.2.1

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0",
+  "version": "1.2.1",
   "gate": [
     {
       "rule": "foreground",

package/package.json

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

package/shell/adapters/_bg.zsh

@@ -75,12 +75,16 @@ __tt_bg_load() {
     bgimages[$name]=${bgimages[$pal]:-1}
   elif [[ -r $dir/$file.conf ]]; then
     lines=("${(@f)$(<$dir/$file.conf)}")
+    for line in ${(k)bgcolors[(I)${(b)pal}:*]}; do
+      unset "bgcolors[$line]"
+    done
   fi
   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##*/} bgact[$pal]=${${line#\# image }%% *} ;;
+      '# colors '*) pd=(${=line#\# colors }); [[ -n $key ]] || bgcolors[$pal:$pd[1]]=$pd[2] ;;
       '# picture '*)
         pd=(${=line#\# picture })
         bgpic[$pal:$pd[1]]=${(j: :)pd[2,-1]}
@@ -131,6 +135,12 @@ __tt_bg_load() {
   fi
 }
 
+__tt_bg_coloring() {
+  local key=${1##*:}
+  [[ $1 == *:* ]] || key=${bgact[$1]}
+  REPLY=${bgcolors[${1%:*}:$key]:-tone}
+}
+
 __tt_bg_image() {
   REPLY=${bgsrc[$1]}
   [[ ${bgsize[$1]} == fill ]] && REPLY=${bgfill[$1]}
@@ -472,6 +482,9 @@ __tt_pv_bg_reset() {
   for img in ${(k)bgsrc[(I)${(b)1}(|:*)]}; do
     unset "bgsrc[$img]"
   done
+  for img in ${(k)bgcolors[(I)${(b)1}:*]}; do
+    unset "bgcolors[$img]"
+  done
   unset "bgview[$1]" "bgswap[$1]"
 }
 
@@ -532,15 +545,48 @@ __tt_pv_bg_drop() {
   __tt_pv_tune_open $name
 }
 
+__tt_pv_bg_recolor() {
+  local name=$tune was=$tpick key=${tpick##*:} want err REPLY
+  local -i rc row=$tf
+  [[ $tpick == *:* ]] || key=${bgact[$name]}
+  __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
+  err=$(__tt_cli image $name $want $key 2>&1)
+  rc=$?
+  err=${${err//$'\n'/ }## #}
+  resized=1 bgname="" bgshown="" bgdim=()
+  __tt_pv_bg_reset $name
+  __tt_bg_load $name
+  bgload[$name]="" bgedit[$name]=1
+  msg=${err:-"Background · $name"} msgt=$(( rc ? 300 : 200 ))
+  [[ -r ${TTHEME_CONFIG:h}/backgrounds/${${name/@/--}/\//--}.conf ]] || return 0
+  __tt_pv_tune_open $name
+  if [[ $was != "$tpick" ]]; then
+    tpick=$was
+    __tt_bg_load $tpick
+    tsnaps[$tpick]="${bgsize[$tpick]} ${bgpos[$tpick]} ${bgop[$tpick]} ${bgoff[$tpick]}"
+  fi
+  tf=$row
+}
+
 __tt_pv_bg_panel() {
-  local name=$1 z=$'\e[0m' b=$'\e[1m' d=$'\e[2m' c=$ac val sty mark REPLY
-  local -a labs=(Size Position Opacity) at=(0 3 6) def=(${=bgdef[$1]})
+  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 -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
   (( $+commands[sips] )) && lo=20
   __tt_pv_bg_fs $name && (( REPLY > hi )) && hi=$REPLY
-  for k in 1 2 3; do
+  for k in 1 2 3 4; do
     r=$(( r0 + at[k] ))
     sty=$d
     (( tf == k && ! off )) && sty=$b
@@ -551,6 +597,23 @@ __tt_pv_bg_panel() {
       out+="  "
     fi
     out+=$sty$labs[k]$z
+    if (( k == 4 )); then
+      __tt_bg_coloring $name
+      val=$REPLY
+      out+=$'\e['$r';'$(( col + 12 ))'H'
+      for choice in tone original; do
+        if (( ! color )); then
+          if [[ $choice == $val ]]; then out+="[$choice] "; else out+=" $choice  "; fi
+        elif [[ $choice != $val ]]; then
+          out+=$d" $choice "$z" "
+        elif (( tf == k && ! off )); then
+          out+=$'\e[7;1m'$c" $choice "$z" "
+        else
+          out+=$sty" $choice "$z" "
+        fi
+      done
+      continue
+    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'
@@ -598,7 +661,7 @@ __tt_pv_bg_panel() {
       out+=$'\e['$r';'$end'H'$mark"↺"$z
     fi
   done
-  (( split )) && bgstrip="$(( r0 + 8 )) $col $end"
+  (( split )) && bgstrip="$(( r0 + 9 )) $col $end"
 }
 
 __tt_pv_bg_strip() {

package/shell/ttheme.zsh

@@ -95,6 +95,8 @@ __tt_pins_load
 
 : ${TTHEME_BG_BLUR:=0}
 
+: ${TTHEME_BG_COLORS:=tone}
+
 typeset -g TTHEME_STATE_DIR=${XDG_STATE_HOME:-$HOME/.local/state}/ttheme
 
 () {
@@ -1673,11 +1675,16 @@ __tt_pv_foot() {
     badge='IMAGE EDIT' kk=(↑↓ ←→ '=' +) kl=(field step reset "reset all")
     if (( tf == 2 )); then
       kl[2]=move kk+=(1-9) kl+=(place)
+    elif (( tf == 4 )); then
+      kl[2]=switch kk=(${kk:#'='}) kl=("${(@)kl[1,2]}" "reset all")
     else
       kk+=(⇧←→) kl+=(×10)
     fi
-    kk+=(space enter)
-    if (( bgoff[$tpick] )); then kl+=(show keep); else kl+=(hide keep); fi
+    if (( bgoff[$tpick] )); then
+      kk+=(space enter) kl+=(show keep)
+    else
+      kk+=(c space enter) kl+=(colors hide keep)
+    fi
     __tt_pv_bg_images $tune
     (( REPLY > 1 )) && { kk+=(', .' D); kl+=("image ×$REPLY" remove) }
     __tt_pv_bg_findable $tune && { kk+=(f); kl+=(find) }
@@ -1773,8 +1780,8 @@ __tt_pv_help() {
     "enter  ·  esc restores $back"
   )
   if (( bgcw )); then
-    hk+=("Tune bg" "" "" "" "" "")
-    hv+=("tab  ·  finds one on the boorus, or takes your own, if none" "↑↓ field  ←→ step  ⇧←→ ×10  1-9 place" "=  resets a field  ·  +  resets all" "space hides  ·  enter keeps  ·  esc undoes" ",  .  other pictures  ·  D removes one" "f  adds one from the boorus or your own")
+    hk+=("Tune bg" "" "" "" "" "" "")
+    hv+=("tab  ·  finds one on the boorus, or takes your own, if none" "↑↓ field  ←→ step  ⇧←→ ×10  1-9 place" "=  resets a field  ·  +  resets all" "space hides  ·  enter keeps  ·  esc undoes" "c  tone  ↔  the picture's own colors" ",  .  other pictures  ·  D removes one" "f  adds one from the boorus or your own")
   fi
   hk+=(Config "")
   hv+=("alt-c  ·  ↑↓ setting  ←→ value" "enter saves  ·  esc undoes")
@@ -1890,9 +1897,14 @@ __tt_pv_tune() {
   local name
   case $key in
     $'\x03') return 1 ;;
-    up) tf=$(( tf > 1 ? tf - 1 : 3 )) ;;
-    down) tf=$(( tf < 3 ? tf + 1 : 1 )) ;;
+    up) tf=$(( tf > 1 ? tf - 1 : 4 )) ;;
+    down) tf=$(( tf < 4 ? tf + 1 : 1 )) ;;
+    c) (( bgoff[$tpick] )) || __tt_pv_bg_recolor ;;
     left|right|sleft|sright)
+      if (( tf == 4 )); then
+        (( bgoff[$tpick] )) || __tt_pv_bg_recolor
+        return 0
+      fi
       [[ $key == *left ]] && n=-1
       [[ $key == s* ]] && (( tf != 2 )) && n=$(( n * 10 ))
       __tt_pv_bg_adjust ${fields[tf]} $n
@@ -1902,7 +1914,7 @@ __tt_pv_tune() {
       __tt_pv_bg_adjust at $key
       ;;
     ' ') __tt_pv_bg_adjust on ;;
-    '=') __tt_pv_bg_adjust def $tf ;;
+    '=') (( tf == 4 )) || __tt_pv_bg_adjust def $tf ;;
     '+') __tt_pv_bg_adjust def ;;
     ',') __tt_pv_bg_pick -1 ;;
     '.') __tt_pv_bg_pick 1 ;;
@@ -2312,11 +2324,11 @@ __tt_pv_draw() {
         src=" · $k/${#held}"
       fi
       __tt_pv_bg_title $(( lw - ${#tune} - 6 )) "$src"
-      __tt_pv_head $(( ph - 9 )) 1 $lw $tune "$REPLY" $state
-      __tt_pv_bg_panel $tpick $(( ph - 8 )) 1 $lw
+      __tt_pv_head $(( ph - 10 )) 1 $lw $tune "$REPLY" $state
+      __tt_pv_bg_panel $tpick $(( ph - 9 )) 1 $lw
     elif (( conf )); then
-      __tt_pv_head $(( ph - 7 )) 1 $lw Config
-      __tt_pv_conf_panel $(( ph - 6 )) 1 $lw
+      __tt_pv_head $(( ph - 8 )) 1 $lw Config
+      __tt_pv_conf_panel $(( ph - 7 )) 1 $lw
     fi
     (( help )) && __tt_pv_help
   fi
@@ -2611,11 +2623,11 @@ __tt_preview() {
   local -i scene=0
   local -a bgorder=()
   local -A bgfrom=() bgurl=() bgby=() bgsent=() bgcost=() bgdim=() bgsrc=() bgfill=() bgfocus=() bgsize=() bgpos=() bgop=() bgdef=() bgoff=() bgbase=() bgload=() bgshot=() bgshotkey=() bgedit=() bgtunef=() bgofff=() bgimages=()
-  local -A bgpic=() bgpics=() bgact=() bgview=() bgswap=() bgthumb=() tsnaps=() pvseek=()
+  local -A bgpic=() bgpics=() bgact=() bgview=() bgswap=() bgthumb=() tsnaps=() pvseek=() bgcolors=()
   local conf=0 cf=1
   local -a plabel=(" This tab " " Default ") pkeys=() reach=() csnap=()
-  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 cvars=(TTHEME_TAB_PALETTE TTHEME_ANNOUNCE TTHEME_FX TTHEME_SORT TTHEME_BG_BLUR TTHEME_BG_COLORS) clabel=("New tabs" Announce "Search fx" Sort Blur Colors)
+  local -a cchoice=("off seq" "1 0" "typewriter decode glitch" "abc series" "0 1 2 3 4" "tone original") cshow=("off seq" "on off" "typewriter decode glitch" "abc series" "off 1px 2px 3px 4px" "tone original")
   local -A cnote=(
     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"
@@ -2624,6 +2636,8 @@ __tt_preview() {
     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"
+    TTHEME_BG_COLORS:tone "New pictures are tinted in one color of the palette"
+    TTHEME_BG_COLORS:original "New pictures keep their own colors"
   )
   [[ $mode == pin ]] && __tt_pin_scopes "$pdir"
   [[ $mode == init ]] && pkdef=2