Revive drawing capabilities (new and improved!)

Makefile

@@ -115,16 +115,17 @@ kill-folk:
 	fi
 
 FOLK_REMOTE_NODE ?= folk-live
+FOLK_SYNC_IGNORES ?= $(shell git rev-parse --git-path ignores.tmp 2>/dev/null || printf '%s\n' .git/ignores.tmp)
 
 sync:
 	ssh $(FOLK_REMOTE_NODE) -t \
 		'cd ~/folk && git init > /dev/null && git ls-files --exclude-standard -oi --directory' \
-		> .git/ignores.tmp || true
-	git ls-files --exclude-standard -oi --directory >> .git/ignores.tmp
+		> '$(FOLK_SYNC_IGNORES)' || true
+	git ls-files --exclude-standard -oi --directory >> '$(FOLK_SYNC_IGNORES)'
 	rsync --timeout=15 -e "ssh -o StrictHostKeyChecking=no" \
 		--archive --delete --itemize-changes \
 		--exclude='/.git' \
-		--exclude-from='.git/ignores.tmp' \
+		--exclude-from='$(FOLK_SYNC_IGNORES)' \
 		--exclude='vendor/tracy/public/TracyClient.o' \
 		--include='vendor/tracy/public/***' \
 		--exclude='vendor/tracy/*' \

README.md

@@ -517,7 +517,7 @@ Use it in an animation:
 
 ```
 When the clock time is /t/ {
-  Wish $this draws a circle with offset [list [expr {sin($t) * 50}] 0]
+  Wish $this draws a circle with offset [list [expr {sin($t) * 0.05}] 0] radius 0.012
 }
 ```
 

builtin-programs/decorations/label.folk

@@ -1,35 +1,46 @@
-When /thing/ has resolved geometry /geom/ {
+fn drawLabelMaxLineLength {text} {
+    set maxLength 0
+    foreach line [split $text "\n"] {
+        set lineLength [string length $line]
+        if {$lineLength > $maxLength} {
+            set maxLength $lineLength
+        }
+    }
+    return $maxLength
+}
+
+fn drawLabelDefaultScale {text} {
+    set maxLength [drawLabelMaxLineLength $text]
+    if {$maxLength == 0} { return 0.02 }
+    ::math::min 0.02 [/ 0.45 $maxLength]
+}
+
+fn drawLabelDefaultOptions {text width height} {
+    set scale [drawLabelDefaultScale $text]
+    set position [lmap value [list [expr {$width / 2.0}] [expr {$height / 2.0}]] {
+        format "%sm" $value
+    }]
+    dict create \
+        position $position \
+        scale [format "%sm" $scale] \
+        anchor center \
+        font "PTSans-Regular"
+}
+
+When display /disp/ has width /displayWidth/ height /displayHeight/ &\
+     /thing/ has physical drawing surface /surface/ with width /width/ height /height/ space /space/ &\
+     /disp/ has canvas projection for surface /surface/ /surfaceToClip/ {
     When the collected results for [list /someone/ wishes $thing is labelled /text/ with /...options/] are /results/ {
         set text [join [lmap result $results {dict get $result text}] "\n"]
         if {$text eq ""} { return }
 
-        # Split text into lines and find the longest line.
-        set lines [split $text "\n"]
-        set maxLength 0
-        foreach line $lines {
-            set lineLength [string length $line]
-            if {$lineLength > $maxLength} {
-                set maxLength $lineLength
-            }
-        }
-
-        # Set default scale based on longest line length.
-        # Scale inversely with length to keep text readable.
-        set defaultScale [::math::min 0.02 [/ 0.45 $maxLength]]
-
-        set x [/ $geom(width) 2.0]
-        try {
-            set y $($geom(top) + $geom(tagSize) + $geom(bottom)/2.0)
-        } on error e {
-            set y [/ $geom(height) 2.0]
+        set options [drawLabelDefaultOptions $text $width $height]
+        foreach result $results {
+            set options [dict merge $options [dict get $result options]]
         }
-        set options [dict create x $x y $y scale $defaultScale]
-        # FIXME: support per-label options; right now, this just
-        # applies an arbitrary label's options to all of them
-        # together.
-        set options [dict merge $options [dict get $result options]]
         dict set options text $text
-        Wish to draw text onto $thing with {*}$options
+
+        Wish to draw text onto $disp in surface $surface with {*}$options
     }
 }
 

builtin-programs/decorations/outline.folk

@@ -1,13 +1,35 @@
-When /someone/ wishes /thing/ is outlined /color/ &\
-     /thing/ has resolved geometry /geom/ {
-    dict with geom {
-        set points [list [list 0 0] \
-                        [list $width 0] \
-                        [list $width $height] \
-                        [list 0 $height] \
-                        [list 0 0]]
+fn drawOutlinePoints {width height} {
+    lmap point [list \
+        {0 0} \
+        [list $width 0] \
+        [list $width $height] \
+        [list 0 $height] \
+        {0 0}] {
+        lmap value $point {
+            format "%sm" $value
+        }
     }
+}
+
+When /someone/ wishes /thing/ is outlined /color/ {
+    Wish $thing is outlined with color $color
+}
+
+When /someone/ wishes /thing/ is outlined /color/ with /...options/ {
+    if {![info exists options]} { set options [dict create] }
+    Wish $thing is outlined with color $color {*}$options
+}
+
+When display /disp/ has width /displayWidth/ height /displayHeight/ &\
+     /thing/ has physical drawing surface /surface/ with width /width/ height /height/ space /space/ &\
+     /disp/ has canvas projection for surface /surface/ /surfaceToClip/ &\
+     /someone/ wishes /thing/ is outlined with /...options/ {
+    if {![info exists options]} { set options [dict create] }
+    set color [dict getdef $options color white]
+    set outlineWidth [dict getdef $options width [dict getdef $options thickness [format "%sm" 0.01]]]
+    set layer [dict getdef $options layer 2]
 
-    Wish to draw a line onto $thing with \
-        points $points width 0.01 color $color
+    Wish to draw a line onto $disp in surface $surface with \
+        points [drawOutlinePoints $width $height] \
+        width $outlineWidth color $color layer $layer
 }

builtin-programs/demos.folk

@@ -24,7 +24,7 @@ Claim 45004 has demo code {
 }
 Claim 45005 has demo code {
     When the clock time is /t/ {
-        Wish $this draws a circle offset [list expr {sin($t) * 50} 0]
+        Wish $this draws a circle with offset [list [expr {sin($t) * 0.05}] 0] radius 0.012
     }
 }
 Claim 45006 has demo code {