@kecan0406/ttheme 0.1.3 → 0.1.5

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.3",
+  "version": "0.1.5",
   "gate": [
     {
       "rule": "foreground",

package/dist/shell/palettes.zsh

@@ -1,13 +1,13 @@
 # Generated by `mise run build` — do not edit.
 # Source of truth: themes/*.toml in the ttheme repo.
 
-typeset -g TTHEME_VERSION=0.1.3
+typeset -g TTHEME_VERSION=0.1.5
 
 # seed for `ttheme config` when no config.zsh exists yet
 typeset -g TTHEME_CONFIG_TEMPLATE='# ttheme settings — exported variables win over this file
 
-# new tabs: seq rotates through the palettes, off keeps the configured terminal theme (default seq)
-: ${TTHEME_TAB_PALETTE:=seq}
+# new tabs: off keeps the configured terminal theme, seq rotates through the palettes (default off)
+: ${TTHEME_TAB_PALETTE:=off}
 
 # the palette notice under "Last login:": 1 shows it, 0 silences it (default 1)
 : ${TTHEME_ANNOUNCE:=1}

package/package.json

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

package/shell/adapters/_osc.zsh

@@ -30,6 +30,10 @@ __tt_pv_bg_findable() { return 1 }
 
 __tt_pv_bg_find() { return 1 }
 
+__tt_pv_bg_images() { REPLY=1 }
+
+__tt_pv_bg_image() { : }
+
 __tt_pv_bg_panel() { : }
 
 __tt_pv_bg_close() { : }

package/shell/adapters/ghostty.zsh

@@ -420,6 +420,32 @@ __tt_pv_bg_find() {
   return 0
 }
 
+__tt_pv_bg_images() {
+  local -a shelf=(${TTHEME_CONFIG:h}/backgrounds/shelf/$1/*(N/))
+  REPLY=$(( ${#shelf} + 1 ))
+}
+
+__tt_pv_bg_image() {
+  local name=$tune act=$1 err REPLY
+  local -i rc
+  if [[ $act != drop ]]; then
+    __tt_pv_bg_images $name
+    (( REPLY > 1 )) || { msg="$name has one image" msgt=200; return 0 }
+  fi
+  __tt_pv_untune
+  __tt_pv_bg_close
+  err=$(__tt_cli image $name $act 2>&1)
+  rc=$?
+  err=${${err//$'\n'/ }## #}
+  resized=1 bgname="" bgshown="" bgsent=() bgdim=()
+  unset "bgsrc[$name]"
+  __tt_bg_load $name
+  bgload[$name]="" bgedit[$name]=1
+  msg=${err:-"background · $name"} msgt=$(( rc ? 300 : 200 ))
+  [[ -r ${TTHEME_CONFIG:h}/backgrounds/$name.conf ]] || return 0
+  tune=$name tf=1 tsnap="${bgsize[$name]} ${bgpos[$name]} ${bgop[$name]} ${bgoff[$name]}"
+}
+
 __tt_pv_bg_panel() {
   local name=$1 z=$'\e[0m' b=$'\e[1m' d=$'\e[2m' c=$ac val sty REPLY
   local -a labs=(size position opacity) at=(0 3 6)

package/shell/launch-tab.zsh

@@ -2,7 +2,7 @@
 
 source ${0:A:h}/ttheme.zsh
 
-if [[ ${TTHEME_TAB_PALETTE:-seq} != off ]]; then
+if [[ ${TTHEME_TAB_PALETTE:-off} != off ]]; then
   __tt_next
   __tt_apply "$REPLY"
   export TTHEME_SPEC=$REPLY

package/shell/ttheme.zsh

@@ -36,7 +36,7 @@ __tt_pins_load() {
 
 __tt_pins_load
 
-: ${TTHEME_TAB_PALETTE:=seq}
+: ${TTHEME_TAB_PALETTE:=off}
 
 : ${TTHEME_ANNOUNCE:=1}
 
@@ -143,6 +143,7 @@ __tt_dir_sync() {
     spec=${TTHEME_PALETTE[$TTHEME_PINS[$REPLY]]}
   elif [[ $TTHEME_SPEC == "$TTHEME_PIN_SPEC" ]]; then
     spec=$TTHEME_BASE_SPEC
+    [[ -n $spec ]] || { __tt_osc_reset; TTHEME_SPEC= }
   fi
   TTHEME_PIN=$REPLY TTHEME_PIN_SPEC=$spec
   [[ -n $spec && $spec != "$TTHEME_SPEC" ]] || return 0
@@ -225,11 +226,16 @@ __tt_unpin() {
 
 __tt_keep() {
   __tt_cli default "$1" > /dev/null || return 1
-  __tt_reload
+  local note="default · new tabs open with $1"
+  if (( $+functions[__tt_reload] )); then
+    __tt_reload
+  else
+    note+=" — reload your terminal config to pick it up"
+  fi
   if __tt_color; then
-    printf '\033[2mdefault · new tabs open with %s\033[0m\n' "$1"
+    printf '\033[2m%s\033[0m\n' "$note"
   else
-    print -r -- "default · new tabs open with $1"
+    print -r -- "$note"
   fi
 }
 
@@ -281,6 +287,7 @@ __tt_help() {
   ttheme homura   paint this tab (a unique prefix works: ttheme ho)
   ttheme preview  browse live — focus repaints, enter keeps (this tab or default), esc restores, ? lists keys
   ttheme next     advance this tab to the next palette
+  ttheme default  make a palette the one new tabs open with
   ttheme pin      pick a palette for this directory — cd into it repaints, cd out restores
   ttheme unpin    drop the palette pinned to this directory
   ttheme config   edit settings in $EDITOR — they apply in new tabs
@@ -383,10 +390,6 @@ __tt_next() {
 }
 
 __tt_rotate() {
-  if [[ $TTHEME_TAB_PALETTE == off ]]; then
-    print -u2 "ttheme next: TTHEME_TAB_PALETTE is off"
-    return 1
-  fi
   local REPLY
   __tt_next
   __tt_apply "$REPLY"
@@ -583,9 +586,9 @@ __tt_pv_head() {
 
 __tt_pv_foot() {
   setopt localoptions extendedglob
-  local b=$'\e[1m' d=$'\e[2m' z=$'\e[0m' y=$'\e[33m' on=$'\e[7;1m'$ac badge="" lead="" note="" right="" line plain
+  local b=$'\e[1m' d=$'\e[2m' z=$'\e[0m' y=$'\e[33m' on=$'\e[7;1m'$ac badge="" lead="" note="" right="" text line plain
   local -a kk=() kl=() seg=()
-  local -i end=$1 i lwid rwid
+  local -i end=$1 i lwid rwid room
   (( color )) || b= d= z= y= on=
   if (( help )); then
     badge=KEYS right=$b"? esc"$z$d" close"$z
@@ -617,6 +620,8 @@ __tt_pv_foot() {
     fi
     kk+=(space '=' enter)
     if (( bgoff[$tune] )); then kl+=(show default keep); else kl+=(hide default keep); fi
+    __tt_pv_bg_images $tune
+    (( REPLY > 1 )) && { kk+=(', .' D); kl+=("image ×$REPLY" remove) }
     __tt_pv_bg_findable $tune && { kk+=(f); kl+=(find) }
     right=$b"esc"$z$d" undo"$z
   elif (( conf )); then
@@ -651,7 +656,13 @@ __tt_pv_foot() {
     fi
   fi
   if (( msgt > 0 )) && [[ -z $pick ]]; then
-    lead=$y$msg$z note="" kk=() kl=()
+    text=$msg
+    room=$(( end - (${#badge} ? ${#badge} + 4 : 0) ))
+    if (( ${(m)#text} > room )); then
+      while [[ -n $text ]] && (( ${(m)#text} > room - 1 )); do text=${text[1,-2]}; done
+      text+=…
+    fi
+    lead=$y$text$z note="" kk=() kl=()
   fi
   while :; do
     seg=()
@@ -700,8 +711,8 @@ __tt_pv_help() {
     "enter  ·  esc restores $back"
   )
   if (( bgcw )); then
-    hk+=("tune bg" "" "" "")
-    hv+=("tab  ·  finds one on the boorus if none" "↑↓ field  ←→ step  ⇧←→ ×10  1-9 place" "space hides  ·  = default  ·  f replaces" "enter keeps  ·  esc undoes")
+    hk+=("tune bg" "" "" "" "")
+    hv+=("tab  ·  finds one on the boorus if none" "↑↓ field  ←→ step  ⇧←→ ×10  1-9 place" "space hides  ·  = default  ·  f adds one" "enter keeps  ·  esc undoes" ",  .  other saved images  ·  D removes this one")
   fi
   hk+=(config "")
   hv+=("alt-c  ·  ↑↓ setting  ←→ value" "enter saves  ·  esc undoes")
@@ -782,6 +793,9 @@ __tt_pv_tune() {
       ;;
     ' ') __tt_pv_bg_adjust on ;;
     '=') __tt_pv_bg_adjust def ;;
+    ',') __tt_pv_bg_image prev ;;
+    '.') __tt_pv_bg_image next ;;
+    D) __tt_pv_bg_image drop ;;
     f)
       __tt_pv_bg_findable $tune || return 0
       name=$tune
@@ -1344,7 +1358,7 @@ __tt_preview() {
   local conf=0 cf=1
   local -a plabel=(" this tab " " default ") csnap=()
   local -a cvars=(TTHEME_TAB_PALETTE TTHEME_ANNOUNCE TTHEME_FX TTHEME_SORT) clabel=("new tabs" announce "search fx" sort)
-  local -a cchoice=("seq off" "1 0" "typewriter decode glitch" "abc series") cshow=("seq off" "on off" "typewriter decode glitch" "abc series")
+  local -a cchoice=("off seq" "1 0" "typewriter decode glitch" "abc series") cshow=("off seq" "on off" "typewriter decode glitch" "abc series")
   local -A cnote=(
     seq "new tabs rotate through palettes" off "new tabs keep the terminal theme"
     1 "shows the palette notice" 0 "silences the palette notice"
@@ -1421,6 +1435,12 @@ ttheme() {
 
   case $1 in
     next) __tt_rotate; return ;;
+    default)
+      [[ -n $2 ]] || { print -u2 "ttheme default: name a palette — see \`ttheme help\`"; return 1 }
+      local REPLY
+      __tt_resolve "$2" || return 1
+      __tt_keep "$REPLY"
+      return ;;
     preview) __tt_preview; return ;;
     pin) __tt_preview pin; return ;;
     unpin) __tt_unpin; return ;;
@@ -1437,7 +1457,7 @@ ttheme() {
 
 if (( $+functions[compdef] )); then
   __tt_complete() {
-    (( CURRENT == 2 )) && compadd -- preview next pin unpin config help browse list add remove update
+    (( CURRENT == 2 )) && compadd -- preview next default pin unpin config help browse list add remove update
     compadd -- $TTHEME_ORDER
   }
   compdef __tt_complete ttheme
@@ -1453,9 +1473,6 @@ if __tt_active; then
         for k in ${(k)TTHEME_PALETTE}; do
           [[ ${TTHEME_PALETTE[$k]%% *} == "$REPLY" ]] && { TTHEME_SPEC=$TTHEME_PALETTE[$k]; break }
         done
-        [[ -n $TTHEME_SPEC ]] || TTHEME_SPEC="$REPLY ${TTHEME_PALETTE[neutral]#* }"
-      else
-        TTHEME_SPEC="- ${TTHEME_PALETTE[neutral]#* }"
       fi
     else
       __tt_next