Update of /cvsroot/win32forth/win32forth/apps/WinEd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20644/win32forth/apps/WinEd Modified Files: Ed_About.F Ed_Clipboard.F Ed_Colorize.F Ed_Debug.F Ed_Defaults.F Ed_Do-Html-Link.F Ed_EditWindowObj.F Ed_EditorWords.F Ed_FileFuncs.F Ed_FileStack.F Ed_FindInFiles.F Ed_Findrepl.F Ed_FrameWindowObj.F Ed_Globals.F Ed_Gotoline.F Ed_HyperLink.F Ed_ImageDC.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_Search.F Ed_Sfont.F Ed_Statbar.F Ed_Sub_Dirs.F Ed_SubjectListObj.F Ed_ToolBar.F Ed_Url.F Ed_Version.F HYPER.F WinEd.f Log Message: Jos: For WinEd 3.04 Index: Ed_EditorWords.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_EditorWords.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Ed_EditorWords.F 12 Mar 2005 09:29:20 -0000 1.1 --- Ed_EditorWords.F 30 Apr 2005 20:52:42 -0000 1.2 *************** *** 77,83 **** defer primitive-save-text ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 4 Colons-only code ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ 40 value maxscrlines --- 77,83 ---- defer primitive-save-text ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 4 Colons-only code ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ 40 value maxscrlines *************** *** 131,137 **** \ ---------- end colons-only ----------- ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 5 Editor words ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ : #line! { caddr clen cline \ cbuf$ cdiff -- } --- 131,137 ---- \ ---------- end colons-only ----------- ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 5 Editor words ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ : #line! { caddr clen cline \ cbuf$ cdiff -- } *************** *** 315,321 **** EditMode: Win-EdToolbar ; ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 6 Beep ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ : beeper ( -- ) --- 315,321 ---- EditMode: Win-EdToolbar ; ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 6 Beep ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ : beeper ( -- ) *************** *** 327,329 **** --- 327,356 ---- IF beep THEN ; + + \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ + \ 7 Define the EDIT-WINDOW object + \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ + + 0 value textBG + 0 value textFG + 0 0 0 rgb new-color highBG + 255 255 255 rgb new-color highFG + Color: WHITE new-color normalBG + Color: BLACK new-color normalFG + 192 225 255 rgb new-color marginColor + Color: LTGRAY new-color linesColor + Color: BLACK new-color binaryColor + ( BLUE ) GREEN value BmarginColor \ browse margin color + + defer trailBG ' normalBG is trailBG + defer selectBG ' normalBG is selectBG + + : highlighting? ( -- f1 ) + hcst hlst hced hled d= 0= ; \ if start and end are same + + + : increment/ ( n1 -- n2 ) \ adjust for very large file + file-lines 65536 > \ if MANY lines, then + IF file-lines 65536 / 1+ / \ divide scroll lines + THEN ; Index: Ed_ImageDC.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_ImageDC.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Ed_ImageDC.F 12 Mar 2005 09:29:20 -0000 1.1 --- Ed_ImageDC.F 30 Apr 2005 20:52:42 -0000 1.2 *************** *** 1,15 **** ! \ $ Id: Ed_ImageDc.f,v 3.1 2005/02/01 21:15:56 aws Exp $ \ ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 7 Drawing into the Image DC ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! : moveto ( x y -- ) \ Move to the x y position in the editor imageDC MoveTo: [ ] ; ! : lineto ( x y -- ) \ How does this differ from the above imageDC LineTo: [ ] ; ! : line ( x1 y1 x2 y2 -- ) \ move the line from xy to x2y2 2swap moveto lineto ; --- 1,15 ---- ! \ $ Id: Ed_ImageDc.f,v 1.1 2005/02/01 21:15:56 aws Exp $ \ ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 7 Drawing into the Image DC ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! : moveto ( x y -- ) \ Move to the x y position in the editor imageDC MoveTo: [ ] ; ! : lineto ( x y -- ) imageDC LineTo: [ ] ; ! : line ( x1 y1 x2 y2 -- ) \ move the line from xy to x2y2 2swap moveto lineto ; *************** *** 18,20 **** imageDC LineColor: [ ] ; - --- 18,19 ---- Index: Ed_FrameWindowObj.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_FrameWindowObj.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Ed_FrameWindowObj.F 12 Mar 2005 09:29:20 -0000 1.1 --- Ed_FrameWindowObj.F 30 Apr 2005 20:52:42 -0000 1.2 *************** *** 1,7 **** \ $Id$ \ ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 58 Define the main window for the application ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ :Object FrameWindow <super window --- 1,7 ---- \ $Id$ \ ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ 58 Define the main window for the application ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ :Object FrameWindow <super window *************** *** 24,29 **** StartPos: [ self ] swap \ y, x starting position WindowStyle: [ self ] \ the window style ! WindowTitle: [ self ] rel>abs \ the window title ! WindowClassName 1+ rel>abs \ class name ExWindowStyle: [ self ] \ extended window style Call CreateWindowEx --- 24,29 ---- StartPos: [ self ] swap \ y, x starting position WindowStyle: [ self ] \ the window style ! WindowTitle: [ self ] \ the window title ! WindowClassName 1+ \ class name ExWindowStyle: [ self ] \ extended window style Call CreateWindowEx *************** *** 291,295 **** )) all-lines: EditWindow - drag-barH drag-thick + 1+ edit-top --- 291,294 ---- *************** *** 326,330 **** -1 drag-barV drag-thick + 2 + dup>r ! Width 2 + Height r> - -status Move: ConsoleWindow THEN --- 325,329 ---- -1 drag-barV drag-thick + 2 + dup>r ! Width 2 + Height r> - -status Move: ConsoleWindow THEN *************** *** 446,450 **** :M WindowTitle: ( -- Zstring ) \ window caption ! z" WinEd" ;M --- 445,449 ---- :M WindowTitle: ( -- Zstring ) \ window caption ! z" Win-Ed" ;M *************** *** 592,598 **** THEN ;M ! ! \ 59 Support for Drag and Drop files from File Manager to WinEd ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ :M ExWindowStyle: ( -- ) --- 591,597 ---- THEN ;M ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ 59 Support for Drag and Drop files from File Manager to Win-Ed ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ :M ExWindowStyle: ( -- ) *************** *** 627,629 **** ;M - |