@kecan0406/ttheme 1.2.16 → 1.2.17

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "schema": 1,
-  "version": "1.2.16",
+  "version": "1.2.17",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "type": "module",
   "bin": {
     "ttheme": "bin/ttheme.js"
@@ -41,7 +41,8 @@
     "fast-string-width": "^3.0.2",
     "pngjs": "7.0.0",
     "smol-toml": "^1.9.0",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.2",
+    "uqr": "^0.1.3"
   },
   "engines": {
     "bun": ">=1.3",

package/shell/adapters/_osc.zsh

@@ -66,6 +66,8 @@ __tt_pv_claim() { : }
 
 __tt_pv_leave() { : }
 
+__tt_pv_forget() { : }
+
 __tt_shown() { return 1 }
 
 __tt_unshown() { : }

package/shell/adapters/terminal-app.zsh

@@ -167,6 +167,11 @@ __tt_pv_leave() {
   painted=$orig
 }
 
+__tt_pv_forget() {
+  TTHEME_TERMINAL_SHOWN=""
+  __tt_out $'\e]104\e\\\e]110\e\\\e]111\e\\\e]112\e\\\e]117\e\\'
+}
+
 __tt_bg_shown() {
   REPLY=${TTHEME_TERMINAL_SHOWN%% *}
   [[ -n $REPLY ]]

package/shell/preview.zsh

@@ -203,6 +203,7 @@ __tt_pv_lw() {
     (( l < 30 )) && l=30
   fi
   (( sw > pw - l - 6 )) && sw=$(( pw - l - 6 ))
+  (( te && sw < 50 )) && sw=0
   if (( color && sw >= 32 )); then
     lw=$l
   else
@@ -305,13 +306,13 @@ __tt_pv_row() {
   fi
 }
 
-__tt_pv_bg_title() {
+__tt_pv_bg_credit() {
   local by=${bgby[$tpick]} ref=${bgfrom[$tpick]} url=${bgurl[$tpick]} mark="" sgr=""
   local -i room=$1
   [[ -n $ref && $url == http(s|)://* ]] && __tt_links && mark="⧉ "
-  REPLY=Background${by:+ · $by}${ref:+ · $mark$ref}$2
-  (( ${#REPLY} > room )) && REPLY=Background${by:+ · $by}
-  (( ${#REPLY} > room )) && REPLY=Background
+  REPLY=${by:+by $by}${by:+${ref:+ · }}${ref:+$mark$ref}
+  (( ${#REPLY} > room )) && REPLY=${by:+by $by}
+  (( ${#REPLY} > room )) && REPLY=""
   [[ -n $mark && $REPLY == *"$mark$ref"* ]] || return 0
   (( color )) && [[ -n ${TTHEME_SITE_ANSI[${ref%% *}]} ]] && sgr=$'\e[3'${TTHEME_SITE_ANSI[${ref%% *}]}m
   REPLY=${REPLY/"$mark$ref"/$sgr⧉${sgr:+$'\e[39m'} $'\e]8;;'$url$'\e\\'$ref$'\e]8;;\e\\'}
@@ -363,7 +364,9 @@ __tt_pv_foot() {
     hex=${${=applied}[8]#\#}
     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
+  if (( help == 2 )); then
+    badge=HELP right=$b"any key"$z$d" close"$z
+  elif (( help )); then
     badge=HELP right=$b"? esc"$z$d" close"$z
   elif [[ -n $pick ]]; then
     badge='PREVIEW (APPLY)' lead="$pick →"
@@ -551,7 +554,11 @@ __tt_pv_help() {
     (( hub )) && { hk+=(Screens); hv+=("shift+tab  ·  tab on a series") }
   fi
   hk+=(Close)
-  hv+=("?  esc")
+  if (( help == 2 )); then
+    hv+=("any key  ·  ? brings this back")
+  else
+    hv+=("?  esc")
+  fi
   (( color )) || z= b=
   local -i i r x y w hh
   if (( split && sw >= 48 )); then
@@ -1005,7 +1012,7 @@ __tt_pv_draw() {
   fi
   [[ $1 == hint ]] && (( ! wiped )) || pvz=()
   if (( pw < 40 || ph < 12 )); then
-    line="ttheme preview"
+    line="ttheme"
     (( color )) && line=$'\e[1m'$ac$line$'\e[0m'
     out+=$line$'\e[K\n'"Needs 40×12 — now ${pw}×${ph}"$'\e[K\n'
     line="esc quits"
@@ -1449,6 +1456,7 @@ __tt_pv_bg_track() {
 
 __tt_pv_wheel() {
   local -i i
+  (( help == 2 )) && help=0
   if (( help )); then
     return 0
   elif (( conf )); then
@@ -1493,7 +1501,8 @@ __tt_pv_screen() {
     err=$(TTHEME_HUB=${TTHEME_HUB_TABS[to]} __tt_cli ${TTHEME_HUB_TABS[to]} 2>&1 >/dev/tty)
     rc=$?
     if (( rc == TTHEME_HUB_CLOSED )); then
-      hubleft=1
+      hubleft=1 painted=?
+      __tt_pv_forget
       return 1
     elif (( rc > TTHEME_HUB_SWITCH && rc <= TTHEME_HUB_SWITCH + n )); then
       to=$(( rc - TTHEME_HUB_SWITCH ))
@@ -1535,20 +1544,26 @@ __tt_te_save_image() {
 
 __tt_te_read() {
   local rows
-  rows=$(__tt_cli tone $tename show 2>/dev/null) || return 1
+  local -i wide=${1:-0}
+  if (( ! wide )); then
+    __tt_pv_lw
+    wide=${reply[2]}
+    (( wide )) || wide=$(( pw - 2 < 66 ? pw - 3 : 65 ))
+  fi
+  tewide=$wide
+  rows=$(__tt_cli tone $tename show $wide 2>/dev/null) || return 1
   teframe=("${(@f)rows}")
   return 0
 }
 
 __tt_te_open() {
   local name=$1
-  tename=$name tfocus=0 teframe=() tetop=0 msgt=0
+  tename=$name tfocus=0 teframe=() tetop=0 msgt=0 te=1
   if ! __tt_te_read; then
     msg="Could not read the colors of $name" msgt=300
-    tename=""
+    tename="" te=0
     return 0
   fi
-  te=1
   (( bgcw )) && __tt_pv_bg_state $name && __tt_pv_tune_open $name
   __tt_te_image && __tt_te_to_image 1
   resized=1
@@ -1803,79 +1818,137 @@ __tt_pv_te_ghost() {
   return 0
 }
 
-__tt_pv_te_panel() {
-  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' tt st note REPLY
+__tt_pv_te_edge() {
+  local left=$4 right=$5 sty=$6 hs=$7 head=$8 tail=$9 z=$'\e[0m' line
+  local -i y=$1 col=$2 w=$3 n
+  (( color )) || z=
+  n=$(( w - 3 - (${#head} ? ${#head} + 2 : 0) - (${#tail} ? ${#tail} + 3 : 0) ))
+  (( n < 0 )) && n=0
+  line=$sty$left"─"$z
+  [[ -n $head ]] && line+=$hs" $head "$z
+  line+=$sty${(l:n::─:)}
+  [[ -n $tail ]] && line+=" $tail ─"
+  out+=$'\e['$y';'$col'H'$line$right$z
+}
+
+__tt_pv_te_sides() {
+  local sty=$5 z=$'\e[0m'
+  local -i y r1=$2 col=$3 w=$4
+  (( color )) || z=
+  for (( y = $1; y <= r1; y++ )); do
+    out+=$'\e['$y';'$col'H'$sty"│"$z$'\e['$y';'$(( col + w - 1 ))'H'$sty"│"$z
+  done
+}
+
+__tt_pv_te_images() {
+  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' st="  " tt note="0/0"
   local -a held
-  local -i col=$1 end=$2 r0=$3 r1=$4 R W T=${#teframe} I=3 V i n y tfs=$tf
+  local -i y=$1 col=$2 end=$3 n
+  (( color )) || z= d= b=
+  tt=$d
+  if [[ -n $tune ]]; then
+    held=(${=bgpics[$tune]})
+    n=${held[(Ie)${${tpick#$tune}#:}]}
+    (( n )) || n=${held[(Ie)${bgact[$tune]}]}
+    (( n )) || n=1
+    note="$n/$(( ${#held} ? ${#held} : 1 ))"
+  fi
+  (( tfocus == 1 && tf == 5 )) && st=$ac"▶"$z" " tt=$b
+  out+=$'\e['$y';'$col'H'$st$tt"Images"$z$'\e['$y';'$(( end - ${#note} + 1 ))'H'$d$note$z
+  pvz+=("$y $col $end teimg")
+}
+
+__tt_pv_te_editrow() {
+  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' note="tunes its colors full screen"
+  local -i y=$1 col=$2 end=$3
+  (( color )) || z= d= b=
+  pvz+=("$y $col $end teedit")
+  out+=$'\e['$y';'$(( col + 2 ))'H'
+  if (( tfocus == 0 )); then
+    (( color )) && out+=$ac"▶"$z" "$'\e[7;1m'$ac" Edit palette "$z || out+="▶ [Edit palette]"
+  else
+    (( color )) && out+="  "$b" Edit palette "$z || out+="   Edit palette "
+  fi
+  (( ${#note} > end - col - 21 )) && note=${note[1,end-col-21]}
+  out+="  "$d$note$z
+}
+
+__tt_pv_te_panel() {
+  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' fs hs st note row REPLY
+  local -i col=$1 end=$2 r0=$3 r1=$4 ix=$(( $1 + 2 )) ie=$(( $2 - 2 )) R W T P I=3 V i y pics=0 tfs=$tf
   (( color )) || z= d= b=
   R=$(( r1 - r0 + 1 )) W=$(( end - col + 1 ))
-  [[ -n $tune ]] || __tt_pv_bg_findable $tename && I=17
-  V=$(( I + T + 4 ))
+  (( tewide == W )) || __tt_te_read $W
+  T=${#teframe} P=$(( ${#teframe} + 2 ))
+  __tt_te_image && pics=1
+  (( pics && 18 <= R && (tfocus == 1 || 18 + P + 1 <= R) )) && I=18
+  V=$(( I + P + 1 ))
   if (( V <= R || tfocus == 1 )); then
     tetop=0
   else
     tetop=$(( V - R ))
   fi
+  fs=$d hs=$d
+  (( tfocus == 1 )) && fs=$ac hs=$b$ac
   if (( tetop == 0 && I <= R )); then
     y=$r0
-    tt=$d
-    (( tfocus == 1 )) && tt=$b$ac
-    out+=$'\e['$y';'$(( col + 2 ))'H'$tt"Image"$z
-    pvz+=("$y $col $end teimg")
-    if [[ -n $tune ]]; then
-      (( bgoff[$tpick] )) && st=off || st=on
-      __tt_pv_bg_title $(( W - 12 - ${#st} ))
-      out+="  "$d$REPLY$z$'\e['$y';'$(( end - ${#st} + 1 ))'H'$d$st$z
+    st=""
+    [[ -n $tune ]] && { (( bgoff[$tpick] )) && st=off || st=on }
+    __tt_pv_te_edge $y $col $W ╭ ╮ "$fs" "$hs" Image "$st"
+    __tt_pv_te_sides $(( y + 1 )) $(( y + I - 2 )) $col $W "$fs"
+    __tt_pv_te_edge $(( y + I - 1 )) $col $W ╰ ╯ "$fs"
+    if (( pics )); then
+      for (( i = 0; i < I; i++ )); do
+        pvz+=("$(( y + i )) $col $end teimg")
+      done
     fi
-    if (( I == 17 )); then
-      held=() n=0 note="0/0"
+    if (( I == 18 )); then
       if [[ -n $tune ]]; then
-        held=(${=bgpics[$tune]})
-        n=${held[(Ie)${${tpick#$tune}#:}]}
-        (( n )) || n=${held[(Ie)${bgact[$tune]}]}
-        (( n )) || n=1
-        note="$n/$(( ${#held} ? ${#held} : 1 ))"
+        __tt_pv_bg_credit $(( ie - ix + 1 ))
+        [[ -n $REPLY ]] && out+=$'\e['$(( y + 1 ))';'$ix'H'$d$REPLY$z
       fi
-      st="  " tt=$d
-      (( tfocus == 1 && tf == 5 )) && st=$ac"▶"$z" " tt=$b
-      out+=$'\e['$(( y + 2 ))';'$col'H'$st$tt"Images"$z$'\e['$(( y + 2 ))';'$(( end - ${#note} + 1 ))'H'$d$note$z
-      pvz+=("$(( y + 2 )) $col $end teimg")
+      __tt_pv_te_images $(( y + 2 )) $ix $ie
       if [[ -n $tune ]]; then
-        bgstrip="$(( y + 2 )) $col $end"
+        bgstrip="$(( y + 2 )) $ix $ie"
         (( tfocus == 1 )) || tf=0
-        __tt_pv_bg_panel $tpick $(( y + 9 )) $col $end
+        __tt_pv_bg_panel $tpick $(( y + 9 )) $ix $ie
         tf=$tfs
       else
-        __tt_pv_te_tile $(( y + 3 )) $col
+        __tt_pv_te_tile $(( y + 3 )) $ix
         for (( i = 3; i <= 7; i++ )); do
-          pvz+=("$(( y + i )) $col $(( col + 30 )) tefind")
+          pvz+=("$(( y + i )) $ix $(( ix + 30 )) tefind")
         done
-        __tt_pv_te_ghost $(( y + 9 )) $col $end
+        __tt_pv_te_ghost $(( y + 9 )) $ix $ie
       fi
+    elif (( pics )); then
+      __tt_pv_te_images $(( y + 1 )) $ix $ie
     elif (( bgcw )); then
-      out+=$'\e['$(( y + 2 ))';'$(( col + 2 ))'H'$d"No picture yet"$z
+      out+=$'\e['$(( y + 1 ))';'$ix'H'$d"No picture yet"$z
     else
-      out+=$'\e['$(( y + 2 ))';'$(( col + 2 ))'H'$d"This terminal shows no pictures"$z
+      out+=$'\e['$(( y + 1 ))';'$ix'H'$d"This terminal shows no pictures"$z
     fi
   fi
-  for (( i = 1; i <= T; i++ )); do
-    y=$(( r0 + I + i - tetop ))
+  fs=$d
+  (( tfocus == 0 )) && fs=$ac
+  for (( i = 1; i <= P; i++ )); do
+    y=$(( r0 + I + i - 1 - tetop ))
     (( y >= r0 && y <= r1 )) || continue
-    out+=$'\e['$y';'$col'H'${teframe[i]}$z
-    pvz+=("$y $col $end tepal")
-  done
-  y=$(( r0 + V - 2 - tetop ))
-  if (( y >= r0 && y <= r1 )); then
-    pvz+=("$y $col $end teedit")
-    out+=$'\e['$y';'$col'H'
-    if (( tfocus == 0 )); then
-      (( color )) && out+=$ac"▶"$z" "$'\e[7;1m'$ac" Edit palette "$z || out+="▶ [Edit palette]"
+    if (( i == T )); then
+      __tt_pv_te_edge $y $col $W ├ ┤ "$fs"
+    elif (( i == T + 1 )); then
+      __tt_pv_te_sides $y $y $col $W "$fs"
+      __tt_pv_te_editrow $y $col $end
     else
-      (( color )) && out+="  "$b" Edit palette "$z || out+="   Edit palette "
+      row=${teframe[i == P ? T : i]}
+      if (( tfocus == 0 && color )); then
+        row=${${row//$'\e[2m'/$ac}//$'\e[22m'/$'\e[22;39m'}
+        (( i == 1 )) && row=${row/ Palette /$'\e[1m Palette \e[22m'}
+      fi
+      out+=$'\e['$y';'$col'H'$row$z
+      pvz+=("$y $col $end tepal")
     fi
-    out+="  "$d"tunes its colors full screen"$z
-  fi
-  y=$(( r0 + V - 1 - tetop ))
+  done
+  y=$(( r0 + I + P - tetop ))
   (( y >= r0 && y <= r1 )) || return 0
   pvz+=("$y $col $end teapply")
   if [[ $mode == pin ]]; then
@@ -1885,7 +1958,7 @@ __tt_pv_te_panel() {
   else
     note="saves and wears it in this tab"
   fi
-  out+=$'\e['$y';'$col'H'
+  out+=$'\e['$y';'$ix'H'
   if (( tfocus == 2 )); then
     (( color )) && out+=$ac"▶"$z" "$'\e[7;1m'$ac" Apply "$z || out+="▶ [Apply]"
   else
@@ -1928,9 +2001,11 @@ __tt_pv_handle() {
   if (( help )); then
     case $key in
       $'\x03') return 1 ;;
-      '?'|esc) help=0 ;;
+      '?'|esc) help=0; return 0 ;;
+      nop) return 0 ;;
     esac
-    return 0
+    (( help == 2 )) || return 0
+    help=0
   fi
   if [[ -n $pick ]]; then
     __tt_pv_pick
@@ -2070,7 +2145,7 @@ __tt_preview() {
   local -i hub=0 hubleft=0
   [[ $mode == hub ]] && hub=1
   if [[ ! -t 0 || ! -t 1 ]]; then
-    print -u2 "ttheme ${mode:-preview}: needs a terminal"
+    print -u2 "ttheme $mode: needs a terminal"
     return 1
   fi
   local orig=$TTHEME_SPEC applied=$TTHEME_SPEC painted=$TTHEME_SPEC flt="" sel="" cn="" cdot="" key="" REPLY="" cur=1 top=1 color=0 pw=80 ph=24 resized=1 expal="" exgrp="" exnext=0 gstep=0 gseed=0 tick=0
@@ -2082,7 +2157,7 @@ __tt_preview() {
   local -A bgpic=() bgpics=() bgact=() bgview=() bgswap=() bgthumb=() tsnaps=() pvseek=() bgcolors=() bgprep=() TTHEME_ALIASES=()
   local conf=0 cf=1
   local -a plabel=(" Default " " This tab ") pkeys=() reach=() csnap=() teframe=()
-  local te=0 tfocus=0 tetop=0 tename=""
+  local te=0 tfocus=0 tetop=0 tewide=0 tename=""
   local -i pvgone=0 bgprepid=0 mrow=0 mcol=0 mclick=0 mwheel=0 mlwheel=0 mlrow=0 mlcol=0
   local -F mlast=0
   local mact="" mzone="" pvmouse=""
@@ -2112,6 +2187,8 @@ __tt_preview() {
   __tt_pv_roll
   __tt_pv_rows
   [[ -n ${TTHEME_PALETTE[$cn]} ]] && __tt_pv_goto "$cn"
+  __tt_pv_lw
+  (( reply[2] >= 48 )) && help=2
   local tty=""
   local -i TTHEME_RAW=0
   {

package/shell/ttheme.zsh

@@ -274,7 +274,7 @@ source $TTHEME_HOME/adapters/_wired.zsh
   source $TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh
 
 __tt_empty() {
-  print -u2 'ttheme: no palettes installed yet — run `ttheme browse` to pick some'
+  print -u2 'ttheme: no palettes installed yet — run `ttheme` in a terminal to pick some, or `ttheme add <palette>`'
   return 1
 }
 
@@ -1310,7 +1310,10 @@ __tt_catalog() {
 
 __tt_catalog_done() {
   [[ -r $TTHEME_HOME/palettes.zsh ]] || return 0
-  __tt_palettes_load && __tt_reloaded
+  local was=$TTHEME_PALETTES_AT
+  if __tt_palettes_load && [[ $TTHEME_PALETTES_AT != "$was" ]]; then
+    __tt_reloaded
+  fi
   [[ "$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}" == "$1" ]] && return 0
   __tt_follow "$1"
   __tt_worn_shown
@@ -1471,17 +1474,21 @@ ttheme() {
     __tt_unpainted && __tt_paints || return 1
   fi
   if (( ! $# )); then
-    (( ${#TTHEME_PALETTE} )) || { __tt_empty; return }
     if [[ -t 0 && -t 1 ]]; then
-      __tt_preview hub
+      if (( ${#TTHEME_PALETTE} )); then
+        __tt_preview hub
+      else
+        __tt_catalog browse
+      fi
     else
+      (( ${#TTHEME_PALETTE} )) || { __tt_empty; return }
       __tt_menu
     fi
     return 0
   fi
 
   case $1 in
-    browse|list|add|remove|update|market|new|edit|check|share) __tt_catalog "$@"; return ;;
+    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
@@ -1498,7 +1505,6 @@ ttheme() {
     default)
       __tt_resolve "$2" || return 1
       __tt_keep "$REPLY" ;;
-    preview) __tt_preview ;;
     pin)
       if [[ $2 == ssh:* ]]; then
         REPLY=ssh:${(L)2#ssh:}