@kecan0406/ttheme 1.2.6 → 1.2.7

package/dist/manifest.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.2.6",
+  "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 }
@@ -188,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)
@@ -197,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

@@ -26,6 +26,8 @@ __tt_unpainted() {
 
 __tt_keepable() { return 0 }
 
+__tt_reverts() { return 1 }
+
 __tt_follows_prompt() { return 0 }
 
 __tt_prompted() {

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
@@ -124,7 +124,9 @@ 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
@@ -163,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}
@@ -237,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 ]] &&
@@ -381,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
 }
 
@@ -402,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
 }
@@ -2859,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