@kecan0406/ttheme 1.2.18 → 1.2.20

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