diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2021-05-29 17:23:04 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2021-05-29 17:23:04 -0700 |
commit | 9516dfa0b04bcdcd1c9c38aa6278549ccdb5528c (patch) | |
tree | a701a0435d01d0a24a258c8ed06a7d9c836b2890 /shell | |
parent | d85529f3fac9044cfc52d395b1b64de4f4901cb9 (diff) | |
download | mu-9516dfa0b04bcdcd1c9c38aa6278549ccdb5528c.tar.gz |
shell: skeleton for scrolling
Diffstat (limited to 'shell')
-rw-r--r-- | shell/trace.mu | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/shell/trace.mu b/shell/trace.mu index 4203944b..20de38c2 100644 --- a/shell/trace.mu +++ b/shell/trace.mu @@ -23,15 +23,18 @@ type trace { # render loop: # rendering displays trace lines that match visible lines # (caching in each line) + # (caching top-line) # rendering computes cursor-line based on the cursor-y coordinate # edit-trace updates cursor-y coordinate # edit-trace might add/remove lines to visible + # edit-trace might update top-line visible: (handle array trace-line) recreate-caches?: boolean cursor-line-index: int # index into data cursor-y: int # row index on screen unclip-cursor-line?: boolean # extremely short-lived; reset any time cursor moves - top-line-index: int # index into data + top-line-index: int # start rendering trace past this index into data (updated on re-evaluation) + top-line-y: int # trace starts rendering at this row index on screen (updated on re-evaluation) } type trace-line { @@ -434,6 +437,8 @@ fn render-trace screen: (addr screen), _self: (addr trace), xmin: int, ymin: int compare *recreate-caches?, 0/false { break-if-= + var dest/eax: (addr int) <- get self, top-line-y + copy-to *dest, y recompute-all-visible-lines self mark-lines-clean self } @@ -441,7 +446,6 @@ fn render-trace screen: (addr screen), _self: (addr trace), xmin: int, ymin: int var trace-ah/eax: (addr handle array trace-line) <- get self, data var _trace/eax: (addr array trace-line) <- lookup *trace-ah var trace/edi: (addr array trace-line) <- copy _trace - var i/edx: int <- copy 0 var max-addr/ebx: (addr int) <- get self, first-free var max/ebx: int <- copy *max-addr # display trace depth (not in tests) @@ -460,6 +464,8 @@ fn render-trace screen: (addr screen), _self: (addr trace), xmin: int, ymin: int draw-text-rightward-from-cursor-over-full-screen screen, "trace depth: ", 0x17/fg, 0xc5/bg=blue-bg draw-int32-decimal-wrapping-right-then-down-from-cursor-over-full-screen screen, *max-depth, 0x7/fg, 0xc5/bg=blue-bg } + var top-line-addr/edx: (addr int) <- get self, top-line-index + var i/edx: int <- copy *top-line-addr $render-trace:loop: { compare i, max break-if->= @@ -924,6 +930,20 @@ fn edit-trace _self: (addr trace), key: grapheme { copy-to *unclip-cursor-line?, 1/true return } + # ctrl-f: scroll down + { + compare key, 6/ctrl-f + break-if-!= + scroll-down self + return + } + # ctrl-b: scroll up + { + compare key, 2/ctrl-b + break-if-!= + scroll-up self + return + } } fn expand _self: (addr trace) { @@ -1789,3 +1809,9 @@ fn test-trace-collapse-nested-level { check-screen-row screen, 3/y, "... ", "F - test-trace-collapse-nested-level/post-3" check-background-color-in-screen-row screen, 7/bg=cursor, 3/y, " ", "F - test-trace-collapse-nested-level/post-3/cursor" } + +fn scroll-down _self: (addr trace) { +} + +fn scroll-up _self: (addr trace) { +} |