--- gforth/history.fs 2004/12/24 14:08:43 1.33 +++ gforth/history.fs 2007/05/05 17:27:40 1.52 @@ -1,6 +1,6 @@ \ command line edit and history support 16oct94py -\ Copyright (C) 1995,2000,2003 Free Software Foundation, Inc. +\ Copyright (C) 1995,2000,2003,2004,2005,2006 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -28,23 +28,6 @@ interpret/compile: ctrl ( "" -- c : >string ( span addr pos1 -- span addr pos1 addr2 len ) over 3 pick 2 pick chars /string ; -: type-rest ( span addr pos1 -- span addr pos1 back ) - >string tuck type ; -: (del) ( max span addr pos1 -- max span addr pos2 ) - 1- >string over 1+ -rot move - rot 1- -rot #bs emit type-rest bl emit 1+ backspaces ; -: (ins) ( max span addr pos1 char -- max span addr pos2 ) - >r >string over 1+ swap move 2dup chars + r> swap c! - rot 1+ -rot type-rest 1- backspaces 1+ ; -: ?del ( max span addr pos1 -- max span addr pos2 0 ) - dup IF (del) THEN 0 ; -: (ret) type-rest drop true space ; -: back dup IF 1- #bs emit ELSE #bell emit THEN 0 ; -: forw 2 pick over <> IF 2dup + c@ emit 1+ ELSE #bell emit THEN 0 ; -: ( max span addr pos1 -- max span addr pos2 0 ) - 2 pick over <> - IF forw drop (del) ELSE #bell emit THEN 0 ; -: eof 2 pick over or 0= IF bye ELSE THEN ; : bindkey ( xt key -- ) cells ctrlkeys + ! ; @@ -86,11 +69,18 @@ s" os-class" environment? [IF] s" unix" \ moving in history file 16oct94py -: clear-line ( max span addr pos1 -- max addr ) - backspaces over spaces swap backspaces ; +defer back-restore ( u -- ) +' backspaces is back-restore -: clear-tib ( max span addr pos -- max 0 addr 0 false ) - clear-line 0 tuck dup ; +[IFDEF] x-width +: clear-line ( max span addr pos1 -- max addr ) + back-restore over over swap x-width spaces swap back-restore ; +[ELSE] +: clear-line ( max span addr pos1 -- max addr ) + back-restore over spaces swap back-restore ; +[THEN] +\ : clear-tib ( max span addr pos -- max 0 addr 0 false ) +\ clear-line 0 tuck dup ; : hist-pos ( -- ud ) history file-position drop ( throw ) ; : hist-setpos ( ud -- ) history reposition-file drop ( throw ) ; @@ -117,7 +107,7 @@ s" os-class" environment? [IF] s" unix" : prev-line ( max span addr pos1 -- max span addr pos2 false ) clear-line find-prev-line 2dup type 0 ; -Create lfpad #lf c, +\ Create lfpad #lf c, : (enter) ( max span addr pos1 -- max span addr pos2 true ) >r end^ 2@ hist-setpos @@ -125,13 +115,6 @@ Create lfpad #lf c, hist-pos 2dup backward^ 2! end^ 2! r> (ret) ; -\ some other key commands 16oct94py - -: first-pos ( max span addr pos1 -- max span addr 0 0 ) - backspaces 0 0 ; -: end-pos ( max span addr pos1 -- max span addr span 0 ) - type-rest 2drop over 0 ; - : extract-word ( addr len -- addr' len' ) dup >r BEGIN 1- dup 0>= WHILE 2dup + c@ bl = UNTIL THEN 1+ tuck + r> rot - ; @@ -185,13 +168,15 @@ Create prefix-found 0 , 0 , REPEAT drop r> ; +: prefix-off ( -- ) 0 0 prefix-found 2! ; + : prefix-string ( addr len nfa -- addr' len' ) dup prefix-found ! ?dup IF name>string rot /string rot drop dup 1+ prefix-found cell+ ! ELSE - 2drop s" " prefix-found cell+ off + 2drop s" " prefix-off THEN ; : search-prefix ( addr1 len1 -- addr2 len2 ) @@ -201,54 +186,127 @@ Create prefix-found 0 , 0 , [ -1 cells ] Literal +LOOP prefix-string ; -: kill-expand ( max span addr pos1 -- max span addr pos2 ) - prefix-found cell+ @ 0 ?DO (del) LOOP ; - : tib-full? ( max span addr pos addr' len' -- max span addr pos addr1 u flag ) 5 pick over 4 pick + prefix-found @ 0<> - < ; -: tab-expand ( max span addr pos1 -- max span addr pos2 0 ) - key? IF #tab (ins) 0 EXIT THEN - kill-expand 2dup extract-word dup 0= IF nip EXIT THEN - search-prefix tib-full? - IF 7 emit 2drop 0 0 prefix-found 2! - ELSE bounds ?DO I c@ (ins) LOOP THEN - prefix-found @ IF bl (ins) THEN 0 ; - : kill-prefix ( key -- key ) - dup #tab <> IF 0 0 prefix-found 2! THEN ; - -: 8-bit-io ( -- ) - ['] forw ctrl F bindkey - ['] back ctrl B bindkey - ['] ?del ctrl H bindkey - ['] eof ctrl D bindkey - ['] ctrl X bindkey - ['] next-line ctrl N bindkey - ['] prev-line ctrl P bindkey - ['] clear-tib ctrl K bindkey - ['] first-pos ctrl A bindkey - ['] end-pos ctrl E bindkey - ['] (enter) #lf bindkey - ['] (enter) #cr bindkey - ['] tab-expand #tab bindkey - ['] (ins) IS insert-char - ['] kill-prefix IS everychar - ['] noop IS everyline - [ action-of key ] Literal IS key - [ action-of emit ] Literal IS emit ; + dup #tab <> IF prefix-off THEN ; \ UTF-8 support -include utf-8.fs +require utf-8.fs -: utf-8-cold ( -- ) - s" LANG" getenv s" .UTF-8" search nip nip - IF utf-8-io ELSE 8-bit-io THEN ; +[IFUNDEF] #esc 27 Constant #esc [THEN] -' utf-8-cold INIT8 chained +Variable curpos -utf-8-cold +: at-xy? ( -- x y ) + key? drop + #esc emit ." [6n" 0 0 + BEGIN key dup 'R <> WHILE + dup '; = IF drop swap ELSE + dup '0 '9 1+ within IF '0 - swap 10 * + ELSE + drop THEN THEN + REPEAT drop 1- swap 1- ; +: cursor@ ( -- n ) at-xy? form nip * + ; +: cursor! ( n -- ) form nip /mod at-xy ; +: cur-correct ( addr u -- ) x-width curpos @ + cursor@ - + form nip >r r@ 2/ + r@ / r> * negate curpos +! ; + +: save-cursor ( -- ) cursor@ curpos ! ; +: restore-cursor ( -- ) curpos @ cursor! ; +: .rest ( addr pos1 -- addr pos1 ) + restore-cursor 2dup type 2dup cur-correct ; +: .all ( span addr pos1 -- span addr pos1 ) + key? IF rdrop EXIT THEN + restore-cursor >r 2dup swap type 2dup swap cur-correct r> ; +: xback-restore ( u -- ) + drop restore-cursor ; + +\ In the following, addr max is the buffer, addr span is the current +\ string in the buffer, and pos1 is the cursor position in the buffer. + +: ( max span addr pos1 xc -- max span addr pos2 ) + >r 2over r@ xc-size + u< IF ( max span addr pos1 R:xc ) + rdrop bell EXIT THEN + >string over r@ xc-size + swap move + 2dup chars + r@ swap r@ xc-size xc!+? 2drop drop + r> xc-size >r rot r@ chars + -rot r> chars + ; +: (xins) ( max span addr pos1 xc -- max span addr pos2 ) + .all .rest ; +: xback ( max span addr pos1 -- max span addr pos2 f ) + dup IF over + xchar- over - 0 max .all .rest + ELSE bell THEN 0 ; +: xforw ( max span addr pos1 -- max span addr pos2 f ) + 2 pick over <> IF over + xc@+ xemit over - ELSE bell THEN 0 ; +: (xdel) ( max span addr pos1 -- max span addr pos2 ) + over + dup xchar- tuck - >r over - + >string over r@ + -rot move + rot r> - -rot ; +: ?xdel ( max span addr pos1 -- max span addr pos2 0 ) + dup IF (xdel) .all 2 spaces .rest THEN 0 ; +: ( max span addr pos1 -- max span addr pos2 0 ) + 2 pick over <> + IF xforw drop (xdel) .all 2 spaces .rest + ELSE bell THEN 0 ; +: xeof 2 pick over or 0= IF bye ELSE THEN ; + +: xfirst-pos ( max span addr pos1 -- max span addr 0 0 ) + drop 0 .all .rest 0 ; +: xend-pos ( max span addr pos1 -- max span addr span 0 ) + drop over .all 0 ; + + +: xclear-line ( max span addr pos1 -- max addr ) + drop restore-cursor swap spaces restore-cursor ; +: xclear-tib ( max span addr pos -- max 0 addr 0 false ) + xclear-line 0 tuck dup ; + +: (xenter) ( max span addr pos1 -- max span addr pos2 true ) + >r end^ 2@ hist-setpos + 2dup swap history write-line drop ( throw ) \ don't worry about errors + hist-pos 2dup backward^ 2! end^ 2! + r> .all space true ; + +: xkill-expand ( max span addr pos1 -- max span addr pos2 ) + prefix-found cell+ @ ?dup IF >r + r@ - >string over r@ + -rot move + rot r@ - -rot .all r> spaces .rest THEN ; + +: insert ( string length buffer size -- ) + rot over min >r r@ - ( left over ) + over dup r@ + rot move r> move ; + +: xtab-expand ( max span addr pos1 -- max span addr pos2 0 ) + key? IF #tab (xins) 0 EXIT THEN + xkill-expand 2dup extract-word dup 0= IF nip EXIT THEN + search-prefix tib-full? + IF bell 2drop prefix-off + ELSE dup >r + 2>r >string r@ + 2r> 2swap insert + r@ + rot r> + -rot + THEN + prefix-found @ IF bl (xins) ELSE .all .rest THEN 0 ; + +: xchar-history ( -- ) + ['] xforw ctrl F bindkey + ['] xback ctrl B bindkey + ['] ?xdel ctrl H bindkey + ['] xeof ctrl D bindkey + ['] ctrl X bindkey + ['] xclear-tib ctrl K bindkey + ['] xfirst-pos ctrl A bindkey + ['] xend-pos ctrl E bindkey + history IF ['] (xenter) #lf bindkey THEN + history IF ['] (xenter) #cr bindkey THEN + ['] xtab-expand #tab bindkey + ['] (xins) IS insert-char + ['] kill-prefix IS everychar + ['] save-cursor IS everyline + ['] xback-restore IS back-restore +; + +xchar-history \ initializing history @@ -257,7 +315,7 @@ utf-8-cold ?dup-if \ !! >stderr \ history-file type ." : " .error cr - drop 2drop + drop 2drop 0 to history ['] false ['] false ['] (ret) else to history @@ -272,8 +330,12 @@ utf-8-cold ; : history-cold ( -- ) - history-file get-history ; + history-file get-history xchar-history ; + +:noname ( -- ) + defers 'cold + history-cold +; is 'cold -' history-cold INIT8 chained history-cold