about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-05-07 12:46:41 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-05-07 12:46:41 -0700
commitc5f50f05b7d3efe77533e697202378352089bae5 (patch)
tree72a060c08a6f71df139139d4c500d1eff6917c7b
parent150db8d56a399a9f5a3bb0a15b2ae4af612350a5 (diff)
downloadmu-c5f50f05b7d3efe77533e697202378352089bae5.tar.gz
.
-rw-r--r--shell/data.limg8
-rw-r--r--shell/sandbox.mu6
2 files changed, 8 insertions, 6 deletions
diff --git a/shell/data.limg b/shell/data.limg
index 772c9064..7b8654be 100644
--- a/shell/data.limg
+++ b/shell/data.limg
@@ -82,14 +82,16 @@
     (when (<= r y)
       (set err
         (+ err
-           (+ 1 (* 2 (set y (+ y 1)))))))
+           (+ 1 (* 2 (set y (+ y 1))))))
+ )
     (when (or (> r x) (> err y))
       (set err
         (+ err
-           (+ 1 (* 2 (set x (+ x 1)))))))
+           (+ 1 (* 2 (set x (+ x 1))))))
+ )
     (set continue (< x 0)))))))))])
     (main . [(def main (fn (screen keyboard)
   (chessboard screen 16)))])
   ))
-  (sandbox . (brline screen 1 1 5 5 4))
+  (sandbox . (brcircle screen 14 8 6 2))
 )
diff --git a/shell/sandbox.mu b/shell/sandbox.mu
index d07d2f87..d3cf3be2 100644
--- a/shell/sandbox.mu
+++ b/shell/sandbox.mu
@@ -176,7 +176,7 @@ fn maybe-render-empty-screen screen: (addr screen), _self: (addr sandbox), xmin:
   var screen-obj-ah/eax: (addr handle screen) <- get screen-obj-cell, screen-data
   var _screen-obj/eax: (addr screen) <- lookup *screen-obj-ah
   var screen-obj/edx: (addr screen) <- copy _screen-obj
-  var x/eax: int <- draw-text-rightward screen, "screen:   ", xmin, 0x99/xmax, y, 7/fg, 0xc5/bg=blue-bg
+  var x/eax: int <- draw-text-rightward screen, "screen:   ", xmin, 0x99/xmax, y, 0x17/fg, 0xc5/bg=blue-bg
   y <- render-empty-screen screen, screen-obj, x, y
   return y
 }
@@ -205,7 +205,7 @@ fn maybe-render-screen screen: (addr screen), _self: (addr sandbox), xmin: int,
     break-if-=
     return ymin
   }
-  var x/eax: int <- draw-text-rightward screen, "screen:   ", xmin, 0x99/xmax, ymin, 7/fg, 0xc5/bg=blue-bg
+  var x/eax: int <- draw-text-rightward screen, "screen:   ", xmin, 0x99/xmax, ymin, 0x17/fg, 0xc5/bg=blue-bg
   var y/ecx: int <- copy ymin
   y <- render-screen screen, screen-obj, x, y
   return y
@@ -363,7 +363,7 @@ fn maybe-render-keyboard screen: (addr screen), _self: (addr sandbox), xmin: int
   var keyboard-obj/edx: (addr gap-buffer) <- copy _keyboard-obj
   var y/ecx: int <- copy ymin
   y <- increment  # padding
-  var x/eax: int <- draw-text-rightward screen, "keyboard: ", xmin, 0x99/xmax, y, 7/fg, 0xc5/bg=blue-bg
+  var x/eax: int <- draw-text-rightward screen, "keyboard: ", xmin, 0x99/xmax, y, 0x17/fg, 0xc5/bg=blue-bg
   var cursor-in-keyboard?/esi: (addr boolean) <- get self, cursor-in-keyboard?
   y <- render-keyboard screen, keyboard-obj, x, y, *cursor-in-keyboard?
   y <- increment  # padding