Menu
▾
▴
win32forth-cvs — CVS Commit List
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(70) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(38) |
Feb
(4) |
Mar
(11) |
Apr
(49) |
May
(81) |
Jun
(65) |
Jul
(36) |
Aug
(57) |
Sep
(63) |
Oct
(57) |
Nov
(49) |
Dec
(41) |
| 2006 |
Jan
(75) |
Feb
(80) |
Mar
(10) |
Apr
(13) |
May
(100) |
Jun
(100) |
Jul
(77) |
Aug
(87) |
Sep
(80) |
Oct
(124) |
Nov
(39) |
Dec
(41) |
| 2007 |
Jan
(20) |
Feb
(32) |
Mar
(32) |
Apr
(43) |
May
(146) |
Jun
(40) |
Jul
(49) |
Aug
(33) |
Sep
(25) |
Oct
(19) |
Nov
(11) |
Dec
(8) |
| 2008 |
Jan
(4) |
Feb
(11) |
Mar
(31) |
Apr
(40) |
May
(34) |
Jun
(24) |
Jul
(39) |
Aug
(104) |
Sep
(27) |
Oct
(35) |
Nov
(34) |
Dec
(97) |
| 2009 |
Jan
(75) |
Feb
(29) |
Mar
(45) |
Apr
(76) |
May
(121) |
Jun
(103) |
Jul
(67) |
Aug
(28) |
Sep
(22) |
Oct
(39) |
Nov
(9) |
Dec
(15) |
| 2010 |
Jan
(7) |
Feb
(39) |
Mar
(40) |
Apr
(57) |
May
(67) |
Jun
(69) |
Jul
(49) |
Aug
(68) |
Sep
(22) |
Oct
(7) |
Nov
(2) |
Dec
(10) |
| 2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(4) |
May
(6) |
Jun
(10) |
Jul
(16) |
Aug
(23) |
Sep
(9) |
Oct
|
Nov
(28) |
Dec
(3) |
| 2012 |
Jan
(11) |
Feb
(10) |
Mar
(1) |
Apr
|
May
(4) |
Jun
(3) |
Jul
(3) |
Aug
(4) |
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
(7) |
Mar
(30) |
Apr
(4) |
May
(4) |
Jun
(8) |
Jul
(10) |
Aug
(4) |
Sep
|
Oct
(2) |
Nov
(24) |
Dec
(13) |
| 2014 |
Jan
(7) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(9) |
Jun
|
Jul
(3) |
Aug
(9) |
Sep
|
Oct
(2) |
Nov
|
Dec
(3) |
| 2015 |
Jan
(4) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(5) |
Sep
(1) |
Oct
(4) |
Nov
(7) |
Dec
(39) |
| 2016 |
Jan
(17) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(1) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2018 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Dirk B. <db...@us...> - 2005-09-03 09:04:15
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19592 Modified Files: fkernel.exe Log Message: Fixed a bug in (RESTORE-INPUT) whitch I intruduced when I readded the SOURCE-POSITION value Index: fkernel.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 Binary files /tmp/cvsrs8z4A and /tmp/cvshIbxb3 differ |
|
From: Dirk B. <db...@us...> - 2005-09-03 09:02:46
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19414/src Modified Files: FLOAT.F Log Message: removed the deprecated-state from 1/F because it seems that it's widly used (e.g. it's used in David N. Williams complex math lexicon) Index: FLOAT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/FLOAT.F,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FLOAT.F 31 Aug 2005 09:04:49 -0000 1.17 --- FLOAT.F 3 Sep 2005 09:02:38 -0000 1.18 *************** *** 157,161 **** fld FSIZE FSTACK_MEMORY fxam ! fstsw ax mov ebx, eax and ebx, # FPU_STATUS_CCF_MASK --- 157,161 ---- fld FSIZE FSTACK_MEMORY fxam ! fstsw ax mov ebx, eax and ebx, # FPU_STATUS_CCF_MASK *************** *** 235,242 **** \ Subroutine to check the depth of the float stack for underflow errors. \ Input: eax = number of floats we need ! subr: fstack-check ! B/FLOAT 10 = [IF] ! lea eax, 0 [eax*4] [eax] add eax, eax [ELSE] shl eax, # 3 --- 235,242 ---- \ Subroutine to check the depth of the float stack for underflow errors. \ Input: eax = number of floats we need ! subr: fstack-check ! B/FLOAT 10 = [IF] ! lea eax, 0 [eax*4] [eax] add eax, eax [ELSE] shl eax, # 3 *************** *** 410,414 **** code fpop ( f: -- r ) ( fs: r -- ) \ move from simulated stack on FPU stack fstack-check_1 ! >FPU --- 410,414 ---- code fpop ( f: -- r ) ( fs: r -- ) \ move from simulated stack on FPU stack fstack-check_1 ! >FPU *************** *** 418,424 **** code FDROP ( fs: r -- ) fstack-check_1 ! sub FSP_MEMORY , # B/FLOAT ! next, end-code --- 418,424 ---- code FDROP ( fs: r -- ) fstack-check_1 ! sub FSP_MEMORY , # B/FLOAT ! next, end-code *************** *** 426,434 **** code FDUP ( fs: r -- r r ) fstack-check_1 ! \ TODO optimize (>FPU) FPU> ! next, end-code --- 426,434 ---- code FDUP ( fs: r -- r r ) fstack-check_1 ! \ TODO optimize (>FPU) FPU> ! next, end-code *************** *** 436,440 **** code FSWAP ( fs: r1 r2 -- r2 r1 ) fstack-check_2 ! \ TODO optimize 2>FPU --- 436,440 ---- code FSWAP ( fs: r1 r2 -- r2 r1 ) fstack-check_2 ! \ TODO optimize 2>FPU *************** *** 442,446 **** FPU> FPU> ! next, end-code --- 442,446 ---- FPU> FPU> ! next, end-code *************** *** 1051,1055 **** code (fsin) ( f: r1 -- r2 ) fstack-check_1 ! >FPU fsin --- 1051,1055 ---- code (fsin) ( f: r1 -- r2 ) fstack-check_1 ! >FPU fsin *************** *** 1061,1065 **** code (fcos) ( f: r1 -- r2 ) fstack-check_1 ! >FPU fcos --- 1061,1065 ---- code (fcos) ( f: r1 -- r2 ) fstack-check_1 ! >FPU fcos *************** *** 1071,1075 **** code (fsincos) ( f: r1 -- r2 r3 ) fstack-check_1 ! >FPU fsincos --- 1071,1075 ---- code (fsincos) ( f: r1 -- r2 r3 ) fstack-check_1 ! >FPU fsincos *************** *** 1796,1800 **** zerochar @ \ optimization, mantissa=0 ! IF drop f0.0 mantsign @ if fnegate then true EXIT \ then whole number is zero THEN --- 1796,1800 ---- zerochar @ \ optimization, mantissa=0 ! IF drop f0.0 mantsign @ if fnegate then true EXIT \ then whole number is zero THEN *************** *** 1848,1852 **** true ELSE ! r>drop 2drop fdrop false THEN ; --- 1848,1852 ---- true ELSE ! r>drop 2drop fdrop false THEN ; *************** *** 2045,2049 **** synonym fsqr fsqrt deprecated ! : 1/f -1 f**n ; deprecated : f>r r> rp@ b/float - rp! rp@ f! >r ; deprecated --- 2045,2049 ---- synonym fsqr fsqrt deprecated ! : 1/f -1 f**n ; : f>r r> rp@ b/float - rp! rp@ f! >r ; deprecated |
|
From: Dirk B. <db...@us...> - 2005-09-03 09:00:33
|
Update of /cvsroot/win32forth/win32forth/src/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18837/src/kernel Modified Files: fkernel.f Log Message: Fixed a bug in (RESTORE-INPUT) whitch I intruduced when I readded the SOURCE-POSITION value Index: fkernel.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** fkernel.f 29 Aug 2005 15:56:28 -0000 1.22 --- fkernel.f 3 Sep 2005 09:00:25 -0000 1.23 *************** *** 337,341 **** pop ebx jo short @@1 ! br-next @@1: mov eax, 4 [esi] add esi, # 8 --- 337,341 ---- pop ebx jo short @@1 ! br-next @@1: mov eax, 4 [esi] add esi, # 8 *************** *** 449,453 **** mov 0 [esp], ecx next c; ! \ -------------------- Stack Operations ------------------------------------- --- 449,453 ---- mov 0 [esp], ecx next c; ! \ -------------------- Stack Operations ------------------------------------- *************** *** 1817,1822 **** shl ebx, 1 \ put sign bit into carry sbb ebx, ebx ! next c; ! : D>S ( d -- s ) \ convert double to single drop ; --- 1817,1822 ---- shl ebx, 1 \ put sign bit into carry sbb ebx, ebx ! next c; ! : D>S ( d -- s ) \ convert double to single drop ; *************** *** 1878,1884 **** mov eax, # 1234 \ get constant (patched, see res-multi-libs) LABEL RES-MULTI-X \ cell beyond patch address ! xchg esp, ebp \ swap regs for call call callf \ resolve with forth call ! xchg esp, ebp \ swap regs for call mov eax, ebx \ get address pop ebx \ correct the stack --- 1878,1884 ---- mov eax, # 1234 \ get constant (patched, see res-multi-libs) LABEL RES-MULTI-X \ cell beyond patch address ! xchg esp, ebp \ swap regs for call call callf \ resolve with forth call ! xchg esp, ebp \ swap regs for call mov eax, ebx \ get address pop ebx \ correct the stack *************** *** 1890,1896 **** mov eax, # 1234 \ get constant (patched, see res-single-lib) LABEL RES-SINGLE-X \ cell beyond patch address ! xchg esp, ebp \ swap regs for call call callf \ resolve with forth call ! xchg esp, ebp \ swap regs for call mov eax, ebx \ get address pop ebx \ correct the stack --- 1890,1896 ---- mov eax, # 1234 \ get constant (patched, see res-single-lib) LABEL RES-SINGLE-X \ cell beyond patch address ! xchg esp, ebp \ swap regs for call call callf \ resolve with forth call ! xchg esp, ebp \ swap regs for call mov eax, ebx \ get address pop ebx \ correct the stack *************** *** 2229,2233 **** - REPEAT DROP ; ! DEFER COL --- 2229,2233 ---- - REPEAT DROP ; ! DEFER COL *************** *** 3105,3114 **** DUP SYS-ADDR? \ address in system space IN-SYS? 0= AND \ not currently system pointer ! IF WARN_SYSWORD WARNMSG THEN ; : COMPILE, ( xt -- ) \ compile (same as , but with warning) SYS-WARNING? if (syswarn) then \ warn if system word in app word , ; ! CODE COMPILE ( -- ) \ compile xt following push ebx --- 3105,3114 ---- DUP SYS-ADDR? \ address in system space IN-SYS? 0= AND \ not currently system pointer ! IF WARN_SYSWORD WARNMSG THEN ; : COMPILE, ( xt -- ) \ compile (same as , but with warning) SYS-WARNING? if (syswarn) then \ warn if system word in app word , ; ! CODE COMPILE ( -- ) \ compile xt following push ebx *************** *** 3360,3364 **** \ *G Compiletime: Parses the input stream until it finds the next " and \ ** compiles it into the current definition. ! \ ** Runtime: Prints the compiled text to the console window COMPILE (.") ," ; IMMEDIATE --- 3360,3364 ---- \ *G Compiletime: Parses the input stream until it finds the next " and \ ** compiles it into the current definition. ! \ ** Runtime: Prints the compiled text to the console window COMPILE (.") ," ; IMMEDIATE *************** *** 3754,3758 **** mHeapParm call HeapReAlloc dup 0= ; \ flags, heapaddress ! : mHeapSize ( rel-addr -- n ) \ size of rel-addr bytes mHeapParm --- 3754,3758 ---- mHeapParm call HeapReAlloc dup 0= ; \ flags, heapaddress ! : mHeapSize ( rel-addr -- n ) \ size of rel-addr bytes mHeapParm *************** *** 3979,3983 **** else call GetLastError NO_ERROR <> ! if 2drop 0 0 true then --- 3979,3983 ---- else call GetLastError NO_ERROR <> ! if 2drop 0 0 true then *************** *** 4233,4237 **** : ("HEADER) ( a1 n1 -- ) CURRENT @ DUP SYS-ADDR? \ if the dictionary is in system space ! over class>sys or \ or is a class or object IF >SYSTEM ELSE >APPLICATION THEN \ then build the header in the same space 2000 ?MEMCHK \ check avail mem --- 4233,4237 ---- : ("HEADER) ( a1 n1 -- ) CURRENT @ DUP SYS-ADDR? \ if the dictionary is in system space ! over class>sys or \ or is a class or object IF >SYSTEM ELSE >APPLICATION THEN \ then build the header in the same space 2000 ?MEMCHK \ check avail mem *************** *** 4335,4339 **** FALSE TO ?:M 0 TO PARMS ; ! |: :COLONDEF ( -- ) PARMS-INIT DOCOL COMPILE, !CSP ] ; --- 4335,4339 ---- FALSE TO ?:M 0 TO PARMS ; ! |: :COLONDEF ( -- ) PARMS-INIT DOCOL COMPILE, !CSP ] ; *************** *** 4438,4442 **** DOVALUE! COMPILE, DOVALUE+! COMPILE, ; ! |: ?TO_CHECK ( xt -- xt_body ) DUP @ >R --- 4438,4442 ---- DOVALUE! COMPILE, DOVALUE+! COMPILE, ; ! |: ?TO_CHECK ( xt -- xt_body ) DUP @ >R *************** *** 4545,4549 **** ( n2 -- n3 ) \ runtime n3=n1+n2 header dooff compile, , ; ! : field+ ( n1 n2 <-name-> -- n3 ) \ compiling n3=n1+n2 stored offset=n1 ( addr1 -- addr2 ) \ runtime addr2=addr1+n1 --- 4545,4549 ---- ( n2 -- n3 ) \ runtime n3=n1+n2 header dooff compile, , ; ! : field+ ( n1 n2 <-name-> -- n3 ) \ compiling n3=n1+n2 stored offset=n1 ( addr1 -- addr2 ) \ runtime addr2=addr1+n1 *************** *** 4748,4752 **** \ September 23rd, 2003 - dbu : LINKFILE ( a1 -- ) \ link name a1 as current file IF LOADING ONLY !! ! ?LOADING IF MAXCOUNTED _LOCALALLOC \ alloc local path buffer --- 4748,4752 ---- \ September 23rd, 2003 - dbu : LINKFILE ( a1 -- ) \ link name a1 as current file IF LOADING ONLY !! ! ?LOADING IF MAXCOUNTED _LOCALALLOC \ alloc local path buffer *************** *** 4785,4792 **** SOURCE-ID SOURCE ! 6 ; : RESTORE-INPUT ( ... 7 -- flag ) \ restore input ! DROP (SOURCE) 2! TO SOURCE-ID --- 4785,4792 ---- SOURCE-ID SOURCE ! 7 ; : RESTORE-INPUT ( ... 7 -- flag ) \ restore input ! 7 ?PAIRS (SOURCE) 2! TO SOURCE-ID *************** *** 4816,4820 **** | CODE (RESTORE-INPUT) ( R: ... 7 -- ... 7 ) \ save input to stack push ebx ! push 8 CELLS [ebp] push 6 CELLS [ebp] push 5 CELLS [ebp] --- 4816,4820 ---- | CODE (RESTORE-INPUT) ( R: ... 7 -- ... 7 ) \ save input to stack push ebx ! push 7 CELLS [ebp] push 6 CELLS [ebp] push 5 CELLS [ebp] *************** *** 4869,4873 **** : FLOAD ( -<filename>- ) \ load "filename" into application dictionary /PARSE-S$ $FLOAD ; ! ' INCLUDED ALIAS "FLOAD ' FLOAD ALIAS INCLUDE --- 4869,4873 ---- : FLOAD ( -<filename>- ) \ load "filename" into application dictionary /PARSE-S$ $FLOAD ; ! ' INCLUDED ALIAS "FLOAD ' FLOAD ALIAS INCLUDE *************** *** 5192,5196 **** : PARMFIND ( addr -- addr FALSE | cfa -1 | cfa 1 ) dup count find-buffer place \ copy for case-sensitive searches ! ?UPPERCASE \ uppercase PFIND ?DUP 0= IF (FIND) ?DUP 0= --- 5192,5196 ---- : PARMFIND ( addr -- addr FALSE | cfa -1 | cfa 1 ) dup count find-buffer place \ copy for case-sensitive searches ! ?UPPERCASE \ uppercase PFIND ?DUP 0= IF (FIND) ?DUP 0= *************** *** 5289,5296 **** S" Error" (TYPEMSG) \ mark the source line in error, error ?LOADING IF EDIT-ERROR THEN \ edit if loading ! else drop THEN ; ! DEFER MESSAGE ' _MESSAGE IS MESSAGE : QUERY-INTERPRET ( -- ) --- 5289,5296 ---- S" Error" (TYPEMSG) \ mark the source line in error, error ?LOADING IF EDIT-ERROR THEN \ edit if loading ! else drop THEN ; ! DEFER MESSAGE ' _MESSAGE IS MESSAGE : QUERY-INTERPRET ( -- ) |
|
From: Dirk B. <db...@us...> - 2005-08-31 17:03:29
|
Update of /cvsroot/win32forth/win32forth/apps/SciEdit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18856/apps/SciEdit Modified Files: CommandID.f EdCommand.f EdMenu.f EdVersion.f Main.f ScintillaHyperMDI.f ScintillaMDI.f Log Message: SciEdit - New options "Remove trailing white space" and "Ensure final line ending", and some bugfixes Index: EdVersion.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdVersion.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdVersion.f 21 Aug 2005 11:11:04 -0000 1.5 --- EdVersion.f 31 Aug 2005 17:03:19 -0000 1.6 *************** *** 1,5 **** \ $Id$ ! 10123 value sciedit_version# \ Version numbers: v.ww.rr --- 1,5 ---- \ $Id$ ! 10124 value sciedit_version# \ Version numbers: v.ww.rr *************** *** 179,183 **** the help menu. The Win32-SDK help file is needed for this command. If you don't have a copy you can download it from: ! http://www.borland.com/devsupport/borlandcpp/patches/BC52HLP1.ZIP --- 179,183 ---- the help menu. The Win32-SDK help file is needed for this command. If you don't have a copy you can download it from: ! http://www.borland.com/devsupport/borlandcpp/patches/BC52HLP1.ZIP *************** *** 202,204 **** - New menu entry "Handle debug messages?" in the Win32Forth menu to turn off the handling of the debug messages from the console ! window. \ No newline at end of file --- 202,208 ---- - New menu entry "Handle debug messages?" in the Win32Forth menu to turn off the handling of the debug messages from the console ! window. ! ! \ changes for Version 1.01.24 ! dbu Mittwoch, August 31 2005 ! - New options "Remove trailing white space" and "Ensure final line ending" Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdMenu.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdMenu.f 21 Aug 2005 11:11:04 -0000 1.3 --- EdMenu.f 31 Aug 2005 17:03:19 -0000 1.4 *************** *** 87,91 **** ENDSUBMENU MenuSeparator ! :MenuItem mp_backup "&Create Backup File (*.BAK)" IDM_CREATE_BAK DoCommand ; MenuSeparator :MenuItem mp_sabcompile "&Save all files before Compile" IDM_SAVE_ALL_BEFORE_COMPILE DoCommand ; --- 87,94 ---- ENDSUBMENU MenuSeparator ! :MenuItem mp_backup "&Create Backup File (*.BAK)" IDM_CREATE_BAK DoCommand ; ! MenuSeparator ! :MenuItem mp_rtwh "&Remove trailing white space" IDM_REMOVE_TRAILING_WHITE DoCommand ; ! :MenuItem mp_efle "&Ensure final line ending" IDM_ENSURE_FINAL_LINE_ENDING DoCommand ; MenuSeparator :MenuItem mp_sabcompile "&Save all files before Compile" IDM_SAVE_ALL_BEFORE_COMPILE DoCommand ; *************** *** 144,150 **** IsAnsWord? else false ! then ; ! : EnableEdit ( f -- ) \ File menu dup Enable: mf_save --- 147,153 ---- IsAnsWord? else false ! then ; ! : EnableEdit ( f -- ) \ File menu dup Enable: mf_save *************** *** 191,194 **** --- 194,199 ---- dup Enable: mp_sabcompile dup Enable: mp_tabs + dup Enable: mp_rtwh + dup Enable: mp_efle \ Win32Forth menu *************** *** 209,213 **** ?BrowseMode: ActiveChild not Enable: mf_saveas ?Selection: ActiveChild Enable: mf_openhl ! \ Edit menu CanUndo: ActiveChild Enable: me_undo --- 214,218 ---- ?BrowseMode: ActiveChild not Enable: mf_saveas ?Selection: ActiveChild Enable: mf_openhl ! \ Edit menu CanUndo: ActiveChild Enable: me_undo *************** *** 222,226 **** ?Find: ActiveChild Enable: me_findnext \ ?Find: ActiveChild Enable: me_findprev ! ?BrowseMode: ActiveChild not Enable: me_date ?BrowseMode: ActiveChild not Enable: me_date&time ?Selection: ActiveChild Enable: me_commentblock --- 227,231 ---- ?Find: ActiveChild Enable: me_findnext \ ?Find: ActiveChild Enable: me_findprev ! ?BrowseMode: ActiveChild not Enable: me_date ?BrowseMode: ActiveChild not Enable: me_date&time ?Selection: ActiveChild Enable: me_commentblock *************** *** 247,251 **** CreateBackup? Check: mp_backup SaveAllBeforeCompile? Check: mp_sabcompile ! \ Win32Forth menu GetTextLength: ActiveChild Enable: mp_compile --- 252,258 ---- CreateBackup? Check: mp_backup SaveAllBeforeCompile? Check: mp_sabcompile ! StripTrailingWhitespace? Check: mp_rtwh ! FinalNewLine? Check: mp_efle ! \ Win32Forth menu GetTextLength: ActiveChild Enable: mp_compile *************** *** 256,264 **** IsAnsWordSelected? Enable: mp_anshelp sdk-help? Enable: mp_apihelp ! then ! ShowToolbar? Check: mp_showtb ! ShowStatusbar? Check: mp_showsb ! ShowToolbar? Enable: mp_customizetb ActiveChild 0<> dup Enable: mf_saveall --- 263,271 ---- IsAnsWordSelected? Enable: mp_anshelp sdk-help? Enable: mp_apihelp ! then ! ShowToolbar? Check: mp_showtb ! ShowStatusbar? Check: mp_showsb ! ShowToolbar? Enable: mp_customizetb ActiveChild 0<> dup Enable: mf_saveall Index: EdCommand.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdCommand.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdCommand.f 21 Aug 2005 11:11:04 -0000 1.3 --- EdCommand.f 31 Aug 2005 17:03:19 -0000 1.4 *************** *** 13,17 **** needs CommandID.f needs EdAbout.f - needs EdAbout.f needs AnsLink.f needs src/tools/SdkHelp.f --- 13,16 ---- *************** *** 154,158 **** then then ! GetHandle: FindInFilesDlg \ if window already open, then set search text IF Find-buf count ID_SEARCHTEXT SetDlgItemText: FindInFilesDlg --- 153,157 ---- then then ! GetHandle: FindInFilesDlg \ if window already open, then set search text IF Find-buf count ID_SEARCHTEXT SetDlgItemText: FindInFilesDlg *************** *** 208,224 **** \ -------------------------------------------------------------------------- : ViewEOL ( -- ) ! ViewEOL? not to ViewEOL? Update ; IDM_VIEW_EOL SetCommand : ViewWhiteSpace ( -- ) ! ViewWhiteSpace? not to ViewWhiteSpace? Update ; IDM_VIEW_WHITESPACE SetCommand : ViewLineNumbers ( -- ) ! ViewLineNumbers? not to ViewLineNumbers? Update ; IDM_VIEW_LINE_NUMBERS SetCommand : Colorize ( -- ) ! Colorize? not to Colorize? Update ; IDM_COLORIZE SetCommand : mcBrowse ( -- ) ! ?BrowseMode: ActiveChild not SetBrowseMode: ActiveChild Update ; IDM_BROWSE SetCommand \ -------------------------------------------------------------------------- --- 207,223 ---- \ -------------------------------------------------------------------------- : ViewEOL ( -- ) ! ViewEOL? 0= to ViewEOL? Update ; IDM_VIEW_EOL SetCommand : ViewWhiteSpace ( -- ) ! ViewWhiteSpace? 0= to ViewWhiteSpace? Update ; IDM_VIEW_WHITESPACE SetCommand : ViewLineNumbers ( -- ) ! ViewLineNumbers? 0= to ViewLineNumbers? Update ; IDM_VIEW_LINE_NUMBERS SetCommand : Colorize ( -- ) ! Colorize? 0= to Colorize? Update ; IDM_COLORIZE SetCommand : mcBrowse ( -- ) ! ?BrowseMode: ActiveChild 0= SetBrowseMode: ActiveChild Update ; IDM_BROWSE SetCommand \ -------------------------------------------------------------------------- *************** *** 235,243 **** : CreateBAK ( -- ) ! CreateBackup? not to CreateBackup? Update ; IDM_CREATE_BAK SetCommand : SaveAllBeforeCompile ( -- ) ! SaveAllBeforeCompile? not to SaveAllBeforeCompile? Update ; IDM_SAVE_ALL_BEFORE_COMPILE SetCommand NewEditDialog SetTabSizeDlg "Tab options" "&Tab size (1 to 8):" "Ok" "" "&Use Tabs" --- 234,247 ---- : CreateBAK ( -- ) ! CreateBackup? 0= to CreateBackup? Update ; IDM_CREATE_BAK SetCommand : SaveAllBeforeCompile ( -- ) ! SaveAllBeforeCompile? 0= to SaveAllBeforeCompile? Update ; IDM_SAVE_ALL_BEFORE_COMPILE SetCommand + : StripTrailingSpaces ( -- ) + StripTrailingWhitespace? 0= to StripTrailingWhitespace? Update ; IDM_REMOVE_TRAILING_WHITE SetCommand + + : EnsureFinalNewLine ( -- ) + FinalNewLine? 0= to FinalNewLine? Update ; IDM_ENSURE_FINAL_LINE_ENDING SetCommand NewEditDialog SetTabSizeDlg "Tab options" "&Tab size (1 to 8):" "Ok" "" "&Use Tabs" *************** *** 298,306 **** : ShowToolbar ( -- ) ! ShowToolbar? not dup to ShowToolbar? Show: TheRebar ReSize: Frame Update ; IDM_SHOW_TOOLBAR SetCommand : ShowStatusbar ( -- ) ! ShowStatusbar? not dup to ShowStatusbar? Show: ScintillaStatusbar ReSize: Frame Update ; IDM_SHOW_STATUSBAR SetCommand --- 302,310 ---- : ShowToolbar ( -- ) ! ShowToolbar? 0= dup to ShowToolbar? Show: TheRebar ReSize: Frame Update ; IDM_SHOW_TOOLBAR SetCommand : ShowStatusbar ( -- ) ! ShowStatusbar? 0= dup to ShowStatusbar? Show: ScintillaStatusbar ReSize: Frame Update ; IDM_SHOW_STATUSBAR SetCommand Index: ScintillaHyperMDI.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaHyperMDI.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ScintillaHyperMDI.f 21 Aug 2005 11:11:04 -0000 1.2 --- ScintillaHyperMDI.f 31 Aug 2005 17:03:19 -0000 1.3 *************** *** 160,163 **** --- 160,165 ---- TabSize SetTabWidth: super UseTabs? SetUseTabs: super + FinalNewLine? EnableEnsureFinalNewLine: super + StripTrailingWhitespace? EnableStripTrailingSpaces: super ;M Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/Main.f,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Main.f 21 Aug 2005 11:11:04 -0000 1.9 --- Main.f 31 Aug 2005 17:03:19 -0000 1.10 *************** *** 18,22 **** only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\SciEdit" "fpath+ --- 18,22 ---- only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\SciEdit" "fpath+ *************** *** 53,56 **** --- 53,58 ---- true value ShowStatusbar? true value HandleW32FMsg? + true value StripTrailingWhitespace? + true value FinalNewLine? 0 constant FT_SOURCE *************** *** 61,65 **** needs EdMenu.f ! defer Compile-File ' beep is Compile-File defer CloseBrowser ' beep is CloseBrowser defer HandleW32FMsg ' noop is HandleW32FMsg --- 63,67 ---- needs EdMenu.f ! defer Compile-File ' beep is Compile-File defer CloseBrowser ' beep is CloseBrowser defer HandleW32FMsg ' noop is HandleW32FMsg *************** *** 128,132 **** tempRect.AddrOf GetClientRect: self ! Left: tempRect ShowToolbar? if Height: TheRebar 2 - else Top: tempRect then Right: tempRect --- 130,134 ---- tempRect.AddrOf GetClientRect: self ! Left: tempRect ShowToolbar? if Height: TheRebar 2 - else Top: tempRect then Right: tempRect *************** *** 137,146 **** ShowToolbar? if Width Height: TheRebar GetHandle: TheRebar AdjustWindowSize then ! ShowStatusbar? if Redraw: ScintillaStatusbar then ;M int WindowState :M On_Size: ( h m w -- ) ! to WindowState \ get WindowState, don't save size of maximised or minimised window ReSize: self ;M --- 139,148 ---- ShowToolbar? if Width Height: TheRebar GetHandle: TheRebar AdjustWindowSize then ! ShowStatusbar? if Redraw: ScintillaStatusbar then ;M int WindowState :M On_Size: ( h m w -- ) ! to WindowState \ get WindowState, don't save size of maximised or minimised window ReSize: self ;M *************** *** 174,182 **** s" Recent Files" s" File1" 9 0 DO 2dup + 1- 57 i - swap c! ! 4dup 2swap RegGetString 2dup FILE-STATUS nip 0= \ we only add the file's witch still exist IF pad place pad Insert: RecentFiles ELSE 2drop ! THEN LOOP 4drop ; --- 176,184 ---- s" Recent Files" s" File1" 9 0 DO 2dup + 1- 57 i - swap c! ! 4dup 2swap RegGetString 2dup FILE-STATUS nip 0= \ we only add the file's witch still exist IF pad place pad Insert: RecentFiles ELSE 2drop ! THEN LOOP 4drop ; *************** *** 194,198 **** Colorize? s>d (d.) s" Colorize" "SetDefault ViewLineNumbers? s>d (d.) s" ViewLineNumbers" "SetDefault - SaveAllBeforeCompile? s>d (d.) s" SaveAllBeforeCompile" "SetDefault TabSize s>d (d.) s" TabSize" "SetDefault UseTabs? s>d (d.) s" UseTabs" "SetDefault --- 196,199 ---- *************** *** 200,203 **** --- 201,207 ---- ShowStatusbar? s>d (d.) s" ShowStatusbar" "SetDefault HandleW32FMsg? s>d (d.) s" HandleW32FMsg" "SetDefault + FinalNewLine? s>d (d.) s" FinalNewLine" "SetDefault + SaveAllBeforeCompile? s>d (d.) s" SaveAllBeforeCompile" "SetDefault + StripTrailingWhitespace? s>d (d.) s" StripTrailingSpaces" "SetDefault WindowState SIZE_RESTORED = *************** *** 206,210 **** Width: self s>d (d.) s" WindowWidth" "SetDefault Height: self s>d (d.) s" WindowHeight" "SetDefault ! then mask-ptr count s" SearchMask" "SetDefault --- 210,214 ---- Width: self s>d (d.) s" WindowWidth" "SetDefault Height: self s>d (d.) s" WindowHeight" "SetDefault ! then mask-ptr count s" SearchMask" "SetDefault *************** *** 214,219 **** SaveRecentFiles ! SetRegistryKey: ControlToolBar ! true SaveRestore: ControlToolBar r> base ! ; --- 218,223 ---- SaveRecentFiles ! SetRegistryKey: ControlToolBar ! true SaveRestore: ControlToolBar r> base ! ; *************** *** 227,251 **** s" ViewEOL" "GetDefaultValue 0= IF drop false THEN to ViewEOL? s" WhiteSpace" "GetDefaultValue 0= IF drop SCWS_INVISIBLE THEN to ViewWhiteSpace? ! s" CaseSensitive" "GetDefaultValue 0= IF drop true THEN to CaseSensitive? ! s" SubDirectories" "GetDefaultValue 0= IF drop true THEN to sub-dirs? ! s" AllOccurances" "GetDefaultValue 0= IF drop true THEN to all-occur? ! s" Colorize" "GetDefaultValue 0= IF drop true THEN to Colorize? ! s" ViewLineNumbers" "GetDefaultValue 0= IF drop true THEN to ViewLineNumbers? ! s" SaveAllBeforeCompile" "GetDefaultValue 0= IF drop false THEN to SaveAllBeforeCompile? ! s" TabSize" "GetDefaultValue 0= IF drop 8 THEN to TabSize ! s" UseTabs" "GetDefaultValue 0= IF drop true THEN to UseTabs? s" HandleW32FMsg" "GetDefaultValue 0= IF drop true THEN to HandleW32FMsg? s" SearchText" "GetDefault -IF 2dup "CLIP" find-buf place THEN 2drop s" SearchPath" "GetDefault -IF 2dup "CLIP" path-ptr place THEN 2drop s" SearchMask" "GetDefault -IF 2dup "CLIP" mask-ptr place THEN 2drop ! s" ShowToolbar" "GetDefaultValue 0= IF drop true THEN dup to ShowToolbar? Show: TheRebar s" ShowStatusbar" "GetDefaultValue 0= IF drop true THEN dup to ShowStatusbar? Show: ScintillaStatusbar ! RestoreRecentFiles ! SetRegistryKey: ControlToolBar ! false SaveRestore: ControlToolBar r> base ! ; --- 231,257 ---- s" ViewEOL" "GetDefaultValue 0= IF drop false THEN to ViewEOL? s" WhiteSpace" "GetDefaultValue 0= IF drop SCWS_INVISIBLE THEN to ViewWhiteSpace? ! s" CaseSensitive" "GetDefaultValue 0= IF drop true THEN to CaseSensitive? ! s" SubDirectories" "GetDefaultValue 0= IF drop true THEN to sub-dirs? ! s" AllOccurances" "GetDefaultValue 0= IF drop true THEN to all-occur? ! s" Colorize" "GetDefaultValue 0= IF drop true THEN to Colorize? ! s" ViewLineNumbers" "GetDefaultValue 0= IF drop true THEN to ViewLineNumbers? ! s" TabSize" "GetDefaultValue 0= IF drop 8 THEN to TabSize ! s" UseTabs" "GetDefaultValue 0= IF drop true THEN to UseTabs? s" HandleW32FMsg" "GetDefaultValue 0= IF drop true THEN to HandleW32FMsg? + s" FinalNewLine" "GetDefaultValue 0= IF drop true THEN to FinalNewLine? + s" SaveAllBeforeCompile" "GetDefaultValue 0= IF drop true THEN to SaveAllBeforeCompile? + s" StripTrailingWhitespace" "GetDefaultValue 0= IF drop true THEN to StripTrailingWhitespace? s" SearchText" "GetDefault -IF 2dup "CLIP" find-buf place THEN 2drop s" SearchPath" "GetDefault -IF 2dup "CLIP" path-ptr place THEN 2drop s" SearchMask" "GetDefault -IF 2dup "CLIP" mask-ptr place THEN 2drop ! s" ShowToolbar" "GetDefaultValue 0= IF drop true THEN dup to ShowToolbar? Show: TheRebar s" ShowStatusbar" "GetDefaultValue 0= IF drop true THEN dup to ShowStatusbar? Show: ScintillaStatusbar ! RestoreRecentFiles ! SetRegistryKey: ControlToolBar ! false SaveRestore: ControlToolBar r> base ! ; *************** *** 254,259 **** base @ >r decimal \ MUST be in decimal when loading defaults InitRegistry: self ! s" WindowWidth" "GetDefaultValue 0= IF drop 400 THEN ! s" WindowHeight" "GetDefaultValue 0= IF drop 400 THEN r> base ! ;M --- 260,265 ---- base @ >r decimal \ MUST be in decimal when loading defaults InitRegistry: self ! s" WindowWidth" "GetDefaultValue 0= IF drop 400 THEN ! s" WindowHeight" "GetDefaultValue 0= IF drop 400 THEN r> base ! ;M *************** *** 261,266 **** base @ >r decimal \ MUST be in decimal when loading defaults InitRegistry: self ! s" WindowLeft" "GetDefaultValue 0= IF drop 0 THEN ! s" WindowTop" "GetDefaultValue 0= IF drop 0 THEN r> base ! ;M --- 267,272 ---- base @ >r decimal \ MUST be in decimal when loading defaults InitRegistry: self ! s" WindowLeft" "GetDefaultValue 0= IF drop 0 THEN ! s" WindowTop" "GetDefaultValue 0= IF drop 0 THEN r> base ! ;M *************** *** 282,286 **** :M OnWmCommand: ( hwnd msg wparam lparam -- hwnd msg wparam lparam ) ! over LOWORD ( command ID ) dup IsCommand? IF DoCommand \ intercept Toolbar and shortkey commands ELSE drop OnWmCommand: Super \ intercept Menu commands --- 288,292 ---- :M OnWmCommand: ( hwnd msg wparam lparam -- hwnd msg wparam lparam ) ! over LOWORD ( command ID ) dup IsCommand? IF DoCommand \ intercept Toolbar and shortkey commands ELSE drop OnWmCommand: Super \ intercept Menu commands *************** *** 600,604 **** \ FCONTROL 'R' IDM_RELOAD ACCELENTRY FSHIFT FCONTROL or 'O' IDM_OPEN_HIGHLIGHTED_FILE ACCELENTRY ! \ Edit menu FCONTROL 'F' IDM_FIND_TEXT ACCELENTRY --- 606,610 ---- \ FCONTROL 'R' IDM_RELOAD ACCELENTRY FSHIFT FCONTROL or 'O' IDM_OPEN_HIGHLIGHTED_FILE ACCELENTRY ! \ Edit menu FCONTROL 'F' IDM_FIND_TEXT ACCELENTRY *************** *** 702,705 **** --- 708,713 ---- [else] s" src\res\SciEditMDI.ico" s" SciEditMdi.exe" AddAppIcon + + debug breaker Main [then] Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/CommandID.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CommandID.f 21 Aug 2005 11:11:04 -0000 1.3 --- CommandID.f 31 Aug 2005 17:03:19 -0000 1.4 *************** *** 72,75 **** --- 72,77 ---- NewID IDM_SHOW_TOOLBAR NewID IDM_SHOW_STATUSBAR + NewID IDM_REMOVE_TRAILING_WHITE + NewID IDM_ENSURE_FINAL_LINE_ENDING \ Win32Forth menu *************** *** 115,119 **** then ; ! : DoCommand ( ID -- ) >CommandTable @ ?dup IF execute THEN ; --- 117,121 ---- then ; ! : DoCommand ( ID -- ) >CommandTable @ ?dup IF execute THEN ; Index: ScintillaMDI.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaMDI.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ScintillaMDI.f 19 Aug 2005 16:05:46 -0000 1.3 --- ScintillaMDI.f 31 Aug 2005 17:03:19 -0000 1.4 *************** *** 30,33 **** --- 30,35 ---- int CreateBackup? int Lexer + int StripTrailingSpaces? + int EnsureFinalNewLine? :M ?Modified: ( -- f ) *************** *** 78,81 **** --- 80,85 ---- 0 to FindMode true to CreateBackup? + true to StripTrailingSpaces? + true to EnsureFinalNewLine? FindText$ off InitLexer: self *************** *** 114,204 **** GetTextLength: ChildWindow ;M - : SaveText ( -- ) \ save the Text in the control to the file - \ get the complete text from the control - ReleaseBuffer: EditFile - GetTextLength: self 1+ AllocBuffer: EditFile - GetBuffer: EditFile GetText: ChildWindow - - \ adjust the Text length in the EditFile because - \ the Scintilla-Control returns on null byte at the - \ end of the Text. Thank's Ezra for telling me about this - \ bug (Freitag, August 19 2005 - dbu) - GetLength: EditFile 1- SetLength: EditFile - - \ save the text to the file - SaveFile: EditFile - ReleaseBuffer: EditFile - - \ and mark the text in the control as unchanged - SetSavepoint: ChildWindow - SetWindowTitle: self ; - - :M SaveFileAs: ( -- ) \ save the file under a new name - GetSaveFilename ?dup - if SetFileName: self - SaveText - else drop - then ;M - - : CreateBackup ( -- ) \ create a Backup of the active file (*.BAK) - CreateBackup? - if - GetFileName: self count pad place - pad count "minus-ext" pad place s" .bak" pad +place pad +null - - false pad count drop GetFileName: self count drop - Call CopyFile ?win-error - then ; - - :M SaveFile: ( -- ) \ save the file under it's current name - GetFileName: self c@ 0= - if SaveFileAs: self - else CreateBackup - SaveText - then ;M - - :M SaveBeforeCloseing: ( -- ) - GetModify: ChildWindow 0<> - if [ MB_YESNO MB_ICONQUESTION or ] literal - s" The current File has changed. Would you like to save your changes?" MessageBox - IDYES = if SaveFile: self then - then ;M - - :M NewFile: ( -- ) \ open a new empty file - ClearName: EditFile ;M - - : SetFile ( f -- ) - GetBuffer: EditFile ?dup - if over + 0 swap c! \ add 0-terminator - SetText: ChildWindow - then - EmptyUndoBuffer: ChildWindow - SetSavepoint: ChildWindow - 0 -1 Colourise: ChildWindow ; - - :M OpenNamedFile: ( addr len -- f ) \ open a file - SaveBeforeCloseing: self - LoadFile: EditFile - dup if SetFile then - SetWindowTitle: self ;M - - :M OpenFile: ( -- f ) \ open a file - GetOpenFilename ?dup - if OpenNamedFile: self - else drop false - then ;M - - :M ReloadFile: ( -- ) \ reload the current file - GetFileName: self c@ 0<> - if GetModify: ChildWindow 0<> - if [ MB_YESNO MB_ICONQUESTION or ] literal - s" The current File has changed. All changes will be lost. Would you like to continue?" MessageBox - IDYES = - if GetFileName: self count pad place - SetSavepoint: ChildWindow NewFile: self - pad count LoadFile SetFile - then - then - then ;M :M Delete: ( -- ) \ delete the selected text --- 118,121 ---- *************** *** 362,371 **** SelectAll: ChildWindow ;M - :M Compile: ( -- ) \ compile this File - GetModify: ChildWindow 0<> - if SaveFile: self - then GetFileName: self count Compile-File - ;M - :M GotoLine: ( n -- ) GotoLine: ChildWindow ;M --- 279,282 ---- *************** *** 380,383 **** --- 291,300 ---- to CreateBackup? ;M + :M EnableStripTrailingSpaces: ( f -- ) + cr dup space to StripTrailingSpaces? ;M + + :M EnableEnsureFinalNewLine: ( f -- ) + cr dup space to EnsureFinalNewLine? ;M + :M SetEOL: ( eolMode -- ) dup ConvertEOL: ChildWindow SetEOL: ChildWindow ;M *************** *** 412,415 **** --- 329,480 ---- ReleaseBuffer: EditFile ;m + \ remove trailing white space char's (spaces and tabs) form the end + \ of all lines in the file + :M StripTrailingSpaces: { \ lineStart lineEnd -- } + GetLineCount: ChildWindow 0 + ?DO i PositionFromLine: ChildWindow to lineStart + i GetLineEndPosition: ChildWindow dup to lineEnd 0> + if lineEnd + begin 1- + dup GetCharAt: ChildWindow + dup BL = swap 0x09 ( TAB ) = or + swap dup lineStart >= rot and 0= + until + dup i lineEnd 1- < + if 1+ SetTargetStart: ChildWindow + lineEnd SetTargetEnd: ChildWindow + 0 pad ! pad 0 ReplaceTarget: ChildWindow drop + else drop + then + then + LOOP ;M + + \ make shure that the last line of the file ends with a line end marker + :M EnsureFinalNewLine: { \ maxLines endDoc appendNewLine -- } + GetLineCount: ChildWindow to maxLines + maxLines 1 = to appendNewLine + maxLines PositionFromLine: ChildWindow to endDoc + + maxLines 1 > + if endDoc maxLines 1- PositionFromLine: ChildWindow > to appendNewLine + then + + appendNewLine + if GetEOL: ChildWindow + case SC_EOL_CRLF of 0x0D pad c! 0x0A pad 1+ c! 0 pad 2+ c! endof + SC_EOL_CR of 0x0D pad c! 0 pad 1+ c! endof + SC_EOL_LF of 0x0A pad c! 0 pad 1+ c! endof + endcase endDoc pad InsertText: ChildWindow + then ;M + + \ ---------------------------------------------------------------------------- + \ ---------------------------------------------------------------------------- + + : SaveText ( -- ) \ save the Text in the control to the file + cr + StripTrailingSpaces? dup . space + if StripTrailingSpaces: self + then + + EnsureFinalNewLine? dup . space + if EnsureFinalNewLine: self + then + + \ get the complete text from the control + ReleaseBuffer: EditFile + GetTextLength: self 1+ AllocBuffer: EditFile + GetBuffer: EditFile GetText: ChildWindow + + \ adjust the Text length in the EditFile because + \ the Scintilla-Control returns on null byte at the + \ end of the Text. Thank's Ezra for telling me about this + \ bug (Freitag, August 19 2005 - dbu) + GetLength: EditFile 1- SetLength: EditFile + + \ save the text to the file + SaveFile: EditFile + ReleaseBuffer: EditFile + + \ and mark the text in the control as unchanged + SetSavepoint: ChildWindow + SetWindowTitle: self ; + + :M SaveFileAs: ( -- ) \ save the file under a new name + GetSaveFilename ?dup + if SetFileName: self + SaveText + else drop + then ;M + + : CreateBackup ( -- ) \ create a Backup of the active file (*.BAK) + CreateBackup? + if + GetFileName: self count pad place + pad count "minus-ext" pad place s" .bak" pad +place pad +null + + false pad count drop GetFileName: self count drop + Call CopyFile ?win-error + then ; + + :M SaveFile: ( -- ) \ save the file under it's current name + GetFileName: self c@ 0= + if SaveFileAs: self + else CreateBackup + SaveText + then ;M + + :M SaveBeforeCloseing: ( -- ) + GetModify: ChildWindow 0<> + if [ MB_YESNO MB_ICONQUESTION or ] literal + s" The current File has changed. Would you like to save your changes?" MessageBox + IDYES = if SaveFile: self then + then ;M + + :M NewFile: ( -- ) \ open a new empty file + ClearName: EditFile ;M + + : SetFile ( f -- ) + GetBuffer: EditFile ?dup + if over + 0 swap c! \ add 0-terminator + SetText: ChildWindow + then + EmptyUndoBuffer: ChildWindow + SetSavepoint: ChildWindow + 0 -1 Colourise: ChildWindow ; + + :M OpenNamedFile: ( addr len -- f ) \ open a file + SaveBeforeCloseing: self + LoadFile: EditFile + dup if SetFile then + SetWindowTitle: self ;M + + :M OpenFile: ( -- f ) \ open a file + GetOpenFilename ?dup + if OpenNamedFile: self + else drop false + then ;M + + :M ReloadFile: ( -- ) \ reload the current file + GetFileName: self c@ 0<> + if GetModify: ChildWindow 0<> + if [ MB_YESNO MB_ICONQUESTION or ] literal + s" The current File has changed. All changes will be lost. Would you like to continue?" MessageBox + IDYES = + if GetFileName: self count pad place + SetSavepoint: ChildWindow NewFile: self + pad count LoadFile SetFile + then + then + then ;M + + \ ---------------------------------------------------------------------------- + + :M Compile: ( -- ) \ compile this File + GetModify: ChildWindow 0<> + if SaveFile: self + then GetFileName: self count Compile-File + ;M + + \ ---------------------------------------------------------------------------- : OpenFile ( adr -- f ) \ f=false = file is opend dup count FILE-STATUS nip 0= *************** *** 424,432 **** buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c! ! \ try to open the file with the given path buf$ ?defext buf$ OpenFile if \ try to find the file in the folder of the current file buf$ count "to-pathend" pad place ! GetName: EditFile count "path-only" buf$ place buf$ ?+\ pad count buf$ +place buf$ OpenFile --- 489,497 ---- buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c! ! \ try to open the file with the given path buf$ ?defext buf$ OpenFile if \ try to find the file in the folder of the current file buf$ count "to-pathend" pad place ! GetName: EditFile count "path-only" buf$ place buf$ ?+\ pad count buf$ +place buf$ OpenFile *************** *** 441,445 **** buf$ IDM_OPEN_RECENT_FILE DoCommand else 2drop beep ! then then then --- 506,510 ---- buf$ IDM_OPEN_RECENT_FILE DoCommand else 2drop beep ! then then then *************** *** 517,520 **** ;Class - - |
|
From: Dirk B. <db...@us...> - 2005-08-31 17:03:29
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18856/src/lib Modified Files: ScintillaControl.f ScintillaEdit.f Log Message: SciEdit - New options "Remove trailing white space" and "Ensure final line ending", and some bugfixes Index: ScintillaEdit.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/ScintillaEdit.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ScintillaEdit.f 21 Aug 2005 06:22:01 -0000 1.3 --- ScintillaEdit.f 31 Aug 2005 17:03:19 -0000 1.4 *************** *** 116,119 **** --- 116,125 ---- GetBuffer: EditFile GetText: self + \ adjust the Text length in the EditFile because + \ the Scintilla-Control returns on null byte at the + \ end of the Text. Thank's Ezra for telling me about this + \ bug (Freitag, August 19 2005 - dbu) + GetLength: EditFile 1- SetLength: EditFile + \ save the text to the file SaveFile: EditFile *************** *** 125,132 **** :M SaveFileAs: ( -- ) \ save the file under a new name GetSaveFilename ?dup ! if SetFileName: self ! SaveText ! else drop ! then ;M : CreateBackup { \ from$ to$ -- } \ create a Backup of the active file (*.BAK) --- 131,138 ---- :M SaveFileAs: ( -- ) \ save the file under a new name GetSaveFilename ?dup ! if SetFileName: self ! SaveText ! else drop ! then ;M : CreateBackup { \ from$ to$ -- } \ create a Backup of the active file (*.BAK) Index: ScintillaControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/ScintillaControl.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaControl.f 21 Dec 2004 00:19:10 -0000 1.1 --- ScintillaControl.f 31 Aug 2005 17:03:19 -0000 1.2 *************** *** 970,974 **** \ is also set by a successful SearchInTarget:. :M SetTargetStart: ( pos -- ) ! 0 SCI_SETTARGETSTART SendMessage:Self drop ;M :M GetTargetStart: ( -- pos ) --- 970,974 ---- \ is also set by a successful SearchInTarget:. :M SetTargetStart: ( pos -- ) ! 0 swap SCI_SETTARGETSTART SendMessage:Self drop ;M :M GetTargetStart: ( -- pos ) *************** *** 976,980 **** :M SetTargetEnd: ( pos -- ) ! 0 SCI_SETTARGETEND SendMessage:Self drop ;M :M GetTargetEnd: ( -- pos ) --- 976,980 ---- :M SetTargetEnd: ( pos -- ) ! 0 swap SCI_SETTARGETEND SendMessage:Self drop ;M :M GetTargetEnd: ( -- pos ) *************** *** 1009,1013 **** \ string. :M ReplaceTarget: ( addr len -- n ) ! swap SCI_REPLACETARGET SendMessage:Self ;M \ This replaces the target using regular expressions. If length is -1, text is --- 1009,1013 ---- \ string. :M ReplaceTarget: ( addr len -- n ) ! SCI_REPLACETARGET SendMessage:Self ;M \ This replaces the target using regular expressions. If length is -1, text is *************** *** 1936,1938 **** MODULE - |
|
From: George H. <geo...@us...> - 2005-08-31 09:05:00
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8996/win32forth/src Modified Files: ASMWIN32.F DIS486.F FLOAT.F Log Message: gah: replaced compile with postpone Index: ASMWIN32.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/ASMWIN32.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ASMWIN32.F 2 Jun 2005 21:14:55 -0000 1.4 --- ASMWIN32.F 31 Aug 2005 09:04:49 -0000 1.5 *************** *** 51,55 **** : _code> ( -- ) \ create the ;code part of a low level defining word ! ?csp !csp compile (;code) [ also forth ] code-align code-here , [ previous ] postpone [ init-asm ; --- 51,55 ---- : _code> ( -- ) \ create the ;code part of a low level defining word ! ?csp !csp postpone (;code) [ also forth ] code-align code-here , [ previous ] postpone [ init-asm ; Index: DIS486.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/DIS486.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DIS486.F 29 Aug 2005 15:56:27 -0000 1.4 --- DIS486.F 31 Aug 2005 09:04:49 -0000 1.5 *************** *** 87,91 **** : .s" postpone s" ! compile >s ; immediate : >s8 --- 87,91 ---- : .s" postpone s" ! postpone >s ; immediate : >s8 *************** *** 94,98 **** : .sop" postpone s" ! compile >s8 ; immediate --- 94,98 ---- : .sop" postpone s" ! postpone >s8 ; immediate Index: FLOAT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/FLOAT.F,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** FLOAT.F 29 Aug 2005 15:56:27 -0000 1.16 --- FLOAT.F 31 Aug 2005 09:04:49 -0000 1.17 *************** *** 388,392 **** : FTO state @ \ compiletime: ( FS: n - ) ( -<name_fvalue>- ) ! if postpone ['] compile _fto else ' _fto \ runtime: ( FS: n - ) ( 'fvalue - ) then ; IMMEDIATE --- 388,392 ---- : FTO state @ \ compiletime: ( FS: n - ) ( -<name_fvalue>- ) ! if postpone ['] postpone _fto else ' _fto \ runtime: ( FS: n - ) ( 'fvalue - ) then ; IMMEDIATE |
|
From: George H. <geo...@us...> - 2005-08-30 14:08:23
|
Update of /cvsroot/win32forth/win32forth/src/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19391/win32forth/src/console Modified Files: Console2.f LINEEDIT.F Log Message: gah: added $Id:$ to files Index: Console2.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/Console2.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Console2.f 29 Aug 2005 15:56:28 -0000 1.2 --- Console2.f 30 Aug 2005 14:08:15 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + \ $Id$ \ File: Console2.f \ Author: Dirk Busch Index: LINEEDIT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/LINEEDIT.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LINEEDIT.F 29 Aug 2005 15:56:28 -0000 1.4 --- LINEEDIT.F 30 Aug 2005 14:08:15 -0000 1.5 *************** *** 1,2 **** --- 1,3 ---- + \ $Id$ \ LEDIT.SEQ Line Editor Utility by Tom Zimmer |
|
From: George H. <geo...@us...> - 2005-08-30 13:57:09
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16644/win32forth/src/lib Modified Files: BLOCK.F SUB_DIRS.F Log Message: gah: added $Id:$ to files Index: BLOCK.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/BLOCK.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BLOCK.F 29 Aug 2005 15:56:28 -0000 1.2 --- BLOCK.F 30 Aug 2005 13:56:57 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + \ $Id$ \ BLOCK.F Tom's Forth virtual block system. by Tom Zimmer Index: SUB_DIRS.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/SUB_DIRS.F,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SUB_DIRS.F 29 Aug 2005 15:56:28 -0000 1.3 --- SUB_DIRS.F 30 Aug 2005 13:56:57 -0000 1.4 *************** *** 1,2 **** --- 1,3 ---- + \ $Id$ anew -sub_dirs.f |
|
From: George H. <geo...@us...> - 2005-08-30 13:07:47
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5832/win32forth/src Modified Files: Nforget.f Log Message: gah: added $Id:$ to files Index: Nforget.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/Nforget.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Nforget.f 29 Aug 2005 15:56:27 -0000 1.2 --- Nforget.f 30 Aug 2005 13:07:31 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + \ $Id$ \ NFORGET.F \ nforget.f beta 2003/02/13 rbs Various changes as documented below |
|
From: George H. <geo...@us...> - 2005-08-30 11:55:42
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22416/win32forth/src Modified Files: DTHREAD.F ENVIRON.F Log Message: gah: added $Id:$ to files Index: DTHREAD.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/DTHREAD.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DTHREAD.F 29 Aug 2005 15:56:27 -0000 1.2 --- DTHREAD.F 30 Aug 2005 11:55:14 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + \ $Id$ \ DTHREAD.F Display the Threads by Tom Zimmer Index: ENVIRON.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/ENVIRON.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ENVIRON.F 29 Aug 2005 15:56:27 -0000 1.2 --- ENVIRON.F 30 Aug 2005 11:55:15 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + \ $Id$ \ ENVIRON.F ENVIRONMENT? support by Tom Zimmer |
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31814/src Modified Files: ANSFILE.F CALLBACK.f CLASSDBG.F COLORS.F CONTROLS.F Class.f DBGSRC1.F DIS486.F DTHREAD.F Dc.f Debug.f ENVIRON.F EXCEPTIO.F Extend.f FLOAT.F FONTS.F GENERIC.F INTERPIF.F MAPFILE.F Menu.f Nforget.f Order.f POINTER.F Primutil.f REGISTRY.F SCRNCTRL.F SEE.F Utils.f WORDS.F Window.f imageman.f paths.f xfiledlg.f Added Files: editor_io.f Log Message: - Marked >BOLD , >NORM and set-font as depreacted (they don't work anyway) - Marked SP>COL as depreacted (use COL instead) - Removed >BOLD and >NORM from the files - Removed the supporting code for WinEd's internal console window. - Moved then code for communication between WinEd/SciEdit from Mapfile.f into EditorIO.f. - Moved some code around in the files to minimize the file dependencices (there can more done...) - Marked the xxx-pointer words in ScrnCtrl.f as depreacted (use the xxx-cursor words from utils.f) instead. Index: ANSFILE.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/ANSFILE.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ANSFILE.F 3 May 2005 10:04:30 -0000 1.2 --- ANSFILE.F 29 Aug 2005 15:56:27 -0000 1.3 *************** *** 191,195 **** : .dir->file-size ( -- ;print file size ) _win32-find-data @ FILE_ATTRIBUTE_DIRECTORY and ! if >bold ." dir " >norm else _win32-find-data 8 cells+ @ dup 12 u,.r space \ print nFileSizeLow total-file-bytes +! --- 191,195 ---- : .dir->file-size ( -- ;print file size ) _win32-find-data @ FILE_ATTRIBUTE_DIRECTORY and ! if ." dir " else _win32-find-data 8 cells+ @ dup 12 u,.r space \ print nFileSizeLow total-file-bytes +! *************** *** 213,223 **** : print-dir-files ( adr slen -- ) ! cr >bold ." Directory of: " 2dup type >norm ['] _print-dir-files catch IF 2drop \ discard abort results THEN find-close drop ! cr >bold #files @ . ." Files displayed, using " ! total-file-bytes @ 1 u,.r ." bytes of disk." >norm ; : dir ( -<name>- ) \ name = f.e where f or e can be ascii's, * , or ? --- 213,223 ---- : print-dir-files ( adr slen -- ) ! cr ." Directory of: " 2dup type ['] _print-dir-files catch IF 2drop \ discard abort results THEN find-close drop ! cr #files @ . ." Files displayed, using " ! total-file-bytes @ 1 u,.r ." bytes of disk." ; : dir ( -<name>- ) \ name = f.e where f or e can be ascii's, * , or ? *************** *** 261,268 **** EXIT \ leave if no names specified THEN ! cr >bold ." Rename Files: " RenameFrom$ count type ." from: " RenamePart1$ count type ." To: " ! RenamePart2$ count type >norm 0 #files ! \ reset # of files in dir RenameFrom$ count find-first-file nip 0= \ adrd ior - find first file --- 261,268 ---- EXIT \ leave if no names specified THEN ! cr ." Rename Files: " RenameFrom$ count type ." from: " RenamePart1$ count type ." To: " ! RenamePart2$ count type 0 #files ! \ reset # of files in dir RenameFrom$ count find-first-file nip 0= \ adrd ior - find first file *************** *** 275,279 **** do-rename-afile REPEAT find-close drop ! cr >bold #files @ . ." Files renamed" >norm ELSE cr ." No matching files Found" \ if file is not found, exit THEN ; --- 275,279 ---- do-rename-afile REPEAT find-close drop ! cr #files @ . ." Files renamed" ELSE cr ." No matching files Found" \ if file is not found, exit THEN ; *************** *** 281,283 **** IN-APPLICATION - |
|
From: Dirk B. <db...@us...> - 2005-08-29 15:56:38
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31814/src/lib Modified Files: BLOCK.F SUB_DIRS.F Win32Help.f excontrols.f task.f Log Message: - Marked >BOLD , >NORM and set-font as depreacted (they don't work anyway) - Marked SP>COL as depreacted (use COL instead) - Removed >BOLD and >NORM from the files - Removed the supporting code for WinEd's internal console window. - Moved then code for communication between WinEd/SciEdit from Mapfile.f into EditorIO.f. - Moved some code around in the files to minimize the file dependencices (there can more done...) - Marked the xxx-pointer words in ScrnCtrl.f as depreacted (use the xxx-cursor words from utils.f) instead. Index: SUB_DIRS.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/SUB_DIRS.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SUB_DIRS.F 3 May 2005 12:21:10 -0000 1.2 --- SUB_DIRS.F 29 Aug 2005 15:56:28 -0000 1.3 *************** *** 10,13 **** --- 10,15 ---- \ July 4th, 2003 - 17:28 Changed for use in WinEd 2.21.00 - dbu + IN-APPLICATION + INTERNAL \ Hide a number of words *************** *** 214,216 **** MODULE - |
|
From: Dirk B. <db...@us...> - 2005-08-29 15:56:38
|
Update of /cvsroot/win32forth/win32forth/src/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31814/src/console Modified Files: CONSOLE.F Console2.f ConsoleMenu.f LINEEDIT.F Log Message: - Marked >BOLD , >NORM and set-font as depreacted (they don't work anyway) - Marked SP>COL as depreacted (use COL instead) - Removed >BOLD and >NORM from the files - Removed the supporting code for WinEd's internal console window. - Moved then code for communication between WinEd/SciEdit from Mapfile.f into EditorIO.f. - Moved some code around in the files to minimize the file dependencices (there can more done...) - Marked the xxx-pointer words in ScrnCtrl.f as depreacted (use the xxx-cursor words from utils.f) instead. Index: Console2.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/Console2.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Console2.f 21 Dec 2004 00:19:09 -0000 1.1 --- Console2.f 29 Aug 2005 15:56:28 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- \ before this. + cr .( Loading... Console I/O Part 2) \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 97,100 **** --- 98,102 ---- then ; + new-chain mouse-chain \ chain of things to do on mouse down mouse-chain chain-add ?mouse_abort *************** *** 194,199 **** \ ------------------------------------------------------------------------------ - 0 value remote-io? \ is I/O being directed to remote console? - defer@ accept value defaultAccept --- 196,199 ---- *************** *** 221,226 **** focus-console tabing-off ! ! FALSE to remote-io? ; defer basic-forth-io ' _basic-forth-io is basic-forth-io --- 221,225 ---- focus-console tabing-off ! ; defer basic-forth-io ' _basic-forth-io is basic-forth-io *************** *** 287,312 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ allow the user to set the current display FONT \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! WINLIBRARY GDI32.DLL ! 1 proc GetDC ! 2 proc ReleaseDC ! 1 proc GetStockObject ! 2 proc SelectObject : set-font ( font_value -- ) ! conHndl call GetDC >r \ get and save the Device Control # ! call GetStockObject \ return the object information ! r@ call SelectObject drop \ selects the object ! r> conHndl call ReleaseDC drop ; ! ! : _>bold ( -- ) ! OEM_FIXED_FONT set-font ; ! ! : _>norm ( -- ) ! ANSI_FIXED_FONT set-font ; ! ! ' _>bold is >bold ! ' _>norm is >norm \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 286,312 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ allow the user to set the current display FONT + \ doesn't work so it's deprecated \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ WINLIBRARY GDI32.DLL ! \ 1 proc GetDC ! \ 2 proc ReleaseDC ! \ 1 proc GetStockObject ! \ 2 proc SelectObject : set-font ( font_value -- ) ! \ conHndl call GetDC >r \ get and save the Device Control # ! \ call GetStockObject \ return the object information ! \ r@ call SelectObject drop \ selects the object ! \ r> conHndl call ReleaseDC drop ! ; DEPRECATED + \ : _>bold ( -- ) + \ OEM_FIXED_FONT set-font ; + \ + \ : _>norm ( -- ) + \ ANSI_FIXED_FONT set-font ; + \ + \ ' _>bold is >bold + \ ' _>norm is >norm \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ Index: CONSOLE.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/CONSOLE.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CONSOLE.F 17 May 2005 22:42:30 -0000 1.4 --- CONSOLE.F 29 Aug 2005 15:56:28 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- \ Win32Forth Terminal I/O (Moved here from Primutil.f ) + cr .( Loading... Console I/O Part 1) \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 36,42 **** \ sound stuff \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! ! VARIABLE TONE_FREQ 500 TONE_FREQ ! ! VARIABLE TONE_DURA 100 TONE_DURA ! 2 PROC Beep --- 37,42 ---- \ sound stuff \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! VARIABLE TONE_FREQ 700 TONE_FREQ ! ! VARIABLE TONE_DURA 50 TONE_DURA ! 2 PROC Beep *************** *** 50,53 **** --- 50,56 ---- tone_freq @ tone_dura @ tone ; + defer beep ' _beep is beep \ default sound stuff + + synonym NOTE tone DEPRECATED \ use TONE instad \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 55,63 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! defer beep ' _beep is beep \ default sound stuff ! defer >bold ' noop is >bold \ set bold font in console window ! defer >norm ' noop is >norm \ set normal font in console window ! defer page ' cls is page \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 58,67 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! defer page ' cls is page + \ the next two words are deprecated because changeing the + \ console font doesn't realy work + defer >bold DEPRECATED \ ' noop is >bold \ set bold font in console window + defer >norm DEPRECATED \ ' noop is >norm \ set normal font in console window \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 65,70 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! synonym SP>COL COL ! synonym AT-XY gotoxy : cols ( -- n1 ) \ current screen columns --- 69,74 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! synonym SP>COL COL DEPRECATED ! synonym AT-XY gotoxy \ ANS Version of gotoxy : cols ( -- n1 ) \ current screen columns *************** *** 73,101 **** : rows ( -- n1 ) \ current screen rows getcolrow nip ; - 0 value accept-cnt \ current count of chars accepted - : _faccept ( a1 n1 -- n2 ) - 0 swap 0 - ?do drop - i to accept-cnt \ save in case we need it - key - case 8 of i 1 < \ if input is empty - if 0 \ do nothing but - beep \ beep at user - else 1- \ decrement address 1 - -1 08 emit - bl emit - 08 emit - then - endof - 27 of dup c@ emit 1+ 1 endof - 13 of i leave endof - dup emit - 2dup swap c! \ place the character - swap 1+ swap \ bump the address - 1 swap \ loop increment - endcase i 1+ swap \ incase loop completes - +loop nip ; ! ' _faccept is accept \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 77,106 ---- : rows ( -- n1 ) \ current screen rows getcolrow nip ; ! \ 0 value accept-cnt \ current count of chars accepted ! \ : _faccept ( a1 n1 -- n2 ) ! \ 0 swap 0 ! \ ?do drop ! \ i to accept-cnt \ save in case we need it ! \ key ! \ case 8 of i 1 < \ if input is empty ! \ if 0 \ do nothing but ! \ beep \ beep at user ! \ else 1- \ decrement address 1 ! \ -1 08 emit ! \ bl emit ! \ 08 emit ! \ then ! \ endof ! \ 27 of dup c@ emit 1+ 1 endof ! \ 13 of i leave endof ! \ dup emit ! \ 2dup swap c! \ place the character ! \ swap 1+ swap \ bump the address ! \ 1 swap \ loop increment ! \ endcase i 1+ swap \ incase loop completes ! \ +loop nip ; ! \ ! \ ' _faccept is accept \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 238,242 **** 3 PROC InvalidateRect : ConsoleRepaint ( -- ) \ redraw console window ! 1 0 _conHndl call InvalidateRect drop ; : x_SetcharWH ( width height -- ) \ set the width and height of the --- 243,247 ---- 3 PROC InvalidateRect : ConsoleRepaint ( -- ) \ redraw console window ! 1 0 _conHndl call InvalidateRect drop ; : x_SetcharWH ( width height -- ) \ set the width and height of the *************** *** 248,265 **** : SetConsoleFont ( hFont -- ) \ set the console font. If hFont is NULL the ! \ default font will be set. ! call c_setfont drop ! ConsoleRepaint ; \ force repaint ! \ Usage: \ ! \ Font cFont ! \ 16 Height: cFont ! \ 8 Width: cFont ! \ s" Courier New" SetFaceName: cFont ! \ FW_NORMAL Weight: cFont ! \ Create: cFont ! \ Handle: cFont SetConsoleFont ! \ zHandle: cFont \ don't let Win32Forth destroy the font; the console does it !!! --- 253,270 ---- : SetConsoleFont ( hFont -- ) \ set the console font. If hFont is NULL the ! \ default font will be set. ! call c_setfont drop ! ConsoleRepaint ; \ force repaint ! \ Usage of SetConsoleFont: \ ! \ Font cFont ! \ 16 Height: cFont ! \ 8 Width: cFont ! \ s" Courier New" SetFaceName: cFont ! \ FW_NORMAL Weight: cFont ! \ Create: cFont ! \ Handle: cFont SetConsoleFont ! \ zHandle: cFont \ don't let Win32Forth destroy the font; the console does it !!! *************** *** 394,396 **** SYNONYM _BYE k_BYE DEPRECATED - --- 399,400 ---- Index: ConsoleMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/ConsoleMenu.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConsoleMenu.f 5 Aug 2005 08:41:06 -0000 1.3 --- ConsoleMenu.f 29 Aug 2005 15:56:28 -0000 1.4 *************** *** 6,9 **** --- 6,11 ---- only forth also definitions + in-application + INTERNAL \ internal definitions start here *************** *** 140,165 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! EXTERNAL \ externally available definitions start here ! ! defer class-browser ! :noname ( -- ) \ load the class and vocabulary browser ! turnkeyed? 0= ! \in-system-ok IF s" Tools/ClassBrowser.f" INCLUDED ! then ; is class-browser ! ! defer help-system ! :noname ( -- ) \ load the help-system ! turnkeyed? 0= ! \in-system-ok IF s" Tools/HelpSystem.f" INCLUDED ! THEN ; is help-system ! ! defer xref ! :noname ( -- ) \ load the xref tool ! turnkeyed? 0= ! \in-system-ok IF >system s" Tools/xref.f" INCLUDED system> ! THEN ; is xref ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ MENUBAR Win32Forth-Menu-bar --- 142,159 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ INTERNAL \ internal definitions start here ! \ ! \ |Class MENUCONSOLE <Super MENUITEM \ Only for use with the console window ! \ ! \ :M DoMenu: ( IDM -- ) ! \ mid = ! \ if mfunc execute-menufunc ! \ cr ! \ [DEFINED] ledit-y [IF] getxy to ledit-y to ledit-x \ move lineeditor down ! \ [THEN] then ;M ! \ ! \ ;Class ! EXTERNAL MENUBAR Win32Forth-Menu-bar *************** *** 395,397 **** MODULE \ end of the module - |
|
From: Dirk B. <db...@us...> - 2005-08-29 15:56:38
|
Update of /cvsroot/win32forth/win32forth/src/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31814/src/tools Added Files: dump.f tools.f Log Message: - Marked >BOLD , >NORM and set-font as depreacted (they don't work anyway) - Marked SP>COL as depreacted (use COL instead) - Removed >BOLD and >NORM from the files - Removed the supporting code for WinEd's internal console window. - Moved then code for communication between WinEd/SciEdit from Mapfile.f into EditorIO.f. - Moved some code around in the files to minimize the file dependencices (there can more done...) - Marked the xxx-pointer words in ScrnCtrl.f as depreacted (use the xxx-cursor words from utils.f) instead. --- NEW FILE: dump.f --- \ $Id: dump.f,v 1.1 2005/08/29 15:56:28 dbu_de Exp $ \ DUMP.f \ Moved here from fkernel.f \ Sonntag, August 28 2005 dbu cr .( Loading HEX dump utility) anew -dump.f INTERNAL EXTERNAL IN-APPLICATION : +NO-WRAP ( a1 n1 -- a2 ) \ add n1 to a1, limit to address 0xFFFFFFFF \ don't allow wrap around to address zero 0 TUCK D+ -1 0 DMIN DROP ; IN-SYSTEM DEFER DUMPC@ ' C@ IS DUMPC@ \ added as seen in Version 3.5 fkernel.f for \ cf32 port (Samstag, August 13 2005 dbu) : DUMP ( adr len -- ) ( hex byte format with ascii ) OVER +NO-WRAP DUP ROT ?DO CR I 8 h.R ." | " I 16 +NO-WRAP OVER UMIN I 2dup DO I DUMPC@ H.2 space I J 7 + = IF SPACE THEN LOOP 2DUP - 16 OVER - 3 * SWAP 8 < - SPACES ." |" DO I DUMPC@ EMIT. LOOP ." |" NUF? ?LEAVE SCREENDELAY MS \ slow down output 16 +LOOP DROP ; IN-APPLICATION MODULE --- NEW FILE: tools.f --- \ $Id: tools.f,v 1.1 2005/08/29 15:56:28 dbu_de Exp $ \ Tools.f \ Moved here from ConsoleMenu.f \ Sonntag, August 28 2005 dbu anew -tools.f INTERNAL EXTERNAL \ externally available definitions start here defer class-browser :noname ( -- ) \ load the class and vocabulary browser turnkeyed? 0= \in-system-ok IF s" Tools/ClassBrowser.f" INCLUDED then ; is class-browser defer help-system :noname ( -- ) \ load the help-system turnkeyed? 0= \in-system-ok IF s" Tools/HelpSystem.f" INCLUDED THEN ; is help-system defer xref :noname ( -- ) \ load the xref tool turnkeyed? 0= \in-system-ok IF >system s" Tools/xref.f" INCLUDED system> THEN ; is xref MODULE |
|
From: Dirk B. <db...@us...> - 2005-08-29 15:56:38
|
Update of /cvsroot/win32forth/win32forth/src/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31814/src/kernel Modified Files: fkernel.f Log Message: - Marked >BOLD , >NORM and set-font as depreacted (they don't work anyway) - Marked SP>COL as depreacted (use COL instead) - Removed >BOLD and >NORM from the files - Removed the supporting code for WinEd's internal console window. - Moved then code for communication between WinEd/SciEdit from Mapfile.f into EditorIO.f. - Moved some code around in the files to minimize the file dependencices (there can more done...) - Marked the xxx-pointer words in ScrnCtrl.f as depreacted (use the xxx-cursor words from utils.f) instead. Index: fkernel.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** fkernel.f 19 Aug 2005 16:08:11 -0000 1.21 --- fkernel.f 29 Aug 2005 15:56:28 -0000 1.22 *************** *** 5624,5628 **** ['] START/STOP CATCH ; ! : KWORDS ( -- ) CR CONTEXT @ DUP VOC#THREADS >R --- 5624,5628 ---- ['] START/STOP CATCH ; ! : KWORDS ( -- ) \ simple version of words CR CONTEXT @ DUP VOC#THREADS >R *************** *** 5638,5664 **** IN-APPLICATION - : +NO-WRAP ( a1 n1 -- a2 ) \ add n1 to a1, limit to address 0xFFFFFFFF - \ don't allow wrap around to address zero - 0 TUCK D+ -1 0 DMIN DROP ; - - IN-SYSTEM - - DEFER DUMPC@ ' C@ IS DUMPC@ \ added as seen in Version 3.5 fkernel.f for - \ cf32 port (Samstag, August 13 2005 dbu) - - : DUMP ( adr len -- ) ( hex byte format with ascii ) - OVER +NO-WRAP DUP ROT - ?DO CR I 8 h.R ." | " - I 16 +NO-WRAP OVER UMIN I - 2dup - DO I DUMPC@ H.2 space I J 7 + = IF SPACE THEN - LOOP 2DUP - 16 OVER - 3 * SWAP 8 < - SPACES ." |" - DO I DUMPC@ EMIT. - LOOP ." |" NUF? ?LEAVE - SCREENDELAY MS \ slow down output - 16 +LOOP DROP ; - - IN-APPLICATION - #version# constant version# #build# constant build# --- 5638,5641 ---- |
|
From: Dirk B. <db...@us...> - 2005-08-29 15:56:35
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31814 Modified Files: fkernel.exe setup.exe Log Message: - Marked >BOLD , >NORM and set-font as depreacted (they don't work anyway) - Marked SP>COL as depreacted (use COL instead) - Removed >BOLD and >NORM from the files - Removed the supporting code for WinEd's internal console window. - Moved then code for communication between WinEd/SciEdit from Mapfile.f into EditorIO.f. - Moved some code around in the files to minimize the file dependencices (there can more done...) - Marked the xxx-pointer words in ScrnCtrl.f as depreacted (use the xxx-cursor words from utils.f) instead. Index: setup.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/setup.exe,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvstH1YP5 and /tmp/cvsMdf6R0 differ Index: fkernel.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 Binary files /tmp/cvsSrnJ77 and /tmp/cvs8rx5d3 differ |
|
From: Jos v.d.V. <jo...@us...> - 2005-08-28 19:42:38
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28292/src Modified Files: MAPFILE.F Log Message: Jos: A test for Dirk Index: MAPFILE.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/MAPFILE.F,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MAPFILE.F 3 May 2005 15:05:54 -0000 1.6 --- MAPFILE.F 28 Aug 2005 19:42:30 -0000 1.7 *************** *** 3,7 **** \ arm 02/01/2005 21:42:24 DOMAP , instead of DOMAP COMPILE, ! cr .( Loading File Memory Mapping...) --- 3,7 ---- \ arm 02/01/2005 21:42:24 DOMAP , instead of DOMAP COMPILE, ! cr .( Loading File Memory Mapping... ) *************** *** 518,520 **** ! |
Update of /cvsroot/win32forth/win32forth/apps/WinEd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24685/apps/WinEd Modified Files: Ed_Defaults.F Ed_EditWindowObj.F Ed_EditorWords.F Ed_FileFuncs.F Ed_FindInFiles.F Ed_FrameWindowObj.F Ed_Globals.F Ed_HyperLink.F Ed_KeyCMD.F Ed_Keys.F Ed_LineFuncs.F Ed_LoadFileFuncs.F Ed_Menu.F Ed_MenuFuncs.F Ed_MessageBrodcast.F Ed_MiscFunc.F Ed_MouseHighlight.F Ed_Remote.F Ed_Statbar.F Ed_ToolBar.F Ed_Url.F Ed_Version.F WinEd.f Removed Files: Ed_Sub_Dirs.F Log Message: Removed WinEd's internal console window. Index: Ed_EditorWords.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_EditorWords.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Ed_EditorWords.F 30 Apr 2005 20:52:42 -0000 1.2 --- Ed_EditorWords.F 28 Aug 2005 07:28:06 -0000 1.3 *************** *** 158,169 **** text-length 4000 + text-blen > \ check for buffer full warned? 0= and \ and haven't warned used? ! IF GetStack: DocWindow entry-console = ! IF TRUE to edit-changed? \ SET changed flag ! primitive-save-text ! ELSE beep ! IF beep ! warn-to-save ! true to warned? \ we warned you! ! THEN THEN THEN --- 158,165 ---- text-length 4000 + text-blen > \ check for buffer full warned? 0= and \ and haven't warned used? ! IF beep ! IF beep ! warn-to-save ! true to warned? \ we warned you! THEN THEN Index: Ed_Statbar.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_Statbar.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Ed_Statbar.F 30 Apr 2005 20:52:42 -0000 1.2 --- Ed_Statbar.F 28 Aug 2005 07:28:07 -0000 1.3 *************** *** 14,22 **** :Object Win-EdStatusbar <Super MultiStatusbar ! create MultiWidth 125 , 250 , 400 , 520 , 580 , \ width of statusbar parts create SingleWidth -1 , \ width of statusbar parts :M SetMulti: ( -- ) ! MultiWidth 5 SetParts: self ;M --- 14,22 ---- :Object Win-EdStatusbar <Super MultiStatusbar ! create MultiWidth 125 , 250 , 400 , 580 , \ width of statusbar parts create SingleWidth -1 , \ width of statusbar parts :M SetMulti: ( -- ) ! MultiWidth 4 SetParts: self ;M Index: WinEd.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/WinEd.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** WinEd.f 4 Jun 2005 08:51:19 -0000 1.7 --- WinEd.f 28 Aug 2005 07:28:07 -0000 1.8 *************** *** 10,14 **** )) ! cr .( Loading Win-Ed... ) anew -wined.f --- 10,14 ---- )) ! cr .( Loading WinEd... ) anew -wined.f *************** *** 24,28 **** \ So we can rename it as part of an application jap rda create Edname$ 32 allot ! s" Win-Ed " Edname$ place needs Ed_Version.f \ This version of Win-Ed --- 24,28 ---- \ So we can rename it as part of an application jap rda create Edname$ 32 allot ! s" WinEd " Edname$ place needs Ed_Version.f \ This version of Win-Ed *************** *** 39,43 **** needs Ed_About.f \ Win-Ed about Dialog needs Ed_LineFuncs.f \ Setup the line pointers and scroll bar for a new file ! needs Ed_Sub_Dirs.f \ Multi-Directory File processing needs Ed_Search.f \ Text Search functions needs Ed_KeyCMD.f \ Scrolling, ins/del lines & characters --- 39,43 ---- needs Ed_About.f \ Win-Ed about Dialog needs Ed_LineFuncs.f \ Setup the line pointers and scroll bar for a new file ! needs Sub_Dirs.f \ Multi-Directory File processing needs Ed_Search.f \ Text Search functions needs Ed_KeyCMD.f \ Scrolling, ins/del lines & characters *************** *** 74,78 **** edit-window to EditWindow edit-window to DocWindow - console-window to ConsoleWindow ['] Mhedit-click SetClickFunc: EditWindow --- 74,77 ---- *************** *** 80,87 **** ['] Mhedit-track SetTrackFunc: EditWindow ['] Mhedit-dblclick SetDblClickFunc: EditWindow - ['] Mhedit-click SetClickFunc: ConsoleWindow - ['] Mhedit-unclick SetUnClickFunc: ConsoleWindow - ['] Mhedit-track SetTrackFunc: ConsoleWindow - ['] Mhedit-dblclick SetDblClickFunc: ConsoleWindow ['] wined_win32forth-message is win32forth-message --- 79,82 ---- *************** *** 108,133 **** load-more-defaults new-text - console-text make-new-text open-initial-file cursor-line find-top-margin - VPosition: EditWindow ! command-args c@ ! show-console? 0= AND ! IF StartConsole: EditorWindow ! THEN - show-console? - IF 0 VPosition: ConsoleWindow - THEN - show-console? \ if Forth is displayed - file-to-edit$ c@ 0= and \ and no file specified - minimized-EditWindow? or - minimized-ConsoleWindow? 0= and - IF SetFocus: ConsoleWindow - ConsoleWindow to DocWindow - ELSE SetFocus: EditWindow - EditWindow to DocWindow - THEN GetStack: DocWindow to entry# refresh-screen --- 103,113 ---- load-more-defaults new-text make-new-text open-initial-file cursor-line find-top-margin - VPosition: EditWindow ! SetFocus: EditWindow ! EditWindow to DocWindow GetStack: DocWindow to entry# refresh-screen Index: Ed_FrameWindowObj.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_FrameWindowObj.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Ed_FrameWindowObj.F 20 Jun 2005 07:40:44 -0000 1.4 --- Ed_FrameWindowObj.F 28 Aug 2005 07:28:06 -0000 1.5 *************** *** 54,69 **** 0 value hdraging? - : in-vdrag? ( -- f1 ) \ in vert drag bar - hWnd get-mouse-xy nip - drag-barV dup drag-thick + 2 + 1 - between - show-console? and ; - : in-hdrag? ( -- f1 ) \ in horizontal drag bar hWnd get-mouse-xy \ -- x y ;mouse position ! show-console? ! IF edit-top drag-barV between ! ELSE edit-top Height -status between ! THEN ! swap drag-barH dup drag-thick + 2 + between and ; --- 54,60 ---- 0 value hdraging? : in-hdrag? ( -- f1 ) \ in horizontal drag bar hWnd get-mouse-xy \ -- x y ;mouse position ! edit-top Height -status between swap drag-barH dup drag-thick + 2 + between and ; *************** *** 75,81 **** IF mousey drag-thick 2/ - Height drag-thick 2 + - -status 1 - 0max min ! StartSize: Win-EdToolbar nip max to drag-barV ! set-console-height ! drag-barV edit-top listHeightDefault + <= Hide: Subjectlist THEN hdraging? --- 66,70 ---- IF mousey drag-thick 2/ - Height drag-thick 2 + - -status 1 - 0max min ! \ drag-barV edit-top listHeightDefault + <= Hide: Subjectlist THEN hdraging? *************** *** 94,98 **** THEN true to mousedown? - in-vdrag? to vdraging? in-hdrag? to hdraging? MheditW-track ; --- 83,86 ---- *************** *** 106,125 **** false to hdraging? ; - : dbl-click-vdrag ( -- ) - show-console? 0= ?EXIT - in-vdrag? 0= ?EXIT - drag-barV drag-thick 2 / + - StartSize: Win-EdToolbar nip drag-thick + 2 + Height - -status 0max between - IF StartSize: Win-EdToolbar nip to drag-barV - ConsoleWindow to DocWindow - ELSE Height drag-thick 2 + - -status 1 - 0max to drag-barV - EditWindow to DocWindow - THEN GetStack: DocWindow to entry# - set-console-height - show-console? - IF drag-barV edit-top listHeightDefault + <= Hide: Subjectlist - THEN ; - : dbl-click-hdrag ( -- ) in-hdrag? 0= ?EXIT --- 94,97 ---- *************** *** 135,139 **** false to mousedown? mousey StartSize: Win-EdToolbar nip < ?EXIT - dbl-click-vdrag dbl-click-hdrag SetFocus: DocWindow --- 107,110 ---- *************** *** 158,177 **** On_Init: super \ first init super class Create: sFont \ create the font for file list ! second-copy? 0= ! show-console? and ! IF Height 4 / SetTopOf: ConsoleWindow \ set the console window's top ! 1 SetId: ConsoleWindow \ then the child window ! self Start: ConsoleWindow \ then startup child window ! 2 SetId: SplitterV ! self Start: SplitterV ! z" RMOT" @ ed-console-remote ! \ set remote IO operations ! ed-forth-count @ 0= ! IF z" HIDN" @ ed-console-hidden ! \ flag Forth to hide console ! StartUpForth ! ELSE 0 WM_REMOTEIO win32forth-message ! THEN ! ELSE ! FALSE to show-console? ! THEN min-tool-bar? IF min-Edit-Tool-Bar to Win-EdToolbar --- 129,133 ---- On_Init: super \ first init super class Create: sFont \ create the font for file list ! min-tool-bar? IF min-Edit-Tool-Bar to Win-EdToolbar *************** *** 203,208 **** max-ToolBar-Popup-bar SetPopupBar: max-Edit-Tool-Bar Edit-Popup-Bar SetPopupBar: EditWindow - Console-Popup-Bar SetPopupBar: ConsoleWindow - show-console? EnableDisplayMenu ;M --- 159,162 ---- *************** *** 223,227 **** : adjust-col/rows ( -- ) EditWindow set-col/rows ! ConsoleWindow set-col/rows ; :M SetMultiStatus: ( a1 n1 a2 n1 -- ) \ set the current text on statusbar --- 177,181 ---- : adjust-col/rows ( -- ) EditWindow set-col/rows ! ; :M SetMultiStatus: ( a1 n1 a2 n1 -- ) \ set the current text on statusbar *************** *** 255,266 **** StatusBuf +null StatusBuf 1+ 2 SetText: Win-EdStatusbar - s" Forth Instances: " StatusBuf place - ed-forth-count @ 0 (d.) StatusBuf +place - StatusBuf +null StatusBuf 1+ 3 SetText: Win-EdStatusbar - overstrike @ if s" <OvrStrk>" else s" <Insert>" then StatusBuf place ! StatusBuf +null StatusBuf 1+ 4 SetText: Win-EdStatusbar ;M --- 209,216 ---- StatusBuf +null StatusBuf 1+ 2 SetText: Win-EdStatusbar overstrike @ if s" <OvrStrk>" else s" <Insert>" then StatusBuf place ! StatusBuf +null StatusBuf 1+ 3 SetText: Win-EdStatusbar ;M *************** *** 276,287 **** :M Refresh: ( -- ) minimized? 0= ! IF show-console? ! IF Height console-height - StartSize: Win-EdToolbar nip max ! ELSE Height ! THEN to drag-barV ! drag-barH Width edit-min - 0max min to drag-barH edit-top SetTopOf: EditWindow - drag-barV SetTopOf: ConsoleWindow (( The peculiar calculations for window positions and sizes, result from the --- 226,232 ---- :M Refresh: ( -- ) minimized? 0= ! IF drag-barH Width edit-min - 0max min to drag-barH edit-top SetTopOf: EditWindow (( The peculiar calculations for window positions and sizes, result from the *************** *** 295,302 **** edit-top Width drag-barH drag-thick + - ! show-console? ! IF drag-barV edit-top - ! ELSE Height edit-top - -status ! THEN Move: EditWindow window-list BEGIN dup @ ?dup --- 240,245 ---- edit-top Width drag-barH drag-thick + - ! Height edit-top - -status ! Move: EditWindow window-list BEGIN dup @ ?dup *************** *** 305,312 **** IF 0 edit-top listHeight + dup>r drag-barH 1- ! show-console? ! IF drag-barV r> - ! ELSE Height r> - -status ! THEN Move: [ r@ ] THEN r>drop cell+ --- 248,253 ---- IF 0 edit-top listHeight + dup>r drag-barH 1- ! Height r> - -status ! Move: [ r@ ] THEN r>drop cell+ *************** *** 315,331 **** drag-barH 1- edit-top 1- drag-thick 2 + ! show-console? ! IF drag-barV edit-top - 2 + ! ELSE Height edit-top - 2 + -status ! THEN Move: SplitterH ! ! show-console? ! IF all-lines: ConsoleWindow ! -1 drag-barV ! Width 2 + drag-thick 2 + Move: SplitterV ! ! -1 drag-barV drag-thick + 2 + dup>r ! Width 2 + Height r> - -status Move: ConsoleWindow ! THEN Showing: SubjectList --- 256,261 ---- drag-barH 1- edit-top 1- drag-thick 2 + ! Height edit-top - 2 + -status ! Move: SplitterH Showing: SubjectList *************** *** 341,346 **** Floating: Win-EdToolbar 0= and IF TRUE to tool-bar? - GetSize: EditorWindow nip 2/ to drag-barV - set-console-height self Start: Win-EdToolbar \ then startup child window LoadFindStrings --- 271,274 ---- *************** *** 377,415 **** ;M - :M StartConsole: ( -- ) - second-copy? 0= - IF Height 4 / \ console is a quarter screen - SetTopOf: ConsoleWindow \ set the console window's top - self Start: ConsoleWindow \ then startup child window - self Start: SplitterV - TRUE to show-console? \ must be before the ">F" below - console-text - end-doc - TRUE EnableDisplayMenu - >F - Refresh: self - z" RMOT" @ ed-console-remote ! \ set remote IO operations - ed-forth-count @ 0= - IF z" HIDN" @ ed-console-hidden ! \ flag Forth to hide console - StartUpForth - ELSE 0 WM_REMOTEIO win32forth-message - THEN - ELSE FALSE to show-console? - THEN - ;M - - :M CloseConsole: ( -- ) - save-console - FALSE to show-console? - >E-unminimize - Close: ConsoleWindow - Close: SplitterV - FALSE EnableDisplayMenu - Refresh: self - Retitle: [ self ] - 0 ed-console-remote ! - 0 ed-console-hidden ! - ;M - :M On_Done: ( h m w l -- res ) Delete: sFont --- 305,308 ---- *************** *** 484,488 **** Top: ClientRect Bottom: ClientRect between swap Left: ClientRect Right: ClientRect between and ! IF in-vdrag? IF splitv-cursor 1 ELSE in-hdrag? --- 377,381 ---- Top: ClientRect Bottom: ClientRect between swap Left: ClientRect Right: ClientRect between and ! IF false IF splitv-cursor 1 ELSE in-hdrag? *************** *** 503,516 **** entry# >r \ save entry ! entry# entry-console = ! IF s" Win32Forth Console" title$ lplace ! ELSE GetStack: EditWindow to entry# ! Edname$ count title$ lplace ! (.wined_version) title$ +lplace ! s" - " title$ +lplace ! from-web? ! IF URL$ lcount title$ +lplace ! ELSE cur-filename count title$ +lplace ! THEN THEN title$ lcount 255 min SetTitle: self --- 396,406 ---- entry# >r \ save entry ! GetStack: EditWindow to entry# ! Edname$ count title$ lplace ! (.wined_version) title$ +lplace ! s" - " title$ +lplace ! from-web? ! IF URL$ lcount title$ +lplace ! ELSE cur-filename count title$ +lplace THEN title$ lcount 255 min SetTitle: self *************** *** 604,608 **** :M WM_DROPFILES { hndl message wParam lParam \ cFiles drop$ -- res } MAXSTRING LocalAlloc: drop$ ! >E-unminimize SetForegroundWindow: self 0 --- 494,498 ---- :M WM_DROPFILES { hndl message wParam lParam \ cFiles drop$ -- res } MAXSTRING LocalAlloc: drop$ ! >E SetForegroundWindow: self 0 *************** *** 626,629 **** RefreshOn: EditWindow ;M - - |
|
From: Dirk B. <db...@us...> - 2005-08-28 07:28:15
|
Update of /cvsroot/win32forth/win32forth/apps/WinEd/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24685/apps/WinEd/res Modified Files: WinEdit.res Log Message: Removed WinEd's internal console window. Index: WinEdit.res =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/res/WinEdit.res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvshYwfj7 and /tmp/cvsYGlBro differ |
|
From: Dirk B. <db...@us...> - 2005-08-27 10:10:22
|
Update of /cvsroot/win32forth/win32forth/apps/WinEd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30083/apps/WinEd Removed Files: WinEd_Menu.f Log Message: Removed some obsolate files from WinEd --- WinEd_Menu.f DELETED --- |
|
From: Dirk B. <db...@us...> - 2005-08-27 09:51:06
|
Update of /cvsroot/win32forth/win32forth/apps/WinEd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26730/apps/WinEd Removed Files: WINED_VERSION.F WinEd_Statbar.f WinEd_Toolbar.f Log Message: Removed some obsolate files from WinEd --- WinEd_Statbar.f DELETED --- --- WinEd_Toolbar.f DELETED --- --- WINED_VERSION.F DELETED --- |
|
From: Dirk B. <db...@us...> - 2005-08-27 09:17:42
|
Update of /cvsroot/win32forth/win32forth/apps/WinEd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21156/apps/WinEd Removed Files: EdDebug.f EdFindInFiles.f EdRemote.f smart-cr.f Log Message: Removed some obsolate files from WinEd --- EdDebug.f DELETED --- --- EdFindInFiles.f DELETED --- --- smart-cr.f DELETED --- --- EdRemote.f DELETED --- |
|
From: Dirk B. <db...@us...> - 2005-08-27 09:02:18
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18336/src Modified Files: FLOAT.F numconv.f Log Message: Changed NUMBER? to be compatible with older w32f versions. Our current NUMBER? didn't accept "dotted numbers" (like 1.0) in older versions "dotted numbers" were accepted as valid numbers. Index: FLOAT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/FLOAT.F,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** FLOAT.F 31 Jul 2005 07:43:19 -0000 1.14 --- FLOAT.F 27 Aug 2005 09:02:10 -0000 1.15 *************** *** 1833,1836 **** --- 1833,1838 ---- drop 1- charcnt @ 1+ number? + double? 0= and \ October 1st, 1996 - 10:51 tjz & am + \ double exponent not allowed IF d>s r> IF negate *************** *** 2339,2343 **** L$2: next, end-code - - - |
|
From: George H. <geo...@us...> - 2005-08-24 07:24:18
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22107/win32forth/src Modified Files: BUTTON.F Log Message: gah: changed to use :noname instead of docol (for STC) and moved some code to system space Index: BUTTON.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/BUTTON.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BUTTON.F 21 Dec 2004 00:19:07 -0000 1.1 --- BUTTON.F 24 Aug 2005 07:24:10 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + \ $Id$ \ button.f *************** *** 389,393 **** |CLASS AddButton <Super Button ! :M ClassInit: ( -- ) ClassInit: super GetBar: BuildBar to bprev \ end of link is NULL --- 390,399 ---- |CLASS AddButton <Super Button ! in-system ! ! warning off ! ! : (ClassInit) ( -- ) ! [ warning on ] ClassInit: super GetBar: BuildBar to bprev \ end of link is NULL *************** *** 403,410 **** here to title ,"text" GetBCnt: BuildBar 1+ PutBCnt: BuildBar \ bump count ! here to bfunc ! hide !csp docol , ] ! ;M ;Class --- 409,420 ---- here to title ,"text" GetBCnt: BuildBar 1+ PutBCnt: BuildBar \ bump count ! :noname to bfunc ! hide !csp ! ; + in-application + + :m ClassInit: ( -- ) + \in-system-ok (ClassInit) ;m ;Class *************** *** 431,435 **** ;M ! :M ClassInit: ( x y width height -- ) ClassInit: super to bheight --- 441,450 ---- ;M ! in-system ! ! warning off ! ! : (ClassInit) ( x y width height -- ) ! [ warning on ] ClassInit: super to bheight *************** *** 465,471 **** here to title ,"text" GetBCnt: BuildBar 1+ PutBCnt: BuildBar \ bump count ! here to bfunc ! hide !csp docol , ] ! ;M ;Class --- 480,491 ---- here to title ,"text" GetBCnt: BuildBar 1+ PutBCnt: BuildBar \ bump count ! :noname to bfunc ! hide !csp ! ; ! ! in-application ! ! :M ClassInit: ( x y width height -- ) ! \in-system-ok (ClassInit) ;m ;Class *************** *** 777,781 **** int picture-number ! :M ClassInit: ( n1 -- ) to picture-number ClassInit: super --- 797,806 ---- int picture-number ! in-system ! ! warning off ! ! : (ClassInit) ( n1 -- ) ! [ warning on ] to picture-number ClassInit: super *************** *** 794,800 **** here to title 0 , GetBCnt: BuildBar 1+ PutBCnt: BuildBar \ bump count ! here to bfunc ! hide !csp docol , ] ! ;M WinDC dc \ The window's device context --- 819,829 ---- here to title 0 , GetBCnt: BuildBar 1+ PutBCnt: BuildBar \ bump count ! :noname to bfunc ! hide !csp ! ; ! ! in-application ! :m ClassInit: ( n1 -- ) ! \in-system-ok (Classinit) ;m WinDC dc \ The window's device context *************** *** 962,964 **** - |
|
From: George H. <geo...@us...> - 2005-08-24 07:23:25
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21943/win32forth/src Modified Files: Menu.f Log Message: gah: changed to use :noname instead of docol (for STC) Index: Menu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/Menu.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Menu.f 20 Jun 2005 07:40:46 -0000 1.2 --- Menu.f 24 Aug 2005 07:23:16 -0000 1.3 *************** *** 259,264 **** ClassInit: super NextId to mid ! here to mfunc ! hide !csp docol , ] BREAK_FLAG to BROKEN_FLAG 0 to BREAK_FLAG --- 259,264 ---- ClassInit: super NextId to mid ! :noname to mfunc ! hide !csp BREAK_FLAG to BROKEN_FLAG 0 to BREAK_FLAG *************** *** 536,541 **** ClassInit: super m"text" ! here to mfunc ! hide !csp docol , ] ; --- 536,541 ---- ClassInit: super m"text" ! :noname to mfunc ! hide !csp ; *************** *** 625,627 **** MODULE \ end of the module - |
1040 messages has been excluded from this view by a project administrator.
