@@ 37,7 37,7 @@
0908 0707 0706 0607 0703 0407 070a 0708
0709 0807 0708 080c 0808 0704 0604 0605
0307 0606 0707 0506 0704 0406 030c 0806
-0707 0606 0508 070b 0607 0605 0305 0708
+0707 0606 0508 070b 0607 0605 0305 0808
&glyphs
0000 0000 0000 0000 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000
@@ 41,8 41,6 @@
.Screen/height DEI2
DUP2 #0020 SUB2 #04 SFT2 .textarea/lines STZ2
#0018 SUB2 .scrollbar/height STZ2
- ( place widget )
- .Screen/width DEI2 #0028 SUB2 ;draw-widget/x STA2
#0001 .scroll/ratio STZ2
;text .scroll/addr STZ2
;text ;select-start JSR2
@@ 361,7 359,6 @@ BRK
DUP2 ,count-lines JSR GTH2 ,&skip JCN
DUP2 ;set-scroll-y JSR2
;draw-textarea JSR2
- ;draw-widget/scroll JSR2
&skip
POP2
@@ 401,9 398,11 @@ JMP2r
#0001 ;count-lines JSR2 .scrollbar/height LDZ2 DIV2 NIP #40 SFT SFT2 .scroll/ratio STZ2
DUP2 .scroll/y LDZ2 EQU2 ,&same JCN
+ #00 ;draw-position JSR2
DUP2 .scroll/y STZ2
DUP2 ,line-to-addr JSR .scroll/addr STZ2
;update-nav JSR2
+ #02 ;draw-position JSR2
&same
POP2
@@ 502,24 501,21 @@ JMP
INC2k ,set-selection JSR JMP JMP2r
;update-selection JSR2
- ;update-nav JSR2
- ;draw-widget/selection ( .. )
+ ;update-nav ( .. )
JMP2
@select-end ( addr* -- )
.selection/from LDZ2 SWP2 ,set-selection JSR [ JMP JMP2r ]
- ;update-selection JSR2
- ;draw-widget/size ( .. )
+ ;update-selection ( .. )
JMP2
@select-range ( from* to* -- )
,set-selection JSR [ JMP JMP2r ]
- ;update-selection JSR2
- ;draw-widget/size ( .. )
+ ;update-selection ( .. )
JMP2
@@ 529,8 525,7 @@ JMP2
#00 .search STZ
&no-unsearch
;update-nav JSR2
- ;draw-textarea JSR2
- ;draw-widget/selection ( .. )
+ ;draw-textarea ( .. )
JMP2
@@ 578,8 573,7 @@ JMP2
.selection/from LDZ2 STH2k #0001 SUB2 ;get-eof JSR2 #0001 ;msfr JSR2
#0001 ;mod-length JSR2
STH2kr STA
- STH2r INC2 ;select-start JSR2
- ;draw-widget/memory ( .. )
+ STH2r INC2 ;select-start ( .. )
JMP2
@@ 595,9 589,7 @@ JMP2
.selection/from LDZ2 #0001 SUB2
DUP2 ;get-eof JSR2 #0001 ;msfl JSR2
;select-start JSR2
- #ffff ;mod-length JSR2
-
- ;draw-widget/memory ( .. )
+ #ffff ;mod-length ( .. )
JMP2
@@ 613,8 605,7 @@ JMP2
.selection/from LDZ2 ;get-eof JSR2 #0001 ;msfl JSR2
;update-nav JSR2
#ffff ;mod-length JSR2
- ;draw-textarea JSR2
- ;draw-widget/memory ( .. )
+ ;draw-textarea ( .. )
JMP2
@@ 899,8 890,6 @@ JMP2r
DUP #20 SUB #5e GTH ,draw-special JCN
-&basic ( char -- )
-
( width ) #00 SWP STH2k ;font ADD2 LDA
( addr* ) ;font/glyphs STH2r #0020 SUB2 #50 SFT2 ADD2
@@ 979,24 968,27 @@ JMP2r
JMP2r
-@draw-widget ( -- )
+@draw-position ( color -- )
- &scroll .scroll/y LDZ2 #02 ,&draw-short JMP
- &selection .selection/from LDZ2 ;text SUB2 #03 ,&draw-short JMP
- &size .selection/length LDZ2 #09 ,&draw-short JMP
- &memory ( move ) #fff0 ;get-eof JSR2 SUB2 #01
+ #04 ;get-catx JSR2
+ ;filepath ;get-strw JSR2 ADD2
+ .Screen/x DEO2
+ #0004 .Screen/y DEO2
+ #03 ;draw-chr/color STA
+ LIT "~ ;draw-chr JSR2
+ .scroll/y LDZ2 ROT ;draw-short JSR2
-&draw-short ( addr* color -- )
+JMP2r
- ;draw-ufx/color STA
- [ LIT2 &x $2 ] .Screen/x DEO2
- #0004 .Screen/y DEO2
+@draw-short ( addr* color -- )
+
+ ;draw-chr/color STA
SWP ,&draw-byte JSR
&draw-byte ( byte -- )
- DUP #04 SFT ,&parse JSR ;draw-ufx/basic JSR2
- #0f AND ,&parse JSR ;draw-ufx/basic ( .. )
+ DUP #04 SFT ,&parse JSR ;draw-chr JSR2
+ #0f AND ,&parse JSR ;draw-chr ( .. )
JMP2
&parse ( value -- char )
@@ 1038,12 1030,14 @@ JMP2r
@draw-filepath ( color -- )
- ;draw-chr/color STA
+ DUP ;draw-position JSR2
+ DUP ;draw-chr/color STA
#04 ;get-catx JSR2 .Screen/x DEO2
#0004 .Screen/y DEO2
;filepath ;draw-str JSR2 POP2
+ ;draw-position ( .. )
-JMP2r
+JMP2
@draw-state ( state -- )
@@ 1124,7 1118,6 @@ JMP2r
;set-scroll-x JSR2
( draw )
#01 ;draw-filepath JSR2
- ;draw-widget/memory JSR2
;update-nav JSR2
;draw-textarea ( .. )
@@ 1174,8 1167,7 @@ JMP2
,edit-copy JSR
;erase-selection JSR2
- ;reset-selection JSR2
- ;draw-widget/memory ( .. )
+ ;reset-selection ( .. )
JMP2