@@ 16,7 16,7 @@
@cursor
&x $2 &y $2
@textarea
- &color $1 &font $2 &fixed $1
+ &color $1 &fixed $1
&highlight $1 &lines $2 &length $2
&commented $1
@scrollbar
@@ 450,8 450,7 @@ JMP2r
@addr-to-width ( addr* -- width* )
- ;scan-font JSR2 LDAk #00 SWP
- .textarea/font LDZ2 ADD2 LDA #00 SWP
+ LDAk #00 SWP ;font ADD2 LDA #00 SWP
JMP2r
@@ 816,7 815,6 @@ JMP2r
;get-eof JSR2 INC2 .scroll/addr LDZ2
&loop
- ;scan-font JSR2
,scan-color JSR
DUP2 ,is-selected JSR STH
LDAk .textarea/color LDZ #09 STHr [ JMP SWP POP ]
@@ 859,37 857,9 @@ JMP2r
JMP2r
-@scan-font ( addr* -- addr* )
-
- ( on spacer ) DUP2 #0001 SUB2 LDA #21 LTH JMP JMP2r
-
- .textarea/fixed LDZ ;&fixed JCN2
- .textarea/highlight LDZ ;&default JCN2
-
- LDAk #28 NEQ ,&no-paren-open JCN
- #01 .textarea/commented STZ ,&default JMP
- &no-paren-open
- DUP2 #0002 SUB2 LDA #29 NEQ ,&no-paren-close JCN
- #00 .textarea/commented STZ ,&resume JMP
- &no-paren-close
- ( comment ) .textarea/commented LDZ ,&end JCN
- &resume
- ( special1 ) LDAk #30 LTH ,&bold JCN
- ( special2 ) LDAk DUP #39 GTH SWP #41 LTH AND ,&bold JCN
- &default
- ;font .textarea/font STZ2 JMP2r
- &bold
- ;font-bold .textarea/font STZ2 JMP2r
- &fixed
- ;font-fixed .textarea/font STZ2
- &end
-
-JMP2r
-
-@draw-uf2 ( text* font* color -- )
+@draw-uf2 ( text* color -- )
,draw-ufx/color STR
- .textarea/font STZ2
LDAk ,&no-null JCN
POP2 JMP2r
&no-null
@@ 909,7 879,7 @@ JMP2r
&basic ( char -- )
#00 SWP STH2
- .textarea/font LDZ2
+ ;font
( width ) DUP2 STH2kr ADD2 LDA
( addr* ) ROT ROT STH2r #0020 SUB2 #50 SFT2 ADD2 #0080 ADD2
@@ 989,7 959,6 @@ JMP2r
;draw-ufx/color STA
[ LIT2 &x $2 ] .Screen/x DEO2
#0004 .Screen/y DEO2
- ;font-fixed .textarea/font STZ2
SWP ,&draw-byte JSR
&draw-byte ( byte -- )
@@ 1041,7 1010,7 @@ JMP2r
STH
#04 ;get-catx JSR2 .Screen/x DEO2
#0004 .Screen/y DEO2
- ;filepath ;font-bold STHr ;draw-uf2 ( .. )
+ ;filepath STHr ;draw-uf2 ( .. )
JMP2