From f344b250f6f062a1a1902bf69b23ebf9b565de0e Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 17 Sep 2016 15:01:51 -0700 Subject: 3395 --- html/edit/004-programming-environment.mu.html | 270 +++++++++++++------------- 1 file changed, 135 insertions(+), 135 deletions(-) (limited to 'html/edit/004-programming-environment.mu.html') diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html index 24b66e0d..a50eacb9 100644 --- a/html/edit/004-programming-environment.mu.html +++ b/html/edit/004-programming-environment.mu.html @@ -45,90 +45,90 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color initial-recipe:text <- restore [recipes.mu] initial-sandbox:text <- new [] hide-screen 0/screen - env:address:programming-environment-data <- new-programming-environment 0/screen, initial-recipe, initial-sandbox + env:&:programming-environment-data <- new-programming-environment 0/screen, initial-recipe, initial-sandbox render-all 0/screen, env, render event-loop 0/screen, 0/console, env # never gets here ] container programming-environment-data [ - recipes:address:editor-data - current-sandbox:address:editor-data - sandbox-in-focus?:boolean # false => cursor in recipes; true => cursor in current-sandbox + recipes:&:editor-data + current-sandbox:&:editor-data + sandbox-in-focus?:bool # false => cursor in recipes; true => cursor in current-sandbox ] -def new-programming-environment screen:address:screen, initial-recipe-contents:text, initial-sandbox-contents:text -> result:address:programming-environment-data, screen:address:screen [ +def new-programming-environment screen:&:screen, initial-recipe-contents:text, initial-sandbox-contents:text -> result:&:programming-environment-data, screen:&:screen [ local-scope load-ingredients - width:number <- screen-width screen - height:number <- screen-height screen + width:num <- screen-width screen + height:num <- screen-height screen # top menu result <- new programming-environment-data:type draw-horizontal screen, 0, 0/left, width, 32/space, 0/black, 238/grey - button-start:number <- subtract width, 20 - button-on-screen?:boolean <- greater-or-equal button-start, 0 + button-start:num <- subtract width, 20 + button-on-screen?:bool <- greater-or-equal button-start, 0 assert button-on-screen?, [screen too narrow for menu] screen <- move-cursor screen, 0/row, button-start print screen, [ run (F4) ], 255/white, 161/reddish # dotted line down the middle - divider:number, _ <- divide-with-remainder width, 2 + divider:num, _ <- divide-with-remainder width, 2 draw-vertical screen, divider, 1/top, height, 9482/vertical-dotted # recipe editor on the left - recipes:address:editor-data <- new-editor initial-recipe-contents, screen, 0/left, divider/right + recipes:&:editor-data <- new-editor initial-recipe-contents, screen, 0/left, divider/right # sandbox editor on the right - sandbox-left:number <- add divider, 1 - current-sandbox:address:editor-data <- new-editor initial-sandbox-contents, screen, sandbox-left, width/right + sandbox-left:num <- add divider, 1 + current-sandbox:&:editor-data <- new-editor initial-sandbox-contents, screen, sandbox-left, width/right *result <- put *result, recipes:offset, recipes *result <- put *result, current-sandbox:offset, current-sandbox *result <- put *result, sandbox-in-focus?:offset, 0/false <programming-environment-initialization> ] -def event-loop screen:address:screen, console:address:console, env:address:programming-environment-data -> screen:address:screen, console:address:console, env:address:programming-environment-data [ +def event-loop screen:&:screen, console:&:console, env:&:programming-environment-data -> screen:&:screen, console:&:console, env:&:programming-environment-data [ local-scope load-ingredients - recipes:address:editor-data <- get *env, recipes:offset - current-sandbox:address:editor-data <- get *env, current-sandbox:offset - sandbox-in-focus?:boolean <- get *env, sandbox-in-focus?:offset + recipes:&:editor-data <- get *env, recipes:offset + current-sandbox:&:editor-data <- get *env, current-sandbox:offset + sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset # if we fall behind we'll stop updating the screen, but then we have to # render the entire screen when we catch up. # todo: test this - render-all-on-no-more-events?:boolean <- copy 0/false + render-all-on-no-more-events?:bool <- copy 0/false { # looping over each (keyboard or touch) event as it occurs +next-event - e:event, console, found?:boolean, quit?:boolean <- read-event console + e:event, console, found?:bool, quit?:bool <- read-event console loop-unless found? break-if quit? # only in tests trace 10, [app], [next-event] <handle-event> # check for global events that will trigger regardless of which editor has focus { - k:number, is-keycode?:boolean <- maybe-convert e:event, keycode:variant + k:num, is-keycode?:bool <- maybe-convert e:event, keycode:variant break-unless is-keycode? <global-keypress> } { - c:character, is-unicode?:boolean <- maybe-convert e:event, text:variant + c:char, is-unicode?:bool <- maybe-convert e:event, text:variant break-unless is-unicode? <global-type> } # 'touch' event - send to both sides, see what picks it up { - t:touch-event, is-touch?:boolean <- maybe-convert e:event, touch:variant + t:touch-event, is-touch?:bool <- maybe-convert e:event, touch:variant break-unless is-touch? # ignore all but 'left-click' events for now # todo: test this - touch-type:number <- get t, type:offset - is-left-click?:boolean <- equal touch-type, 65513/mouse-left + touch-type:num <- get t, type:offset + is-left-click?:bool <- equal touch-type, 65513/mouse-left loop-unless is-left-click?, +next-event:label - click-row:number <- get t, row:offset - click-column:number <- get t, column:offset + click-row:num <- get t, row:offset + click-column:num <- get t, column:offset # later exceptions for non-editor touches will go here <global-touch> # send to both editors _ <- move-cursor-in-editor screen, recipes, t - sandbox-in-focus?:boolean <- move-cursor-in-editor screen, current-sandbox, t + sandbox-in-focus?:bool <- move-cursor-in-editor screen, current-sandbox, t *env <- put *env, sandbox-in-focus?:offset, sandbox-in-focus? screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env loop +next-event:label @@ -136,10 +136,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # 'resize' event - redraw editor # todo: test this after supporting resize in assume-console { - r:resize-event, is-resize?:boolean <- maybe-convert e:event, resize:variant + r:resize-event, is-resize?:bool <- maybe-convert e:event, resize:variant break-unless is-resize? # if more events, we're still resizing; wait until we stop - more-events?:boolean <- has-more-events? console + more-events?:bool <- has-more-events? console { break-unless more-events? render-all-on-no-more-events? <- copy 1/true # no rendering now, full rendering on some future event @@ -155,13 +155,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # if it's not global and not a touch event, send to appropriate editor { hide-screen screen - sandbox-in-focus?:boolean <- get *env, sandbox-in-focus?:offset + sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset { break-if sandbox-in-focus? - screen, recipes, render?:boolean <- handle-keyboard-event screen, recipes, e:event + screen, recipes, render?:bool <- handle-keyboard-event screen, recipes, e:event # refresh screen only if no more events # if there are more events to process, wait for them to clear up, then make sure you render-all afterward. - more-events?:boolean <- has-more-events? console + more-events?:bool <- has-more-events? console { break-unless more-events? render-all-on-no-more-events? <- copy 1/true # no rendering now, full rendering on some future event @@ -186,10 +186,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color } { break-unless sandbox-in-focus? - screen, current-sandbox, render?:boolean <- handle-keyboard-event screen, current-sandbox, e:event + screen, current-sandbox, render?:bool <- handle-keyboard-event screen, current-sandbox, e:event # refresh screen only if no more events # if there are more events to process, wait for them to clear up, then make sure you render-all afterward. - more-events?:boolean <- has-more-events? console + more-events?:bool <- has-more-events? console { break-unless more-events? render-all-on-no-more-events? <- copy 1/true # no rendering now, full rendering on some future event @@ -220,24 +220,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color } ] -def resize screen:address:screen, env:address:programming-environment-data -> env:address:programming-environment-data, screen:address:screen [ +def resize screen:&:screen, env:&:programming-environment-data -> env:&:programming-environment-data, screen:&:screen [ local-scope load-ingredients clear-screen screen # update screen dimensions - width:number <- screen-width screen - divider:number, _ <- divide-with-remainder width, 2 + width:num <- screen-width screen + divider:num, _ <- divide-with-remainder width, 2 # update recipe editor - recipes:address:editor-data <- get *env, recipes:offset - right:number <- subtract divider, 1 + recipes:&:editor-data <- get *env, recipes:offset + right:num <- subtract divider, 1 *recipes <- put *recipes, right:offset, right # reset cursor (later we'll try to preserve its position) *recipes <- put *recipes, cursor-row:offset, 1 *recipes <- put *recipes, cursor-column:offset, 0 # update sandbox editor - current-sandbox:address:editor-data <- get *env, current-sandbox:offset - left:number <- add divider, 1 + current-sandbox:&:editor-data <- get *env, current-sandbox:offset + left:num <- add divider, 1 *current-sandbox <- put *current-sandbox, left:offset, left - right:number <- subtract width, 1 + right:num <- subtract width, 1 *current-sandbox <- put *current-sandbox, right:offset, right # reset cursor (later we'll try to preserve its position) *current-sandbox <- put *current-sandbox, cursor-row:offset, 1 @@ -247,49 +247,49 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # Variant of 'render' that updates cursor-row and cursor-column based on # before-cursor (rather than the other way around). If before-cursor moves # off-screen, it resets cursor-row and cursor-column. -def render-without-moving-cursor screen:address:screen, editor:address:editor-data -> last-row:number, last-column:number, screen:address:screen, editor:address:editor-data [ +def render-without-moving-cursor screen:&:screen, editor:&:editor-data -> last-row:num, last-column:num, screen:&:screen, editor:&:editor-data [ local-scope load-ingredients return-unless editor, 1/top, 0/left, screen/same-as-ingredient:0, editor/same-as-ingredient:1 - left:number <- get *editor, left:offset - screen-height:number <- screen-height screen - right:number <- get *editor, right:offset - curr:address:duplex-list:character <- get *editor, top-of-screen:offset - prev:address:duplex-list:character <- copy curr # just in case curr becomes null and we can't compute prev + left:num <- get *editor, left:offset + screen-height:num <- screen-height screen + right:num <- get *editor, right:offset + curr:&:duplex-list:char <- get *editor, top-of-screen:offset + prev:&:duplex-list:char <- copy curr # just in case curr becomes null and we can't compute prev curr <- next curr +render-loop-initialization - color:number <- copy 7/white - row:number <- copy 1/top - column:number <- copy left + color:num <- copy 7/white + row:num <- copy 1/top + column:num <- copy left # save before-cursor - old-before-cursor:address:duplex-list:character <- get *editor, before-cursor:offset + old-before-cursor:&:duplex-list:char <- get *editor, before-cursor:offset # initialze cursor-row/cursor-column/before-cursor to the top of the screen # by default *editor <- put *editor, cursor-row:offset, row *editor <- put *editor, cursor-column:offset, column - top-of-screen:address:duplex-list:character <- get *editor, top-of-screen:offset + top-of-screen:&:duplex-list:char <- get *editor, top-of-screen:offset *editor <- put *editor, before-cursor:offset, top-of-screen screen <- move-cursor screen, row, column { +next-character break-unless curr - off-screen?:boolean <- greater-or-equal row, screen-height + off-screen?:bool <- greater-or-equal row, screen-height break-if off-screen? # if we find old-before-cursor still on the new resized screen, update # editor-data.cursor-row and editor-data.cursor-column based on # old-before-cursor { - at-cursor?:boolean <- equal old-before-cursor, prev + at-cursor?:bool <- equal old-before-cursor, prev break-unless at-cursor? *editor <- put *editor, cursor-row:offset, row *editor <- put *editor, cursor-column:offset, column *editor <- put *editor, before-cursor:offset, old-before-cursor } - c:character <- get *curr, value:offset + c:char <- get *curr, value:offset <character-c-received> { # newline? move to left rather than 0 - newline?:boolean <- equal c, 10/newline + newline?:bool <- equal c, 10/newline break-unless newline? # clear rest of line in this window clear-line-until screen, right @@ -304,10 +304,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color { # at right? wrap. even if there's only one more letter left; we need # room for clicking on the cursor after it. - at-right?:boolean <- equal column, right + at-right?:bool <- equal column, right break-unless at-right? # print wrap icon - wrap-icon:character <- copy 8617/loop-back-to-left + wrap-icon:char <- copy 8617/loop-back-to-left print screen, wrap-icon, 245/grey column <- copy left row <- add row, 1 @@ -334,7 +334,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # initialize both halves of screen 1:text <- new [abc] 2:text <- new [def] - 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text + 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text # focus on both sides assume-console [ left-click 1, 1 @@ -342,11 +342,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] # check cursor column in each run [ - event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - 4:address:editor-data <- get *3:address:programming-environment-data, recipes:offset - 5:number <- get *4:address:editor-data, cursor-column:offset - 6:address:editor-data <- get *3:address:programming-environment-data, current-sandbox:offset - 7:number <- get *6:address:editor-data, cursor-column:offset + event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + 4:&:editor-data <- get *3:&:programming-environment-data, recipes:offset + 5:num <- get *4:&:editor-data, cursor-column:offset + 6:&:editor-data <- get *3:&:programming-environment-data, current-sandbox:offset + 7:num <- get *6:&:editor-data, cursor-column:offset ] memory-should-contain [ 5 <- 1 @@ -360,8 +360,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # initialize both halves of screen 1:text <- new [abc] 2:text <- new [def] - 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text - render-all screen, 3:address:programming-environment-data, render + 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text + render-all screen, 3:&:programming-environment-data, render # type one letter in each of them assume-console [ left-click 1, 1 @@ -370,11 +370,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type [1] ] run [ - event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - 4:address:editor-data <- get *3:address:programming-environment-data, recipes:offset - 5:number <- get *4:address:editor-data, cursor-column:offset - 6:address:editor-data <- get *3:address:programming-environment-data, current-sandbox:offset - 7:number <- get *6:address:editor-data, cursor-column:offset + event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + 4:&:editor-data <- get *3:&:programming-environment-data, recipes:offset + 5:num <- get *4:&:editor-data, cursor-column:offset + 6:&:editor-data <- get *3:&:programming-environment-data, current-sandbox:offset + 7:num <- get *6:&:editor-data, cursor-column:offset ] screen-should-contain [ . run (F4) . # this line has a different background, but we don't test that yet @@ -388,8 +388,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] # show the cursor at the right window run [ - 8:character/cursor <- copy 9251/␣ - print screen:address:screen, 8:character/cursor + 8:char/cursor <- copy 9251/␣ + print screen:&:screen, 8:char/cursor ] screen-should-contain [ . run (F4) . @@ -405,8 +405,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ 1:text <- new [abc] 2:text <- new [def] - 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text - render-all screen, 3:address:programming-environment-data, render + 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text + render-all screen, 3:&:programming-environment-data, render ] # divider isn't messed up screen-should-contain [ @@ -423,14 +423,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen 30/width, 5/height 1:text <- new [abc] 2:text <- new [def] - 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text - render-all screen, 3:address:programming-environment-data, render + 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text + render-all screen, 3:&:programming-environment-data, render # initialize programming environment and highlight cursor assume-console [] run [ - event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - 4:character/cursor <- copy 9251/␣ - print screen:address:screen, 4:character/cursor + event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + 4:char/cursor <- copy 9251/␣ + print screen:&:screen, 4:char/cursor ] # is cursor at the right place? screen-should-contain [ @@ -444,9 +444,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type [z] ] run [ - event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - 4:character/cursor <- copy 9251/␣ - print screen:address:screen, 4:character/cursor + event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + 4:char/cursor <- copy 9251/␣ + print screen:&:screen, 4:char/cursor ] # cursor should still be right screen-should-contain [ @@ -464,8 +464,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color 1:text <- new [] 2:text <- new [abc def] - 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text - render-all screen, 3:address:programming-environment-data, render + 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text + render-all screen, 3:&:programming-environment-data, render screen-should-contain [ . run (F4) . . ┊abc . @@ -479,9 +479,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press backspace ] run [ - event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - 4:character/cursor <- copy 9251/␣ - print screen:address:screen, 4:character/cursor + event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + 4:char/cursor <- copy 9251/␣ + print screen:&:screen, 4:char/cursor ] # cursor moves to end of old line screen-should-contain [ @@ -492,47 +492,47 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -def render-all screen:address:screen, env:address:programming-environment-data, {render-editor: (recipe (address screen) (address editor-data) -> number number (address screen) (address editor-data))} -> screen:address:screen, env:address:programming-environment-data [ +def render-all screen:&:screen, env:&:programming-environment-data, {render-editor: (recipe (address screen) (address editor-data) -> number number (address screen) (address editor-data))} -> screen:&:screen, env:&:programming-environment-data [ local-scope load-ingredients trace 10, [app], [render all] hide-screen screen # top menu trace 11, [app], [render top menu] - width:number <- screen-width screen + width:num <- screen-width screen draw-horizontal screen, 0, 0/left, width, 32/space, 0/black, 238/grey - button-start:number <- subtract width, 20 - button-on-screen?:boolean <- greater-or-equal button-start, 0 + button-start:num <- subtract width, 20 + button-on-screen?:bool <- greater-or-equal button-start, 0 assert button-on-screen?, [screen too narrow for menu] screen <- move-cursor screen, 0/row, button-start print screen, [ run (F4) ], 255/white, 161/reddish # dotted line down the middle trace 11, [app], [render divider] - divider:number, _ <- divide-with-remainder width, 2 - height:number <- screen-height screen + divider:num, _ <- divide-with-remainder width, 2 + height:num <- screen-height screen draw-vertical screen, divider, 1/top, height, 9482/vertical-dotted # screen <- render-recipes screen, env, render-editor screen <- render-sandbox-side screen, env, render-editor <render-components-end> # - recipes:address:editor-data <- get *env, recipes:offset - current-sandbox:address:editor-data <- get *env, current-sandbox:offset - sandbox-in-focus?:boolean <- get *env, sandbox-in-focus?:offset + recipes:&:editor-data <- get *env, recipes:offset + current-sandbox:&:editor-data <- get *env, current-sandbox:offset + sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env # show-screen screen ] -def render-recipes screen:address:screen, env:address:programming-environment-data, {render-editor: (recipe (address screen) (address editor-data) -> number number (address screen) (address editor-data))} -> screen:address:screen, env:address:programming-environment-data [ +def render-recipes screen:&:screen, env:&:programming-environment-data, {render-editor: (recipe (address screen) (address editor-data) -> number number (address screen) (address editor-data))} -> screen:&:screen, env:&:programming-environment-data [ local-scope load-ingredients trace 11, [app], [render recipes] - recipes:address:editor-data <- get *env, recipes:offset + recipes:&:editor-data <- get *env, recipes:offset # render recipes - left:number <- get *recipes, left:offset - right:number <- get *recipes, right:offset - row:number, column:number, screen <- call render-editor, screen, recipes + left:num <- get *recipes, left:offset + right:num <- get *recipes, right:offset + row:num, column:num, screen <- call render-editor, screen, recipes clear-line-until screen, right row <- add row, 1 <render-recipe-components-end> @@ -543,13 +543,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] # replaced in a later layer -def render-sandbox-side screen:address:screen, env:address:programming-environment-data, {render-editor: (recipe (address screen) (address editor-data) -> number number (address screen) (address editor-data))} -> screen:address:screen, env:address:programming-environment-data [ +def render-sandbox-side screen:&:screen, env:&:programming-environment-data, {render-editor: (recipe (address screen) (address editor-data) -> number number (address screen) (address editor-data))} -> screen:&:screen, env:&:programming-environment-data [ local-scope load-ingredients - current-sandbox:address:editor-data <- get *env, current-sandbox:offset - left:number <- get *current-sandbox, left:offset - right:number <- get *current-sandbox, right:offset - row:number, column:number, screen, current-sandbox <- call render-editor, screen, current-sandbox + current-sandbox:&:editor-data <- get *env, current-sandbox:offset + 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) @@ -558,48 +558,48 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color clear-screen-from screen, row, left, left, right ] -def update-cursor screen:address:screen, recipes:address:editor-data, current-sandbox:address:editor-data, sandbox-in-focus?:boolean, env:address:programming-environment-data -> screen:address:screen [ +def update-cursor screen:&:screen, recipes:&:editor-data, current-sandbox:&:editor-data, sandbox-in-focus?:bool, env:&:programming-environment-data -> screen:&:screen [ local-scope load-ingredients <update-cursor-special-cases> { break-if sandbox-in-focus? - cursor-row:number <- get *recipes, cursor-row:offset - cursor-column:number <- get *recipes, cursor-column:offset + cursor-row:num <- get *recipes, cursor-row:offset + cursor-column:num <- get *recipes, cursor-column:offset } { break-unless sandbox-in-focus? - cursor-row:number <- get *current-sandbox, cursor-row:offset - cursor-column:number <- get *current-sandbox, cursor-column:offset + cursor-row:num <- get *current-sandbox, cursor-row:offset + cursor-column:num <- get *current-sandbox, cursor-column:offset } screen <- move-cursor screen, cursor-row, cursor-column ] # like 'render' for texts, but with colorization for comments like in the editor -def render-code screen:address:screen, s:text, left:number, right:number, row:number -> row:number, screen:address:screen [ +def render-code screen:&:screen, s:text, left:num, right:num, row:num -> row:num, screen:&:screen [ local-scope load-ingredients return-unless s - color:number <- copy 7/white - column:number <- copy left + color:num <- copy 7/white + column:num <- copy left screen <- move-cursor screen, row, column - screen-height:number <- screen-height screen - i:number <- copy 0 - len:number <- length *s + screen-height:num <- screen-height screen + i:num <- copy 0 + len:num <- length *s { +next-character - done?:boolean <- greater-or-equal i, len + done?:bool <- greater-or-equal i, len break-if done? done? <- greater-or-equal row, screen-height break-if done? - c:character <- index *s, i + c:char <- index *s, i <character-c-received> # only line different from render { # at right? wrap. - at-right?:boolean <- equal column, right + at-right?:bool <- equal column, right break-unless at-right? # print wrap icon - wrap-icon:character <- copy 8617/loop-back-to-left + wrap-icon:char <- copy 8617/loop-back-to-left print screen, wrap-icon, 245/grey column <- copy left row <- add row, 1 @@ -609,13 +609,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color i <- add i, 1 { # newline? move to left rather than 0 - newline?:boolean <- equal c, 10/newline + newline?:bool <- equal c, 10/newline break-unless newline? # clear rest of line in this window { - done?:boolean <- greater-than column, right + done?:bool <- greater-than column, right break-if done? - space:character <- copy 32/space + space:char <- copy 32/space print screen, space column <- add column, 1 loop @@ -629,7 +629,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color column <- add column, 1 loop } - was-at-left?:boolean <- equal column, left + was-at-left?:bool <- equal column, left clear-line-until screen, right { break-if was-at-left? @@ -642,9 +642,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color after <global-type> [ { - redraw-screen?:boolean <- equal c, 12/ctrl-l + redraw-screen?:bool <- equal c, 12/ctrl-l break-unless redraw-screen? - screen <- render-all screen, env:address:programming-environment-data, render + screen <- render-all screen, env:&:programming-environment-data, render sync-screen screen loop +next-event:label } @@ -655,9 +655,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color after <global-type> [ { - switch-side?:boolean <- equal c, 14/ctrl-n + switch-side?:bool <- equal c, 14/ctrl-n break-unless switch-side? - sandbox-in-focus?:boolean <- get *env, sandbox-in-focus?:offset + sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset sandbox-in-focus? <- not sandbox-in-focus? *env <- put *env, sandbox-in-focus?:offset, sandbox-in-focus? screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env @@ -667,22 +667,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ## helpers -def draw-vertical screen:address:screen, col:number, y:number, bottom:number -> screen:address:screen [ +def draw-vertical screen:&:screen, col:num, y:num, bottom:num -> screen:&:screen [ local-scope load-ingredients - style:character, style-found?:boolean <- next-ingredient + style:char, style-found?:bool <- next-ingredient { break-if style-found? style <- copy 9474/vertical } - color:number, color-found?:boolean <- next-ingredient + color:num, color-found?:bool <- next-ingredient { # default color to white break-if color-found? color <- copy 245/grey } { - continue?:boolean <- lesser-than y, bottom + continue?:bool <- lesser-than y, bottom break-unless continue? screen <- move-cursor screen, y, col print screen, style, color -- cgit 1.4.1-2-gfad0