From 6212a0886614c5b86c49eb016950599a19c56e94 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Fri, 5 Jun 2020 13:54:45 -0400 Subject: [PATCH] VE: Add F and E --- blk/107 | 8 +++----- blk/108 | 7 +++---- blk/122 | 4 ++-- blk/127 | 4 +++- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/blk/107 b/blk/107 index 5b1d157..9cebddc 100644 --- a/blk/107 +++ b/blk/107 @@ -1,4 +1,4 @@ -: F +: _F ( F without _pln. used in VE ) FBUF _type FBUF EDPOS @ _cpos ( a1 a2 ) BEGIN C@+ ROT ( a2+1 c2 a1 ) C@+ ROT ( a2+1 a1+1 c1 c2 ) @@ -6,7 +6,5 @@ TUCK C@ 0xd = ( a1 a2 f1 ) OVER BLK) = OR ( a1 a2 f1|f2 ) UNTIL - DUP BLK) < IF BLK( - FBUF + -^ EDPOS ! THEN - EDPOS @ 64 / _pln DROP -; - + DUP BLK) < IF BLK( - FBUF + -^ EDPOS ! THEN DROP ; +: F _F EDPOS @ 64 / _pln ; diff --git a/blk/108 b/blk/108 index 3a2d8e6..07b1849 100644 --- a/blk/108 +++ b/blk/108 @@ -3,7 +3,7 @@ : _rbufsz ( size of linebuf to the right of curpos ) EDPOS @ 64 MOD 63 -^ ; : i COMPILE I ; IMMEDIATE ( save overshadowed ) -: I +: _I ( I without _pln. used in VE ) IBUF _type _rbufsz IBUF _blen 2DUP > IF TUCK - ( ilen chars-to-move ) SWAP EDPOS @ _cpos 2DUP + ( ctm ilen a a+ilen ) @@ -11,6 +11,5 @@ NIP ( ilen ) ELSE DROP ( ilen becomes rbuffsize ) THEN - DUP IBUF EDPOS @ _cpos ROT MOVE ( ilen ) - BLK!! EDPOS +! EDPOS @ 64 / _pln -; + DUP IBUF EDPOS @ _cpos ROT MOVE ( ilen ) EDPOS +! BLK!! ; +: I _I EDPOS @ 64 / _pln ; diff --git a/blk/122 b/blk/122 index d10f54d..8e19a9b 100644 --- a/blk/122 +++ b/blk/122 @@ -2,8 +2,8 @@ 'w' moves forward by a word. 'W' moves backward by a word. -'I' inserts text by calling the "I" command from the Block -editor. +'I', 'F' and 'E' invoke the corresponding command from the +Block Editor (B100). Refer to documentation there. 'R' goes into replace mode at current cursor position. Following keystrokes replace current character and advance diff --git a/blk/127 b/blk/127 index 089812b..d651a13 100644 --- a/blk/127 +++ b/blk/127 @@ -6,7 +6,9 @@ : $g ACC @ selblk 0acc ; : $[ BLK> @ acc@ - selblk ; : $] BLK> @ acc@ + selblk ; -: $I mode! 'I' EMIT 3 1 AT-XY I contents mode! SPC ; +: $I mode! 'I' EMIT 3 1 AT-XY _I contents mode! SPC ; +: $F mode! 'F' EMIT 3 2 AT-XY _F setpos mode! SPC ; +: $E E contents ; : $h -1 cmv ; : $l 1 cmv ; : $k -64 cmv ; : $j 64 cmv ; : $H 0acc EDPOS @ 0x3c0 AND EDPOS ! ; : $L 0acc EDPOS @ 0x3f OR EDPOS ! ;