@kecan0406/ttheme 1.2.3 → 1.2.4

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.3",
+  "version": "1.2.4",
   "gate": [
     {
       "rule": "foreground",

package/package.json

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

package/shell/adapters/_osc.zsh

@@ -55,6 +55,8 @@ __tt_reloaded() { : }
 
 __tt_worn() { : }
 
+__tt_blurred() { : }
+
 __tt_keepable() { return 1 }
 
 __tt_paints() { return 0 }

package/shell/adapters/_wired.zsh

@@ -16,20 +16,28 @@ __tt_pictured() {
   return 0
 }
 
+__tt_ghostty_owner() {
+  local pid=$1 ppid comm
+  REPLY=0
+  while (( pid > 1 )); do
+    read -r ppid comm <<< "$(ps -o ppid=,comm= -p $pid)"
+    if [[ ${comm:t} == ghostty ]]; then
+      REPLY=$pid
+      return 0
+    fi
+    pid=$ppid
+  done
+  return 1
+}
+
 __tt_reload_ghostty() {
-  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
-        owner=$pid
-        break
-      fi
-      pid=$ppid
-    done
-    (( TTHEME_TMUX )) || TTHEME_GHOSTTY_PID=$owner
+  local REPLY owner=$TTHEME_GHOSTTY_PID
+  if (( TTHEME_TMUX )); then
+    __tt_ghostty_owner "$(tmux display -p '#{client_pid}' 2>/dev/null)"
+    owner=$REPLY
+  elif [[ -z $owner ]]; then
+    __tt_ghostty_owner $PPID
+    owner=$REPLY TTHEME_GHOSTTY_PID=$REPLY
   fi
   (( owner )) && kill -USR2 $owner 2>/dev/null && return
   pkill -USR2 -x ghostty 2>/dev/null

package/shell/adapters/ghostty.zsh

@@ -1,11 +1,204 @@
 source $TTHEME_HOME/adapters/_bg.zsh
 
+typeset -g TTHEME_GHOSTTY_TABS=$TTHEME_STATE_DIR/ghostty TTHEME_GHOSTTY_FRONT="" TTHEME_GHOSTTY_BLUR=""
+typeset -gF TTHEME_GHOSTTY_ASKED=0 TTHEME_GHOSTTY_WANT=0 TTHEME_GHOSTTY_HUSH=0
+typeset -gi TTHEME_GHOSTTY_IDLE=1 TTHEME_GHOSTTY_TICK=0 TTHEME_GHOSTTY_NONE=0 TTHEME_GHOSTTY_FOLLOWS=-1
+typeset -gA TTHEME_GHOSTTY_SEEN=() TTHEME_GHOSTTY_RUN=()
+typeset -g TTHEME_GHOSTTY_JS='ObjC.import("AppKit");function run(v){var p=+v[0],E=$.NSAppleEventDescriptor,G="com.mitchellh.ghostty",f=function(s){return(s.charCodeAt(0)<<24)|(s.charCodeAt(1)<<16)|(s.charCodeAt(2)<<8)|s.charCodeAt(3)},a=p?$.NSRunningApplication.runningApplicationWithProcessIdentifier(p):$.NSRunningApplication.runningApplicationsWithBundleIdentifier(G).firstObject;if(!a||a.isNil())return"none";var s=$.NSString.stringWithContentsOfFileEncodingError(a.bundleURL.path.js+"/Contents/Resources/Ghostty.sdef",4,null);if(s.isNil()||s.js.indexOf("code=\"Gtty\"")<0)return"blind";var t=E.descriptorWithProcessIdentifier(a.processIdentifier);function q(c,o){var d=E.recordDescriptor;d.setDescriptorForKeyword(E.descriptorWithTypeCode(f("prop")),f("want"));d.setDescriptorForKeyword(o,f("from"));d.setDescriptorForKeyword(E.descriptorWithEnumCode(f("prop")),f("form"));d.setDescriptorForKeyword(E.descriptorWithTypeCode(f(c)),f("seld"));return d.coerceToDescriptorType(f("obj "))}function g(o){var e=E.appleEventWithEventClassEventIDTargetDescriptorReturnIDTransactionID(f("core"),f("getd"),t,-1,0);e.setParamDescriptorForKeyword(o,f("----"));var r=e.sendEventWithOptionsTimeoutError(3,5,null);return!r||r.isNil()||!r.paramDescriptorForKeyword(f("errn")).isNil()?null:r.paramDescriptorForKeyword(f("----"))}var n=E.nullDescriptor,m=q("GTfT",q("GWsT",q("GFWn",n))),w=g(q("pisf",n)),y=g(q("Gtty",m)),i=g(q("Gpid",m));if(!w||!y||!i||w.isNil()||y.isNil()||i.isNil())return"none";return(w.booleanValue?1:0)+" "+y.stringValue.js+" "+i.int32Value}'
+
 __tt_follows_focus() { return 0 }
 
+__tt_follows_prompt() { return 0 }
+
 __tt_keepable() { return 0 }
 
 __tt_bg_shown() { __tt_ghostty_shown }
 
+__tt_ghostty_key() { REPLY=${${1#/dev/}//\//-} }
+
+__tt_ghostty_wears() {
+  REPLY=""
+  [[ -n $1 ]] && __tt_name_of "$1"
+  [[ -n ${TTHEME_PALETTE[$REPLY]} ]] || REPLY=""
+}
+
+__tt_ghostty_modules() {
+  zmodload -F zsh/files b:zf_rm b:zf_mkdir
+  zmodload -F zsh/zselect b:zselect
+  zmodload -F zsh/datetime p:EPOCHREALTIME p:EPOCHSECONDS
+} 2>/dev/null
+
+__tt_ghostty_follows() {
+  local -a at
+  (( TTHEME_GHOSTTY_FOLLOWS < 0 )) || return $(( ! TTHEME_GHOSTTY_FOLLOWS ))
+  TTHEME_GHOSTTY_FOLLOWS=0
+  [[ $TERM_PROGRAM == ghostty && -o interactive && -n $TTY ]] && (( $+commands[osascript] && ! TTHEME_TMUX )) || return 1
+  if zstat -A at +mtime -- $TTHEME_GHOSTTY_TABS/.blind 2>/dev/null && [[ "$(<$TTHEME_GHOSTTY_TABS/.blind)" == "${TERM_PROGRAM_VERSION:--}" ]]; then
+    zmodload -F zsh/datetime p:EPOCHSECONDS 2>/dev/null
+    (( EPOCHSECONDS - at[1] < 86400 )) && return 1
+  fi
+  TTHEME_GHOSTTY_FOLLOWS=1
+}
+
+__tt_ghostty_publish() {
+  local f line REPLY
+  __tt_ghostty_follows || return 0
+  line="$$ ${TTHEME_STARTUP:--} ${1:--} $TTY"
+  __tt_ghostty_key $TTY
+  f=$TTHEME_GHOSTTY_TABS/$REPLY
+  [[ -r $f && "$(<$f)" == "$line" ]] && return 0
+  if [[ ! -d $TTHEME_GHOSTTY_TABS ]]; then
+    zmodload -F zsh/files b:zf_mkdir 2>/dev/null
+    zf_mkdir -p $TTHEME_GHOSTTY_TABS 2>/dev/null || return 0
+  fi
+  __tt_put $f "$line" 2>/dev/null
+  return 0
+}
+
+__tt_worn() {
+  local REPLY
+  (( TTHEME_RAW )) && return 0
+  __tt_ghostty_wears "$1"
+  __tt_ghostty_publish "$REPLY"
+}
+
+__tt_prompted() {
+  emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+  local REPLY
+  __tt_ghostty_wears "$TTHEME_SPEC"
+  __tt_ghostty_publish "$REPLY"
+  __tt_ghostty_follow
+}
+
+__tt_blurred() {
+  __tt_ghostty_follows && [[ -d $TTHEME_GHOSTTY_TABS ]] && : >| $TTHEME_GHOSTTY_TABS/.blur 2>/dev/null
+  return 0
+}
+
+__tt_ghostty_follow() {
+  local fd lock=$TTHEME_GHOSTTY_TABS/.follow
+  __tt_ghostty_follows && [[ -d $TTHEME_GHOSTTY_TABS ]] || return 0
+  if [[ -e $TTHEME_GHOSTTY_TABS/.blind ]]; then
+    TTHEME_GHOSTTY_FOLLOWS=-1
+    __tt_ghostty_follows || return 0
+  fi
+  [[ -e $lock ]] || : >>| $lock 2>/dev/null || return 0
+  zsystem flock -t 0 -f fd $lock 2>/dev/null || return 0
+  zsystem flock -u $fd
+  zsh -fc 'source $1; __tt_ghostty_follower' zsh $TTHEME_HOME/ttheme.zsh </dev/null >/dev/null 2>&1 &!
+}
+
+__tt_ghostty_ask() {
+  REPLY=$(osascript -l JavaScript -e $TTHEME_GHOSTTY_JS ${TTHEME_GHOSTTY_PID:-0} 2>/dev/null)
+  TTHEME_GHOSTTY_ASKED=$EPOCHREALTIME
+  [[ -n $REPLY ]]
+}
+
+__tt_ghostty_check() {
+  local REPLY shown key pal conf=${TTHEME_CONFIG:h}/backgrounds/shown.conf
+  local -a at ans rec
+  integer n
+  __tt_ghostty_modules
+  for (( n = 0; n < 3; n++ )); do
+    at=("")
+    zstat -F %s.%N -A at +mtime -- $conf 2>/dev/null
+    shown=$at[1]
+    __tt_ghostty_ask || return 0
+    at=("")
+    zstat -F %s.%N -A at +mtime -- $conf 2>/dev/null
+    [[ $at[1] == "$shown" ]] && break
+  done
+  if [[ $REPLY == blind ]] || { [[ $REPLY == none ]] && (( ++TTHEME_GHOSTTY_NONE >= 5 )) }; then
+    __tt_put $TTHEME_GHOSTTY_TABS/.blind "${TERM_PROGRAM_VERSION:--}" 2>/dev/null
+    return 1
+  fi
+  [[ $REPLY == none ]] && return 0
+  TTHEME_GHOSTTY_NONE=0
+  ans=(${=REPLY})
+  if [[ $ans[1] != 1 || -z $ans[2] ]]; then
+    TTHEME_GHOSTTY_FRONT=""
+    return 0
+  fi
+  __tt_ghostty_key $ans[2]
+  key=$REPLY
+  TTHEME_GHOSTTY_FRONT=$key TTHEME_GHOSTTY_IDLE=1
+  [[ -r $TTHEME_GHOSTTY_TABS/$key ]] || return 0
+  rec=(${=${"$(<$TTHEME_GHOSTTY_TABS/$key)"}})
+  [[ $rec[1] == "$ans[3]" ]] || TTHEME_GHOSTTY_IDLE=0
+  pal=${rec[3]#-}
+  [[ $rec[2] != - && -z $TTHEME_STARTUP ]] && pal=""
+  [[ -n $pal && -n ${TTHEME_PALETTE[$pal]} ]] || return 0
+  __tt_shown "$pal" force && __tt_reload_ghostty
+  return 0
+}
+
+__tt_ghostty_tick() {
+  local f key
+  local -a at rec
+  local -F now=$EPOCHREALTIME
+  integer seen
+  zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/palettes.zsh 2>/dev/null && [[ $at[1] != "$TTHEME_PALETTES_AT" ]] && __tt_palettes_load
+  if zstat -F %s.%N -A at +mtime -- $TTHEME_GHOSTTY_TABS/.blur 2>/dev/null && [[ $at[1] != "$TTHEME_GHOSTTY_BLUR" ]]; then
+    [[ -n $TTHEME_GHOSTTY_BLUR ]] && TTHEME_GHOSTTY_WANT=$now
+    TTHEME_GHOSTTY_BLUR=$at[1]
+  fi
+  for f in $TTHEME_GHOSTTY_TABS/[^.]*(N); do
+    key=${f:t}
+    rec=(${=${"$(<$f)"}})
+    zstat -F %s.%N -A at +atime -- ${rec[4]:-/nonexistent} 2>/dev/null || continue
+    if [[ $at[1] == "${TTHEME_GHOSTTY_SEEN[$key]}" ]]; then
+      TTHEME_GHOSTTY_RUN[$key]=0
+      continue
+    fi
+    seen=${+TTHEME_GHOSTTY_SEEN[$key]}
+    TTHEME_GHOSTTY_SEEN[$key]=$at[1]
+    (( seen )) || continue
+    if [[ $key == "$TTHEME_GHOSTTY_FRONT" ]]; then
+      TTHEME_GHOSTTY_HUSH=$now
+    elif (( ++TTHEME_GHOSTTY_RUN[$key] < 5 )); then
+      TTHEME_GHOSTTY_WANT=$now
+    fi
+  done
+  if (( TTHEME_GHOSTTY_HUSH && now - TTHEME_GHOSTTY_HUSH >= 0.3 && now - TTHEME_GHOSTTY_ASKED >= (TTHEME_GHOSTTY_IDLE ? 10 : 2) )); then
+    TTHEME_GHOSTTY_HUSH=0 TTHEME_GHOSTTY_WANT=$now
+  fi
+  (( TTHEME_GHOSTTY_WANT && now - TTHEME_GHOSTTY_ASKED >= 0.2 )) || return 0
+  TTHEME_GHOSTTY_WANT=0
+  __tt_ghostty_check
+}
+
+__tt_ghostty_live() {
+  local f pid
+  integer live=0
+  (( TTHEME_GHOSTTY_PID )) && ! kill -0 $TTHEME_GHOSTTY_PID 2>/dev/null && return 1
+  for f in $TTHEME_GHOSTTY_TABS/[^.]*(N); do
+    pid=${"$(<$f)"%% *}
+    if [[ $pid == <-> ]] && kill -0 $pid 2>/dev/null; then
+      live=1
+    else
+      zf_rm -f -- $f 2>/dev/null
+      unset "TTHEME_GHOSTTY_SEEN[${f:t}]" "TTHEME_GHOSTTY_RUN[${f:t}]"
+    fi
+  done
+  (( live ))
+}
+
+__tt_ghostty_follower() {
+  emulate -L zsh
+  local fd REPLY
+  __tt_ghostty_modules
+  zsystem flock -t 0 -f fd $TTHEME_GHOSTTY_TABS/.follow 2>/dev/null || return 0
+  trap '' HUP
+  __tt_ghostty_owner $PPID
+  TTHEME_GHOSTTY_PID=$REPLY
+  __tt_ghostty_check || return 0
+  while [[ -e $TTHEME_HOME/palettes.zsh ]]; do
+    __tt_ghostty_tick || break
+    (( ++TTHEME_GHOSTTY_TICK % 50 )) || __tt_ghostty_live || break
+    zselect -t 10
+  done
+}
+
 __tt_reset_reloaded() {
   local REPLY
   integer i
@@ -21,6 +214,8 @@ __tt_reset_reloaded() {
 
 __tt_shown() {
   local dir=${TTHEME_CONFIG:h}/backgrounds was REPLY
+  __tt_ghostty_publish "$1"
+  [[ $2 == force ]] || (( TTHEME_FRONT || TTHEME_TMUX )) || return 1
   __tt_bg_shown
   was=$REPLY
   [[ $was == $1 ]] && return 1

package/shell/ttheme.zsh

@@ -19,9 +19,21 @@ __tt_fresh() {
     [[ -e $TTHEME_HOME ]] || __tt_gone
     return 0
   fi
-  [[ $at[1] == "$TTHEME_PALETTES_AT" ]] && return 0
-  __tt_palettes_load && { __tt_follow "$start" && __tt_sync; __tt_reloaded }
-  [[ -n $was && -z $TTHEME_STARTUP && -n $TTHEME_SPEC ]] && __tt_active && __tt_off_here
+  if [[ $at[1] != "$TTHEME_PALETTES_AT" ]]; then
+    __tt_palettes_load && { __tt_follow "$start" && __tt_sync; __tt_reloaded }
+    [[ -n $was && -z $TTHEME_STARTUP && -n $TTHEME_SPEC ]] && __tt_active && __tt_off_here
+  fi
+  at=("")
+  zstat -F %s.%N -A at +mtime -- $TTHEME_PINS_FILE 2>/dev/null
+  [[ $at[1] == "$TTHEME_PINS_AT" ]] && return 0
+  __tt_pins_load
+  __tt_active && __tt_dir_sync
+}
+
+__tt_prompt() {
+  emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+  (( TTHEME_FRONT < 0 )) || TTHEME_FRONT=0
+  __tt_fresh
 }
 
 __tt_follow() {
@@ -36,7 +48,7 @@ __tt_gone() {
   __tt_reload
   __tt_reset_reloaded $bg
   print -n $'\e[?1004l'
-  for hook in precmd:__tt_fresh 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_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_line_init
@@ -65,7 +77,7 @@ typeset -g TTHEME_CONFIG=${XDG_CONFIG_HOME:-$HOME/.config}/ttheme/config.zsh
 [[ -r $TTHEME_CONFIG ]] && source $TTHEME_CONFIG
 
 typeset -g TTHEME_PINS_FILE=${TTHEME_CONFIG:h}/pins
-typeset -g TTHEME_PINS_RAW=""
+typeset -g TTHEME_PINS_RAW="" TTHEME_PINS_AT=""
 typeset -gA TTHEME_PINS=()
 typeset -g TTHEME_PIN="" TTHEME_PIN_SPEC="" TTHEME_BASE_SPEC=""
 
@@ -75,6 +87,9 @@ __tt_pins_load() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
   setopt localoptions extendedglob
   local raw="" line key name
+  local -a at=("")
+  zstat -F %s.%N -A at +mtime -- $TTHEME_PINS_FILE 2>/dev/null
+  TTHEME_PINS_AT=$at[1]
   [[ -r $TTHEME_PINS_FILE ]] && raw="$(<$TTHEME_PINS_FILE)"
   [[ $raw == "$TTHEME_PINS_RAW" ]] && return 0
   TTHEME_PINS_RAW=$raw
@@ -146,7 +161,7 @@ __tt_active() {
 }
 
 typeset -g TTHEME_HEARD=""
-typeset -gi TTHEME_RECHECK=0 TTHEME_FOCUS=0
+typeset -gi TTHEME_RECHECK=0 TTHEME_FOCUS=0 TTHEME_FRONT=-1
 
 __tt_put() {
   local f=${1:A}
@@ -298,13 +313,16 @@ __tt_dir_rule() {
 __tt_dir_sync() {
   local REPLY="" spec=""
   __tt_dir_rule "$PWD" || REPLY=""
-  [[ $REPLY == "$TTHEME_PIN" ]] && return 0
   if [[ -n $REPLY ]]; then
-    [[ -n $TTHEME_PIN ]] || TTHEME_BASE_SPEC=$TTHEME_SPEC
     spec=${TTHEME_PALETTE[$TTHEME_PINS[$REPLY]]}
-  elif [[ $TTHEME_SPEC == "$TTHEME_PIN_SPEC" ]]; then
-    spec=$TTHEME_BASE_SPEC
-    [[ -n $spec ]] || { __tt_osc_reset; TTHEME_SPEC= }
+    [[ $REPLY == "$TTHEME_PIN" && $spec == "$TTHEME_PIN_SPEC" ]] && return 0
+    [[ -n $TTHEME_PIN ]] || TTHEME_BASE_SPEC=$TTHEME_SPEC
+  else
+    [[ -n $TTHEME_PIN ]] || return 0
+    if [[ $TTHEME_SPEC == "$TTHEME_PIN_SPEC" ]]; then
+      spec=$TTHEME_BASE_SPEC
+      [[ -n $spec ]] || { __tt_osc_reset; TTHEME_SPEC= }
+    fi
   fi
   TTHEME_PIN=$REPLY TTHEME_PIN_SPEC=$spec
   [[ -n $spec && $spec != "$TTHEME_SPEC" ]] || return 0
@@ -353,6 +371,7 @@ __tt_rewear() {
 
 __tt_focus() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+  TTHEME_FRONT=1
   __tt_fresh
   if (( TTHEME_TMUX )); then
     __tt_rewear
@@ -375,7 +394,8 @@ __tt_unmux() {
 
 __tt_blur() {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
-  :
+  TTHEME_FRONT=0
+  __tt_blurred
 }
 
 __tt_line_init() {
@@ -410,12 +430,14 @@ __tt_pins_write() {
   done
   if (( ! ${#lines} )); then
     rm -f $TTHEME_PINS_FILE || return 1
-    TTHEME_PINS_RAW=""
+    TTHEME_PINS_RAW="" TTHEME_PINS_AT=""
     return 0
   fi
   mkdir -p ${TTHEME_PINS_FILE:h} || return 1
   __tt_put $TTHEME_PINS_FILE "${lines[@]}" || return 1
   TTHEME_PINS_RAW="$(<$TTHEME_PINS_FILE)"
+  local -a at
+  zstat -F %s.%N -A at +mtime -- $TTHEME_PINS_FILE 2>/dev/null && TTHEME_PINS_AT=$at[1]
 }
 
 __tt_pin_base() { REPLY=${${${1%/\*\*}:-/}:a} }
@@ -2758,6 +2780,7 @@ ttheme() {
   case $1 in
     browse|list|add|remove|update|market|new|edit|check|share) __tt_catalog "$@"; return ;;
     on|off) __tt_switch "$@"; return ;;
+    info) TTHEME_ZSH=$ZSH_VERSION __tt_cli "$@"; return ;;
   esac
   __tt_arity "$@" || return
   [[ $1 == config ]] && { __tt_config; return }
@@ -2841,7 +2864,7 @@ fi
   zle -N __tt_line_init
   add-zle-hook-widget line-init __tt_line_init
   add-zsh-hook chpwd __tt_chpwd
-  add-zsh-hook precmd __tt_fresh
+  add-zsh-hook precmd __tt_prompt
   if (( ! TTHEME_TMUX )); then
     add-zsh-hook preexec __tt_mux
     add-zsh-hook precmd __tt_unmux