From c3edaff02a4c6a21daf264da7963a27ff73e8fb3 Mon Sep 17 00:00:00 2001
From: Kartik Agaram <vc@akkartik.com>
Date: Tue, 13 Oct 2020 10:58:18 -0700
Subject: 7018 - tile: tweak spacing between stacks

Until now the word being typed had a slightly larger invisible margin,
which was a little strange. Should look cleaner now.
---
 apps/tile/environment.mu | 20 +++++++++++++++-----
 apps/tile/main.mu        | 16 ++++------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/apps/tile/environment.mu b/apps/tile/environment.mu
index b0ed4605..79a6e5c7 100644
--- a/apps/tile/environment.mu
+++ b/apps/tile/environment.mu
@@ -628,6 +628,8 @@ fn render-line screen: (addr screen), functions: (addr handle function), binding
   var line/esi: (addr line) <- copy _line
   var first-word-ah/eax: (addr handle word) <- get line, data
   var curr-word/eax: (addr word) <- lookup *first-word-ah
+  var debug-row: int
+  copy-to debug-row, 0x20
   #
   # loop-carried dependency
   var curr-col/ecx: int <- copy left-col
@@ -717,7 +719,9 @@ fn render-line screen: (addr screen), functions: (addr handle function), binding
 #?     increment top-row
     # render main column
     var old-col/edx: int <- copy curr-col
-#?     print-string 0, "rendering line from "
+#?     move-cursor 0, debug-row, 1
+#?     increment debug-row
+#?     print-string 0, "rendering column from "
 #?     print-int32-decimal 0, curr-col
 #?     print-string 0, "\n"
     curr-col <- render-column screen, functions, bindings, line, curr-word, top-row, curr-col
@@ -752,7 +756,7 @@ fn render-column screen: (addr screen), functions: (addr handle function), bindi
   {
     # indent stack
     var indented-col/ebx: int <- copy left-col
-    indented-col <- add 1  # margin-right - 2 for padding spaces
+    indented-col <- add 1  # margin-right
     # compute stack
     var stack: value-stack
     var stack-addr/edi: (addr value-stack) <- address stack
@@ -778,6 +782,8 @@ fn render-column screen: (addr screen), functions: (addr handle function), bindi
     }
   }
 
+  max-width <- add 2  # spaces on either side of items on the stack
+
   # render word, initialize result
   reset-formatting screen
   move-cursor screen, top-row, left-col
@@ -790,9 +796,13 @@ fn render-column screen: (addr screen), functions: (addr handle function), bindi
   }
 
   # post-process right-col
-  right-col <- copy max-width
-  right-col <- add left-col
-  right-col <- add 3  # margin-right
+  right-col <- copy left-col
+  right-col <- add max-width
+  right-col <- add 1  # margin-right
+#?   print-int32-decimal 0, left-col
+#?   print-string 0, " => "
+#?   print-int32-decimal 0, right-col
+#?   print-string 0, "\n"
 }
 
 # synaesthesia
diff --git a/apps/tile/main.mu b/apps/tile/main.mu
index 7a57a1b9..cb6cde68 100644
--- a/apps/tile/main.mu
+++ b/apps/tile/main.mu
@@ -74,20 +74,12 @@ fn interactive {
 fn test {
   var env-storage: environment
   var env/esi: (addr environment) <- address env-storage
-  initialize-environment-with-fake-screen env, 0x30, 0xa0  # 48 rows, 160 columns
-  var g/eax: grapheme <- copy 0x31  # '1'
+  initialize-environment-with-fake-screen env, 0x30, 0xd4  # 48 rows, 160 columns
+  var g/eax: grapheme <- copy 0x61  # 'a'
   process env, g
-  g <- copy 0x31
+  g <- copy 0x61
   process env, g
-  g <- copy 0x31
-  process env, g
-  g <- copy 0x31
-  process env, g
-  g <- copy 0x20  # space
-  process env, g
-  g <- copy 0x31
-  process env, g
-  g <- copy 0x20  # space
+  g <- copy 0x20
   process env, g
   render env
 }
-- 
cgit 1.4.1-2-gfad0