From d0e2d093f789fac54056a2f19f2339d230a69420 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 1 May 2021 15:56:56 -0700 Subject: cleaner rendering of fake screens and keyboards I don't understand why a second line in the keyboard is visible now where it wasn't before. That whole aspect has unclear desires. What exactly do I want to happen on newlines? --- shell/global.mu | 2 +- shell/sandbox.mu | 125 ++++--------------------------------------------------- 2 files changed, 10 insertions(+), 117 deletions(-) diff --git a/shell/global.mu b/shell/global.mu index c8babbff..7592189c 100644 --- a/shell/global.mu +++ b/shell/global.mu @@ -1351,7 +1351,7 @@ fn apply-print _args-ah: (addr handle cell), out: (addr handle cell), trace: (ad var stream-storage: (stream byte 0x100) var stream/edi: (addr stream byte) <- address stream-storage print-cell second-ah, stream, trace - draw-stream-wrapping-right-then-down-from-cursor-over-full-screen screen, stream, 7/fg, 0xc5/bg=blue-bg + draw-stream-wrapping-right-then-down-from-cursor-over-full-screen screen, stream, 7/fg, 0/bg # return what was printed copy-object second-ah, out } diff --git a/shell/sandbox.mu b/shell/sandbox.mu index 40490e13..4d5286b0 100644 --- a/shell/sandbox.mu +++ b/shell/sandbox.mu @@ -214,23 +214,6 @@ fn maybe-render-screen screen: (addr screen), _self: (addr sandbox), xmin: int, fn render-empty-screen screen: (addr screen), _target-screen: (addr screen), xmin: int, ymin: int -> _/ecx: int { var target-screen/esi: (addr screen) <- copy _target-screen var screen-y/edi: int <- copy ymin - # top border - { - set-cursor-position screen, xmin, screen-y - var width/edx: (addr int) <- get target-screen, width - var limit/edx: int <- copy *width - limit <- add 2/screen-border - var x/ebx: int <- copy 0 - { - compare x, limit - break-if->= - draw-code-point-at-cursor screen, 0x20/space, 0/fg, 0xdc/bg=green-bg - move-cursor-right screen - x <- increment - loop - } - screen-y <- increment - } # screen var height/edx: (addr int) <- get target-screen, height var y/ecx: int <- copy 0 @@ -238,63 +221,26 @@ fn render-empty-screen screen: (addr screen), _target-screen: (addr screen), xmi compare y, *height break-if->= set-cursor-position screen, xmin, screen-y - draw-code-point-at-cursor screen, 0x20/space, 0/fg, 0xdc/bg=green-bg - move-cursor-right screen var width/edx: (addr int) <- get target-screen, width var x/ebx: int <- copy 0 { compare x, *width break-if->= - draw-code-point-at-cursor screen, 0x20/space, 0x18/fg, 0xc5/bg=blue-bg + draw-code-point-at-cursor screen, 0x20/space, 0x18/fg, 0/bg move-cursor-right screen x <- increment loop } - draw-code-point-at-cursor screen, 0x20/space, 0/fg, 0xdc/bg=green-bg y <- increment screen-y <- increment loop } - # bottom border - { - set-cursor-position screen, xmin, screen-y - var width/edx: (addr int) <- get target-screen, width - var limit/edx: int <- copy *width - limit <- add 2/screen-border - var x/ebx: int <- copy 0 - { - compare x, limit - break-if->= - draw-code-point-at-cursor screen, 0x20/space, 0x20/space, 0xdc/bg=green-bg - move-cursor-right screen - x <- increment - loop - } - screen-y <- increment - } return screen-y } fn render-screen screen: (addr screen), _target-screen: (addr screen), xmin: int, ymin: int -> _/ecx: int { var target-screen/esi: (addr screen) <- copy _target-screen var screen-y/edi: int <- copy ymin - # top border - { - set-cursor-position screen, xmin, screen-y - var width/edx: (addr int) <- get target-screen, width - var limit/edx: int <- copy *width - limit <- add 2/screen-border - var x/ebx: int <- copy 0 - { - compare x, limit - break-if->= - draw-code-point-at-cursor screen, 0x20/space, 0/fg, 0xdc/bg=green-bg - move-cursor-right screen - x <- increment - loop - } - screen-y <- increment - } # text data { var height/edx: (addr int) <- get target-screen, height @@ -303,8 +249,6 @@ fn render-screen screen: (addr screen), _target-screen: (addr screen), xmin: int compare y, *height break-if->= set-cursor-position screen, xmin, screen-y - draw-code-point-at-cursor screen, 0x20/space, 0/fg, 0xdc/bg=green-bg - move-cursor-right screen var width/edx: (addr int) <- get target-screen, width var x/ebx: int <- copy 0 { @@ -315,7 +259,6 @@ fn render-screen screen: (addr screen), _target-screen: (addr screen), xmin: int x <- increment loop } - draw-code-point-at-cursor screen, 0x20/space, 0/fg, 0xdc/bg=green-bg y <- increment screen-y <- increment loop @@ -325,12 +268,10 @@ fn render-screen screen: (addr screen), _target-screen: (addr screen), xmin: int { # screen top left pixels x y width height var tmp/eax: int <- copy xmin - tmp <- add 1/margin-left tmp <- shift-left 3/log2-font-width var left: int copy-to left, tmp tmp <- copy ymin - tmp <- add 1/margin-top tmp <- shift-left 4/log2-font-height var top: int copy-to top, tmp @@ -373,23 +314,6 @@ fn render-screen screen: (addr screen), _target-screen: (addr screen), xmin: int loop } } - # bottom border - { - set-cursor-position screen, xmin, screen-y - var width/edx: (addr int) <- get target-screen, width - var limit/edx: int <- copy *width - limit <- add 2/screen-border - var x/ebx: int <- copy 0 - { - compare x, limit - break-if->= - draw-code-point-at-cursor screen, 0x20/space, 0x20/space, 0xdc/bg=green-bg - move-cursor-right screen - x <- increment - loop - } - screen-y <- increment - } return screen-y } @@ -437,59 +361,28 @@ fn maybe-render-keyboard screen: (addr screen), _self: (addr sandbox), xmin: int var keyboard-obj-ah/eax: (addr handle gap-buffer) <- get keyboard-obj-cell, keyboard-data var _keyboard-obj/eax: (addr gap-buffer) <- lookup *keyboard-obj-ah var keyboard-obj/edx: (addr gap-buffer) <- copy _keyboard-obj - var x/eax: int <- draw-text-rightward screen, "keyboard: ", xmin, 0x99/xmax, ymin, 7/fg, 0xc5/bg=blue-bg var y/ecx: int <- copy ymin + y <- increment # padding + var x/eax: int <- draw-text-rightward screen, "keyboard: ", xmin, 0x99/xmax, y, 7/fg, 0xc5/bg=blue-bg var cursor-in-keyboard?/esi: (addr boolean) <- get self, cursor-in-keyboard? y <- render-keyboard screen, keyboard-obj, x, y, *cursor-in-keyboard? y <- increment # padding return y } -# draw an evocative shape fn render-keyboard screen: (addr screen), _keyboard: (addr gap-buffer), xmin: int, ymin: int, render-cursor?: boolean -> _/ecx: int { var keyboard/esi: (addr gap-buffer) <- copy _keyboard var width/edx: int <- copy 0x10/keyboard-capacity var y/edi: int <- copy ymin - # top border - { - set-cursor-position screen, xmin, y - move-cursor-right screen - var x/ebx: int <- copy 0 - { - compare x, width - break-if->= - draw-code-point-at-cursor screen, 0x2d/horizontal-bar, 0x18/fg, 0xc5/bg=blue-bg - move-cursor-right screen - x <- increment - loop - } - y <- increment - } # keyboard var x/eax: int <- copy xmin - draw-code-point screen, 0x7c/vertical-bar, x, y, 0x18/fg, 0xc5/bg=blue-bg - x <- increment - x <- render-gap-buffer screen, keyboard, x, y, render-cursor?, 3/fg, 0xc5/bg=blue-bg - x <- copy xmin - x <- add 1 # for left bar - x <- add 0x10/keyboard-capacity - draw-code-point screen, 0x7c/vertical-bar, x, y, 0x18/fg, 0xc5/bg=blue-bg + var xmax/ecx: int <- copy x + xmax <- add 0x10 + var ymax/edx: int <- copy ymin + ymax <- add 1 + clear-rect screen, x, y, xmax, ymax, 0/bg + x <- render-gap-buffer screen, keyboard, x, y, render-cursor?, 3/fg, 0/bg y <- increment - # bottom border - { - set-cursor-position screen, xmin, y - move-cursor-right screen - var x/ebx: int <- copy 0 - { - compare x, width - break-if->= - draw-code-point-at-cursor screen, 0x2d/horizontal-bar, 0x18/fg, 0xc5/bg=blue-bg - move-cursor-right screen - x <- increment - loop - } - y <- increment - } return y } -- cgit 1.4.1-2-gfad0 e39085'>^ 
ea2d44bd ^


























cd94852d ^

ea2d44bd ^











65dcc746 ^

ea2d44bd ^






ab445d6e ^

ea2d44bd ^



ea2d44bd ^




ab445d6e ^



ea2d44bd ^

951c3f4c ^

ea2d44bd ^

















ab445d6e ^

ea2d44bd ^


ab445d6e ^

ea2d44bd ^


ab445d6e ^

ea2d44bd ^




ab445d6e ^

ea2d44bd ^


ab445d6e ^

ea2d44bd ^




ab445d6e ^

ea2d44bd ^


ab445d6e ^

ea2d44bd ^


ab445d6e ^






ea2d44bd ^


ab445d6e ^






ea2d44bd ^


ab445d6e ^






ea2d44bd ^


cd94852d ^

951c3f4c ^

307a7553 ^





951c3f4c ^

307a7553 ^

cd94852d ^







951c3f4c ^


cd94852d ^




951c3f4c ^


cd94852d ^

































65dcc746 ^

cd94852d ^













951c3f4c ^

cd94852d ^





























951c3f4c ^

fc42975c ^







951c3f4c ^


fc42975c ^




951c3f4c ^


fc42975c ^

































65dcc746 ^

fc42975c ^













951c3f4c ^

fc42975c ^


cd94852d ^

951c3f4c ^

cd94852d ^

951c3f4c ^

cd94852d ^









951c3f4c ^

cd94852d ^
































ab445d6e ^

d07dfdd4 ^

da791479 ^

ea2d44bd ^

ab445d6e ^

ea2d44bd ^

8e4b4f20 ^





















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
26
27
28
29
30

31
32

33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58

59

60
61
62
63
64
65
66
67
68
69
70

71

72
73
74
75
76
77

78

79
80
81

82
83
84
85

86
87
88

89

90

91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107

108

109
110

111

112
113

114

115
116
117
118

119

120
121

122

123
124
125
126

127

128
129

130

131
132

133
134
135
136
137
138

139
140

141
142
143
144
145
146

147
148

149
150
151
152
153
154

155
156

157

158

159
160
161
162
163

164

165

166
167
168
169
170
171
172

173
174

175
176
177
178

179
180

181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213

214

215
216
217
218
219
220
221
222
223
224
225
226
227

228

229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257

258

259
260
261
262
263
264
265

266
267

268
269
270
271

272
273

274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306

307

308
309
310
311
312
313
314
315
316
317
318
319
320

321

322
323

324

325

326

327

328
329
330
331
332
333
334
335
336

337

338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369

370

371

372

373

374

375

376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396