--- gforth/history.fs	2005/01/29 16:55:30	1.42
+++ gforth/history.fs	2007/06/16 20:47:00	1.56
@@ -1,6 +1,6 @@
 \ command line edit and history support                 16oct94py
 
-\ Copyright (C) 1995,2000,2003,2004 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -69,9 +69,18 @@ s" os-class" environment? [IF] s" unix"
 
 \ moving in history file                               16oct94py
 
-: clear-line ( max span addr pos1 -- max addr )
-  backspaces over spaces swap backspaces ;
+defer back-restore ( u -- )
+defer cur-correct ( addr u -- )
+' backspaces IS back-restore
+' 2drop IS cur-correct
 
+[IFDEF] x-width
+: clear-line ( max span addr pos1 -- max addr )
+  back-restore over over swap x-width spaces swap back-restore ;
+[ELSE]
+: clear-line ( max span addr pos1 -- max addr )
+  back-restore over spaces swap back-restore ;
+[THEN]
 \ : clear-tib ( max span addr pos -- max 0 addr 0 false )
 \   clear-line 0 tuck dup ;
 
@@ -86,7 +95,7 @@ s" os-class" environment? [IF] s" unix"
   forward^ 2@ 2dup hist-setpos backward^ 2!
   2dup get-line drop
   hist-pos  forward^ 2!
-  tuck 2dup type 0 ;
+  tuck 2dup type 2dup cur-correct 0 ;
 
 : find-prev-line ( max addr -- max span addr pos2 )
   backward^ 2@ forward^ 2!
@@ -98,7 +107,7 @@ s" os-class" environment? [IF] s" unix"
   REPEAT  2drop  THEN  tuck ;
 
 : 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,
 
@@ -191,12 +200,44 @@ require utf-8.fs
 
 [IFUNDEF] #esc  27 Constant #esc  [THEN]
 
-: save-cursor ( -- )  #esc emit '7 emit ;
-: restore-cursor ( -- )  #esc emit '8 emit ;
+Variable curpos
+
+: cygwin? ( -- flag ) s" TERM" getenv s" cygwin" str= ;
+: 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 ;
+: xcur-correct  ( addr u -- )
+    cygwin? IF  2drop EXIT  THEN
+    x-width curpos @ + cursor@ -
+    form nip >r  r@ 2/ + r@ / r> * negate curpos +! ;
+: save-cursor ( -- )
+    cygwin? IF  #esc emit '7 emit  ELSE
+	key? IF  -1  ELSE  cursor@  THEN  curpos !  THEN ;
+: restore-cursor ( -- )
+    cygwin? IF  #esc emit '8 emit  ELSE
+	curpos @ dup -1 = IF  drop  ELSE   cursor!  THEN  THEN ;
+
+' xcur-correct IS cur-correct
+
 : .rest ( addr pos1 -- addr pos1 )
-    restore-cursor 2dup type ;
+    key? ?EXIT
+    restore-cursor 2dup type 2dup cur-correct ;
 : .all ( span addr pos1 -- span addr pos1 )
-    restore-cursor >r 2dup swap type r> ;
+    key? ?EXIT
+    restore-cursor >r 2dup swap type 2dup swap cur-correct r> ;
+: xback-restore ( u -- )
+    drop key? ?EXIT
+    restore-cursor ;
+
+\ 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.
 
 : <xins>  ( max span addr pos1 xc -- max span addr pos2 )
     >r  2over r@ xc-size + u< IF  ( max span addr pos1 R:xc )
@@ -238,7 +279,11 @@ require utf-8.fs
     >r end^ 2@ hist-setpos
     2dup swap history write-line drop ( throw ) \ don't worry about errors
     hist-pos 2dup backward^ 2! end^ 2!
-    r> .all space true ;
+    r> curpos @ -1 = key? or IF
+	>r 2dup swap type r>
+    ELSE
+	.all
+    THEN space true ;
 
 : xkill-expand ( max span addr pos1 -- max span addr pos2 )
     prefix-found cell+ @ ?dup IF  >r
@@ -269,12 +314,15 @@ require utf-8.fs
     ['] xclear-tib   ctrl K bindkey
     ['] xfirst-pos   ctrl A bindkey
     ['] xend-pos     ctrl E bindkey
-    ['] (xenter)     #lf    bindkey
-    ['] (xenter)     #cr    bindkey
+    history IF  ['] (xenter)     #lf    bindkey  THEN
+    history IF  ['] (xenter)     #cr    bindkey  THEN
     ['] xtab-expand  #tab   bindkey
     ['] (xins)       IS insert-char
     ['] kill-prefix  IS everychar
-    ['] save-cursor  IS everyline ;
+    ['] save-cursor  IS everyline
+    ['] xback-restore IS back-restore
+    ['] xcur-correct  IS cur-correct
+;
 
 xchar-history
 
@@ -285,7 +333,7 @@ xchar-history
     ?dup-if
 	\ !! >stderr
         \ history-file type ." : " .error cr
-	drop 2drop
+	drop 2drop 0 to history
 	['] false ['] false ['] (ret)
     else
 	to history
@@ -302,6 +350,10 @@ xchar-history
 : history-cold ( -- )
     history-file get-history xchar-history ;
 
-' history-cold INIT8 chained
+:noname ( -- )
+    defers 'cold
+    history-cold
+; is 'cold
+
 history-cold