Browse code

Improved calculator

neauoire authored on 26/09/2021 22:21:16
Showing 1 changed files
... ...
@@ -63,13 +63,13 @@
63 63
 |0100 ( -> )
64 64
 
65 65
 	( theme ) 
66
-	#0fef .System/r DEO2 
67
-	#0fc5 .System/g DEO2 
68
-	#0f25 .System/b DEO2
66
+	#6e7d .System/r DEO2 
67
+	#6ec6 .System/g DEO2 
68
+	#6e95 .System/b DEO2
69 69
 
70 70
 	( size )
71
-	#0120 .Screen/width DEO2
72
-	#0160 .Screen/height DEO2
71
+	#0090 .Screen/width DEO2
72
+	#0100 .Screen/height DEO2
73 73
 
74 74
 	( vectors )
75 75
 	;on-mouse .Mouse/vector DEO2
... ...
@@ -85,10 +85,10 @@
85 85
 	.Screen/width DEI2 2// .center/x STZ2
86 86
 	.Screen/height DEI2 2// .center/y STZ2
87 87
 
88
-	.center/x LDZ2 #0028 -- 
88
+	.center/x LDZ2 #0020 -- 
89 89
 	DUP2 .keypad-frame/x STZ2
90 90
 		#0040 ++ .keypad-frame/x2 STZ2
91
-	.center/y LDZ2 #0020 -- 
91
+	.center/y LDZ2 #0018 -- 
92 92
 	DUP2 .keypad-frame/y STZ2
93 93
 		#0040 ++ .keypad-frame/y2 STZ2
94 94
 
... ...
@@ -106,7 +106,7 @@
106 106
 	DUP2 .bitpad-frame/y STZ2
107 107
 		#0010 ++ .bitpad-frame/y2 STZ2
108 108
 
109
-	.center/x LDZ2 #0028 -- 
109
+	.center/x LDZ2 #0020 -- 
110 110
 	DUP2 .input-frame/x STZ2
111 111
 		#0040 ++ .input-frame/x2 STZ2
112 112
 	.center/y LDZ2 #0030 -- 
... ...
@@ -385,7 +385,7 @@ RTN
385 385
 		( color ) DUP #08 .stack/length LDZ - #01 - > STH
386 386
 		( value ) DUP 2* .stack/items + [ #10 .stack/length LDZ 2* - - ] LDZ2 STH2
387 387
 		( y ) DUP TOS 8** .input-frame/y LDZ2 ++ #0048 -- STH2
388
-		( x ) #0088 STH2r STH2r STHr ;draw-short JSR2
388
+		( x ) .input-frame/x LDZ2 #0020 ++ STH2r STH2r STHr ;draw-short JSR2
389 389
 		INC GTHk ,&loop JCN
390 390
 	POP2
391 391
 
... ...
@@ -410,9 +410,9 @@ RTN
410 410
 
411 411
 @get-length ( short* -- length )
412 412
 
413
-	DUP2 #0fff << ,&no4 JCN POP2 #04 RTN &no4
414
-	DUP2 #00ff << ,&no3 JCN POP2 #03 RTN &no3
415
-	DUP2 #000f << ,&no2 JCN POP2 #02 RTN &no2
413
+	DUP2 #1000 << ,&no4 JCN POP2 #04 RTN &no4
414
+	DUP2 #0100 << ,&no3 JCN POP2 #03 RTN &no3
415
+	DUP2 #0010 << ,&no2 JCN POP2 #02 RTN &no2
416 416
 	#0000 !!
417 417
 
418 418
 RTN
... ...
@@ -426,7 +426,7 @@ RTN
426 426
 		( x ) DUP TOS 8** .input-frame/x LDZ2 #0018 ++ SWP2 -- .Screen/x DEO2
427 427
 		( value ) STHk .input/value LDZ2 STHr 4* SFT2 #000f AND2
428 428
 		( value glyph ) 8** ;font-hex ++ .Screen/addr DEO2
429
-		( color ) DUP INC .input/value LDZ2 ;get-length JSR2 >
429
+		( color ) DUP INC .input/value LDZ2 ,get-length JSR >
430 430
 		#01 + .Screen/sprite DEO
431 431
 		INC GTHk ,&loop JCN
432 432
 	POP2
... ...
@@ -495,7 +495,7 @@ RTN
495 495
 		( state ) DUP #0f SWP - .input/value LDZ2 ROT SFT2 #0001 AND2 NIP STH
496 496
 		( y ) DUP 8/ TOS 8** .bitpad-frame/y LDZ2 ++ STH2
497 497
 		( x ) DUP #07 AND TOS 8** .bitpad-frame/x LDZ2 ++
498
-		STH2r STHr #01 ;draw-bit JSR2
498
+		STH2r STHr #01 ,draw-bit JSR
499 499
 		INC GTHk ,&loop JCN
500 500
 	POP2
501 501