[BACK]Return to history.fs CVS log [TXT] [DIR] Up to [gforth] / gforth

Diff for /gforth/history.fs between versions 1.64 and 1.80

version 1.64, 2007/09/30 20:21:44 version 1.80, 2012/12/31 15:25:18
Line 1 Line 1
 \ command line edit and history support                 16oct94py  \ 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,2010,2011,2012 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ 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.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
   : ctrl-i ( "<char>" -- c )
       char toupper $40 xor ;
   
   ' ctrl-i
 :noname  :noname
     char [char] @ - ;      ctrl-i postpone Literal ;
 :noname  
     char [char] @ - postpone Literal ;  
 interpret/compile: ctrl  ( "<char>" -- ctrl-code )  interpret/compile: ctrl  ( "<char>" -- ctrl-code )
   
 \ command line editing                                  16oct94py  \ command line editing                                  16oct94py
Line 76  defer cur-correct ( addr u -- ) Line 77  defer cur-correct ( addr u -- )
   
 Variable linew  Variable linew
 Variable screenw  Variable screenw
   : linew-off  linew off cols screenw ! ;
 : linew-off  linew off form nip screenw ! ;  
   
 [IFDEF] x-width  [IFDEF] x-width
 : clear-line ( max span addr pos1 -- max addr )  : clear-line ( max span addr pos1 -- max addr )
Line 118  Variable screenw Line 118  Variable screenw
 \ Create lfpad #lf c,  \ Create lfpad #lf c,
   
 : (enter)  ( max span addr pos1 -- max span addr pos2 true )  : (enter)  ( max span addr pos1 -- max span addr pos2 true )
   >r end^ 2@ hist-setpos      >r 2dup swap -trailing nip IF
   2dup swap history write-line drop ( throw ) \ don't worry about errors          end^ 2@ hist-setpos
   hist-pos 2dup backward^ 2! end^ 2!          2dup swap history write-line drop
   r> (ret) ;          hist-pos 2dup backward^ 2! end^ 2!
       THEN  r> (ret) ;
   
 : extract-word ( addr len -- addr' len' )  dup >r  : extract-word ( addr len -- addr' len' )  dup >r
   BEGIN  1- dup 0>=  WHILE  2dup + c@ bl =  UNTIL  THEN  1+    BEGIN  1- dup 0>=  WHILE  2dup + c@ bl =  UNTIL  THEN  1+
Line 206  require utf-8.fs Line 207  require utf-8.fs
   
 [IFUNDEF] #esc  27 Constant #esc  [THEN]  [IFUNDEF] #esc  27 Constant #esc  [THEN]
   
 : at-deltaxy ( dx dy -- )  base @ >r decimal  Defer at-deltaxy
   : vt100-at-deltaxy ( dx dy -- )
       over 0< over 0= and IF  drop abs backspaces  EXIT  THEN
       base @ >r decimal
     ?dup IF      ?dup IF
         #esc emit '[ emit  dup abs 0 .r 0< IF  'A  ELSE  'B  THEN  emit          #esc emit '[ emit  dup abs 0 .r 0< IF  'A  ELSE  'B  THEN  emit
     THEN      THEN
     ?dup IF      ?dup IF
         #esc emit '[ emit  dup abs 0 .r 0< IF  'D  ELSE  'C  THEN  emit          #esc emit '[ emit  dup abs 0 .r 0< IF  'D  ELSE  'C  THEN  emit
     THEN  r> base ! ;      THEN  r> base ! ;
   ' vt100-at-deltaxy IS at-deltaxy
   
 \ : cygwin? ( -- flag ) s" TERM" getenv s" cygwin" str= ;  \ : cygwin? ( -- flag ) s" TERM" getenv s" cygwin" str= ;
 \ : at-xy? ( -- x y )  \ : at-xy? ( -- x y )
Line 230  require utf-8.fs Line 235  require utf-8.fs
 ' xcur-correct IS cur-correct  ' xcur-correct IS cur-correct
   
 : xback-restore ( u -- )  : xback-restore ( u -- )
       dup screenw @ mod 0= IF  1- 0 max  THEN
       \ correction for line=screenw, no wraparound then!
     screenw @ /mod negate swap negate swap at-deltaxy ;      screenw @ /mod negate swap negate swap at-deltaxy ;
 : .rest ( addr pos1 -- addr pos1 )  : .rest ( addr pos1 -- addr pos1 )
     linew @ xback-restore 2dup type 2dup cur-correct ;      linew @ xback-restore 2dup type 2dup cur-correct ;
Line 237  require utf-8.fs Line 244  require utf-8.fs
     linew @ xback-restore >r 2dup swap type 2dup swap cur-correct r> ;      linew @ xback-restore >r 2dup swap type 2dup swap cur-correct r> ;
   
 : xretype ( max span addr pos1 -- max span addr pos1 f )  : xretype ( max span addr pos1 -- max span addr pos1 f )
     .all form nip screenw @ >r screenw !      .all cols screenw @ >r screenw !
     linew @ screenw @ / linew @ r@ / max      linew @ screenw @ / linew @ r@ / max
     screenw @ r> - * 0 max      screenw @ r> - * 0 max
     dup spaces linew +! .rest false ;      dup spaces linew +! .rest false ;
Line 276  require utf-8.fs Line 283  require utf-8.fs
 : xend-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 ;    drop over .all 0 ;
   
   : xclear-rest ( max span addr pos -- max pos addr pos false )
 : xclear-line ( max span addr pos1 -- max addr )       rot >r tuck 2dup r> swap /string u8width dup spaces linew +! .all 0 ;
     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 ;  
   
 : (xenter)  ( max span addr pos1 -- max span addr pos2 true )  : (xenter)  ( max span addr pos1 -- max span addr pos2 true )
     >r end^ 2@ hist-setpos      >r 2dup swap -trailing nip IF
     2dup swap history write-line drop ( throw ) \ don't worry about errors          end^ 2@ hist-setpos
     hist-pos 2dup backward^ 2! end^ 2!          2dup swap history write-line drop ( throw ) \ don't worry about errors
     r> .all space true ;          hist-pos 2dup backward^ 2! end^ 2!
       THEN  r> .all space true ;
   
 : xkill-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      prefix-found cell+ @ ?dup IF  >r
         r@ - >string over r@ + -rot move          r@ - >string over r@ + -rot move
         rot r@ - -rot .all r@ spaces r> back-restore .rest THEN ;          rot r@ - -rot .all r@ spaces r> back-restore .rest THEN ;
   
   [IFUNDEF] insert
 : insert   ( string length buffer size -- )  : insert   ( string length buffer size -- )
     rot over min >r  r@ - ( left over )      rot over min >r  r@ - ( left over )
     over dup r@ +  rot move   r> move  ;      over dup r@ +  rot move   r> move  ;
   [THEN]
   
 : xtab-expand ( max span addr pos1 -- max span addr pos2 0 )  : xtab-expand ( max span addr pos1 -- max span addr pos2 0 )
     key? IF  #tab (xins) 0  EXIT  THEN      key? IF  #tab (xins) 0  EXIT  THEN
Line 314  require utf-8.fs Line 321  require utf-8.fs
     ['] ?xdel        ctrl H bindkey      ['] ?xdel        ctrl H bindkey
     ['] xeof         ctrl D bindkey      ['] xeof         ctrl D bindkey
     ['] <xdel>       ctrl X bindkey      ['] <xdel>       ctrl X bindkey
     ['] xclear-tib   ctrl K bindkey      ['] xclear-rest  ctrl K bindkey
     ['] xfirst-pos   ctrl A bindkey      ['] xfirst-pos   ctrl A bindkey
     ['] xend-pos     ctrl E bindkey      ['] xend-pos     ctrl E bindkey
     ['] xretype      ctrl L bindkey      ['] xretype      ctrl L bindkey
Line 323  require utf-8.fs Line 330  require utf-8.fs
     ['] xtab-expand  #tab   bindkey      ['] xtab-expand  #tab   bindkey
     ['] (xins)       IS insert-char      ['] (xins)       IS insert-char
     ['] kill-prefix  IS everychar      ['] kill-prefix  IS everychar
   [ifdef] everyline
     ['] linew-off     IS everyline      ['] linew-off     IS everyline
   [endif]
     ['] xback-restore IS back-restore      ['] xback-restore IS back-restore
     ['] xcur-correct  IS cur-correct      ['] xcur-correct  IS cur-correct
 ;  ;
Removed from v.1.64  
changed lines
  Added in v.1.80

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>