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

version 1.71, 2008/05/07 20:38:46 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,2007 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.
   
Line 232  require utf-8.fs Line 232  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 278  require utf-8.fs Line 280  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 end^ 2@ hist-setpos
Line 295  require utf-8.fs Line 294  require utf-8.fs
         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 316  require utf-8.fs Line 317  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

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


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