--- gforth/history.fs 2005/01/12 21:21:53 1.40 +++ gforth/history.fs 2007/06/17 19:26:42 1.57 @@ -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. @@ -28,23 +28,6 @@ interpret/compile: ctrl ( "" -- c : >string ( span addr pos1 -- span addr pos1 addr2 len ) over 3 pick 2 pick chars /string ; -: type-rest ( span addr pos1 -- span addr pos1 back ) - >string tuck type ; -: (del) ( max span addr pos1 -- max span addr pos2 ) - 1- >string over 1+ -rot move - rot 1- -rot #bs emit type-rest bl emit 1+ backspaces ; -: (ins) ( max span addr pos1 char -- max span addr pos2 ) - >r >string over 1+ swap move 2dup chars + r> swap c! - rot 1+ -rot type-rest 1- backspaces 1+ ; -: ?del ( max span addr pos1 -- max span addr pos2 0 ) - dup IF (del) THEN 0 ; -: (ret) type-rest drop true space ; -: back dup IF 1- #bs emit ELSE #bell emit THEN 0 ; -: forw 2 pick over <> IF 2dup + c@ emit 1+ ELSE #bell emit THEN 0 ; -: ( max span addr pos1 -- max span addr pos2 0 ) - 2 pick over <> - IF forw drop (del) ELSE #bell emit THEN 0 ; -: eof 2 pick over or 0= IF bye ELSE THEN ; : bindkey ( xt key -- ) cells ctrlkeys + ! ; @@ -86,11 +69,20 @@ 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 -: clear-tib ( max span addr pos -- max 0 addr 0 false ) - clear-line 0 tuck dup ; +[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 ; : hist-pos ( -- ud ) history file-position drop ( throw ) ; : hist-setpos ( ud -- ) history reposition-file drop ( throw ) ; @@ -103,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! @@ -115,9 +107,9 @@ 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, +\ Create lfpad #lf c, : (enter) ( max span addr pos1 -- max span addr pos2 true ) >r end^ 2@ hist-setpos @@ -125,13 +117,6 @@ Create lfpad #lf c, hist-pos 2dup backward^ 2! end^ 2! r> (ret) ; -\ some other key commands 16oct94py - -: first-pos ( max span addr pos1 -- max span addr 0 0 ) - backspaces 0 0 ; -: end-pos ( max span addr pos1 -- max span addr span 0 ) - type-rest 2drop over 0 ; - : extract-word ( addr len -- addr' len' ) dup >r BEGIN 1- dup 0>= WHILE 2dup + c@ bl = UNTIL THEN 1+ tuck + r> rot - ; @@ -203,56 +188,56 @@ Create prefix-found 0 , 0 , [ -1 cells ] Literal +LOOP prefix-string ; -: kill-expand ( max span addr pos1 -- max span addr pos2 ) - prefix-found cell+ @ 0 ?DO (del) LOOP ; - : tib-full? ( max span addr pos addr' len' -- max span addr pos addr1 u flag ) 5 pick over 4 pick + prefix-found @ 0<> - < ; -: tab-expand ( max span addr pos1 -- max span addr pos2 0 ) - key? IF #tab (ins) 0 EXIT THEN - kill-expand 2dup extract-word dup 0= IF nip EXIT THEN - search-prefix tib-full? - IF 7 emit 2drop 0 0 prefix-found 2! - ELSE bounds ?DO I c@ (ins) LOOP THEN - prefix-found @ IF bl (ins) THEN 0 ; - : kill-prefix ( key -- key ) dup #tab <> IF prefix-off THEN ; -[IFUNDEF] everyline defer everyline [THEN] - -: char-history ( -- ) - \ might be useful on dumb terminals, otherwise unused - ['] forw ctrl F bindkey - ['] back ctrl B bindkey - ['] ?del ctrl H bindkey - ['] eof ctrl D bindkey - ['] ctrl X bindkey - ['] next-line ctrl N bindkey - ['] prev-line ctrl P bindkey - ['] clear-tib ctrl K bindkey - ['] first-pos ctrl A bindkey - ['] end-pos ctrl E bindkey - ['] (enter) #lf bindkey - ['] (enter) #cr bindkey - ['] tab-expand #tab bindkey - ['] (ins) IS insert-char - ['] kill-prefix IS everychar - ['] noop IS everyline ; - \ UTF-8 support 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? curpos @ -1 = or 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. : ( max span addr pos1 xc -- max span addr pos2 ) >r 2over r@ xc-size + u< IF ( max span addr pos1 R:xc ) @@ -294,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 @@ -325,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 @@ -341,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 @@ -356,8 +348,12 @@ xchar-history ; : history-cold ( -- ) - history-file get-history ; + history-file get-history xchar-history ; + +:noname ( -- ) + defers 'cold + history-cold +; is 'cold -' history-cold INIT8 chained history-cold