2 files changed, 9 insertions(+), 11 deletions(-)

M src/left.tal
M src/manifest.tal

@@ 13,8 13,6 @@
 	@search $30
 	@selection
 		&from $2 &to $2 &length $2
-	@cursor
-		&x $2 &y $2
 	@textarea
 		&highlight $1 &lines $2 &length $2
 	@scrollbar

@@ 310,14 310,14 @@ JMP2r
 
 	#00 .Screen/auto DEO
 	#40 draw-cursor
-	.Mouse/x DEI2 .cursor/x STZ2
-	.Mouse/y DEI2 .cursor/y STZ2
+	.Mouse/x DEI2 ,draw-cursor/x STR2
+	.Mouse/y DEI2 ,draw-cursor/y STR2
 	.Screen/addr DEO2
 
 @draw-cursor ( color -- )
 
-	.cursor/x LDZ2 .Screen/x DEO2
-	.cursor/y LDZ2 .Screen/y DEO2
+	[ LIT2 &x $2 ] .Screen/x DEO2
+	[ LIT2 &y $2 ] .Screen/y DEO2
 	.Screen/sprite DEO
 
 JMP2r


@@ 331,10 331,10 @@ JMP2r
 	;&r .File/read DEO2
 	;&g .File/read DEO2
 	;&b .File/read DEO2
-	.File/success DEI2 ORA #01 JCN JMP2r
-	LIT2 &r $2 .System/r DEO2
-	LIT2 &g $2 .System/g DEO2
-	LIT2 &b $2 .System/b DEO2
+	.File/success DEI2 ORA #01 [ JCN JMP2r ]
+	[ LIT2 &r $2 ] .System/r DEO2
+	[ LIT2 &g $2 ] .System/g DEO2
+	[ LIT2 &b $2 ] .System/b DEO2
 
 JMP2r
 	&path ".theme $1


@@ 349,7 349,7 @@ JMP2r
 @scat ( src* dst* -- ) scap
 @scpy ( src* dst* -- ) STH2 &w LDAk STH2kr STA INC2r INC2 LDAk ?&w POP2 #00 STH2r STA JMP2r
 @mclr ( src* len* -- ) OVR2 ADD2 SWP2 &l STH2k #00 STH2r STA INC2 GTH2k ?&l POP2 POP2 JMP2r
-@phex ( short* -- ) SWP ,&b JSR &b DUP #04 SFT ,&c JSR &c #0f AND DUP #09 GTH #27 MUL ADD #30 ADD #18 DEO JMP2r
+@phex ( short* -- ) SWP phex/b &b DUP #04 SFT phex/c JSR &c #0f AND DUP #09 GTH #27 MUL ADD #30 ADD #18 DEO JMP2r
 @exit ( -- ) #010f DEO JMP2r
 
 ( assets )