From 74e327d14728443310324e03a61455418a2ee1b5 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 4 Feb 2017 22:01:02 -0800 Subject: 3738 - start on new edit/ layer: minimizing prints --- edit/005-programming-environment.mu | 642 ++++++++++++++++++++++++++++++++++++ 1 file changed, 642 insertions(+) create mode 100644 edit/005-programming-environment.mu (limited to 'edit/005-programming-environment.mu') diff --git a/edit/005-programming-environment.mu b/edit/005-programming-environment.mu new file mode 100644 index 00000000..7efa3d47 --- /dev/null +++ b/edit/005-programming-environment.mu @@ -0,0 +1,642 @@ +## putting the environment together out of editors +# +# Consists of one editor on the left for recipes and one on the right for the +# sandbox. + +def! main [ + local-scope + open-console + env:&:environment <- new-programming-environment 0/filesystem, 0/screen + render-all 0/screen, env, render + event-loop 0/screen, 0/console, env, 0/filesystem + # never gets here +] + +container environment [ + recipes:&:editor + current-sandbox:&:editor + sandbox-in-focus?:bool # false => cursor in recipes; true => cursor in current-sandbox +] + +def new-programming-environment resources:&:resources, screen:&:screen, test-sandbox-editor-contents:text -> result:&:environment [ + local-scope + load-ingredients + width:num <- screen-width screen + result <- new environment:type + # recipe editor on the left + initial-recipe-contents:text <- slurp resources, [lesson/recipes.mu] # ignore errors + divider:num, _ <- divide-with-remainder width, 2 + recipes:&:editor <- new-editor initial-recipe-contents, 0/left, divider/right + # sandbox editor on the right + sandbox-left:num <- add divider, 1 + current-sandbox:&:editor <- new-editor test-sandbox-editor-contents, 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 + +] + +def event-loop screen:&:screen, console:&:console, env:&:environment, resources:&:resources -> screen:&:screen, console:&:console, env:&:environment, resources:&:resources [ + local-scope + load-ingredients + recipes:&:editor <- get *env, recipes:offset + current-sandbox:&:editor <- 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?:bool <- copy 0/false + { + # looping over each (keyboard or touch) event as it occurs + +next-event + e:event, found?:bool, quit?:bool, console <- read-event console + loop-unless found? + break-if quit? # only in tests + trace 10, [app], [next-event] + + # check for global events that will trigger regardless of which editor has focus + { + k:num, is-keycode?:bool <- maybe-convert e:event, keycode:variant + break-unless is-keycode? + + } + { + c:char, is-unicode?:bool <- maybe-convert e:event, text:variant + break-unless is-unicode? + + } + # 'touch' event - send to both sides, see what picks it up + { + 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:num <- get t, type:offset + is-left-click?:bool <- equal touch-type, 65513/mouse-left + loop-unless is-left-click?, +next-event + click-row:num <- get t, row:offset + click-column:num <- get t, column:offset + # later exceptions for non-editor touches will go here + + # send to both editors + _ <- move-cursor-in-editor screen, recipes, 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 + } + # 'resize' event - redraw editor + # todo: test this after supporting resize in assume-console + { + 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?: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 + } + { + break-if more-events? + env, screen <- resize screen, env + screen <- render-all screen, env, render-without-moving-cursor + render-all-on-no-more-events? <- copy 0/false # full render done + } + loop +next-event + } + # if it's not global and not a touch event, send to appropriate editor + { + hide-screen screen + sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset + { + break-if sandbox-in-focus? + 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?: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 + jump +finish-event + } + { + break-if more-events? + { + break-unless render-all-on-no-more-events? + # no more events, and we have to force render + screen <- render-all screen, env, render + render-all-on-no-more-events? <- copy 0/false + jump +finish-event + } + # no more events, no force render + { + break-unless render? + screen <- render-recipes screen, env, render + jump +finish-event + } + } + } + { + break-unless sandbox-in-focus? + 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?: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 + jump +finish-event + } + { + break-if more-events? + { + break-unless render-all-on-no-more-events? + # no more events, and we have to force render + screen <- render-all screen, env, render + render-all-on-no-more-events? <- copy 0/false + jump +finish-event + } + # no more events, no force render + { + break-unless render? + screen <- render-sandbox-side screen, env, render + jump +finish-event + } + } + } + +finish-event + screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env + show-screen screen + } + loop + } +] + +def resize screen:&:screen, env:&:environment -> env:&:environment, screen:&:screen [ + local-scope + load-ingredients + clear-screen screen # update screen dimensions + width:num <- screen-width screen + divider:num, _ <- divide-with-remainder width, 2 + # update recipe editor + recipes:&:editor <- 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:&:editor <- get *env, current-sandbox:offset + left:num <- add divider, 1 + *current-sandbox <- put *current-sandbox, left:offset, left + 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 + *current-sandbox <- put *current-sandbox, cursor-column:offset, left +] + +# 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:&:screen, editor:&:editor -> last-row:num, last-column:num, screen:&:screen, editor:&:editor [ + local-scope + load-ingredients + return-unless editor, 1/top, 0/left + 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:num <- copy 7/white + row:num <- copy 1/top + column:num <- copy left + # save before-cursor + 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:&: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?: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.cursor-row and editor.cursor-column based on + # old-before-cursor + { + 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:char <- get *curr, value:offset + + { + # newline? move to left rather than 0 + newline?:bool <- equal c, 10/newline + break-unless newline? + # clear rest of line in this window + clear-line-until screen, right + # skip to next line + row <- add row, 1 + column <- copy left + screen <- move-cursor screen, row, column + curr <- next curr + prev <- next prev + loop +next-character + } + { + # at right? wrap. even if there's only one more letter left; we need + # room for clicking on the cursor after it. + at-right?:bool <- equal column, right + break-unless at-right? + # print wrap icon + wrap-icon:char <- copy 8617/loop-back-to-left + print screen, wrap-icon, 245/grey + column <- copy left + row <- add row, 1 + screen <- move-cursor screen, row, column + # don't increment curr + loop +next-character + } + print screen, c, color + curr <- next curr + prev <- next prev + column <- add column, 1 + loop + } + # save first character off-screen + *editor <- put *editor, bottom-of-screen:offset, curr + *editor <- put *editor, bottom:offset, row + return row, column +] + +scenario point-at-multiple-editors [ + local-scope + trace-until 100/app # trace too long + assume-screen 30/width, 5/height + # initialize both halves of screen + assume-resources [ + [lesson/recipes.mu] <- [ + |abc| + ] + ] + env:&:environment <- new-programming-environment resources, screen, [def] # contents of sandbox editor + # focus on both sides + assume-console [ + left-click 1, 1 + left-click 1, 17 + ] + # check cursor column in each + run [ + event-loop screen, console, env, resources + recipes:&:editor <- get *env, recipes:offset + 5:num/raw <- get *recipes, cursor-column:offset + sandbox:&:editor <- get *env, current-sandbox:offset + 7:num/raw <- get *sandbox, cursor-column:offset + ] + memory-should-contain [ + 5 <- 1 + 7 <- 17 + ] +] + +scenario edit-multiple-editors [ + local-scope + trace-until 100/app # trace too long + assume-screen 30/width, 5/height + # initialize both halves of screen + assume-resources [ + [lesson/recipes.mu] <- [ + |abc| + ] + ] + env:&:environment <- new-programming-environment resources, screen, [def] # contents of sandbox + render-all screen, env, render + # type one letter in each of them + assume-console [ + left-click 1, 1 + type [0] + left-click 1, 17 + type [1] + ] + run [ + event-loop screen, console, env, resources + recipes:&:editor <- get *env, recipes:offset + 5:num/raw <- get *recipes, cursor-column:offset + sandbox:&:editor <- get *env, current-sandbox:offset + 7:num/raw <- get *sandbox, cursor-column:offset + ] + screen-should-contain [ + . run (F4) . # this line has a different background, but we don't test that yet + .a0bc ┊d1ef . + . ┊──────────────. + .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ . + . ┊ . + ] + memory-should-contain [ + 5 <- 2 # cursor column of recipe editor + 7 <- 18 # cursor column of sandbox editor + ] + # show the cursor at the right window + run [ + cursor:char <- copy 9251/␣ + print screen, cursor + ] + screen-should-contain [ + . run (F4) . + .a0bc ┊d1␣f . + . ┊──────────────. + .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ . + . ┊ . + ] +] + +scenario editor-in-focus-keeps-cursor [ + local-scope + trace-until 100/app # trace too long + assume-screen 30/width, 5/height + assume-resources [ + [lesson/recipes.mu] <- [ + |abc| + ] + ] + env:&:environment <- new-programming-environment resources, screen, [def] + render-all screen, env, render + # initialize programming environment and highlight cursor + assume-console [] + run [ + event-loop screen, console, env, resources + cursor:char <- copy 9251/␣ + print screen, cursor + ] + # is cursor at the right place? + screen-should-contain [ + . run (F4) . + .␣bc ┊def . + . ┊──────────────. + .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ . + . ┊ . + ] + # now try typing a letter + assume-console [ + type [z] + ] + run [ + event-loop screen, console, env, resources + cursor:char <- copy 9251/␣ + print screen, cursor + ] + # cursor should still be right + screen-should-contain [ + . run (F4) . + .z␣bc ┊def . + . ┊──────────────. + .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ . + . ┊ . + ] +] + +scenario backspace-in-sandbox-editor-joins-lines [ + local-scope + trace-until 100/app # trace too long + assume-screen 30/width, 5/height + assume-resources [ + ] + # initialize sandbox side with two lines + test-sandbox-editor-contents:text <- new [abc +def] + env:&:environment <- new-programming-environment resources, screen, test-sandbox-editor-contents + render-all screen, env, render + screen-should-contain [ + . run (F4) . + . ┊abc . + .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊def . + . ┊──────────────. + . ┊ . + ] + # position cursor at start of second line and hit backspace + assume-console [ + left-click 2, 16 + press backspace + ] + run [ + event-loop screen, console, env, resources + cursor:char <- copy 9251/␣ + print screen, cursor + ] + # cursor moves to end of old line + screen-should-contain [ + . run (F4) . + . ┊abc␣ef . + .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊──────────────. + . ┊ . + ] +] + +def render-all screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ + local-scope + load-ingredients + trace 10, [app], [render all] + hide-screen screen + # top menu + trace 11, [app], [render top menu] + width:num <- screen-width screen + draw-horizontal screen, 0, 0/left, width, 32/space, 0/black, 238/grey + 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: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 + + # + recipes:&:editor <- get *env, recipes:offset + current-sandbox:&:editor <- 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:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ + local-scope + load-ingredients + trace 11, [app], [render recipes] + recipes:&:editor <- get *env, recipes:offset + # render 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 + + # draw dotted line after recipes + draw-horizontal screen, row, left, right, 9480/horizontal-dotted + row <- add row, 1 + clear-screen-from screen, row, left, left, right +] + +# replaced in a later layer +def render-sandbox-side screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ + local-scope + load-ingredients + current-sandbox:&:editor <- 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) + draw-horizontal screen, row, left, right + row <- add row, 1 + clear-screen-from screen, row, left, left, right +] + +def update-cursor screen:&:screen, recipes:&:editor, current-sandbox:&:editor, sandbox-in-focus?:bool, env:&:environment -> screen:&:screen [ + local-scope + load-ingredients + + { + break-if sandbox-in-focus? + cursor-row:num <- get *recipes, cursor-row:offset + cursor-column:num <- get *recipes, cursor-column:offset + } + { + break-unless sandbox-in-focus? + 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:&:screen, s:text, left:num, right:num, row:num -> row:num, screen:&:screen [ + local-scope + load-ingredients + return-unless s + color:num <- copy 7/white + column:num <- copy left + screen <- move-cursor screen, row, column + screen-height:num <- screen-height screen + i:num <- copy 0 + len:num <- length *s + { + +next-character + done?:bool <- greater-or-equal i, len + break-if done? + done? <- greater-or-equal row, screen-height + break-if done? + c:char <- index *s, i + # only line different from render + { + # at right? wrap. + at-right?:bool <- equal column, right + break-unless at-right? + # print wrap icon + wrap-icon:char <- copy 8617/loop-back-to-left + print screen, wrap-icon, 245/grey + column <- copy left + row <- add row, 1 + screen <- move-cursor screen, row, column + loop +next-character # retry i + } + i <- add i, 1 + { + # newline? move to left rather than 0 + newline?:bool <- equal c, 10/newline + break-unless newline? + # clear rest of line in this window + { + done?:bool <- greater-than column, right + break-if done? + space:char <- copy 32/space + print screen, space + column <- add column, 1 + loop + } + row <- add row, 1 + column <- copy left + screen <- move-cursor screen, row, column + loop +next-character + } + print screen, c, color + column <- add column, 1 + loop + } + was-at-left?:bool <- equal column, left + clear-line-until screen, right + { + break-if was-at-left? + row <- add row, 1 + } + move-cursor screen, row, left +] + +# ctrl-l - redraw screen (just in case it printed junk somehow) + +after [ + { + redraw-screen?:bool <- equal c, 12/ctrl-l + break-unless redraw-screen? + screen <- render-all screen, env:&:environment, render + sync-screen screen + loop +next-event + } +] + +# ctrl-n - switch focus +# todo: test this + +after [ + { + switch-side?:bool <- equal c, 14/ctrl-n + break-unless switch-side? + 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 + loop +next-event + } +] + +## helpers + +def draw-vertical screen:&:screen, col:num, y:num, bottom:num -> screen:&:screen [ + local-scope + load-ingredients + style:char, style-found?:bool <- next-ingredient + { + break-if style-found? + style <- copy 9474/vertical + } + color:num, color-found?:bool <- next-ingredient + { + # default color to white + break-if color-found? + color <- copy 245/grey + } + { + continue?:bool <- lesser-than y, bottom + break-unless continue? + screen <- move-cursor screen, y, col + print screen, style, color + y <- add y, 1 + loop + } +] -- cgit 1.4.1-2-gfad0