--- gforth/history.fs 1999/12/12 18:35:54 1.19 +++ gforth/history.fs 2004/12/26 20:32:02 1.34 @@ -1,6 +1,6 @@ \ command line edit and history support 16oct94py -\ Copyright (C) 1995 Free Software Foundation, Inc. +\ Copyright (C) 1995,2000,2003 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -16,7 +16,7 @@ \ You should have received a copy of the GNU General Public License \ along with this program; if not, write to the Free Software -\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. :noname char [char] @ - ; @@ -41,18 +41,12 @@ interpret/compile: ctrl ( "" -- c : (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 ; -: eof 2 pick over or 0= IF - bye - ELSE 2 pick over <> - IF forw drop (del) ELSE #bell emit THEN 0 - THEN ; - -' forw ctrl F cells ctrlkeys + ! -' back ctrl B cells ctrlkeys + ! -' ?del ctrl H cells ctrlkeys + ! -' eof ctrl D cells ctrlkeys + ! +: ( 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 ; -' (ins) IS insert-char +: bindkey ( xt key -- ) cells ctrlkeys + ! ; \ history support 16oct94py @@ -70,7 +64,7 @@ interpret/compile: ctrl ( "" -- c nip nip THEN ; -s" os-class" environment? [IF] s" unix" compare 0= [ELSE] true [THEN] +s" os-class" environment? [IF] s" unix" str= [ELSE] true [THEN] [IF] : history-file ( -- addr u ) s" GFORTHHIST" getenv dup 0= IF @@ -98,8 +92,8 @@ s" os-class" environment? [IF] s" unix" : clear-tib ( max span addr pos -- max 0 addr 0 false ) clear-line 0 tuck dup ; -: hist-pos ( -- ud ) history file-position throw ; -: hist-setpos ( ud -- ) history reposition-file throw ; +: hist-pos ( -- ud ) history file-position drop ( throw ) ; +: hist-setpos ( ud -- ) history reposition-file drop ( throw ) ; : get-line ( addr len -- len' flag ) swap history read-line throw ; @@ -111,21 +105,23 @@ s" os-class" environment? [IF] s" unix" hist-pos forward^ 2! tuck 2dup type 0 ; -: prev-line ( max span addr pos1 -- max span addr pos2 false ) - clear-line backward^ 2@ forward^ 2! +: find-prev-line ( max addr -- max span addr pos2 ) + backward^ 2@ forward^ 2! over 2 + negate s>d backward^ 2@ d+ 0. dmax 2dup hist-setpos BEGIN backward^ 2! 2dup get-line WHILE hist-pos 2dup forward^ 2@ d< WHILE rot drop - REPEAT 2drop THEN - tuck 2dup type 0 ; + REPEAT 2drop THEN tuck ; + +: prev-line ( max span addr pos1 -- max span addr pos2 false ) + clear-line find-prev-line 2dup type 0 ; Create lfpad #lf c, : (enter) ( max span addr pos1 -- max span addr pos2 true ) >r end^ 2@ hist-setpos - 2dup swap history write-line throw + 2dup swap history write-line drop ( throw ) \ don't worry about errors hist-pos 2dup backward^ 2! end^ 2! r> (ret) ; @@ -142,6 +138,16 @@ Create lfpad #lf c, Create prefix-found 0 , 0 , +: sgn ( n -- -1/0/1 ) + dup 0= IF EXIT THEN 0< 2* 1+ ; + +: capscomp ( c_addr1 u c_addr2 -- n ) + swap bounds + ?DO dup c@ I c@ <> + IF dup c@ toupper I c@ toupper = + ELSE true THEN WHILE 1+ LOOP drop 0 + ELSE c@ toupper I c@ toupper - unloop THEN sgn ; + : word-lex ( nfa1 nfa2 -- -1/0/1 ) dup 0= IF @@ -202,8 +208,9 @@ Create prefix-found 0 , 0 , 5 pick over 4 pick + prefix-found @ 0<> - < ; : tab-expand ( max span addr pos1 -- max span addr pos2 0 ) - kill-expand 2dup extract-word search-prefix - tib-full? + 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 ; @@ -211,16 +218,39 @@ Create prefix-found 0 , 0 , : kill-prefix ( key -- key ) dup #tab <> IF 0 0 prefix-found 2! THEN ; -' kill-prefix IS everychar +[IFUNDEF] everyline defer everyline [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 ; + +\ UTF-8 support + +include utf-8.fs + +: utf-8-cold ( -- ) + s" LANG" getenv s" .UTF-8" search nip nip + IF utf-8-io ELSE 8-bit-io THEN ; + +' utf-8-cold INIT8 chained -' next-line ctrl N cells ctrlkeys + ! -' prev-line ctrl P cells ctrlkeys + ! -' clear-tib ctrl K cells ctrlkeys + ! -' first-pos ctrl A cells ctrlkeys + ! -' end-pos ctrl E cells ctrlkeys + ! -' (enter) #lf cells ctrlkeys + ! -' (enter) #cr cells ctrlkeys + ! -' tab-expand #tab cells ctrlkeys + ! +utf-8-cold \ initializing history @@ -228,7 +258,8 @@ Create prefix-found 0 , 0 , ['] force-open catch ?dup-if \ !! >stderr - history-file type ." : " .error cr 2drop + \ history-file type ." : " .error cr + drop 2drop ['] false ['] false ['] (ret) else to history @@ -236,11 +267,10 @@ Create prefix-found 0 , 0 , 2dup forward^ 2! 2dup backward^ 2! end^ 2! ['] next-line ['] prev-line ['] (enter) endif - dup - [ #lf cells ctrlkeys + ]L ! - [ #cr cells ctrlkeys + ]L ! - [ ctrl P cells ctrlkeys + ]L ! - [ ctrl N cells ctrlkeys + ]L ! + dup #lf bindkey + #cr bindkey + ctrl P bindkey + ctrl N bindkey ; : history-cold ( -- )