@@ 43,6 43,15 @@ BRK
BRK
+(
+@|actions )
+
+@menu-deselect ( cat cat -- )
+
+ POP2
+
+( >> )
+
@menu-close ( -- )
untrap
@@ 75,15 84,8 @@ JMP2r
#ff ;draw-sub/sel STA
DUP ;draw-menu/sel STA
#ff draw-sub
- !draw-menu
-( .. )
-
-@menu-deselect ( cat cat -- )
-
- POP2 !menu-close
-
-( .. )
+!draw-menu
@menu-select-sub ( sub -- )
@@ 125,7 127,7 @@ JMP2r
( TODO: merge tails )
POPr
#0000
- JMP2r
+JMP2r
&end
POP2
INC2 INC2 LDA2
@@ 215,6 217,9 @@ JMP2r
JMP2r
+(
+@|drawing )
+
@draw-menu ( mask -- )
#0010 .Screen/x DEO2
@@ 257,7 262,7 @@ JMP2r
.Screen/x DEI2
.Screen/y DEI2
.Screen/auto DEI
- #f2 .Screen/auto DEO
+ [ LIT2 f2 -Screen/auto ] DEO
;blank-icn .Screen/addr DEO2
;draw-chr/color LDA .Screen/sprite DEOk DEO
.Screen/auto DEO
@@ 266,9 271,9 @@ JMP2r
STH2k #0078 ADD2 .Screen/x DEO2
LDA2k get-modkey-str draw-str-right POP2
STH2r .Screen/x DEO2
- #0004 ADD2 !draw-str
+ #0004 ADD2
-( .. )
+!draw-str
@get-modkey-str ( mod key -- str* )
@@ 306,7 311,7 @@ JMP2r
@update-cursor ( color addr* -- )
- #00 .Screen/auto DEO
+ [ LIT2 00 -Screen/auto ] DEO
#40 draw-cursor
.Mouse/x DEI2 ,draw-cursor/x STR2
.Mouse/y DEI2 ,draw-cursor/y STR2