--- gforth/history.fs 2005/01/10 10:30:55 1.39 +++ gforth/history.fs 2008/02/12 16:44:58 1.70 @@ -1,12 +1,12 @@ \ command line edit and history support 16oct94py -\ Copyright (C) 1995,2000,2003,2004 Free Software Foundation, Inc. +\ Copyright (C) 1995,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc. \ This file is part of Gforth. \ Gforth is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License -\ as published by the Free Software Foundation; either version 2 +\ as published by the Free Software Foundation, either version 3 \ of the License, or (at your option) any later version. \ This program is distributed in the hope that it will be useful, @@ -15,36 +15,20 @@ \ GNU General Public License for more details. \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +\ along with this program. If not, see http://www.gnu.org/licenses/. +: ctrl-i ( "" -- c ) + char toupper $40 xor ; + +' ctrl-i :noname - char [char] @ - ; -:noname - char [char] @ - postpone Literal ; + ctrl-i postpone Literal ; interpret/compile: ctrl ( "" -- ctrl-code ) \ command line editing 16oct94py : >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 +70,25 @@ 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 -- ) +defer cur-correct ( addr u -- ) +' backspaces IS back-restore +' 2drop IS cur-correct + +Variable linew +Variable screenw +: linew-off linew off cols screenw ! ; -: 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 ) + drop linew @ back-restore over over swap x-width + dup spaces back-restore nip linew off ; +[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 ) ; @@ -103,7 +101,7 @@ s" os-class" environment? [IF] s" unix" forward^ 2@ 2dup hist-setpos backward^ 2! 2dup get-line drop hist-pos forward^ 2! - tuck 2dup type 0 ; + tuck 2dup type 2dup cur-correct 0 ; : find-prev-line ( max addr -- max span addr pos2 ) backward^ 2@ forward^ 2! @@ -115,9 +113,9 @@ s" os-class" environment? [IF] s" unix" REPEAT 2drop THEN tuck ; : prev-line ( max span addr pos1 -- max span addr pos2 false ) - clear-line find-prev-line 2dup type 0 ; + clear-line find-prev-line 2dup type 2dup cur-correct 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 +123,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 - ; @@ -203,143 +194,143 @@ 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 prefix-off THEN ; -[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 require utf-8.fs [IFUNDEF] #esc 27 Constant #esc [THEN] -: save-cursor ( -- ) #esc emit '7 emit ; -: restore-cursor ( -- ) #esc emit '8 emit ; +: at-deltaxy ( dx dy -- ) base @ >r decimal + ?dup IF + #esc emit '[ emit dup abs 0 .r 0< IF 'A ELSE 'B THEN emit + THEN + ?dup IF + #esc emit '[ emit dup abs 0 .r 0< IF 'D ELSE 'C THEN emit + THEN r> base ! ; + +\ : cygwin? ( -- flag ) s" TERM" getenv s" cygwin" str= ; +\ : at-xy? ( -- x y ) +\ key? drop \ make sure prep_terminal() is executed +\ #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? screenw @ * + ; +\ : cursor! ( n -- ) screenw @ /mod at-xy ; +: xcur-correct ( addr u -- ) x-width linew ! ; + +' xcur-correct IS cur-correct + +: xback-restore ( u -- ) + screenw @ /mod negate swap negate swap at-deltaxy ; : .rest ( addr pos1 -- addr pos1 ) - restore-cursor 2dup type ; + linew @ xback-restore 2dup type 2dup cur-correct ; : .all ( span addr pos1 -- span addr pos1 ) - restore-cursor >r 2dup swap type r> ; + linew @ xback-restore >r 2dup swap type 2dup swap cur-correct r> ; -: ( max span addr pos1 u8char -- max span addr pos2 ) - >r 2over r@ u8len + u< IF rdrop bell EXIT THEN - >string over r@ u8len + swap move 2dup chars + r@ swap u8!+ drop - r> u8len >r rot r@ chars + -rot r> chars + ; -: (u8ins) ( max span addr pos1 u8char -- max span addr pos2 ) - .all .rest ; -: u8back ( max span addr pos1 -- max span addr pos2 f ) - dup IF over + u8<< over - 0 max .all .rest +: xretype ( max span addr pos1 -- max span addr pos1 f ) + .all cols screenw @ >r screenw ! + linew @ screenw @ / linew @ r@ / max + screenw @ r> - * 0 max + dup spaces linew +! .rest false ; + +\ 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 ) + key? 0= IF .all .rest THEN ; +: xback ( max span addr pos1 -- max span addr pos2 f ) + dup IF over + xchar- over - 0 max .all .rest ELSE bell THEN 0 ; -: u8forw ( max span addr pos1 -- max span addr pos2 f ) - 2 pick over <> IF over + u8@+ u8emit over - ELSE bell THEN 0 ; -: (u8del) ( max span addr pos1 -- max span addr pos2 ) - over + dup u8<< tuck - >r over - +: xforw ( max span addr pos1 -- max span addr pos2 f ) + 2 pick over <> IF over + xc@+ xemit over - ELSE bell THEN + 2dup cur-correct 0 ; +: (xdel) ( max span addr pos1 -- max span addr pos2 ) + over + dup xchar- tuck - >r over - >string over r@ + -rot move rot r> - -rot ; -: ?u8del ( max span addr pos1 -- max span addr pos2 0 ) - dup IF (u8del) .all 2 spaces .rest THEN 0 ; -: ( max span addr pos1 -- max span addr pos2 0 ) +: ?xdel ( max span addr pos1 -- max span addr pos2 0 ) + dup IF (xdel) .all 2 spaces 2 linew +! .rest THEN 0 ; +: ( max span addr pos1 -- max span addr pos2 0 ) 2 pick over <> - IF u8forw drop (u8del) .all 2 spaces .rest + IF xforw drop (xdel) .all 2 spaces 2 linew +! .rest ELSE bell THEN 0 ; -: u8eof 2 pick over or 0= IF bye ELSE THEN ; +: xeof 2 pick over or 0= IF bye ELSE THEN ; -: u8first-pos ( max span addr pos1 -- max span addr 0 0 ) +: xfirst-pos ( max span addr pos1 -- max span addr 0 0 ) drop 0 .all .rest 0 ; -: u8end-pos ( max span addr pos1 -- max span addr span 0 ) +: xend-pos ( max span addr pos1 -- max span addr span 0 ) drop over .all 0 ; -: u8clear-line ( max span addr pos1 -- max addr ) - drop restore-cursor swap spaces restore-cursor ; -: u8clear-tib ( max span addr pos -- max 0 addr 0 false ) - u8clear-line 0 tuck dup ; +: xclear-line ( max span addr pos1 -- max addr ) + 2dup x-width dup xback-restore dup spaces xback-restore drop nip ; +: xclear-tib ( max span addr pos -- max 0 addr 0 false ) + xclear-line 0 tuck dup ; -: (u8enter) ( max span addr pos1 -- max span addr pos2 true ) +: (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 ; -: u8kill-expand ( max span addr pos1 -- max span addr pos2 ) +: 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 ; + rot r@ - -rot .all r@ spaces r> back-restore .rest THEN ; : insert ( string length buffer size -- ) rot over min >r r@ - ( left over ) over dup r@ + rot move r> move ; -: u8tab-expand ( max span addr pos1 -- max span addr pos2 0 ) - key? IF #tab (u8ins) 0 EXIT THEN - u8kill-expand 2dup extract-word dup 0= IF nip EXIT THEN +: 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 7 emit 2drop prefix-off + IF bell 2drop prefix-off ELSE dup >r 2>r >string r@ + 2r> 2swap insert r@ + rot r> + -rot THEN - prefix-found @ IF bl (u8ins) ELSE .all .rest THEN 0 ; + prefix-found @ IF bl (xins) ELSE .all .rest THEN 0 ; -: utf-8-io ( -- ) - ['] u8forw ctrl F bindkey - ['] u8back ctrl B bindkey - ['] ?u8del ctrl H bindkey - ['] u8eof ctrl D bindkey - ['] ctrl X bindkey - ['] u8clear-tib ctrl K bindkey - ['] u8first-pos ctrl A bindkey - ['] u8end-pos ctrl E bindkey - ['] (u8enter) #lf bindkey - ['] (u8enter) #cr bindkey - ['] u8tab-expand #tab bindkey - ['] (u8ins) IS insert-char +: 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 + ['] xretype ctrl L 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 - ['] u8key IS key - ['] u8emit IS emit ; - -: 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 +[ifdef] everyline + ['] linew-off IS everyline +[endif] + ['] xback-restore IS back-restore + ['] xcur-correct IS cur-correct +; -utf-8-cold +xchar-history \ initializing history @@ -348,7 +339,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 @@ -363,8 +354,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