@kecan0406/ttheme 1.0.33 → 1.0.35

package/dist/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.33",
+  "version": "1.0.35",
   "gate": [
     {
       "rule": "foreground",
@@ -46,21 +46,6 @@
     "margin": 0.03,
     "stands": 12
   },
-  "font": {
-    "family": "JetBrainsMono Nerd Font",
-    "size": 14,
-    "codepointMap": [
-      {
-        "range": "U+AC00-U+D7A3",
-        "family": "D2Coding"
-      },
-      {
-        "range": "U+3130-U+318F",
-        "family": "D2Coding"
-      }
-    ]
-  },
-  "shader": "cursor_tail.glsl",
   "palettes": [
     {
       "name": "neutral",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kecan0406/ttheme",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "type": "module",
   "bin": {
     "ttheme": "bin/ttheme.js"
@@ -8,12 +8,10 @@
   "files": [
     "bin",
     "dist/manifest.json",
-    "dist/ghostty/ttheme.conf",
     "shell",
-    "!shell/check.zsh",
-    "ghostty/shaders"
+    "!shell/check.zsh"
   ],
-  "description": "Character terminal palettes for ghostty, kitty, alacritty, wezterm and iTerm2",
+  "description": "Character terminal palettes for Ghostty, kitty, Alacritty, WezTerm, iTerm2, Windows Terminal and Warp",
   "license": "MIT",
   "author": "kecan0406",
   "repository": {

package/shell/adapters/_osc.zsh

@@ -31,6 +31,8 @@ __tt_osc_reset() {
   return 0
 }
 
+__tt_reset_reloaded() { __tt_osc_reset }
+
 __tt_repaint() {
   if [[ -n $TTHEME_SPEC ]]; then
     __tt_apply "$TTHEME_SPEC"

package/shell/adapters/ghostty.zsh

@@ -4,6 +4,19 @@ __tt_keepable() { return 0 }
 
 __tt_bg_shown() { __tt_ghostty_shown }
 
+__tt_reset_reloaded() {
+  local REPLY
+  integer i
+  __tt_osc_reset
+  [[ -n $1 ]] && (( ${TTHEME_TERMINALS[(Ie)ghostty]} && ! TTHEME_TMUX )) || return 0
+  for (( i = 0; i < 20; i++ )); do
+    __tt_query_bg || return 0
+    [[ ${(L)REPLY} == ${(L)1} ]] || return 0
+    sleep 0.05
+    __tt_osc_reset
+  done
+}
+
 __tt_shown() {
   local dir=${TTHEME_CONFIG:h}/backgrounds was REPLY
   __tt_bg_shown
@@ -17,7 +30,7 @@ __tt_shown() {
 __tt_bg_cells() {
   local fd saved resp="" line c v f
   local -i px=2 py=2 fs=0 sc=2
-  for f in ${XDG_CONFIG_HOME:-$HOME/.config}/ghostty/config ${TTHEME_CONFIG:h}/ttheme.conf; do
+  for f in ${XDG_CONFIG_HOME:-$HOME/.config}/ghostty/config; do
     [[ -r $f ]] || continue
     for line in "${(@f)$(<$f)}"; do
       v=${${line#*=}// /}

package/shell/launch-tab.zsh

@@ -8,4 +8,4 @@ if [[ ${TTHEME_TAB_PALETTE:-off} != off ]]; then
   export TTHEME_SPEC=$REPLY
 fi
 
-exec /bin/zsh -l
+exec ${SHELL:-/bin/zsh} -l

package/shell/ttheme.zsh

@@ -12,8 +12,36 @@ __tt_palettes_load() {
 
 __tt_fresh() {
   local -a at
-  zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/palettes.zsh 2>/dev/null || return 0
-  [[ $at[1] == "$TTHEME_PALETTES_AT" ]] || { __tt_palettes_load && __tt_reloaded }
+  local was=$TTHEME_STARTUP
+  if ! zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/palettes.zsh 2>/dev/null; then
+    [[ -e $TTHEME_HOME ]] || __tt_gone
+    return 0
+  fi
+  [[ $at[1] == "$TTHEME_PALETTES_AT" ]] && return 0
+  __tt_palettes_load && __tt_reloaded
+  [[ -n $was && -z $TTHEME_STARTUP && -n $TTHEME_SPEC ]] && __tt_active && __tt_off_here
+}
+
+__tt_gone() {
+  local bg=${TTHEME_SPEC%% *} hook
+  TTHEME_SPEC=
+  __tt_reload
+  __tt_reset_reloaded $bg
+  print -n $'\e[?1004l'
+  for hook in precmd:__tt_fresh precmd:__tt_precmd precmd:__tt_unmux preexec:__tt_preexec preexec:__tt_mux chpwd:__tt_chpwd; do
+    add-zsh-hook -d ${hook%%:*} ${hook#*:}
+  done
+  unfunction ttheme
+}
+
+__tt_off_here() {
+  local bg=${TTHEME_SPEC%% *}
+  TTHEME_SPEC=
+  if __tt_shown "" || [[ $1 == reload ]]; then
+    __tt_reload
+  fi
+  __tt_unshown force
+  __tt_reset_reloaded $bg
 }
 
 if [[ -r $TTHEME_HOME/palettes.zsh ]]; then
@@ -134,7 +162,7 @@ __tt_spec() {
 
 __tt_name_of() { REPLY=${${(k)TTHEME_PALETTE[(re)$1]}:-custom} }
 
-__tt_color() { [[ -t 1 && -z $NO_COLOR ]] }
+__tt_color() { [[ -t 1 && -z $NO_COLOR && $TERM != dumb ]] }
 
 __tt_palette_line() {
   local name=$1 marker=$2
@@ -379,34 +407,60 @@ __tt_menu() {
     [[ $k == $cur ]] && mark=$gutter
     __tt_palette_line "$k" "$mark"
   done
-  printf '\n\033[2mttheme <name> paints this tab · ttheme preview · ttheme help\033[0m\n'
+  printf '\n\033[2mttheme use <palette> paints this tab · ttheme preview · ttheme help\033[0m\n'
 }
 
 __tt_help() {
-  print -r -- 'ttheme — character terminal palettes
+  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'
+}
 
-  ttheme          list every palette, grouped, with previews
-  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 off      open new tabs in the terminal'"'"'s own colors — ttheme on wears the default again
-  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
+__tt_usage() {
+  print -r -- "Usage: ttheme ${${:-$1 $TTHEME_VERB_ARGS[$1]}% }"$'\n\n'"$TTHEME_VERB_ABOUT[$1]"
+}
 
-  ttheme browse   pick palettes from the catalog in a live picker
-  ttheme list     show the catalog, marking what is installed
-  ttheme add      install palettes from the catalog
-  ttheme remove   uninstall palettes
-  ttheme update   refresh the catalog from the registry'
+__tt_verb_help() {
+  if (( ${TTHEME_SHELL_VERBS[(Ie)$1]} )); then
+    __tt_usage $1
+  elif [[ -n $1 && -n ${TTHEME_VERB_ABOUT[$1]} ]]; then
+    __tt_cli $1 --help
+  else
+    __tt_help
+  fi
+}
+
+__tt_misuse() {
+  print -u2 -r -- "ttheme $1: $2"$'\n'
+  __tt_usage $1 >&2
+  return 1
+}
+
+__tt_arity() {
+  local verb=$1
+  shift
+  local -a want=(${=TTHEME_VERB_ARGS[$verb]})
+  local least=${#${(M)want:#\<*}} most=${#want}
+  (( ${#${(M)want:#*...*}} )) && most=$#
+  (( $# >= least )) || { __tt_misuse $verb "missing $want[$# + 1]"; return }
+  (( $# <= most )) || { __tt_misuse $verb "too many arguments: ${argv[most + 1, -1]}"; return }
 }
 
 __tt_cli() {
-  TTHEME_FIND_RATING=$TTHEME_FIND_RATING TTHEME_FIND_BLOCK=$TTHEME_FIND_BLOCK \
-    TTHEME_FIND_POSTS=$TTHEME_FIND_POSTS TTHEME_FIND_SOLO=$TTHEME_FIND_SOLO TTHEME_FIND_ORDER=$TTHEME_FIND_ORDER TTHEME_FIND_SETS=$TTHEME_FIND_SETS \
-    TTHEME_FIND_HOSTS=$TTHEME_FIND_HOSTS TTHEME_FIND_UNBLOCK=$TTHEME_FIND_UNBLOCK TTHEME_FIND_CUTOUTS=$TTHEME_FIND_CUTOUTS TTHEME_FIND_REMOVE_BG=$TTHEME_FIND_REMOVE_BG \
-    node $TTHEME_HOME/ttheme.js "$@"
+  local k
+  local -a pass=()
+  for k in $TTHEME_SETTINGS; do
+    (( $+parameters[$k] )) && pass+=("$k=${(P)k}")
+  done
+  env $pass node $TTHEME_HOME/ttheme.js "$@"
 }
 
 __tt_catalog() {
@@ -421,18 +475,20 @@ __tt_catalog() {
 
 __tt_switch() {
   local spec
-  __tt_catalog $1 || return
-  __tt_active || return 0
+  __tt_cli "$@" || return
+  [[ -r $TTHEME_HOME/palettes.zsh ]] && __tt_palettes_load && __tt_reloaded
+  if ! __tt_active; then
+    __tt_reload
+    return 0
+  fi
   if [[ $1 == off ]]; then
-    __tt_osc_reset
-    TTHEME_SPEC=
-    __tt_shown "" && __tt_reload
-    __tt_unshown force
+    __tt_off_here reload
   elif [[ -n $TTHEME_STARTUP ]]; then
     spec=${TTHEME_PALETTE[$TTHEME_STARTUP]}
     __tt_apply "$spec"
     TTHEME_SPEC=$spec
-    __tt_shown "$TTHEME_STARTUP" force && __tt_reload
+    __tt_shown "$TTHEME_STARTUP" force
+    __tt_reload
   fi
 }
 
@@ -1559,7 +1615,21 @@ __tt_preview() {
 }
 
 ttheme() {
-  if [[ $TTHEME_ADAPTER == warp && $1 != (-h|--help|help|browse|list|add|remove|update|config|default|on|off) ]]; then
+  if (( $# > 1 && ${${argv[2,-1]}[(I)(-h|--help)]} )); then
+    __tt_verb_help $1
+    return
+  fi
+  case $1 in
+    -h|--help) __tt_help; return 0 ;;
+    -V|--version) __tt_cli --version; return ;;
+    help) __tt_verb_help $2; return 0 ;;
+    -*) print -u2 "ttheme: unknown option $1 — see \`ttheme help\`"; return 1 ;;
+  esac
+  if (( $# )) && [[ -z ${TTHEME_VERB_ABOUT[$1]} ]]; then
+    print -u2 "ttheme: unknown command '$1' — see \`ttheme help\`"
+    return 1
+  fi
+  if [[ $TTHEME_ADAPTER == warp && $1 != (browse|list|add|remove|update|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
@@ -1570,41 +1640,43 @@ ttheme() {
   fi
 
   case $1 in
-    -h|--help|help) __tt_help; return 0 ;;
     browse|list|add|remove|update) __tt_catalog "$@"; return ;;
-    config) __tt_config; return ;;
+    on|off) __tt_switch "$@"; return ;;
   esac
-
+  __tt_arity "$@" || return
+  [[ $1 == config ]] && { __tt_config; return }
   (( ${#TTHEME_PALETTE} )) || { __tt_empty; return }
 
+  local REPLY spec
   case $1 in
-    next) __tt_rotate; return ;;
+    use)
+      __tt_resolve "$2" || return 1
+      spec=${TTHEME_PALETTE[$REPLY]}
+      __tt_apply "$spec"
+      TTHEME_SPEC=$spec
+      __tt_shown "$REPLY" force && __tt_reload
+      __tt_announce ;;
+    next) __tt_rotate ;;
     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 ;;
-    on|off) __tt_switch $1; return ;;
-    preview) __tt_preview; return ;;
-    pin) __tt_preview pin; return ;;
-    unpin) __tt_unpin; return ;;
-    -*) print -u2 "ttheme: unknown option $1 — see \`ttheme help\`"; return 1 ;;
+      __tt_keep "$REPLY" ;;
+    preview) __tt_preview ;;
+    pin) __tt_preview pin ;;
+    unpin) __tt_unpin ;;
   esac
-
-  local REPLY
-  __tt_resolve "$1" || return 1
-  local spec=${TTHEME_PALETTE[$REPLY]}
-  __tt_apply "$spec"
-  TTHEME_SPEC=$spec
-  __tt_shown "$REPLY" force && __tt_reload
-  __tt_announce
 }
 
 if (( $+functions[compdef] )); then
   __tt_complete() {
-    (( CURRENT == 2 )) && compadd -- preview next default on off pin unpin config help browse list add remove update
-    compadd -- $TTHEME_ORDER
+    local -a reply
+    if (( CURRENT == 2 )); then
+      compadd -- ${TTHEME_VERBS:#-} help
+    elif [[ $words[2] == remove || ( $words[2] == (use|default) && CURRENT == 3 ) ]]; then
+      compadd -- $TTHEME_ORDER
+    elif [[ $words[2] == add ]]; then
+      reply=(${${${(M)${(f)"$(__tt_cli list --json 2>/dev/null)"}:#*\"name\": *}#*\"name\": \"}%%\"*})
+      compadd -- ${reply:|TTHEME_ORDER}
+    fi
   }
   compdef __tt_complete ttheme
 fi

package/dist/ghostty/ttheme.conf

@@ -1,9 +0,0 @@
-# ttheme — shared font and shader, identical for every palette.
-# Pick colors with:  theme = <palette>
-font-family = JetBrainsMono Nerd Font
-font-size = 14
-font-codepoint-map = U+AC00-U+D7A3=D2Coding
-font-codepoint-map = U+3130-U+318F=D2Coding
-
-custom-shader = ~/.config/ghostty/shaders/cursor_tail.glsl
-custom-shader-animation = true

package/ghostty/shaders/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Sahaj Bhatt
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/ghostty/shaders/README.md

@@ -1,31 +0,0 @@
-# Shaders
-
-Ghostty is the only Tier-1 terminal that runs GLSL, so nothing here applies to
-kitty, Alacritty, WezTerm or iTerm2. A theme picks one with `[ghostty] shader`
-in its TOML; the built config wires it up as `custom-shader`.
-
-Shaders apply to the whole Ghostty instance, not per tab — so switching a tab's
-palette does not switch its shader.
-
-## Included
-
-Both come from [sahaj-b/ghostty-cursor-shaders][sahaj] (MIT — see `LICENSE`).
-
-| File | Effect | Local change |
-|---|---|---|
-| `cursor_tail.glsl` | comet trail behind the cursor | `DURATION` 0.09 → 0.05 (shorter tail) |
-| `ripple_cursor.glsl` | expanding ring on cursor move | fixed `COLOR` → theme cursor via `iCurrentCursorColor` |
-
-Trail length lives in `DURATION` and `MAX_TRAIL_LENGTH` inside the file.
-
-## Not included
-
-These are in use locally but ship no license, so they are not redistributed
-here. Drop them into this directory yourself if you want them:
-
-- `bloom.glsl`, `bloom-subtle.glsl` — [qwerasd205's gist][bloom]
-- `gradient-background.glsl`, `animated-gradient-shader.glsl` — [unkn0wncode][unk]
-
-[sahaj]: https://github.com/sahaj-b/ghostty-cursor-shaders
-[bloom]: https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f
-[unk]: https://github.com/unkn0wncode

package/ghostty/shaders/cursor_tail.glsl

@@ -1,243 +0,0 @@
-// cursor_tail.glsl — from sahaj-b/ghostty-cursor-shaders (MIT).
-// https://github.com/sahaj-b/ghostty-cursor-shaders
-// See LICENSE in this directory. Local change: DURATION tuned.
-
-// sRGB -> Linear conversion (needed because Ghostty passes sRGB values but the shader pipeline operates in linear color space)
-vec3 sRGBToLinear(vec3 c) {
-    return mix(c / 12.92, pow((c + 0.055) / 1.055, vec3(2.4)), step(vec3(0.04045), c));
-}
-
-// --- CONFIGURATION ---
-vec4 TRAIL_COLOR = vec4(sRGBToLinear(iCurrentCursorColor.rgb), iCurrentCursorColor.a); // for custom color: vec4(0.2, 0.6, 1.0, 0.5); (wrap in sRGBToLinear for correct brightness)
-const float DURATION = 0.05; // in seconds
-const float MAX_TRAIL_LENGTH = 0.2;
-const float THRESHOLD_MIN_DISTANCE = 1.5; // min distance to show trail (units of cursor width)
-const float BLUR = 2.0; // blur size in pixels (for antialiasing)
-
-// --- CONSTANTS for easing functions ---
-const float PI = 3.14159265359;
-const float C1_BACK = 1.70158;
-const float C2_BACK = C1_BACK * 1.525;
-const float C3_BACK = C1_BACK + 1.0;
-const float C4_ELASTIC = (2.0 * PI) / 3.0;
-const float C5_ELASTIC = (2.0 * PI) / 4.5;
-const float SPRING_STIFFNESS = 9.0;
-const float SPRING_DAMPING = 0.9;
-
-// --- EASING FUNCTIONS ---
-
-// // Linear
-// float ease(float x) {
-//     return x;
-// }
-
-// // EaseOutQuad
-// float ease(float x) {
-//     return 1.0 - (1.0 - x) * (1.0 - x);
-// }
-
-// // EaseOutCubic
-// float ease(float x) {
-//     return 1.0 - pow(1.0 - x, 3.0);
-// }
-
-
-// // EaseOutQuart
-// float ease(float x) {
-//     return 1.0 - pow(1.0 - x, 4.0);
-// }
-
-// // EaseOutQuint
-// float ease(float x) {
-//     return 1.0 - pow(1.0 - x, 5.0);
-// }
-
-// // EaseOutSine
-// float ease(float x) {
-//     return sin((x * PI) / 2.0);
-// }
-
-// // EaseOutExpo
-// float ease(float x) {
-//     return x == 1.0 ? 1.0 : 1.0 - pow(2.0, -10.0 * x);
-// }
-
-// EaseOutCirc
-float ease(float x) {
-    return sqrt(1.0 - pow(x - 1.0, 2.0));
-}
-
-// // EaseOutBack
-// float ease(float x) {
-//     return 1.0 + C3_BACK * pow(x - 1.0, 3.0) + C1_BACK * pow(x - 1.0, 2.0);
-// }
-
-// // EaseOutElastic
-// float ease(float x) {
-//     return x == 0.0 ? 0.0
-//          : x == 1.0 ? 1.0
-//                     : pow(2.0, -10.0 * x) * sin((x * 10.0 - 0.75) * C4_ELASTIC) + 1.0;
-// }
-
-// Parametric Spring
-// float ease(float x) {
-//     x = clamp(x, 0.0, 1.0);
-//     float decay = exp(-SPRING_DAMPING * SPRING_STIFFNESS * x);
-//     float freq = sqrt(SPRING_STIFFNESS * (1.0 - SPRING_DAMPING * SPRING_DAMPING));
-//     float osc = cos(freq * 6.283185 * x) + (SPRING_DAMPING * sqrt(SPRING_STIFFNESS) / freq) * sin(freq * 6.283185 * x);
-//     return 1.0 - decay * osc;
-// }
-
-float getSdfRectangle(in vec2 p, in vec2 xy, in vec2 b)
-{
-    vec2 d = abs(p - xy) - b;
-    return length(max(d, 0.0)) + min(max(d.x, d.y), 0.0);
-}
-
-// Based on Inigo Quilez's 2D distance functions article: https://iquilezles.org/articles/distfunctions2d/
-// Potencially optimized by eliminating conditionals and loops to enhance performance and reduce branching
-
-float seg(in vec2 p, in vec2 a, in vec2 b, inout float s, float d) {
-    vec2 e = b - a;
-    vec2 w = p - a;
-    vec2 proj = a + e * clamp(dot(w, e) / dot(e, e), 0.0, 1.0);
-    float segd = dot(p - proj, p - proj);
-    d = min(d, segd);
-
-    float c0 = step(0.0, p.y - a.y);
-    float c1 = 1.0 - step(0.0, p.y - b.y);
-    float c2 = 1.0 - step(0.0, e.x * w.y - e.y * w.x);
-    float allCond = c0 * c1 * c2;
-    float noneCond = (1.0 - c0) * (1.0 - c1) * (1.0 - c2);
-    float flip = mix(1.0, -1.0, step(0.5, allCond + noneCond));
-    s *= flip;
-    return d;
-}
-
-float getSdfParallelogram(in vec2 p, in vec2 v0, in vec2 v1, in vec2 v2, in vec2 v3) {
-    float s = 1.0;
-    float d = dot(p - v0, p - v0);
-
-    d = seg(p, v0, v3, s, d);
-    d = seg(p, v1, v0, s, d);
-    d = seg(p, v2, v1, s, d);
-    d = seg(p, v3, v2, s, d);
-
-    return s * sqrt(d);
-}
-
-vec2 normalize(vec2 value, float isPosition) {
-    return (value * 2.0 - (iResolution.xy * isPosition)) / iResolution.y;
-}
-
-float antialising(float distance) {
-	return 1. - smoothstep(0., normalize(vec2(BLUR, BLUR), 0.).x, distance);
-}
-
-float determineIfTopRightIsLeading(vec2 a, vec2 b) {
-    float condition1 = step(b.x, a.x) * step(a.y, b.y); // a.x < b.x && a.y > b.y
-    float condition2 = step(a.x, b.x) * step(b.y, a.y); // a.x > b.x && a.y < b.y
-
-    // if neither condition is met, return 1 (else case)
-    return 1.0 - max(condition1, condition2);
-}
-
-vec2 getRectangleCenter(vec4 rectangle) {
-    return vec2(rectangle.x + (rectangle.z / 2.), rectangle.y - (rectangle.w / 2.));
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord){
-    #if !defined(WEB)
-    fragColor = texture(iChannel0, fragCoord.xy / iResolution.xy);
-    #endif
-
-    // normalization & setup(-1, 1 coords)
-    vec2 vu = normalize(fragCoord, 1.);
-    vec2 offsetFactor = vec2(-.5, 0.5);
-    
-    vec4 currentCursor = vec4(normalize(iCurrentCursor.xy, 1.), normalize(iCurrentCursor.zw, 0.));
-    vec4 previousCursor = vec4(normalize(iPreviousCursor.xy, 1.), normalize(iPreviousCursor.zw, 0.));
-
-    vec2 centerCC = currentCursor.xy - (currentCursor.zw * offsetFactor);
-    vec2 centerCP = previousCursor.xy - (previousCursor.zw * offsetFactor);
-
-    vec2 delta = centerCP - centerCC;
-    float lineLength = length(delta);
-
-     float sdfCurrentCursor = getSdfRectangle(vu, centerCC, currentCursor.zw * 0.5);
-	
-     vec4 newColor = vec4(fragColor);
-	
-     float minDist = currentCursor.w * THRESHOLD_MIN_DISTANCE;
-     float progress = clamp((iTime - iTimeCursorChange) / DURATION, 0.0, 1.0);
-     if (lineLength > minDist) {
-         // ANIMATION logic
-        
-        float head_eased = 0.0;
-        float tail_eased = 0.0;
-
-        float tail_delay_factor = MAX_TRAIL_LENGTH / lineLength;
-
-        float isLongMove = step(MAX_TRAIL_LENGTH, lineLength);
-
-        float head_eased_short = ease(progress);
-        float tail_eased_short = ease(smoothstep(tail_delay_factor, 1.0, progress));
-        float head_eased_long = 1.0;
-        float tail_eased_long = ease(progress);
-
-        head_eased = mix(head_eased_long, head_eased_short, isLongMove);
-        tail_eased = mix(tail_eased_long, tail_eased_short, isLongMove);
-
-        // detect straight moves
-        vec2 delta_abs = abs(centerCC - centerCP); 
-        float threshold = 0.001;
-        float isHorizontal = step(delta_abs.y, threshold);
-        float isVertical = step(delta_abs.x, threshold);
-        float isStraightMove = max(isHorizontal, isVertical);
-
-        // -- Making the parallelogram sdf (diagonal move) --
-
-        // animate the TOP-LEFT corners
-        vec2 head_pos_tl = mix(previousCursor.xy, currentCursor.xy, head_eased);
-        vec2 tail_pos_tl = mix(previousCursor.xy, currentCursor.xy, tail_eased);
-
-        float isTopRightLeading = determineIfTopRightIsLeading(currentCursor.xy, previousCursor.xy);
-        float isBottomLeftLeading = 1.0 - isTopRightLeading;
-        
-        // v0, v1 : "front" of the trail (head)
-        vec2 v0 = vec2(head_pos_tl.x + currentCursor.z * isTopRightLeading, head_pos_tl.y - currentCursor.w);
-        vec2 v1 = vec2(head_pos_tl.x + currentCursor.z * isBottomLeftLeading, head_pos_tl.y);
-        
-        // v2, v3: "back" of the trail (tail)
-        vec2 v2 = vec2(tail_pos_tl.x + currentCursor.z * isBottomLeftLeading, tail_pos_tl.y);
-        vec2 v3 = vec2(tail_pos_tl.x + currentCursor.z * isTopRightLeading, tail_pos_tl.y - previousCursor.w);
-
-        float sdfTrail_diag = getSdfParallelogram(vu, v0, v1, v2, v3);
-
-        // -- Making the rectangle sdf (straight move) --
-
-        vec2 head_center = mix(centerCP, centerCC, head_eased);
-        vec2 tail_center = mix(centerCP, centerCC, tail_eased);
-
-        vec2 min_center = min(head_center, tail_center);
-        vec2 max_center = max(head_center, tail_center);
-        
-        vec2 box_size = (max_center - min_center) + currentCursor.zw;
-        vec2 box_center = (min_center + max_center) * 0.5;
-
-        float sdfTrail_rect = getSdfRectangle(vu, box_center, box_size * 0.5);
-
-        // -- FINAL SELECTING AND DRAWING --
-        float sdfTrail = mix(sdfTrail_diag, sdfTrail_rect, isStraightMove);
-        
-        vec4 trail = TRAIL_COLOR;
-        float trailAlpha = antialising(sdfTrail);
-        newColor = mix(newColor, trail, trailAlpha);
-
-        // punch hole
-        newColor = mix(newColor, fragColor, step(sdfCurrentCursor, 0.));
-    }
-
-    fragColor = newColor;
-}