--- gforth/history.fs 2007/06/07 20:57:13 1.54 +++ gforth/history.fs 2008/07/15 16:11:49 1.72 @@ -1,12 +1,12 @@ \ command line edit and history support 16oct94py -\ Copyright (C) 1995,2000,2003,2004,2005,2006 Free Software Foundation, Inc. +\ Copyright (C) 1995,2000,2003,2004,2005,2006,2007,2008 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,13 +15,14 @@ \ 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 @@ -70,11 +71,18 @@ s" os-class" environment? [IF] s" unix" \ moving in history file 16oct94py defer back-restore ( u -- ) -' backspaces is back-restore +defer cur-correct ( addr u -- ) +' backspaces IS back-restore +' 2drop IS cur-correct + +Variable linew +Variable screenw +: linew-off linew off cols screenw ! ; [IFDEF] x-width : clear-line ( max span addr pos1 -- max addr ) - back-restore over over swap x-width spaces swap back-restore ; + 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 ; @@ -93,7 +101,7 @@ defer back-restore ( u -- ) 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! @@ -105,7 +113,7 @@ defer back-restore ( u -- ) 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, @@ -198,37 +206,43 @@ require utf-8.fs [IFUNDEF] #esc 27 Constant #esc [THEN] -Variable curpos +: at-deltaxy ( dx dy -- ) + over 0< over 0= and IF drop abs backspaces EXIT THEN + 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 ! ; -s" os-type" environment? [IF] s" cygwin" str= [IF] -: save-cursor ( -- ) #esc emit '7 emit ; -: restore-cursor ( -- ) #esc emit '8 emit ; -: cur-correct ( addr u -- ) 2drop ; -[ELSE] -: 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! ; -[THEN] +' xcur-correct IS cur-correct + +: xback-restore ( u -- ) + screenw @ /mod negate swap negate swap at-deltaxy ; : .rest ( addr pos1 -- addr pos1 ) - key? ?EXIT - restore-cursor 2dup type 2dup cur-correct ; + linew @ xback-restore 2dup type 2dup cur-correct ; : .all ( span addr pos1 -- span addr pos1 ) - key? ?EXIT - restore-cursor >r 2dup swap type 2dup swap cur-correct r> ; -: xback-restore ( u -- ) - drop key? ?EXIT - restore-cursor ; + linew @ xback-restore >r 2dup swap type 2dup swap cur-correct r> ; + +: 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. @@ -240,21 +254,22 @@ s" os-type" environment? [IF] s" cygwin" 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 ; + 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 ; : xforw ( max span addr pos1 -- max span addr pos2 f ) - 2 pick over <> IF over + xc@+ xemit over - ELSE bell THEN 0 ; + 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 ; : ?xdel ( max span addr pos1 -- max span addr pos2 0 ) - dup IF (xdel) .all 2 spaces .rest THEN 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 xforw drop (xdel) .all 2 spaces .rest + IF xforw drop (xdel) .all 2 spaces 2 linew +! .rest ELSE bell THEN 0 ; : xeof 2 pick over or 0= IF bye ELSE THEN ; @@ -265,7 +280,7 @@ s" os-type" environment? [IF] s" cygwin" : xclear-line ( max span addr pos1 -- max addr ) - drop restore-cursor swap spaces restore-cursor ; + 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 ; @@ -278,7 +293,7 @@ s" os-type" environment? [IF] s" cygwin" : 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 ) @@ -304,13 +319,17 @@ s" os-type" environment? [IF] s" cygwin" ['] 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 +[ifdef] everyline + ['] linew-off IS everyline +[endif] ['] xback-restore IS back-restore + ['] xcur-correct IS cur-correct ; xchar-history