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

Diff for /gforth/history.fs between versions 1.74 and 1.79

version 1.74, 2010/12/31 18:09:02 version 1.79, 2012/08/15 00:48:12
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,2008,2010 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.
   
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 -- )  Defer at-deltaxy
   : vt100-at-deltaxy ( dx dy -- )
     over 0< over 0= and IF  drop abs backspaces  EXIT  THEN      over 0< over 0= and IF  drop abs backspaces  EXIT  THEN
     base @ >r decimal      base @ >r decimal
     ?dup IF      ?dup IF
Line 215  require utf-8.fs Line 217  require utf-8.fs
     ?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 232  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 282  require utf-8.fs Line 287  require utf-8.fs
      rot >r tuck 2dup r> swap /string u8width dup spaces linew +! .all 0 ;       rot >r tuck 2dup r> swap /string u8width dup spaces linew +! .all 0 ;
   
 : (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
Removed from v.1.74  
changed lines
  Added in v.1.79

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