@@ 7,15 7,6 @@
|90 @Mouse &vector $2 &x $2 &y $2 &state $1 &wheel $1
|a0 @File &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &read $2 &write $2
-%menu-def { #01 }
-%menu-sel { #04 }
-%menu-hov { #09 }
-%menu-hit { #0014 }
-%menu-auto { #15 }
-%menu-label { DEOk DEO }
-%menu-l { #40 }
-%menu-r { #04 }
-
|0000
@state &timer $2
@@ 26,9 17,6 @@
@editor-view &x $2 &y $2 &x2 $2 &y2 $2
@collection-view &x $2 &y $2 &x2 $2 &y2 $2
-(
-@|vectors )
-
|0100 ( -> )
( theme )
@@ 82,15 70,18 @@ BRK
80 00 :move-right "Right $1
$1
+(
+@|vectors )
+
@trap ( -- )
;on-frame-trap .Screen/vector DEO2
;on-button-trap .Controller/vector DEO2
;on-mouse-trap .Mouse/vector DEO2
#00 .Mouse/state DEO
- #40 ;draw-cursor JSR2
+ #40 ;draw-cursor ( .. )
-JMP2r
+JMP2
@untrap ( -- )
@@ 98,9 89,9 @@ JMP2r
;on-button .Controller/vector DEO2
;on-mouse .Mouse/vector DEO2
#00 .Mouse/state DEO
- #01 ;draw-filepath JSR2
+ #01 ;draw-filepath ( .. )
-JMP2r
+JMP2
@on-console ( -> )
@@ 144,7 135,7 @@ JMP2r
@on-mouse-trap ( -> )
( release on touch )
- .Mouse/state DEI #00 NEQ JMP BRK
+ .Mouse/state DEI #00 NEQ [ JMP BRK ]
;untrap JSR2
BRK
@@ 260,17 251,17 @@ JMP2r
POP2 JMP2r
&changed
#00 ROT ;font ADD2 STA
- ;redraw JSR2
+ ;redraw ( .. )
-JMP2r
+JMP2
@select-glyph ( glyph -- )
DUP .glyph LDZ NEQ ,&changed JCN POP JMP2r &changed
.glyph STZ
- ;redraw JSR2
+ ;redraw ( .. )
-JMP2r
+JMP2
@get-pixel ( addr* yx -- mask )
@@ 296,10 287,10 @@ JMP2r
JMP2r
-@move-up ( -- ) .glyph LDZ #10 SUB ;select-glyph JSR2 JMP2r
-@move-down ( -- ) .glyph LDZ #10 ADD ;select-glyph JSR2 JMP2r
-@move-left ( -- ) .glyph LDZ #01 SUB ;select-glyph JSR2 JMP2r
-@move-right ( -- ) .glyph LDZ INC ;select-glyph JSR2 JMP2r
+@move-up ( -- ) .glyph LDZ #10 SUB ;select-glyph JMP2
+@move-down ( -- ) .glyph LDZ #10 ADD ;select-glyph JMP2
+@move-left ( -- ) .glyph LDZ #01 SUB ;select-glyph JMP2
+@move-right ( -- ) .glyph LDZ INC ;select-glyph JMP2
(
@|drawing )
@@ 326,9 317,9 @@ JMP2r
#01 ;draw-filepath JSR2
;draw-pangrams JSR2
;draw-editor JSR2
- ;draw-collection JSR2
+ ;draw-collection ( .. )
-JMP2r
+JMP2
@draw-filepath ( color -- )
@@ 407,9 398,9 @@ JMP2r
( id )
.editor-view/x LDZ2 .Screen/x DEO2
.editor-view/y LDZ2 #0088 ADD2 .Screen/y DEO2
- .glyph LDZ ;draw-byte JSR2
+ .glyph LDZ ;draw-byte ( .. )
-JMP2r
+JMP2
@draw-collection ( -- )
@@ 539,18 530,18 @@ JMP2r
;src .File/name DEO2
#2100 .File/length DEO2
;font .File/read DEO2
- ;redraw-all JSR2
+ ;redraw-all ( .. )
-JMP2r
+JMP2
@file-save ( -- )
;src .File/name DEO2
#2100 .File/length DEO2
;font .File/write DEO2
- #01 ;draw-state JSR2
+ #01 ;draw-state ( .. )
-JMP2r
+JMP2
@file-export ( -- )
@@ 564,7 555,7 @@ JMP2r
#0a ;fchr JSR2
( glyphs )
;dict/glyphs ;fstr JSR2
- ;font/glyphs #0400 ADD2 #0c00 ;fmem JSR2
+ [ ;font/glyphs #0400 ADD2 ] #0c00 ;fmem JSR2
#0a ;fchr JSR2
#00 STH2r STA
@@ 607,17 598,17 @@ JMP2r
#2100 .File/length DEO2
;get-selection JSR2 .File/read DEO2
;redraw JSR2
- #02 ;draw-state JSR2
+ #02 ;draw-state ( .. )
-JMP2r
+JMP2
@edit-erase ( -- )
;get-selection JSR2 #0020 ;mclr JSR2
#02 ;draw-state JSR2
- ;redraw JSR2
+ ;redraw ( .. )
-JMP2r
+JMP2
@edit-drag-up ( -- )
@@ 629,9 620,9 @@ JMP2r
INC GTHk ,&loop JCN
POP2
( cap ) #00 STH2r #001f ADD2 STA
- ;redraw JSR2
+ ;redraw ( .. )
-JMP2r
+JMP2
@edit-drag-down ( -- )
@@ 643,9 634,9 @@ JMP2r
INC GTHk ,&loop JCN
POP2
#00 STH2r STA
- ;redraw JSR2
+ ;redraw ( .. )
-JMP2r
+JMP2
@edit-shift-left ( -- )
@@ 671,9 662,9 @@ JMP2r
INC GTHk ,&loop JCN
POP2
POP2r
- ;redraw JSR2
+ ;redraw ( .. )
-JMP2r
+JMP2
(
@|stdlib )
@@ 681,7 672,6 @@ JMP2r
@fhex ( short* -- ) SWP ,&b JSR &b DUP #04 SFT ,&c JSR &c #0f AND DUP #09 GTH #27 MUL ADD #30 ADD ,fchr JSR JMP2r
@fchr ( chr -- ) ,&b STR #0001 .File/length DEO2 ;&b .File/write DEO2 JMP2r &b $1
@fstr ( str* -- ) DUP2 ;slen JSR2 .File/length DEO2 .File/write DEO2 JMP2r
-
@mcpy ( src* dst* len* -- ) SWP2 STH2 OVR2 ADD2 SWP2 &loop LDAk STH2kr STA INC2r INC2 GTH2k ,&loop JCN POP2 POP2 POP2r JMP2r
(
@@ 725,5 715,4 @@ JMP2r
0000 0000 0000 0000
~src/manifest.tal
-~src/font.tal