Menu
▾
▴
win32forth-cvs
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5766 Modified Files: ClassBrowser.f CommandID.f EdCommand.f EdCompile.f EdFilePane.f EdFindInFiles.f EdHexViewer.f EdImageWindow.f EdMenu.f EdRemote.f EdStatusbar.f EdTabControl.f EdToolbar.f Main.f ProjectTree.f ScintillaHyperMDI.f ScintillaMDI.f Added Files: EdPreferences.f EdPreferences.ff EdPreferences.frm Log Message: Updates. EAB Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** EdTabControl.f 23 Jul 2006 09:36:40 -0000 1.16 --- EdTabControl.f 13 Oct 2006 03:55:11 -0000 1.17 *************** *** 89,93 **** count "TO-PATHEND" ! dup 0= if drop s" Unnamed File" then $buffer place $buffer +null $buffer 1+ ; --- 89,93 ---- count "TO-PATHEND" ! dup 0= if 2drop s" Unnamed File" then $buffer place $buffer +null $buffer 1+ ; *************** *** 367,370 **** --- 367,371 ---- UpdateFileName: cFileList ;M + :M FindFile: ( addr -- f ) FindFile: cFileList ;M Index: EdCommand.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdCommand.f,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EdCommand.f 3 Aug 2006 22:47:45 -0000 1.8 --- EdCommand.f 13 Oct 2006 03:55:11 -0000 1.9 *************** *** 46,50 **** do i GetFile: SourceFileOpenDialog (OpenSourceFile) loop ! then ; IDM_OPEN_SOURCE_FILE SetCommand : UpdateFileName ( -- ) --- 46,50 ---- do i GetFile: SourceFileOpenDialog (OpenSourceFile) loop ! then ; IDM_OPEN_SOURCE_FILE SetCommand : UpdateFileName ( -- ) Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CommandID.f 23 Jul 2006 09:36:40 -0000 1.8 --- CommandID.f 13 Oct 2006 03:55:11 -0000 1.9 *************** *** 89,92 **** --- 89,93 ---- NewID IDM_ENSURE_FINAL_LINE_ENDING NewID IDM_COMPILE_PROJECT + NewID IDM_PREFERENCES \ Win32Forth menu *************** *** 134,138 **** NewID IDM_ADD_FORMS_PRJ NewID IDM_ZIP_PRJ ! NewID IDM_ADD_PRJ NewID IDM_COPY_PRJ NewID IDM_OPEN_RECENT_FILE_PRJ --- 135,139 ---- NewID IDM_ADD_FORMS_PRJ NewID IDM_ZIP_PRJ ! \ NewID IDM_ADD_PRJ NewID IDM_COPY_PRJ NewID IDM_OPEN_RECENT_FILE_PRJ --- NEW FILE: EdPreferences.f --- \ EdPreferences.f needs EdPreferences.frm Color: WHITE value back-color \ default font background color Color: BLACK value fore-color \ default font color Color: WHITE value caret-backcolor \ current line color Color: LTGRAY value select-backcolor \ selection background color Color: BLACK value select-forecolor \ selection font color :Class ColorWindow <Super Child-Window colorobject thecolor :M WindowStyle: ( -- style ) WindowStyle: super WS_BORDER or WS_VISIBLE or ;M :m paint: ( colorref -- ) newcolor: thecolor paint: super ;m :m on_paint: ( -- ) 0 0 width height thecolor fillarea: dc ;m ;class :Object IDEPreferencesForm <Super frmIDEPreferences colorwindow fore-window colorwindow back-window colorwindow current-window colorwindow selfore-window colorwindow selback-window colorobject fore colorobject back colorobject curr colorobject selfore colorobject selback :m close: ( -- ) color: fore to fore-color color: back to back-color color: curr to caret-backcolor color: selfore to select-forecolor color: selback to select-backcolor Update close: super ;m : command-func ( id obj -- ) drop case getid: btnforeground of choose: fore if color: fore paint: fore-window then endof getid: btnbackground of choose: back if color: back paint: back-window then endof getid: btncurrentline of choose: curr if color: curr paint: current-window then endof 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: btncancel of close: super endof getid: btnok of close: self endof endcase ; :m on_init: ( -- ) IDCANCEL SetID: btnCancel IDOK SetID: btnOK on_init: super SW_HIDE Show: chkButtonTabs SW_HIDE Show: chkMultiLineTabs SW_HIDE Show: chkAutoIndent SW_HIDE Show: grpEditorOptions SW_HIDE Show: grpTabOptions ['] command-func setcommand: self fore-color newcolor: fore back-color newcolor: back caret-backcolor newcolor: curr select-forecolor newcolor: selfore select-backcolor newcolor: selback 100 setid: fore-window self start: fore-window forechildx forechildy forechildw forechildh move: fore-window fore-color paint: fore-window 101 setid: back-window self start: back-window forechildx backchildy backchildw backchildh move: back-window back-color paint: back-window 102 setid: current-window self start: current-window currentchildx currentchildy currentchildw currentchildh move: current-window caret-backcolor paint: current-window 103 setid: selfore-window self start: selfore-window selforechildx selforechildy selforechildw selforechildh move: selfore-window select-forecolor paint: selfore-window 104 setid: selback-window self start: selback-window selbackchildx selbackchildy selbackchildw selbackchildh move: selback-window select-backcolor paint: selback-window ;m ;object : IDEOptions ( -- ) GetHandle: MainWindow SetParentWindow: IDEPreferencesForm start: IDEPreferencesForm ; IDM_PREFERENCES SetCOmmand \s --- NEW FILE: EdPreferences.frm --- \ EDPREFERENCES.FRM \- textbox needs excontrols.f :Object frmIDEPreferences <Super DialogWindow Font WinFont \ default font ' 2drop value WmCommand-Func \ function pointer for WM_COMMAND ColorObject FrmColor \ the background color 150 175 2value XYPos \ save screen location of form GroupBox grpEditorOptions GroupBox grpTabOptions GroupBox grpCOlors PushButton btnForeground PushButton btnBackground PushButton btnCurrentline PushButton btnSelectFore PushButton btnSelectBack \ Coordinates and dimensions for foreChild 130 value foreChildX 30 value foreChildY 34 value foreChildW 25 value foreChildH \ 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 CheckBox chkButtonTabs CheckBox chkMultiLineTAbs CheckBox chkAutoIndent PushButton btnOk PushButton btnCancel :M ClassInit: ( -- ) ClassInit: super \ Insert your code here ;M :M WindowStyle: ( -- style ) WS_POPUPWINDOW WS_DLGFRAME or ;M \ if this form is a modal form a non-zero parent must be set :M ParentWindow: ( -- hwndparent | 0 if no parent ) hWndParent ;M :M SetParentWindow: ( hwndparent -- ) \ set owner window to hWndParent ;M :M WindowTitle: ( -- ztitle ) z" Preferences" ;M :M StartSize: ( -- width height ) 188 362 ;M :M StartPos: ( -- x y ) XYPos ;M :M Close: ( -- ) \ Insert your code here Close: super ;M :M On_Init: ( -- ) s" MS Sans Serif" SetFaceName: WinFont 8 Width: WinFont Create: WinFont drop \ not testing return flag \ set form color to system color COLOR_BTNFACE Call GetSysColor NewColor: FrmColor self Start: grpEditorOptions 16 261 124 55 Move: grpEditorOptions Handle: Winfont SetFont: grpEditorOptions s" Editor Options" SetText: grpEditorOptions self Start: grpTabOptions 15 177 127 80 Move: grpTabOptions Handle: Winfont SetFont: grpTabOptions s" TabWindow Options" SetText: grpTabOptions self Start: grpCOlors 16 14 161 155 Move: grpCOlors Handle: Winfont SetFont: grpCOlors s" 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 self Start: chkButtonTabs 27 189 100 25 Move: chkButtonTabs Handle: Winfont SetFont: chkButtonTabs s" Button Style" SetText: chkButtonTabs self Start: chkMultiLineTAbs 27 216 100 25 Move: chkMultiLineTAbs Handle: Winfont SetFont: chkMultiLineTAbs s" MultiLine" SetText: chkMultiLineTAbs self Start: chkAutoIndent 28 277 100 25 Move: chkAutoIndent Handle: Winfont SetFont: chkAutoIndent s" AutoIndent" SetText: chkAutoIndent self Start: btnOk 8 332 80 25 Move: btnOk Handle: Winfont SetFont: btnOk s" &Ok" SetText: btnOk self Start: btnCancel 90 332 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 :M On_Paint: ( -- ) 0 0 GetSize: self Addr: FrmColor FillArea: dc ;M :M On_Done: ( -- ) Delete: WinFont originx originy 2to XYPos ParentWindow: self \ if modal form re-enable parent if 1 ParentWindow: self Call EnableWindow drop \ reset focus to parent if we have one ParentWindow: self Call SetFocus drop then \ Insert your code here On_Done: super ;M ;Object Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** EdMenu.f 23 Jul 2006 09:36:40 -0000 1.12 --- EdMenu.f 13 Oct 2006 03:55:11 -0000 1.13 *************** *** 140,143 **** --- 140,144 ---- MenuSeparator :MenuItem mp_tabs "&Set Tab options..." IDM_TABS DoCommand ; + MenuItem " IDE Preferences " IDM_PREFERENCES DoCommand ; MenuSeparator :MenuItem mp_showsb "&Show Statusbar" IDM_SHOW_STATUSBAR DoCommand ; Index: EdFilePane.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdFilePane.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdFilePane.f 15 Jun 2006 20:59:36 -0000 1.2 --- EdFilePane.f 13 Oct 2006 03:55:11 -0000 1.3 *************** *** 12,16 **** ImageButton imgDupeButton - :Object TheFolderview <Super Child-Window --- 12,15 ---- *************** *** 117,133 **** DeleteFile: TheDirectory ; - \ create txtextension$ ," .f;.frm;.cfg;.ini;.txt;.seq;.4th;.c;.cpp;.h;.bat;.bas;.pas;.htm;.html" - \ \ - \ : open-file { item -- } - \ getname$: item ?dup - \ if 2dup ".ext-only" - \ txtextension$ count 2swap search nip nip - \ if pad place - \ pad IDM_OPEN_RECENT_FILE DoCommand \ recognised text file - \ else 2drop \ hwnd ExecuteFile - \ then - \ else drop - \ then ; - : command-func { id obj -- } ( h m w l id obj -- ) \ OnCommand function for frmFileWindow id --- 116,119 ---- *************** *** 155,165 **** endcase ; ! : UpdatetxtFolder ( -- ) ! GetPath: TheDirectory ! InsertString: cmblstPathPicker ; : openfile { item -- } ! getname$: item pad place ! pad IDM_OPEN_RECENT_FILE DoCommand ; :M On_Init: ( -- ) --- 141,153 ---- endcase ; ! : UpdatetxtFolder ( obj -- ) ! GetPath: [ ] InsertString: cmblstPathPicker ; : openfile { item -- } ! getname$: item new$ dup>r place ! ?control \ control and double click opens file for editing, it had better be text! ! if NewEditWindow r@ count OpenNamedFile: ActiveChild drop ! else r@ IDM_OPEN_RECENT_FILE DoCommand ! then r>drop ; :M On_Init: ( -- ) *************** *** 263,267 **** \ CS_DBLCLKS only to prevent flicker in window on sizing. CS_DBLCLKS ;M ! :m classinit: classinit: super 1290 to id ;m --- 251,255 ---- \ CS_DBLCLKS only to prevent flicker in window on sizing. CS_DBLCLKS ;M ! :m classinit: classinit: super 1290 to id ;m Index: EdCompile.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdCompile.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdCompile.f 22 Jul 2006 08:21:53 -0000 1.2 --- EdCompile.f 13 Oct 2006 03:55:11 -0000 1.3 *************** *** 135,139 **** :noname ( addr n -- ) \ compile a file { \ load$ file$ -- } ! MAXSTRING LocalAlloc: load$ MAXSTRING LocalAlloc: file$ --- 135,139 ---- :noname ( addr n -- ) \ compile a file { \ load$ file$ -- } ! MAXSTRING LocalAlloc: load$ MAXSTRING LocalAlloc: file$ Index: ProjectTree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ProjectTree.f 26 Aug 2006 15:25:32 -0000 1.14 --- ProjectTree.f 13 Oct 2006 03:55:11 -0000 1.15 *************** *** 90,93 **** --- 90,96 ---- itemname ;m + :m getname$: ( -- addrz ) + itemname zcount ;m + :m isparentitem: ( n -- ) to parentitem ;m *************** *** 291,295 **** do i >Link#: ThisList Data@: ThisList Getname: [ ] zcount ! pad count caps-compare 0= if unloop exitm then --- 294,298 ---- do i >Link#: ThisList Data@: ThisList Getname: [ ] zcount ! pad count istr= if unloop exitm then *************** *** 373,388 **** : .buildfile ( -- ) ! mainfile c@ dup ! if s" " ! else s" No build file set" ! then new$ dup>r place ! mainfile count r@ +place ! if s" ---- Total files in project= " r@ +place ! totalfiles: self (.) r@ +place ! then r> count SetText: ProjInfo false to dirty? ; :m setbuildfile: ( addr cnt -- ) ! mainfile place .buildfile ;m :m getbuildfile: ( -- addr cnt ) --- 376,392 ---- : .buildfile ( -- ) ! \ mainfile c@ dup ! \ if s" " ! \ else s" No build file set" ! \ then new$ dup>r place ! \ mainfile count r@ +place ! \ if s" ---- Total files in project= " r@ +place ! \ totalfiles: self (.) r@ +place ! \ then r> count SetText: ProjInfo false to dirty? ; :m setbuildfile: ( addr cnt -- ) ! mainfile place .buildfile ! ;m :m getbuildfile: ( -- addr cnt ) *************** *** 488,509 **** itemid: SelectedItem - \ <<<<<<< ProjectTree.f if s" Number of files = " r@ place #items: SelectedItem (.) r@ +place - r@ FileExt off else ! GetName: SelectedItem dup zcount ! 2dup ".ext-only" 2dup lower FileExt place \ set FileExt ! ! GetName: SelectedItem zcount r@ place ! r@ dup IDM_OPEN_RECENT_FILE DoCommand ! ! then ! count Settext: ProjStatus .buildfile SetFocus: self \ ProjectManager.htm item lost focus before false - r>drop ;M --- 492,510 ---- itemid: SelectedItem if s" Number of files = " r@ place #items: SelectedItem (.) r@ +place FileExt off else ! GetName$: SelectedItem ! 2dup r@ place ! 2dup ".ext-only" ! 2dup lower ! FileExt place \ set FileExt ! r@ IDM_OPEN_RECENT_FILE DoCommand ! then r>drop ! .buildfile SetFocus: self \ ProjectManager.htm item lost focus before false ;M *************** *** 638,642 **** :M Clear: ( -- ) ! TVI_ROOT DeleteItem: self DisposeLists --- 639,643 ---- :M Clear: ( -- ) ! TVI_ROOT DeleteItem: self drop DisposeLists *************** *** 831,835 **** SortParentLists: TheProject true to Modified ! else drop then ; IDM_ADD_PRJ SetCommand --- 832,836 ---- SortParentLists: TheProject true to Modified ! \ else drop then ; IDM_ADD_PRJ SetCommand *************** *** 841,845 **** \ Add the open forms from ForthForm to the project. ForthForm? ! if 0 WANT_FORMS win32forth-message SortParentLists: TheProject then ; IDM_ADD_FORMS_PRJ SetCommand --- 842,846 ---- \ Add the open forms from ForthForm to the project. ForthForm? ! if 0 WANT_FORMS _win32forth-message SortParentLists: TheProject then ; IDM_ADD_FORMS_PRJ SetCommand *************** *** 1002,1010 **** if 2dup addfile ! 2dup SetText: ProjStatus dialog? IF 2dup pad place -2 pad c+! s" .res" pad +place pad count addfile ! 2dup SetText: ProjStatus THEN skip-recurse? --- 1003,1011 ---- if 2dup addfile ! \ 2dup SetText: ProjStatus dialog? IF 2dup pad place -2 pad c+! s" .res" pad +place pad count addfile ! THEN skip-recurse? *************** *** 1040,1044 **** then fClear if Clear: TheProject then ! s" " SetText: ProjStatus GetBuildFile: TheProject ModuleList: TheProject AddItem: TheProject --- 1041,1045 ---- then fClear if Clear: TheProject then ! \ s" " SetText: ProjStatus GetBuildFile: TheProject ModuleList: TheProject AddItem: TheProject *************** *** 1053,1057 **** total-size (.) pad +place s" bytes" pad +place ! pad count SetText: ProjStatus GetBuildFile: TheProject SetBuildFile: TheProject \ update info --- 1054,1058 ---- total-size (.) pad +place s" bytes" pad +place ! GetBuildFile: TheProject SetBuildFile: TheProject \ update info Index: EdToolbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdToolbar.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EdToolbar.f 23 Jul 2006 09:36:40 -0000 1.6 --- EdToolbar.f 13 Oct 2006 03:55:11 -0000 1.7 *************** *** 21,27 **** anew -ScintillaToolbar.f ! TextBox ProjStatus ! TextBox ProjInfo ! INTERNAL --- 21,25 ---- anew -ScintillaToolbar.f ! ComboBox helpbox INTERNAL *************** *** 63,66 **** --- 61,65 ---- ts," Back" ts," Forward" + ts," Browse" ;ToolStrings *************** *** 84,87 **** --- 83,87 ---- ts," Back" ts," Forward" + ts," Browse" ;ToolStrings *************** *** 112,115 **** --- 112,116 ---- 22 IDM_BACK TBSTATE_ENABLED TBSTYLE_BUTTON 15 ToolBarButton, 23 IDM_FORWARD TBSTATE_ENABLED TBSTYLE_BUTTON 16 ToolBarButton, + 24 IDM_BROWSE TBSTATE_ENABLED TBSTYLE_BUTTON 17 ToolBarButton, ;ToolBarTable *************** *** 120,124 **** 24 constant SmallButtonWidth \ a little bigger than Windows default 18 constant SmallButtonHeight ! 17 constant #buttons :M ClassInit: ( -- ) --- 121,125 ---- 24 constant SmallButtonWidth \ a little bigger than Windows default 18 constant SmallButtonHeight ! 18 constant #buttons :M ClassInit: ( -- ) *************** *** 294,319 **** ; ! : add-projStat ( -- ) ! self Start: ProjStatus ! true ReadOnly: ProjStatus ! ! eraseband-info GetHandle: ProjStatus ! z" Project Status:" to lptext ! [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 200 insert-band ! ; ! ! : add-projInfo ( -- ) ! self Start: ProjInfo ! true ReadOnly: ProjInfo ! eraseband-info GetHandle: ProjInfo ! z" Build File:" to lptext [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 200 insert-band ; ! : add-projtoolbar ( -- ) ! self Start: pToolBar ! eraseband-info GetHandle: pToolBar [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 200 insert-band ; --- 295,311 ---- ; ! : add-projtoolbar ( -- ) ! self Start: pToolBar ! eraseband-info GetHandle: pToolBar [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 200 insert-band ; ! : add-helpbox ( -- ) ! \ WS_CLIPSIBLINGS AddStyle: helpbox ! self Start: helpbox ! eraseband-info GetHandle: helpbox ! z" View Source for:" to lptext [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 200 insert-band ; *************** *** 328,340 **** hwnd if add-toolbars - add-projstat add-projtoolbar ! add-projinfo ! Handle: textFont dup SetFont: ProjStatus SetFont: ProjInfo then ;M :M WindowStyle: ( -- style ) WindowStyle: super ! [ WS_CLIPSIBLINGS WS_CLIPCHILDREN or WS_BORDER or RBS_VARHEIGHT or RBS_BANDBORDERS or RBS_AUTOSIZE or ] literal or ;M --- 320,331 ---- hwnd if add-toolbars add-projtoolbar ! add-helpbox ! Handle: textFont SetFont: HelpBox then ;M :M WindowStyle: ( -- style ) WindowStyle: super ! [ ( WS_CLIPCHILDREN ) WS_BORDER RBS_VARHEIGHT or RBS_BANDBORDERS or RBS_AUTOSIZE or ] literal or ;M *************** *** 353,356 **** --- 344,406 ---- ;object + : $browse ( line_number file_name len -- ) + NewBrowseChild LoadHyperFile: ActiveBrowser + SetBrowseMode: ActiveBrowser Update ; + + : ?viewsource { addr cnt -- } + addr cnt "CLIP" pad place \ save string in find buffer + pad caps-find + 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 + : myWmChar ( h m w l obj -- res ) + 2 pick VK_RETURN = \ if return + if GetText: [ ] \ get adr,len of edit control text + ?viewsource + false + else drop true + then ; + + ' myWmChar SetWmChar: helpbox + + \ - Save away find text and perform search when user presses F3 + \ - Move Focus to DocWindow when user presses ESC + \ Changed May 19th, 2003 - 18:16 dbu + \ : myWmKeyDown ( h m w l obj -- res ) + \ 2 pick VK_F3 = \ if F3 + \ IF GetText: [ ] \ get adr,len of edit control text + \ "CLIP" find-buf place \ save string in find buffer + \ ?shift \ if we have the shift key + \ IF back-find-text-again + \ ELSE find-text-again \ search for it + \ THEN + \ FALSE \ we already processed this message + \ ELSE + \ 2 pick VK_ESCAPE = \ if ESC + \ if SetFocus: DocWindow \ move Focus to doc window + \ drop \ discard object + \ false \ we already processed this message + \ else drop \ discard object + \ true \ and use default processing + \ then + \ THEN ; + \ + \ ' myWmKeyDown SetWmKeyDown: findCombo + \ + \ save the find text away when the combo box gets a WM_KILLFOCUS message + \ : myWmKillFocus ( h m w l obj -- res ) + \ GetText: [ ] \ get adr,len of edit control text + \ "CLIP" find-buf place \ save string in find buffer + \ TRUE ; \ and use default processing + \ + \ ' myWmKillFocus SetWmKillFocus: findCombo + \ + \ ----------------------------------------------------------------------------------- \ ----------------------------------------------------------------------------------- *************** *** 415,418 **** --- 465,469 ---- false IDM_FIND_NEXT EnableButton: ControlToolbar false IDM_REDO EnableButton: ControlToolbar + false IDM_BROWSE EnableButton: ControlToolbar false IDM_BACK EnableButton: ControlToolbar *************** *** 427,433 **** GetBuildFile: TheProject nip 0<> dup IDM_SAVE_PRJ EnableButton: ptoolbar ! dup IDM_DELETE_PRJ EnableButton: ptoolbar ! dup IDM_BUILD_PRJ EnableButton: ptoolbar ! dup IDM_ADD_PRJ EnableButton: ptoolbar \ dup IDM_ZIP_PRJ EnableButton: ptoolbar \ IDM_COPY_PRJ EnableButton: ptoolbar --- 478,484 ---- GetBuildFile: TheProject nip 0<> dup IDM_SAVE_PRJ EnableButton: ptoolbar ! \ dup IDM_DELETE_PRJ EnableButton: ptoolbar ! \ dup IDM_BUILD_PRJ EnableButton: ptoolbar ! \ dup IDM_ADD_PRJ EnableButton: ptoolbar \ dup IDM_ZIP_PRJ EnableButton: ptoolbar \ IDM_COPY_PRJ EnableButton: ptoolbar Index: EdStatusbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdStatusbar.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdStatusbar.f 9 Jun 2006 17:03:35 -0000 1.3 --- EdStatusbar.f 13 Oct 2006 03:55:11 -0000 1.4 *************** *** 20,29 **** :Object ScintillaStatusbar <Super MultiStatusbar ! create MultiWidth 60 , -1 , \ width of statusbar parts create SingleWidth -1 , \ width of statusbar parts ! 2 constant MultiParts 0 constant EdPart 1 constant LinePart :M SetMulti: ( -- ) --- 20,30 ---- :Object ScintillaStatusbar <Super MultiStatusbar ! create MultiWidth 60 , 700 , -1 , \ width of statusbar parts create SingleWidth -1 , \ width of statusbar parts ! 3 constant MultiParts 0 constant EdPart 1 constant LinePart + 2 constant projpart :M SetMulti: ( -- ) *************** *** 42,46 **** :M Clear: ( -- ) z" " EdPart SetText: self ! z" " LinePart SetText: self ;M : SetHtmlView ( -- ) --- 43,48 ---- :M Clear: ( -- ) z" " EdPart SetText: self ! z" " LinePart SetText: self ! ;M : SetHtmlView ( -- ) *************** *** 83,87 **** FT_BITMAP of SetBitmapView endof endcase ! then r> base ! ;M --- 85,92 ---- FT_BITMAP of SetBitmapView endof endcase ! then GetProjectFileName: TheProject ?dup ! if s" Project File: " pad place "to-pathend" pad +place pad +null ! else pad off ! then pad 1+ projpart SetText: self r> base ! ;M *************** *** 98,100 **** if UpdateStatusBar: ActiveChild else Clear: ScintillaStatusbar ! then ; --- 103,105 ---- if UpdateStatusBar: ActiveChild else Clear: ScintillaStatusbar ! then Update: ScintillaStatusbar ; Index: EdHexViewer.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdHexViewer.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdHexViewer.f 7 Jun 2006 15:39:34 -0000 1.2 --- EdHexViewer.f 13 Oct 2006 03:55:11 -0000 1.3 *************** *** 21,24 **** --- 21,27 ---- max-path 2 + bytes FileName + :M GetTextLength: ( -- n ) + 0 ;M + :M Start: ( parent -- ) New> HexViewer to ChildWindow Index: EdImageWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdImageWindow.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdImageWindow.f 14 Jun 2006 06:02:56 -0000 1.3 --- EdImageWindow.f 13 Oct 2006 03:55:11 -0000 1.4 *************** *** 17,20 **** --- 17,23 ---- :Class ImageViewChild <Super MDIChild + :M GetTextLength: ( -- n ) + 0 ;M + :M Start: ( parent -- ) New> FreeImageWindow to ChildWindow Index: ClassBrowser.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ClassBrowser.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ClassBrowser.f 29 Jun 2006 10:01:01 -0000 1.4 --- ClassBrowser.f 13 Oct 2006 03:55:11 -0000 1.5 *************** *** 235,241 **** : $browse ( line_number file_name len -- ) ! NewBrowseChild LoadHyperFile: ActiveBrowser ! SetBrowseMode: ActiveBrowser Update ! ; : Browse ( xt -- ) \ browse for the given xt --- 235,240 ---- : $browse ( line_number file_name len -- ) ! NewBrowseChild LoadHyperFile: ActiveBrowser ! SetBrowseMode: ActiveBrowser Update ; : Browse ( xt -- ) \ browse for the given xt Index: EdRemote.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdRemote.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdRemote.f 3 Aug 2006 22:47:45 -0000 1.3 --- EdRemote.f 13 Oct 2006 03:55:11 -0000 1.4 *************** *** 53,56 **** --- 53,69 ---- endcase r> ; + : add-open-forms ( -- ) + param-buffer lcount dup 0= + if 2drop true s" No open forms!" ?MessageBox exit + then 0 + do dup count 2dup + s" untitled.frm" caps-compare 0<> \ not unsaved forms + if AddForm: TheProject + else 2drop + \ pad place s" not saved!" pad +place + \ pad +null pad 1+ 0 Settext: TheStatusBar + then count + + loop drop ; + : ForthFormMsg ( wParam -- f ) \ ForthForm \ returns true if the message wasn't handled *************** *** 58,61 **** --- 71,75 ---- CASE FF_PASTE of FFPasteSource r>drop false >r endof \ August 20, 2005 - EAB + FORMS_SENT of add-open-forms r>drop false >r endof endcase r> ; *************** *** 66,70 **** wParam DebugMsg if wparam ConsoleMsg ! if wparam ForthFormMsg then then ; is HandleW32FMsg --- 80,84 ---- wParam DebugMsg if wparam ConsoleMsg ! if wparam ForthFormMsg drop then then ; is HandleW32FMsg *************** *** 113,118 **** IsHtmlFile? if ed-filename count (OpenHtmlFile) ! else NewRemoteChild ! ed-line @ ed-filename count LoadHyperFile: ActiveRemote \ load the file wParam ED_OPEN_BROWSE = SetBrowseMode: ActiveRemote \ browsing? then --- 127,135 ---- IsHtmlFile? if ed-filename count (OpenHtmlFile) ! else \ avoid duplicate files loaded when compiling and error occurs ! ed-filename count (OpenRemoteFile) \ switch if already loaded ! ed-line @ GotoLine: ActiveRemote ! \ NewRemoteChild ! \ ed-line @ ed-filename count LoadHyperFile: ActiveRemote \ load the file wParam ED_OPEN_BROWSE = SetBrowseMode: ActiveRemote \ browsing? then Index: ScintillaHyperMDI.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ScintillaHyperMDI.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ScintillaHyperMDI.f 29 Jun 2006 04:18:47 -0000 1.2 --- ScintillaHyperMDI.f 13 Oct 2006 03:55:11 -0000 1.3 *************** *** 101,104 **** --- 101,111 ---- then addnew: HyperList ; + :M GotoLine: ( n -- ) \ position at line + 1- 0max dup GotoLine: ChildWindow + dup PositionFromLine: ChildWindow swap + LineLength: ChildWindow + over SetSelectionStart: ChildWindow + + SetSelectionEnd: ChildWindow ;M + \ Samstag, August 20 2005 dbu \ Changed to open the file only if it exist *************** *** 108,117 **** 2dup file-exist? if OpenNamedFile: self ! if 1- 0 max dup GotoLine: ChildWindow ! ! dup PositionFromLine: ChildWindow swap ! LineLength: ChildWindow ! over SetSelectionStart: ChildWindow ! + SetSelectionEnd: ChildWindow else drop beep then --- 115,119 ---- 2dup file-exist? if OpenNamedFile: self ! if GotoLine: self else drop beep then *************** *** 169,172 **** --- 171,178 ---- false SetBrowseMode: self Update: self + \ set current line background color, personal preference - EAB + 0 Color: LTCYAN SCI_SETCARETLINEBACK GetHandle: ChildWindow send-window + 0 true SCI_SETCARETLINEVISIBLE GetHandle: ChildWindow send-window + 0 500 SCI_SETCARETPERIOD GetHandle: ChildWindow send-window ;M --- NEW FILE: EdPreferences.ff --- (This appears to be a binary file; contents omitted.) Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Main.f 9 Oct 2006 19:05:23 -0000 1.29 --- Main.f 13 Oct 2006 03:55:11 -0000 1.30 *************** *** 19,23 **** only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\Win32ForthIDE" "fpath+ --- 19,23 ---- only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\Win32ForthIDE" "fpath+ *************** *** 73,76 **** --- 73,77 ---- defer HandleW32FMsg ' noop is HandleW32FMsg defer NewBrowseChild ' noop is NewBrowseChild + defer NewEditWindow ' noop is NewEditWindow defer Update ' noop is Update defer OnSelect ' drop is OnSelect \ called when item is selected in the file listview *************** *** 79,82 **** --- 80,84 ---- needs EdStatusbar.f needs EdMenu.f + needs EdPreferences.f AcceleratorTable AccelTable \ create the Accelerator-Key-Table *************** *** 270,274 **** :M WindowStyle: ( -- style ) WindowStyle: SUPER ! WS_CLIPCHILDREN or ;M :M ExWindowStyle: ( -- exstyle ) --- 272,277 ---- :M WindowStyle: ( -- style ) WindowStyle: SUPER ! WS_CLIPCHILDREN or ! ;M :M ExWindowStyle: ( -- exstyle ) *************** *** 369,372 **** --- 372,380 ---- SaveAllBeforeCompile? s>d (d.) s" SaveAllBeforeCompile" "SetDefault StripTrailingWhitespace? s>d (d.) s" StripTrailingSpaces" "SetDefault + Back-Color s>d (d.) s" BackColor" "SetDefault + Fore-Color s>d (d.) s" ForeColor" "SetDefault + Caret-BackColor s>d (d.) s" CaretBackColor" "SetDefault + Select-ForeColor s>d (d.) s" SelectForeColor" "SetDefault + Select-BackColor s>d (d.) s" SelectBackColor" "SetDefault WindowState SIZE_RESTORED = *************** *** 414,417 **** --- 422,431 ---- s" StripTrailingWhitespace" "GetDefaultValue 0= IF drop true THEN to StripTrailingWhitespace? + s" BackColor" "GetDefaultValue 0= IF drop Back-Color THEN to Back-Color + s" ForeColor" "GetDefaultValue 0= IF drop Fore-Color THEN to Fore-Color + s" CaretBackColor" "GetDefaultValue 0= IF drop Caret-BackColor THEN to Caret-BackColor + 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" SearchText" "GetDefault -IF 2dup "CLIP" find-buf place THEN 2drop s" SearchPath" "GetDefault -IF 2dup "CLIP" search-path place THEN 2drop *************** *** 458,464 **** self Start: LeftPane self Start: Splitter - EnableToolbar On_Init: super load-defaults Update --- 472,479 ---- self Start: LeftPane self Start: Splitter EnableToolbar On_Init: super + \ WS_CLIPCHILDREN -Style: mdiclient + \ WS_CLIPsiblings -Style: mdiclient load-defaults Update *************** *** 468,472 **** over LOWORD ( command ID ) dup IsCommand? IF DoCommand \ intercept Toolbar and shortkey commands ! ELSE drop OnWmCommand: Super \ intercept Menu commands THEN ;M --- 483,492 ---- over LOWORD ( command ID ) dup IsCommand? IF DoCommand \ intercept Toolbar and shortkey commands ! ELSE GetID: HelpBox = ! if over HIWORD CBN_SELCHANGE = ! if GetSelectedString: HelpBox ?viewsource ! then ! else OnWmCommand: Super \ intercept Menu commands ! then THEN ;M *************** *** 561,564 **** --- 581,591 ---- ;M + : RefreshColors ( -- ) + GetFileType: ChildParent FT_SOURCE <> ?exit + fore-color back-color SetColors: ChildParent + caret-backcolor SetCaretBackColor: ChildParent + Select-ForeColor Select-BackColor SetSelectionColor: ChildParent + ; + 0 value Starting? :M Start: ( parent -- ) *************** *** 568,575 **** 0 0 Width Height Move: ChildWindow self AddFile: cTabWindow \ add the file to the file list ! \ SetFocus: ChildWindow ! SetFocus: self ! false to Starting? ! ;M :M ?Modified: ( -- f ) --- 595,603 ---- 0 0 Width Height Move: ChildWindow self AddFile: cTabWindow \ add the file to the file list ! \ SetFocus: ChildWindow ! SetFocus: self ! false to Starting? ! RefreshColors ! ;M :M ?Modified: ( -- f ) *************** *** 675,678 **** --- 703,707 ---- GetFileType: self FT_SOURCE = if Update: ChildParent + RefreshColors then ;M *************** *** 759,762 **** --- 788,792 ---- New> HyperEditorChild to ActiveChild MDIClientWindow: Frame Start: ActiveChild ; + ' NewEditWnd is NewEditWindow : NewHtmlWnd ( -- ) \ open a new child window for displaying HTML-Files *************** *** 792,796 **** temp$ FileNotFound: Frame if NewEditWnd ! temp$ count OpenNamedFile: ActiveChild then Update ; --- 822,826 ---- temp$ FileNotFound: Frame if NewEditWnd ! temp$ count OpenNamedFile: ActiveChild drop then Update ; *************** *** 820,824 **** temp$ FileNotFound: Frame if NewRemoteChild ! temp$ count OpenNamedFile: ActiveChild else ActiveChild to ActiveRemote then Update ; --- 850,854 ---- temp$ FileNotFound: Frame if NewRemoteChild ! temp$ count OpenNamedFile: ActiveChild drop else ActiveChild to ActiveRemote then Update ; *************** *** 966,969 **** --- 996,1000 ---- GetHandle: frame hwndOwner ! DefaultPrinter \ initialise PSD and PD init-shared-type + init-msg-buffer ['] sciedit_win32forth-message is win32forth-message InitClassBrowsers Index: EdFindInFiles.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdFindInFiles.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdFindInFiles.f 26 Aug 2006 15:25:32 -0000 1.2 --- EdFindInFiles.f 13 Oct 2006 03:55:11 -0000 1.3 *************** *** 9,14 **** anew -EdFindInFiles.f - s" src\wined" "fpath+ - s" src\wined\res" "fpath+ FALSE value all-occur? \ find all occurances of a string in a file, not just first --- 9,12 ---- *************** *** 376,379 **** ;Object - - |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X