@kecan0406/ttheme 1.0.43 → 1.0.45

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.43",
+  "version": "1.0.45",
   "gate": [
     {
       "rule": "foreground",

package/package.json

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

package/shell/adapters/_bg.zsh

@@ -6,7 +6,7 @@ __tt_ghostty_shown() {
   [[ -r $f ]] || return 1
   REPLY=${${"$(<$f)"}##*\?}
   REPLY=${REPLY%.conf}
-  REPLY=${REPLY/--//}
+  REPLY=${${REPLY/--/@}/--//}
 }
 
 __tt_put() {
@@ -92,7 +92,7 @@ __tt_bg_path() {
 }
 
 __tt_bg_load() {
-  local name=$1 file=${1/\//--} dir=${TTHEME_CONFIG:h}/backgrounds img="" fit=contain op=1 pos=center f line stem="" size=100 REPLY
+  local name=$1 file=${${1/@/--}/\//--} dir=${TTHEME_CONFIG:h}/backgrounds img="" fit=contain op=1 pos=center f line stem="" size=100 REPLY
   local -i at=5
   local -a fills lines
   (( ${+bgsrc[$name]} )) && return 0
@@ -189,7 +189,7 @@ __tt_bg_bake() {
 }
 
 __tt_bg_include() {
-  local file=${1/\//--}
+  local file=${${1/@/--}/\//--}
   local conf=${TTHEME_CONFIG:h}/backgrounds/$file.conf line
   local -a lines=() add=()
   [[ -r $conf ]] && lines=("${(@f)$(<$conf)}")
@@ -205,7 +205,7 @@ __tt_bg_write() {
   local pos=${TTHEME_BG_POSITIONS[${bgpos[$1]}]}
   local -i W=$(( (pw + 2 * bgmx) * bgcw )) H=$(( (ph + 2 * bgmy) * bgch ))
   local -a wh fr
-  [[ -r $dir/${name/\//--}.conf ]] || return 0
+  [[ -r $dir/${${name/@/--}/\//--}.conf ]] || return 0
   __tt_bg_include $name || return 1
   if [[ "$size ${bgpos[$1]} ${bgop[$1]}" == "${bgdef[$1]}" ]]; then
     rm -f -- $dir/${bgtunef[$1]}
@@ -449,7 +449,7 @@ __tt_pv_bg_image() {
   __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
+  [[ -r ${TTHEME_CONFIG:h}/backgrounds/${${name/@/--}/\//--}.conf ]] || return 0
   tune=$name tf=1 tsnap="${bgsize[$name]} ${bgpos[$name]} ${bgop[$name]} ${bgoff[$name]}"
 }
 
@@ -527,7 +527,7 @@ __tt_pv_bg_save() {
       continue
     fi
     saved+=($name)
-    if [[ ! -r ${TTHEME_CONFIG:h}/backgrounds/${name/\//--}.conf ]]; then
+    if [[ ! -r ${TTHEME_CONFIG:h}/backgrounds/${${name/@/--}/\//--}.conf ]]; then
       msg="background · $name none"
     elif (( bgoff[$name] )); then
       msg="background · $name off"

package/shell/adapters/ghostty.zsh

@@ -22,9 +22,9 @@ __tt_shown() {
   __tt_bg_shown
   was=$REPLY
   [[ $was == $1 ]] && return 1
-  [[ -r $dir/${1/\//--}.conf || ( -n $was && -r $dir/${was/\//--}.conf ) ]] || return 1
+  [[ -r $dir/${${1/@/--}/\//--}.conf || ( -n $was && -r $dir/${${was/@/--}/\//--}.conf ) ]] || return 1
   [[ -d $dir ]] || mkdir -p $dir || return 1
-  __tt_put $dir/shown.conf "config-file = ?${1/\//--}.conf"
+  __tt_put $dir/shown.conf "config-file = ?${${1/@/--}/\//--}.conf"
 }
 
 __tt_bg_cells() {

package/shell/adapters/iterm2.zsh

@@ -20,7 +20,7 @@ __tt_shown() {
   __tt_bg_shown
   was=$REPLY
   [[ $2 != force && $was == $1 ]] && return 1
-  [[ -r $dir/${1/\//--}.conf || ( -n $was && -r $dir/${was/\//--}.conf ) ]] || (( TTHEME_MUXED )) || return 1
+  [[ -r $dir/${${1/@/--}/\//--}.conf || ( -n $was && -r $dir/${${was/@/--}/\//--}.conf ) ]] || (( TTHEME_MUXED )) || return 1
   (( ${TTHEME_ORDER[(Ie)$1]} )) || return 1
   __tt_out $'\e]1337;SetProfile=ttheme · '$1$'\a'
   TTHEME_ITERM_SHOWN=$1

package/shell/ttheme.zsh

@@ -404,6 +404,7 @@ __tt_menu() {
   for k in $reply; do
     grp=${TTHEME_GROUP[$k]:-Other}
     if [[ $grp != $last_grp ]]; then
+      [[ $grp == *@* && $last_grp != *@* && -n $last_grp ]] && printf '\033[2m── markets ──────────\033[0m\n'
       printf '\033[1m%s\033[0m' "$grp"
       [[ -n ${TTHEME_NATIVE[$k]} ]] && printf ' \033[2m%s\033[0m' "${TTHEME_NATIVE[$k]}"
       printf '\n'
@@ -417,17 +418,11 @@ __tt_menu() {
 }
 
 __tt_help() {
-  local v
-  print -r -- $'ttheme — character terminal palettes\n'
-  print -r -- "  ${(r:16:):-ttheme}list every palette, grouped, with previews"
-  for v in $TTHEME_VERBS; do
-    if [[ $v == - ]]; then
-      print
-    else
-      print -r -- "  ${(r:16:)${:-ttheme $v}}$TTHEME_VERB_ABOUT[$v]"
-    fi
-  done
-  print -r -- $'\nttheme <command> --help describes one command · ttheme --version prints the version'
+  if [[ $1 == all ]]; then
+    print -r -- $TTHEME_HELP_ALL
+  else
+    print -r -- $TTHEME_HELP
+  fi
 }
 
 __tt_usage() {
@@ -435,7 +430,9 @@ __tt_usage() {
 }
 
 __tt_verb_help() {
-  if (( ${TTHEME_SHELL_VERBS[(Ie)$1]} )); then
+  if [[ -z $1 || $1 == all ]]; then
+    __tt_help $1
+  elif (( ${TTHEME_SHELL_VERBS[(Ie)$1]} )); then
     __tt_usage $1
   elif [[ -n $1 && -n ${TTHEME_VERB_ABOUT[$1]} ]]; then
     __tt_cli $1 --help
@@ -472,7 +469,7 @@ __tt_cli() {
 __tt_catalog() {
   local was
   __tt_cli "$@" || return
-  [[ $1 == (list|share|submit) ]] && return 0
+  [[ $1 == (list|share|market) ]] && return 0
   [[ -r $TTHEME_HOME/palettes.zsh ]] || return 0
   was="$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}"
   __tt_palettes_load && __tt_reloaded
@@ -593,7 +590,7 @@ __tt_rotate() {
 
 __tt_pv_rows() {
   rtype=() rval=() rcnt=()
-  local g t gm
+  local g t gm ruled=""
   local -a ts
   for g in $groups; do
     ts=()
@@ -603,6 +600,10 @@ __tt_pv_rows() {
       [[ -z $flt || -n $gm || $t == *$flt* ]] && ts+=($t)
     done
     [[ -n $flt ]] && (( ! ${#ts} )) && continue
+    if [[ $g == *@* && -z $ruled ]]; then
+      ruled=1
+      (( ${#rtype} )) && { rtype+=(rule); rval+=(''); rcnt+=(0) }
+    fi
     rtype+=(hdr); rval+=($g); rcnt+=(${#ts})
     if [[ -n $flt || -n ${exp[$g]} ]]; then
       for t in $ts; do rtype+=(thm); rval+=($t); rcnt+=(0); done
@@ -737,6 +738,11 @@ __tt_pv_row() {
   local -i w
   (( color )) || b= d= r= z= lead=
   (( $1 == cur && color )) && on=$sb
+  if [[ ${rtype[$1]} == rule ]]; then
+    name='── markets '
+    REPLY=$d$name${(l:lw - 2 - ${#name}::─:)}$z
+    return 0
+  fi
   if [[ ${rtype[$1]} == hdr ]]; then
     [[ -n $flt || -n ${exp[$t]} ]] && arrow=▾
     name=$t
@@ -1483,8 +1489,8 @@ __tt_pv_handle() {
         __tt_pv_toggle
       fi
       ;;
-    up) (( cur > 1 )) && cur=$(( cur - 1 )) ;;
-    down) (( cur < ${#rval} )) && cur=$(( cur + 1 )) ;;
+    up) (( cur > 1 )) && cur=$(( cur - 1 )); [[ ${rtype[cur]} == rule ]] && cur=$(( cur - 1 )) ;;
+    down) (( cur < ${#rval} )) && cur=$(( cur + 1 )); [[ ${rtype[cur]} == rule ]] && cur=$(( cur + 1 )) ;;
     right) [[ ${rtype[cur]} == hdr && -z ${exp[${rval[cur]}]} ]] && __tt_pv_toggle ;;
     left) __tt_pv_left ;;
     home) cur=1 ;;
@@ -1492,11 +1498,13 @@ __tt_pv_handle() {
     pgup)
       cur=$(( cur - ph + 5 ))
       (( cur < 1 )) && cur=1
+      [[ ${rtype[cur]} == rule ]] && cur=$(( cur - 1 ))
       ;;
     pgdn)
       cur=$(( cur + ph - 5 ))
       (( cur > ${#rval} )) && cur=${#rval}
       (( cur < 1 )) && cur=1
+      [[ ${rtype[cur]} == rule ]] && cur=$(( cur + 1 ))
       ;;
     ' ') [[ ${rtype[cur]} == hdr ]] && __tt_pv_toggle ;;
     $'\t')
@@ -1635,7 +1643,7 @@ ttheme() {
     print -u2 "ttheme: unknown command '$1' — see \`ttheme help\`"
     return 1
   fi
-  if [[ $TTHEME_ADAPTER == warp && $1 != (browse|list|add|remove|update|new|edit|check|share|submit|config|default|on|off) ]]; then
+  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"
     return 1
   fi
@@ -1646,7 +1654,7 @@ ttheme() {
   fi
 
   case $1 in
-    browse|list|add|remove|update|new|edit|check|share|submit) __tt_catalog "$@"; return ;;
+    browse|list|add|remove|update|market|new|edit|check|share) __tt_catalog "$@"; return ;;
     on|off) __tt_switch "$@"; return ;;
   esac
   __tt_arity "$@" || return
@@ -1676,13 +1684,19 @@ if (( $+functions[compdef] )); then
   __tt_complete() {
     local -a reply
     if (( CURRENT == 2 )); then
-      compadd -- ${TTHEME_VERBS:#-} help
-    elif [[ $words[2] == remove || ( $words[2] == (use|default|edit|check|share|submit) && CURRENT == 3 ) ]]; then
+      compadd -- $TTHEME_VERBS help
+    elif [[ $words[2] == remove || ( $words[2] == (use|default|edit|check|share) && CURRENT == 3 ) ]]; then
       compadd -- $TTHEME_ORDER
     elif [[ $words[2] == new && $words[CURRENT-1] == --from ]]; then
       compadd -- $TTHEME_ORDER
+    elif [[ $words[2] == new && $words[CURRENT-1] == --in ]]; then
+      _files -/
     elif [[ $words[2] == new ]]; then
-      compadd -- --from
+      compadd -- --from --in
+    elif [[ $words[2] == market && CURRENT == 3 ]]; then
+      compadd -- add remove search init
+    elif [[ $words[2] == market && $words[3] == (add|init) && CURRENT == 4 ]]; then
+      _files -/
     elif [[ $words[2] == add ]]; then
       reply=(${${${(M)${(f)"$(__tt_cli list --json 2>/dev/null)"}:#*\"name\": *}#*\"name\": \"}%%\"*})
       compadd -- ${reply:|TTHEME_ORDER}