diff options
Diffstat (limited to 'html/edit')
| -rw-r--r-- | html/edit/002-typing.mu.html | 48 | ||||
| -rw-r--r-- | html/edit/003-shortcuts.mu.html | 128 | ||||
| -rw-r--r-- | html/edit/004-programming-environment.mu.html | 4 | ||||
| -rw-r--r-- | html/edit/012-editor-undo.mu.html | 4 |
4 files changed, 71 insertions, 113 deletions
diff --git a/html/edit/002-typing.mu.html b/html/edit/002-typing.mu.html index 2c52331c..15853c1f 100644 --- a/html/edit/002-typing.mu.html +++ b/html/edit/002-typing.mu.html @@ -69,7 +69,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># keyboard events</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> is-touch? - screen, editor, go-render?:bool <span class="Special"><-</span> handle-keyboard-event screen, editor, e + go-render?:bool <span class="Special"><-</span> handle-keyboard-event screen, editor, e <span class="Delimiter">{</span> <span class="muControl">break-unless</span> go-render? screen <span class="Special"><-</span> editor-render screen, editor @@ -196,11 +196,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># Process an event 'e' and try to minimally update the screen.</span> <span class="Comment"># Set 'go-render?' to true to indicate the caller must perform a non-minimal update.</span> -<span class="muRecipe">def</span> handle-keyboard-event screen:&:screen, editor:&:editor, e:event<span class="muRecipe"> -> </span>screen:&:screen, editor:&:editor, go-render?:bool [ +<span class="muRecipe">def</span> handle-keyboard-event screen:&:screen, editor:&:editor, e:event<span class="muRecipe"> -> </span>go-render?:bool, screen:&:screen, editor:&:editor [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return-unless</span> editor + <span class="muControl">return-unless</span> editor, <span class="Constant">0/don't-render</span> screen-width:num <span class="Special"><-</span> screen-width screen screen-height:num <span class="Special"><-</span> screen-height screen left:num <span class="Special"><-</span> get *editor, <span class="Constant">left:offset</span> @@ -219,11 +218,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> <handle-special-character></span> <span class="Comment"># ignore any other special characters</span> regular-character?:bool <span class="Special"><-</span> greater-or-equal c, <span class="Constant">32/space</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return-unless</span> regular-character? + <span class="muControl">return-unless</span> regular-character?, <span class="Constant">0/don't-render</span> <span class="Comment"># otherwise type it in</span> <span class="Constant"> <insert-character-begin></span> - editor, screen, go-render?:bool <span class="Special"><-</span> insert-at-cursor editor, c, screen + go-render? <span class="Special"><-</span> insert-at-cursor editor, c, screen <span class="Constant"> <insert-character-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> @@ -232,11 +230,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assert is-keycode?, <span class="Constant">[event was of unknown type; neither keyboard nor mouse]</span> <span class="Comment"># handlers for each special key will go here</span> <span class="Constant"> <handle-special-key></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> ] -<span class="muRecipe">def</span> insert-at-cursor editor:&:editor, c:char, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor, screen:&:screen, go-render?:bool [ +<span class="muRecipe">def</span> insert-at-cursor editor:&:editor, c:char, screen:&:screen<span class="muRecipe"> -> </span>go-render?:bool, editor:&:editor, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> before-cursor:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">before-cursor:offset</span> @@ -268,8 +265,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break-if</span> overflow? move-cursor screen, save-row, save-column print screen, c - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">0/don't-render</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="Comment"># not at right margin? print the character and rest of line</span> @@ -281,9 +277,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color curr-column:num <span class="Special"><-</span> copy save-column <span class="Delimiter">{</span> <span class="Comment"># hit right margin? give up and let caller render</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> at-right?:bool <span class="Special"><-</span> greater-than curr-column, right - <span class="muControl">return-if</span> at-right? + <span class="muControl">return-if</span> at-right?, <span class="Constant">1/go-render</span> <span class="muControl">break-unless</span> curr <span class="Comment"># newline? done.</span> currc:char <span class="Special"><-</span> get *curr, <span class="Constant">value:offset</span> @@ -294,11 +289,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color curr <span class="Special"><-</span> next curr <span class="muControl">loop</span> <span class="Delimiter">}</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">0/don't-render</span> <span class="Delimiter">}</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> ] <span class="Comment"># helper for tests</span> @@ -775,8 +768,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break-unless</span> below-screen? <span class="Constant"> <scroll-down></span> <span class="Delimiter">}</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] @@ -898,14 +890,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color newline?:bool <span class="Special"><-</span> equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> newline? <span class="Constant"> <insert-enter-begin></span> - editor <span class="Special"><-</span> insert-new-line-and-indent editor, screen + insert-new-line-and-indent editor, screen <span class="Constant"> <insert-enter-end></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> insert-new-line-and-indent editor:&:editor, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor, screen:&:screen, go-render?:bool [ +<span class="muRecipe">def</span> insert-new-line-and-indent editor:&:editor, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> cursor-row:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-row:offset</span> @@ -927,7 +918,6 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color below-screen?:bool <span class="Special"><-</span> greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal, never greater</span> <span class="muControl">break-unless</span> below-screen? <span class="Constant"> <scroll-down></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> cursor-row <span class="Special"><-</span> subtract cursor-row,<span class="Constant"> 1</span> <span class="Comment"># bring back into screen range</span> *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row <span class="Delimiter">}</span> @@ -941,7 +931,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">{</span> indent-done?:bool <span class="Special"><-</span> greater-or-equal i, indent <span class="muControl">break-if</span> indent-done? - editor, screen, go-render?:bool <span class="Special"><-</span> insert-at-cursor editor, <span class="Constant">32/space</span>, screen + insert-at-cursor editor, <span class="Constant">32/space</span>, screen i <span class="Special"><-</span> add i,<span class="Constant"> 1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> @@ -1083,8 +1073,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color paste-start?:bool <span class="Special"><-</span> equal k, <span class="Constant">65507/paste-start</span> <span class="muControl">break-unless</span> paste-start? *editor <span class="Special"><-</span> put *editor, <span class="Constant">indent?:offset</span>, <span class="Constant">0/false</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] @@ -1093,8 +1082,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color paste-end?:bool <span class="Special"><-</span> equal k, <span class="Constant">65506/paste-end</span> <span class="muControl">break-unless</span> paste-end? *editor <span class="Special"><-</span> put *editor, <span class="Constant">indent?:offset</span>, <span class="Constant">1/true</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] diff --git a/html/edit/003-shortcuts.mu.html b/html/edit/003-shortcuts.mu.html index 9225ac1a..e7b49f49 100644 --- a/html/edit/003-shortcuts.mu.html +++ b/html/edit/003-shortcuts.mu.html @@ -63,11 +63,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color tab?:bool <span class="Special"><-</span> equal c, <span class="Constant">9/tab</span> <span class="muControl">break-unless</span> tab? <span class="Constant"> <insert-character-begin></span> - editor, screen, go-render?:bool <span class="Special"><-</span> insert-at-cursor editor, <span class="Constant">32/space</span>, screen - editor, screen, go-render?:bool <span class="Special"><-</span> insert-at-cursor editor, <span class="Constant">32/space</span>, screen + insert-at-cursor editor, <span class="Constant">32/space</span>, screen + insert-at-cursor editor, <span class="Constant">32/space</span>, screen <span class="Constant"> <insert-character-end></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] @@ -106,7 +105,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color delete-previous-character?:bool <span class="Special"><-</span> equal c, <span class="Constant">8/backspace</span> <span class="muControl">break-unless</span> delete-previous-character? <span class="Constant"> <backspace-character-begin></span> - editor, screen, go-render?:bool, backspaced-cell:&:duplex-list:char <span class="Special"><-</span> delete-before-cursor editor, screen + go-render?:bool, backspaced-cell:&:duplex-list:char <span class="Special"><-</span> delete-before-cursor editor, screen <span class="Constant"> <backspace-character-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> @@ -115,31 +114,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># return values:</span> <span class="Comment"># go-render? - whether caller needs to update the screen</span> <span class="Comment"># backspaced-cell - value deleted (or 0 if nothing was deleted) so we can save it for undo, etc.</span> -<span class="muRecipe">def</span> delete-before-cursor editor:&:editor, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor, screen:&:screen, go-render?:bool, backspaced-cell:&:duplex-list:char [ +<span class="muRecipe">def</span> delete-before-cursor editor:&:editor, screen:&:screen<span class="muRecipe"> -> </span>go-render?:bool, backspaced-cell:&:duplex-list:char, editor:&:editor, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> before-cursor:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">before-cursor:offset</span> data:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">data:offset</span> <span class="Comment"># if at start of text (before-cursor at § sentinel), return</span> prev:&:duplex-list:char <span class="Special"><-</span> prev before-cursor - go-render?, backspaced-cell <span class="Special"><-</span> copy <span class="Constant">0/no-more-render</span>, <span class="Constant">0/nothing-deleted</span> - <span class="muControl">return-unless</span> prev + <span class="muControl">return-unless</span> prev, <span class="Constant">0/no-more-render</span>, <span class="Constant">0/nothing-deleted</span> trace<span class="Constant"> 10</span>, <span class="Constant">[app]</span>, <span class="Constant">[delete-before-cursor]</span> original-row:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-row:offset</span> - editor, scroll?:bool <span class="Special"><-</span> move-cursor-coordinates-left editor + scroll?:bool <span class="Special"><-</span> move-cursor-coordinates-left editor backspaced-cell:&:duplex-list:char <span class="Special"><-</span> copy before-cursor data <span class="Special"><-</span> remove before-cursor, data <span class="Comment"># will also neatly trim next/prev pointers in backspaced-cell/before-cursor</span> before-cursor <span class="Special"><-</span> copy prev *editor <span class="Special"><-</span> put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return-if</span> scroll? + <span class="muControl">return-if</span> scroll?, <span class="Constant">1/go-render</span> screen-width:num <span class="Special"><-</span> screen-width screen cursor-row:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-row:offset</span> cursor-column:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-column:offset</span> <span class="Comment"># did we just backspace over a newline?</span> same-row?:bool <span class="Special"><-</span> equal cursor-row, original-row - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return-unless</span> same-row? + <span class="muControl">return-unless</span> same-row?, <span class="Constant">1/go-render</span> left:num <span class="Special"><-</span> get *editor, <span class="Constant">left:offset</span> right:num <span class="Special"><-</span> get *editor, <span class="Constant">right:offset</span> curr:&:duplex-list:char <span class="Special"><-</span> next before-cursor @@ -148,8 +144,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">{</span> <span class="Comment"># hit right margin? give up and let caller render</span> at-right?:bool <span class="Special"><-</span> greater-or-equal curr-column, right - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return-if</span> at-right? + <span class="muControl">return-if</span> at-right?, <span class="Constant">1/go-render</span> <span class="muControl">break-unless</span> curr <span class="Comment"># newline? done.</span> currc:char <span class="Special"><-</span> get *curr, <span class="Constant">value:offset</span> @@ -166,9 +161,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> ] -<span class="muRecipe">def</span> move-cursor-coordinates-left editor:&:editor<span class="muRecipe"> -> </span>editor:&:editor, go-render?:bool [ +<span class="muRecipe">def</span> move-cursor-coordinates-left editor:&:editor<span class="muRecipe"> -> </span>go-render?:bool, editor:&:editor [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> + go-render?:bool <span class="Special"><-</span> copy <span class="Constant">0/false</span> before-cursor:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">before-cursor:offset</span> cursor-row:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-row:offset</span> cursor-column:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-column:offset</span> @@ -180,12 +176,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace<span class="Constant"> 10</span>, <span class="Constant">[app]</span>, <span class="Constant">[decrementing cursor column]</span> cursor-column <span class="Special"><-</span> subtract cursor-column,<span class="Constant"> 1</span> *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> <span class="muControl">return</span> <span class="Delimiter">}</span> <span class="Comment"># if at left margin, we must move to previous row:</span> top-of-screen?:bool <span class="Special"><-</span> equal cursor-row,<span class="Constant"> 1</span> <span class="Comment"># exclude menu bar</span> - go-render?:bool <span class="Special"><-</span> copy <span class="Constant">0/false</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> top-of-screen? cursor-row <span class="Special"><-</span> subtract cursor-row,<span class="Constant"> 1</span> @@ -379,25 +373,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color delete-next-character?:bool <span class="Special"><-</span> equal k, <span class="Constant">65522/delete</span> <span class="muControl">break-unless</span> delete-next-character? <span class="Constant"> <delete-character-begin></span> - editor, screen, go-render?:bool, deleted-cell:&:duplex-list:char <span class="Special"><-</span> delete-at-cursor editor, screen + go-render?:bool, deleted-cell:&:duplex-list:char <span class="Special"><-</span> delete-at-cursor editor, screen <span class="Constant"> <delete-character-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> delete-at-cursor editor:&:editor, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor, screen:&:screen, go-render?:bool, deleted-cell:&:duplex-list:char [ +<span class="muRecipe">def</span> delete-at-cursor editor:&:editor, screen:&:screen<span class="muRecipe"> -> </span>go-render?:bool, deleted-cell:&:duplex-list:char, editor:&:editor, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> before-cursor:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">before-cursor:offset</span> data:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">data:offset</span> deleted-cell:&:duplex-list:char <span class="Special"><-</span> next before-cursor - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return-unless</span> deleted-cell + <span class="muControl">return-unless</span> deleted-cell, <span class="Constant">0/don't-render</span> currc:char <span class="Special"><-</span> get *deleted-cell, <span class="Constant">value:offset</span> data <span class="Special"><-</span> remove deleted-cell, data deleted-newline?:bool <span class="Special"><-</span> equal currc, <span class="Constant">10/newline</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return-if</span> deleted-newline? + <span class="muControl">return-if</span> deleted-newline?, <span class="Constant">1/go-render</span> <span class="Comment"># wasn't a newline? render rest of line</span> curr:&:duplex-list:char <span class="Special"><-</span> next before-cursor <span class="Comment"># refresh after remove above</span> cursor-row:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-row:offset</span> @@ -408,8 +400,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">{</span> <span class="Comment"># hit right margin? give up and let caller render</span> at-right?:bool <span class="Special"><-</span> greater-or-equal curr-column, screen-width - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return-if</span> at-right? + <span class="muControl">return-if</span> at-right?, <span class="Constant">1/go-render</span> <span class="muControl">break-unless</span> curr <span class="Comment"># newline? done.</span> currc:char <span class="Special"><-</span> get *curr, <span class="Constant">value:offset</span> @@ -461,7 +452,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> <move-cursor-begin></span> before-cursor <span class="Special"><-</span> copy next-cursor *editor <span class="Special"><-</span> put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor - editor, go-render?:bool <span class="Special"><-</span> move-cursor-coordinates-right editor, screen-height + go-render?:bool <span class="Special"><-</span> move-cursor-coordinates-right editor, screen-height screen <span class="Special"><-</span> move-cursor screen, cursor-row, cursor-column undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">2/right-arrow</span> <span class="Constant"> <move-cursor-end></span> @@ -469,7 +460,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> move-cursor-coordinates-right editor:&:editor, screen-height:num<span class="muRecipe"> -> </span>editor:&:editor, go-render?:bool [ +<span class="muRecipe">def</span> move-cursor-coordinates-right editor:&:editor, screen-height:num<span class="muRecipe"> -> </span>go-render?:bool, editor:&:editor [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> before-cursor:&:duplex-list:char <span class="Special"><-</span> get *editor <span class="Constant">before-cursor:offset</span> @@ -487,13 +478,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color cursor-column <span class="Special"><-</span> copy left *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column below-screen?:bool <span class="Special"><-</span> greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return-unless</span> below-screen? + <span class="muControl">return-unless</span> below-screen?, <span class="Constant">0/don't-render</span> <span class="Constant"> <scroll-down></span> cursor-row <span class="Special"><-</span> subtract cursor-row,<span class="Constant"> 1</span> <span class="Comment"># bring back into screen range</span> *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> <span class="Comment"># if the line wraps, move cursor to start of next row</span> <span class="Delimiter">{</span> @@ -512,12 +501,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color cursor-column <span class="Special"><-</span> copy left *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column below-screen?:bool <span class="Special"><-</span> greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal</span> - <span class="muControl">return-unless</span> below-screen?, editor, <span class="Constant">0/no-more-render</span> + <span class="muControl">return-unless</span> below-screen?, <span class="Constant">0/no-more-render</span> <span class="Constant"> <scroll-down></span> cursor-row <span class="Special"><-</span> subtract cursor-row,<span class="Constant"> 1</span> <span class="Comment"># bring back into screen range</span> *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> <span class="Comment"># otherwise move cursor one character right</span> cursor-column <span class="Special"><-</span> add cursor-column,<span class="Constant"> 1</span> @@ -744,10 +732,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace<span class="Constant"> 10</span>, <span class="Constant">[app]</span>, <span class="Constant">[left arrow]</span> <span class="Comment"># if not at start of text (before-cursor at § sentinel)</span> prev:&:duplex-list:char <span class="Special"><-</span> prev before-cursor - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return-unless</span> prev + <span class="muControl">return-unless</span> prev, <span class="Constant">0/don't-render</span> <span class="Constant"> <move-cursor-begin></span> - editor, go-render? <span class="Special"><-</span> move-cursor-coordinates-left editor + go-render? <span class="Special"><-</span> move-cursor-coordinates-left editor before-cursor <span class="Special"><-</span> copy prev *editor <span class="Special"><-</span> put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">1/left-arrow</span> @@ -1013,16 +1000,17 @@ d] move-to-previous-line?:bool <span class="Special"><-</span> equal k, <span class="Constant">65517/up-arrow</span> <span class="muControl">break-unless</span> move-to-previous-line? <span class="Constant"> <move-cursor-begin></span> - editor, go-render? <span class="Special"><-</span> move-to-previous-line editor + go-render? <span class="Special"><-</span> move-to-previous-line editor undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">3/up-arrow</span> <span class="Constant"> <move-cursor-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> move-to-previous-line editor:&:editor<span class="muRecipe"> -> </span>editor:&:editor, go-render?:bool [ +<span class="muRecipe">def</span> move-to-previous-line editor:&:editor<span class="muRecipe"> -> </span>go-render?:bool, editor:&:editor [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> + go-render?:bool <span class="Special"><-</span> copy <span class="Constant">0/false</span> cursor-row:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-row:offset</span> cursor-column:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-column:offset</span> before-cursor:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">before-cursor:offset</span> @@ -1043,14 +1031,12 @@ d] <span class="muControl">break-if</span> at-newline? curr:&:duplex-list:char <span class="Special"><-</span> before-previous-line curr, editor no-motion?:bool <span class="Special"><-</span> equal curr, old - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> <span class="muControl">return-if</span> no-motion? <span class="Delimiter">}</span> <span class="Delimiter">{</span> old <span class="Special"><-</span> copy curr curr <span class="Special"><-</span> before-previous-line curr, editor no-motion?:bool <span class="Special"><-</span> equal curr, old - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> <span class="muControl">return-if</span> no-motion? <span class="Delimiter">}</span> before-cursor <span class="Special"><-</span> copy curr @@ -1076,15 +1062,13 @@ d] *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column <span class="muControl">loop</span> <span class="Delimiter">}</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> <span class="muControl">return</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="Comment"># if cursor already at top, scroll up</span> <span class="muControl">break-unless</span> already-at-top? <span class="Constant"> <scroll-up></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] @@ -1247,14 +1231,14 @@ d] move-to-next-line?:bool <span class="Special"><-</span> equal k, <span class="Constant">65516/down-arrow</span> <span class="muControl">break-unless</span> move-to-next-line? <span class="Constant"> <move-cursor-begin></span> - editor, go-render? <span class="Special"><-</span> move-to-next-line editor, screen-height + go-render? <span class="Special"><-</span> move-to-next-line editor, screen-height undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">4/down-arrow</span> <span class="Constant"> <move-cursor-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> move-to-next-line editor:&:editor, screen-height:num<span class="muRecipe"> -> </span>editor:&:editor, go-render?:bool [ +<span class="muRecipe">def</span> move-to-next-line editor:&:editor, screen-height:num<span class="muRecipe"> -> </span>go-render?:bool, editor:&:editor [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> cursor-row:num <span class="Special"><-</span> get *editor, <span class="Constant">cursor-row:offset</span> @@ -1277,8 +1261,7 @@ d] <span class="muControl">break-unless</span> no-motion? scroll?:bool <span class="Special"><-</span> greater-than cursor-row,<span class="Constant"> 1</span> <span class="muControl">break-if</span> scroll?, <span class="Constant">+try-to-scroll</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">0/don't-render</span> <span class="Delimiter">}</span> cursor-row <span class="Special"><-</span> add cursor-row,<span class="Constant"> 1</span> *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row @@ -1302,8 +1285,7 @@ d] *editor <span class="Special"><-</span> put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column <span class="muControl">loop</span> <span class="Delimiter">}</span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">0/don't-render</span> <span class="Delimiter">}</span> <span class="Constant"> +try-to-scroll</span> <span class="Constant"> <scroll-down></span> @@ -1383,8 +1365,7 @@ d] move-to-start-of-line editor undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">0/don't-render</span> <span class="Delimiter">}</span> ] @@ -1396,8 +1377,7 @@ d] move-to-start-of-line editor undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">0/don't-render</span> <span class="Delimiter">}</span> ] @@ -1559,8 +1539,7 @@ d] move-to-end-of-line editor undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">0/don't-render</span> <span class="Delimiter">}</span> ] @@ -1572,8 +1551,7 @@ d] move-to-end-of-line editor undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">0/don't-render</span> <span class="Delimiter">}</span> ] @@ -1708,8 +1686,7 @@ d] <span class="Constant"> <delete-to-start-of-line-begin></span> deleted-cells:&:duplex-list:char <span class="Special"><-</span> delete-to-start-of-line editor <span class="Constant"> <delete-to-start-of-line-end></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] @@ -1846,8 +1823,7 @@ d] <span class="Constant"> <delete-to-end-of-line-begin></span> deleted-cells:&:duplex-list:char <span class="Special"><-</span> delete-to-end-of-line editor <span class="Constant"> <delete-to-end-of-line-end></span> - go-render? <span class="Special"><-</span> copy <span class="Constant">1/true</span> - <span class="muControl">return</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] @@ -2037,8 +2013,7 @@ d] top-of-screen <span class="Special"><-</span> before-start-of-next-line top-of-screen, max *editor <span class="Special"><-</span> put *editor, <span class="Constant">top-of-screen:offset</span>, top-of-screen no-movement?:bool <span class="Special"><-</span> equal old-top, top-of-screen - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return-if</span> no-movement? + <span class="muControl">return-if</span> no-movement?, <span class="Constant">0/don't-render</span> ] <span class="Comment"># takes a pointer into the doubly-linked list, scans ahead at most 'max'</span> @@ -2417,8 +2392,7 @@ d] top-of-screen <span class="Special"><-</span> before-previous-line top-of-screen, editor *editor <span class="Special"><-</span> put *editor, <span class="Constant">top-of-screen:offset</span>, top-of-screen no-movement?:bool <span class="Special"><-</span> equal old-top, top-of-screen - go-render? <span class="Special"><-</span> copy <span class="Constant">0/false</span> - <span class="muControl">return-if</span> no-movement? + <span class="muControl">return-if</span> no-movement?, <span class="Constant">0/don't-render</span> ] <span class="Comment"># takes a pointer into the doubly-linked list, scans back to before start of</span> @@ -2824,9 +2798,8 @@ e] undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> top-of-screen:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">top-of-screen:offset</span> - no-movement?:bool <span class="Special"><-</span> equal top-of-screen, old-top - go-render? <span class="Special"><-</span> not no-movement? - <span class="muControl">return</span> + movement?:bool <span class="Special"><-</span> not-equal top-of-screen, old-top + <span class="muControl">return</span> movement?/go-render <span class="Delimiter">}</span> ] @@ -2840,9 +2813,8 @@ e] undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> top-of-screen:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">top-of-screen:offset</span> - no-movement?:bool <span class="Special"><-</span> equal top-of-screen, old-top - go-render? <span class="Special"><-</span> not no-movement? - <span class="muControl">return</span> + movement?:bool <span class="Special"><-</span> not-equal top-of-screen, old-top + <span class="muControl">return</span> movement?/go-render <span class="Delimiter">}</span> ] @@ -3025,9 +2997,8 @@ e] undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> top-of-screen:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">top-of-screen:offset</span> - no-movement?:bool <span class="Special"><-</span> equal top-of-screen, old-top - go-render? <span class="Special"><-</span> not no-movement? - <span class="muControl">return</span> + movement?:bool <span class="Special"><-</span> not-equal top-of-screen, old-top + <span class="muControl">return</span> movement?/go-render <span class="Delimiter">}</span> ] @@ -3041,10 +3012,9 @@ e] undo-coalesce-tag:num <span class="Special"><-</span> copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> top-of-screen:&:duplex-list:char <span class="Special"><-</span> get *editor, <span class="Constant">top-of-screen:offset</span> - no-movement?:bool <span class="Special"><-</span> equal top-of-screen, old-top + movement?:bool <span class="Special"><-</span> not-equal top-of-screen, old-top <span class="Comment"># don't bother re-rendering if nothing changed. todo: test this</span> - go-render? <span class="Special"><-</span> not no-movement? - <span class="muControl">return</span> + <span class="muControl">return</span> movement?/go-render <span class="Delimiter">}</span> ] diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html index f363ac7e..776c336e 100644 --- a/html/edit/004-programming-environment.mu.html +++ b/html/edit/004-programming-environment.mu.html @@ -147,7 +147,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color sandbox-in-focus?:bool <span class="Special"><-</span> get *env, <span class="Constant">sandbox-in-focus?:offset</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> sandbox-in-focus? - screen, recipes, render?:bool <span class="Special"><-</span> handle-keyboard-event screen, recipes, e:event + render?:bool <span class="Special"><-</span> handle-keyboard-event screen, recipes, e:event <span class="Comment"># refresh screen only if no more events</span> <span class="Comment"># if there are more events to process, wait for them to clear up, then make sure you render-all afterward.</span> more-events?:bool <span class="Special"><-</span> has-more-events? console @@ -175,7 +175,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> sandbox-in-focus? - screen, current-sandbox, render?:bool <span class="Special"><-</span> handle-keyboard-event screen, current-sandbox, e:event + render?:bool <span class="Special"><-</span> handle-keyboard-event screen, current-sandbox, e:event <span class="Comment"># refresh screen only if no more events</span> <span class="Comment"># if there are more events to process, wait for them to clear up, then make sure you render-all afterward.</span> more-events?:bool <span class="Special"><-</span> has-more-events? console diff --git a/html/edit/012-editor-undo.mu.html b/html/edit/012-editor-undo.mu.html index c0f6d84a..ec4fd7b9 100644 --- a/html/edit/012-editor-undo.mu.html +++ b/html/edit/012-editor-undo.mu.html @@ -109,7 +109,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color redo <span class="Special"><-</span> push op, redo *editor <span class="Special"><-</span> put *editor, <span class="Constant">redo:offset</span>, redo <span class="Constant"> <handle-undo></span> - <span class="muControl">return</span> screen, editor, <span class="Constant">1/go-render</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] @@ -127,7 +127,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color undo <span class="Special"><-</span> push op, undo *editor <span class="Special"><-</span> put *editor, <span class="Constant">undo:offset</span>, undo <span class="Constant"> <handle-redo></span> - <span class="muControl">return</span> screen, editor, <span class="Constant">1/go-render</span> + <span class="muControl">return</span> <span class="Constant">1/go-render</span> <span class="Delimiter">}</span> ] |