@kecan0406/ttheme 1.0.31 → 1.0.33

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.31",
+  "version": "1.0.33",
   "gate": [
     {
       "rule": "foreground",

package/package.json

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

package/shell/adapters/_bg.zsh

@@ -11,10 +11,13 @@ __tt_ghostty_shown() {
 __tt_bg_saved() {
   local REPLY
   (( ${TTHEME_TERMINALS[(Ie)iterm2]} )) && __tt_cli image $1 tuned
+  __tt_bg_refresh "$@"
   __tt_ghostty_shown && (( ${@[(Ie)$REPLY]} )) && __tt_reload
   return 0
 }
 
+__tt_bg_refresh() { : }
+
 __tt_bg_aligns() { (( ! ${TTHEME_TERMINALS[(Ie)iterm2]} )) }
 
 __tt_b64() {

package/shell/adapters/_osc.zsh

@@ -16,16 +16,18 @@ __tt_osc_apply() {
   else
     out=$'\e]11;'$p[1]$'\e\\'
   fi
-  out+=$'\e]10;'$p[2]$'\e\\\e]12;'$p[3]$'\e\\\e]17;'$p[4]$'\e\\\e]4'
-  for i in {0..15}; do out+=";$i;$p[i+5]"; done
-  __tt_out "$out"$'\e\\'
+  out+=$'\e]10;'$p[2]$'\e\\\e]12;'$p[3]$'\e\\\e]17;'$p[4]$'\e\\'
+  for i in {0..15}; do out+=$'\e]4;'$i';'$p[i+5]$'\e\\'; done
+  __tt_out "$out"
   (( TTHEME_TMUX )) && tmux set -q @ttheme_bg "$p[1]" 2>/dev/null
+  __tt_worn "$1"
   return 0
 }
 
 __tt_osc_reset() {
   __tt_out $'\e]104\e\\\e]110\e\\\e]111\e\\\e]112\e\\\e]117\e\\'
   (( TTHEME_TMUX )) && tmux set -qu @ttheme_bg 2>/dev/null
+  __tt_worn ""
   return 0
 }
 
@@ -43,6 +45,10 @@ __tt_shown() { return 1 }
 
 __tt_unshown() { : }
 
+__tt_reloaded() { : }
+
+__tt_worn() { : }
+
 __tt_keepable() { return 1 }
 
 __tt_pv_bg_open() { : }

package/shell/adapters/alacritty.zsh

@@ -0,0 +1 @@
+__tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)alacritty]} )) }

package/shell/adapters/kitty.zsh

@@ -1,31 +1,54 @@
-if (( $+commands[kitten] )); then
-  __tt_kitty() { kitten @ "$@" }
-elif (( $+commands[kitty] )); then
-  __tt_kitty() { kitty @ "$@" }
-else
-  __tt_kitty() { return 1 }
-fi
-
-__tt_kitty_args() {
-  local -a p=(${=1})
-  (( ${#p} >= 20 )) || return 1
-  reply=(
-    foreground=$p[2]
-    background=$p[1]
-    cursor=$p[3]
-    cursor_text_color=$p[1]
-    selection_background=$p[4]
-    selection_foreground=$p[2]
-  )
-  local i
-  for i in {0..15}; do reply+=("color$i=$p[i+5]"); done
+source $TTHEME_HOME/adapters/_bg.zsh
+
+typeset -g TTHEME_KITTY_SHOWN=""
+
+__tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)kitty]} )) }
+
+__tt_kitty_var() { __tt_out $'\e]1337;SetUserVar='$1'='"$(print -rn -- $2 | base64)"$'\a' }
+
+__tt_shown() {
+  [[ $2 != force && $TTHEME_KITTY_SHOWN == $1 ]] && return 1
+  TTHEME_KITTY_SHOWN=$1
+  __tt_kitty_var ttheme_shown $1
+  return 1
+}
+
+__tt_unshown() {
+  TTHEME_KITTY_SHOWN=""
+  __tt_kitty_var ttheme_shown ""
 }
 
-__tt_apply() {
-  local -a reply
-  if [[ ${1%% *} != - ]] && __tt_kitty_args "$1"; then
-    __tt_kitty set-colors -- "${reply[@]}" 2>/dev/null && return 0
-  fi
+__tt_worn() {
+  local REPLY=""
+  [[ -n $1 ]] && __tt_name_of "$1"
+  [[ -n ${TTHEME_PALETTE[$REPLY]} ]] || REPLY=""
+  __tt_kitty_var ttheme_worn $REPLY
+}
+
+__tt_reloaded() { [[ -n $TTHEME_STARTUP ]] && __tt_kitty_var ttheme_startup $TTHEME_STARTUP }
+
+__tt_bg_shown() { REPLY=$TTHEME_KITTY_SHOWN }
+
+__tt_bg_refresh() { (( ${@[(Ie)$TTHEME_KITTY_SHOWN]} )) && __tt_kitty_var ttheme_shown $TTHEME_KITTY_SHOWN }
+
+__tt_bg_cells() {
+  local fd saved resp="" c
+  exec {fd}<>/dev/tty 2>/dev/null || return 0
+  saved=$(stty -g <&$fd 2>/dev/null)
+  stty raw -echo min 0 time 3 <&$fd 2>/dev/null
+  printf '\e[16t' >&$fd
+  while IFS= read -r -s -k 1 -t 1 -u $fd c 2>/dev/null; do
+    resp+=$c
+    [[ $resp == *'[6;'<1->';'<1->t ]] && break
+  done
+  stty "$saved" <&$fd 2>/dev/null
+  exec {fd}>&-
+  [[ $resp == *'[6;'<1->';'<1->t ]] || return 0
+  resp=${${resp##*\[6;}%t}
+  bgch=${resp%;*} bgcw=${resp#*;}
+}
 
-  __tt_osc_apply "$1"
+__tt_bg_crop() {
+  __tt_bg_send $1
+  REPLY="$REPLY $4"
 }

package/shell/adapters/windows-terminal.zsh

@@ -1 +1,3 @@
 __tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)windows-terminal]} )) }
+
+__tt_reloaded() { __tt_repaint }

package/shell/ttheme.zsh

@@ -13,7 +13,7 @@ __tt_palettes_load() {
 __tt_fresh() {
   local -a at
   zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/palettes.zsh 2>/dev/null || return 0
-  [[ $at[1] == "$TTHEME_PALETTES_AT" ]] || __tt_palettes_load
+  [[ $at[1] == "$TTHEME_PALETTES_AT" ]] || { __tt_palettes_load && __tt_reloaded }
 }
 
 if [[ -r $TTHEME_HOME/palettes.zsh ]]; then
@@ -390,6 +390,7 @@ __tt_help() {
   ttheme preview  browse live — focus repaints, enter keeps (this tab or default), esc restores, ? lists keys
   ttheme next     advance this tab to the next palette
   ttheme default  make a palette the one new tabs open with
+  ttheme off      open new tabs in the terminal'"'"'s own colors — ttheme on wears the default again
   ttheme pin      pick a palette for this directory — cd into it repaints, cd out restores
   ttheme unpin    drop the palette pinned to this directory
   ttheme config   edit settings in $EDITOR — they apply in new tabs
@@ -414,10 +415,27 @@ __tt_catalog() {
   [[ $1 == list ]] && return 0
   [[ -r $TTHEME_HOME/palettes.zsh ]] || return 0
   was="$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}"
-  __tt_palettes_load
+  __tt_palettes_load && __tt_reloaded
   [[ "$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}" == "$was" ]] || __tt_reload
 }
 
+__tt_switch() {
+  local spec
+  __tt_catalog $1 || return
+  __tt_active || return 0
+  if [[ $1 == off ]]; then
+    __tt_osc_reset
+    TTHEME_SPEC=
+    __tt_shown "" && __tt_reload
+    __tt_unshown force
+  elif [[ -n $TTHEME_STARTUP ]]; then
+    spec=${TTHEME_PALETTE[$TTHEME_STARTUP]}
+    __tt_apply "$spec"
+    TTHEME_SPEC=$spec
+    __tt_shown "$TTHEME_STARTUP" force && __tt_reload
+  fi
+}
+
 __tt_config() {
   if [[ ! -e $TTHEME_CONFIG ]]; then
     mkdir -p ${TTHEME_CONFIG:h} || return 1
@@ -826,7 +844,7 @@ __tt_pv_help() {
   )
   if (( bgcw )); then
     hk+=("tune bg" "" "" "" "")
-    hv+=("tab  ·  finds one on the boorus if none" "↑↓ field  ←→ step  ⇧←→ ×10  1-9 place" "space hides  ·  = default  ·  f adds one" "enter keeps  ·  esc undoes" ",  .  other saved images  ·  D removes this one")
+    hv+=("tab  ·  finds one on the boorus, or takes your own, if none" "↑↓ field  ←→ step  ⇧←→ ×10  1-9 place" "space hides  ·  = default  ·  f adds one from the boorus or your own" "enter keeps  ·  esc undoes" ",  .  other saved images  ·  D removes this one")
   fi
   hk+=(config "")
   hv+=("alt-c  ·  ↑↓ setting  ←→ value" "enter saves  ·  esc undoes")
@@ -1481,6 +1499,7 @@ __tt_preview() {
     abc "series and palettes by name" series "series in the order added"
   )
   [[ $mode == pin ]] && pkdef=2 plabel=(" this directory " " and below ")
+  [[ $mode == init ]] && pkdef=2
   __tt_pv_canpick
   __tt_pv_size
   local -a groups=() rtype=() rval=() rcnt=() reply=()
@@ -1540,7 +1559,7 @@ __tt_preview() {
 }
 
 ttheme() {
-  if [[ $TTHEME_ADAPTER == warp && $1 != (-h|--help|help|browse|list|add|remove|update|config|default) ]]; then
+  if [[ $TTHEME_ADAPTER == warp && $1 != (-h|--help|help|browse|list|add|remove|update|config|default|on|off) ]]; then
     print -u2 "ttheme: Warp wears one theme app-wide and paints no tab background of its own — \`ttheme default <palette>\` puts one on every Warp window"
     return 1
   fi
@@ -1566,6 +1585,7 @@ ttheme() {
       __tt_resolve "$2" || return 1
       __tt_keep "$REPLY"
       return ;;
+    on|off) __tt_switch $1; return ;;
     preview) __tt_preview; return ;;
     pin) __tt_preview pin; return ;;
     unpin) __tt_unpin; return ;;
@@ -1583,7 +1603,7 @@ ttheme() {
 
 if (( $+functions[compdef] )); then
   __tt_complete() {
-    (( CURRENT == 2 )) && compadd -- preview next default pin unpin config help browse list add remove update
+    (( CURRENT == 2 )) && compadd -- preview next default on off pin unpin config help browse list add remove update
     compadd -- $TTHEME_ORDER
   }
   compdef __tt_complete ttheme
@@ -1615,7 +1635,7 @@ if __tt_active; then
     add-zsh-hook preexec __tt_mux
     add-zsh-hook precmd __tt_unmux
   fi
-  if [[ $TTHEME_ADAPTER == ghostty ]] || (( TTHEME_TMUX )); then
+  if [[ $TTHEME_ADAPTER == (ghostty|kitty|windows-terminal) ]] || (( TTHEME_TMUX )); then
     add-zsh-hook precmd __tt_precmd
     add-zsh-hook preexec __tt_preexec
     __tt_bind_focus