Diff for /gforth/history.fs between versions 1.60 and 1.77

version 1.60, 2007/07/01 18:32:11 version 1.77, 2011/12/31 15:29:25
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 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 74  defer cur-correct ( addr u -- ) Line 75  defer cur-correct ( addr u -- )
 ' backspaces IS back-restore  ' backspaces IS back-restore
 ' 2drop IS cur-correct  ' 2drop IS cur-correct
   
   Variable linew
   Variable screenw
   : linew-off  linew off cols screenw ! ;
   
 [IFDEF] x-width  [IFDEF] x-width
 : clear-line ( max span addr pos1 -- max addr )  : 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]  [ELSE]
 : clear-line ( max span addr pos1 -- max addr )  : clear-line ( max span addr pos1 -- max addr )
   back-restore over spaces swap back-restore ;    back-restore over spaces swap back-restore ;
Line 200  require utf-8.fs Line 206  require utf-8.fs
   
 [IFUNDEF] #esc  27 Constant #esc  [THEN]  [IFUNDEF] #esc  27 Constant #esc  [THEN]
   
 Variable curpos  : at-deltaxy ( dx dy -- )
 Variable screenw      over 0< over 0= and IF  drop abs backspaces  EXIT  THEN
       base @ >r decimal
 : cygwin? ( -- flag ) s" TERM" getenv s" cygwin" str= ;      ?dup IF
 : at-xy? ( -- x y )          #esc emit '[ emit  dup abs 0 .r 0< IF  'A  ELSE  'B  THEN  emit
     key? drop \ make sure prep_terminal() is executed      THEN
     #esc emit ." [6n"  0 0      ?dup IF
     BEGIN  key dup 'R <>  WHILE          #esc emit '[ emit  dup abs 0 .r 0< IF  'D  ELSE  'C  THEN  emit
             dup '; = IF  drop  swap  ELSE      THEN  r> base ! ;
                 dup '0 '9 1+ within  IF  '0 - swap 10 * +  ELSE  
                     drop  THEN  THEN  \ : cygwin? ( -- flag ) s" TERM" getenv s" cygwin" str= ;
     REPEAT  drop 1- swap 1- ;  \ : at-xy? ( -- x y )
 : cursor@ ( -- n )  at-xy? screenw @ * + ;  \     key? drop \ make sure prep_terminal() is executed
 : cursor! ( n -- )  screenw @ /mod at-xy ;  \     #esc emit ." [6n"  0 0
 : xcur-correct  ( addr u -- )  \     BEGIN  key dup 'R <>  WHILE
     cygwin? curpos @ -1 = or  IF  2drop EXIT  THEN  \           dup '; = IF  drop  swap  ELSE
     x-width curpos @ + cursor@ -  \               dup '0 '9 1+ within  IF  '0 - swap 10 * +  ELSE
     screenw @ >r  r@ 2/ + r@ / r> * negate curpos +! ;  \                   drop  THEN  THEN
 : save-cursor ( -- )  \     REPEAT  drop 1- swap 1- ;
     cygwin? IF  #esc emit '7 emit  ELSE  \ : cursor@ ( -- n )  at-xy? screenw @ * + ;
         key? IF  -1  ELSE  form nip screenw ! cursor@  THEN  curpos !  THEN ;  \ : cursor! ( n -- )  screenw @ /mod at-xy ;
 : restore-cursor ( -- )  : xcur-correct  ( addr u -- )  x-width linew ! ;
     cygwin? IF  #esc emit '8 emit  ELSE  
         curpos @ dup -1 = IF  drop  ELSE   cursor!  THEN  THEN ;  
   
 ' xcur-correct IS cur-correct  ' xcur-correct IS cur-correct
   
   : 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 ;
 : .rest ( addr pos1 -- addr pos1 )  : .rest ( addr pos1 -- addr pos1 )
     key? ?EXIT      linew @ xback-restore 2dup type 2dup cur-correct ;
     restore-cursor 2dup type 2dup cur-correct ;  
 : .all ( span addr pos1 -- span addr pos1 )  : .all ( span addr pos1 -- span addr pos1 )
     key? ?EXIT      linew @ xback-restore >r 2dup swap type 2dup swap cur-correct r> ;
     restore-cursor >r 2dup swap type 2dup swap cur-correct r> ;  
 : xback-restore ( u -- )  
     drop key? ?EXIT  
     restore-cursor ;  
   
 : xretype ( max span addr pos1 -- max span addr pos1 )  : xretype ( max span addr pos1 -- max span addr pos1 f )
     restore-cursor screenw @ >r save-cursor      .all cols screenw @ >r screenw !
     .all 2 pick r@ / screenw @ r> - * 0 max spaces .rest false ;      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  \ 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.  \ string in the buffer, and pos1 is the cursor position in the buffer.
Line 251  Variable screenw Line 256  Variable screenw
     2dup chars + r@ swap r@ xc-size xc!+? 2drop drop      2dup chars + r@ swap r@ xc-size xc!+? 2drop drop
     r> xc-size >r  rot r@ chars + -rot r> chars + ;      r> xc-size >r  rot r@ chars + -rot r> chars + ;
 : (xins)  ( max span addr pos1 xc -- max span addr pos2 )  : (xins)  ( max span addr pos1 xc -- max span addr pos2 )
     <xins> .all .rest ;      <xins> key? 0= IF  .all .rest  THEN ;
 : xback  ( max span addr pos1 -- max span addr pos2 f )  : xback  ( max span addr pos1 -- max span addr pos2 f )
     dup  IF  over + xchar- over -  0 max .all .rest      dup  IF  over + xchar- over -  0 max .all .rest
     ELSE  bell  THEN 0 ;      ELSE  bell  THEN 0 ;
 : xforw  ( max span addr pos1 -- max span addr pos2 f )  : 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 )  : (xdel)  ( max span addr pos1 -- max span addr pos2 )
     over + dup xchar- tuck - >r over -      over + dup xchar- tuck - >r over -
     >string over r@ + -rot move      >string over r@ + -rot move
     rot r> - -rot ;      rot r> - -rot ;
 : ?xdel ( 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 .rest  THEN  0 ;    dup  IF  (xdel) .all 2 spaces 2 linew +! .rest  THEN  0 ;
 : <xdel> ( max span addr pos1 -- max span addr pos2 0 )  : <xdel> ( max span addr pos1 -- max span addr pos2 0 )
   2 pick over <>    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 ;      ELSE  bell  THEN  0 ;
 : xeof  2 pick over or 0=  IF  bye  ELSE  <xdel>  THEN ;  : xeof  2 pick over or 0=  IF  bye  ELSE  <xdel>  THEN ;
   
Line 274  Variable screenw Line 280  Variable screenw
 : 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 ;
     drop restore-cursor swap spaces restore-cursor ;  
 : 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 end^ 2@ hist-setpos
     2dup swap history write-line drop ( throw ) \ don't worry about errors      2dup swap history write-line drop ( throw ) \ don't worry about errors
     hist-pos 2dup backward^ 2! end^ 2!      hist-pos 2dup backward^ 2! end^ 2!
     r> curpos @ -1 = key? or IF      r> .all space true ;
         >r 2dup swap type r>  
     ELSE  
         .all  
     THEN 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 .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 316  Variable screenw Line 317  Variable screenw
     ['] ?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      bl     bindkey      ['] xretype      ctrl L bindkey
     history IF  ['] (xenter)     #lf    bindkey  THEN      history IF  ['] (xenter)     #lf    bindkey  THEN
     history IF  ['] (xenter)     #cr    bindkey  THEN      history IF  ['] (xenter)     #cr    bindkey  THEN
     ['] xtab-expand  #tab   bindkey      ['] xtab-expand  #tab   bindkey
     ['] (xins)       IS insert-char      ['] (xins)       IS insert-char
     ['] kill-prefix  IS everychar      ['] kill-prefix  IS everychar
     ['] save-cursor  IS everyline  [ifdef] 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.60  
changed lines
  Added in v.1.77


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