From 6ac59c625d978567ac6938a8b048cf283ee864fb Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 12 Jun 2016 22:04:10 -0700 Subject: 3053 - keep cursor stable on resize As much as possible; if the cursor moves off screen, it still resets to top of screen. --- edit/004-programming-environment.mu | 86 ++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) (limited to 'edit') diff --git a/edit/004-programming-environment.mu b/edit/004-programming-environment.mu index e3bf3be3..247a4c68 100644 --- a/edit/004-programming-environment.mu +++ b/edit/004-programming-environment.mu @@ -111,7 +111,7 @@ def event-loop screen:address:screen, console:address:console, env:address:progr { break-if more-events? env, screen <- resize screen, env - screen <- render-all screen, env, render + screen <- render-all screen, env, render-without-moving-cursor render-all-on-no-more-events? <- copy 0/false # full render done } loop +next-event:label @@ -208,6 +208,90 @@ def resize screen:address:screen, env:address:programming-environment-data -> en *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:address:screen, editor:address:editor-data -> last-row:number, last-column:number, screen:address:screen, editor:address: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 + curr <- next curr + +render-loop-initialization + color:number <- copy 7/white + row:number <- copy 1/top + column:number <- copy left + # save before-cursor + old-before-cursor:address:duplex-list:character <- 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 + *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 + 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 + 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 + + { + # newline? move to left rather than 0 + newline?:boolean <- 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:label + } + { + # 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 + break-unless at-right? + # print wrap icon + wrap-icon:character <- 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:label + } + 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, screen/same-as-ingredient:0, editor/same-as-ingredient:1 +] + + scenario point-at-multiple-editors [ trace-until 100/app # trace too long assume-screen 30/width, 5/height -- cgit 1.4.1-2-gfad0 0-09-07 13:51:54 -0700 committer Kartik Agaram <vc@akkartik.com> 2020-09-07 14:18:48 -0700 6742 - support for formatting in fake screens' href='/akkartik/mu/commit/308allocate-array.subx?h=main&id=5462619d963ca8606c03812b1d8d614bb7e0462c'>5462619d ^ 
b8df5340 ^

5e0ae917 ^





15b98801 ^

5e0ae917 ^


ae470b42 ^

15b98801 ^

5e0ae917 ^



15b98801 ^

5e0ae917 ^





1

2

3

4
5

6

7
8
9
10
11

12

13
14

15

16

17
18
19

20

21
22
23
24
25