Browse code

Improved label.tal

neauoire authored on 08/04/2022 18:41:07
Showing 2 changed files
... ...
@@ -6,7 +6,7 @@
6 6
 |00 @System  &vector $2 &pad $6 &r $2 &g $2 &b $2 &debug $1 &halt $1
7 7
 |20 @Screen  &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr  $2 &pixel $1 &sprite $1
8 8
 |90 @Mouse &vector $2 &x $2 &y $2 &state $1 &wheel $1
9
-|b0 @Date &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1
9
+|c0 @Date &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1
10 10
 
11 11
 |0000
12 12
 
... ...
@@ -8,11 +8,11 @@
8 8
 @center &x $2 &y $2
9 9
 
10 10
 |0100
11
-	
11
+
12 12
 	( theme )
13
-	#f0d7 .System/r DEO2
14
-	#f0de .System/g DEO2
15
-	#f0dc .System/b DEO2
13
+	#a0dc .System/r DEO2
14
+	#a0dc .System/g DEO2
15
+	#a0dc .System/b DEO2
16 16
 	( find screen center )
17 17
 	.Screen/width DEI2 #01 SFT2 .center/x STZ2
18 18
 	.Screen/height DEI2 #01 SFT2 .center/y STZ2
... ...
@@ -28,32 +28,32 @@
28 28
 	POP2 POP2
29 29
 	( left )
30 30
 	.center/x LDZ2 .Screen/x DEO2
31
-	.center/y LDZ2 #0020 SUB2 .Screen/y DEO2
32
-	;left-txt #09 ;draw-uf2 JSR2
31
+	.center/y LDZ2 #0018 SUB2 .Screen/y DEO2
32
+	;left-txt ,draw-uf2 JSR
33 33
 	( center )
34 34
 	.center/x LDZ2 .Screen/x DEO2
35 35
 	.center/y LDZ2 .Screen/y DEO2
36
-	;center-txt #09 ;draw-uf2-center JSR2
36
+	;center-txt ,draw-uf2-center JSR
37 37
 	( right )
38 38
 	.center/x LDZ2 .Screen/x DEO2
39
-	.center/y LDZ2 #0020 ADD2 .Screen/y DEO2
40
-	;right-txt #09 ;draw-uf2-right JSR2
39
+	.center/y LDZ2 #0018 ADD2 .Screen/y DEO2
40
+	;right-txt ,draw-uf2-right JSR
41 41
 
42 42
 BRK
43 43
 
44 44
 @draw-uf2-center ( text* color -- )
45
-	
46
-	STH
47
-	DUP2 ,get-width JSR #01 SFT2 STH2 .Screen/x DEI2k STH2r SUB2 ROT DEO2
48
-	STHr ,draw-uf2 JSR
45
+
46
+	DUP2 ,get-width JSR #01 SFT2 STH2 
47
+	.Screen/x DEI2k STH2r SUB2 ROT DEO2
48
+	,draw-uf2 JSR
49 49
 
50 50
 JMP2r
51 51
 
52 52
 @draw-uf2-right ( text* color -- )
53 53
 
54
-	STH
55
-	DUP2 ,get-width JSR STH2 .Screen/x DEI2k STH2r SUB2 ROT DEO2
56
-	STHr ,draw-uf2 JSR
54
+	DUP2 ,get-width JSR STH2 
55
+	.Screen/x DEI2k STH2r SUB2 ROT DEO2
56
+	,draw-uf2 JSR
57 57
 
58 58
 JMP2r
59 59
 
... ...
@@ -68,19 +68,17 @@ JMP2r
68 68
 
69 69
 JMP2r
70 70
 
71
-@draw-uf2 ( text* color -- )
71
+@draw-uf2 ( text* -- )
72 72
 
73
-	STH
74 73
 	#15 .Screen/auto DEO
75 74
 	&while
76
-		LDAk STHkr SWP
77
-		#00 SWP #20 SUB
78
-			( addr ) DUP2 #50 SFT2 ;font/glyphs ADD2 .Screen/addr DEO2
79
-			( anchor ) ;font ADD2 LDA #00 SWP .Screen/x DEI2 ADD2 STH2
80
-		.Screen/sprite DEOk DEO
81
-		STH2r .Screen/x DEO2
75
+		LDAk #20 SUB #00 SWP
76
+			DUP2 #50 SFT2 ;font/glyphs ADD2 .Screen/addr DEO2
77
+			;font ADD2 LDA #00 SWP .Screen/x DEI2 ADD2
78
+		#01 .Screen/sprite DEOk DEO
79
+		.Screen/x DEO2
82 80
 		INC2 LDAk ,&while JCN
83
-	POP2 POPr
81
+	POP2
84 82
 
85 83
 JMP2r
86 84
 
... ...
@@ -88,22 +86,6 @@ JMP2r
88 86
 @center-txt "Center 20 "Aligned 20 "Label $1
89 87
 @right-txt "Right 20 "Aligned 20 "Label $1
90 88
 
91
-@unknown-icn
92
-	aa55 aa55 aa55 aa55
93
-	aa55 aa55 aa55 aa55
94
-	aa55 aa55 aa55 aa55
95
-	aa55 aa55 aa55 aa55
96
-@tab-icn
97
-	0000 0000 0000 1008
98
-	1000 0000 0000 0000
99
-	0000 0000 0000 0000
100
-	0000 0000 0000 0000
101
-@linebreak-icn
102
-	0000 0000 0000 1028
103
-	1000 0000 0000 0000
104
-	0000 0000 0000 0000
105
-	0000 0000 0000 0000
106
-
107 89
 @font ( venice14 )
108 90
 	0505 0809 080c 0d05 0707 0a09 0609 0608
109 91
 	0808 0808 0908 0808 0808 0505 0708 0709