@kecan0406/ttheme 1.0.30 → 1.0.32

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.30",
+  "version": "1.0.32",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "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() {
@@ -236,7 +239,7 @@ __tt_pv_bg_open() {
   bgcw=0 bgch=0 bginc="" bgrel=0 bgmx=0 bgmy=0 bganchor=0
   local REPLY
   __tt_bg_shown && bginc=$REPLY
-  __tt_bg_cells
+  (( TTHEME_TMUX )) || __tt_bg_cells
 }
 
 __tt_pv_bg_show() {

package/shell/adapters/_osc.zsh

@@ -1,25 +1,54 @@
+__tt_out() {
+  if (( TTHEME_TMUX )); then
+    printf '\ePtmux;%s\e\\' "${1//$'\e'/$'\e\e'}"
+  else
+    printf '%s' "$1"
+  fi
+}
+
 __tt_osc_apply() {
   local -a p=(${=1})
   (( ${#p} >= 20 )) || return 1
+  local out i
 
   if [[ $p[1] == - ]]; then
-    printf '\033]111\033\\'
+    out=$'\e]111\e\\'
   else
-    printf '\033]11;%s\033\\' "$p[1]"
+    out=$'\e]11;'$p[1]$'\e\\'
   fi
-  printf '\033]10;%s\033\\\033]12;%s\033\\\033]17;%s\033\\' "$p[2]" "$p[3]" "$p[4]"
+  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
+}
 
-  local osc4="" i
-  for i in {0..15}; do osc4+=";$i;$p[i+5]"; done
-  printf '\033]4%s\033\\' "$osc4"
+__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
 }
 
-__tt_osc_reset() { printf '\033]104\033\\\033]110\033\\\033]111\033\\\033]112\033\\\033]117\033\\' }
+__tt_repaint() {
+  if [[ -n $TTHEME_SPEC ]]; then
+    __tt_apply "$TTHEME_SPEC"
+  else
+    __tt_osc_reset
+  fi
+}
 
 __tt_apply() { __tt_osc_apply "$@" }
 
 __tt_shown() { return 1 }
 
+__tt_unshown() { : }
+
+__tt_reloaded() { : }
+
+__tt_worn() { : }
+
 __tt_keepable() { return 1 }
 
 __tt_pv_bg_open() { : }
@@ -47,6 +76,11 @@ __tt_pv_bg_save() { : }
 __tt_query_bg() {
   local saved resp="" c fd
   REPLY=""
+  if (( TTHEME_TMUX )); then
+    REPLY=$(tmux show -qv @ttheme_bg 2>/dev/null)
+    [[ $REPLY == \#* ]] && return 0
+    REPLY=""
+  fi
   exec {fd}<>/dev/tty 2>/dev/null || return 1
 
   saved=$(stty -g <&$fd 2>/dev/null)

package/shell/adapters/alacritty.zsh

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

package/shell/adapters/iterm2.zsh

@@ -8,7 +8,9 @@ fi
 __tt_keepable() { return 0 }
 
 __tt_bg_shown() {
-  REPLY=$TTHEME_ITERM_SHOWN
+  REPLY=""
+  (( TTHEME_TMUX )) && REPLY=$(tmux show -qv @ttheme_shown 2>/dev/null)
+  [[ -n $REPLY ]] || REPLY=$TTHEME_ITERM_SHOWN
   [[ $REPLY == default ]] && REPLY=$TTHEME_STARTUP
   [[ -n $REPLY ]]
 }
@@ -18,13 +20,24 @@ __tt_shown() {
   __tt_bg_shown
   was=$REPLY
   [[ $2 != force && $was == $1 ]] && return 1
-  [[ -r $dir/$1.conf || ( -n $was && -r $dir/$was.conf ) ]] || return 1
+  [[ -r $dir/$1.conf || ( -n $was && -r $dir/$was.conf ) ]] || (( TTHEME_MUXED )) || return 1
   (( ${TTHEME_ORDER[(Ie)$1]} )) || return 1
-  printf '\e]1337;SetProfile=ttheme · %s\a' $1
+  __tt_out $'\e]1337;SetProfile=ttheme · '$1$'\a'
   TTHEME_ITERM_SHOWN=$1
+  (( TTHEME_TMUX )) && tmux set -q @ttheme_shown $1 2>/dev/null
   return 1
 }
 
+__tt_unshown() {
+  local want=${TTHEME_STARTUP:+default} was=$TTHEME_ITERM_SHOWN
+  (( TTHEME_TMUX )) && was=$(tmux show -qv @ttheme_shown 2>/dev/null)
+  [[ $1 != force && $was == "$want" ]] && return 0
+  __tt_out $'\e]1337;SetProfile=\a'
+  TTHEME_ITERM_SHOWN=$want
+  (( TTHEME_TMUX )) && tmux set -q @ttheme_shown "$want" 2>/dev/null
+  return 0
+}
+
 __tt_bg_cells() {
   local fd saved resp="" c
   local -a p

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/terminal-app.zsh

@@ -0,0 +1,35 @@
+typeset -g TTHEME_TERMINAL_BASE=""
+
+__tt_terminal_base() {
+  local fd saved resp="" c q=$'\e]11;?\e\\\e]10;?\e\\\e]12;?\e\\\e]17;?\e\\' e v i
+  local -a p
+  local -A got
+  for i in {0..15}; do q+=$'\e]4;'$i$';?\e\\'; done
+  exec {fd}<>/dev/tty 2>/dev/null || return 1
+  saved=$(stty -g <&$fd 2>/dev/null)
+  [[ -n $saved ]] || { exec {fd}>&-; return 1 }
+  stty raw -echo min 0 time 3 <&$fd 2>/dev/null
+  printf '%s\e[5n' $q >&$fd
+  while IFS= read -r -k 1 -u $fd c 2>/dev/null; do
+    resp+=$c
+    [[ $resp == *$'\e[0n' ]] && break
+    (( ${#resp} < 2048 )) || break
+  done
+  stty "$saved" <&$fd 2>/dev/null
+  exec {fd}>&-
+  for e in ${(ps:\e]:)resp}; do
+    [[ $e == *';rgb:'* ]] || continue
+    p=(${(s:/:)${${e#*rgb:}%%[^0-9A-Fa-f/]*}})
+    (( ${#p} >= 3 )) && got[${e%%;rgb:*}]="#${(L)p[1][1,2]}${(L)p[2][1,2]}${(L)p[3][1,2]}"
+  done
+  v="$got[11] $got[10] $got[12] ${got[17]:-$got[11]}"
+  for i in {0..15}; do v+=" ${got[4;$i]}"; done
+  (( ${#${=v}} == 20 )) && TTHEME_TERMINAL_BASE=$v
+}
+
+__tt_osc_reset() {
+  [[ -n $TTHEME_TERMINAL_BASE ]] && __tt_osc_apply "$TTHEME_TERMINAL_BASE"
+  return 0
+}
+
+[[ -o interactive && -t 1 ]] && __tt_terminal_base

package/shell/adapters/wezterm.zsh

@@ -0,0 +1,19 @@
+typeset -g TTHEME_WEZTERM_SHOWN=""
+
+__tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)wezterm]} )) }
+
+__tt_wezterm_show() { printf '\e]1337;SetUserVar=ttheme_shown=%s\a' "$(print -rn -- $1 | base64)" }
+
+__tt_shown() {
+  [[ $2 != force && $TTHEME_WEZTERM_SHOWN == $1 ]] && return 1
+  TTHEME_WEZTERM_SHOWN=$1
+  __tt_wezterm_show $1
+  return 1
+}
+
+__tt_pv_bg_show() {
+  bgname=$1
+  __tt_wezterm_show $1
+}
+
+__tt_pv_bg_close() { [[ -z $TTHEME_WEZTERM_SHOWN ]] || __tt_wezterm_show $TTHEME_WEZTERM_SHOWN }

package/shell/adapters/windows-terminal.zsh

@@ -0,0 +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
@@ -62,7 +62,9 @@ __tt_pins_load
 
 typeset -g TTHEME_STATE_DIR=${XDG_STATE_HOME:-$HOME/.local/state}/ttheme
 
-if [[ -n $GHOSTTY_RESOURCES_DIR || $TERM_PROGRAM == ghostty ]]; then
+if [[ $TERM_PROGRAM == WarpTerminal ]]; then
+  typeset -g TTHEME_ADAPTER=warp
+elif [[ -n $GHOSTTY_RESOURCES_DIR || $TERM_PROGRAM == ghostty ]]; then
   typeset -g TTHEME_ADAPTER=ghostty
 elif [[ -n $KITTY_WINDOW_ID ]]; then
   typeset -g TTHEME_ADAPTER=kitty
@@ -72,32 +74,43 @@ elif [[ -n $ALACRITTY_WINDOW_ID ]]; then
   typeset -g TTHEME_ADAPTER=alacritty
 elif [[ -n $ITERM_SESSION_ID || $TERM_PROGRAM == iTerm.app ]]; then
   typeset -g TTHEME_ADAPTER=iterm2
+elif [[ $TERM_PROGRAM == Apple_Terminal ]]; then
+  typeset -g TTHEME_ADAPTER=terminal-app
+elif [[ -n $WT_SESSION && -z $TERM_PROGRAM ]]; then
+  typeset -g TTHEME_ADAPTER=windows-terminal
 elif [[ $TERM == foot* ]]; then
   typeset -g TTHEME_ADAPTER=foot
 else
   typeset -g TTHEME_ADAPTER=unknown
 fi
 
-typeset -g TTHEME_GHOSTTY_PID=""
+typeset -g TTHEME_GHOSTTY_PID="" TTHEME_TMUX=0 TTHEME_MUXED=0
 
 __tt_reload() {
   (( ${TTHEME_TERMINALS[(Ie)ghostty]} )) || return 0
-  local pid=$PPID ppid comm
-  if [[ -z $TTHEME_GHOSTTY_PID ]]; then
-    TTHEME_GHOSTTY_PID=0
+  local pid=$PPID ppid comm owner=$TTHEME_GHOSTTY_PID
+  (( TTHEME_TMUX )) && { pid=$(tmux display -p '#{client_pid}' 2>/dev/null) owner="" }
+  if [[ -z $owner ]]; then
+    owner=0
     while (( pid > 1 )); do
       read -r ppid comm <<< "$(ps -o ppid=,comm= -p $pid)"
       if [[ ${comm:t} == ghostty ]]; then
-        TTHEME_GHOSTTY_PID=$pid
+        owner=$pid
         break
       fi
       pid=$ppid
     done
+    (( TTHEME_TMUX )) || TTHEME_GHOSTTY_PID=$owner
   fi
-  (( TTHEME_GHOSTTY_PID )) && kill -USR2 $TTHEME_GHOSTTY_PID 2>/dev/null && return
+  (( owner )) && kill -USR2 $owner 2>/dev/null && return
   pkill -USR2 -x ghostty 2>/dev/null
 }
 
+__tt_tmux() {
+  [[ $(tmux if -t "$TMUX_PANE" -F '#{==:#{allow-passthrough},off}' 'set -p allow-passthrough on' \; set -sq focus-events on \; display -p '#{client_control_mode}' 2>/dev/null) == 1 ]] && return 0
+  TTHEME_TMUX=1 TTHEME_SPEC=
+}
+
 source $TTHEME_HOME/adapters/_osc.zsh
 [[ -r $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh ]] &&
   source $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh
@@ -105,7 +118,7 @@ source $TTHEME_HOME/adapters/_osc.zsh
 __tt_active() {
   [[ -o interactive ]] || return 1
   (( ${#TTHEME_PALETTE} )) || return 1
-  [[ $TTHEME_ADAPTER != unknown || -n $TTHEME_FORCE ]]
+  [[ $TTHEME_ADAPTER != (unknown|warp) || -n $TTHEME_FORCE ]]
 }
 
 __tt_empty() {
@@ -209,9 +222,30 @@ __tt_precmd() {
 
 __tt_preexec() { printf '\e[?1004l' }
 
+__tt_rewear() {
+  local REPLY
+  __tt_repaint
+  [[ -n $TTHEME_SPEC ]] || { __tt_unshown $1; return 0 }
+  __tt_name_of "$TTHEME_SPEC"
+  [[ -n ${TTHEME_PALETTE[$REPLY]} ]] || return 0
+  __tt_shown "$REPLY" $1 && __tt_reload
+}
+
 __tt_focus() {
   __tt_fresh
-  __tt_sync
+  if (( TTHEME_TMUX )); then
+    __tt_rewear
+  else
+    __tt_sync
+  fi
+}
+
+__tt_mux() { [[ ${${(z)3}[1]:t} == tmux ]] && TTHEME_MUXED=1 }
+
+__tt_unmux() {
+  (( TTHEME_MUXED )) || return 0
+  __tt_rewear force
+  TTHEME_MUXED=0
 }
 
 __tt_blur() { : }
@@ -380,7 +414,7 @@ __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
 }
 
@@ -792,7 +826,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")
@@ -1506,6 +1540,10 @@ __tt_preview() {
 }
 
 ttheme() {
+  if [[ $TTHEME_ADAPTER == warp && $1 != (-h|--help|help|browse|list|add|remove|update|config|default) ]]; 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
   if (( ! $# )); then
     (( ${#TTHEME_PALETTE} )) || { __tt_empty; return }
     __tt_menu
@@ -1552,6 +1590,7 @@ if (( $+functions[compdef] )); then
 fi
 
 if __tt_active; then
+  [[ -n $TMUX ]] && __tt_tmux
   () {
     local REPLY k
     if [[ -n $TTHEME_SPEC ]]; then
@@ -1572,7 +1611,11 @@ if __tt_active; then
   autoload -Uz add-zsh-hook
   add-zsh-hook chpwd __tt_chpwd
   add-zsh-hook precmd __tt_fresh
-  if [[ $TTHEME_ADAPTER == ghostty ]]; then
+  if (( ! TTHEME_TMUX )); then
+    add-zsh-hook preexec __tt_mux
+    add-zsh-hook precmd __tt_unmux
+  fi
+  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