@kecan0406/ttheme 1.2.5 → 1.2.7

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.5",
+  "version": "1.2.7",
   "gate": [
     {
       "rule": "foreground",

package/package.json

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

package/shell/adapters/_osc.zsh

@@ -74,6 +74,8 @@ __tt_paints() { return 0 }
 
 __tt_unpainted() { : }
 
+__tt_reverts() { return 0 }
+
 __tt_follows_focus() { return 1 }
 
 __tt_takes_default() { return 0 }
@@ -82,6 +84,8 @@ __tt_follows_prompt() { return 1 }
 
 __tt_prompted() { : }
 
+__tt_pv_conf_rows() { : }
+
 __tt_pv_bg_open() { : }
 
 __tt_pv_bg_show() { : }
@@ -186,8 +190,18 @@ __tt_start_bg() {
   [[ -n $REPLY ]]
 }
 
+__tt_colors() {
+  local e
+  local -a p
+  for e in ${(ps:\e]:)1}; 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
+}
+
 __tt_query_bg() {
-  local resp
+  local -A got
   REPLY=""
   if (( TTHEME_TMUX )); then
     REPLY=$(tmux show -qv @ttheme_bg 2>/dev/null)
@@ -195,10 +209,7 @@ __tt_query_bg() {
     REPLY=""
   fi
   __tt_ask $'\e]11;?\e\\' || return 1
-  resp=$REPLY
-  REPLY=""
-  [[ $resp == *rgb:* ]] || return 1
-  local -a parts=(${(s:/:)${${resp#*rgb:}%%[^0-9A-Fa-f/]*}})
-  (( ${#parts} >= 3 )) || return 1
-  REPLY="#${(L)parts[1]:0:2}${(L)parts[2]:0:2}${(L)parts[3]:0:2}"
+  __tt_colors "$REPLY"
+  REPLY=$got[11]
+  [[ -n $REPLY ]]
 }

package/shell/adapters/editor.zsh

@@ -0,0 +1,5 @@
+__tt_paints() { return 1 }
+
+__tt_unpainted() {
+  print -u2 "ttheme: this shell runs in an editor's built-in terminal, whose colors come from the editor's theme — use ttheme in a terminal tab outside the editor"
+}

package/shell/adapters/iterm2.zsh

@@ -7,6 +7,8 @@ fi
 
 __tt_keepable() { return 0 }
 
+__tt_reverts() { return 1 }
+
 __tt_follows_focus() { return 0 }
 
 __tt_takes_default() {

package/shell/adapters/konsole.zsh

@@ -8,6 +8,8 @@ __tt_keepable() { __tt_paints }
 
 __tt_takes_default() { __tt_osc_reset }
 
+__tt_reverts() { return 1 }
+
 __tt_follows_focus() { return 0 }
 
 __tt_scheme() {

package/shell/adapters/terminal-app.zsh

@@ -1,18 +1,12 @@
 typeset -g TTHEME_TERMINAL_BASE=""
 
 __tt_hear() {
-  local resp q=$'\e]11;?\e\\\e]10;?\e\\\e]12;?\e\\\e]17;?\e\\' e v i
-  local -a p
+  local q=$'\e]11;?\e\\\e]10;?\e\\\e]12;?\e\\\e]17;?\e\\' v i
   local -A got
   for i in {0..15}; do q+=$'\e]4;'$i$';?\e\\'; done
   __tt_ask $q || return 1
-  resp=$REPLY
+  __tt_colors "$REPLY"
   REPLY=""
-  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 )) || return 1
@@ -23,6 +17,8 @@ __tt_heard() { TTHEME_TERMINAL_BASE=$1 }
 
 __tt_takes_default() { return 1 }
 
+__tt_reverts() { return 1 }
+
 __tt_osc_reset() {
   [[ -n $TTHEME_TERMINAL_BASE ]] && __tt_osc_apply "$TTHEME_TERMINAL_BASE"
   unset TTHEME_PAINTED

package/shell/adapters/warp.zsh

@@ -2,8 +2,9 @@ source $TTHEME_HOME/adapters/_bg.zsh
 
 typeset -g TTHEME_WARP_SETTINGS=$HOME/.warp/settings.toml TTHEME_WARP_THEMES=$HOME/.warp/themes TTHEME_WARP_WORN=""
 typeset -g TTHEME_WARP_TABS=$TTHEME_STATE_DIR/warp TTHEME_WARP_DB="" TTHEME_WARP_ID="" TTHEME_WARP_LAST="" TTHEME_WARP_SEEN=""
-typeset -g TTHEME_WARP_SHOWING="" TTHEME_WARP_VIEW=""
-typeset -gi TTHEME_WARP_VIEWS=0 TTHEME_WARP_BUSY=0 TTHEME_WARP_FOLLOWS=-1 TTHEME_WARP_TICK=0
+typeset -g TTHEME_WARP_SHOWING="" TTHEME_WARP_VIEW="" TTHEME_WARP_CODE="" TTHEME_WARP_RECORDS=""
+typeset -gi TTHEME_WARP_VIEWS=0 TTHEME_WARP_BUSY=0 TTHEME_WARP_FOLLOWS=-1 TTHEME_WARP_UP=0 TTHEME_WARP_SQLPID=0 TTHEME_WARP_MIXED=0
+typeset -gF TTHEME_WARP_WARM=0 TTHEME_WARP_PRIMED=0 TTHEME_WARP_LIVED=0
 typeset -ga TTHEME_WARP_LAID=()
 typeset -g TTHEME_WARP_SQL='with t as (select id, window_id, row_number() over (partition by window_id order by id) - 1 as ix from tabs) select lower(hex(p.uuid)) from app a join windows w on w.id = a.active_window_id join t on t.window_id = w.id and t.ix = w.active_tab_index join pane_nodes n on n.tab_id = t.id and n.is_leaf join pane_leaves l on l.pane_node_id = n.id and l.is_focused join terminal_panes p on p.id = n.id'
 if [[ $OSTYPE != darwin* ]]; then
@@ -25,6 +26,8 @@ __tt_unpainted() {
 
 __tt_keepable() { return 0 }
 
+__tt_reverts() { return 1 }
+
 __tt_follows_prompt() { return 0 }
 
 __tt_prompted() {
@@ -194,8 +197,48 @@ __tt_warp_follow() {
 
 __tt_warp_active() {
   setopt localoptions extendedglob
-  REPLY=$(sqlite3 -readonly -cmd '.timeout 300' $TTHEME_WARP_DB $TTHEME_WARP_SQL 2>/dev/null)
-  [[ $REPLY == [0-9a-f](#c32) ]]
+  local line
+  REPLY=""
+  if (( ! TTHEME_WARP_SQLPID )) || ! kill -0 $TTHEME_WARP_SQLPID 2>/dev/null; then
+    coproc sqlite3 -readonly -batch -cmd '.timeout 300' $TTHEME_WARP_DB 2>/dev/null
+    TTHEME_WARP_SQLPID=$!
+  fi
+  if print -rp -- "$TTHEME_WARP_SQL; select 'end';" 2>/dev/null; then
+    while read -rp -t 1 line; do
+      [[ $line == end ]] && { [[ $REPLY == [0-9a-f](#c32) ]]; return }
+      REPLY=$line
+    done
+  fi
+  TTHEME_WARP_SQLPID=0 REPLY=""
+  return 1
+}
+
+__tt_warp_stamp() {
+  local -a at
+  zstat -F %s.%N -A at +mtime -- $TTHEME_WARP_DB-wal 2>/dev/null || zstat -F %s.%N -A at +mtime -- $TTHEME_WARP_DB 2>/dev/null || return 1
+  REPLY=$at[1]
+}
+
+__tt_warp_mixed() {
+  setopt localoptions extendedglob
+  local f pal view
+  local -a rec
+  local -A looks
+  for f in $TTHEME_WARP_TABS/[0-9a-f](#c32)(N); do
+    rec=(${=${"$(<$f)"}})
+    pal=${rec[3]#-} view=${rec[4]#-}
+    [[ $rec[2] != - && -z $TTHEME_STARTUP ]] && pal="" view=""
+    pal="${pal:-$TTHEME_STARTUP} $view"
+    looks[$pal]=1
+  done
+  (( ${#looks} > 1 ))
+}
+
+__tt_warp_prime() {
+  local fd byte
+  sysopen -rw -u fd $TTHEME_WARP_SETTINGS 2>/dev/null || return 0
+  sysread -s 1 -i $fd byte && sysseek -u $fd 0 && syswrite -o $fd -- $byte
+  exec {fd}>&-
 }
 
 __tt_warp_line() {
@@ -207,18 +250,28 @@ __tt_warp_line() {
 __tt_warp_tick() {
   local line="" REPLY
   local -a at
-  if zstat -F %s.%N -A at +mtime -- $TTHEME_WARP_DB-wal 2>/dev/null || zstat -F %s.%N -A at +mtime -- $TTHEME_WARP_DB 2>/dev/null; then
-    if [[ $at[1] != "$TTHEME_WARP_SEEN" ]]; then
-      TTHEME_WARP_SEEN=$at[1]
-      if __tt_warp_active && [[ $REPLY != "$TTHEME_WARP_ID" ]]; then
-        TTHEME_WARP_ID=$REPLY
+  integer recount=0
+  if __tt_warp_stamp && [[ $REPLY != "$TTHEME_WARP_SEEN" ]]; then
+    TTHEME_WARP_SEEN=$REPLY
+    if __tt_warp_active; then
+      TTHEME_WARP_UP=1
+      if [[ $REPLY != "$TTHEME_WARP_ID" ]]; then
+        TTHEME_WARP_ID=$REPLY recount=1
         __tt_put $TTHEME_WARP_TABS/.active $REPLY 2>/dev/null
       fi
+    else
+      TTHEME_WARP_UP=0
     fi
   fi
-  zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/palettes.zsh 2>/dev/null && [[ $at[1] != "$TTHEME_PALETTES_AT" ]] && __tt_palettes_load
+  zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/palettes.zsh 2>/dev/null && [[ $at[1] != "$TTHEME_PALETTES_AT" ]] && __tt_palettes_load && recount=1
+  zstat -F %s.%N -A at +mtime -- $TTHEME_WARP_TABS 2>/dev/null && [[ $at[1] != "$TTHEME_WARP_RECORDS" ]] && TTHEME_WARP_RECORDS=$at[1] recount=1
+  if (( recount )); then
+    __tt_warp_mixed
+    TTHEME_WARP_MIXED=$(( ! $? ))
+  fi
   [[ -n $TTHEME_WARP_ID && -r $TTHEME_WARP_TABS/$TTHEME_WARP_ID ]] && line=$(<$TTHEME_WARP_TABS/$TTHEME_WARP_ID)
   [[ "$TTHEME_WARP_ID $line $TTHEME_PALETTES_AT" == "$TTHEME_WARP_LAST" ]] && return 0
+  [[ ${TTHEME_WARP_LAST%% *} == "$TTHEME_WARP_ID" ]] && TTHEME_WARP_WARM=$(( EPOCHREALTIME + 3 ))
   TTHEME_WARP_LAST="$TTHEME_WARP_ID $line $TTHEME_PALETTES_AT"
   [[ -n $line ]] && __tt_warp_line ${=line} && __tt_warp_wear "$REPLY"
   return 0
@@ -239,15 +292,64 @@ __tt_warp_live() {
   (( live ))
 }
 
+__tt_pv_conf_rows() {
+  cvars+=(TTHEME_WARP_FAST) clabel+=("Warp tabs") cchoice+=("on off") cshow+=("on off")
+  cnote+=(
+    TTHEME_WARP_FAST:on "About 0.2 s per switch, for about 8% CPU"
+    TTHEME_WARP_FAST:off "About 0.6 s per switch"
+  )
+}
+
+__tt_warp_warming() {
+  [[ $TTHEME_WARP_FAST == on ]] && (( TTHEME_WARP_UP && ( TTHEME_WARP_MIXED || EPOCHREALTIME < TTHEME_WARP_WARM ) ))
+}
+
+__tt_warp_wait() {
+  local REPLY
+  local -F now=$EPOCHREALTIME end=$(( EPOCHREALTIME + 0.1 ))
+  if ! __tt_warp_warming; then
+    zselect -t 10
+    return 0
+  fi
+  while (( now < end )); do
+    if (( now - TTHEME_WARP_PRIMED >= 0.25 )); then
+      __tt_warp_prime
+      TTHEME_WARP_PRIMED=$now
+    fi
+    zselect -t 2
+    __tt_warp_stamp && [[ $REPLY != "$TTHEME_WARP_SEEN" ]] && return 0
+    now=$EPOCHREALTIME
+  done
+  return 0
+}
+
+__tt_warp_code() {
+  local -a at conf
+  zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/adapters/warp.zsh 2>/dev/null
+  zstat -F %s.%N -A conf +mtime -- $TTHEME_CONFIG 2>/dev/null
+  REPLY="$at[1] $conf[1]"
+}
+
 __tt_warp_follower() {
   emulate -L zsh
-  local fd
+  local fd REPLY
   __tt_warp_db && zsystem flock -t 0 -f fd $TTHEME_WARP_TABS/.follow 2>/dev/null || return 0
-  trap '' HUP
+  trap '' HUP PIPE
+  __tt_warp_code
+  TTHEME_WARP_CODE=$REPLY TTHEME_WARP_LIVED=$EPOCHREALTIME
   while [[ -e $TTHEME_HOME/palettes.zsh && -e $TTHEME_WARP_DB ]]; do
     __tt_warp_tick
-    (( ++TTHEME_WARP_TICK % 50 )) || __tt_warp_live || break
-    zselect -t 10
+    if (( EPOCHREALTIME - TTHEME_WARP_LIVED >= 5 )); then
+      TTHEME_WARP_LIVED=$EPOCHREALTIME
+      __tt_warp_live || break
+      __tt_warp_code
+      if [[ $REPLY != "$TTHEME_WARP_CODE" ]]; then
+        coproc :
+        zsystem flock -u $fd
+        exec zsh -fc 'source $1; __tt_warp_follower' zsh $TTHEME_HOME/ttheme.zsh
+      fi
+    fi
+    __tt_warp_wait
   done
   zf_rm -f -- $TTHEME_WARP_TABS/.active 2>/dev/null
 }

package/shell/ttheme.zsh

@@ -48,7 +48,7 @@ __tt_gone() {
   __tt_reload
   __tt_reset_reloaded $bg
   print -n $'\e[?1004l'
-  for hook in precmd:__tt_prompt precmd:__tt_precmd precmd:__tt_prompted precmd:__tt_unmux preexec:__tt_preexec preexec:__tt_mux chpwd:__tt_chpwd; do
+  for hook in precmd:__tt_prompt precmd:__tt_precmd precmd:__tt_prompted precmd:__tt_unmux preexec:__tt_preexec preexec:__tt_ran 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
@@ -118,11 +118,15 @@ __tt_pins_load
 
 : ${TTHEME_BG_COLORS:=tone}
 
+: ${TTHEME_WARP_FAST:=on}
+
 typeset -g TTHEME_STATE_DIR=${XDG_STATE_HOME:-$HOME/.local/state}/ttheme
 
 () {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
-  if [[ $TERM_PROGRAM == WarpTerminal ]]; then
+  if [[ -n $NVIM || -n $VIM_TERMINAL || -n $INSIDE_EMACS || $TERM_PROGRAM == vscode ]]; then
+    typeset -g TTHEME_ADAPTER=editor
+  elif [[ $TERM_PROGRAM == WarpTerminal ]]; then
     typeset -g TTHEME_ADAPTER=warp
   elif [[ -n $GHOSTTY_RESOURCES_DIR || $TERM_PROGRAM == ghostty ]]; then
     typeset -g TTHEME_ADAPTER=ghostty
@@ -161,7 +165,7 @@ __tt_active() {
 }
 
 typeset -g TTHEME_HEARD=""
-typeset -gi TTHEME_RECHECK=0 TTHEME_FOCUS=0 TTHEME_FRONT=-1
+typeset -gi TTHEME_RECHECK=0 TTHEME_FOCUS=0 TTHEME_FRONT=-1 TTHEME_RAN=0
 
 __tt_put() {
   local f=${1:A}
@@ -235,6 +239,18 @@ __tt_recheck() {
   fi
 }
 
+__tt_mend() {
+  local REPLY
+  local -a p=(${(L)=TTHEME_SPEC})
+  local -A got
+  TTHEME_RAN=0
+  [[ -n $TTHEME_PAINTED ]] && (( ${#p} >= 20 )) && __tt_reverts || return 0
+  __tt_ask $'\e]11;?\e\\\e]12;?\e\\' || return 0
+  __tt_colors "$REPLY"
+  [[ $p[1] == - || ${got[11]:-$p[1]} == $p[1] ]] && [[ ${got[12]:-$p[3]} == $p[3] ]] && return 0
+  __tt_apply "$TTHEME_SPEC"
+}
+
 source $TTHEME_HOME/adapters/_osc.zsh
 source $TTHEME_HOME/adapters/_wired.zsh
 [[ -r $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh ]] &&
@@ -379,8 +395,9 @@ __tt_focus() {
   fi
 }
 
-__tt_mux() {
+__tt_ran() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+  TTHEME_RAN=1
   [[ ${${(z)3}[1]:t} == tmux ]] && TTHEME_MUXED=1
 }
 
@@ -400,6 +417,7 @@ __tt_blur() {
 __tt_line_init() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
   (( TTHEME_RECHECK )) && __tt_recheck
+  (( TTHEME_RAN )) && __tt_mend
   __tt_typed
   (( TTHEME_FOCUS )) && __tt_focus_on
 }
@@ -2202,7 +2220,7 @@ __tt_pv_draw() {
   split=$(( sw > 0 )) sc=$(( pw - 1 - sw ))
   h=$(( ph - 5 ))
   [[ -n $tune ]] && (( ! split )) && h=$(( ph - 14 ))
-  (( conf && ! split )) && h=$(( ph - 12 ))
+  (( conf && ! split )) && h=$(( ph - 6 - ${#cvars} ))
   reach=()
   if [[ -n $pick && $mode == pin ]]; then
     if (( split )); then
@@ -2351,8 +2369,8 @@ __tt_pv_draw() {
       __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 - 8 )) 1 $lw Config
-      __tt_pv_conf_panel $(( ph - 7 )) 1 $lw
+      __tt_pv_head $(( ph - 2 - ${#cvars} )) 1 $lw Config
+      __tt_pv_conf_panel $(( ph - 1 - ${#cvars} )) 1 $lw
     fi
     (( help )) && __tt_pv_help
   fi
@@ -2663,6 +2681,7 @@ __tt_preview() {
     TTHEME_BG_COLORS:tone "New pictures are tinted in one color of the palette"
     TTHEME_BG_COLORS:original "New pictures keep their own colors"
   )
+  __tt_pv_conf_rows
   [[ $mode == pin ]] && __tt_pin_scopes "$pdir"
   [[ $mode == init ]] && pkdef=2
   __tt_pv_canpick
@@ -2856,7 +2875,7 @@ fi
   add-zsh-hook chpwd __tt_chpwd
   add-zsh-hook precmd __tt_prompt
   if (( ! TTHEME_TMUX )); then
-    add-zsh-hook preexec __tt_mux
+    add-zsh-hook preexec __tt_ran
     add-zsh-hook precmd __tt_unmux
   fi
   if __tt_follows_focus || (( TTHEME_TMUX )); then