VE: add I command

Also, add insert and find buffers to the header, making it 3 lines
high.

Also, fix the "I" overshadowing word which wasn't operating on the
proper RSP level.

Also, fix I which didn't mark the block as dirty.

blk/101

@@ -5,7 +5,7 @@ F xxx: find typed string in block.
 I xxx: insert typed string at cursor.
 E: Delete previously found string.
 
-
+Note that "I" shadows core word. Use "i" to access core word.
 
 
 

blk/102

@@ -1,5 +1,5 @@
 '? CASE NOT [IF] 51 52 LOADR+ [THEN] DROP ( B152-153 )
-'? FILL NOT [IF] 53 LOAD+ [THEN] DROP ( B154 )
+'? FILL NOT [IF] 53 LOAD+ [THEN] DROP ( B155 )
 1 7 LOADR+
 : BROWSE
     0 ACC ! L
@@ -12,5 +12,3 @@
         ENDCASE
     AGAIN
 ;
-( I masks DO..LOOP's I. Do it as late as possible. )
-: I _I ;

blk/108

@@ -2,7 +2,8 @@
     DUP BEGIN C@+ EOL? UNTIL -^ 1- ;
 : _rbufsz ( size of linebuf to the right of curpos )
     EDPOS @ 64 MOD 63 -^ ;
-: _I
+: i COMPILE I ; IMMEDIATE ( save overshadowed )
+: I
     IBUF _type _rbufsz IBUF _blen 2DUP > IF
         TUCK - ( ilen chars-to-move )
         SWAP EDPOS @ _cpos 2DUP + ( ctm ilen a a+ilen )
@@ -11,5 +12,5 @@
     ELSE DROP ( ilen becomes rbuffsize )
     THEN
     DUP IBUF EDPOS @ _cpos ROT MOVE ( ilen )
-    EDPOS +! EDPOS @ 64 / _pln
+    BLK!! EDPOS +! EDPOS @ 64 / _pln
 ;

blk/120

@@ -4,7 +4,8 @@ This editor, unlike the Block Editor (B100), is grid-based
 instead of being command-based. It requires the AT-XY, COLS
 and LINES words to be implemented.
 
-It is loaded with "125 LOAD" and invoked with "VE".
+It is loaded with "125 LOAD" and invoked with "VE". Note that
+this also fully loads the Block Editor (B100).
 
 This editor uses 17 lines. The top line is the status line and
 the 16 others are contents lines. The content shown is that
@@ -12,5 +13,4 @@ of the currently selected block.
 
 All keystrokes are directly interpreted by VE and have the
 effect described below.
-
                                                         (cont.)

blk/121

@@ -4,13 +4,13 @@ keystokes described below. The modifier starts at zero, but
 most commands interpret a zero as a 1 so that they can have an
 effect.
 
-'G' selects the block specified by the modifier as the current
+'g' selects the block specified by the modifier as the current
 block. Any change madde to the previously selected block is
 saved beforehand.
 
 '[' and ']' advance the selected block by modifier.
 
-';' resets the modifier
+';' resets the modifier. 'q' quits.
 
-H and L move the cursor by "modifier" characters. J and K, by
+'h' and 'l' move the cursor by "modifier" characters. 'j' and
-lines.                                                  (cont.)
+'k', by lines.                                          (cont.)

blk/122

@@ -1 +1,6 @@
-W moves forward by a word. S moves backward by a word.
+'H' goes to the beginning of the line, 'L' to the end.
+
+'w' moves forward by a word. 'W' moves backward by a word.
+
+'I' inserts text by calling the "I" command from the Block
+editor.

blk/125

@@ -1,2 +1,3 @@
 '? UPPER NOT [IF] 33 LOAD+ [THEN] DROP ( B158 )
-1 3 LOADR+
+-23 LOAD+ ( B102, block editor )
+1 4 LOADR+

blk/126

@@ -1,14 +1,13 @@
 CREATE CMD 2 C, '$' C, 0 C,
-VARIABLE ACC
+VARIABLE MODE VARIABLE MODEC
-VARIABLE POS
 : 0acc 0 ACC ! ;
 : acc@ ACC @ 1 MAX 0acc ;
 : num ACC @ SWAP _pdacc IF DROP ELSE ACC ! THEN ;
 : nspcs ( n -- , spit n space ) 0 DO SPC LOOP ;
 : aty 0 SWAP AT-XY ;
 : clrln DUP aty COLS nspcs aty ;
-: clrscr LINES 0 DO I clrln LOOP ;
+: clrscr LINES 0 DO i clrln LOOP ;
 : status 0 clrln ." BLK" SPC BLK> ? SPC ACC ?
-    SPC POS @ 64 /MOD . ',' EMIT . ;
+    SPC EDPOS @ 64 /MOD . ',' EMIT . SPC MODEC C@ EMIT ;
-: contents 1 aty BLK> @ LIST ;
+: contents 3 aty BLK> @ LIST ;
 : selblk BLK@ contents ;

blk/127

@@ -1,13 +1,12 @@
-: setpos POS @ 64 /MOD
+: setpos EDPOS @ 64 /MOD
-    1+ ( status line ) SWAP 3 + ( gutter ) SWAP AT-XY ;
+    3 + ( header ) SWAP 3 + ( gutter ) SWAP AT-XY ;
-: pos+ POS @ + 1024 MOD POS ! ;
+: pos+ EDPOS @ + 1024 MOD EDPOS ! ;
 : cmv ( n -- , char movement ) acc@ * pos+ ;
 : $; 0acc ;
-: $G ACC @ selblk 0acc ;
+: $g ACC @ selblk 0acc ;
 : $[ BLK> @ acc@ - selblk ;
 : $] BLK> @ acc@ + selblk ;
-: $H -1 cmv ; : $L 1 cmv ; : $K -64 cmv ; : $J 64 cmv ;
+: $I 3 1 AT-XY I contents ;
-: $W POS @ BLK( + BEGIN C@+ WS? UNTIL BEGIN C@+ WS? NOT UNTIL
+: $h -1 cmv ; : $l 1 cmv ; : $k -64 cmv ; : $j 64 cmv ;
-    1- BLK( - 1023 MIN POS ! ;
+: $H 0acc EDPOS @ 0x3c0 AND EDPOS ! ;
-: $S POS @ BLK( + BEGIN C@- WS? UNTIL BEGIN C@- WS? NOT UNTIL
+: $L 0acc EDPOS @ 0x3f OR EDPOS ! ;
-    1+ BLK( - DUP 0< IF DROP 0 THEN POS ! ;

blk/128

@@ -1,7 +1,11 @@
-: handle ( c -- f )
+: $w EDPOS @ BLK( + acc@ 0 DO
-    UPPER DUP '0' '9' =><= IF num 0 EXIT THEN
+    BEGIN C@+ WS? UNTIL BEGIN C@+ WS? NOT UNTIL LOOP
+    1- BLK( - 1023 MIN EDPOS ! ;
+: $W EDPOS @ BLK( + acc@ 0 DO
+    BEGIN C@- WS? UNTIL BEGIN C@- WS? NOT UNTIL LOOP
+    1+ BLK( - DUP 0< IF DROP 0 THEN EDPOS ! ;
+: handleM ( c -- f )
+    DUP '0' '9' =><= IF num 0 EXIT THEN
     DUP CMD 2+ C! CMD FIND IF EXECUTE ELSE DROP THEN
-    'Q' = ;
+    UPPER 'Q' = ;
-: VE clrscr 0acc 0 POS ! contents
+: modeM ['] handleM MODE ! 'M' MODEC C! ;
-    BEGIN status setpos KEY handle UNTIL 18 aty ;
-

blk/129

@@ -0,0 +1,13 @@
+: bufp ( buf -- )
+    DUP 64 + SWAP DO
+        i C@ DUP 0x20 < IF DROP 0x20 THEN EMIT
+    LOOP ;
+: bufs
+    1 aty ." I: " IBUF bufp
+    2 aty ." F: " FBUF bufp ;
+: c<over KEY DUP EMIT DUP 0x0a = IF DROP 0x0d THEN ;
+: VE ['] c<over 0x08 ( C< override ) RAM+ !
+    clrscr 0acc 0 EDPOS ! modeM contents
+    BEGIN status bufs setpos KEY MODE @ EXECUTE UNTIL
+    0 0x08 RAM+ ! 19 aty ;
+