@kecan0406/ttheme 1.0.36 → 1.0.38

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.36",
+  "version": "1.0.38",
   "gate": [
     {
       "rule": "foreground",

package/package.json

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

package/shell/adapters/_bg.zsh

@@ -8,6 +8,14 @@ __tt_ghostty_shown() {
   REPLY=${REPLY%.conf}
 }
 
+__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
@@ -85,10 +93,18 @@ __tt_bg_path() {
 __tt_bg_load() {
   local name=$1 dir=${TTHEME_CONFIG:h}/backgrounds img="" fit=contain op=1 pos=center f line stem="" size=100 REPLY
   local -i at=5
-  local -a fills
+  local -a fills lines
   (( ${+bgsrc[$name]} )) && return 0
-  bgfrom[$name]=""
-  for f in $dir/$name.conf $dir/$name.tune.conf; do
+  bgfrom[$name]="" bgtunef[$name]=$name.tune.conf bgofff[$name]=$name.off.conf bgimages[$name]=1
+  [[ -r $dir/$name.conf ]] && lines=("${(@f)$(<$dir/$name.conf)}")
+  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##*/} ;;
+    esac
+  done
+  for f in $dir/$name.conf $dir/${bgtunef[$name]}; do
     if [[ -r $f ]]; then
       for line in "${(@f)$(<$f)}"; do
         case $line in
@@ -114,7 +130,7 @@ __tt_bg_load() {
     [[ $f == *.tune.conf ]] || bgdef[$name]="$size $at $op" bgbase[$name]=$REPLY
   done
   bgsize[$name]=$size bgpos[$name]=$at bgop[$name]=$op bgoff[$name]=0 bgshot[$name]="" bgshotkey[$name]="" bgfocus[$name]=50
-  [[ -e $dir/$name.off.conf ]] && bgoff[$name]=1
+  [[ -e $dir/${bgofff[$name]} ]] && bgoff[$name]=1
   bgload[$name]="$size $at $op ${bgoff[$name]}"
   [[ $REPLY == *@<20-999>-*-<->x<->.png ]] && bgshot[$name]=$REPLY bgshotkey[$name]="$size $at"
   if [[ -n $stem ]]; then
@@ -175,11 +191,11 @@ __tt_bg_include() {
   local conf=${TTHEME_CONFIG:h}/backgrounds/$1.conf line
   local -a lines=() add=()
   [[ -r $conf ]] && lines=("${(@f)$(<$conf)}")
-  for line in "config-file = ?$1.tune.conf" "config-file = ?$1.off.conf"; do
+  for line in "config-file = ?${bgtunef[$1]:-$1.tune.conf}" "config-file = ?${bgofff[$1]:-$1.off.conf}"; do
     (( ${lines[(Ie)$line]} )) || add+=("$line")
   done
   (( ${#add} )) || return 0
-  mkdir -p ${conf:h} && print -rl -- "${lines[@]}" "${add[@]}" > $conf
+  mkdir -p ${conf:h} && __tt_put $conf "${lines[@]}" "${add[@]}"
 }
 
 __tt_bg_write() {
@@ -190,7 +206,7 @@ __tt_bg_write() {
   [[ -r $dir/$name.conf ]] || return 0
   __tt_bg_include $name || return 1
   if [[ "$size ${bgpos[$1]} ${bgop[$1]}" == "${bgdef[$1]}" ]]; then
-    rm -f -- $dir/$name.tune.conf
+    rm -f -- $dir/${bgtunef[$1]}
   else
     shape=$size
     [[ $size == <20-100> && $pos != center ]] && ! __tt_bg_aligns && shape=window
@@ -220,12 +236,12 @@ __tt_bg_write() {
         ;;
     esac
     __tt_tilde "$img"
-    print -rl -- "background-image = $REPLY" "background-image-fit = $fit" "background-image-position = $pos" "background-image-opacity = ${bgop[$1]}" > $dir/$name.tune.conf || return 1
+    __tt_put $dir/${bgtunef[$1]} "background-image = $REPLY" "background-image-fit = $fit" "background-image-position = $pos" "background-image-opacity = ${bgop[$1]}" || return 1
   fi
   if (( bgoff[$1] )); then
-    print -r -- "background-image =" > $dir/$name.off.conf || return 1
+    __tt_put $dir/${bgofff[$1]} "background-image =" || return 1
   else
-    rm -f -- $dir/$name.off.conf
+    rm -f -- $dir/${bgofff[$1]}
   fi
   if [[ $src == /*.png ]]; then
     for f in ${src%.png}@<20-999>-*.png(N); do
@@ -409,8 +425,8 @@ __tt_pv_bg_find() {
 }
 
 __tt_pv_bg_images() {
-  local -a shelf=(${TTHEME_CONFIG:h}/backgrounds/shelf/$1/*(N/))
-  REPLY=$(( ${#shelf} + 1 ))
+  __tt_bg_load $1
+  REPLY=${bgimages[$1]:-1}
 }
 
 __tt_pv_bg_image() {

package/shell/adapters/ghostty.zsh

@@ -24,7 +24,7 @@ __tt_shown() {
   [[ $was == $1 ]] && return 1
   [[ -r $dir/$1.conf || ( -n $was && -r $dir/$was.conf ) ]] || return 1
   [[ -d $dir ]] || mkdir -p $dir || return 1
-  print -r -- "config-file = ?$1.conf" > $dir/shown.conf
+  __tt_put $dir/shown.conf "config-file = ?$1.conf"
 }
 
 __tt_bg_cells() {

package/shell/launch-tab.zsh

@@ -1,8 +1,10 @@
 #!/bin/zsh -f
 
-source ${0:A:h}/ttheme.zsh
+config=${XDG_CONFIG_HOME:-$HOME/.config}/ttheme/config.zsh
+[[ -r $config ]] && source $config
 
 if [[ ${TTHEME_TAB_PALETTE:-off} != off ]]; then
+  source ${0:A:h}/ttheme.zsh
   __tt_next
   __tt_apply "$REPLY"
   export TTHEME_SPEC=$REPLY

package/shell/ttheme.zsh

@@ -31,6 +31,7 @@ __tt_gone() {
   for hook in precmd:__tt_fresh precmd:__tt_precmd 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_focus_on
   unfunction ttheme
 }
 
@@ -243,10 +244,9 @@ __tt_sync() {
   __tt_shown "$REPLY" && __tt_reload
 }
 
-__tt_precmd() {
-  printf '\e[?1004h'
-  __tt_sync
-}
+__tt_precmd() { __tt_sync }
+
+__tt_focus_on() { printf '\e[?1004h' }
 
 __tt_preexec() { printf '\e[?1004l' }
 
@@ -282,6 +282,9 @@ __tt_bind_focus() {
   local k
   zle -N __tt_focus
   zle -N __tt_blur
+  zle -N __tt_focus_on
+  autoload -Uz add-zle-hook-widget
+  add-zle-hook-widget line-init __tt_focus_on
   for k in emacs viins vicmd; do
     bindkey -M $k '^[[I' __tt_focus
     bindkey -M $k '^[[O' __tt_blur
@@ -1543,7 +1546,7 @@ __tt_preview() {
   local orig=$TTHEME_SPEC applied=$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
   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=()
+  local -A bgfrom=() bgsent=() 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)