Menu
▾
▴
[Win32forth-cvs] win32forth/apps/WinEd Ed_Defaults.F,1.2,1.3 Ed_EditWindowObj.F,1.3,1.4 Ed_EditorWords.F,1.2,1.3 Ed_FileFuncs.F,1.2,1.3 Ed_FindInFiles.F,1.2,1.3 Ed_FrameWindowObj.F,1.4,1.5 Ed_Globals.F,1.3,1.4 Ed_HyperLink.F,1.2,1.3 Ed_KeyCMD.F,1.2,1.3 Ed_Keys.F,1.3,1.4 Ed_LineFuncs.F,1.2,1.3 Ed_LoadFileFuncs.F,1.2,1.3 Ed_Menu.F,1.2,1.3 Ed_MenuFuncs.F,1.2,1.3 Ed_MessageBrodcast.F,1.3,1.4 Ed_MiscFunc.F,1.2,1.3 Ed_MouseHighlight.F,1.2,1.3 Ed_Remote.F,1.2,1.3 Ed_Statbar.F,1.2,1.3 Ed_ToolBar.F,1.2,1.3 Ed_Url.F,1.2,1.3 Ed_Version.F,1.3,1.4 WinEd.f,1.7,1.8 Ed_Sub_Dirs.F,1.2,NONE
Update of /cvsroot/win32forth/win32forth/apps/WinEd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24685/apps/WinEd Modified Files: Ed_Defaults.F Ed_EditWindowObj.F Ed_EditorWords.F Ed_FileFuncs.F Ed_FindInFiles.F Ed_FrameWindowObj.F Ed_Globals.F Ed_HyperLink.F Ed_KeyCMD.F Ed_Keys.F Ed_LineFuncs.F Ed_LoadFileFuncs.F Ed_Menu.F Ed_MenuFuncs.F Ed_MessageBrodcast.F Ed_MiscFunc.F Ed_MouseHighlight.F Ed_Remote.F Ed_Statbar.F Ed_ToolBar.F Ed_Url.F Ed_Version.F WinEd.f Removed Files: Ed_Sub_Dirs.F Log Message: Removed WinEd's internal console window. Index: Ed_EditorWords.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_EditorWords.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Ed_EditorWords.F 30 Apr 2005 20:52:42 -0000 1.2 --- Ed_EditorWords.F 28 Aug 2005 07:28:06 -0000 1.3 *************** *** 158,169 **** text-length 4000 + text-blen > \ check for buffer full warned? 0= and \ and haven't warned used? ! IF GetStack: DocWindow entry-console = ! IF TRUE to edit-changed? \ SET changed flag ! primitive-save-text ! ELSE beep ! IF beep ! warn-to-save ! true to warned? \ we warned you! ! THEN THEN THEN --- 158,165 ---- text-length 4000 + text-blen > \ check for buffer full warned? 0= and \ and haven't warned used? ! IF beep ! IF beep ! warn-to-save ! true to warned? \ we warned you! THEN THEN Index: Ed_Statbar.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_Statbar.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Ed_Statbar.F 30 Apr 2005 20:52:42 -0000 1.2 --- Ed_Statbar.F 28 Aug 2005 07:28:07 -0000 1.3 *************** *** 14,22 **** :Object Win-EdStatusbar <Super MultiStatusbar ! create MultiWidth 125 , 250 , 400 , 520 , 580 , \ width of statusbar parts create SingleWidth -1 , \ width of statusbar parts :M SetMulti: ( -- ) ! MultiWidth 5 SetParts: self ;M --- 14,22 ---- :Object Win-EdStatusbar <Super MultiStatusbar ! create MultiWidth 125 , 250 , 400 , 580 , \ width of statusbar parts create SingleWidth -1 , \ width of statusbar parts :M SetMulti: ( -- ) ! MultiWidth 4 SetParts: self ;M Index: WinEd.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/WinEd.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** WinEd.f 4 Jun 2005 08:51:19 -0000 1.7 --- WinEd.f 28 Aug 2005 07:28:07 -0000 1.8 *************** *** 10,14 **** )) ! cr .( Loading Win-Ed... ) anew -wined.f --- 10,14 ---- )) ! cr .( Loading WinEd... ) anew -wined.f *************** *** 24,28 **** \ So we can rename it as part of an application jap rda create Edname$ 32 allot ! s" Win-Ed " Edname$ place needs Ed_Version.f \ This version of Win-Ed --- 24,28 ---- \ So we can rename it as part of an application jap rda create Edname$ 32 allot ! s" WinEd " Edname$ place needs Ed_Version.f \ This version of Win-Ed *************** *** 39,43 **** needs Ed_About.f \ Win-Ed about Dialog needs Ed_LineFuncs.f \ Setup the line pointers and scroll bar for a new file ! needs Ed_Sub_Dirs.f \ Multi-Directory File processing needs Ed_Search.f \ Text Search functions needs Ed_KeyCMD.f \ Scrolling, ins/del lines & characters --- 39,43 ---- needs Ed_About.f \ Win-Ed about Dialog needs Ed_LineFuncs.f \ Setup the line pointers and scroll bar for a new file ! needs Sub_Dirs.f \ Multi-Directory File processing needs Ed_Search.f \ Text Search functions needs Ed_KeyCMD.f \ Scrolling, ins/del lines & characters *************** *** 74,78 **** edit-window to EditWindow edit-window to DocWindow - console-window to ConsoleWindow ['] Mhedit-click SetClickFunc: EditWindow --- 74,77 ---- *************** *** 80,87 **** ['] Mhedit-track SetTrackFunc: EditWindow ['] Mhedit-dblclick SetDblClickFunc: EditWindow - ['] Mhedit-click SetClickFunc: ConsoleWindow - ['] Mhedit-unclick SetUnClickFunc: ConsoleWindow - ['] Mhedit-track SetTrackFunc: ConsoleWindow - ['] Mhedit-dblclick SetDblClickFunc: ConsoleWindow ['] wined_win32forth-message is win32forth-message --- 79,82 ---- *************** *** 108,133 **** load-more-defaults new-text - console-text make-new-text open-initial-file cursor-line find-top-margin - VPosition: EditWindow ! command-args c@ ! show-console? 0= AND ! IF StartConsole: EditorWindow ! THEN - show-console? - IF 0 VPosition: ConsoleWindow - THEN - show-console? \ if Forth is displayed - file-to-edit$ c@ 0= and \ and no file specified - minimized-EditWindow? or - minimized-ConsoleWindow? 0= and - IF SetFocus: ConsoleWindow - ConsoleWindow to DocWindow - ELSE SetFocus: EditWindow - EditWindow to DocWindow - THEN GetStack: DocWindow to entry# refresh-screen --- 103,113 ---- load-more-defaults new-text make-new-text open-initial-file cursor-line find-top-margin - VPosition: EditWindow ! SetFocus: EditWindow ! EditWindow to DocWindow GetStack: DocWindow to entry# refresh-screen Index: Ed_FrameWindowObj.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_FrameWindowObj.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Ed_FrameWindowObj.F 20 Jun 2005 07:40:44 -0000 1.4 --- Ed_FrameWindowObj.F 28 Aug 2005 07:28:06 -0000 1.5 *************** *** 54,69 **** 0 value hdraging? - : in-vdrag? ( -- f1 ) \ in vert drag bar - hWnd get-mouse-xy nip - drag-barV dup drag-thick + 2 + 1 - between - show-console? and ; - : in-hdrag? ( -- f1 ) \ in horizontal drag bar hWnd get-mouse-xy \ -- x y ;mouse position ! show-console? ! IF edit-top drag-barV between ! ELSE edit-top Height -status between ! THEN ! swap drag-barH dup drag-thick + 2 + between and ; --- 54,60 ---- 0 value hdraging? : in-hdrag? ( -- f1 ) \ in horizontal drag bar hWnd get-mouse-xy \ -- x y ;mouse position ! edit-top Height -status between swap drag-barH dup drag-thick + 2 + between and ; *************** *** 75,81 **** IF mousey drag-thick 2/ - Height drag-thick 2 + - -status 1 - 0max min ! StartSize: Win-EdToolbar nip max to drag-barV ! set-console-height ! drag-barV edit-top listHeightDefault + <= Hide: Subjectlist THEN hdraging? --- 66,70 ---- IF mousey drag-thick 2/ - Height drag-thick 2 + - -status 1 - 0max min ! \ drag-barV edit-top listHeightDefault + <= Hide: Subjectlist THEN hdraging? *************** *** 94,98 **** THEN true to mousedown? - in-vdrag? to vdraging? in-hdrag? to hdraging? MheditW-track ; --- 83,86 ---- *************** *** 106,125 **** false to hdraging? ; - : dbl-click-vdrag ( -- ) - show-console? 0= ?EXIT - in-vdrag? 0= ?EXIT - drag-barV drag-thick 2 / + - StartSize: Win-EdToolbar nip drag-thick + 2 + Height - -status 0max between - IF StartSize: Win-EdToolbar nip to drag-barV - ConsoleWindow to DocWindow - ELSE Height drag-thick 2 + - -status 1 - 0max to drag-barV - EditWindow to DocWindow - THEN GetStack: DocWindow to entry# - set-console-height - show-console? - IF drag-barV edit-top listHeightDefault + <= Hide: Subjectlist - THEN ; - : dbl-click-hdrag ( -- ) in-hdrag? 0= ?EXIT --- 94,97 ---- *************** *** 135,139 **** false to mousedown? mousey StartSize: Win-EdToolbar nip < ?EXIT - dbl-click-vdrag dbl-click-hdrag SetFocus: DocWindow --- 107,110 ---- *************** *** 158,177 **** On_Init: super \ first init super class Create: sFont \ create the font for file list ! second-copy? 0= ! show-console? and ! IF Height 4 / SetTopOf: ConsoleWindow \ set the console window's top ! 1 SetId: ConsoleWindow \ then the child window ! self Start: ConsoleWindow \ then startup child window ! 2 SetId: SplitterV ! self Start: SplitterV ! z" RMOT" @ ed-console-remote ! \ set remote IO operations ! ed-forth-count @ 0= ! IF z" HIDN" @ ed-console-hidden ! \ flag Forth to hide console ! StartUpForth ! ELSE 0 WM_REMOTEIO win32forth-message ! THEN ! ELSE ! FALSE to show-console? ! THEN min-tool-bar? IF min-Edit-Tool-Bar to Win-EdToolbar --- 129,133 ---- On_Init: super \ first init super class Create: sFont \ create the font for file list ! min-tool-bar? IF min-Edit-Tool-Bar to Win-EdToolbar *************** *** 203,208 **** max-ToolBar-Popup-bar SetPopupBar: max-Edit-Tool-Bar Edit-Popup-Bar SetPopupBar: EditWindow - Console-Popup-Bar SetPopupBar: ConsoleWindow - show-console? EnableDisplayMenu ;M --- 159,162 ---- *************** *** 223,227 **** : adjust-col/rows ( -- ) EditWindow set-col/rows ! ConsoleWindow set-col/rows ; :M SetMultiStatus: ( a1 n1 a2 n1 -- ) \ set the current text on statusbar --- 177,181 ---- : adjust-col/rows ( -- ) EditWindow set-col/rows ! ; :M SetMultiStatus: ( a1 n1 a2 n1 -- ) \ set the current text on statusbar *************** *** 255,266 **** StatusBuf +null StatusBuf 1+ 2 SetText: Win-EdStatusbar - s" Forth Instances: " StatusBuf place - ed-forth-count @ 0 (d.) StatusBuf +place - StatusBuf +null StatusBuf 1+ 3 SetText: Win-EdStatusbar - overstrike @ if s" <OvrStrk>" else s" <Insert>" then StatusBuf place ! StatusBuf +null StatusBuf 1+ 4 SetText: Win-EdStatusbar ;M --- 209,216 ---- StatusBuf +null StatusBuf 1+ 2 SetText: Win-EdStatusbar overstrike @ if s" <OvrStrk>" else s" <Insert>" then StatusBuf place ! StatusBuf +null StatusBuf 1+ 3 SetText: Win-EdStatusbar ;M *************** *** 276,287 **** :M Refresh: ( -- ) minimized? 0= ! IF show-console? ! IF Height console-height - StartSize: Win-EdToolbar nip max ! ELSE Height ! THEN to drag-barV ! drag-barH Width edit-min - 0max min to drag-barH edit-top SetTopOf: EditWindow - drag-barV SetTopOf: ConsoleWindow (( The peculiar calculations for window positions and sizes, result from the --- 226,232 ---- :M Refresh: ( -- ) minimized? 0= ! IF drag-barH Width edit-min - 0max min to drag-barH edit-top SetTopOf: EditWindow (( The peculiar calculations for window positions and sizes, result from the *************** *** 295,302 **** edit-top Width drag-barH drag-thick + - ! show-console? ! IF drag-barV edit-top - ! ELSE Height edit-top - -status ! THEN Move: EditWindow window-list BEGIN dup @ ?dup --- 240,245 ---- edit-top Width drag-barH drag-thick + - ! Height edit-top - -status ! Move: EditWindow window-list BEGIN dup @ ?dup *************** *** 305,312 **** IF 0 edit-top listHeight + dup>r drag-barH 1- ! show-console? ! IF drag-barV r> - ! ELSE Height r> - -status ! THEN Move: [ r@ ] THEN r>drop cell+ --- 248,253 ---- IF 0 edit-top listHeight + dup>r drag-barH 1- ! Height r> - -status ! Move: [ r@ ] THEN r>drop cell+ *************** *** 315,331 **** drag-barH 1- edit-top 1- drag-thick 2 + ! show-console? ! IF drag-barV edit-top - 2 + ! ELSE Height edit-top - 2 + -status ! THEN Move: SplitterH ! ! show-console? ! IF all-lines: ConsoleWindow ! -1 drag-barV ! Width 2 + drag-thick 2 + Move: SplitterV ! ! -1 drag-barV drag-thick + 2 + dup>r ! Width 2 + Height r> - -status Move: ConsoleWindow ! THEN Showing: SubjectList --- 256,261 ---- drag-barH 1- edit-top 1- drag-thick 2 + ! Height edit-top - 2 + -status ! Move: SplitterH Showing: SubjectList *************** *** 341,346 **** Floating: Win-EdToolbar 0= and IF TRUE to tool-bar? - GetSize: EditorWindow nip 2/ to drag-barV - set-console-height self Start: Win-EdToolbar \ then startup child window LoadFindStrings --- 271,274 ---- *************** *** 377,415 **** ;M - :M StartConsole: ( -- ) - second-copy? 0= - IF Height 4 / \ console is a quarter screen - SetTopOf: ConsoleWindow \ set the console window's top - self Start: ConsoleWindow \ then startup child window - self Start: SplitterV - TRUE to show-console? \ must be before the ">F" below - console-text - end-doc - TRUE EnableDisplayMenu - >F - Refresh: self - z" RMOT" @ ed-console-remote ! \ set remote IO operations - ed-forth-count @ 0= - IF z" HIDN" @ ed-console-hidden ! \ flag Forth to hide console - StartUpForth - ELSE 0 WM_REMOTEIO win32forth-message - THEN - ELSE FALSE to show-console? - THEN - ;M - - :M CloseConsole: ( -- ) - save-console - FALSE to show-console? - >E-unminimize - Close: ConsoleWindow - Close: SplitterV - FALSE EnableDisplayMenu - Refresh: self - Retitle: [ self ] - 0 ed-console-remote ! - 0 ed-console-hidden ! - ;M - :M On_Done: ( h m w l -- res ) Delete: sFont --- 305,308 ---- *************** *** 484,488 **** Top: ClientRect Bottom: ClientRect between swap Left: ClientRect Right: ClientRect between and ! IF in-vdrag? IF splitv-cursor 1 ELSE in-hdrag? --- 377,381 ---- Top: ClientRect Bottom: ClientRect between swap Left: ClientRect Right: ClientRect between and ! IF false IF splitv-cursor 1 ELSE in-hdrag? *************** *** 503,516 **** entry# >r \ save entry ! entry# entry-console = ! IF s" Win32Forth Console" title$ lplace ! ELSE GetStack: EditWindow to entry# ! Edname$ count title$ lplace ! (.wined_version) title$ +lplace ! s" - " title$ +lplace ! from-web? ! IF URL$ lcount title$ +lplace ! ELSE cur-filename count title$ +lplace ! THEN THEN title$ lcount 255 min SetTitle: self --- 396,406 ---- entry# >r \ save entry ! GetStack: EditWindow to entry# ! Edname$ count title$ lplace ! (.wined_version) title$ +lplace ! s" - " title$ +lplace ! from-web? ! IF URL$ lcount title$ +lplace ! ELSE cur-filename count title$ +lplace THEN title$ lcount 255 min SetTitle: self *************** *** 604,608 **** :M WM_DROPFILES { hndl message wParam lParam \ cFiles drop$ -- res } MAXSTRING LocalAlloc: drop$ ! >E-unminimize SetForegroundWindow: self 0 --- 494,498 ---- :M WM_DROPFILES { hndl message wParam lParam \ cFiles drop$ -- res } MAXSTRING LocalAlloc: drop$ ! >E SetForegroundWindow: self 0 *************** *** 626,629 **** RefreshOn: EditWindow ;M - - |
