--- gforth/history.fs 2006/02/19 15:11:22 1.44 +++ gforth/history.fs 2007/10/22 20:24:10 1.65 @@ -1,6 +1,6 @@ \ command line edit and history support 16oct94py -\ Copyright (C) 1995,2000,2003,2004,2005 Free Software Foundation, Inc. +\ Copyright (C) 1995,2000,2003,2004,2005,2006 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -19,9 +19,9 @@ \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. :noname - char [char] @ - ; + char toupper $1f and ; :noname - char [char] @ - postpone Literal ; + char toupper $1f and postpone Literal ; interpret/compile: ctrl ( "" -- ctrl-code ) \ command line editing 16oct94py @@ -70,11 +70,23 @@ 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 -: clear-line ( max span addr pos1 -- max addr ) - back-restore over spaces swap backspaces ; +Variable linew +Variable screenw + +: linew-off linew off form nip screenw ! ; +[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 ; @@ -89,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! @@ -101,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, @@ -194,14 +206,41 @@ 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> ; -: xback-restore ( u -- ) - drop 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 form nip 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. @@ -213,21 +252,22 @@ require utf-8.fs 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 ; @@ -238,7 +278,7 @@ require utf-8.fs : 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 ; @@ -251,7 +291,7 @@ require utf-8.fs : 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 ) @@ -277,13 +317,15 @@ require utf-8.fs ['] xclear-tib ctrl K bindkey ['] xfirst-pos ctrl A bindkey ['] xend-pos ctrl E bindkey - ['] (xenter) #lf bindkey - ['] (xenter) #cr 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 + ['] linew-off IS everyline ['] xback-restore IS back-restore + ['] xcur-correct IS cur-correct ; xchar-history @@ -295,7 +337,7 @@ xchar-history ?dup-if \ !! >stderr \ history-file type ." : " .error cr - drop 2drop + drop 2drop 0 to history ['] false ['] false ['] (ret) else to history @@ -312,6 +354,10 @@ xchar-history : history-cold ( -- ) history-file get-history xchar-history ; -' history-cold INIT8 chained +:noname ( -- ) + defers 'cold + history-cold +; is 'cold + history-cold