about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2018-02-15 23:52:29 -0800
committerKartik K. Agaram <vc@akkartik.com>2018-02-15 23:52:29 -0800
commitaae10710052c7f3a6b9132b2d9a0a83863f8dd5b (patch)
tree6540e13aebe0c826010cefc2ecbcf7fd15fc231a
parent3eaca808346acf47ddc38c9a591ff0ec4e471148 (diff)
downloadmu-aae10710052c7f3a6b9132b2d9a0a83863f8dd5b.tar.gz
4207
-rw-r--r--edit/001-editor.mu1
-rw-r--r--sandbox/001-editor.mu4
-rw-r--r--sandbox/002-typing.mu2
-rw-r--r--sandbox/004-programming-environment.mu2
-rw-r--r--sandbox/005-sandbox.mu2
5 files changed, 3 insertions, 8 deletions
diff --git a/edit/001-editor.mu b/edit/001-editor.mu
index e1404fc8..8855395a 100644
--- a/edit/001-editor.mu
+++ b/edit/001-editor.mu
@@ -209,7 +209,6 @@ def render screen:&:screen, editor:&:editor -> last-row:num, last-column:num, sc
 def clear-screen-from screen:&:screen, row:num, column:num, left:num, right:num -> screen:&:screen [
   local-scope
   load-inputs
-#?   stash [clear-screen-from] row column [between] left [and] right
   # if it's the real screen, use the optimized primitive
   {
     break-if screen
diff --git a/sandbox/001-editor.mu b/sandbox/001-editor.mu
index 9f1adbe7..8855395a 100644
--- a/sandbox/001-editor.mu
+++ b/sandbox/001-editor.mu
@@ -201,7 +201,9 @@ def render screen:&:screen, editor:&:editor -> last-row:num, last-column:num, sc
   *editor <- put *editor, cursor-row:offset, cursor-row
   *editor <- put *editor, cursor-column:offset, cursor-column
   *editor <- put *editor, before-cursor:offset, before-cursor
-  return row, column
+  clear-line-until screen, right
+  row <- add row, 1
+  return row, left/column
 ]
 
 def clear-screen-from screen:&:screen, row:num, column:num, left:num, right:num -> screen:&:screen [
diff --git a/sandbox/002-typing.mu b/sandbox/002-typing.mu
index 709e8d22..47885c4f 100644
--- a/sandbox/002-typing.mu
+++ b/sandbox/002-typing.mu
@@ -269,8 +269,6 @@ def editor-render screen:&:screen, editor:&:editor -> screen:&:screen, editor:&:
   left:num <- get *editor, left:offset
   right:num <- get *editor, right:offset
   row:num, column:num <- render screen, editor
-  clear-line-until screen, right
-  row <- add row, 1
   draw-horizontal screen, row, left, right, 9480/horizontal-dotted
   row <- add row, 1
   clear-screen-from screen, row, left, left, right
diff --git a/sandbox/004-programming-environment.mu b/sandbox/004-programming-environment.mu
index 68d6ef24..dccd7c9a 100644
--- a/sandbox/004-programming-environment.mu
+++ b/sandbox/004-programming-environment.mu
@@ -224,8 +224,6 @@ def render-sandbox-side screen:&:screen, env:&:environment, render-editor:render
   left:num <- get *current-sandbox, left:offset
   right:num <- get *current-sandbox, right:offset
   row:num, column:num, screen, current-sandbox <- call render-editor, screen, current-sandbox
-  clear-line-until screen, right
-  row <- add row, 1
   # draw solid line after code (you'll see why in later layers)
   draw-horizontal screen, row, left, right
   row <- add row, 1
diff --git a/sandbox/005-sandbox.mu b/sandbox/005-sandbox.mu
index 89ebf3ca..4b56ad27 100644
--- a/sandbox/005-sandbox.mu
+++ b/sandbox/005-sandbox.mu
@@ -250,8 +250,6 @@ def! render-sandbox-side screen:&:screen, env:&:environment, render-editor:rende
     render-current-sandbox?:bool <- equal render-from, -1
     break-unless render-current-sandbox?
     row, column, screen, current-sandbox <- call render-editor, screen, current-sandbox
-    clear-screen-from screen, row, column, left, right
-    row <- add row, 1
   }
   # render sandboxes
   draw-horizontal screen, row, left, right