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: Ezra B. <ezr...@us...> - 2008-10-01 03:17:13
|
Update of /cvsroot/win32forth/win32forth/Help/html/IDE In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18462/Help/html/IDE Modified Files: Navigator.gif ProjectTab.gif Log Message: Doc updates. EAB Index: Navigator.gif =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/Navigator.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsRS06Tp and /tmp/cvsuui2fy differ Index: ProjectTab.gif =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/ProjectTab.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsCLcA2p and /tmp/cvsUUflpy differ |
|
From: Ezra B. <ezr...@us...> - 2008-10-01 03:15:32
|
Update of /cvsroot/win32forth/win32forth/Help/html/IDE In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18386/Help/html/IDE Modified Files: Code Window.htm Editor.htm Form Designer.htm IDE.htm IDEMenus.htm IDEToolbar.htm Project Navigator.htm ProjectManager.htm Splitter Windows.htm Using Forms.htm Log Message: Doc updates. EAB Index: IDE.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/IDE.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IDE.htm 27 Aug 2008 11:30:14 -0000 1.2 --- IDE.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 13,22 **** <p>The IDE has a number of other features that the user might find helpful.</p> ! <p><b>"View Source For"</b> - typing a word in this textbox in the toolbar and ! pressing "Enter" will search open the source for word if it is defined and ! position the cursor on the line where it it defined. Handy for quick look-ups ! when you can't remember the syntax for a word. Notice that you can also use ! Help or select a word and get help for it with Ctrl+F1 . This is usually faster ! and works with a large number of Forth and Libraries words.</p> <p><b>"Directory viewer"</b> from the TabWindow-</p> --- 13,20 ---- <p>The IDE has a number of other features that the user might find helpful.</p> ! <p><b>"Help on:"</b> - typing a word in this textbox in the toolbar and ! pressing "Enter" will open Help on the word. You can also use ! Help or select a word and get help for it with Ctrl+F1 . This works with a ! large number of Forth and Libraries words.</p> <p><b>"Directory viewer"</b> from the TabWindow-</p> *************** *** 56,60 **** vocabularies listing is replaced by words families, classes are shown in a top down treeview and methods are listed. You might find Help displays more meaningful ! depending of your current knowledge of Win32Forth.</p> <img src="ClassesTab.gif" alt="" border="0"> --- 54,58 ---- vocabularies listing is replaced by words families, classes are shown in a top down treeview and methods are listed. You might find Help displays more meaningful ! information depending of your current knowledge of Win32Forth.</p> <img src="ClassesTab.gif" alt="" border="0"> Index: Project Navigator.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/Project Navigator.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Project Navigator.htm 27 Aug 2008 11:30:14 -0000 1.2 --- Project Navigator.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 18,22 **** <p>In the IDE Preferences Dialog an option is available to allow or prevent the inclusion of library files when tracking code in a project. Usually you ! will not put this option ON as you are not to edit theese sources and as Help is able to provide any needed information about the win32Forth and Libraries words.</p> --- 18,22 ---- <p>In the IDE Preferences Dialog an option is available to allow or prevent the inclusion of library files when tracking code in a project. Usually you ! will not put this option ON as you are not to edit these sources and as Help is able to provide any needed information about the win32Forth and Libraries words.</p> *************** *** 28,32 **** <p>The root item is the name of the current project. Tracking a project (click the <b>track</b> button) scans all the files in a project and builds the Navigator tree ! from the code.</p> <p>Code is separated into objects and classes, global (i.e not private to a class --- 28,34 ---- <p>The root item is the name of the current project. Tracking a project (click the <b>track</b> button) scans all the files in a project and builds the Navigator tree ! from the code. If no project is opened any source files opened in the IDE will ! be indexed. Pressing the control key while clicking the track button will ! build the tree from opened source files even if a project is opened.</p> <p>Code is separated into objects and classes, global (i.e not private to a class *************** *** 37,54 **** file and position the cursor at the line number where the code is located.</p> ! <p>Note that in the methods tree the item in brackets is the parent class or object ! of the method.</p> <br> - <p>In the bottom window of the Project Navigator is the Bookmark window. This - allows setting markers in source files and the quick return to specific - points in such files.</p> - - <p>Click <b>Add Bookmark</b> to set a marker at the current point in a source file. - To return to that point simply click the line text in the listbox.</p> - - <p><b>Clear Bookmarks</b> clears all bookmarks.</p> - - <hr> --- 39,46 ---- file and position the cursor at the line number where the code is located.</p> ! <p>Note that in the methods/private definitions/private data tree the item in ! brackets is the parent class/object of the method/definition/data.</p> <br> <hr> Index: Form Designer.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/Form Designer.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Form Designer.htm 27 Aug 2008 11:30:14 -0000 1.2 --- Form Designer.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 15,19 **** <p>Form Designer is based on the stand-alone ForthForm application <IMG SRC="Forthform.gif" NAME="Graphic1" >. ! All the functionality of ForthForm are included in Form Designer.</p> <br> --- 15,19 ---- <p>Form Designer is based on the stand-alone ForthForm application <IMG SRC="Forthform.gif" NAME="Graphic1" >. ! All the functionality of ForthForm is included in Form Designer.</p> <br> Index: Code Window.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/Code Window.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Code Window.htm 27 Aug 2008 11:30:13 -0000 1.2 --- Code Window.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 60,67 **** <ul> ! <li><b>Refresh</b> - updates the window with any added controls or forms. Typically, this ! is done automatically.</li> ! <li><b>Save Code</b> - saves any entered code. Normally any code added is saved automaticaly, but it is a good idea to save after editing.</li> --- 60,67 ---- <ul> ! <li><b>Refresh</b> - updates the window with any added controls or forms. Normally ! this should not be necessary.</li> ! <li><b>Save Code</b> - saves any entered code. Any code added is saved automaticaly, but it is a good idea to save after editing.</li> *************** *** 73,77 **** tested from a fresh Win32Forth instance.</li> ! <li><b>Close</b> - close the Forms Code Window. The Code Window will also be closed when the last form is closed.</li> </ul> --- 73,77 ---- tested from a fresh Win32Forth instance.</li> ! <li><b>Close</b> - close the Forms Code Window. THis window will also be closed when the last form is closed.</li> </ul> Index: Using Forms.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/Using Forms.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Using Forms.htm 27 Aug 2008 11:30:15 -0000 1.2 --- Using Forms.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 102,110 **** :M On_Init: ( -- ) \ modify the behaviour of some controls On_Init: Super \ initialize form false Enable: chkButton \ disable this one - IDOK SetID: btnOk \ change this id \ and anything else you wish --- 102,111 ---- :M On_Init: ( -- ) \ modify the behaviour of some controls + IDOK SetID: btnOk \ change this id before starting the control + On_Init: Super \ initialize form false Enable: chkButton \ disable this one \ and anything else you wish *************** *** 167,171 **** <b>#Dirs:, #Files:</b> return the number of directories or files respectively. ! For further information please browse the file FileLister.f. Following are some other control methods that may be useful in forms. --- 168,172 ---- <b>#Dirs:, #Files:</b> return the number of directories or files respectively. ! For further information please browse the file Folderview.f. Following are some other control methods that may be useful in forms. Index: IDEMenus.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/IDEMenus.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IDEMenus.htm 27 Aug 2008 11:30:14 -0000 1.2 --- IDEMenus.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 158,161 **** --- 158,162 ---- <ul> <li>Compile and debugger commands</li> + <li>Bookmark management</li> </ul> Index: Splitter Windows.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/Splitter Windows.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Splitter Windows.htm 27 Aug 2008 11:30:15 -0000 1.2 --- Splitter Windows.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 25,30 **** <p>The default action is to test a selected template. Other options are to copy the template code to the clipboard for pasting in other source code, and to edit ! the code using the form editor. If you want to save the source code to a file ! you can do so from the form editor.</p> <hr> --- 25,30 ---- <p>The default action is to test a selected template. Other options are to copy the template code to the clipboard for pasting in other source code, and to edit ! the code using the IDE editor. If you want to save the source code to a file ! you can do so from the IDE editor.</p> <hr> Index: IDEToolbar.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/IDEToolbar.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IDEToolbar.htm 27 Aug 2008 11:30:14 -0000 1.2 --- IDEToolbar.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 14,19 **** <p>The IDE rebar allows one-click access to many of the IDE functions. It consists of three parts, (1) The Editor toolbar, (2) The Project Manager toolbar and (3) a ! combobox that allows a file containing a source word to be opened at the point ! where the word is defined. </p> <img src="IDEToolbar.gif" alt="" border="0"><br><br> --- 14,18 ---- <p>The IDE rebar allows one-click access to many of the IDE functions. It consists of three parts, (1) The Editor toolbar, (2) The Project Manager toolbar and (3) a ! combobox that allows help to be quickly found for a word. </p> <img src="IDEToolbar.gif" alt="" border="0"><br><br> *************** *** 41,51 **** <p>The drop down combobox control located in a rebar control can be used to quickly ! view the source for a word. Simply type the word in the box and press enter. If ! valid, the file containing the source for the word will be open at the point ! where the word is defined.</p> ! <p>Notice that you can also use Help or select a word and get help for it with ! Ctrl+F1 . This is usually faster and works with a large number of Forth and ! Libraries words.</p> <hr> --- 40,48 ---- <p>The drop down combobox control located in a rebar control can be used to quickly ! get help for a word. Simply type the word in the box and press enter. If ! valid, Help will be opened on the word.</p> ! <p>Notice that you can also select a word in a file and get help for it with ! Ctrl+F1 . This works with a large number of Forth and Libraries words.</p> <hr> Index: Editor.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/Editor.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Editor.htm 27 Aug 2008 11:30:14 -0000 1.2 --- Editor.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 50,55 **** only mode.</p> ! <p>You can check, in the lower left corner of the status bar, if a file is opened ! for editing or browsing. Only one browsed file is opened at a time.</p> <p>Optional create backup file when saving.</p> --- 50,56 ---- only mode.</p> ! <p>You can check, in the lower left corner of the status bar, or by the color of ! the window, if a file is opened for editing or browsing. These colors can be set ! in the preferences dialog.</p> <p>Optional create backup file when saving.</p> Index: ProjectManager.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/Help/html/IDE/ProjectManager.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProjectManager.htm 27 Aug 2008 11:30:15 -0000 1.2 --- ProjectManager.htm 1 Oct 2008 03:15:20 -0000 1.3 *************** *** 63,66 **** --- 63,68 ---- <ul> <li><b>New</b> - start a new project.</li> + + <li><b>Close</b> - close the current project.</li> <li><b>Open</b> - open a previously saved project. The name of the opened project |
|
From: Ezra B. <ezr...@us...> - 2008-10-01 03:13:03
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18290/apps/Win32ForthIDE Modified Files: Main.f Log Message: Bug fix for ?control. Minor updates. EAB Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Main.f 8 Sep 2008 03:06:13 -0000 1.59 --- Main.f 1 Oct 2008 03:12:51 -0000 1.60 *************** *** 199,202 **** --- 199,205 ---- then ; + : control-key? ( -- f ) \ console not available in IDE so ?control doesn't work + VK_CONTROL Call GetKeyState 0x8000 and ; + \ ************************************************************************************ *************** *** 646,650 **** ELSE GetID: HelpBox = if over HIWORD CBN_SELCHANGE = ! if GetSelectedString: HelpBox ?viewsource then else OnWmCommand: Super \ intercept Menu commands --- 649,653 ---- ELSE GetID: HelpBox = if over HIWORD CBN_SELCHANGE = ! if GetSelectedString: HelpBox GetSomeHelp then else OnWmCommand: Super \ intercept Menu commands *************** *** 1227,1231 **** ; ! sysgen [if] : InitDir ( -- ) current-dir$ count SetDir: SourceFileOpenDialog ; --- 1230,1234 ---- ; ! [defined] sysgen [if] : InitDir ( -- ) current-dir$ count SetDir: SourceFileOpenDialog ; |
|
From: Ezra B. <ezr...@us...> - 2008-10-01 03:10:27
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18195/apps/Win32ForthIDE Modified Files: ProjectWindow.f Log Message: Bug fix for ?control. Minor updates. EAB Index: ProjectWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectWindow.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProjectWindow.f 11 Sep 2008 03:22:35 -0000 1.2 --- ProjectWindow.f 1 Oct 2008 03:10:14 -0000 1.3 *************** *** 169,173 **** _colon _code _value _variable _constant _method _class _object _create _int _bytes _short ! _dint _byte _2value ; \ enumerate parent ids --- 169,173 ---- _colon _code _value _variable _constant _method _class _object _create _int _bytes _short ! _dint _byte _2value _fvariable _fconstant _fvalue ; \ enumerate parent ids *************** *** 432,435 **** --- 432,438 ---- s" create" "of _create add-data EndOf s" 2value" "of _2value add-data EndOf + s" fvalue" "of _fvalue add-data EndOf + s" fvariable" "of _fvariable add-data EndOf + s" fconstant" "of _fconstant add-data EndOf s" int" "of in-class? if _int add-data then EndOf *************** *** 632,640 **** loop ; ! : BuildNavigatorTree ( -- ) Clear: NavigatorTree ! GetBuildFile: TheProject nip if Track-Project-Files ! else GetTabCount: OpenFilesTab 0> if Track-Opened-Files then --- 635,646 ---- loop ; ! : BuildNavigatorTree { \ open? -- } ! GetTabCount: OpenFilesTab 0> to open? Clear: NavigatorTree ! control-key? open? and \ force tracking of opened files if control key pressed ! if Track-Opened-Files exit ! then GetBuildFile: TheProject nip if Track-Project-Files ! else open? if Track-Opened-Files then |
|
From: Ezra B. <ezr...@us...> - 2008-10-01 03:09:04
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18122/apps/Win32ForthIDE Modified Files: EdFormWindow.f EdToolbar.f Log Message: Bug fix for ?control. Minor updates. EAB Index: EdToolbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdToolbar.f,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** EdToolbar.f 3 Aug 2008 10:56:42 -0000 1.14 --- EdToolbar.f 1 Oct 2008 03:08:51 -0000 1.15 *************** *** 312,316 **** eraseband-info GetHandle: helpbox ! z" View Source for:" to lptext [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 150 insert-band ; --- 312,316 ---- eraseband-info GetHandle: helpbox ! z" Help on:" to lptext [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 150 insert-band ; *************** *** 349,365 **** ;object ! : $browse ( line_number file_name len -- ) ! NewBrowseChild LoadHyperFile: ActiveBrowser ! SetBrowseMode: ActiveBrowser Update ; ! ! : ?viewsource { addr cnt -- } ! \in-system-ok addr cnt "CLIP" "anyfind \ find it if it exist \ ! if ! \in-system-ok get-viewfile ! if count $browse ! else 2drop ! then addr cnt InsertString: helpbox \ save help string as entered ! else drop beep ! then ; \ copied from WinED --- 349,369 ---- ;object ! : GetSomeHelp { addr cnt \ cfa -- } ! \in-system-ok addr cnt "CLIP" "anyfind \ find it if it exist \ ! swap to cfa ! if addr cnt InsertString: helpbox \ save string ! 0 0 ExecHelp drop \ launch help or put it in front ! addr cnt msgpad place \ try to show word from help ! msgpad dup c@ 1+ WM_WORDHELP w32fHelp Sendw32fMsg ! 0= \ if not in help database, show source ! if cfa ! \in-system-ok get-viewfile ! drop count ! rot msgpad ! ! dup 1+ >r msgpad cell+ place ! msgpad r> cell+ WM_LINEFILE w32fHelp Sendw32fMsg drop ! then ! else beep ! then ; \ copied from WinED *************** *** 367,371 **** 2 pick VK_RETURN = \ if return if GetText: [ ] \ get adr,len of edit control text ! ?viewsource false else drop true --- 371,375 ---- 2 pick VK_RETURN = \ if return if GetText: [ ] \ get adr,len of edit control text ! GetSomeHelp false else drop true *************** *** 374,378 **** ' myWmChar SetWmChar: helpbox - \ ----------------------------------------------------------------------------------- \ ----------------------------------------------------------------------------------- --- 378,381 ---- Index: EdFormWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdFormWindow.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdFormWindow.f 24 Aug 2008 05:07:27 -0000 1.3 --- EdFormWindow.f 1 Oct 2008 03:08:51 -0000 1.4 *************** *** 1,3 **** ! \ COLOR_BTNFACE Call GetSysColor new-color BTNFACE load-bitmap formbitmap "res\FFBITMAPS.BMP" --- 1,3 ---- ! \ EdFormWindow.f load-bitmap formbitmap "res\FFBITMAPS.BMP" *************** *** 6,10 **** load-bitmap PictureBitmap "picture.bmp" - :Object FormBar <Super Win32Toolbar --- 6,9 ---- *************** *** 151,155 **** : ?TypeTextBox ( -- type ) ! ?control \ control key pressed while buttonclicked? if TypeMultiLineBox else TypeTextBox --- 150,154 ---- : ?TypeTextBox ( -- type ) ! control-key? \ control key pressed while buttonclicked? if TypeMultiLineBox else TypeTextBox *************** *** 157,161 **** : ?TypeLabel ( -- type ) ! ?control \ control key pressed while buttonclicked? if TypeStaticBitmap else TypeLabel --- 156,160 ---- : ?TypeLabel ( -- type ) ! control-key? \ control key pressed while buttonclicked? if TypeStaticBitmap else TypeLabel *************** *** 163,167 **** : ?TypeComboBox ( -- type ) ! ?control \ control key pressed while buttonclicked? if TypeComboListBox else TypeComboBox --- 162,166 ---- : ?TypeComboBox ( -- type ) ! control-key? \ control key pressed while buttonclicked? if TypeComboListBox else TypeComboBox *************** *** 169,173 **** : ?TypeListBox ( -- type ) ! ?control \ control key pressed while buttonclicked? if TypeMultiListBox else TypeListBox --- 168,172 ---- : ?TypeListBox ( -- type ) ! control-key? \ control key pressed while buttonclicked? if TypeMultiListBox else TypeListBox *************** *** 200,214 **** :M WM_COMMAND ( hwnd msg wparam lparam -- res ) ! ?dup 0= ! if LOWORD ! CurrentMenu ! if dup DoMenu: CurrentMenu ! then ! CurrentPopup ! if dup DoMenu: CurrentPopup ! then drop ! else over HIWORD ( notification code ) rot LOWORD ( ID ) ! On_Command: [ self ] ! then 0 ;M --- 199,204 ---- :M WM_COMMAND ( hwnd msg wparam lparam -- res ) ! over HIWORD ( notification code ) rot LOWORD ( ID ) ! On_Command: self 0 ;M *************** *** 249,263 **** :M WM_COMMAND ( hwnd msg wparam lparam -- res ) ! ?dup 0= ! if LOWORD ! CurrentMenu ! if dup DoMenu: CurrentMenu ! then ! CurrentPopup ! if dup DoMenu: CurrentPopup ! then drop ! else over HIWORD ( notification code ) rot LOWORD ( ID ) ! On_Command: [ self ] ! then 0 ;M --- 239,244 ---- :M WM_COMMAND ( hwnd msg wparam lparam -- res ) ! over HIWORD ( notification code ) rot LOWORD ( ID ) ! On_Command: self 0 ;M |
|
From: Jos v.d.V. <jo...@us...> - 2008-09-16 04:18:46
|
Update of /cvsroot/win32forth/win32forth/apps/Internet/WebServer In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16946 Modified Files: WebServer.F Log Message: Jos: Updated to the current state of Win32Forth Index: WebServer.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Internet/WebServer/WebServer.F,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WebServer.F 16 Aug 2008 13:31:35 -0000 1.5 --- WebServer.F 16 Sep 2008 11:18:40 -0000 1.6 *************** *** 80,88 **** create-turnkey? [IF] - in-console - \ and create the application &forthdir count &appdir place \ in the Forth-directory ! 0 0 ' www-server APPLICATION WebServer.exe 1 pause-seconds bye --- 80,86 ---- create-turnkey? [IF] \ and create the application &forthdir count &appdir place \ in the Forth-directory ! ' www-server SAVE WebServer.exe 1 pause-seconds bye |
|
From: Jos v.d.V. <jo...@us...> - 2008-09-16 01:39:45
|
Update of /cvsroot/win32forth/win32forth/src/console In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16308 Modified Files: CommandWindow.f Log Message: Jos: Reduces elapsed time of the ConsoleTest from 00:02:51.443 to 00:01:46.566. That is +/- 38% faster. Index: CommandWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/CommandWindow.f,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** CommandWindow.f 29 Aug 2008 08:55:18 -0000 1.18 --- CommandWindow.f 16 Sep 2008 08:39:40 -0000 1.19 *************** *** 5,9 **** \ Features: \ ! \ Action when enter is pressed is deferred \ Font changeable \ Key buffer --- 5,9 ---- \ Features: \ ! \ Action when enter is pressed is deferred \ Font changeable \ Key buffer *************** *** 47,50 **** --- 47,52 ---- int text \ pointer to text buffer int MaxText \ size of text buffer allocated + int NewLine \ To reduce calculations in paint + : TextEnd ( -- a ) text zcount + ; : RowAddress ( row -- a ) \ address of text at beginning of row *************** *** 242,246 **** \ :M VisibleCols: ( -- cols ) width iLeftMargin - iRightMargin - HorzLine / ;M ! :M VisibleCols: ( -- cols ) \ number of columns visible if vertical scrollbar were present GetWindowRect: self drop nip swap - SM_CXVSCROLL call GetSystemMetrics - --- 244,248 ---- \ :M VisibleCols: ( -- cols ) width iLeftMargin - iRightMargin - HorzLine / ;M ! :M VisibleCols: ( -- cols ) \ number of columns visible if vertical scrollbar were present GetWindowRect: self drop nip swap - SM_CXVSCROLL call GetSystemMetrics - *************** *** 276,280 **** r> ScrollPos.top + ; ! :M UpdateVScroll: ( -- ) Top: ScrollPos negate to nPos Top: ScrollRange to nMin --- 278,282 ---- r> ScrollPos.top + ; ! :M UpdateVScroll: ( -- ) Top: ScrollPos negate to nPos Top: ScrollRange to nMin *************** *** 287,291 **** ;M ! :M UpdateHScroll: ( -- ) Left: ScrollPos negate to nPos Left: ScrollRange to nMin --- 289,293 ---- ;M ! :M UpdateHScroll: ( -- ) Left: ScrollPos negate to nPos Left: ScrollRange to nMin *************** *** 304,308 **** Bottom: ScrollRange - Top: ScrollPos - max dup ScrollPos 4 + +! 0 swap Scroll: self ! \ Update: self UpdateVScroll: self THEN --- 306,310 ---- Bottom: ScrollRange - Top: ScrollPos - max dup ScrollPos 4 + +! 0 swap Scroll: self ! \ Update: self UpdateVScroll: self THEN *************** *** 318,322 **** SB_PAGEUP OF VertPage ENDOF SB_THUMBTRACK OF dup negate Top: ScrollPos - ENDOF ! ( default case) 0 swap ENDCASE VScroll --- 320,324 ---- SB_PAGEUP OF VertPage ENDOF SB_THUMBTRACK OF dup negate Top: ScrollPos - ENDOF ! ( default case) 0 swap ENDCASE VScroll *************** *** 328,334 **** IF Left: ScrollPos negate min Right: ScrollPage ! Right: ScrollRange - Left: ScrollPos - max dup ScrollPos +! 0 Scroll: self ! Update: self UpdateHScroll: self THEN --- 330,336 ---- IF Left: ScrollPos negate min Right: ScrollPage ! Right: ScrollRange - Left: ScrollPos - max dup ScrollPos +! 0 Scroll: self ! Update: self UpdateHScroll: self THEN *************** *** 350,354 **** ;M ! :M WM_MOUSEWHEEL ( h m w l -- res ) over word-split 32768 and \ get the Key flags (loword of wParam) and the WHEEL_DELTA (hiword of wParam) \ A positive value indicates that the wheel was rotated forward, away --- 352,356 ---- ;M ! :M WM_MOUSEWHEEL ( h m w l -- res ) over word-split 32768 and \ get the Key flags (loword of wParam) and the WHEEL_DELTA (hiword of wParam) \ A positive value indicates that the wheel was rotated forward, away *************** *** 423,427 **** : SetCaretPosition ( -- ) \ needs dc, also sets an update rectangle to end of line \ X Y ColRow>xy ScrollAdjust ! SelEndX SelEndY ScrollAdjust \ as long as SetSelectionStart is done first dup VertLine + width swap SetRect: CaretPos cursor-on? IF CaretPos.top CaretPos.left call SetCaretPos drop THEN --- 425,429 ---- : SetCaretPosition ( -- ) \ needs dc, also sets an update rectangle to end of line \ X Y ColRow>xy ScrollAdjust ! SelEndX SelEndY ScrollAdjust \ as long as SetSelectionStart is done first dup VertLine + width swap SetRect: CaretPos cursor-on? IF CaretPos.top CaretPos.left call SetCaretPos drop THEN *************** *** 435,439 **** : SCP ( -- ) \ SetCommandPosition ! get-dc hFont SetFont: dc X Y SetSelectionStart SetCaretPosition --- 437,441 ---- : SCP ( -- ) \ SetCommandPosition ! get-dc hFont SetFont: dc X Y SetSelectionStart SetCaretPosition *************** *** 447,451 **** : UpdateRange ( SelStartCol SelStartRow SelEndCol SelEndRow f -- ) >r 2>r ! get-dc hFont SetFont: dc ColRow>XY ScrollAdjust 2r> ColRow>XY VertLine + ScrollAdjust r> UpdateRectangle release-dc --- 449,453 ---- : UpdateRange ( SelStartCol SelStartRow SelEndCol SelEndRow f -- ) >r 2>r ! get-dc hFont SetFont: dc ColRow>XY ScrollAdjust 2r> ColRow>XY VertLine + ScrollAdjust r> UpdateRectangle release-dc *************** *** 516,524 **** BackgroundColour SetBkColor: dc \ Calculate the size of the text then draw it DRAWTEXTPARAMS DT_CALCRECT DT_EXPANDTABS or DT_TABSTOP or DT_NOPREFIX or ! ScrollRange -1 Text GetHandle: dc call DrawTextEx VertLine / to lines DRAWTEXTPARAMS DT_NOCLIP DT_EXPANDTABS or DT_TABSTOP or DT_NOPREFIX or ! ScrollPos -1 Text GetHandle: dc call DrawTextEx drop \ Draw highlighted text if any --- 518,528 ---- BackgroundColour SetBkColor: dc + NewLine if \ Calculate the size of the text then draw it DRAWTEXTPARAMS DT_CALCRECT DT_EXPANDTABS or DT_TABSTOP or DT_NOPREFIX or ! ScrollRange -1 Text GetHandle: dc call DrawTextEx VertLine / to lines false to NewLine ! then DRAWTEXTPARAMS DT_NOCLIP DT_EXPANDTABS or DT_TABSTOP or DT_NOPREFIX or ! ScrollPos -1 Text GetHandle: dc call DrawTextEx drop \ Draw highlighted text if any *************** *** 563,567 **** : GetColRow ( X Y -- col row ) \ needs dc ScrollRange.bottom min scrollpos.top - VertLine / lines 1- min 0max >r ! ScrollRange.right iRightMargin - ( HorzLine + ) min scrollpos.left - iLeftMargin - r@ RowAddress r@ RowLength GetTabbedCharsFromPoint r@ RowLength min r> ; --- 567,571 ---- : GetColRow ( X Y -- col row ) \ needs dc ScrollRange.bottom min scrollpos.top - VertLine / lines 1- min 0max >r ! ScrollRange.right iRightMargin - ( HorzLine + ) min scrollpos.left - iLeftMargin - r@ RowAddress r@ RowLength GetTabbedCharsFromPoint r@ RowLength min r> ; *************** *** 576,580 **** StartY EndY < dup IF ! StartX width min StartY width \ more than one line ELSE StartX StartY EndX \ one line only --- 580,584 ---- StartY EndY < dup IF ! StartX width min StartY width \ more than one line ELSE StartX StartY EndX \ one line only *************** *** 584,588 **** BEGIN StartY EndY < ! WHILE 0 StartY width VertLine +to StartY StartY \ whole lines true UpdateRectangle --- 588,592 ---- BEGIN StartY EndY < ! WHILE 0 StartY width VertLine +to StartY StartY \ whole lines true UpdateRectangle *************** *** 596,600 **** :M Select: ( col row -- ) \ select text from SelStart to SelEnd - col row ! get-dc hFont SetFont: dc SelEndCol SelEndRow \ previous SelEnd col row 2swap to SelEndRow to SelEndCol --- 600,604 ---- :M Select: ( col row -- ) \ select text from SelStart to SelEnd - col row ! get-dc hFont SetFont: dc SelEndCol SelEndRow \ previous SelEnd col row 2swap to SelEndRow to SelEndCol *************** *** 624,628 **** : On_Track ( h m -- h m ) ! get-dc hFont SetFont: dc MouseX MouseY GetColRow release-dc --- 628,632 ---- : On_Track ( h m -- h m ) ! get-dc hFont SetFont: dc MouseX MouseY GetColRow release-dc *************** *** 636,641 **** SelectedLength IF ! 0 to SelectedLength ! get-dc hFont SetFont: dc SelStartCol SelStartRow ColRow>XY ScrollAdjust SelEndCol SelEndRow ColRow>XY ScrollAdjust --- 640,645 ---- SelectedLength IF ! 0 to SelectedLength ! get-dc hFont SetFont: dc SelStartCol SelStartRow ColRow>XY ScrollAdjust SelEndCol SelEndRow ColRow>XY ScrollAdjust *************** *** 646,650 **** : SetStart ( x y -- ) \ used in On_Click and SelectAll: ! get-dc hFont SetFont: dc GetColRow 2dup SetSelectionStart over swap OnCommandLine --- 650,654 ---- : SetStart ( x y -- ) \ used in On_Click and SelectAll: ! get-dc hFont SetFont: dc GetColRow 2dup SetSelectionStart over swap OnCommandLine *************** *** 695,699 **** :M DeleteLine: ( -- ) \ delete current row Y RowAddress TextEnd over - ! 2dup 13 scan 13 skip 10 skip nip - dup>r DeleteText: self \ 0 Y r> 1+ Y true UpdateRange \ no need to update here ;M --- 699,703 ---- :M DeleteLine: ( -- ) \ delete current row Y RowAddress TextEnd over - ! 2dup 13 scan 13 skip 10 skip nip - dup>r DeleteText: self \ 0 Y r> 1+ Y true UpdateRange \ no need to update here ;M *************** *** 701,705 **** :M DeleteTextAndRedraw: ( a n -- ) \ DeleteText and update DeleteText: self ! Deselect: self Redraw: self ;M --- 705,709 ---- :M DeleteTextAndRedraw: ( a n -- ) \ DeleteText and update DeleteText: self ! Deselect: self Redraw: self ;M *************** *** 710,714 **** drop text - nip Text swap DeleteTextAndRedraw: self ;M ! : CheckTextBuffer ( n -- ) dup text zcount nip + 256 + MaxText > --- 714,718 ---- drop text - nip Text swap DeleteTextAndRedraw: self ;M ! : CheckTextBuffer ( n -- ) dup text zcount nip + 256 + MaxText > *************** *** 722,726 **** :M CR: ( -- ) ! crlf$ count OverwriteLineAtXY: self Y UpdateLine: self 0 to X 1 +to Y --- 726,730 ---- :M CR: ( -- ) ! crlf$ count true to NewLine OverwriteLineAtXY: self Y UpdateLine: self 0 to X 1 +to Y *************** *** 761,764 **** --- 765,769 ---- :M cls: ( -- ) 0 text c! + true to NewLine Redraw: self 0 to X 0 to Y \ 1 to lines \ 0 text ! *************** *** 797,801 **** CommandStart to X X Y X #chars + Y true UpdateRange ! 0 to #chars SCP true to editing --- 802,806 ---- CommandStart to X X Y X #chars + Y true UpdateRange ! 0 to #chars SCP true to editing *************** *** 808,813 **** SelStartCol SelEndCol min to X \ Update: self X Y X #chars + Y true UpdateRange ! SelectedLength negate +to #chars ! Deselect: self SCP true to editing --- 813,818 ---- SelStartCol SelEndCol min to X \ Update: self X Y X #chars + Y true UpdateRange ! SelectedLength negate +to #chars ! Deselect: self SCP true to editing *************** *** 884,888 **** ELSE Deselect: self ! X CommandEnd < IF XYAddress 1 DeleteTextOnCommandLine: self --- 889,893 ---- ELSE Deselect: self ! X CommandEnd < IF XYAddress 1 DeleteTextOnCommandLine: self *************** *** 958,963 **** : OpenClipboard ( -- ) CF_TEXT call IsClipboardFormatAvailable ! IF ! hWnd call OpenClipboard drop CF_TEXT call GetClipboardData dup to ClipboardHandle call GlobalLock zcount to ClipboardCount to ClipboardAddress --- 963,968 ---- : OpenClipboard ( -- ) CF_TEXT call IsClipboardFormatAvailable ! IF ! hWnd call OpenClipboard drop CF_TEXT call GetClipboardData dup to ClipboardHandle call GlobalLock zcount to ClipboardCount to ClipboardAddress *************** *** 994,998 **** :M PasteFirstLine: ( -- ) \ paste only the first line (less CR) to the commandline CF_TEXT call IsClipboardFormatAvailable ! IF hWnd call OpenClipboard drop CF_TEXT call GetClipboardData --- 999,1003 ---- :M PasteFirstLine: ( -- ) \ paste only the first line (less CR) to the commandline CF_TEXT call IsClipboardFormatAvailable ! IF hWnd call OpenClipboard drop CF_TEXT call GetClipboardData *************** *** 1009,1015 **** SelectedLength IF ! hWnd call OpenClipboard drop call EmptyClipboard drop ! SelectedLength 1+ GMEM_DDESHARE call GlobalAlloc dup Call GlobalLock dup SelectedLength 1+ erase SelectedAddress over SelectedLength move --- 1014,1020 ---- SelectedLength IF ! hWnd call OpenClipboard drop call EmptyClipboard drop ! SelectedLength 1+ GMEM_DDESHARE call GlobalAlloc dup Call GlobalLock dup SelectedLength 1+ erase SelectedAddress over SelectedLength move *************** *** 1030,1034 **** ELSE StartAfterCommandLine SameRowAsCommandLine and ! IF CommandEnd ELSE 0 THEN THEN SelStartRow Select: self ;M --- 1035,1039 ---- ELSE StartAfterCommandLine SameRowAsCommandLine and ! IF CommandEnd ELSE 0 THEN THEN SelStartRow Select: self ;M *************** *** 1039,1043 **** ELSE StartBeforeCommandLine SameRowAsCommandLine and ! IF CommandStart ELSE SelStartRow RowLength THEN THEN SelStartRow Select: self ;M --- 1044,1048 ---- ELSE StartBeforeCommandLine SameRowAsCommandLine and ! IF CommandStart ELSE SelStartRow RowLength THEN THEN SelStartRow Select: self ;M *************** *** 1048,1052 **** ELSE StartAfterCommandLine ! IF CommandEnd Y ELSE 0 0 THEN THEN Select: self ;M --- 1053,1057 ---- ELSE StartAfterCommandLine ! IF CommandEnd Y ELSE 0 0 THEN THEN Select: self ;M *************** *** 1057,1061 **** ELSE StartBeforeCommandLine ! IF CommandStart Y ELSE LastColRow: self THEN THEN Select: self ;M --- 1062,1066 ---- ELSE StartBeforeCommandLine ! IF CommandStart Y ELSE LastColRow: self THEN THEN Select: self ;M *************** *** 1066,1071 **** ELSE SelStartCol SelEndRow 1- 0max RowLength min SelEndRow 1- dup 0< IF 2drop 0 0 THEN ! StartAfterCommandLine SelEndRow 1- 0max Y = and ! IF swap CommandEnd max swap THEN THEN Select: self ;M --- 1071,1076 ---- ELSE SelStartCol SelEndRow 1- 0max RowLength min SelEndRow 1- dup 0< IF 2drop 0 0 THEN ! StartAfterCommandLine SelEndRow 1- 0max Y = and ! IF swap CommandEnd max swap THEN THEN Select: self ;M *************** *** 1076,1080 **** ELSE SelStartCol SelEndRow 1+ RowLength min SelEndRow 1+ 2dup LastColRow: self d> IF 2drop LastColRow: self THEN ! StartBeforeCommandLine SelEndRow 1+ lines 1- min Y = and IF swap CommandStart min swap THEN StartBeforeCommandLine SameRowAsCommandLine and IF CommandStart Y THEN --- 1081,1085 ---- ELSE SelStartCol SelEndRow 1+ RowLength min SelEndRow 1+ 2dup LastColRow: self d> IF 2drop LastColRow: self THEN ! StartBeforeCommandLine SelEndRow 1+ lines 1- min Y = and IF swap CommandStart min swap THEN StartBeforeCommandLine SameRowAsCommandLine and IF CommandStart Y THEN *************** *** 1092,1096 **** THEN THEN ! Select: self ;M :M ShiftRight: ( -- ) --- 1097,1101 ---- THEN THEN ! Select: self ;M :M ShiftRight: ( -- ) *************** *** 1100,1104 **** SelEndCol SelEndRow CommandStart Y d= IF exitm THEN SelEndCol SelEndRow RowLength < IF SelEndCol 1+ SelEndRow ! ELSE lines 1- SelEndRow = IF exitm THEN 0 SelEndRow 1+ THEN THEN --- 1105,1109 ---- SelEndCol SelEndRow CommandStart Y d= IF exitm THEN SelEndCol SelEndRow RowLength < IF SelEndCol 1+ SelEndRow ! ELSE lines 1- SelEndRow = IF exitm THEN 0 SelEndRow 1+ THEN THEN *************** *** 1108,1112 **** CommandStart Y \ lines 1- 2dup SelEndCol SelEndRow d= ! SelStartRow SelStartCol d0= and IF 2drop \ if all is selected already ELSE Deselect: self 0 0 ScrollAdjust SetStart Select: self --- 1113,1117 ---- CommandStart Y \ lines 1- 2dup SelEndCol SelEndRow d= ! SelStartRow SelStartCol d0= and IF 2drop \ if all is selected already ELSE Deselect: self 0 0 ScrollAdjust SetStart Select: self *************** *** 1136,1144 **** ELSE dup 27 = IF true to Abort? THEN PutKey: self THEN ! \ drop false to Abort? 0 ;M :M HandleKeyDown: ( n -- ) ! CASE VK_HOME of ?shift IF 0 0 ?control IF CtrlShiftHome: self ELSE ShiftHome: self THEN ELSE SB_TOP WM_HSCROLL THEN endof VK_END of ?shift IF 0 0 ?control IF CtrlShiftEnd: self ELSE ShiftEnd: self THEN ELSE SB_BOTTOM WM_HSCROLL THEN endof --- 1141,1149 ---- ELSE dup 27 = IF true to Abort? THEN PutKey: self THEN ! \ drop false to Abort? 0 ;M :M HandleKeyDown: ( n -- ) ! CASE VK_HOME of ?shift IF 0 0 ?control IF CtrlShiftHome: self ELSE ShiftHome: self THEN ELSE SB_TOP WM_HSCROLL THEN endof VK_END of ?shift IF 0 0 ?control IF CtrlShiftEnd: self ELSE ShiftEnd: self THEN ELSE SB_BOTTOM WM_HSCROLL THEN endof *************** *** 1182,1186 **** VK_PAUSE of 0x20009 endof VK_PRIOR of 0x20010 endof ! VK_NEXT of 0x20011 endof ( default ) 0 swap EndCase --- 1187,1191 ---- VK_PAUSE of 0x20009 endof VK_PRIOR of 0x20010 endof ! VK_NEXT of 0x20011 endof ( default ) 0 swap EndCase *************** *** 1205,1208 **** --- 1210,1214 ---- 1024 to MaxHistory 100000 to MaxText + true to NewLine 0 to head -1 to wrap |
|
From: Jos v.d.V. <jo...@us...> - 2008-09-16 01:31:37
|
Update of /cvsroot/win32forth/win32forth/apps/Console-Games In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13115 Modified Files: tetris.f Log Message: Jos: Adapted to current state of Win32Forth Index: tetris.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Console-Games/tetris.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tetris.f 16 Aug 2008 13:31:24 -0000 1.3 --- tetris.f 16 Sep 2008 08:31:29 -0000 1.4 *************** *** 410,418 **** \ override default-hello to start - in-console \ the application in a visible console \ create the application &forthdir count &appdir place \ in the Forth-directory ! 0 0 ' tt APPLICATION tetris.exe 1 pause-seconds bye --- 410,417 ---- \ override default-hello to start \ create the application &forthdir count &appdir place \ in the Forth-directory ! ' tt save tetris.exe 1 pause-seconds bye |
|
From: Ezra B. <ezr...@us...> - 2008-09-15 22:16:47
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32651/apps/Win32ForthIDE Modified Files: FORMOBJECT.F Log Message: Reverse small change in ChangeControlType. EAB Index: FORMOBJECT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/FORMOBJECT.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FORMOBJECT.F 24 Aug 2008 05:07:27 -0000 1.4 --- FORMOBJECT.F 16 Sep 2008 05:16:36 -0000 1.5 *************** *** 1234,1239 **** ButtonID 0 to ButtonID \ clear buttonid IDM_FORM_BITMAP IDM_FORM_Generic between ! if \ false ButtonID CheckButton: TheFormBar ! \ true IDM_FORM_SELECT CheckButton: TheFormBar then \ we will keep our position in the tab order ThisControl ?ControlNumber \ link to be deleted --- 1234,1239 ---- ButtonID 0 to ButtonID \ clear buttonid IDM_FORM_BITMAP IDM_FORM_Generic between ! if false ButtonID CheckButton: TheFormBar ! true IDM_FORM_SELECT CheckButton: TheFormBar then \ we will keep our position in the tab order ThisControl ?ControlNumber \ link to be deleted |
|
From: Jos v.d.V. <jo...@us...> - 2008-09-14 17:39:48
|
Update of /cvsroot/win32forth/win32forth/apps/Solipon2 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3098 Modified Files: SOLIPION.F Log Message: Jos: Made the console hidden. Index: SOLIPION.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Solipon2/SOLIPION.F,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SOLIPION.F 2 Sep 2008 06:38:40 -0000 1.12 --- SOLIPION.F 14 Sep 2008 17:39:44 -0000 1.13 *************** *** 1059,1062 **** --- 1059,1063 ---- \ Create the exe-file &forthdir count &appdir place + ConsoleHiddenBoot \ Hide the console ' solipion SAVE Solipion.exe |
|
From: Jos v.d.V. <jo...@us...> - 2008-09-13 16:39:41
|
Update of /cvsroot/win32forth/win32forth/proj In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4267 Modified Files: PictureViewer.fpj Log Message: Jos: Filled in the name of the project. and rebuild the project file. Index: PictureViewer.fpj =================================================================== RCS file: /cvsroot/win32forth/win32forth/proj/PictureViewer.fpj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PictureViewer.fpj 24 Jul 2006 21:31:50 -0000 1.2 --- PictureViewer.fpj 13 Sep 2008 16:39:38 -0000 1.3 *************** *** 1,22 **** ! ProjectName= Project BuildFile= apps\PictureViewer\PictureViewer.f SearchPath= ! Project,0 ! Modules,16 apps\PictureViewer\PictureViewer.f ! SRC\LIB\MDI.f ! SRC\LIB\RecentFiles.f ! apps\PictureViewer\PVMenu.f ! apps\PictureViewer\PVDialogs.f ! SRC\LIB\RegistrySupport.f ! apps\PictureViewer\PVStatusBar.f ! SRC\LIB\StatusBar.f SRC\LIB\Listbox.f ! apps\PictureViewer\PVToolbar.f ! SRC\LIB\ToolBar.f ! apps\PictureViewer\RotateBits.f ! apps\PictureViewer\PVPrinting.f ! SRC\LIB\AcceleratorTables.f ! apps\PictureViewer\PVResources.f SRC\LIB\Resources.f DLLs,1 --- 1,30 ---- ! ProjectName= PictureViewer BuildFile= apps\PictureViewer\PictureViewer.f SearchPath= ! PictureViewer,0 ! Modules,24 apps\PictureViewer\PictureViewer.f ! SRC\LIB\MDI.F ! SRC\LIB\RecentFiles.F ! APPS\PICTUREVIEWER\PVMenu.F ! APPS\PICTUREVIEWER\PVDialogs.F ! SRC\LIB\RegistrySupport.F ! APPS\PICTUREVIEWER\PVStatusBar.F ! SRC\LIB\StatusBar.F ! APPS\PICTUREVIEWER\PVToolbar.F ! SRC\LIB\ToolBar.F ! SRC\LIB\ExControls.F ! SRC\LIB\Textbox.f SRC\LIB\Listbox.f ! SRC\LIB\UpDownControl.f ! SRC\LIB\Buttons.f ! SRC\LIB\Label.f ! SRC\LIB\ScrollBar.f ! SRC\LIB\TabControl.f ! APPS\PICTUREVIEWER\RotateBits.F ! APPS\PICTUREVIEWER\PVPrinting.F ! SRC\PrintSupport.F ! SRC\LIB\AcceleratorTables.F ! APPS\PICTUREVIEWER\PVResources.F SRC\LIB\Resources.f DLLs,1 *************** *** 24,49 **** Forms,0 Auxiliary Files,0 ! Resources,22 ! apps\PictureViewer\Res\PV.h ! apps\PictureViewer\Res\Blank.cur ! apps\PictureViewer\Res\HandClosed.cur ! apps\PictureViewer\Res\HandOpen.cur ! apps\PictureViewer\Res\ICO100.ico ! apps\PictureViewer\Res\ICON-BMP.ico ! apps\PictureViewer\Res\ICON-GIF.ico ! apps\PictureViewer\Res\ICON-IFF.ico ! apps\PictureViewer\Res\ICON-JPG.ico ! apps\PictureViewer\Res\ICON-PCD.ico ! apps\PictureViewer\Res\ICON-PCX.ico ! apps\PictureViewer\Res\ICON-PIC.ico ! apps\PictureViewer\Res\ICON-PNG.ico ! apps\PictureViewer\Res\ICON-PSD.ico ! apps\PictureViewer\Res\ICON-TGA.ico ! apps\PictureViewer\Res\ICON-TIF.ico ! apps\PictureViewer\Res\ICON-WMF.ico ! apps\PictureViewer\Res\IDD_ABOUTBOX.dlg ! apps\PictureViewer\Res\IDD_KEY_HELP.dlg ! apps\PictureViewer\Res\IDD_OPTIONS_DIALOG.dlg ! apps\PictureViewer\Res\Picture.ico ! apps\PictureViewer\Res\Toolbar.bmp Docs,0 --- 32,36 ---- Forms,0 Auxiliary Files,0 ! Resources,1 ! APPS\PICTUREVIEWER\RES\PV.h Docs,0 |
|
From: Jos v.d.V. <jo...@us...> - 2008-09-13 14:08:41
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7714 Modified Files: PLAYER4.F Pl_MciWindow.f Log Message: Jos: Adapted for the current state of Win32Forth. Index: PLAYER4.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** PLAYER4.F 2 Sep 2008 06:38:39 -0000 1.68 --- PLAYER4.F 13 Sep 2008 14:08:33 -0000 1.69 *************** *** 35,39 **** 200 value IDJoystick ! defer PLAYER ' noop is PLAYER defer RefreshCatalog ' noop is RefreshCatalog defer SortCatalog ' noop is SortCatalog --- 35,39 ---- 200 value IDJoystick ! defer RefreshCatalog ' noop is RefreshCatalog defer SortCatalog ' noop is SortCatalog Index: Pl_MciWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_MciWindow.f,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Pl_MciWindow.f 13 Aug 2008 11:40:43 -0000 1.30 --- Pl_MciWindow.f 13 Sep 2008 14:08:33 -0000 1.31 *************** *** 216,220 **** then ; ! :M Playing: ( -- ) \ the main player; must be called in the PLAYER loop PauseIfIconic UpdateTitle --- 216,220 ---- then ; ! :M Playing: ( -- ) \ the main player; must be called while playing PauseIfIconic UpdateTitle *************** *** 226,231 **** : (PlayOneFile) ( addr len -- ) \ plays a file and waits until playing is finished PlayFile: self \ play this file ! begin PLAYER \ call the main PLAYER ! Playing? 0= \ and wait until playing is finished until ; --- 226,231 ---- : (PlayOneFile) ( addr len -- ) \ plays a file and waits until playing is finished PlayFile: self \ play this file ! begin Playing: Self winpause 10 ms \ handle the messages ! Playing? 0= \ and wait until playing is finished until ; |
|
From: Ezra B. <ezr...@us...> - 2008-09-11 03:22:39
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18154/apps/Win32ForthIDE Modified Files: ProjectWindow.f Log Message: Navigator update. EAB Index: ProjectWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectWindow.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProjectWindow.f 8 Sep 2008 03:02:34 -0000 1.1 --- ProjectWindow.f 11 Sep 2008 03:22:35 -0000 1.2 *************** *** 376,380 **** : add-code { cid -- } in-definition? ?exit \ should not happen! ! bl word dup c@ 0= abort" Add Code error!" count currentname place cid to code-id --- 376,380 ---- : add-code { cid -- } in-definition? ?exit \ should not happen! ! bl word dup c@ 0= if drop exit then \ forget it! count currentname place cid to code-id *************** *** 388,392 **** : add-data { cid -- } in-definition? ?exit ! bl word dup c@ 0= abort" Add data error!" count currentname place cid to code-id --- 388,392 ---- : add-data { cid -- } in-definition? ?exit ! bl word dup c@ 0= if drop exit then \ forget it! count currentname place cid to code-id *************** *** 395,399 **** : add-class { cid -- } in-class? ?exit ! bl word dup c@ 0= abort" Add Class\Object error!" count currentname place currentname count parentclass place --- 395,399 ---- : add-class { cid -- } in-class? ?exit ! bl word dup c@ 0= if drop exit then \ forget it! count currentname place currentname count parentclass place *************** *** 405,409 **** in-definition? ?exit in-class? not ?exit ! bl word dup c@ 0= abort" Add Method error!" count currentname place +parent-class --- 405,409 ---- in-definition? ?exit in-class? not ?exit ! bl word dup c@ 0= if drop exit then \ forget it! count currentname place +parent-class |
|
From: Jos v.d.V. <jo...@us...> - 2008-09-10 11:23:55
|
Update of /cvsroot/win32forth/win32forth/demos In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20895 Modified Files: ListViewDemo.f Log Message: Jos: Removed a backup definition. Index: ListViewDemo.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/demos/ListViewDemo.f,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ListViewDemo.f 2 Sep 2008 06:46:27 -0000 1.17 --- ListViewDemo.f 10 Sep 2008 11:23:46 -0000 1.18 *************** *** 111,125 **** ;M - : 0GetParmsItem ( nItem - Z$text Lparm flNew ) - LVIF_TEXT LVIF_PARAM or SetMask: LvItem - out$: RightTopPane SetpszText: LvItem - maxstring SetcchTextMax: LvItem - SetiItem: LvItem - Addr: LvItem GetItem: ListViewLeft drop out$: RightTopPane - GetlParam: LvItem dup SelectedItemLeft <> - if dup to SelectedItemLeft true - else false - then ; - : GetParmsItem ( nItem - Z$text Lparm flNew ) >r LVIF_TEXT LVIF_PARAM or SetMask: LvItem --- 111,114 ---- |
|
From: George H. <geo...@us...> - 2008-09-09 20:54:44
|
Update of /cvsroot/win32forth/win32forth-stc/src/kernel In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10948 Modified Files: gkernel.f Log Message: Corrected bug in (LOCAL) Index: gkernel.f =================================================================== RCS file: /cvsroot/win32forth/win32forth-stc/src/kernel/gkernel.f,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** gkernel.f 17 Aug 2007 02:57:20 -0000 1.43 --- gkernel.f 9 Sep 2008 20:54:40 -0000 1.44 *************** *** 1601,1608 **** mov eax, ecx next; ! code lastchar ( str -- char ) \ returns last character from c-string movzx ecx, byte [eax] ! movzx eax, byte [eax] [ecx] next c; --- 1601,1608 ---- mov eax, ecx next; ! code lastchar ( str -- char ) \ returns last character from c-string movzx ecx, byte [eax] ! movzx eax, byte [eax] [ecx] next c; *************** *** 1944,1948 **** : -trailing ( addr n1 -- addr n2 ) \ remove trailing blanks from addr,n1 bl -trailchars ; ! : -nulls ( addr n1 -- addr n2 ) \ remove trailing nulls from addr,n1 0 -trailchars ; --- 1944,1948 ---- : -trailing ( addr n1 -- addr n2 ) \ remove trailing blanks from addr,n1 bl -trailchars ; ! : -nulls ( addr n1 -- addr n2 ) \ remove trailing nulls from addr,n1 0 -trailchars ; *************** *** 4264,4269 **** xor throw_mismatch ?throw ; ! : >mark ( -- addr ) ! sync-code code-here ; \ mark a link for later resolution by : <resolve ( orig -- ) \ fixup relative jump at orig --- 4264,4269 ---- xor throw_mismatch ?throw ; ! : >mark ( -- addr ) ! sync-code code-here ; \ mark a link for later resolution by : <resolve ( orig -- ) \ fixup relative jump at orig *************** *** 4586,4590 **** \ EXIT compiles __LOCALFREE, but leaves LOCALSTK alone so that ; can ! \ also compile __LOCALFREE : exit ( -- ) \ exit current word --- 4586,4590 ---- \ EXIT compiles __LOCALFREE, but leaves LOCALSTK alone so that ; can ! \ also compile __LOCALFREE : exit ( -- ) \ exit current word *************** *** 4630,4634 **** (comp-only) compilation> ; ! |: ;noname ( -- ) \ ; for :noname drop \ because after compilation> --- 4630,4634 ---- (comp-only) compilation> ; ! |: ;noname ( -- ) \ ; for :noname drop \ because after compilation> *************** *** 4641,4645 **** ofa 1+ (ofa-calc) \ length calculation (don't include the ret) reveal ; \ reveal the name ! \ Words to support : --- 4641,4645 ---- ofa 1+ (ofa-calc) \ length calculation (don't include the ret) reveal ; \ reveal the name ! \ Words to support : *************** *** 4749,4753 **** code-here compiles-last \ make the defined word compile this ; ! : compile-only> ( -- ) \ shorthand for (comp-only) comp (comp-only) --- 4749,4753 ---- code-here compiles-last \ make the defined word compile this ; ! : compile-only> ( -- ) \ shorthand for (comp-only) comp (comp-only) *************** *** 5386,5390 **** \ Code to fetch local values ! gcode _localn mov -4 [ebp], eax lea ebp, -4 [ebp] --- 5386,5390 ---- \ Code to fetch local values ! gcode _localn mov -4 [ebp], eax lea ebp, -4 [ebp] *************** *** 5462,5487 **** then ; - : (local) ( addr cnt -- ) \ create name in locals vocab - (comp-only) compilation> drop - dup if \ looks like std vocab header - 1 +to localstk \ total count of stack parms - localstk #-locals > throw_localstoomany ?throw - get-current >r \ save current - also locals definitions \ move to locals area - last @ last-link @ 2>r \ save last (we wipe out) - latestxt @ >r - >local - "header \ build a header - tloc tfa! \ mark as a local - local> - localstk cells [ local-ptrs cell- ] literal \ table is zero offset - + @ xtptr! \ return correct xt and make it xt (local n) - r> latestxt ! - 2r> last-link ! last ! \ restore last, last-link - previous r> set-current \ back out of locals - locflg +to localsi \ locflg counts initialised - else 2drop localsgen, \ go on to create locals - then ; - : nextword ( char -- adr flag ) \ flag=true if we got a word, else false begin dup word dup c@ 0= --- 5462,5465 ---- *************** *** 5506,5509 **** --- 5484,5516 ---- [ ' locals >body ] literal off ; \ clean thread in vocabulary + |: {local} ( addr cnt -- ) \ create name in locals vocab + 1 +to localstk \ total count of stack parms + localstk #-locals > throw_localstoomany ?throw + get-current >r \ save current + also locals definitions \ move to locals area + last @ last-link @ 2>r \ save last (we wipe out) + latestxt @ >r + >local + "header \ build a header + tloc tfa! \ mark as a local + local> + localstk cells [ local-ptrs cell- ] literal \ table is zero offset + + @ xtptr! \ return correct xt and make it xt (local n) + r> latestxt ! + 2r> last-link ! last ! \ restore last, last-link + previous r> set-current \ back out of locals + locflg +to localsi ; \ locflg counts initialised + + : (local) ( addr cnt -- ) \ create name in locals vocab + (comp-only) compilation> drop + localstk 0= if + locals-init + false to locdir \ reversed stack order + then + dup if \ looks like std vocab header + {local} + else 2drop localsgen, \ go on to create locals + then ; + : { ( -- ) \ begin local variables (comp-only) compilation> drop *************** *** 5515,5519 **** 2dup s" \" str= >r \ is it { [...] \ ... 2dup s" |" str= r> or not \ is it { [...] | ... ! if postpone (local) \ no, it's a local else 2drop 0 to locflg then \ onto uninited locals repeat --- 5522,5526 ---- 2dup s" \" str= >r \ is it { [...] \ ... 2dup s" |" str= r> or not \ is it { [...] | ... ! if {local} \ no, it's a local else 2drop 0 to locflg then \ onto uninited locals repeat *************** *** 5529,5534 **** : locals| ( -- ) \ ans standard locals (comp-only) compilation> drop - locals-init - false to locdir \ reversed stack order begin localword 2dup s" |" str= not --- 5536,5539 ---- *************** *** 5583,5587 **** __localsave (copy-code) -1 to localstk \ mark as localalloc ! then __localalloc (copy-code) ; --- 5588,5592 ---- __localsave (copy-code) -1 to localstk \ mark as localalloc ! then __localalloc (copy-code) ; |
|
From: Ezra B. <ezr...@us...> - 2008-09-08 03:08:17
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Forms In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1454/apps/Win32ForthIDE/Forms Modified Files: EdPreferences.ff EdPreferences.frm Log Message: IDE updates. EAB Index: EdPreferences.frm =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Forms/EdPreferences.frm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdPreferences.frm 4 May 2008 18:13:25 -0000 1.2 --- EdPreferences.frm 8 Sep 2008 03:08:13 -0000 1.3 *************** *** 26,45 **** \ Coordinates and dimensions for BackChild 130 value BackChildX ! 57 value BackChildY 34 value BackChildW 25 value BackChildH \ Coordinates and dimensions for CurrentChild 130 value CurrentChildX ! 84 value CurrentChildY 34 value CurrentChildW 25 value CurrentChildH \ Coordinates and dimensions for SelForeChild 130 value SelForeChildX ! 111 value SelForeChildY 34 value SelForeChildW 25 value SelForeChildH \ Coordinates and dimensions for SelBackChild 130 value SelBackChildX ! 138 value SelBackChildY 34 value SelBackChildW 25 value SelBackChildH --- 26,45 ---- \ Coordinates and dimensions for BackChild 130 value BackChildX ! 58 value BackChildY 34 value BackChildW 25 value BackChildH \ Coordinates and dimensions for CurrentChild 130 value CurrentChildX ! 86 value CurrentChildY 34 value CurrentChildW 25 value CurrentChildH \ Coordinates and dimensions for SelForeChild 130 value SelForeChildX ! 114 value SelForeChildY 34 value SelForeChildW 25 value SelForeChildH \ Coordinates and dimensions for SelBackChild 130 value SelBackChildX ! 142 value SelBackChildY 34 value SelBackChildW 25 value SelBackChildH *************** *** 52,55 **** --- 52,68 ---- PushButton btnOk PushButton btnCancel + PushButton btnBrowseFore + PushButton btnBrowseBack + \ Coordinates and dimensions for BrowseForeChild + 130 value BrowseForeChildX + 170 value BrowseForeChildY + 34 value BrowseForeChildW + 25 value BrowseForeChildH + \ Coordinates and dimensions for BrowsebackChild + 130 value BrowsebackChildX + 198 value BrowsebackChildY + 34 value BrowsebackChildW + 25 value BrowsebackChildH + :M ClassInit: ( -- ) *************** *** 76,80 **** :M StartSize: ( -- width height ) ! 388 303 ;M --- 89,93 ---- :M StartSize: ( -- width height ) ! 381 361 ;M *************** *** 83,86 **** --- 96,104 ---- ;M + :M Start: ( -- ) + Start: Super + Begin WinPause Hwnd 0= Until + ;M + :M Close: ( -- ) \ Insert your code here, e.g any data entered in form that needs to be saved *************** *** 88,91 **** --- 106,120 ---- ;M + :M WM_COMMAND ( h m w l -- res ) + over LOWORD ( ID ) self \ object address on stack + WMCommand-Func ?dup \ must not be zero + if execute + else 2drop \ drop ID and object address + then 0 ;M + + :M SetCommand: ( cfa -- ) \ set WMCommand function + to WMCommand-Func + ;M + :M On_Init: ( -- ) s" MS Sans Serif" SetFaceName: WinFont *************** *** 103,107 **** self Start: grpNavigator ! 16 196 190 57 Move: grpNavigator Handle: Winfont SetFont: grpNavigator s" Project Navigator" SetText: grpNavigator --- 132,136 ---- self Start: grpNavigator ! 16 244 190 57 Move: grpNavigator Handle: Winfont SetFont: grpNavigator s" Project Navigator" SetText: grpNavigator *************** *** 113,142 **** self Start: grpColors ! 16 14 161 155 Move: grpColors Handle: Winfont SetFont: grpColors s" Editor Colors" SetText: grpColors self Start: btnForeground ! 28 30 100 25 Move: btnForeground Handle: Winfont SetFont: btnForeground s" ForeGround" SetText: btnForeground self Start: btnBackground ! 28 57 100 25 Move: btnBackground Handle: Winfont SetFont: btnBackground s" BackGround" SetText: btnBackground self Start: btnCurrentline ! 28 84 100 25 Move: btnCurrentline Handle: Winfont SetFont: btnCurrentline s" Current Line" SetText: btnCurrentline self Start: btnSelectFore ! 28 111 100 25 Move: btnSelectFore Handle: Winfont SetFont: btnSelectFore s" Select Foreground" SetText: btnSelectFore self Start: btnSelectBack ! 28 138 100 25 Move: btnSelectBack Handle: Winfont SetFont: btnSelectBack s" Select Background" SetText: btnSelectBack --- 142,171 ---- self Start: grpColors ! 16 14 162 215 Move: grpColors Handle: Winfont SetFont: grpColors s" Editor Colors" SetText: grpColors self Start: btnForeground ! 28 30 100 26 Move: btnForeground Handle: Winfont SetFont: btnForeground s" ForeGround" SetText: btnForeground self Start: btnBackground ! 28 58 100 26 Move: btnBackground Handle: Winfont SetFont: btnBackground s" BackGround" SetText: btnBackground self Start: btnCurrentline ! 28 86 100 26 Move: btnCurrentline Handle: Winfont SetFont: btnCurrentline s" Current Line" SetText: btnCurrentline self Start: btnSelectFore ! 28 114 100 26 Move: btnSelectFore Handle: Winfont SetFont: btnSelectFore s" Select Foreground" SetText: btnSelectFore self Start: btnSelectBack ! 28 142 100 26 Move: btnSelectBack Handle: Winfont SetFont: btnSelectBack s" Select Background" SetText: btnSelectBack *************** *** 168,198 **** self Start: chkIncludeLibs ! 28 217 175 24 Move: chkIncludeLibs Handle: Winfont SetFont: chkIncludeLibs s" Include library files when tracking" SetText: chkIncludeLibs self Start: btnOk ! 18 272 80 25 Move: btnOk Handle: Winfont SetFont: btnOk s" &Ok" SetText: btnOk self Start: btnCancel ! 100 272 80 25 Move: btnCancel Handle: Winfont SetFont: btnCancel s" &Cancel" SetText: btnCancel ParentWindow: self \ if this is a modal form disable parent if 0 ParentWindow: self Call EnableWindow drop then - ;M - :M WM_COMMAND ( h m w l -- res ) - over LOWORD ( ID ) self \ object address on stack - WMCommand-Func ?dup \ must not be zero - if execute - else 2drop \ drop ID and object address - then 0 ;M - - :M SetCommand: ( cfa -- ) \ set WMCommand function - to WMCommand-Func ;M --- 197,227 ---- self Start: chkIncludeLibs ! 28 265 175 24 Move: chkIncludeLibs Handle: Winfont SetFont: chkIncludeLibs s" Include library files when tracking" SetText: chkIncludeLibs self Start: btnOk ! 18 320 80 25 Move: btnOk Handle: Winfont SetFont: btnOk s" &Ok" SetText: btnOk self Start: btnCancel ! 100 320 80 25 Move: btnCancel Handle: Winfont SetFont: btnCancel s" &Cancel" SetText: btnCancel + self Start: btnBrowseFore + 28 170 100 26 Move: btnBrowseFore + Handle: Winfont SetFont: btnBrowseFore + s" Browse Foreground" SetText: btnBrowseFore + + self Start: btnBrowseBack + 28 198 100 26 Move: btnBrowseBack + Handle: Winfont SetFont: btnBrowseBack + s" Browse Background" SetText: btnBrowseBack + ParentWindow: self \ if this is a modal form disable parent if 0 ParentWindow: self Call EnableWindow drop then ;M Index: EdPreferences.ff =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Forms/EdPreferences.ff,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsWl4faj and /tmp/cvsvCDvjk differ |
|
From: Ezra B. <ezr...@us...> - 2008-09-08 03:07:14
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1009/apps/Win32ForthIDE Modified Files: ProjectTree.f Log Message: IDE updates. EAB Index: ProjectTree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ProjectTree.f 27 Jul 2008 07:21:51 -0000 1.22 --- ProjectTree.f 8 Sep 2008 03:07:10 -0000 1.23 *************** *** 769,772 **** --- 769,779 ---- ; IDM_NEW_PRJ SetCommand + : close-project ( -- ) + SaveIfModified 0= ?exit + s" Project" SetProjectName: TheProject + pad 0 SetBuildFile: TheProject + pad 0 (open-project) + ; IDM_CLOSE_PRJ SetCommand + : open-project ( -- ) \ Open a project |
|
From: Ezra B. <ezr...@us...> - 2008-09-08 03:06:16
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv599/apps/Win32ForthIDE Modified Files: Main.f Log Message: IDE updates. EAB Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Main.f 2 Sep 2008 06:38:41 -0000 1.58 --- Main.f 8 Sep 2008 03:06:13 -0000 1.59 *************** *** 18,22 **** only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\win32forthIDE" "fpath+ --- 18,22 ---- only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\win32forthIDE" "fpath+ *************** *** 68,73 **** false value with-tabs? false value include-libs? ! 150 175 2value NavigatorPos ! 225 450 2value NavigatorSize 0 constant FT_SOURCE --- 68,73 ---- false value with-tabs? false value include-libs? ! 150 175 2value BookMarksPos ! 225 450 2value BookMarksSize 0 constant FT_SOURCE *************** *** 505,512 **** Select-ForeColor s>d (d.) s" SelectForeColor" "SetDefault Select-BackColor s>d (d.) s" SelectBackColor" "SetDefault AutoIndent? s>d (d.) s" AutoIndent" "SetDefault With-Tabs? s>d (d.) s" TabsInEditor" "SetDefault ! NavigatorPos (d.) s" NavigatorPosition" "SetDefault ! NavigatorSize (d.) s" NavigatorSize" "SetDefault AutoProperty? s>d (d.) s" AutoProperty" "SetDefault SingleControl? s>d (d.) s" SingleControl" "SetDefault --- 505,514 ---- Select-ForeColor s>d (d.) s" SelectForeColor" "SetDefault Select-BackColor s>d (d.) s" SelectBackColor" "SetDefault + Browse-ForeColor s>d (d.) s" BrowseForeColor" "SetDefault + Browse-BackColor s>d (d.) s" BrowseBackColor" "SetDefault AutoIndent? s>d (d.) s" AutoIndent" "SetDefault With-Tabs? s>d (d.) s" TabsInEditor" "SetDefault ! BookMarksPos (d.) s" BookMarksPosition" "SetDefault ! BookMarksSize (d.) s" BookMarksSize" "SetDefault AutoProperty? s>d (d.) s" AutoProperty" "SetDefault SingleControl? s>d (d.) s" SingleControl" "SetDefault *************** *** 565,573 **** s" SelectBackColor" "GetDefaultValue 0= IF drop Select-BackColor THEN to Select-BackColor s" SelectForeColor" "GetDefaultValue 0= IF drop Select-ForeColor THEN to Select-ForeColor s" AutoIndent" "GetDefaultValue 0= IF drop false THEN to autoindent? s" TabsInEditor" "GetDefaultValue 0= IF drop false THEN to with-tabs? ! s" NavigatorPosition" "GetDefault2Value IF 2to NavigatorPos ELSE 2drop then ! s" NavigatorSize" "GetDefault2Value IF 2to NavigatorSize ELSE 2drop THEN s" AutoProperty" "GetDefaultValue 0= IF drop false THEN to AutoProperty? s" SingleControl" "GetDefaultValue 0= IF drop true THEN to SingleControl? --- 567,577 ---- s" SelectBackColor" "GetDefaultValue 0= IF drop Select-BackColor THEN to Select-BackColor s" SelectForeColor" "GetDefaultValue 0= IF drop Select-ForeColor THEN to Select-ForeColor + s" BrowseForeColor" "GetDefaultValue 0= IF drop Browse-ForeColor THEN to Browse-ForeColor + s" BrowseBackColor" "GetDefaultValue 0= IF drop Browse-BackColor THEN to Browse-BackColor s" AutoIndent" "GetDefaultValue 0= IF drop false THEN to autoindent? s" TabsInEditor" "GetDefaultValue 0= IF drop false THEN to with-tabs? ! s" BookMarksPosition" "GetDefault2Value IF 2to BookMarksPos ELSE 2drop then ! s" BookMarksSize" "GetDefault2Value IF 2to BookMarksSize ELSE 2drop THEN s" AutoProperty" "GetDefaultValue 0= IF drop false THEN to AutoProperty? s" SingleControl" "GetDefaultValue 0= IF drop true THEN to SingleControl? *************** *** 617,620 **** --- 621,627 ---- InitScintillaControl \ Dienstag, August 03 2004 dbu AccelTable EnableAccelerators \ init the accelerator table + s" MS Sans Serif" SetFaceName: TabFont + 8 Width: TabFont + Create: TabFont self Start: ScintillaStatusbar self Start: TheRebar *************** *** 627,633 **** load-defaults self Start: OpenFilesTab \ start after mdiclient - s" MS Sans Serif" SetFaceName: TabFont - 8 Width: TabFont - Create: TabFont Handle: TabFont SetFont: OpenFilesTab show-form-tab \ show the form designer whether detached or not --- 634,637 ---- *************** *** 749,753 **** : RefreshColors ( -- ) GetFileType: ChildParent FT_SOURCE <> ?exit ! fore-color back-color SetColors: ChildParent caret-backcolor SetCaretBackColor: ChildParent Select-ForeColor Select-BackColor SetSelectionColor: ChildParent --- 753,760 ---- : RefreshColors ( -- ) GetFileType: ChildParent FT_SOURCE <> ?exit ! ?BrowseMode: ChildParent ! if browse-forecolor browse-backcolor ! else fore-color back-color ! then SetColors: ChildParent caret-backcolor SetCaretBackColor: ChildParent Select-ForeColor Select-BackColor SetSelectionColor: ChildParent *************** *** 1028,1032 **** temp$ count OpenNamedFile: ActiveChild drop then Update ! ; : (OpenBinaryFile) ( adr len -- ) --- 1035,1039 ---- temp$ count OpenNamedFile: ActiveChild drop then Update ! ; ' (OpenSourceFile) is OpenSource : (OpenBinaryFile) ( adr len -- ) *************** *** 1085,1089 **** fload EdRemote.f fload EdCompile.f ! needs EdNavigator.f \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 1092,1096 ---- fload EdRemote.f fload EdCompile.f ! needs EdBookMarks.f \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 1213,1217 **** start: Frame GetHandle: frame hwndOwner ! DefaultPrinter \ initialise PSD and PD ! sysgen if GetHandle: Frame Enablew32fMsg then \ inter-process comm InitClassBrowsers \+ sysgen HandleCmdLine --- 1220,1224 ---- start: Frame GetHandle: frame hwndOwner ! DefaultPrinter \ initialise PSD and PD ! \+ sysgen GetHandle: Frame Enablew32fMsg \ inter-process comm InitClassBrowsers \+ sysgen HandleCmdLine |
|
From: Ezra B. <ezr...@us...> - 2008-09-08 03:05:13
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32741/apps/Win32ForthIDE Modified Files: EDSplitterWindow.f Log Message: IDE updates. EAB Index: EDSplitterWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EDSplitterWindow.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EDSplitterWindow.f 2 Sep 2008 03:15:10 -0000 1.1 --- EDSplitterWindow.f 8 Sep 2008 03:05:10 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- int TheEditor + int myparent :M ExWindowStyle: ( -- style ) *************** *** 13,21 **** ClassInit: super \ init super class 0 to TheEditor ;M :M On_Init: ( -- ) CS_DBLCLKS GCL_STYLE hWnd Call SetClassLong drop ! hwnd GetHandle: TheEditor Call SetParent drop ;M --- 14,23 ---- ClassInit: super \ init super class 0 to TheEditor + 0 to myparent ;M :M On_Init: ( -- ) CS_DBLCLKS GCL_STYLE hWnd Call SetClassLong drop ! hwnd GetHandle: TheEditor Call SetParent drop ;M *************** *** 35,40 **** l w WM_NOTIFY GetHandle: GrandParent Call SendMessage drop ;M ! ;Class :Class VertSplitterWindow <Super Child-Window --- 37,49 ---- l w WM_NOTIFY GetHandle: GrandParent Call SendMessage drop ;M ! :M WM_COMMAND ( h m w l -- res ) ! GetHandle: TheEditor = ! if HIWORD SCEN_SETFOCUS = ! if GetParent: Self to myparent ! TheEditor GetParent: myparent SetPrimaryEditor: [ ] ! then ! then 0 ;M + ;Class :Class VertSplitterWindow <Super Child-Window *************** *** 42,48 **** int dragging int mousedown ! 0 value ToolBarHeight \ set to height of toolbar if any ! 0 value StatusBarHeight \ set to height of status bar if any ! 250 value LeftWidth 5 value ThicknessV --- 51,55 ---- int dragging int mousedown ! int LeftWidth 5 value ThicknessV *************** *** 54,69 **** : RightWidth ( -- n ) Width RightXpos - ; : LeftWidthMin ( -- n ) LeftWidth width min ; ! : StatusBarYpos ( -- n ) height StatusbarHeight - ; ! : TotalHeight ( -- n ) Height ToolBarHeight - StatusBarHeight - ; : position-windows ( -- ) ! 0 ToolBarHeight LeftWidthMin TotalHeight Move: PrimaryPane ! RightXpos ToolBarHeight RightWidth TotalHeight Move: SecondaryPane ! LeftWidth ToolBarHeight ThicknessV TotalHeight Move: SplitV ; : Splitter ( -- n ) \ the splitter window the cursor is on hWnd get-mouse-xy ! ToolBarHeight StatusBarYpos within swap LeftWidth RightXpos within and IF 1 ELSE 0 THEN ; --- 61,76 ---- : RightWidth ( -- n ) Width RightXpos - ; : LeftWidthMin ( -- n ) LeftWidth width min ; ! : StatusBarYpos ( -- n ) height ; ! : TotalHeight ( -- n ) Height ; : position-windows ( -- ) ! 0 0 LeftWidthMin TotalHeight Move: PrimaryPane ! RightXpos 0 RightWidth TotalHeight Move: SecondaryPane ! LeftWidth 0 ThicknessV TotalHeight Move: SplitV ; : Splitter ( -- n ) \ the splitter window the cursor is on hWnd get-mouse-xy ! 0 StatusBarYpos within swap LeftWidth RightXpos within and IF 1 ELSE 0 THEN ; *************** *** 112,115 **** --- 119,123 ---- ['] On_DblClick SetDblClickFunc: self false to mousedown + 250 to LeftWidth ;M *************** *** 140,147 **** --- 148,157 ---- VertSplitterWindow SplitW ScintillaControl MirrorEditor + int TheChild :M Start: ( parent -- ) Start: super self Start: MirrorEditor + ChildWindow to TheChild \ save original ChildWindow MirrorEditor SetEditors: SplitW self Start: Splitw *************** *** 161,171 **** :M WM_UPDATE ( -- ) \ save the current child from global variables ! Update: self ! RefreshColors \ main window ! ChildWindow >r \ save on stack ! MirrorEditor to ChildWindow ! RefreshColors \ clone window ! Update: self ! r> to ChildWindow \ restore ;M --- 171,183 ---- :M WM_UPDATE ( -- ) \ save the current child from global variables ! ChildWindow >r ! TheChild ?dup ! if to ChildWindow ! Update: self ! RefreshColors \ main window ! MirrorEditor to ChildWindow ! RefreshColors \ clone window ! Update: self ! then r> to ChildWindow \ restore ;M *************** *** 175,188 **** :M WM_NOTIFY ( h m w l -- res ) dup 2 cells + @ SCN_UPDATEUI = ! if UpdateStatusBar: self ! EnableToolbar ! else 4 cells+ @ dup ?indent ! ChildWindow >r ! MirrorEditor to ChildWindow ! ?indent ! r> to ChildWindow then false ;M ;Class --- 187,216 ---- :M WM_NOTIFY ( h m w l -- res ) dup 2 cells + @ SCN_UPDATEUI = ! if UpdateStatusBar: self ! EnableToolbar ! else ChildWindow >r ! TheChild ?dup ! if to ChildWindow ! 4 cells+ @ dup ?indent ! MirrorEditor to ChildWindow ! ?indent ! then r> to ChildWindow then false ;M + :M SetPrimaryEditor: ( editor -- ) + to ChildWindow + ChildWindow to CurrentWindow ;M + + :M On_Close: ( -- ) + TheChild to ChildWindow \ restore original for disposing + On_Close: Super + ;M + + :M ClassInit: ( -- ) + ClassInit: Super + 0 to TheChild + ;M + ;Class *************** *** 197,203 **** WindowPane SecondaryPane \ clone editor window ! 0 value ToolBarHeight \ set to height of toolbar if any ! 0 value StatusBarHeight \ set to height of status bar if any ! 200 value TopHeight 5 value ThicknessH --- 225,231 ---- WindowPane SecondaryPane \ clone editor window ! \ 0 value ToolBarHeight \ set to height of toolbar if any ! \ 0 value StatusBarHeight \ set to height of status bar if any ! int TopHeight 5 value ThicknessH *************** *** 205,217 **** int mousedown ! : SplitterYpos ( -- n ) ToolBarHeight TopHeight + ; : BottomYpos ( -- n ) SplitterYpos ThicknessH + ; ! : StatusBarYpos ( -- n ) height StatusbarHeight - ; : BottomHeight ( -- n ) StatusBarYpos BottomYpos - ; ! : TotalHeight ( -- n ) StatusBarYpos ToolBarHeight - ; : TopHeightMin ( -- n ) TopHeight TotalHeight min ; : position-windows ( -- ) ! 0 ToolBarHeight Width TopHeightMin Move: PrimaryPane 0 BottomYpos Width BottomHeight Move: SecondaryPane 0 SplitterYpos Width ThicknessH Move: SplitterH --- 233,245 ---- int mousedown ! : SplitterYpos ( -- n ) TopHeight ; : BottomYpos ( -- n ) SplitterYpos ThicknessH + ; ! : StatusBarYpos ( -- n ) height ; : BottomHeight ( -- n ) StatusBarYpos BottomYpos - ; ! : TotalHeight ( -- n ) StatusBarYpos ; : TopHeightMin ( -- n ) TopHeight TotalHeight min ; : position-windows ( -- ) ! 0 0 Width TopHeightMin Move: PrimaryPane 0 BottomYpos Width BottomHeight Move: SecondaryPane 0 SplitterYpos Width ThicknessH Move: SplitterH *************** *** 220,224 **** : Splitter ( -- n ) \ the splitter window the cursor is on hWnd get-mouse-xy ! dup ToolBarHeight StatusBarYpos within IF SplitterYpos BottomYpos within swap 0 width within and IF 1 ELSE 0 THEN ELSE 2drop 0 THEN ; --- 248,252 ---- : Splitter ( -- n ) \ the splitter window the cursor is on hWnd get-mouse-xy ! dup 0 StatusBarYpos within IF SplitterYpos BottomYpos within swap 0 width within and IF 1 ELSE 0 THEN ELSE 2drop 0 THEN ; *************** *** 227,231 **** mousedown dragging or 0= ?EXIT dragging ! IF mousey ToolBarHeight - 0max TotalHeight min thicknessH 2/ - to TopHeight THEN position-windows WINPAUSE ; --- 255,259 ---- mousedown dragging or 0= ?EXIT dragging ! IF mousey TotalHeight min thicknessH 2/ - to TopHeight THEN position-windows WINPAUSE ; *************** *** 268,271 **** --- 296,300 ---- ['] On_DblClick SetDblClickFunc: self false to mousedown + 200 to TopHeight ;M *************** *** 297,304 **** --- 326,335 ---- HorizSplitterWindow SplitW ScintillaControl MirrorEditor + int TheChild :M Start: ( parent -- ) Start: super self Start: MirrorEditor + ChildWindow to TheChild \ save original ChildWindow MirrorEditor SetEditors: SplitW self Start: Splitw *************** *** 313,327 **** ;M :M On_Size: ( h m w l -- h m w l ) 0 0 Width Height Move: SplitW ;M :M WM_UPDATE ( -- ) \ save the current child from global variables ! Update: self ! RefreshColors \ main window ! ChildWindow >r \ save on stack ! MirrorEditor to ChildWindow ! RefreshColors \ clone window ! Update: self ! r> to ChildWindow \ restore ;M --- 344,361 ---- ;M + :M On_Size: ( h m w l -- h m w l ) 0 0 Width Height Move: SplitW ;M :M WM_UPDATE ( -- ) \ save the current child from global variables ! ChildWindow >r ! TheChild ?dup ! if to ChildWindow ! Update: self ! RefreshColors \ main window ! MirrorEditor to ChildWindow ! RefreshColors \ clone window ! Update: self ! then r> to ChildWindow \ restore ;M *************** *** 331,344 **** :M WM_NOTIFY ( h m w l -- res ) dup 2 cells + @ SCN_UPDATEUI = ! if UpdateStatusBar: self ! EnableToolbar ! else 4 cells+ @ dup ?indent ! ChildWindow >r ! MirrorEditor to ChildWindow ! ?indent ! r> to ChildWindow then false ;M ;Class --- 365,394 ---- :M WM_NOTIFY ( h m w l -- res ) dup 2 cells + @ SCN_UPDATEUI = ! if UpdateStatusBar: self ! EnableToolbar ! else ChildWindow >r ! TheChild ?dup ! if to ChildWindow ! 4 cells+ @ dup ?indent ! MirrorEditor to ChildWindow ! ?indent ! then r> to ChildWindow then false ;M + :M SetPrimaryEditor: ( editor -- ) + to ChildWindow + ChildWindow to CurrentWindow ;M + + :M On_Close: ( -- ) + TheChild to ChildWindow \ restore original for disposing + On_Close: Super + ;M + + :M ClassInit: ( -- ) + ClassInit: Super + 0 to TheChild + ;M + ;Class *************** *** 365,372 **** --- 415,425 ---- child1 GetTabInfo: OpenFilesTab LParam: OpenFilesTab to l1 + TCIF_PARAM IsMask: OpenFilesTab child2 GetTabInfo: OpenFilesTab LParam: OpenFilesTab to l2 + TCIF_PARAM IsMask: OpenFilesTab child1 SetTabInfo: OpenFilesTab l1 IsLparam: OpenFilesTab + TCIF_PARAM IsMask: OpenFilesTab child2 SetTabInfo: OpenFilesTab ; *************** *** 384,388 **** SetSavepoint: CurrentWindow \ mark as not modified ActiveChild >r ! win-func execute \ NewHSplitWnd textbuf SetText: CurrentWindow name$ count SetFileName: ActiveChild --- 437,441 ---- SetSavepoint: CurrentWindow \ mark as not modified ActiveChild >r ! win-func execute textbuf SetText: CurrentWindow name$ count SetFileName: ActiveChild *************** *** 393,397 **** r> GetHandle: [ ] CloseChild: Frame Update ! SetFocus: ActiveChild ; IDM_SPLIT_HORIZONTAL SetCommand : SplitWindowVertical ( -- ) --- 446,451 ---- r> GetHandle: [ ] CloseChild: Frame Update ! SetFocus: ActiveChild ! ; : SplitWindowVertical ( -- ) *************** *** 404,408 **** ['] NewEditWindow NO_SPLIT SplitWindow ; IDM_NO_SPLIT_WINDOW SetCommand - \s \ : SplitWindowHorizontal { \ modified? curpos textbuf textlen name$ -- } \ ActiveChild 0= ?exit --- 458,461 ---- *************** *** 476,478 **** \ Update \ SetFocus: ActiveChild ; IDM_NO_SPLIT_WINDOW SetCommand ! \ \s --- 529,532 ---- \ Update \ SetFocus: ActiveChild ; IDM_NO_SPLIT_WINDOW SetCommand ! ! \s |
|
From: Ezra B. <ezr...@us...> - 2008-09-08 03:04:03
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32249/apps/Win32ForthIDE Modified Files: CommandID.f EdMenu.f EdPreferences.f Log Message: IDE updates. EAB Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** CommandID.f 2 Sep 2008 06:38:41 -0000 1.20 --- CommandID.f 8 Sep 2008 03:03:59 -0000 1.21 *************** *** 99,103 **** NewID IDM_DEBUG NewID IDM_SET_BREAK_POINT ! NewID IDM_NAVIGATOR NewID IDM_SET_BOOKMARK NewID IDM_BUILD_CODE_TREE --- 99,103 ---- NewID IDM_DEBUG NewID IDM_SET_BREAK_POINT ! NewID IDM_BOOKMARKs NewID IDM_SET_BOOKMARK NewID IDM_BUILD_CODE_TREE *************** *** 145,148 **** --- 145,149 ---- NewID IDM_OPEN_RECENT_FILE_PRJ NewID IDM_SHOWPROJECT_TAB + NewID IDM_CLOSE_PRJ \ Form Designer Index: EdPreferences.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdPreferences.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdPreferences.f 28 Apr 2008 05:17:15 -0000 1.5 --- EdPreferences.f 8 Sep 2008 03:03:59 -0000 1.6 *************** *** 8,11 **** --- 8,13 ---- Color: LTGRAY value select-backcolor \ selection background color Color: BLACK value select-forecolor \ selection font color + Color: BLACK value browse-forecolor + Color: LTGRAY value browse-backcolor :Class ColorWindow <Super Child-Window *************** *** 32,35 **** --- 34,39 ---- colorwindow selfore-window colorwindow selback-window + colorwindow browse-forewindow + colorwindow browse-backwindow colorobject fore colorobject back *************** *** 37,40 **** --- 41,46 ---- colorobject selfore colorobject selback + colorobject browsefore + colorobject browseback *************** *** 45,48 **** --- 51,56 ---- color: selfore to select-forecolor color: selback to select-backcolor + color: browsefore to browse-forecolor + color: browseback to browse-backcolor detached? >r \ save it for a moment *************** *** 67,70 **** --- 75,80 ---- getid: btnSelectFore of choose: selfore if color: selfore paint: selfore-window then endof getid: btnSelectBack of choose: selback if color: selback paint: selback-window then endof + getid: btnBrowseBack of choose: browseback if color: browseback paint: browse-backwindow then endof + getid: btnBrowseFore of choose: browsefore if color: browsefore paint: browse-forewindow then endof getid: btncancel of close: self endof getid: btnok of savecolors close: self endof *************** *** 91,94 **** --- 101,106 ---- select-forecolor newcolor: selfore select-backcolor newcolor: selback + browse-forecolor newcolor: browsefore + browse-backcolor newcolor: browseback 100 setid: fore-window *************** *** 117,120 **** --- 129,142 ---- select-backcolor paint: selback-window + 105 setid: browse-forewindow + self start: browse-forewindow + browseforechildx browseforechildy browseforechildw browseforechildh move: browse-forewindow + browse-forecolor paint: browse-forewindow + + 106 setid: browse-backwindow + self start: browse-backwindow + browsebackchildx browsebackchildy browsebackchildw browsebackchildh move: browse-backwindow + browse-backcolor paint: browse-backwindow + ;m *************** *** 123,127 **** : IDEOptions ( -- ) GetHandle: MainWindow SetParentWindow: IDEPreferencesForm ! start: IDEPreferencesForm ; IDM_PREFERENCES SetCOmmand \s --- 145,149 ---- : IDEOptions ( -- ) GetHandle: MainWindow SetParentWindow: IDEPreferencesForm ! start: IDEPreferencesForm ; IDM_PREFERENCES SetCommand \s Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** EdMenu.f 2 Sep 2008 07:11:52 -0000 1.29 --- EdMenu.f 8 Sep 2008 03:03:59 -0000 1.30 *************** *** 81,84 **** --- 81,85 ---- Popup "&Project" MenuItem "&New project... \tCtrl+N" IDM_NEW_PRJ DoCommand ; + MenuItem "&Close project " IDM_CLOSE_PRJ DoCommand ; MenuSeparator MenuItem "&Open project... \tCtrl+O" IDM_OPEN_PRJ DoCommand ; *************** *** 94,98 **** MenuSeparator MenuItem "&New Module... \tCtrl+M" IDM_NEW_MODULE_PRJ DoCommand ; - MenuItem "Navigator" IDM_NAVIGATOR DoCommand ; MenuSeparator MenuItem "&Add files to project... \tCtrl+A" IDM_ADD_PRJ DoCommand ; --- 95,98 ---- *************** *** 186,190 **** :MenuItem mp_compileSel "Compile selected &text" IDM_COMPILE_SELECTION DoCommand ; MenuSeparator ! MenuItem "Bookmarks" IDM_NAVIGATOR DoCommand ; MenuSeparator :MenuItem mp_setbp "&Set breakpoint...\tCTRL+B" IDM_SET_BREAK_POINT DoCommand ; --- 186,190 ---- :MenuItem mp_compileSel "Compile selected &text" IDM_COMPILE_SELECTION DoCommand ; MenuSeparator ! MenuItem "BookMarks" IDM_BOOKMARKS DoCommand ; MenuSeparator :MenuItem mp_setbp "&Set breakpoint...\tCTRL+B" IDM_SET_BREAK_POINT DoCommand ; |
|
From: Ezra B. <ezr...@us...> - 2008-09-08 03:02:40
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31849/apps/Win32ForthIDE Modified Files: EdTabControl.f Added Files: EdBookmarks.f ProjectWindow.f Removed Files: EdNavigator.f Log Message: IDE updates. EAB --- NEW FILE: ProjectWindow.f --- \ ProjectWindow.f \ * *********************** Project Navigator ********************************** \ \ Allows quick navigating between code in a project. When editing files in a large \ project sometimes remembering where a word was defined can be challenging. You \ can find yourself opening many files and browsing through them to find the word. \ Project navigator keeps tracks of various code routines and by double clicking \ in the navigator tree on the desired word the file is open to the position of \ the word. \ \ \ Usage: After starting Navigator click "Track" to build code tree. Note that \ doing so clears the entire tree. By default library files used by a project are \ not scanned. This however, can be enabled in the Preferences dialog. Note too \ that this option is not saved when the IDE is closed. \ \ \ Sunday, April 27 2008 - 22:25 - Have been noticing some inconsistencies when clicking \ in the navigator tree to go to a file. Cursor is not always position correctly; you \ have to click and pause then double-click to open file. This is whether I double-click \ or right click on an item. Tests indicate it may be timing issues or something. \ For now I've added a button to goto a position. It seem more consistent than the \ tree clicking, even though some peculiarities still seem to be lurking around. \ I will continue to work on it. \ \ * **************************************************************************** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ the Project Treeview control \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ fload ProjectTree.f :object ManagerWindow <Super ProjectTreeViewControl :M ExWindowStyle: ( -- ) WS_EX_CLIENTEDGE ;M :M Handle_Notify: ( h m w l -- f ) \ Handle the notification messages of the treeview control. \ dup GetNotifyCode NM_DBLCLK = \ if IDM_EXECUTEFILE_PRJ DoCommand false \ else Handle_Notify: super \ then ;M Handle_Notify: super ;M ;object PushButton btnTrack PushButton btnGoto StatusBar NavigatorBar create curfilename max-path allot create currentname max-path allot -1 value markerhandle create lastword$ 0 , 100 allot create parentclass 0 , 100 allot \ parent class or object of method defer OpenSource \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ \\\\\ Tree Item object \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ :Class Codeitem <Super Object record: iteminfo max-path bytes itemname int parenttree \ parent treeview control int parentitem \ parent item in treeview control int hwnditem \ handle for item int linenumber int markerhandle \ scintilla control handle int itemid \ item id max-path bytes linetext max-path bytes filename ;recordsize: sizeof(iteminfo) :M classinit: ( -- ) classinit: Super iteminfo sizeof(iteminfo) erase -1 to markerhandle ;M :M setname: ( addr cnt -- ) itemname maxstring erase maxstring min 0max itemname swap move ;M :M getname: ( -- addrz ) itemname ;M :M getname$: ( -- addrz ) itemname zcount ;M :M isparentitem: ( n -- ) to parentitem ;M :M parentitem: ( -- n ) parentitem ;M :M isparenttree: ( n -- ) to parenttree ;M :M parenttree: ( -- n ) parenttree ;M :M handle: ( -- hwnd ) hwnditem ;M :M ishandle: ( n -- ) to hwnditem ;M :M itemid: ( -- f ) itemid ;M :M isitemid: ( f -- ) to itemid ;M :M linenumber: ( -- n ) linenumber ;M :M islinenumber: ( n -- ) to linenumber ;M :M linetext: ( -- addr count ) linetext count ;M :M islinetext: ( addr count-- ) linetext place ;M :M filename: ( -- addr count ) filename count ;M :M isfilename: ( addr count-- ) filename place ;M :M markerhandle: ( -- n ) markerhandle ;M :M ismarkerhandle: ( n -- ) to markerhandle ;M ;class :object NavigatorTree <Super TreeViewControl \ 1. Colon Definitions/Code \ 2. Values/Variables/Constants/Creates/Ints \ 3. Objects/Classes \ 4. Privates/Publics (Methods, Colon Definitions) int hwndmain \ handle of root item in tree \ pointers to dynamic parent list int MainList int CodeList int GlobalDataList int PrivateDataList int ClassesList int MethodsList int PrivateCodeList false value in-class? false value in-definition? false value in-enum? 0 value code-id 0 value ThisItem 1 to enum-value enum: _colon _code _value _variable _constant _method _class _object _create _int _bytes _short _dint _byte _2value ; \ enumerate parent ids -32 to enum-value enum: _main_ _code_ _pdata_ \ private data list _gdata_ \ global data list _classes_ _Methods_ _pcodelist_ ; create treename ," Code Tracker" 33 allot create default-treename ," Code Tracker" :M CodeList: ( -- list ) CodeList ;M :M PrivateDataList: ( -- list ) PrivateDataList ;M :M GlobalDataList: ( -- list ) GlobalDataList ;M :M ClassesList: ( -- list ) ClassesList ;M :M MethodsList: ( -- list ) MethodsList ;M :M MainList: ( -- list ) MainList ;M : AddChildItem ( -- ) tvins /tvins erase tvitem /tvitem erase 0 to cChildren Handle: ThisList to hParent TVI_LAST to hInsertAfter GetName: ThisItem to pszText ThisItem to lparam [ TVIF_TEXT TVIF_CHILDREN or TVIF_PARAM or ] literal to mask tvitem->tvins InsertItem: Self IsHandle: ThisItem ; : UpdateList ( f -- ) ThisList IsParentItem: ThisItem Self IsParentTree: ThisItem currentname count SetName: ThisItem code-id isitemid: ThisItem source islinetext: ThisItem #linecount islinenumber: ThisItem markerhandle ismarkerhandle: ThisItem curfilename count isfilename: ThisItem AddChildItem ; :M AddItem: ( parentlist -- ) to ThisList Data@: ThisList if AddLink: ThisList then New> CodeItem dup Data!: ThisList to ThisItem UpdateList ;M :M AddCode: ( -- ) \ global definitions CodeList AddItem: Self ;M :M AddPrivateCode: ( -- ) PrivateCodeList AddItem: Self ;M :M AddPrivateData: ( -- ) PrivateDataList AddItem: Self ;M :M AddGlobalData: ( -- ) GlobalDataList AddItem: Self ;M :M AddMethod: ( -- ) MethodsList AddItem: Self ;M :M AddClass: ( -- ) ClassesList AddItem: Self ;M :M WindowStyle: ( -- style ) WindowStyle: Super WS_BORDER invert and \ remove WS_BORDER style WS_CLIPCHILDREN or [ TVS_HASLINES TVS_HASBUTTONS or TVS_DISABLEDRAGDROP or TVS_SHOWSELALWAYS or TVS_LINESATROOT or ] LITERAL or ;M : AddParentItem ( lparam hAfter hParent nChildren -- hwnd ) tvins /tvins erase tvitem /tvitem erase ( nChildren) to cChildren ( hParent) to hParent ( hAfter) to hInsertAfter ( lparam) to lparam getname: lparam to pszText [ TVIF_TEXT TVIF_CHILDREN or TVIF_PARAM or TVIF_STATE or ] LITERAL to mask TVIS_BOLD dup to state to statemask tvitem->tvins InsertItem: Self ; : AddParentLists ( -- ) MainList TVI_LAST TVI_ROOT 1 AddParentItem dup to hwndmain isHandle: MainList ClassesList TVI_LAST hwndmain 1 AddParentItem isHandle: ClassesList MethodsList TVI_LAST hwndmain 1 AddParentItem isHandle: MethodsList CodeList TVI_LAST hwndmain 1 AddParentItem isHandle: CodeList PrivateCodeList TVI_LAST hwndmain 1 AddParentItem isHandle: PrivateCodeList GlobalDataList TVI_LAST hwndmain 1 AddParentItem isHandle: GlobalDataList PrivateDataList TVI_LAST hwndmain 1 AddParentItem isHandle: PrivateDataList ; :M SortParentLists: ( -- ) \ Sort the content of the lists handle: GlobalDataList SortChildren: Self handle: PrivateDataList SortChildren: Self handle: MethodsList SortChildren: Self handle: ClassesList SortChildren: Self handle: Codelist SortChildren: Self handle: PrivateCodeList SortChildren: Self ;M :M Classinit: ( -- ) Classinit: Super 0 to SelectedItem ;M : DisposeLists ( -- ) MainList 0= ?exit CodeList DisposeList 0 to CodeList PrivateCodeList DisposeList 0 to PrivateCodeList GlobalDataList DisposeList 0 to GlobalDataList PrivateDataList DisposeList 0 to PrivateDataList MethodsList DisposeList 0 to MethodsList ClassesList DisposeList 0 to ClassesList Mainlist DisposeList 0 to Mainlist ; :M setname: ( addr cnt -- ) treename place ;M : CreateTree ( -- ) _main_ treename count new> treelinked-list to MainList _code_ s" Global Definitions" new> treelinked-list to CodeList _pcodelist_ s" Private Definitions" new> treelinked-list to PrivateCodeList _gdata_ s" Global Data" new> treelinked-list to GlobalDataList _pdata_ s" Private Data" new> treelinked-list to PrivateDataList _Methods_ s" Methods" new> treelinked-list to MethodsList _classes_ s" Objects & Classes" new> treelinked-list to ClassesList ; :M Start: ( parent -- ) Start: Super CreateTree AddParentLists ;M :M Close: ( -- ) DisposeLists Close: Super ;M :M On_SelChanged: ( -- f ) lparamNew to SelectedItem itemid: SelectedItem 0> if s" File: " pad place Filename: SelectedItem "to-pathend" pad +place s" , Line#: " pad +place LineNumber: SelectedItem (.) pad +place pad count else s" " then asciiz SetText: NavigatorBar false ;M :M SelectedItem: ( -- n ) SelectedItem ;M :M Clear: ( -- ) TVI_ROOT DeleteItem: Self drop DisposeLists CreateTree AddParentLists parentclass off default-treename count treename place ;M : not-in-class ( -- ) false to in-class? parentclass off ; : +parent-class ( -- ) s" (" currentname +place parentclass count currentname +place s" )" currentname +place ; : data-add ( -- ) in-class? if +parent-class AddPrivateData: Self else AddGlobalData: Self then ; : add-code { cid -- } in-definition? ?exit \ should not happen! bl word dup c@ 0= abort" Add Code error!" count currentname place cid to code-id true to in-definition? in-class? if +parent-class AddPrivateCode: Self else AddCode: Self then ; : add-data { cid -- } in-definition? ?exit bl word dup c@ 0= abort" Add data error!" count currentname place cid to code-id data-add ; : add-class { cid -- } in-class? ?exit bl word dup c@ 0= abort" Add Class\Object error!" count currentname place currentname count parentclass place cid to code-id true to in-class? AddClass: Self ; : add-method ( -- ) in-definition? ?exit in-class? not ?exit bl word dup c@ 0= abort" Add Method error!" count currentname place +parent-class _method to code-id true to in-definition? AddMethod: Self ; : ?add-word ( a -- ) comment? if drop exit then Case s" :" "of _colon add-code EndOf s" :code" "of _code add-code EndOf s" ;" "of false to in-definition? false to in-enum? EndOf s" ;code" "of false to in-definition? EndOf s" :class" "of _class add-class EndOf s" :object" "of _object add-class EndOf s" ;class" "of not-in-class EndOf s" ;object" "of not-in-class EndOf s" :m" "of add-method EndOf s" ;m" "of false to in-definition? EndOf s" value" "of _value add-data EndOf s" variable" "of _variable add-data EndOf s" constant" "of _constant add-data EndOf s" create" "of _create add-data EndOf s" 2value" "of _2value add-data EndOf s" int" "of in-class? if _int add-data then EndOf s" bytes" "of in-class? if _bytes add-data then EndOf s" short" "of in-class? if _short add-data then EndOf s" byte" "of in-class? if _byte add-data then EndOf s" dint" "of in-class? if _dint add-data then EndOf s" enum:" "of in-definition? not to in-enum? EndOf s" setcommand" "of lastword$ uppercase count currentname place \ any vector tables _constant to code-id data-add EndOF in-enum? if count currentname place _constant to code-id data-add false then dup if count lastword$ place \ save word false then EndCase ; \ // -- -1 \S \ ( 1 ) \ (( 2 )) \ /* 4 */ \ (* 8 *) \ comment: 16 comment; \ DOC 32 ENDDOC : +Comment ( n -- ) comment? IF drop ELSE comment? or to comment? THEN ; : -Comment ( n -- ) invert comment? and to comment? ; : \Comment ( -- ) comment? 0= IF source nip >in ! THEN ; \ ignore till end of line : build-NavigatorTree ( -- ) bl word dup count lower dup c@ IF Case s" \" "of \comment EndOf s" //" "of \comment EndOf s" --" "of \comment EndOf s" \s" "of -1 +Comment EndOf s" (" "of 1 +Comment EndOf s" )" "of 1 -Comment EndOf s" ((" "of 2 +Comment EndOf s" ))" "of 2 -Comment EndOf s" /*" "of 4 +Comment EndOf s" */" "of 4 -Comment EndOf s" (*" "of 8 +Comment EndOf s" *)" "of 8 -Comment EndOf s" comment:" "of 16 +Comment EndOf s" comment;" "of 16 -Comment EndOf s" doc" "of 32 +Comment EndOf s" enddoc" "of 32 -Comment EndOf ( default ) ?add-word false EndCase ELSE drop THEN ; : .trackmessage ( fname cnt -- ) s" Tracking " pad place "to-pathend" pad +place s" ..." pad +place pad count asciiz SetText: NavigatorBar ; :M TrackCode: ( fname cnt -- ) curfilename place curfilename c@ 0= ?exitm curfilename count .trackmessage false to comment? 0 to #linecount curfilename count "open if drop exitm then source-ID >r to source-ID >in @ >r source 2>r \ save current source new$ (source) cell+ ! refill if 1 +to #linecount then begin more? dup 0= if drop refill dup if 1 +to #linecount \ bump line count then then while build-NavigatorTree repeat source-id close-file drop 2r> (source) 2! r> >in ! r> to source-id SortParentLists: Self 0 to selecteditem z" " SetText: NavigatorBar ;M ;object \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ \\\\\ Top window pane \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ :Object NavigatorWindow <Super Child-Window ColorObject FrmColor \ the background color :M ExWindowStyle: ( -- style ) ExWindowStyle: Super WS_EX_CLIENTEDGE or ;M :M On_Paint: ( -- ) 0 0 Width Height FrmColor FillArea: dc ;M :M On_Init: ( -- ) \ prevent flicker in window on sizing CS_DBLCLKS GCL_STYLE hWnd Call SetClassLong drop \ set form color to system color COLOR_BTNFACE Call GetSysColor NewColor: FrmColor self Start: NavigatorTree self Start: btnTrack s" Track" SetText: btnTrack Handle: TabFont SetFont: btnTrack self Start: btnGoto s" Goto" SetText: btnGoto Handle: TabFont SetFont: btnGoto self Start: NavigatorBar ;M :m On_Size: ( -- ) Redraw: NavigatorBar 0 25 Width Height 25 - Height: NavigatorBar - Move: NavigatorTree 0 0 75 24 Move: btnTrack 77 0 75 24 Move: btnGoto ;M : ShowFile { \ item -- } SelectedItem: NavigatorTree dup to item 0= ?exit \ should not be ItemID: item 0 <= ?exit \ listname FileName: item OpenSource LineNumber: item 1- GotoLine: CurrentWindow SetFocus: CurrentWindow ; :M ShowFile: ( -- ) ShowFile ;M :M WM_NOTIFY ( h m w l -- f ) dup GetNotifyWnd GetHandle: NavigatorTree <> if false exitm then Handle_Notify: NavigatorTree ;M :M Close: ( -- ) Close: NavigatorTree Close: super ;M ;Object : LibFile? ( a n - f ) "path-only" dup 7 - /string s" src\lib" caps-compare 0= ; : Track-Project-Files { \ ilist item -- } ProjectName: TheProject SetName: NavigatorTree Clear: NavigatorTree ModuleList: TheProject to ilist #items: ilist 1+ 1 ?do i >Link#: ilist Data@: ilist to item GetName$: item 2dup LibFile? not include-libs? or if TrackCode: NavigatorTree else 2drop then loop Handle: [ MainList: NavigatorTree ] ExpandItem: NavigatorTree ; \ IDM_BUILD_CODE_TREE SetCommand : Track-Opened-Files { \ ThisFile -- } s" Opened Files" SetName: NavigatorTree Clear: NavigatorTree GetTabCount: OpenFilesTab 1+ 0 do TCIF_PARAM IsMask: OpenFilesTab i GetTabInfo: OpenFilesTab Lparam: OpenFilesTab dup to ThisFile if GetFileType: ThisFile FT_SOURCE = if GetFileName: ThisFile count TrackCode: NavigatorTree then then loop ; : BuildNavigatorTree ( -- ) Clear: NavigatorTree GetBuildFile: TheProject nip if Track-Project-Files else GetTabCount: OpenFilesTab 0> if Track-Opened-Files then then ; ' BuildNavigatorTree SetFunc: btnTrack : ShowFile ( -- ) ShowFile: NavigatorWindow ; ' ShowFile SetFunc: btnGoto :Object ProjectWindow <Super Child-Window TabControl ProjectTab :M WndClassStyle: ( -- style ) \ Set the style member of the the WNDCLASS structure. CS_DBLCLKS ;M :M ReSize: ( -- ) \ Resize the controls within the main window. AutoSize: ProjectTab ClientSize: ProjectTab 2over d- ( x y w h ) 4dup Move: ManagerWindow Move: NavigatorWindow ;M :M On_Size: ( -- ) \ Handle the WM_SIZE message. ReSize: self Paint: ProjectTab ;M : ShowManager ( -- ) SW_SHOW Show: ManagerWindow \ show before hide SW_HIDE Show: NavigatorWindow ; : ShowNavigator ( -- ) SW_SHOW Show: NavigatorWindow SW_HIDE Show: ManagerWindow ; :M SelChange: ( -- ) \ Show the control for the currently selected tab. GetSelectedTab: ProjectTab case 0 of ShowManager endof 1 of ShowNavigator endof endcase ;M \ : selchange-func { lParam obj \ Parent -- false } \ This function es executed when the currently selected tab has changed. \ lParam is the adress of the Address of an NMHDR structure. \ obj is the address of the TabControl object that has send the \ notification message. GetParent: obj to Parent SelChange: Parent false ; :M ShowTab: ( n -- ) \ show tab n SetSelectedTab: ProjectTab SelChange: self ;M :M On_Init: ( -- ) self Start: ManagerWindow self Start: NavigatorWindow TCS_FLATBUTTONS AddStyle: ProjectTab self Start: ProjectTab Handle: TabFont SetFont: ProjectTab ['] selchange-func IsChangeFunc: ProjectTab TCIF_TEXT IsMask: ProjectTab z" Manager" IsPszText: ProjectTab 1 InsertTab: ProjectTab TCIF_TEXT IsMask: ProjectTab z" Navigator" IsPszText: ProjectTab 2 InsertTab: ProjectTab SelChange: self \ show the control for the currently selected tab ;M :M ExWindowStyle: ( -- style ) ExWindowStyle: Super WS_EX_CLIENTEDGE or ;M :M On_Paint: ( -- ) 0 0 Width Height white FillArea: dc ;M :M WM_NOTIFY ( h m w l -- f ) \ Handle the notification messages of the controls. dup GetNotifyWnd GetHandle: ManagerWindow = if Handle_Notify: ManagerWindow else dup GetNotifyWnd GetHandle: ProjectTab = if Handle_Notify: ProjectTab else false then then ;M :M Close: ( -- ) Close: ManagerWindow Close: NavigatorWindow Close: Super ;M :M On_Done: ( -- ) On_Done: Super ;M ;Object \s Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** EdTabControl.f 11 Aug 2008 17:46:18 -0000 1.20 --- EdTabControl.f 8 Sep 2008 03:02:34 -0000 1.21 *************** *** 146,171 **** ;class ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ the Project Treeview control ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! ! fload ProjectTree.f ! ! :class ProjectWindow <Super ProjectTreeViewControl ! ! :M ExWindowStyle: ( -- ) ! WS_EX_CLIENTEDGE ;M ! ! :M Handle_Notify: ( h m w l -- f ) ! \ Handle the notification messages of the treeview control. ! \ dup GetNotifyCode NM_DBLCLK = ! \ if IDM_EXECUTEFILE_PRJ DoCommand false ! \ else Handle_Notify: super ! \ then ;M ! Handle_Notify: super ! ;M ! ! ;class ! fload edfilepane.f fload edforthform.f --- 146,150 ---- ;class ! fload ProjectWindow.f fload edfilepane.f fload edforthform.f *************** *** 191,195 **** TabControlEx cTab FileListView cFileList ! ProjectWindow cProjectTree ClassBrowserWindow cClassTree ClassBrowserWindow cVocTree --- 170,174 ---- TabControlEx cTab FileListView cFileList ! \ ProjectWindow ProjectWindow ClassBrowserWindow cClassTree ClassBrowserWindow cVocTree *************** *** 206,210 **** ClientSize: cTab 2over d- ( x y w h ) 4dup Move: cFileList ! 4dup Move: cProjectTree 4dup Move: cClassTree 4dup Move: cVocTree --- 185,189 ---- ClientSize: cTab 2over d- ( x y w h ) 4dup Move: cFileList ! 4dup Move: ProjectWindow 4dup Move: cClassTree 4dup Move: cVocTree *************** *** 222,226 **** : ShowFiles ( -- ) SW_SHOW Show: cFileList \ show before hide ! SW_HIDE Show: cProjectTree SW_HIDE Show: cVocTree SW_HIDE Show: cClassTree --- 201,205 ---- : ShowFiles ( -- ) SW_SHOW Show: cFileList \ show before hide ! SW_HIDE Show: ProjectWindow SW_HIDE Show: cVocTree SW_HIDE Show: cClassTree *************** *** 231,235 **** : ShowProject ( -- ) ! SW_SHOW Show: cProjectTree SW_HIDE Show: cFileList SW_HIDE Show: cVocTree --- 210,214 ---- : ShowProject ( -- ) ! SW_SHOW Show: ProjectWindow SW_HIDE Show: cFileList SW_HIDE Show: cVocTree *************** *** 243,247 **** SW_SHOW Show: cVocTree SW_HIDE Show: cFileList ! SW_HIDE Show: cProjectTree SW_HIDE Show: cClassTree SW_HIDE Show: TheFolderView --- 222,226 ---- SW_SHOW Show: cVocTree SW_HIDE Show: cFileList ! SW_HIDE Show: ProjectWindow SW_HIDE Show: cClassTree SW_HIDE Show: TheFolderView *************** *** 253,257 **** SW_SHOW Show: cClassTree SW_HIDE Show: cFileList ! SW_HIDE Show: cProjectTree SW_HIDE Show: cVocTree SW_HIDE Show: TheFolderView --- 232,236 ---- SW_SHOW Show: cClassTree SW_HIDE Show: cFileList ! SW_HIDE Show: ProjectWindow SW_HIDE Show: cVocTree SW_HIDE Show: TheFolderView *************** *** 264,268 **** SW_HIDE Show: cClassTree SW_HIDE Show: cFileList ! SW_HIDE Show: cProjectTree SW_HIDE Show: cVocTree detached? not --- 243,247 ---- SW_HIDE Show: cClassTree SW_HIDE Show: cFileList ! SW_HIDE Show: ProjectWindow SW_HIDE Show: cVocTree detached? not *************** *** 276,280 **** SW_HIDE Show: cClassTree SW_HIDE Show: cFileList ! SW_HIDE Show: cProjectTree SW_HIDE Show: cVocTree SW_HIDE Show: TheFolderView --- 255,259 ---- SW_HIDE Show: cClassTree SW_HIDE Show: cFileList ! SW_HIDE Show: ProjectWindow SW_HIDE Show: cVocTree SW_HIDE Show: TheFolderView *************** *** 326,333 **** else dup GetNotifyWnd GetHandle: cVocTree = if Handle_Notify: cVocTree ! else dup GetNotifyWnd GetHandle: cProjectTree = ! if Handle_Notify: cProjectTree ! else false ! then then then then then ;M :M AddFormTab: ( -- ) --- 305,313 ---- else dup GetNotifyWnd GetHandle: cVocTree = if Handle_Notify: cVocTree ! else \ dup GetNotifyWnd GetHandle: ProjectWindow = ! \ if Handle_Notify: ProjectWindow ! \ else ! false ! then then then then ;M :M AddFormTab: ( -- ) *************** *** 346,350 **** :M On_Init: ( -- ) self Start: cFileList ! self Start: cProjectTree self Start: cVocTree self Start: cClassTree --- 326,330 ---- :M On_Init: ( -- ) self Start: cFileList ! self Start: ProjectWindow self Start: cVocTree self Start: cClassTree --- NEW FILE: EdBookmarks.f --- \ EdBookMarks.f \ Bookmarking allows setting markers at points anywhere in a source file for quick \ navigating. \ Click "Add Bookmark" to save the position of the current line in the current \ file as a bookmark. To return to a saved bookmark click on the desired mark. \ \ "Clear BookMarks" does as it says, clears all bookmarks from all open files. PushButton btnAddBookMark PushButton btnClearBookMarks :Object BookMarksWindow <Super Window 0 value BookMarkList Listbox BMListBox ColorObject FrmColor \ the background color 0 value ThisItem : UpdateList ( -- ) currentname count SetName: ThisItem source islinetext: ThisItem #linecount islinenumber: ThisItem curfilename count isfilename: ThisItem markerhandle ismarkerhandle: ThisItem ; : Addbookmark ( -- ) Data@: BookMarkList if AddLink: BookMarkList then New> CodeItem dup Data!: BookMarkList to ThisItem updatelist linetext: thisitem asciiz addstringto: BMListBox ; :M ExWindowStyle: ( -- style ) ExWindowStyle: Super WS_EX_CLIENTEDGE or ;M :M On_Paint: ( -- ) 0 0 Width Height FrmColor FillArea: dc ;M :M StartSize: ( -- width height ) BookMarksSize ;M :M StartPos: ( -- x y ) BookMarksPos ;M :M WindowTitle: ( -- ztitle ) z" Bookmarks" ;M :M On_Done: ( -- ) originx originy 2to BookMarksPos Width Height 2to BookMarksSize On_Done: Super ;M :m On_Init: ( -- ) New> Linked-List to BookMarkList CS_DBLCLKS GCL_STYLE hWnd Call SetClassLong drop \ set form color to system color COLOR_BTNFACE Call GetSysColor NewColor: FrmColor self Start: BMListBox Handle: TabFont SetFont: BMListBox self Start: btnAddBookMark s" Add Bookmark" SetText: btnAddBookMark Handle: TabFont SetFont: btnAddBookMark self Start: btnClearBookMarks s" Clear Bookmarks" SetText: btnClearBookMarks Handle: TabFont SetFont: btnClearBookMarks ;m :m on_size: ( -- ) 0 0 100 24 Move: btnAddBookMark 102 0 100 24 Move: btnClearBookMarks 0 25 width height 25 - Move: BMListBox ;m : -leading ( addr cnt -- addr2 cnt2 ) \ remove leading blanks and tabs dup 0 ?do over i + c@ bl <= if 1 /string else leave \ leave if not bl or tab then loop ; : add-bookmark ( -- ) ActiveChild 0= ?exit GetFileType: ActiveChild FT_SOURCE <> ?exit GetFileName: ActiveChild count curfilename place GetCurrentLine: ActiveChild dup to #linecount LineLength: CurrentWindow cell+ malloc >r #linecount r@ GetLine: CurrentWindow 2 - 0max r@ swap ( -- addr len ) -leading maxstring min 0max 2dup currentname place 0 #linecount SCI_MARKERADD GetHandle: CurrentWindow call SendMessage to markerhandle source 2>r (source) 2! AddBookMark -1 to markerhandle \ reset it 2r> (source) 2! r> release ; :M BookMark: ( -- ) add-bookmark ;M :M ClearBookMarks: { \ this -- } Clear: BMListBox GetTabCount: OpenFilesTab dup 0> if 1+ 0 do TCIF_PARAM IsMask: OpenFilesTab i GetTabInfo: OpenFilesTab Lparam: OpenFilesTab to this This if GetFileType: This FT_SOURCE = if ChildWindow: This GetHandle: [ ] >r 0 -1 SCI_MARKERDELETEALL r> Call SendMessage drop then then loop else drop then ;M :M Close: ( -- ) ClearBookMarks: self Close: BMListBox BookMarkList DisposeList Close: super ;M : ShowFile { \ item -- } FileName: Thisitem (OpenSourceFile) markerhandle: Thisitem dup 0< if drop LineNumber: Thisitem else 0 swap SCI_MARKERLINEFROMHANDLE GetHandle: CurrentWindow call SendMessage dup 0< if drop LineNumber: Thisitem then then GotoLine: CurrentWindow SetFocus: CurrentWindow ; :M WM_COMMAND ( h m w l -- f ) over LOWORD GetID: BMListBox = if over HIWORD LBN_SELCHANGE = if GetSelection: BMListBox dup LB_ERR <> if 1+ >Link#: BookMarkList Data@: BookMarkList to ThisItem ShowFile else drop then then then false ;M ;Object : add-bookmark ( -- ) BookMark: BookMarksWindow ; IDM_SET_BOOKMARK SetCommand ' add-bookmark SetFunc: btnAddBookMark : clear-bookmarks ( -- ) ClearBookMarks: BookMarksWindow ; ' clear-bookmarks SetFunc: btnClearBookMarks : BookMarker ( -- ) GetHandle: MainWindow SetParentWindow: BookMarksWindow Start: BookMarksWindow ; IDM_BOOKMARKS SetCommand \s --- EdNavigator.f DELETED --- |
|
From: Ezra B. <ezr...@us...> - 2008-09-02 03:18:00
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15001/apps/Win32ForthIDE Modified Files: Main.f Log Message: Splitter windows for the IDE. Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** Main.f 31 Aug 2008 02:30:32 -0000 1.56 --- Main.f 2 Sep 2008 03:17:56 -0000 1.57 *************** *** 76,79 **** --- 76,84 ---- 3 constant FT_BITMAP + 0 constant NO_SPLIT + 1 constant HORIZ_SPLIT + 2 constant VERT_SPLIT + + defer Compile-File ' beep is Compile-File defer HandleW32FMsg ' noop is HandleW32FMsg *************** *** 899,902 **** --- 904,910 ---- ChildWindow ;M + :M GetSplitType: ( -- n ) + NO_SPLIT ;M + ;Class *************** *** 909,912 **** --- 917,921 ---- fload EdHexViewer.f fload EdImageWindow.f + needs EdSplitterWindow.f \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ |
|
From: Ezra B. <ezr...@us...> - 2008-09-02 03:16:28
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14381/apps/Win32ForthIDE Modified Files: EdMenu.f Log Message: Splitter windows for the IDE. Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** EdMenu.f 27 Jul 2008 07:21:50 -0000 1.27 --- EdMenu.f 2 Sep 2008 03:16:24 -0000 1.28 *************** *** 188,191 **** --- 188,193 ---- :MenuItem mp_compileSel "Compile selected &text" IDM_COMPILE_SELECTION DoCommand ; MenuSeparator + MenuItem "Bookmarks" IDM_NAVIGATOR DoCommand ; + MenuSeparator :MenuItem mp_setbp "&Set breakpoint...\tCTRL+B" IDM_SET_BREAK_POINT DoCommand ; :MenuItem mp_debug "&Debug...\tF11" IDM_DEBUG DoCommand ; *************** *** 197,200 **** --- 199,206 ---- :MenuItem mf_cascade "Ca&scade" IDM_CASCADE DoCommand ; MenuSeparator + :MenuItem mf_split_hor "Dual View Horizontal" IDM_SPLIT_HORIZONTAL DoCommand ; + :MenuItem mf_split_ver "Dual View Vertical" IDM_SPLIT_VERTICAL DoCommand ; + :MenuItem mf_split_none "Single View" IDM_NO_SPLIT_WINDOW DoCommand ; + MenuSeparator :MenuItem mf_close_all "&Close all" IDM_CLOSE_ALL DoCommand ; *************** *** 321,324 **** --- 327,334 ---- dup Enable: mp_compileSel + dup Enable: mf_split_hor + dup Enable: mf_split_ver + dup Enable: mf_split_none + \ Help menu \ [cdo] dup Enable: mp_anshelp |
|
From: Ezra B. <ezr...@us...> - 2008-09-02 03:15:18
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13420/apps/Win32ForthIDE Modified Files: CommandID.f EdVersion.f Added Files: EDSplitterWindow.f Log Message: Splitter windows for the IDE. Index: EdVersion.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdVersion.f,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** EdVersion.f 24 Aug 2008 05:07:27 -0000 1.10 --- EdVersion.f 2 Sep 2008 03:15:10 -0000 1.11 *************** *** 314,315 **** --- 314,317 ---- on a form or control to bring up the Form Code Editor. - Beginnings of documentation for the IDE written. + Saturday, August 30 2008 + - Added splitter windows to the editor. Available from the Windows menu. Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** CommandID.f 24 Aug 2008 05:07:27 -0000 1.18 --- CommandID.f 2 Sep 2008 03:15:09 -0000 1.19 *************** *** 112,115 **** --- 112,119 ---- NewID IDM_CLOSE_ALL + NewID IDM_SPLIT_HORIZONTAL + NewID IDM_SPLIT_VERTICAL + NewId IDM_NO_SPLIT_WINDOW + \ Help menu \ [cdo]NewID IDM_W32F_ANS_HELP --- NEW FILE: EDSplitterWindow.f --- \ EdSplitterWindow.f \ Allow dual viewing and editing of a file. :Class WindowPane <Super Child-Window int TheEditor :M ExWindowStyle: ( -- style ) ExWindowStyle: Super WS_EX_CLIENTEDGE or ;M :M Classinit: ( -- ) ClassInit: super \ init super class 0 to TheEditor ;M :M On_Init: ( -- ) CS_DBLCLKS GCL_STYLE hWnd Call SetClassLong drop hwnd GetHandle: TheEditor Call SetParent drop ;M :M On_Size: ( -- ) 0 0 Width Height Move: TheEditor ;M :M HandleofEditor: ( -- ) GetHandle: TheEditor ;M :M SetEditor: ( addr -- ) \ addr = editor object to TheEditor ;M :M WM_NOTIFY { h m w l \ GrandParent -- } \ let gran take care of it GetParent: Self GetParent: [ ] to GrandParent l w WM_NOTIFY GetHandle: GrandParent Call SendMessage drop ;M ;Class :Class VertSplitterWindow <Super Child-Window int dragging int mousedown 0 value ToolBarHeight \ set to height of toolbar if any 0 value StatusBarHeight \ set to height of status bar if any 250 value LeftWidth 5 value ThicknessV WinSplitter SplitV WindowPane PrimaryPane \ main editing window WindowPane SecondaryPane \ clone editing window : RightXpos ( -- n ) LeftWidth ThicknessV + ; : RightWidth ( -- n ) Width RightXpos - ; : LeftWidthMin ( -- n ) LeftWidth width min ; : StatusBarYpos ( -- n ) height StatusbarHeight - ; : TotalHeight ( -- n ) Height ToolBarHeight - StatusBarHeight - ; : position-windows ( -- ) 0 ToolBarHeight LeftWidthMin TotalHeight Move: PrimaryPane RightXpos ToolBarHeight RightWidth TotalHeight Move: SecondaryPane LeftWidth ToolBarHeight ThicknessV TotalHeight Move: SplitV ; : Splitter ( -- n ) \ the splitter window the cursor is on hWnd get-mouse-xy ToolBarHeight StatusBarYpos within swap LeftWidth RightXpos within and IF 1 ELSE 0 THEN ; : On_Tracking ( -- ) \ set min and max values of LeftWidth here mousedown dragging or 0= ?EXIT dragging IF mousex 0max width min thicknessV 2/ - to LeftWidth THEN position-windows WINPAUSE ; : On_Clicked ( -- ) mousedown not IF hWnd Call SetCapture drop THEN true to mousedown Splitter to dragging On_Tracking ; : On_Unclicked ( -- ) mousedown IF Call ReleaseCapture drop THEN false to mousedown false to dragging ; : On_DblClick ( -- ) false to mousedown Splitter 1 = IF LeftWidth 8 > IF 0 thicknessV 2/ - to LeftWidth ELSE Width thicknessV - 2/ to LeftWidth THEN position-windows THEN ; :M WM_SETCURSOR ( h m w l -- ) Splitter Case 0 of DefWindowProc: self endof 1 of SIZEWE-CURSOR 1 endof EndCase ;M :M Classinit: ( -- ) ClassInit: super \ init super class ['] On_Clicked SetClickFunc: self ['] On_Unclicked SetUnClickFunc: self ['] On_Tracking SetTrackFunc: self ['] On_DblClick SetDblClickFunc: self false to mousedown ;M :M On_Size: ( -- ) position-windows ;M :M On_Init: ( -- ) \ prevent flicker in window on sizing CS_DBLCLKS GCL_STYLE hWnd Call SetClassLong drop self Start: PrimaryPane self Start: SecondaryPane self Start: SplitV \ sync the two editors 0 0 SCI_GETDOCPOINTER HandleOfEditor: PrimaryPane Call SendMessage 0 SCI_SETDOCPOINTER HandleOfEditor: SecondaryPane Call SendMessage drop ;M :M SetEditors: ( addr1 addr2 -- addr ) SetEditor: SecondaryPane SetEditor: PrimaryPane ;M ;Class :Class VSplitterChild <Super HyperEditorChild VertSplitterWindow SplitW ScintillaControl MirrorEditor :M Start: ( parent -- ) Start: super self Start: MirrorEditor ChildWindow MirrorEditor SetEditors: SplitW self Start: Splitw 0 0 Width Height Move: SplitW ChildWindow >r MirrorEditor to ChildWindow InitLexer: self STYLE_DEFAULT z" Fixedsys" StyleSetFont: ChildWindow WordChars 1+ SetWordChars: ChildWindow RefreshColors ShowLineNumbers: ChildWindow r> to ChildWindow ;M :M On_Size: ( h m w l -- h m w l ) 0 0 Width Height Move: SplitW ;M :M WM_UPDATE ( -- ) \ save the current child from global variables Update: self RefreshColors \ main window ChildWindow >r \ save on stack MirrorEditor to ChildWindow RefreshColors \ clone window Update: self r> to ChildWindow \ restore ;M :M GetSplitType: ( -- n ) VERT_SPLIT ;M :M WM_NOTIFY ( h m w l -- res ) dup 2 cells + @ SCN_UPDATEUI = if UpdateStatusBar: self EnableToolbar else 4 cells+ @ dup ?indent ChildWindow >r MirrorEditor to ChildWindow ?indent r> to ChildWindow then false ;M ;Class : NewVSplitWnd ( -- ) New> VSplitterChild to ActiveChild MDIClientWindow: Frame Start: ActiveChild ; :Class HorizSplitterWindow <Super Child-Window WinSplitter SplitterH WindowPane PrimaryPane \ main editor window WindowPane SecondaryPane \ clone editor window 0 value ToolBarHeight \ set to height of toolbar if any 0 value StatusBarHeight \ set to height of status bar if any 200 value TopHeight 5 value ThicknessH int dragging int mousedown : SplitterYpos ( -- n ) ToolBarHeight TopHeight + ; : BottomYpos ( -- n ) SplitterYpos ThicknessH + ; : StatusBarYpos ( -- n ) height StatusbarHeight - ; : BottomHeight ( -- n ) StatusBarYpos BottomYpos - ; : TotalHeight ( -- n ) StatusBarYpos ToolBarHeight - ; : TopHeightMin ( -- n ) TopHeight TotalHeight min ; : position-windows ( -- ) 0 ToolBarHeight Width TopHeightMin Move: PrimaryPane 0 BottomYpos Width BottomHeight Move: SecondaryPane 0 SplitterYpos Width ThicknessH Move: SplitterH ; : Splitter ( -- n ) \ the splitter window the cursor is on hWnd get-mouse-xy dup ToolBarHeight StatusBarYpos within IF SplitterYpos BottomYpos within swap 0 width within and IF 1 ELSE 0 THEN ELSE 2drop 0 THEN ; : On_Tracking ( -- ) \ set min and max values of TopHeight here mousedown dragging or 0= ?EXIT dragging IF mousey ToolBarHeight - 0max TotalHeight min thicknessH 2/ - to TopHeight THEN position-windows WINPAUSE ; : On_Clicked ( -- ) mousedown not IF hWnd Call SetCapture drop THEN true to mousedown Splitter to dragging On_Tracking ; : On_Unclicked ( -- ) mousedown IF Call ReleaseCapture drop THEN false to mousedown false to dragging ; : On_DblClick ( -- ) false to mousedown Splitter 1 = IF TopHeight 8 > IF 0 thicknessH 2/ - to TopHeight ELSE TopHeight BottomHeight + thicknessH - 2/ to TopHeight THEN position-windows THEN ; :M WM_SETCURSOR ( h m w l -- ) Splitter Case 0 of DefWindowProc: self endof 1 of SIZENS-CURSOR 1 endof EndCase ;M :M Classinit: ( -- ) ClassInit: super \ init super class ['] On_Clicked SetClickFunc: self ['] On_Unclicked SetUnClickFunc: self ['] On_Tracking SetTrackFunc: self ['] On_DblClick SetDblClickFunc: self false to mousedown ;M :M On_Size: ( -- ) position-windows ;M :M On_Init: ( -- ) \ prevent flicker in window on sizing CS_DBLCLKS GCL_STYLE hWnd Call SetClassLong drop self Start: PrimaryPane self Start: SecondaryPane self Start: SplitterH \ sync the two editors 0 0 SCI_GETDOCPOINTER HandleOfEditor: PrimaryPane Call SendMessage 0 SCI_SETDOCPOINTER HandleOfEditor: SecondaryPane Call SendMessage drop ;M :M SetEditors: ( addr1 addr2 -- addr ) SetEditor: SecondaryPane SetEditor: PrimaryPane ;M ;Class :Class HSplitterChild <Super HyperEditorChild HorizSplitterWindow SplitW ScintillaControl MirrorEditor :M Start: ( parent -- ) Start: super self Start: MirrorEditor ChildWindow MirrorEditor SetEditors: SplitW self Start: Splitw 0 0 Width Height Move: SplitW ChildWindow >r MirrorEditor to ChildWindow InitLexer: self STYLE_DEFAULT z" Fixedsys" StyleSetFont: ChildWindow WordChars 1+ SetWordChars: ChildWindow RefreshColors ShowLineNumbers: ChildWindow r> to ChildWindow ;M :M On_Size: ( h m w l -- h m w l ) 0 0 Width Height Move: SplitW ;M :M WM_UPDATE ( -- ) \ save the current child from global variables Update: self RefreshColors \ main window ChildWindow >r \ save on stack MirrorEditor to ChildWindow RefreshColors \ clone window Update: self r> to ChildWindow \ restore ;M :M GetSplitType: ( -- n ) HORIZ_SPLIT ;M :M WM_NOTIFY ( h m w l -- res ) dup 2 cells + @ SCN_UPDATEUI = if UpdateStatusBar: self EnableToolbar else 4 cells+ @ dup ?indent ChildWindow >r MirrorEditor to ChildWindow ?indent r> to ChildWindow then false ;M ;Class : NewHSplitWnd ( -- ) New> HSplitterChild to ActiveChild MDIClientWindow: Frame Start: ActiveChild ; : TabPosition { ThisChild -- n } \ position of file in tab window TCIF_PARAM IsMask: OpenFilesTab GetTabCount: OpenFilesTab dup 0> if 1+ 0 do i GetTabInfo: OpenFilesTab Lparam: OpenFilesTab ThisChild = if i leave then loop else -1 then ; : SwapTabs { child1 child2 \ l1 l2 -- } GetTabCount: OpenFilesTab 0> not ?exit child1 child2 1- 0max = ?exit TCIF_PARAM IsMask: OpenFilesTab child1 GetTabInfo: OpenFilesTab LParam: OpenFilesTab to l1 child2 GetTabInfo: OpenFilesTab LParam: OpenFilesTab to l2 child1 SetTabInfo: OpenFilesTab l1 IsLparam: OpenFilesTab child2 SetTabInfo: OpenFilesTab ; : SplitWindow { win-func split-type \ modified? curpos textbuf textlen name$ -- } ActiveChild 0= ?exit GetFileType: ActiveChild FT_SOURCE <> ?exit GetSplitType: ActiveChild split-type = ?exit new$ to name$ name$ off GetTextLength: CurrentWindow 1+ to textlen \ get text buffer size textlen malloc to textbuf \ allocate buffer textbuf textlen GetText: CurrentWindow \ retrieve text ?Modified: ActiveChild to modified? \ get modified status GetCurrentPos: CurrentWindow to curpos \ position in document GetFileName: ActiveChild count name$ place \ file name SetSavepoint: CurrentWindow \ mark as not modified ActiveChild >r win-func execute \ NewHSplitWnd textbuf SetText: CurrentWindow name$ count SetFileName: ActiveChild curpos GotoPos: CurrentWindow modified? 0= IF SetSavePoint: CurrentWindow THEN textbuf release r@ TabPosition ActiveChild TabPosition SwapTabs r> GetHandle: [ ] CloseChild: Frame Update SetFocus: ActiveChild ; IDM_SPLIT_HORIZONTAL SetCommand : SplitWindowVertical ( -- ) ['] NewVSplitWnd VERT_SPLIT SplitWindow ; IDM_SPLIT_VERTICAL SetCommand : SplitWindowHorizontal ( -- ) ['] NewHSplitWnd HORIZ_SPLIT SplitWindow ; IDM_SPLIT_HORIZONTAL SetCommand : UnSplitWindow ( -- ) ['] NewEditWindow NO_SPLIT SplitWindow ; IDM_NO_SPLIT_WINDOW SetCommand \s \ : SplitWindowHorizontal { \ modified? curpos textbuf textlen name$ -- } \ ActiveChild 0= ?exit \ GetFileType: ActiveChild FT_SOURCE <> ?exit \ GetSplitType: ActiveChild HORIZ_SPLIT = ?exit \ new$ to name$ name$ off \ GetTextLength: CurrentWindow 1+ to textlen \ get text buffer size \ textlen malloc to textbuf \ allocate buffer \ textbuf textlen GetText: CurrentWindow \ retrieve text \ ?Modified: ActiveChild to modified? \ get modified status \ GetCurrentPos: CurrentWindow to curpos \ position in document \ GetFileName: ActiveChild count name$ place \ file name \ SetSavepoint: CurrentWindow \ mark as not modified \ ActiveChild >r \ NewHSplitWnd \ textbuf SetText: CurrentWindow \ name$ count SetFileName: ActiveChild \ curpos GotoPos: CurrentWindow \ modified? 0= IF SetSavePoint: CurrentWindow THEN \ textbuf release \ r@ TabPosition ActiveChild TabPosition SwapTabs \ r> GetHandle: [ ] CloseChild: Frame \ Update \ SetFocus: ActiveChild ; IDM_SPLIT_HORIZONTAL SetCommand \ \ : SplitWindowVertical { \ modified? curpos textbuf textlen name$ -- } \ ActiveChild 0= ?exit \ GetFileType: ActiveChild FT_SOURCE <> ?exit \ GetSplitType: ActiveChild VERT_SPLIT = ?exit \ new$ to name$ name$ off \ GetTextLength: CurrentWindow 1+ to textlen \ get text buffer size \ textlen malloc to textbuf \ allocate buffer \ textbuf textlen GetText: CurrentWindow \ retrieve text \ ?Modified: ActiveChild to modified? \ get modified status \ GetCurrentPos: CurrentWindow to curpos \ position in document \ GetFileName: ActiveChild count name$ place \ file name \ SetSavepoint: CurrentWindow \ mark as not modified \ ActiveChild >r \ NewVSplitWnd \ textbuf SetText: CurrentWindow \ name$ count SetFileName: ActiveChild \ curpos GotoPos: CurrentWindow \ modified? 0= IF SetSavePoint: CurrentWindow THEN \ textbuf release \ r@ TabPosition ActiveChild TabPosition SwapTabs \ r> GetHandle: [ ] CloseChild: Frame \ Update \ SetFocus: ActiveChild ; IDM_SPLIT_VERTICAL SetCommand \ \ : UnSplitWindow { \ modified? curpos textbuf textlen name$ -- } \ ActiveChild 0= ?exit \ GetFileType: ActiveChild FT_SOURCE <> ?exit \ GetSplitType: ActiveChild NO_SPLIT = ?exit \ new$ to name$ name$ off \ GetTextLength: CurrentWindow 1+ to textlen \ get text buffer size \ textlen malloc to textbuf \ allocate buffer \ textbuf textlen GetText: CurrentWindow \ retrieve text \ ?Modified: ActiveChild to modified? \ get modified status \ GetCurrentPos: CurrentWindow to curpos \ position in document \ GetFileName: ActiveChild count name$ place \ file name \ SetSavepoint: CurrentWindow \ mark as not modified \ ActiveChild >r \ NewEditWindow \ textbuf SetText: CurrentWindow \ name$ count SetFileName: ActiveChild \ curpos GotoPos: CurrentWindow \ modified? 0= IF SetSavePoint: CurrentWindow THEN \ textbuf release \ r@ TabPosition ActiveChild TabPosition SwapTabs \ r> GetHandle: [ ] CloseChild: Frame \ Update \ SetFocus: ActiveChild ; IDM_NO_SPLIT_WINDOW SetCommand \ \s |
|
From: Elford R. <mon...@z-...> - 2008-09-01 22:59:38
|
Should he not be ill? Nay, he might even be dead. Course of my life. Kait is a thoroughly stupid in which direction his fellow guest was walking. It was no longer necessary for them to live at i would not even slay the captain who has used. |
1040 messages has been excluded from this view by a project administrator.
