@kecan0406/ttheme 1.1.6 → 1.2.0

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.6",
+  "version": "1.2.0",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "type": "module",
   "bin": {
     "ttheme": "bin/ttheme.js"
@@ -11,7 +11,7 @@
     "shell",
     "!shell/check.zsh"
   ],
-  "description": "Character terminal palettes for Ghostty, kitty, Alacritty, WezTerm, iTerm2, Windows Terminal and Warp",
+  "description": "Character terminal palettes for Ghostty, kitty, Alacritty, WezTerm, iTerm2, Windows Terminal, Warp and Konsole",
   "license": "MIT",
   "author": "kecan0406",
   "repository": {
@@ -27,7 +27,8 @@
     "kitty",
     "alacritty",
     "wezterm",
-    "iterm2"
+    "iterm2",
+    "konsole"
   ],
   "devDependencies": {
     "@biomejs/biome": "^2.3.0",

package/shell/adapters/_bg.zsh

@@ -1,19 +1,8 @@
 typeset -ga TTHEME_BG_POSITIONS=(top-left top-center top-right center-left center center-right bottom-left bottom-center bottom-right)
 
-__tt_ghostty_shown() {
-  local f=${TTHEME_CONFIG:h}/backgrounds/shown.conf
-  REPLY=""
-  [[ -r $f ]] || return 1
-  REPLY=${${"$(<$f)"}##*\?}
-  REPLY=${REPLY%.conf}
-  REPLY=${${REPLY/--/@}/--//}
-}
-
 __tt_bg_saved() {
-  local REPLY
-  (( ${TTHEME_TERMINALS[(Ie)iterm2]} )) && __tt_cli image $1 tuned
+  __tt_pictured "$@"
   __tt_bg_refresh "$@"
-  __tt_ghostty_shown && (( ${@[(Ie)$REPLY]} )) && __tt_reload
   return 0
 }
 
@@ -21,8 +10,6 @@ __tt_bg_refresh() { : }
 
 __tt_bg_lasting() { : }
 
-__tt_bg_aligns() { (( ! ${TTHEME_TERMINALS[(Ie)iterm2]} )) }
-
 __tt_bg_frame() {
   local -i iw=$1 ih=$2 W=$3 H=$4 s=$5 ax=$(( ($6 - 1) % 3 )) ay=$(( ($6 - 1) / 3 )) f=${8:--1} wide dw dh ox oy
   wide=$(( W * ih >= H * iw ))

package/shell/adapters/_osc.zsh

@@ -57,6 +57,12 @@ __tt_worn() { : }
 
 __tt_keepable() { return 1 }
 
+__tt_paints() { return 0 }
+
+__tt_unpainted() { : }
+
+__tt_follows_focus() { return 1 }
+
 __tt_pv_bg_open() { : }
 
 __tt_pv_bg_show() { : }

package/shell/adapters/_wired.zsh

@@ -0,0 +1,55 @@
+typeset -g TTHEME_GHOSTTY_PID=""
+
+__tt_reload() {
+  local wired
+  for wired in $TTHEME_TERMINALS; do
+    (( $+functions[__tt_reload_$wired] )) && __tt_reload_$wired
+  done
+  return 0
+}
+
+__tt_pictured() {
+  local wired
+  for wired in $TTHEME_TERMINALS; do
+    (( $+functions[__tt_pictured_$wired] )) && __tt_pictured_$wired "$@"
+  done
+  return 0
+}
+
+__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
+  fi
+  (( owner )) && kill -USR2 $owner 2>/dev/null && return
+  pkill -USR2 -x ghostty 2>/dev/null
+}
+
+__tt_ghostty_shown() {
+  local f=${TTHEME_CONFIG:h}/backgrounds/shown.conf
+  REPLY=""
+  [[ -r $f ]] || return 1
+  REPLY=${${"$(<$f)"}##*\?}
+  REPLY=${REPLY%.conf}
+  REPLY=${${REPLY/--/@}/--//}
+}
+
+__tt_pictured_ghostty() {
+  local REPLY
+  __tt_ghostty_shown && (( ${@[(Ie)$REPLY]} )) && __tt_reload_ghostty
+  return 0
+}
+
+__tt_pictured_iterm2() { __tt_cli image $1 tuned }
+
+__tt_bg_aligns() { (( ! ${TTHEME_TERMINALS[(Ie)iterm2]} )) }

package/shell/adapters/ghostty.zsh

@@ -1,5 +1,7 @@
 source $TTHEME_HOME/adapters/_bg.zsh
 
+__tt_follows_focus() { return 0 }
+
 __tt_keepable() { return 0 }
 
 __tt_bg_shown() { __tt_ghostty_shown }

package/shell/adapters/kitty.zsh

@@ -1,5 +1,7 @@
 source $TTHEME_HOME/adapters/_bg.zsh
 
+__tt_follows_focus() { return 0 }
+
 typeset -g TTHEME_KITTY_SHOWN=""
 
 __tt_keepable() { (( ${TTHEME_TERMINALS[(Ie)kitty]} )) }

package/shell/adapters/konsole.zsh

@@ -0,0 +1,45 @@
+__tt_paints() { (( ${TTHEME_TERMINALS[(Ie)konsole]} )) }
+
+__tt_unpainted() {
+  print -u2 "ttheme: Konsole draws a palette's 16 colors only from the color schemes init writes — wire it with \`npx @kecan0406/ttheme@latest init\`"
+}
+
+__tt_keepable() { __tt_paints }
+
+__tt_scheme() {
+  local -a p=(${=TTHEME_PALETTE[$1]})
+  REPLY="ColorScheme=ttheme-${${1/@/--}/\//--};UseCustomCursorColor=true;customCursorColor=$p[3]"
+}
+
+__tt_osc_apply() {
+  local -a p=(${=1})
+  (( ${#p} >= 20 )) || return 1
+  local REPLY
+  __tt_name_of "$1"
+  if __tt_paints && [[ -n ${TTHEME_PALETTE[$REPLY]} ]]; then
+    __tt_scheme $REPLY
+    __tt_out $'\e]50;'$REPLY$'\a'
+  elif [[ $p[1] == - ]]; then
+    __tt_out $'\e]10;'$p[2]$'\e\\'
+  else
+    __tt_out $'\e]11;'$p[1]$'\e\\\e]10;'$p[2]$'\e\\'
+  fi
+  export TTHEME_PAINTED=1
+  (( TTHEME_TMUX )) && tmux set -q @ttheme_bg "$p[1]" 2>/dev/null
+  __tt_worn "$1"
+  return 0
+}
+
+__tt_osc_reset() {
+  local REPLY=$TTHEME_KONSOLE_BASE
+  if __tt_paints; then
+    [[ -n $TTHEME_STARTUP && -n ${TTHEME_PALETTE[$TTHEME_STARTUP]} ]] && __tt_scheme $TTHEME_STARTUP
+    __tt_out $'\e]50;'$REPLY$'\a'
+  else
+    __tt_out $'\e]110;\e\\\e]111;\e\\'
+  fi
+  unset TTHEME_PAINTED
+  (( TTHEME_TMUX )) && tmux set -qu @ttheme_bg 2>/dev/null
+  __tt_worn ""
+  return 0
+}

package/shell/adapters/warp.zsh

@@ -0,0 +1,5 @@
+__tt_paints() { return 1 }
+
+__tt_unpainted() {
+  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"
+}

package/shell/adapters/windows-terminal.zsh

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

package/shell/ttheme.zsh

@@ -109,6 +109,8 @@ typeset -g TTHEME_STATE_DIR=${XDG_STATE_HOME:-$HOME/.local/state}/ttheme
     typeset -g TTHEME_ADAPTER=wezterm
   elif [[ -n $ALACRITTY_WINDOW_ID ]]; then
     typeset -g TTHEME_ADAPTER=alacritty
+  elif [[ -n $KONSOLE_VERSION ]]; then
+    typeset -g TTHEME_ADAPTER=konsole
   elif [[ -n $ITERM_SESSION_ID || $TERM_PROGRAM == iTerm.app ]]; then
     typeset -g TTHEME_ADAPTER=iterm2
   elif [[ $TERM_PROGRAM == Apple_Terminal ]]; then
@@ -122,27 +124,7 @@ typeset -g TTHEME_STATE_DIR=${XDG_STATE_HOME:-$HOME/.local/state}/ttheme
   fi
 }
 
-typeset -g TTHEME_GHOSTTY_PID="" TTHEME_TMUX=0 TTHEME_MUXED=0
-
-__tt_reload() {
-  (( ${TTHEME_TERMINALS[(Ie)ghostty]} )) || return 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
-        owner=$pid
-        break
-      fi
-      pid=$ppid
-    done
-    (( TTHEME_TMUX )) || TTHEME_GHOSTTY_PID=$owner
-  fi
-  (( owner )) && kill -USR2 $owner 2>/dev/null && return
-  pkill -USR2 -x ghostty 2>/dev/null
-}
+typeset -g TTHEME_TMUX=0 TTHEME_MUXED=0
 
 __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
@@ -152,7 +134,7 @@ __tt_tmux() {
 __tt_active() {
   [[ -o interactive ]] || return 1
   (( ${#TTHEME_PALETTE} )) || return 1
-  [[ $TTHEME_ADAPTER != (unknown|warp) || -n $TTHEME_FORCE ]]
+  [[ -n $TTHEME_FORCE ]] || { [[ $TTHEME_ADAPTER != unknown ]] && __tt_paints }
 }
 
 typeset -g TTHEME_HEARD=""
@@ -231,6 +213,7 @@ __tt_recheck() {
 }
 
 source $TTHEME_HOME/adapters/_osc.zsh
+source $TTHEME_HOME/adapters/_wired.zsh
 [[ -r $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh ]] &&
   source $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh
 
@@ -1662,9 +1645,9 @@ __tt_pv_foot() {
     printf -v y '\e[38;2;%d;%d;%dm' $((16#${hex:0:2})) $((16#${hex:2:2})) $((16#${hex:4:2}))
   fi
   if (( help )); then
-    badge=KEYS right=$b"? esc"$z$d" close"$z
+    badge=HELP right=$b"? esc"$z$d" close"$z
   elif [[ -n $pick ]]; then
-    badge=APPLY lead="$pick →"
+    badge='PREVIEW (APPLY)' lead="$pick →"
     for (( i = 1; i <= ${#plabel}; i++ )); do
       if (( i != pk )); then
         lead+=" "$d${plabel[i]}$z
@@ -1675,7 +1658,7 @@ __tt_pv_foot() {
       fi
     done
     if [[ $mode == pin ]]; then
-      badge=PIN
+      badge='PREVIEW (PIN)'
       __tt_pin_base "${pkeys[pk]}"
       __tt_dir_label "$REPLY"
       note=$REPLY
@@ -1687,7 +1670,7 @@ __tt_pv_foot() {
     kk=(enter) kl=(confirm)
     right=$b"esc"$z$d" back"$z
   elif [[ -n $tune ]]; then
-    badge=TUNE kk=(↑↓ ←→ '=' +) kl=(field step reset "reset all")
+    badge='IMAGE EDIT' kk=(↑↓ ←→ '=' +) kl=(field step reset "reset all")
     if (( tf == 2 )); then
       kl[2]=move kk+=(1-9) kl+=(place)
     else
@@ -1703,7 +1686,8 @@ __tt_pv_foot() {
     badge=CONFIG kk=(↑↓ ←→ enter) kl=(setting value save)
     right=$b"esc"$z$d" undo"$z
   else
-    [[ -n $flt ]] && badge=FILTER
+    badge=PREVIEW
+    [[ -n $flt ]] && badge='PREVIEW (FILTER)'
     if (( ! ${#rval} )); then
       kk=(bksp) kl=(edit)
     elif [[ ${rtype[cur]} == (hdr|cat) ]]; then
@@ -1810,7 +1794,7 @@ __tt_pv_help() {
   x=$(( (pw - w) / 2 + 1 )) y=$(( (ph - hh) / 2 ))
   (( y < 4 )) && y=4
   blank=${(l:w:: :)}
-  out+=$'\e['$y';'$x'H'"╭─ Keys ${(l:$(( w - 9 ))::─:)}╮"
+  out+=$'\e['$y';'$x'H'"╭─ Help ${(l:$(( w - 9 ))::─:)}╮"
   for (( r = y + 1; r < y + hh - 1; r++ )); do
     out+=$'\e['$r';'$x'H'$blank$'\e['$r';'$x'H│'$'\e['$r';'$(( x + w - 1 ))'H│'
   done
@@ -2287,7 +2271,7 @@ __tt_pv_draw() {
   __tt_pv_foot $(( split ? se : pw ))
   if (( split )); then
     if (( help && sw >= 48 )); then
-      __tt_pv_head 1 $sc $se Keys
+      __tt_pv_head 1 $sc $se Help
       __tt_pv_help
     elif (( ${#reach} )); then
       __tt_pv_head 1 $sc $se "$pick" "$rsub"
@@ -2735,8 +2719,8 @@ ttheme() {
     print -u2 "ttheme: unknown command '$1' — see \`ttheme help\`"
     return 1
   fi
-  if [[ $TTHEME_ADAPTER == warp && $1 != (browse|list|add|remove|update|market|new|edit|check|share|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"
+  if ! __tt_paints && (( ! $# || ${TTHEME_TAB_VERBS[(Ie)$1]} )); then
+    __tt_unpainted
     return 1
   fi
   if (( ! $# )); then
@@ -2836,7 +2820,7 @@ fi
     add-zsh-hook preexec __tt_mux
     add-zsh-hook precmd __tt_unmux
   fi
-  if [[ $TTHEME_ADAPTER == (ghostty|kitty|windows-terminal) ]] || (( TTHEME_TMUX )); then
+  if __tt_follows_focus || (( TTHEME_TMUX )); then
     add-zsh-hook precmd __tt_precmd
     add-zsh-hook preexec __tt_preexec
     __tt_bind_focus
@@ -2849,7 +2833,7 @@ fi
 () {
   emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
   local f
-  for f in $TTHEME_HOME/ttheme.zsh $TTHEME_HOME/palettes.zsh $TTHEME_HOME/adapters/_osc.zsh $TTHEME_HOME/adapters/_bg.zsh $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh; do
+  for f in $TTHEME_HOME/ttheme.zsh $TTHEME_HOME/palettes.zsh $TTHEME_HOME/adapters/_osc.zsh $TTHEME_HOME/adapters/_wired.zsh $TTHEME_HOME/adapters/_bg.zsh $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh; do
     [[ -r $f && ! $f.zwc -nt $f ]] || continue
     zcompile -UR -- $f.$$.zwc $f 2>/dev/null && command mv -f -- $f.$$.zwc $f.zwc 2>/dev/null
     [[ ! -e $f.$$.zwc ]] || command rm -f -- $f.$$.zwc