Diff for /gforth/history.fs between versions 1.54 and 1.76

version 1.54, 2007/06/07 20:57:13 version 1.76, 2011/01/29 21:56:47
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 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 70  s" os-class" environment? [IF] s" unix" Line 71  s" os-class" environment? [IF] s" unix"
 \ moving in history file                               16oct94py  \ moving in history file                               16oct94py
   
 defer back-restore ( u -- )  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  [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 93  defer back-restore ( u -- ) Line 101  defer back-restore ( u -- )
   forward^ 2@ 2dup hist-setpos backward^ 2!    forward^ 2@ 2dup hist-setpos backward^ 2!
   2dup get-line drop    2dup get-line drop
   hist-pos  forward^ 2!    hist-pos  forward^ 2!
   tuck 2dup type 0 ;    tuck 2dup type 2dup cur-correct 0 ;
   
 : find-prev-line ( max addr -- max span addr pos2 )  : find-prev-line ( max addr -- max span addr pos2 )
   backward^ 2@ forward^ 2!    backward^ 2@ forward^ 2!
Line 105  defer back-restore ( u -- ) Line 113  defer back-restore ( u -- )
   REPEAT  2drop  THEN  tuck ;    REPEAT  2drop  THEN  tuck ;
   
 : prev-line  ( max span addr pos1 -- max span addr pos2 false )  : 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,
   
Line 198  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 -- )
       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 ! ;
   
   ' xcur-correct IS cur-correct
   
 s" os-type" environment? [IF] s" cygwin" str= [IF]  : xback-restore ( u -- )
 : save-cursor ( -- ) #esc emit '7 emit ;      dup screenw @ mod 0= IF  1- 0 max  THEN
 : restore-cursor ( -- ) #esc emit '8 emit ;      \ correction for line=screenw, no wraparound then!
 : cur-correct ( addr u -- )  2drop ;      screenw @ /mod negate swap negate swap at-deltaxy ;
 [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]  
 : .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 -- )  : xretype ( max span addr pos1 -- max span addr pos1 f )
     drop key? ?EXIT      .all cols screenw @ >r screenw !
     restore-cursor ;      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 240  s" os-type" environment? [IF] s" cygwin" Line 256  s" os-type" environment? [IF] s" cygwin"
     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 263  s" os-type" environment? [IF] s" cygwin" Line 280  s" os-type" environment? [IF] s" cygwin"
 : 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
Line 278  s" os-type" environment? [IF] s" cygwin" Line 292  s" os-type" environment? [IF] s" cygwin"
 : 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 301  s" os-type" environment? [IF] s" cygwin" Line 317  s" os-type" environment? [IF] s" cygwin"
     ['] ?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
     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
 ;  ;
   
 xchar-history  xchar-history

Removed from v.1.54  
changed lines
  Added in v.1.76


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