@kecan0406/ttheme 1.2.0 → 1.2.2

package/shell/ttheme.zsh

@@ -30,7 +30,7 @@ __tt_gone() {
   __tt_reload
   __tt_reset_reloaded $bg
   print -n $'\e[?1004l'
-  for hook in precmd:__tt_fresh precmd:__tt_precmd precmd:__tt_unmux preexec:__tt_preexec preexec:__tt_mux chpwd:__tt_chpwd; do
+  for hook in precmd:__tt_fresh precmd:__tt_precmd precmd:__tt_prompted precmd:__tt_unmux preexec:__tt_preexec preexec:__tt_mux chpwd:__tt_chpwd; do
     add-zsh-hook -d ${hook%%:*} ${hook#*:}
   done
   (( $+functions[add-zle-hook-widget] )) && add-zle-hook-widget -d line-init __tt_line_init
@@ -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
@@ -2639,7 +2653,7 @@ __tt_preview() {
   local tty=""
   local -i TTHEME_RAW=0
   {
-    tty=$(stty -g 2>/dev/null && stty -echo -icanon min 1 time 0 2>/dev/null)
+    tty=$(stty -g 2>/dev/null) && stty -echo -icanon min 1 time 0 2>/dev/null || tty=""
     TTHEME_RAW=$(( ${#tty} > 0 ))
     __tt_pv_bg_open
     printf '\e[?2026h\e[?1049h\e[?7l\e[?25l'
@@ -2827,6 +2841,7 @@ fi
   else
     __tt_sync
   fi
+  __tt_follows_prompt && add-zsh-hook precmd __tt_prompted
   __tt_announce
 }