@@ 246,27 246,29 @@ BRK
BRK
@on-button-trap ( -> )
-
- ( backspace )
- .Controller/key DEI #08 ! ,&no-edit-backspace JCN
- .path/length LDZ #00 = ,&edit-end JCN
- .path/length LDZ #01 - .path/length STZ
- #00 .path/name .path/length LDZ + STZ
- #23 ;draw-filepath JSR2
- BRK
+
+ .Controller/key DEI
+ DUP ,&continue JCN
+ POP BRK
+ &continue
+ DUP ( backspace ) #08 ! ,&no-edit-backspace JCN
+ ( clamp ) .path/length LDZ #00 = ,&edit-end JCN
+ #20 ;draw-filepath JSR2
+ .path/length LDZ #01 - STHk .path/length STZ
+ #00 .path/name STHr + STZ
+ #21 ;draw-filepath JSR2 POP BRK
&no-edit-backspace
- ( enter/escape )
- .Controller/key DEI DUP #0d = SWP #2d < #0000 == ,&no-edit-enter JCN
+ DUP ( special ) #20 > ,&no-edit-enter JCN
#00 .state/trap STZ
- #23 ;draw-filepath JSR2
- BRK
+ #21 ;draw-filepath JSR2 POP BRK
&no-edit-enter
- ( default )
- .path/length LDZ #1f = ,&edit-end JCN
- .Controller/key DEI .path/name .path/length LDZ + STZ
- .path/length LDZ #01 + .path/length STZ
+ ( clamp ) .path/length LDZ #1f = ,&edit-end JCN
+ DUP .path/name .path/length LDZ STHk + STZ
+ STHr #01 + STHk .path/length STZ
+ #00 .path/name STHr + STZ
+ #23 ;draw-filepath JSR2
&edit-end
- #00 .path/name .path/length LDZ + STZ
+ POP
BRK
@@ 312,15 314,13 @@ BRK
POP2
.settings/color LDZ ;put-pixel JSR2
SET-STATE
- ;draw-tileview JSR2
- ;draw-preview JSR2
+ ;redraw JSR2
BRK &no-brush-mouse1
DUP2 #0010 !! ,&no-brush-mouse2 JCN ( brush erase )
POP2
#00 ;put-pixel JSR2
SET-STATE
- ;draw-tileview JSR2
- ;draw-preview JSR2
+ ;redraw JSR2
BRK &no-brush-mouse2
DUP2 #0101 !! ,&no-select-mouse1 JCN ( select default )
POP2
@@ 510,8 510,7 @@ BRK
OVR2 ++
&loop
OVR2 #00 ROT ROT STA
- INCR2
- NEQ2k ,&loop JCN
+ INCR2 NEQ2k ,&loop JCN
POP2 POP2
RTN
@@ 522,8 521,7 @@ RTN
&loop
OVR2 #0010 ++ LDA STH
OVR2 STHr ROT ROT STA
- INCR2
- NEQ2k ,&loop JCN
+ INCR2 NEQ2k ,&loop JCN
POP2 POP2
RTN
@@ 534,8 532,7 @@ RTN
&loop
OVR2 LDA STH
OVR2 #0010 ++ STHr ROT ROT STA
- DECR2
- NEQ2k ,&loop JCN
+ DECR2 NEQ2k ,&loop JCN
POP2 POP2
RTN
@@ 577,8 574,7 @@ RTN
&loop
OVR TOS STH2kr ++ DUP2
LDA [ ROL ] ROT ROT STA
- INCR
- LTHk ,&loop JCN
+ INCR LTHk ,&loop JCN
POP2
POP2r
@@ 591,8 587,7 @@ RTN
&loop
OVR TOS STH2kr ++ DUP2
LDA [ ROR ] ROT ROT STA
- INCR
- LTHk ,&loop JCN
+ INCR LTHk ,&loop JCN
POP2
POP2r
@@ 607,8 602,7 @@ RTN
OVR TOS DUP2 STH2kr ++ LDA
( put )
ROT ROT SWP2r STH2kr SWP2r ++ STA
- INCR
- LTHk ,&loop JCN
+ INCR LTHk ,&loop JCN
POP2
POP2r POP2r
@@ 643,12 637,10 @@ RTN
.settings/blending LDZ +
.settings/depth LDZ #20 * +
#20 + .Screen/color DEO
- INCR
- LTHk ,&hor JCN
+ INCR LTHk ,&hor JCN
POP2
POPr
- INCR
- LTHk ,&ver JCN
+ INCR LTHk ,&ver JCN
POP2
.tileview/x1 LDZ2 #0002 --
@@ 672,11 664,9 @@ RTN
( get pixel offset ) GET-ITERATORS SWP TOS ROT TOS
( add focus ) STH2kr SWP2r STH2kr SWP2r ADD-POSITIONS
;get-pixel JSR2 #20 + .Screen/color DEO
- INCR
- LTHk ,&hor JCN
+ INCR LTHk ,&hor JCN
POP2
- INCR
- LTHk ,&ver JCN
+ INCR LTHk ,&ver JCN
POP2
POP2r POP2r
@@ 689,8 679,7 @@ RTN
.tileview/y1 LDZ2 STHr #01 + #40 * #01 - TOS ++
#02
;line-hor JSR2
- INCR
- LTHk ,&guides-hor JCN
+ INCR LTHk ,&guides-hor JCN
POP2
#00 HOR #08 / #01 -
@@ 701,8 690,7 @@ RTN
.tileview/y2 LDZ2
#02
;line-ver JSR2
- INCR
- LTHk ,&guides-ver JCN
+ INCR LTHk ,&guides-ver JCN
POP2
RTN
@@ 830,8 818,7 @@ RTN
OVR #04 / #00 SWP #0008 ** .blendview/y1 LDZ2 ++ .Screen/y DEO2
#20 .Screen/color DEO
OVR #20 + .settings/depth LDZ #20 * + .Screen/color DEO
- INCR
- LTHk ,&loop JCN
+ INCR LTHk ,&loop JCN
POP2
RTN
@@ 886,11 873,9 @@ RTN
;halftone-icn .Screen/addr DEO2
#23 .Screen/color DEO
&resume
- ( incr ) INCR
- LTHk ,&hor JCN
+ INCR LTHk ,&hor JCN
POP2
- ( incr ) INCR
- LTHk ;&ver JCN2
+ INCR LTHk ;&ver JCN2
POP2
POP2r
@@ 928,8 913,7 @@ RTN
OVR STHkr > #08 * TOS ;slider-icns ++ .Screen/addr DEO2
#22 .Screen/color DEO
.Screen/x DEI2 #0002 ++ .Screen/x DEO2
- INCR
- LTHk ,&loop JCN
+ INCR LTHk ,&loop JCN
POP2
POPr
@@ 950,8 934,7 @@ RTN
OVR #02 * TOS .settings/focus LDZ2 ++ LDA2 #23 ;draw-short JSR2
.dataview/x1 LDZ2 #0020 ++ .Screen/x DEO2
OVR #02 * TOS .settings/focus LDZ2 ++ #0008 ++ LDA2 #23 ;draw-short JSR2
- INCR
- LTHk ,&loop JCN
+ INCR LTHk ,&loop JCN
POP2
RTN
@@ 975,11 958,9 @@ RTN
#07 SWP - SFT #01 AND
#02 * +
#20 + .Screen/color DEO
- INCR
- LTHk ,&hor JCN
+ INCR LTHk ,&hor JCN
POP2
- INCR
- LTHk ,&ver JCN
+ INCR LTHk ,&ver JCN
POP2
.zoomview/x1 LDZ2 #0002 --
@@ 1081,8 1062,7 @@ RTN
&loop
OVR DUP TOS STH2kr ++ LDA
SWP .path/name + STZ
- INCR
- LTHk ,&loop JCN
+ INCR LTHk ,&loop JCN
( end ) #00 SWP .path/name + STZ
.path/length STZ
POP2r
@@ 1114,8 1094,7 @@ RTN
&loop
OVR2 BANK-TEMP ++ LDA STH
OVR2 [ DUP2 #0008 // #0008 ** ++ ] BANK ++ STHr ROT ROT STA
- INCR2
- LTH2k ,&loop JCN
+ INCR2 LTH2k ,&loop JCN
POP2 POP2
RTN