@kecan0406/ttheme 1.2.18 → 1.2.19

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "schema": 1,
-  "version": "1.2.18",
+  "version": "1.2.19",
   "gate": [
     {
       "rule": "foreground",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "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, Warp and Konsole",
+  "description": "Character terminal palettes for Ghostty, iTerm2, kitty, Alacritty, WezTerm, Windows Terminal, Warp, Konsole and Terminal.app",
   "license": "MIT",
   "author": "kecan0406",
   "repository": {
@@ -28,20 +28,22 @@
     "alacritty",
     "wezterm",
     "iterm2",
-    "konsole"
+    "konsole",
+    "warp",
+    "windows-terminal"
   ],
   "devDependencies": {
-    "@biomejs/biome": "^2.3.0",
-    "@clack/prompts": "^1.7.0",
+    "@biomejs/biome": "^2.5.15",
+    "@clack/prompts": "^1.8.1",
     "@jsquash/jpeg": "^1.6.0",
     "@material/material-color-utilities": "^0.4.0",
-    "@types/bun": "^1.3.0",
+    "@types/bun": "^1.4.2",
     "@types/pngjs": "6.0.5",
     "@xterm/headless": "6.0.0",
     "fast-string-width": "^3.0.2",
     "pngjs": "7.0.0",
     "smol-toml": "^1.9.0",
-    "typescript": "^5.8.2",
+    "typescript": "^7.0.2",
     "uqr": "^0.1.3"
   },
   "engines": {

package/shell/adapters/_bg.zsh

@@ -476,7 +476,8 @@ __tt_pv_bg_find() {
   __tt_bg_hide $name
   err=$(__tt_cli find $name 2>&1 >/dev/tty)
   rc=$?
-  printf %s "$pvmouse"
+  printf '\e[?2004h%s' "$pvmouse"
+  __tt_pv_size
   for var in ${(k)parameters[(I)TTHEME_FIND_*]}; do
     [[ ${parameters[$var]} == *export* ]] || unset $var
   done

package/shell/adapters/_osc.zsh

@@ -165,7 +165,7 @@ __tt_b64s() {
 
 __tt_ask() {
   setopt localoptions extendedglob
-  local fd saved="" buf="" chunk seqs=$'\e[]_P][^\a\e]#(\a|\e\\\\)|\e\\[[0-?]#[ -/]#[@-~]|\e[^][_P]'
+  local fd saved="" buf="" chunk seq
   local -a match mbegin mend
   REPLY=""
   { exec {fd}<>/dev/tty } 2>/dev/null || return 1
@@ -185,10 +185,26 @@ __tt_ask() {
   [[ -n $saved ]] && stty "$saved" <&$fd 2>/dev/null
   exec {fd}>&-
   [[ $buf == *$'\e[0n'* ]] || __tt_owed
-  while [[ $buf == (#b)([^$'\e']#)(${~seqs})(*) ]]; do
-    TTHEME_TYPED+=$match[1] REPLY+=$match[2] buf=$match[-1]
+  while [[ -n $buf ]]; do
+    if [[ $buf == (#b)([^$'\e']##)(*) ]]; then
+      TTHEME_TYPED+=$match[1] buf=$match[2]
+    elif [[ $buf == (#b)($'\e'[]P_^X][^$'\a\e']#($'\a'|$'\e\\'))(*) ]]; then
+      REPLY+=$match[1] buf=$match[-1]
+    elif [[ $buf == (#b)($'\e['[0-?]#[ -/]#[@-~])(*) ]]; then
+      seq=$match[1] buf=$match[-1]
+      if [[ $seq == *[nt] || $seq == $'\e['[?\>]*c || $seq == *'$y' ]]; then
+        REPLY+=$seq
+      else
+        TTHEME_TYPED+=$seq
+      fi
+    elif [[ $buf == (#b)($'\e'(O?|[^][P_^XO$'\e']))(*) ]]; then
+      TTHEME_TYPED+=$match[1] buf=$match[-1]
+    elif [[ $buf == $'\e\e'* ]]; then
+      TTHEME_TYPED+=$'\e' buf=${buf:1}
+    else
+      break
+    fi
   done
-  [[ $buf == $'\e'* ]] || TTHEME_TYPED+=$buf
   REPLY=${REPLY%$'\e[0n'}
 }
 

package/shell/adapters/ghostty.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 typeset -g TTHEME_GHOSTTY_TABS=$TTHEME_STATE_DIR/ghostty TTHEME_GHOSTTY_FRONT="" TTHEME_GHOSTTY_BLUR="" TTHEME_GHOSTTY_HEARD="" TTHEME_GHOSTTY_CODE=""
 typeset -gF TTHEME_GHOSTTY_ASKED=0 TTHEME_GHOSTTY_WANT=0 TTHEME_GHOSTTY_HUSH=0 TTHEME_GHOSTTY_TOLD=0 TTHEME_GHOSTTY_NONE_AT=0

package/shell/adapters/iterm2.zsh

@@ -1,11 +1,14 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 zmodload -F zsh/datetime p:EPOCHREALTIME 2>/dev/null
 
-if (( ! ${+TTHEME_ITERM_SHOWN} )); then
+() {
+  emulate -L zsh ${=${options[xtrace]:#off}:+-o xtrace}
+  (( ${+TTHEME_ITERM_SHOWN} )) && return 0
   typeset -gx TTHEME_ITERM_SHOWN="" TTHEME_ITERM_DYED=0
   [[ $ITERM_PROFILE == 'ttheme · '* ]] && TTHEME_ITERM_SHOWN=${ITERM_PROFILE#ttheme · }
-fi
+  return 0
+}
 
 __tt_keepable() { return 0 }
 

package/shell/adapters/kitty.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 __tt_follows_focus() { return 0 }
 

package/shell/adapters/konsole.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 zmodload -F zsh/files b:zf_rm b:zf_mkdir 2>/dev/null
 

package/shell/adapters/terminal-app.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 typeset -g TTHEME_TERMINAL_BASE="" TTHEME_TERMINAL_VIEW=""
 typeset -gi TTHEME_TERMINAL_RFD=0 TTHEME_TERMINAL_WFD=0 TTHEME_TERMINAL_PID=0 TTHEME_TERMINAL_VIEWS=0 TTHEME_TERMINAL_RESHAPE=0

package/shell/adapters/warp.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 typeset -g TTHEME_WARP_SETTINGS=$HOME/.warp/settings.toml TTHEME_WARP_THEMES=$HOME/.warp/themes TTHEME_WARP_WORN=""
 typeset -g TTHEME_WARP_TABS=$TTHEME_STATE_DIR/warp TTHEME_WARP_DB="" TTHEME_WARP_ID="" TTHEME_WARP_LAST="" TTHEME_WARP_LOOK="" TTHEME_WARP_SEEN=""

package/shell/adapters/wezterm.zsh

@@ -1,4 +1,4 @@
-source $TTHEME_HOME/adapters/_bg.zsh
+source "$TTHEME_HOME/adapters/_bg.zsh"
 
 typeset -g TTHEME_WEZTERM_SHOWN="" TTHEME_WEZTERM_VIEW=""
 

package/shell/preview.zsh

@@ -288,15 +288,16 @@ __tt_pv_row() {
   fi
   name=${t##*/}
   [[ -n ${TTHEME_CATALOG[$t]} && ${TTHEME_GROUP[$t]} == *@* ]] && ind="     "
+  (( ${TTHEME_TUNED[(Ie)$t]} )) && w=-2
+  (( ${(m)#name} > lw - 17 - ${#ind} + w )) && name="${name[1,lw-18-${#ind}+w]}…"
   __tt_pv_hl "$name" "$base"
   hl=$REPLY
-  if (( ${TTHEME_TUNED[(Ie)$t]} )); then
+  if (( w )); then
     (( color )) && hl+=" "$TTHEME_SGR[warn]"●"$TTHEME_SGR[/warn] || hl+=" ●"
-    w=-2
   fi
   extra=""
   for part in "${(@s:|:)TTHEME_NATIVE_NAMES[$t]}" "${TTHEME_CHARACTER[$t]}" "${(@s:|:)TTHEME_ALIASES[$t]}"; do
-    __tt_pv_alias "$name" "$part"
+    __tt_pv_alias "${t##*/}" "$part"
     [[ -n $REPLY ]] && { extra=$REPLY; break }
   done
   if (( color )); then
@@ -306,7 +307,9 @@ __tt_pv_row() {
     (( w < 1 )) && w=1
     REPLY=$gut$on"$ind$mark $base$hl$r$REPLY${(l:w:: :)}${tstrip[$t]} "$z
   else
-    REPLY="$gut$ind$mark $hl${extra:+  $extra}"
+    w=$(( w + lw - 4 - ${#ind} - ${#name} ))
+    __tt_pv_fit "$extra"
+    REPLY="$gut$ind$mark $hl$REPLY"
   fi
 }
 
@@ -350,10 +353,19 @@ __tt_pv_bar() {
 }
 
 __tt_pv_head() {
-  local b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] z=$TTHEME_SGR[reset] right=$6
+  local b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] z=$TTHEME_SGR[reset] title=$4 sub=$5 right=$6
+  local -i room=$(( $3 - $2 + 1 )) used
   (( color )) || b= d= z=
-  out+=$'\e['$1';'$2'H'$b$gc$4$z
-  [[ -n $5 ]] && out+="  "$d$5$z
+  if (( ${(m)#title} > room )); then
+    while [[ -n $title ]] && (( ${(m)#title} > room - 1 )); do title=${title[1,-2]}; done
+    title+=…
+  fi
+  used=${(m)#title}
+  (( used + 2 + ${(m)#sub} <= room )) || sub=""
+  [[ -n $sub ]] && (( used += 2 + ${(m)#sub} ))
+  (( used + 2 + ${(m)#right} <= room )) || right=""
+  out+=$'\e['$1';'$2'H'$b$gc$title$z
+  [[ -n $sub ]] && out+="  "$d$sub$z
   [[ -n $right ]] && out+=$'\e['$(( $3 - ${(m)#right} + 1 ))'G'$d$right$z
   return 0
 }
@@ -498,6 +510,10 @@ __tt_pv_foot() {
       break
     fi
   done
+  if (( lwid > end )); then
+    __tt_clip "$line" $end
+    line=$REPLY
+  fi
   out+=$line$'\e[K'
   [[ -n $right ]] && out+=$'\e['$(( end - rwid + 1 ))'G'$right
   local -i zc=1 zw
@@ -599,7 +615,7 @@ __tt_pv_specimen() {
   (( ${#sp} >= 20 )) || return 0
   local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] cell hex fore line text piece role tabs="" built="" key="$applied|$painted|$scene|$sw|$sc|$ph"
   local -A rs=(p "" d $TTHEME_SGR[dim] b $TTHEME_SGR[bold])
-  local -i i r=6 cw=4 k n=${#TTHEME_SCENES} at
+  local -i i r=6 cw=4 k n=${#TTHEME_SCENES} at room
   (( n )) || return 0
   if [[ $key == "$pvscene" ]]; then
     out+=$pvscenes
@@ -660,11 +676,17 @@ __tt_pv_specimen() {
     [[ $line == «n»* ]] && (( sw >= 44 )) && continue
     (( r < ph )) || break
     parts=("${(@s:«:)line}")
-    text=$parts[1]
+    text=$parts[1] room=$sw
+    while (( ${(m)#text} > room )); do text=${text[1,-2]}; done
+    (( room -= ${(m)#text} ))
     for piece in "${(@)parts[2,-1]}"; do
+      (( room > 0 )) || break
       role=${piece%%»*}
       [[ $role == [wn] ]] && role=p
-      text+=$z${rs[${role:-p}]}${piece#*»}
+      piece=${piece#*»}
+      while (( ${(m)#piece} > room )); do piece=${piece[1,-2]}; done
+      text+=$z${rs[${role:-p}]}$piece
+      (( room -= ${(m)#piece} ))
     done
     built+=$'\e['$r';'$sc'H'$text$z
     (( ++r ))
@@ -1027,12 +1049,15 @@ __tt_pv_draw() {
   fi
   [[ $1 == hint ]] && (( ! wiped )) || pvz=()
   if (( pw < 40 || ph < 12 )); then
-    line="ttheme"
-    (( color )) && line=$TTHEME_SGR[bold]$ac$line$TTHEME_SGR[reset]
-    out+=$line$'\e[K\n'"Needs 40×12 — now ${pw}×${ph}"$'\e[K\n'
-    line="esc quits"
-    (( color )) && line=$TTHEME_SGR[dim]$line$TTHEME_SGR[reset]
-    out+=$line$'\e[K\e[J'
+    local -a small=(ttheme "Needs 40×12 — now ${pw}×${ph}" "esc quits") paint=("" "" "")
+    (( color )) && paint=($TTHEME_SGR[bold]$ac "" $TTHEME_SGR[dim])
+    for (( k = 1; k <= 3 && k <= ph; k++ )); do
+      line=${small[k]}
+      while (( ${(m)#line} > pw )); do line=${line[1,-2]}; done
+      (( k > 1 )) && out+=$'\n'
+      out+=${paint[k]}$line${paint[k]:+$TTHEME_SGR[reset]}$'\e[K'
+    done
+    out+=$'\e[J'
     __tt_pv_flush
     return 0
   fi
@@ -1100,7 +1125,7 @@ __tt_pv_draw() {
     line=""
     if (( k < h )); then
       if (( ! N )); then
-        (( k == 0 )) && line="   ${dd}No palettes match '$flt'$zz"
+        (( k == 0 )) && { __tt_clip "   ${dd}No palettes match '$flt'$zz" $lw; line=$REPLY }
       elif (( i <= N )); then
         __tt_pv_row $i
         line=$REPLY
@@ -1265,6 +1290,7 @@ __tt_pv_read() {
   if [[ $REPLY != '[' && $REPLY != O ]]; then
     key=nop
     [[ $REPLY == c ]] && key=altc
+    [[ $REPLY == [\]P_^X] ]] && __tt_pv_string
     return 0
   fi
   while __tt_pv_getch 0.05; do
@@ -1286,10 +1312,33 @@ __tt_pv_read() {
     Z) key=stab ;;
     '<'<->';'<->';'<->[Mm]) __tt_pv_sgr $seq ;;
     M) __tt_pv_x10 ;;
+    "200~") __tt_pv_paste ;;
     *) key=nop ;;
   esac
 }
 
+__tt_pv_string() {
+  local prev=""
+  while __tt_pv_getch 0.05; do
+    [[ $REPLY == $'\a' || ( $prev == $'\e' && $REPLY == \\ ) ]] && return 0
+    prev=$REPLY
+  done
+}
+
+__tt_pv_paste() {
+  setopt localoptions extendedglob
+  local text=""
+  key=nop
+  while __tt_pv_getch 0.5; do
+    text+=$REPLY
+    [[ $REPLY == '~' && $text == *$'\e[201~' ]] && break
+  done
+  text=${${text%$'\e[201~'}//[$'\r\n\t']##/ }
+  pasted=${text//[[:cntrl:]]/}
+  [[ -n $pasted ]] && key=paste
+  return 0
+}
+
 __tt_pv_sgr() {
   local -a p=(${(s:;:)${${1#<}%[Mm]}})
   local -i b=$p[1]
@@ -1534,13 +1583,14 @@ __tt_pv_screen() {
       to=$at
     fi
   done
-  printf '\e[?2026h\e[?25l%s' "$pvmouse"
+  printf '\e[?2026h\e[?25l\e[?2004h%s' "$pvmouse"
   if [[ -n $applied ]]; then
     __tt_pv_paint "$applied"
   else
     __tt_osc_reset
     painted=""
   fi
+  __tt_pv_size
   resized=1 bgname="" bgshown="" bgdim=()
   return 0
 }
@@ -1683,7 +1733,8 @@ __tt_te_edit() {
   __tt_bg_hide $name
   err=$(__tt_cli tone $name edit 2>&1 >/dev/tty)
   rc=$?
-  printf %s "$pvmouse"
+  printf '\e[?2004h%s' "$pvmouse"
+  __tt_pv_size
   err=${${err//$'\n'/ }## #}
   resized=1 bgname="" bgshown="" bgdim=()
   if (( rc == 0 )); then
@@ -2052,7 +2103,7 @@ __tt_pv_te_panel() {
   else
     (( color )) && out+="  "$b" Apply "$z || out+="   Apply "
   fi
-  out+="  "$d$note$z
+  (( ${#note} <= end - ix - 10 )) && out+="  "$d$note$z
   return 0
 }
 
@@ -2222,6 +2273,15 @@ __tt_pv_handle() {
       __tt_pv_rows
       __tt_pv_first "$name"
       ;;
+    paste)
+      __tt_pv_lw
+      name=""
+      [[ ${rtype[cur]} == thm ]] && name=${rval[cur]}
+      flt+=${(L)pasted}
+      while [[ -n $flt ]] && (( ${(m)#flt} > reply[1] - 12 )); do flt=${flt[1,-2]}; done
+      __tt_pv_rows
+      __tt_pv_first "$name"
+      ;;
   esac
   return 0
 }
@@ -2248,7 +2308,7 @@ __tt_preview() {
   local te=0 tfocus=0 tetop=0 tewide=0 tbtn=0 tearm=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=""
+  local mact="" mzone="" pvmouse="" pasted=""
   local -a pvz=()
   local -a cvars=(TTHEME_TAB_PALETTE TTHEME_ANNOUNCE TTHEME_FX TTHEME_SORT TTHEME_MOUSE TTHEME_BG_BLUR TTHEME_BG_COLORS) clabel=("New tabs" Announce "Search fx" Sort Mouse Blur Colors)
   local -a cchoice=("off seq" "1 0" "typewriter decode glitch" "abc series" "on off" "0 1 2 3 4" "tone original") cshow=("off seq" "on off" "typewriter decode glitch" "abc series" "on off" "off 1px 2px 3px 4px" "tone original")
@@ -2283,7 +2343,7 @@ __tt_preview() {
     tty=$(stty -g 2>/dev/null) && stty -echo -icanon -ixon min 1 time 0 2>/dev/null || tty=""
     TTHEME_RAW=$(( ${#tty} > 0 ))
     __tt_pv_bg_open
-    printf '\e[?2026h\e[?1049h\e[?7l\e[?25l'
+    printf '\e[?2026h\e[?1049h\e[?7l\e[?25l\e[?2004h'
     __tt_pv_pointer
     while :; do
       printf '\e[?2026h'
@@ -2316,7 +2376,7 @@ __tt_preview() {
       __tt_pv_unpaint
     fi
     __tt_pv_pointer off
-    printf '\e[?7h'
+    printf '\e[?2004l\e[?7h'
     (( hubleft )) || printf '\e[?1049l'
     printf '\e[?25h\e[?2026l'
     [[ -n $tty ]] && stty "$tty" 2>/dev/null

package/shell/ttheme.zsh

@@ -112,7 +112,7 @@ fi
 
 typeset -g TTHEME_CONFIG=${XDG_CONFIG_HOME:-$HOME/.config}/ttheme/config.zsh
 
-[[ -r $TTHEME_CONFIG ]] && source $TTHEME_CONFIG
+[[ -r $TTHEME_CONFIG ]] && source "$TTHEME_CONFIG"
 
 typeset -g TTHEME_PINS_FILE=${TTHEME_CONFIG:h}/pins
 typeset -g TTHEME_PINS_RAW="" TTHEME_PINS_AT=""
@@ -305,10 +305,10 @@ __tt_mend() {
   __tt_apply "$TTHEME_SPEC"
 }
 
-source $TTHEME_HOME/adapters/_osc.zsh
-source $TTHEME_HOME/adapters/_wired.zsh
+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
+  source "$TTHEME_HOME/adapters/$TTHEME_ADAPTER.zsh"
 
 __tt_empty() {
   print -u2 'ttheme: no palettes installed yet — run `ttheme` in a terminal to pick some, or `ttheme add <palette>`'
@@ -729,6 +729,14 @@ __tt_key() {
           C) REPLY=right ;;
           D) REPLY=left ;;
           Z) REPLY=stab ;;
+          "200~")
+            seq=""
+            while read -sk 1 -t 0.5 c; do
+              seq+=$c
+              [[ $c == '~' && $seq == *$'\e[201~' ]] && break
+            done
+            REPLY=nop
+            ;;
           *) REPLY=nop ;;
         esac
       else
@@ -795,7 +803,7 @@ __tt_unpin_choose() {
   chosen=0
   {
     tty=$(stty -g 2>/dev/null && stty -echo -icanon -ixon min 1 time 0 2>/dev/null)
-    print -rn -- $'\e[?25l'
+    print -rn -- $'\e[?25l\e[?2004h'
     while :; do
       __tt_unpin_block $at
       __tt_unpin_paint $n
@@ -811,7 +819,7 @@ __tt_unpin_choose() {
   } always {
     REPLY=$'\r'
     (( n > 1 )) && REPLY+=$'\e['$(( n - 1 ))'A'
-    print -rn -- "$REPLY"$'\e[J\e[?25h'
+    print -rn -- "$REPLY"$'\e[J\e[?2004l\e[?25h'
     [[ -n $tty ]] && stty "$tty" 2>/dev/null
   }
   (( chosen ))
@@ -960,14 +968,15 @@ __tt_map_tip() {
 
 __tt_map_chip() {
   local -a p=(${=TTHEME_PALETTE[$1]})
-  local bg=${p[1]#\#} fg=${p[2]#\#}
+  local bg=${p[1]#\#} fg=${p[2]#\#} name=$1
+  (( ${#name} > $2 )) && name=${name[1,$2-1]}…
   if (( ! color )); then
-    printf -v REPLY '%-*s' $2 "$1"
+    printf -v REPLY '%-*s' $2 "$name"
   elif (( ${#p} >= 20 )); then
     printf -v REPLY "\e[48;2;%d;%d;%d;38;2;%d;%d;%dm %-*s ${TTHEME_SGR[/ink]}" $((16#${bg:0:2})) $((16#${bg:2:2})) $((16#${bg:4:2})) \
-      $((16#${fg:0:2})) $((16#${fg:2:2})) $((16#${fg:4:2})) $2 "$1"
+      $((16#${fg:0:2})) $((16#${fg:2:2})) $((16#${fg:4:2})) $2 "$name"
   else
-    printf -v REPLY "${TTHEME_SGR[dim]} %-*s ${TTHEME_SGR[reset]}" $2 "$1"
+    printf -v REPLY "${TTHEME_SGR[dim]} %-*s ${TTHEME_SGR[reset]}" $2 "$name"
   fi
 }
 
@@ -1110,7 +1119,7 @@ __tt_map_build() {
 
 __tt_map_fit() {
   local b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] y=$TTHEME_SGR[warn] r=$TTHEME_SGR[error] z=$TTHEME_SGR[reset] lab line tag tip note REPLY
-  local -i width=$1 i lvl maxw namew need wr cap
+  local -i width=$1 i lvl maxw namew need wr cap short
   local -a lw=() rw=() cut=()
   (( color )) || b= d= y= r= z=
   reply=()
@@ -1149,11 +1158,16 @@ __tt_map_fit() {
   (( lvl > 3 )) && lvl=3
   cut=()
   if (( need > width )); then
-    cap=0
+    cap=0 short=0
     for (( i = 1; i <= ${#ll}; i++ )); do
       (( rw[i] > cap )) && cap=$rw[i]
+      (( rw[i] && lw[i] - ${(m)#ll[i]} + 1 > short )) && short=$(( lw[i] - ${(m)#ll[i]} + 1 ))
     done
     cap=$(( width - cap ))
+    if (( short > cap )); then
+      short=$(( short - cap > namew - 4 ? namew - 4 : short - cap ))
+      (( short > 0 )) && (( namew -= short, cap += short ))
+    fi
     maxw=0
     for (( i = 1; i <= ${#ll}; i++ )); do
       wr=$(( rw[i] ? cap : width ))
@@ -1202,6 +1216,10 @@ __tt_map_fit() {
       fi
     fi
     while [[ $line == *' ' ]]; do line=${line% }; done
+    if (( need > width )); then
+      __tt_clip "$line" $width
+      line=$REPLY
+    fi
     reply+=("$line")
   done
 }
@@ -1481,7 +1499,7 @@ __tt_next() {
   REPLY=${TTHEME_PALETTE[$TTHEME_ORDER[idx]]}
 }
 
-source $TTHEME_HOME/preview.zsh
+source "$TTHEME_HOME/preview.zsh"
 
 __tt_hook() {
   autoload -Uz add-zsh-hook add-zle-hook-widget