VE: add W and S movements

blk/001

@@ -2,7 +2,7 @@ MASTER INDEX
 
   3 Usage                      30 Dictionary
  70 Implementation notes      100 Block editor
-150 Extra words
+120 Visual Editor             150 Extra words
 200 Z80 assembler             260 Cross compilation
 280 Z80 boot code             350 Core words
 410 PS/2 keyboard subsystem   420 Bootstrap guide

blk/030

@@ -14,4 +14,3 @@ and Extra words (B150).
 
 
 
-

blk/048

@@ -14,5 +14,3 @@ J           -- n            Copy RS third item to PS
 
 
 
-
-

blk/056

@@ -14,7 +14,3 @@ NOT  f -- f     Push the logical opposite of f
 
 
 
-
-
-
-

blk/062

@@ -14,4 +14,3 @@ a newline.
 
 
 
-

blk/064

@@ -14,5 +14,3 @@ LOADR+ n1 n2 --  Relative ranged load.
 WIPE   --        Empties current block
 
 
-
-

blk/120

@@ -0,0 +1,16 @@
+Visual Editor
+
+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".
+
+This editor uses 17 lines. The top line is the status line and
+the 16 others are contents lines. The content shown is that
+of the currently selected block.
+
+All keystrokes are directly interpreted by VE and have the
+effect described below.
+
+                                                        (cont.)

blk/121

@@ -0,0 +1,16 @@
+Pressing a 0-9 digit accumulates that digit into what is named
+the "modifier". That modifier affects the behavior of many
+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
+block. Any change madde to the previously selected block is
+saved beforehand.
+
+'[' and ']' advance the selected block by modifier.
+
+';' resets the modifier
+
+H and L move the cursor by "modifier" characters. J and K, by
+lines.                                                  (cont.)

blk/122

@@ -0,0 +1 @@
+W moves forward by a word. S moves backward by a word.

blk/125

@@ -0,0 +1,2 @@
+'? UPPER NOT [IF] 33 LOAD+ [THEN] DROP ( B158 )
+1 3 LOADR+

blk/126

@@ -0,0 +1,14 @@
+CREATE CMD 2 C, '$' C, 0 C,
+VARIABLE ACC
+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 ;
+: status 0 clrln ." BLK" SPC BLK> ? SPC ACC ?
+    SPC POS @ 64 /MOD . ',' EMIT . ;
+: contents 1 aty BLK> @ LIST ;
+: selblk BLK@ contents ;

blk/127

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

blk/128

@@ -0,0 +1,7 @@
+: handle ( c -- f )
+    UPPER DUP '0' '9' =><= IF num 0 EXIT THEN
+    DUP CMD 2+ C! CMD FIND IF EXECUTE ELSE DROP THEN
+    'Q' = ;
+: VE clrscr 0acc 0 POS ! contents
+    BEGIN status setpos KEY handle UNTIL 18 aty ;
+

blk/158

@@ -0,0 +1,2 @@
+: LOWER DUP 'A' 'Z' =><= IF 32 + THEN ;
+: UPPER DUP 'a' 'z' =><= IF 32 - THEN ;

blk/307

@@ -14,4 +14,3 @@ CODE ?DUP
 CODE DROP
     HL POPqq,
 ;CODE
-

blk/496

@@ -14,4 +14,3 @@ CODE @GET ( a -- c f )
     0x28 RSTn,
     PUSHA, PUSHZ,
 ;CODE
-

tools/blkpack.c

@@ -54,6 +54,10 @@ int main(int argc, char *argv[])
             }
             strncpy(buf+(blkid*1024)+(i*64), line, cnt-1);
         }
+        ssize_t cnt = getline(&line, &n, fp);
+        if (cnt > 0) {
+            fprintf(stderr, "blk %s has more than 16 lines\n", ep->d_name);
+        }
         free(line);
     }
     fwrite(buf, 1024, blkcnt, stdout);