(m291) Progress on merging lists
This commit is contained in:
parent
f8cf42530f
commit
2d1b4b2670
|
@ -323,20 +323,7 @@
|
||||||
|
|
||||||
@<y-id> ( y* -- id )
|
@<y-id> ( y* -- id )
|
||||||
[ LIT2 00 -playing ] LDZ EQU ?{ #0080 SUB2 }
|
[ LIT2 00 -playing ] LDZ EQU ?{ #0080 SUB2 }
|
||||||
#0018 SUB2
|
#0018 SUB2 #04 SFT2 NIP .selection/scroll LDZ ADD JMP2r
|
||||||
( | above )
|
|
||||||
DUP2 #8000 GTH2 ?&outside
|
|
||||||
( | spacer )
|
|
||||||
has-spacer #00 EQU ?{
|
|
||||||
DUP2 [ LIT2 00 -lines/folders ] LDZ #40 SFT2 SUB2 #0008 LTH2 ?&outside
|
|
||||||
DUP2 [ LIT2 00 -lines/folders ] LDZ #40 SFT2 GTH2 #00 SWP #30 SFT2 SUB2 }
|
|
||||||
#04 SFT2 NIP
|
|
||||||
( | below )
|
|
||||||
DUP count-lines LTH ?{ POP #ff }
|
|
||||||
JMP2r
|
|
||||||
|
|
||||||
&outside ( y* -- id )
|
|
||||||
POP2 #ff JMP2r
|
|
||||||
|
|
||||||
@<refresh-dir> ( -- )
|
@<refresh-dir> ( -- )
|
||||||
;path .File/name DEO2
|
;path .File/name DEO2
|
||||||
|
@ -359,7 +346,6 @@
|
||||||
( tracks ) .lines/tracks LDZ ADD
|
( tracks ) .lines/tracks LDZ ADD
|
||||||
( scroll ) #18 LTHk [ JMP SWP ] POP
|
( scroll ) #18 LTHk [ JMP SWP ] POP
|
||||||
( empty ) DUP #00 EQU ADD #40 SFT2
|
( empty ) DUP #00 EQU ADD #40 SFT2
|
||||||
( no-folder spacer ) has-spacer #00 EQU ?{ #0008 ADD2 }
|
|
||||||
( padding ) #0020 ADD2
|
( padding ) #0020 ADD2
|
||||||
( playing ) [ LIT2 00 -playing ] LDZ EQU ?{ #0080 ADD2 }
|
( playing ) [ LIT2 00 -playing ] LDZ EQU ?{ #0080 ADD2 }
|
||||||
.Screen/height DEO2
|
.Screen/height DEO2
|
||||||
|
@ -436,10 +422,6 @@
|
||||||
@count-lines ( -- lines )
|
@count-lines ( -- lines )
|
||||||
.lines/folders LDZ .lines/tracks LDZ ADD JMP2r
|
.lines/folders LDZ .lines/tracks LDZ ADD JMP2r
|
||||||
|
|
||||||
@has-spacer ( -- f )
|
|
||||||
[ LIT2 00 -lines/folders ] LDZ NEQ
|
|
||||||
( .. ) [ LIT2 00 -lines/tracks ] LDZ NEQ AND JMP2r
|
|
||||||
|
|
||||||
@is-folder ( line* -- line* f )
|
@is-folder ( line* -- line* f )
|
||||||
DUP2 lcap/ #0001 SUB2 LDA [ LIT "/ ] EQU JMP2r
|
DUP2 lcap/ #0001 SUB2 LDA [ LIT "/ ] EQU JMP2r
|
||||||
|
|
||||||
|
@ -535,7 +517,6 @@
|
||||||
;dict/empty #0f !<draw-uf2> }
|
;dict/empty #0f !<draw-uf2> }
|
||||||
( | folders )
|
( | folders )
|
||||||
.selection LDZ <draw-folders>
|
.selection LDZ <draw-folders>
|
||||||
has-spacer #00 EQU ?{ ;dash-icn <draw-spacer> }
|
|
||||||
;mem/tracks .lines/tracks LDZ .selection LDZ .lines/folders LDZ SUB
|
;mem/tracks .lines/tracks LDZ .selection LDZ .lines/folders LDZ SUB
|
||||||
( >> )
|
( >> )
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue