Dariaceli's Git
Browse code

Added color picker for screen example

neauoire authored on 23/03/2021 18:44:36
Showing 4 changed files
build.sh
History View file @ 2e90428
... ... 
@@ -28,7 +28,7 @@ else
28 28 
 fi
29 29
30 30 
 echo "Assembling.."
31 
-./bin/assembler projects/software/noodle.usm bin/boot.rom
31 
+./bin/assembler projects/examples/dev.screen.usm bin/boot.rom
32 32
33 33 
 echo "Running.."
34 34 
 if [ "${2}" = '--cli' ];
projects/examples/dev.screen.usm
History View file @ 2e90428
... ... 
@@ -1,18 +1,47 @@
1 
-( Screen )
1 
+( draw routines )
2 2
3 
-;center { x 2 y 2 }
4 
-;timer { byte 1 }
3 
+%RTN { JMP2r }
4 
+%++  { #0001 ADD2 }
5 
+%2/  { #0001 SFT2 }
6 
+%8+  { #0008 ADD2 }
7 
+%STEP8 { #0033 SFT2 }
8 
+%S2B { SWP POP }
5 9
6 
-( devices )
10 
+;center { x 2 y 2 }
11 
+;color { byte 1 }
12 
+;pointer { x 2 y 2 sprite 2 }
13 
+;rect { x1 2 y1 2 x2 2 y2 2 }
14 
+;window { x1 2 y1 2 x2 2 y2 2 w 2 h 2 }
15 
+;label { x 2 y 2 addr 2 }
16 
+;slider { x1 2 y 2 x2 2 pos 2 }
17 
+;addr { short 2 }
18 
+;selection { byte 1 }
19 
+;theme {
20 
+	r1 1 r2 1 r3 1 r4 1
21 
+	g1 1 g2 1 g3 1 g4 1
22 
+	b1 1 b2 1 b3 1 b4 1
23 
+}
7 24
8 25 
 |0110 ;Screen { width 2 height 2 pad 4 x 2 y 2 color 1 }
9 26 
 |0120 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }
27 
+|0150 ;Mouse  { x 2 y 2 state 1 chord 1 }
10 28 
 |01F0 .RESET .FRAME .ERROR ( vectors )
11 
-|01F8 [ f0ac f0bb f053 ] ( palette )
29 
+|01F8 @Red [ 127f ] @Green [ 34e7 ] @Blue [ 56c4 ]   ( palette )
30 
+
31 
+|0200 @RESET
32 
+
33 
+	#00a0 =window.w
34 
+	#0050 =window.h
12 35
13 
-( program )
36 
+	( center window )
14 37
15 
-|0200 @RESET
38 
+	~Screen.width #0002 DIV2 ~window.w #0002 DIV2 SUB2 =window.x1
39 
+	~Screen.height #0002 DIV2 ~window.h #0002 DIV2 SUB2 =window.y1
40 
+
41 
+	#01 =theme.r1 #02 =theme.g1 #03 =theme.b1
42 
+	#04 =theme.r2 #06 =theme.g2 #07 =theme.b2
43 
+	#0a =theme.r3 #09 =theme.g3 #08 =theme.b3
44 
+	#0c =theme.r4 #0b =theme.g4 #0d =theme.b4
16 45
17 46 
 	( find screen center )
18 47 
 	~Screen.width #0002 DIV2 =center.x
... ... 
@@ -37,7 +66,7 @@
37 66 
 	POP2 POP2
38 67
39 68 
 	( draw blending modes )
40 
-	#0020 =Sprite.x #0020 =Sprite.y ,icon =Sprite.addr
69 
+	#0020 =Sprite.x #0020 =Sprite.y ,icon_icn =Sprite.addr
41 70 
 	#00 #10
42 71 
 	$draw-blends NOP
43 72 
 		( move ) OVR #00 SWP #0008 MUL2 #0020 ADD2 =Sprite.x
... ... 
@@ -46,27 +75,277 @@
46 75 
 		DUP2 LTH ^$draw-blends SWP JMP?
47 76 
 	POP POP
48 77
78 
+	,update-theme JSR2
79 
+	,draw-window JSR2
80 
+
49 81 
 BRK
50 82
51 
-@FRAME
83 
+@FRAME
52 84
53 
-	( update colors every 40 frames )
54 
-	~timer #40 NEQ ,skip1 ROT JMP2?
55 
-		#0fac #01fa STR2 #f0bb #01fc STR2 #f053 #01f8 STR2
56 
-	@skip1
57 
-	~timer #80 NEQ ,skip2 ROT JMP2?
58 
-		#00fc #01fc STR2 #f0bb #01f8 STR2 #f053 #01fa STR2
59 
-	@skip2
60 
-	~timer #c0 NEQ ,skip3 ROT JMP2?
61 
-		#000f #01f8 STR2 #0f0f #01fa STR2 #0100 #01fc STR2
62 
-	@skip3
63 
-	~timer #00 NEQ ,skip4 ROT JMP2?
64 
-		#f0ac #01f8 STR2 #f0bb #01fa STR2 #f053 #01fc STR2
65 
-	@skip4
66 
-	~timer #01 ADD =timer
85 
+	,$no-touch ~Mouse.state #00 EQU JMP2?
67 86
68 
-BRK
87 
+		~Mouse.y ~window.y1 SUB2 STEP8
88 
+
89 
+		DUP2 #0010 NEQ2 ,$no-touch-red ROT JMP2?
90 
+			,$no-touch-red ~Mouse.x ~window.x1 #0050 ADD2 LTH2 JMP2?
91 
+			,$no-touch-red ~Mouse.x ~window.x1 #008c ADD2 GTH2 JMP2?
92 
+			( get new value ) ~Mouse.x ~window.x1 SUB2 #0050 SUB2 #0004 DIV2 S2B ,theme.r1 #00 ~selection ADD2 POK2
93 
+		$no-touch-red
94 
+		DUP2 #0020 NEQ2 ,$no-touch-green ROT JMP2?
95 
+			,$no-touch-green ~Mouse.x ~window.x1 #0050 ADD2 LTH2 JMP2?
96 
+			,$no-touch-green ~Mouse.x ~window.x1 #008c ADD2 GTH2 JMP2?
97 
+			( get new value ) ~Mouse.x ~window.x1 SUB2 #0050 SUB2 #0004 DIV2 S2B ,theme.g1 #00 ~selection ADD2 POK2
98 
+		$no-touch-green
99 
+		DUP2 #0030 NEQ2 ,$no-touch-blue ROT JMP2?
100 
+			,$no-touch-blue ~Mouse.x ~window.x1 #0050 ADD2 LTH2 JMP2?
101 
+			,$no-touch-blue ~Mouse.x ~window.x1 #008c ADD2 GTH2 JMP2?
102 
+			( get new value ) ~Mouse.x ~window.x1 SUB2 #0050 SUB2 #0004 DIV2 S2B ,theme.b1 #00 ~selection ADD2 POK2
103 
+		$no-touch-blue
104 
+		DUP2 #0040 NEQ2 ,$no-touch-radio ROT JMP2?
105 
+			,$no-touch-radio ~Mouse.x ~window.x1 #0050 ADD2 LTH2 JMP2?
106 
+			,$no-touch-radio ~Mouse.x ~window.x1 #008c ADD2 GTH2 JMP2?
107 
+			~Mouse.x ~window.x1 SUB2 #0050 SUB2 STEP8 2/ #0008 DIV2 S2B =selection
108 
+		$no-touch-radio
109 
+
110 
+		POP2
111 
+
112 
+		,update-theme JSR2
113 
+		,draw-window JSR2
114 
+
115 
+	$no-touch
116 
+
117 
+	,draw-cursor JSR2
118 
+
119 
+BRK
120 
+
121 
+@update-theme
122 
+
123 
+	#01F8 PEK2 #0f AND ~theme.r1 #40 SFT ADD #01F8 POK2
124 
+	#01Fa PEK2 #0f AND ~theme.g1 #40 SFT ADD #01Fa POK2
125 
+	#01Fc PEK2 #0f AND ~theme.b1 #40 SFT ADD #01Fc POK2
126 
+	#01F8 PEK2 #f0 AND ~theme.r2 ADD #01F8 POK2
127 
+	#01Fa PEK2 #f0 AND ~theme.g2 ADD #01Fa POK2
128 
+	#01Fc PEK2 #f0 AND ~theme.b2 ADD #01Fc POK2
129 
+	#01F9 PEK2 #0f AND ~theme.r3 #40 SFT ADD #01F9 POK2
130 
+	#01Fb PEK2 #0f AND ~theme.g3 #40 SFT ADD #01Fb POK2
131 
+	#01Fd PEK2 #0f AND ~theme.b3 #40 SFT ADD #01Fd POK2
132 
+	#01F9 PEK2 #f0 AND ~theme.r4 ADD #01F9 POK2
133 
+	#01Fb PEK2 #f0 AND ~theme.g4 ADD #01Fb POK2
134 
+	#01Fd PEK2 #f0 AND ~theme.b4 ADD #01Fd POK2
135 
+
136 
+RTN
137 
+
138 
+@draw-window
139 
+
140 
+	~window.x1 ~window.w ADD2 =window.x2
141 
+	~window.y1 ~window.h ADD2 =window.y2
142 
+	~window.x1 ~window.y1 ~window.x2 ~window.y2 #02 ,fill-rect JSR2
143 
+	~window.x1 ~window.y1 ~window.x2 ~window.y2 #01 ,line-rect JSR2
144 
+	~window.x1 #0002 SUB2 ~window.y1 #0002 SUB2 ~window.x2 #0002 ADD2 ~window.y2 #0002 ADD2 #01 ,line-rect JSR2
145 
+
146 
+	~window.x1 #0008 ADD2 ~window.y1 #0010 ADD2 #05 ,red_txt ,draw-label JSR2
147 
+	~window.x1 #0008 ADD2 ~window.y1 #0020 ADD2 #05 ,green_txt ,draw-label JSR2
148 
+	~window.x1 #0008 ADD2 ~window.y1 #0030 ADD2 #05 ,blue_txt ,draw-label JSR2
149 
+
150 
+	~window.x1 #0050 ADD2 ~window.y1 #0010 ADD2 ~window.x1 #0080 ADD2 #00 ,theme.r1 ~selection ADD PEK2 #0004 MUL2 #01 ,draw-slider JSR2
151 
+	~window.x1 #0050 ADD2 ~window.y1 #0020 ADD2 ~window.x1 #0080 ADD2 #00 ,theme.g1 ~selection ADD PEK2 #0004 MUL2 #01 ,draw-slider JSR2
152 
+	~window.x1 #0050 ADD2 ~window.y1 #0030 ADD2 ~window.x1 #0080 ADD2 #00 ,theme.b1 ~selection ADD PEK2 #0004 MUL2 #01 ,draw-slider JSR2
153 
+
154 
+	~window.x1 #0008 ADD2 =Sprite.x ~window.y1 =Sprite.y ,Red ,draw-short JSR2
155 
+	~window.x1 #0030 ADD2 =Sprite.x ~window.y1 =Sprite.y ,Green ,draw-short JSR2
156 
+	~window.x1 #0058 ADD2 =Sprite.x ~window.y1 =Sprite.y ,Blue ,draw-short JSR2
157 
+
158 
+	~window.x1 #0050 ADD2 =Sprite.x
159 
+	~window.y1 #0040 ADD2 =Sprite.y
160 
+	,radio_icns #00 ~selection #00 EQU #0008 MUL2 ADD2 =Sprite.addr
161 
+	#05 =Sprite.color
162 
+
163 
+	~window.x1 #0060 ADD2 =Sprite.x
164 
+	~window.y1 #0040 ADD2 =Sprite.y
165 
+	,radio_icns #00 ~selection #01 EQU #0008 MUL2 ADD2 =Sprite.addr
166 
+	#05 =Sprite.color
167 
+
168 
+	~window.x1 #0070 ADD2 =Sprite.x
169 
+	~window.y1 #0040 ADD2 =Sprite.y
170 
+	,radio_icns #00 ~selection #02 EQU #0008 MUL2 ADD2 =Sprite.addr
171 
+	#05 =Sprite.color
172 
+
173 
+	~window.x1 #0080 ADD2 =Sprite.x
174 
+	~window.y1 #0040 ADD2 =Sprite.y
175 
+	,radio_icns #00 ~selection #03 EQU #0008 MUL2 ADD2 =Sprite.addr
176 
+	#05 =Sprite.color
177 
+
178 
+RTN
179 
+
180 
+@draw-cursor
181 
+
182 
+	( clear last cursor )
183 
+	,clear_icn =Sprite.addr
184 
+	~pointer.x =Sprite.x
185 
+	~pointer.y =Sprite.y
186 
+	#10 =Sprite.color
187 
+
188 
+	( record pointer positions )
189 
+	~Mouse.x =pointer.x ~Mouse.y =pointer.y
190 
+
191 
+	( draw new cursor )
192 
+	,pointer_icn =Sprite.addr
193 
+	~pointer.x =Sprite.x
194 
+	~pointer.y =Sprite.y
195 
+	#13 =Sprite.color
196 
+
197 
+RTN
198 
+
199 
+@draw-short ( short )
200 
+
201 
+	=addr
202 
+	,font_hex #00 ~addr LDR #f0 AND #04 SFT #08 MUL ADD2 =Sprite.addr
203 
+	( draw ) #04 =Sprite.color
204 
+	~Sprite.x 8+ =Sprite.x
205 
+	,font_hex #00 ~addr LDR #0f AND #08 MUL ADD2 =Sprite.addr
206 
+	( draw ) #04 =Sprite.color
207 
+	~Sprite.x 8+ =Sprite.x
208 
+	,font_hex #00 ~addr ++ LDR #f0 AND #04 SFT #08 MUL ADD2 =Sprite.addr
209 
+	( draw ) #04 =Sprite.color
210 
+	~Sprite.x 8+ =Sprite.x
211 
+	,font_hex #00 ~addr ++ LDR #0f AND #08 MUL ADD2 =Sprite.addr
212 
+	( draw ) #04 =Sprite.color
213 
+
214 
+RTN
215 
+
216 
+@draw-slider ( x1 y x2 pos color )
217 
+
218 
+	( load ) =color =slider.pos =slider.x2 =slider.y =slider.x1
219 
+
220 
+	~slider.x1 =Sprite.x
221 
+	~slider.y =Sprite.y
222 
+	,halftone_icn =Sprite.addr
223 
+
224 
+	,slidera_icn =Sprite.addr
225 
+	( draw ) #05 =Sprite.color
226 
+	,sliderb_icn =Sprite.addr
227 
+
228 
+	$loop
229 
+		( incr ) ~Sprite.x 8+ =Sprite.x
230 
+		( draw ) #05 =Sprite.color
231 
+		,$loop ~Sprite.x ~slider.x2 #0008 ADD2 LTH2 JMP2?
232 
+
233 
+	( incr ) ~Sprite.x #0004 ADD2 =Sprite.x
234 
+	,sliderc_icn =Sprite.addr
235 
+	( draw ) #05 =Sprite.color
236 
+
237 
+	~slider.x1 ~slider.pos ADD2 =Sprite.x
238 
+	,sliderd_icn =Sprite.addr
239 
+	( draw ) #0a =Sprite.color
240 
+
241 
+RTN
242 
+
243 
+@fill-rect ( x1 y1 x2 y2 color )
244 
+
245 
+	( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1
246 
+	$ver
247 
+		~rect.x1 =Screen.x
248 
+		$hor
249 
+			( draw ) ~color =Screen.color
250 
+			( incr ) ~Screen.x ++ =Screen.x
251 
+			,$hor ~Screen.x ~rect.x2 LTH2 JMP2?
252 
+		( incr ) ~Screen.y ++ =Screen.y
253 
+		,$ver ~Screen.y ~rect.y2 LTH2 JMP2?
254 
+
255 
+RTN
256 
+
257 
+@line-rect ( x1 y1 x2 y2 color )
258 
+
259 
+	( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1
260 
+	$hor
261 
+		( incr ) ~Screen.x ++ =Screen.x
262 
+		( draw ) ~rect.y1 =Screen.y ~color =Screen.color
263 
+		( draw ) ~rect.y2 =Screen.y ~color =Screen.color
264 
+		,$hor ~Screen.x ~rect.x2 LTH2 JMP2?
265 
+	~rect.y1 =Screen.y
266 
+	$ver
267 
+		( draw ) ~rect.x1 =Screen.x ~color =Screen.color
268 
+		( draw ) ~rect.x2 =Screen.x ~color =Screen.color
269 
+		( incr ) ~Screen.y ++ =Screen.y
270 
+		,$ver ~Screen.y ~rect.y2 ++ LTH2 JMP2?
271 
+
272 
+RTN
273 
+
274 
+@draw-label ( x y color addr )
275 
+
276 
+	( load ) =label.addr =color =Sprite.y =Sprite.x ~label.addr
277 
+	$loop
278 
+		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =Sprite.addr ~color =Sprite.color
279 
+		( incr ) ++
280 
+		( incr ) ~Sprite.x 8+ =Sprite.x
281 
+		DUP2 LDR #00 NEQ ,$loop ROT JMP2?
282 
+	POP2
283 
+
284 
+RTN
285 
+
286 
+@clear_icn    [ 0000 0000 0000 0000 ]
287 
+@pointer_icn  [ 80c0 e0f0 f8e0 1000 ]
288 
+@halftone_icn [ aa55 aa55 aa55 aa55 ]
289 
+@slidera_icn  [ 3f7f ffff ffff 7f3f ]
290 
+@sliderb_icn  [ ffff ffff ffff ffff ]
291 
+@sliderc_icn  [ fcfe ffff ffff fefc ]
292 
+@sliderd_icn  [ 003c 7e7e 7e7e 3c00 ]
293 
+@icon_icn     [ 3c7e e7c3 c3e7 7e3c ]
294 
+@radio_icns
295 
+	[ 3c42 8181 8181 423c ]
296 
+	[ 3c42 99bd bd99 423c ]
297 
+
298 
+@red_txt      [ Red 00 ]
299 
+@green_txt    [ Green 00 ]
300 
+@blue_txt     [ Blue 00 ]
301 
+
302 
+
303 
+@font_hex ( 0-F TODO: should pull from @font instead.. )
304 
+[
305 
+	003c 464a 5262 3c00 0018 0808 0808 1c00
306 
+	003c 4202 3c40 7e00 003c 421c 0242 3c00
307 
+	000c 1424 447e 0400 007e 407c 0242 3c00
308 
+	003c 407c 4242 3c00 007e 0204 0810 1000
309 
+	003c 423c 4242 3c00 003c 4242 3e02 3c00
310 
+	003c 4242 7e42 4200 007c 427c 4242 7c00
311 
+	003c 4240 4042 3c00 007c 4242 4242 7c00
312 
+	007e 4078 4040 7e00 007e 4078 4040 4000
313 
+]
69 314
70 
-@icon [ 3c7e e7c3 c3e7 7e3c ]
315 
+@font ( spectrum-zx font )
316 
+[
317 
+	0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
318 
+	0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
319 
+	007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
320 
+	0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
321 
+	0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
322 
+	003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
323 
+	0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
324 
+	0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
325 
+	0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
326 
+	0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
327 
+	0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
328 
+	0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
329 
+	003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
330 
+	0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
331 
+	003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
332 
+	0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
333 
+	003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
334 
+	0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
335 
+	0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
336 
+	0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
337 
+	007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
338 
+	00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
339 
+	0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
340 
+	0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
341 
+	0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
342 
+	0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
343 
+	0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
344 
+	0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
345 
+	0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
346 
+	0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
347 
+	0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
348 
+	0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
349 
+]
71 350
72 351 
 @ERROR BRK
projects/software/theme.usm
History View file @ 2e90428
73 352 
deleted file mode 100644
... ... 
@@ -1,162 +0,0 @@
1 
-( draw routines )
2 
-
3 
-%RTN { JMP2r }
4 
-%++  { #0001 ADD2 }
5 
-%8+  { #0008 ADD2 }
6 
-
7 
-;color { byte 1 }
8 
-;pointer { x 2 y 2 sprite 2 }
9 
-;rect { x1 2 y1 2 x2 2 y2 2 }
10 
-;r1 { x1 2 y1 2 x2 2 y2 2 }
11 
-;r2 { x1 2 y1 2 x2 2 y2 2 }
12 
-;r3 { x1 2 y1 2 x2 2 y2 2 }
13 
-;window { x1 2 y1 2 x2 2 y2 2 w 2 h 2 }
14 
-;label { x 2 y 2 addr 2 }
15 
-
16 
-|0110 ;Screen { width 2 height 2 pad 4 x 2 y 2 color 1 }
17 
-|0120 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }
18 
-|0150 ;Mouse  { x 2 y 2 state 1 chord 1 }
19 
-
20 
-|01F0 .RESET .FRAME .ERROR ( vectors )
21 
-|01F8 [ f07c f0e2 f0c2 ]   ( palette )
22 
-
23 
-|0200 @RESET
24 
-
25 
-	#0080 =window.w
26 
-	#0050 =window.h
27 
-
28 
-	( center window )
29 
-
30 
-	~Screen.width #0002 DIV2 ~window.w #0002 DIV2 SUB2 =window.x1
31 
-	~Screen.height #0002 DIV2 ~window.h #0002 DIV2 SUB2 =window.y1
32 
-
33 
-	,draw-window JSR2
34 
-
35 
-BRK
36 
-
37 
-@FRAME
38 
-
39 
-	,draw-cursor JSR2
40 
-
41 
-BRK
42 
-
43 
-@draw-window
44 
-
45 
-	~window.x1 ~window.w ADD2 =window.x2
46 
-	~window.y1 ~window.h ADD2 =window.y2
47 
-	~window.x1 ~window.y1 ~window.x2 ~window.y2 #02 ,fill-rect JSR2
48 
-	~window.x1 ~window.y1 ~window.x2 ~window.y2 #01 ,line-rect JSR2
49 
-	~window.x1 #0002 SUB2 ~window.y1 #0002 SUB2 ~window.x2 #0002 ADD2 ~window.y2 #0002 ADD2 #01 ,line-rect JSR2
50 
-	~window.x1 ~window.y1 #04 ,window_txt ,draw-label JSR2
51 
-	~window.x1 #0008 ADD2 ~window.y1 #0010 ADD2 #05 ,red_txt ,draw-label JSR2
52 
-	~window.x1 #0008 ADD2 ~window.y1 #0020 ADD2 #05 ,green_txt ,draw-label JSR2
53 
-	~window.x1 #0008 ADD2 ~window.y1 #0030 ADD2 #05 ,blue_txt ,draw-label JSR2
54 
-
55 
-RTN
56 
-
57 
-@draw-cursor
58 
-
59 
-	( clear last cursor )
60 
-	,clear_icn =Sprite.addr
61 
-	~pointer.x =Sprite.x
62 
-	~pointer.y =Sprite.y
63 
-	#10 =Sprite.color
64 
-
65 
-	( record pointer positions )
66 
-	~Mouse.x =pointer.x ~Mouse.y =pointer.y
67 
-
68 
-	( draw new cursor )
69 
-	,pointer_icn =Sprite.addr
70 
-	~pointer.x =Sprite.x
71 
-	~pointer.y =Sprite.y
72 
-	#11 =Sprite.color
73 
-
74 
-RTN
75 
-
76 
-@fill-rect ( x1 y1 x2 y2 color )
77 
-
78 
-	( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1
79 
-	$ver
80 
-		~rect.x1 =Screen.x
81 
-		$hor
82 
-			( draw ) ~color =Screen.color
83 
-			( incr ) ~Screen.x ++ =Screen.x
84 
-			,$hor ~Screen.x ~rect.x2 LTH2 JMP2?
85 
-		( incr ) ~Screen.y ++ =Screen.y
86 
-		,$ver ~Screen.y ~rect.y2 LTH2 JMP2?
87 
-
88 
-RTN
89 
-
90 
-@line-rect ( x1 y1 x2 y2 color )
91 
-
92 
-	( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1
93 
-	$hor
94 
-		( incr ) ~Screen.x ++ =Screen.x
95 
-		( draw ) ~rect.y1 =Screen.y ~color =Screen.color
96 
-		( draw ) ~rect.y2 =Screen.y ~color =Screen.color
97 
-		,$hor ~Screen.x ~rect.x2 LTH2 JMP2?
98 
-	~rect.y1 =Screen.y
99 
-	$ver
100 
-		( draw ) ~rect.x1 =Screen.x ~color =Screen.color
101 
-		( draw ) ~rect.x2 =Screen.x ~color =Screen.color
102 
-		( incr ) ~Screen.y ++ =Screen.y
103 
-		,$ver ~Screen.y ~rect.y2 ++ LTH2 JMP2?
104 
-
105 
-RTN
106 
-
107 
-@draw-label ( x y color addr )
108 
-
109 
-	( load ) =label.addr =color =Sprite.y =Sprite.x ~label.addr
110 
-	$loop
111 
-		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =Sprite.addr ~color =Sprite.color
112 
-		( incr ) ++
113 
-		( incr ) ~Sprite.x 8+ =Sprite.x
114 
-		DUP2 LDR #00 NEQ ,$loop ROT JMP2?
115 
-	POP2
116 
-
117 
-RTN
118 
-
119 
-@clear_icn   [ 0000 0000 0000 0000 ]
120 
-@pointer_icn [ 80c0 e0f0 f8e0 1000 ]
121 
-@window_txt [ theme 20 editor 00 ]
122 
-@red_txt [ red 00 ]
123 
-@green_txt [ green 00 ]
124 
-@blue_txt [ blue 00 ]
125 
-
126 
-@font ( spectrum-zx font )
127 
-[
128 
-	0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
129 
-	0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
130 
-	007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
131 
-	0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
132 
-	0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
133 
-	003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
134 
-	0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
135 
-	0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
136 
-	0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
137 
-	0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
138 
-	0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
139 
-	0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
140 
-	003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
141 
-	0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
142 
-	003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
143 
-	0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
144 
-	003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
145 
-	0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
146 
-	0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
147 
-	0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
148 
-	007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
149 
-	00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
150 
-	0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
151 
-	0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
152 
-	0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
153 
-	0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
154 
-	0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
155 
-	0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
156 
-	0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
157 
-	0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
158 
-	0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
159 
-	0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
160 
-]
161 
-
162 
-@ERROR BRK
src/emulator.c
History View file @ 2e90428
... ... 
@@ -467,6 +467,7 @@ main(int argc, char **argv)
467 467 
 	portuxn(&u, "empty", ppnil);
468 468 
 	portuxn(&u, "empty", ppnil);
469 469 
 	portuxn(&u, "empty", ppnil);
470 
+	portuxn(&u, "empty", ppnil);
470 471 
 	portuxn(&u, "system", system_poke);
471 472
472 473 
 	/* Write screen size to dev/screen */