Dariaceli's Git
Browse code

Progress on left

neauoire authored on 07/03/2021 05:30:16
Showing 1 changed files
projects/software/left.usm
History View file @ 3ca7ed4
... ... 
@@ -10,9 +10,14 @@
10 10 
 &Mouse  { x 2 y 2 state 1 chord 1 }
11 11 
 &File       { pad 8 name 2 length 2 load 2 save 2 }
12 12
13 
-&Textarea2d { x1 2 y1 2 x2 2 y2 2 color 1 addr 2 cursor 1 }
13 
+&Point2d { x 2 y 2 }
14 
+&Label2d { x 2 y 2 color 1 addr 2 }
15 
+&Textarea2d { x1 2 y1 2 x2 2 y2 2 color 1 addr 2 cursor 1 sela 2 selb 2 }
14 16
17 
+;target Point2d  ;pt Point2d ;mouse Point2d
15 18 
 ;textarea Textarea2d
19 
+;label Label2d
20 
+;i 1 ;j 2 ;addr 2 ;color 1
16 21
17 22 
 |0100 @RESET
18 23
... ... 
@@ -20,18 +25,161 @@
20 25 
 	#0300 =dev/file.length
21 26 
 	,body =dev/file.load
22 27
23 
-	#0000 #0000 #0e ,body ,draw-textarea JSR
28 
+	#0064 =textarea.sela #0065 =textarea.selb
29 
+	#0018 =textarea.x1
30 
+
31 
+	,redraw JSR
24 32
25 33 
 BRK
26 34
27 
-|2000 @FRAME BRK
35 
+|2000 @FRAME
36 
+
37 
+	( ctrl )
38 
+
39 
+	,no-ctrl ~dev/ctrl.buttons #00 EQU JMP? POP2
40 
+
41 
+		,no-ctrl-left ~dev/ctrl.buttons #40 EQU JMP? POP2
42 
+			~textarea.sela #0001 ADD2 =textarea.sela
43 
+			~textarea.selb #0001 ADD2 =textarea.selb
44 
+			,redraw JSR
45 
+		@no-ctrl-left
46 
+		,no-ctrl-right ~dev/ctrl.buttons #80 EQU JMP? POP2
47 
+			~textarea.sela #0001 SUB2 =textarea.sela
48 
+			~textarea.selb #0001 SUB2 =textarea.selb
49 
+			,redraw JSR
50 
+		@no-ctrl-right
51 
+
52 
+	@no-ctrl
53 
+
54 
+	( mouse )
55 
+
56 
+	,click-end ~dev/mouse.state #00 EQU JMP? POP2
57 
+
58 
+		~dev/mouse.x #0008 DIV2 #0003 SUB2 =target.x
59 
+		~dev/mouse.y #0008 DIV2 =target.y
60 
+		,select-target JSR
61 
+		,redraw JSR
62 
+
63 
+	@click-end
64 
+
65 
+	,draw-cursor JSR
66 
+
67 
+BRK
68 
+
69 
+@select-target
70 
+
71 
+	#0000 =j #0000 =pt.x #0000 =pt.y
72 
+
73 
+	@select-target-loop
74 
+
75 
+		,no-reached ~pt.y ~target.y NEQ2 JMP? POP2
76 
+			,no-reached ~pt.x ~target.x NEQ2 JMP? POP2
77 
+				~j #0001 ADD2 =textarea.sela ~j #0002 ADD2 =textarea.selb
78 
+				RTS
79 
+		@no-reached
80 
+
81 
+		,no-space ,body ~j ADD2 LDR #0a NEQ JMP? POP2
82 
+			( incr ) ~pt.y #0001 ADD2 =pt.y
83 
+			#0000 =pt.x
84 
+		@no-space
85 
+
86 
+		( incr ) ~pt.x #0001 ADD2 =pt.x
87 
+		( incr ) ~j #0001 ADD2 =j
88 
+	,select-target-loop ,body ~j ADD2 LDR #00 NEQ JMP? POP2
89 
+
90 
+RTS
91 
+
92 
+@redraw
93 
+
94 
+	#0058 #0000 #02 ,body ,draw-textarea JSR
95 
+	,draw-scrollbar JSR
96 
+	,draw-titlebar JSR
97 
+	,draw-lines JSR
98 
+
99 
+	~dev/screen.width #0028 SUB2 =dev/sprite.x
100 
+	~dev/screen.height #0008 SUB2 =dev/sprite.y
101 
+	~textarea.sela ,draw-short JSR
102 
+
103 
+RTS
104 
+
105 
+@draw-lines
106 
+
107 
+	#0000 =j
108 
+	#0000 =dev/sprite.x
109 
+	#0000 =dev/sprite.y
110 
+
111 
+	@draw-lines-loop
112 
+
113 
+		#0000 =dev/sprite.x
114 
+
115 
+		~j =addr
116 
+		,font_hex #00 ,addr #0001 ADD2 LDR #f0 AND #04 ROR #08 MUL ADD2 =dev/sprite.addr
117 
+		( draw ) #06 ~pt.y ~j EQU2 ADD =dev/sprite.color
118 
+		~dev/sprite.x #0008 ADD2 =dev/sprite.x
119 
+		,font_hex #00 ,addr #0001 ADD2 LDR #0f AND #08 MUL ADD2 =dev/sprite.addr
120 
+		( draw ) #06 ~pt.y ~j EQU2 ADD =dev/sprite.color
121 
+
122 
+		( incr ) ~j #0001 ADD2 =j
123 
+		( incr ) ~dev/sprite.y #0008 ADD2 =dev/sprite.y
124 
+
125 
+		,draw-lines-loop ~j ~dev/screen.height #0008 DIV2 NEQ2 JMP? POP2
126 
+
127 
+RTS
128 
+
129 
+@draw-short ( short )
130 
+
131 
+	=addr
132 
+	,font_hex #00 ,addr LDR #f0 AND #04 ROR #08 MUL ADD2 =dev/sprite.addr
133 
+	( draw ) #0e =dev/sprite.color
134 
+	~dev/sprite.x #0008 ADD2 =dev/sprite.x
135 
+	,font_hex #00 ,addr LDR #0f AND #08 MUL ADD2 =dev/sprite.addr
136 
+	( draw ) #0e =dev/sprite.color
137 
+	~dev/sprite.x #0008 ADD2 =dev/sprite.x
138 
+	,font_hex #00 ,addr #0001 ADD2 LDR #f0 AND #04 ROR #08 MUL ADD2 =dev/sprite.addr
139 
+	( draw ) #0e =dev/sprite.color
140 
+	~dev/sprite.x #0008 ADD2 =dev/sprite.x
141 
+	,font_hex #00 ,addr #0001 ADD2 LDR #0f AND #08 MUL ADD2 =dev/sprite.addr
142 
+	( draw ) #0e =dev/sprite.color
143 
+
144 
+RTS
145 
+
146 
+@draw-cursor
147 
+
148 
+	~mouse.x ~dev/mouse.x NEQU2
149 
+	~mouse.y ~dev/mouse.y NEQU2
150 
+
151 
+	#0000 EQU2 RTS? ( Return if unchanged )
152 
+
153 
+	( clear last cursor )
154 
+	~mouse.x =dev/sprite.x
155 
+	~mouse.y =dev/sprite.y
156 
+	,blank_icn =dev/sprite.addr
157 
+	#10 =dev/sprite.color
158 
+
159 
+	( record mouse positions )
160 
+	~dev/mouse.x =mouse.x
161 
+	~dev/mouse.y =mouse.y
162 
+
163 
+	( draw new cursor )
164 
+	~mouse.x =dev/sprite.x
165 
+	~mouse.y =dev/sprite.y
166 
+	,cursor_icn =dev/sprite.addr
167 
+	#11 =dev/sprite.color
168 
+
169 
+RTS
28 170
29 171 
 @draw-textarea ( x y color addr )
30 172
173 
+	#0000 =j
174 
+
31 175 
 	( load ) =textarea.addr =textarea.color =dev/sprite.y =dev/sprite.x
32 176 
 	~textarea.addr
33 177 
 	@draw-textarea-left-loop
34 
-		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~textarea.color =dev/sprite.color
178 
+		( draw ) DUP2 LDR #00 SWP #20 SUB #0008 MUL2 ,font ADD2 =dev/sprite.addr
179 
+
180 
+		~textarea.color
181 
+		( selection ) ~j ~textarea.sela #0001 SUB2 GTH2 ~j ~textarea.selb LTH2 #0101 EQU2 #06 MUL ADD
182 
+		=dev/sprite.color
35 183
36 184 
 		( detect linebreaks )
37 185 
 		DUP2 LDR #0a NEQ ,no-return ROT JMP? POP2
... ... 
@@ -42,49 +190,116 @@ BRK
42 190
43 191 
 		( incr ) #0001 ADD2
44 192 
 		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
193 
+		( incr ) ~j #0001 ADD2 =j
45 194
46 195 
 		DUP2 LDR #00 NEQ ,draw-textarea-left-loop ROT JMP? POP2
47 196 
 	POP2
48 197
49 198 
 RTS
50 199
51 
-@font ( spectrum-zx font )
200 
+@draw-scrollbar
201 
+
202 
+	~dev/screen.width #0008 SUB2 =dev/sprite.x
203 
+	#0000 =dev/sprite.y
204 
+	,scrollbar_bg =dev/sprite.addr
205 
+
206 
+	@draw-scrollbar-loop
207 
+	( draw ) #01 =dev/sprite.color
208 
+	( incr ) ~dev/sprite.y #0008 ADD2 =dev/sprite.y
209 
+	,draw-scrollbar-loop ~dev/sprite.y ~dev/screen.height LTH2 JMP? POP2
210 
+
211 
+	( at )
212 
+	#0000 =dev/sprite.y
213 
+	,scrollbar_fg =dev/sprite.addr
214 
+	( draw ) #01 =dev/sprite.color
215 
+
216 
+RTS
217 
+
218 
+@draw-titlebar
219 
+
220 
+	#0018 ~dev/screen.height #0008 SUB2 #07 ,filepath
221 
+
222 
+	( load ) =label.addr =label.color =dev/sprite.y =dev/sprite.x
223 
+	~label.addr
224 
+	@draw-label-left-loop
225 
+		( draw ) DUP2 LDR #00 SWP #20 SUB #0008 MUL2 ,font ADD2 =dev/sprite.addr ~label.color =dev/sprite.color
226 
+		( incr ) #0001 ADD2
227 
+		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
228 
+		DUP2 #0001 ADD2  LDR #00 NEQ ,draw-label-left-loop ROT JMP? POP2
229 
+	POP2
230 
+
231 
+RTS
232 
+
233 
+@font_hex ( 0-F )
52 234 
 [
53 
-	0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
54 
-	0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
55 
-	007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
56 
-	0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
57 
-	0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
58 
-	003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
59 
-	0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
60 
-	0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
61 
-	0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
62 
-	0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
63 
-	0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
64 
-	0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
65 
-	003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
66 
-	0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
67 
-	003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
68 
-	0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
69 
-	003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
70 
-	0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
71 
-	0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
72 
-	0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
73 
-	007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
74 
-	00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
75 
-	0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
76 
-	0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
77 
-	0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
78 
-	0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
79 
-	0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
80 
-	0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
81 
-	0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
82 
-	0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
83 
-	0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
84 
-	0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
235 
+	007c 8282 8282 827c 0030 1010 1010 1010
236 
+	007c 8202 7c80 80fe 007c 8202 1c02 827c
237 
+	000c 1424 4484 fe04 00fe 8080 7c02 827c
238 
+	007c 8280 fc82 827c 007c 8202 1e02 0202
239 
+	007c 8282 7c82 827c 007c 8282 7e02 827c
240 
+	007c 8202 7e82 827e 00fc 8282 fc82 82fc
241 
+	007c 8280 8080 827c 00fc 8282 8282 82fc
242 
+	007c 8280 f080 827c 007c 8280 f080 8080
243 
+]
244 
+
245 
+@font ( specter8-frag font )
246 
+[
247 
+	0000 0000 0000 0000 0008 0808 0800 0800
248 
+	0014 1400 0000 0000 0024 7e24 247e 2400
249 
+	0008 1e28 1c0a 3c08 0000 2204 0810 2200
250 
+	0030 4832 4c44 3a00 0008 1000 0000 0000
251 
+	0004 0808 0808 0400 0020 1010 1010 2000
252 
+	0000 2214 0814 2200 0000 0808 3e08 0800
253 
+	0000 0000 0000 0810 0000 0000 3e00 0000
254 
+	0000 0000 0000 0800 0000 0204 0810 2000
255 
+	003c 464a 5262 3c00 0018 0808 0808 1c00
256 
+	003c 4202 3c40 7e00 003c 421c 0242 3c00
257 
+	000c 1424 447e 0400 007e 407c 0242 3c00
258 
+	003c 407c 4242 3c00 007e 0204 0810 1000
259 
+	003c 423c 4242 3c00 003c 4242 3e02 3c00
260 
+	0000 0010 0000 1000 0000 1000 0010 1020
261 
+	0000 0810 2010 0800 0000 003e 003e 0000
262 
+	0000 1008 0408 1000 003c 420c 1000 1000
263 
+	003c 4232 4a42 3c00 003c 4242 7e42 4200
264 
+	007c 427c 4242 7c00 003c 4240 4042 3c00
265 
+	007c 4242 4242 7c00 007e 4078 4040 7e00
266 
+	007e 4078 4040 4000 003c 4240 4642 3c00
267 
+	0042 427e 4242 4200 001c 0808 0808 1c00
268 
+	007e 0202 0242 3c00 0042 4478 4442 4200
269 
+	0040 4040 4040 7e00 0042 665a 4242 4200
270 
+	0042 6252 4a46 4200 003c 4242 4242 3c00
271 
+	007c 4242 7c40 4000 003c 4242 4244 3a00
272 
+	007c 4242 7c44 4200 003e 403c 0242 3c00
273 
+	007e 0808 0808 1000 0042 4242 4244 3a00
274 
+	0042 4242 4224 1800 0042 4242 5a66 4200
275 
+	0042 423c 4242 4200 0042 423e 0242 3c00
276 
+	007e 020c 3040 7e00 000c 0808 0808 0c00
277 
+	0040 2010 0804 0200 0030 1010 1010 3000
278 
+	0008 1400 0000 0000 0000 0000 0000 7e00
279 
+	0008 0400 0000 0000 0000 3c02 3e42 3a00
280 
+	0040 407c 4242 7c00 0000 3c42 4042 3c00
281 
+	0002 023e 4242 3e00 0000 3c42 7e40 3e00
282 
+	0000 3e40 7840 4000 0000 3c42 3e02 3c00
283 
+	0040 405c 6242 4200 0008 0018 0808 0400
284 
+	0008 0018 0808 4830 0040 4244 7844 4200
285 
+	0010 1010 1010 0c00 0000 6c52 5252 5200
286 
+	0000 5c62 4242 4200 0000 3c42 4242 3c00
287 
+	0000 7c42 427c 4040 0000 3e42 423e 0202
288 
+	0000 5c62 4040 4000 0000 3e40 3c02 7c00
289 
+	0008 7e08 0808 1000 0000 4242 4244 3a00
290 
+	0000 4242 4224 1800 0000 5252 5252 2e00
291 
+	0000 4224 1824 4200 0000 4242 3e02 7c00
292 
+	0000 7e02 3c40 7e00 000c 0810 1008 0c00
293 
+	0008 0808 0808 0800 0030 1008 0810 3000
294 
+	0000 0032 4c00 0000 3c42 99a1 a199 423c
295 
+
85 296 
 ]
86 297
87 
-@filepath [ examples/app.left.usm ]
298 
+@blank_icn     [ 0000 0000 0000 0000 ]
299 
+@cursor_icn    [ 80c0 e0f0 f8e0 1000 ]
300 
+@scrollbar_bg  [ aa55 aa55 aa55 aa55 ]
301 
+@scrollbar_fg  [ ffff ffff ffff ffff ]
302 
+@filepath      [ projects/software/left.usm 00 ]
88 303
89 304 
 |4000 @body [ ]
90 305
... ... 
@@ -99,4 +314,4 @@ RTS
99 314 
 |FF60 ;dev/file    File
100 315
101 316 
 |FFF0 .RESET .FRAME .ERROR ( vectors )
102 
-|FFF8 [ 320c 350b fb03 ] ( palette )
317 
+|FFF8 [ a30c a30b af03 ] ( palette )