Menu
▾
▴
win32forth-cvs — CVS Commit List
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(70) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(38) |
Feb
(4) |
Mar
(11) |
Apr
(49) |
May
(81) |
Jun
(65) |
Jul
(36) |
Aug
(57) |
Sep
(63) |
Oct
(57) |
Nov
(49) |
Dec
(41) |
| 2006 |
Jan
(75) |
Feb
(80) |
Mar
(10) |
Apr
(13) |
May
(100) |
Jun
(100) |
Jul
(77) |
Aug
(87) |
Sep
(80) |
Oct
(124) |
Nov
(39) |
Dec
(41) |
| 2007 |
Jan
(20) |
Feb
(32) |
Mar
(32) |
Apr
(43) |
May
(146) |
Jun
(40) |
Jul
(49) |
Aug
(33) |
Sep
(25) |
Oct
(19) |
Nov
(11) |
Dec
(8) |
| 2008 |
Jan
(4) |
Feb
(11) |
Mar
(31) |
Apr
(40) |
May
(34) |
Jun
(24) |
Jul
(39) |
Aug
(104) |
Sep
(27) |
Oct
(35) |
Nov
(34) |
Dec
(97) |
| 2009 |
Jan
(75) |
Feb
(29) |
Mar
(45) |
Apr
(76) |
May
(121) |
Jun
(103) |
Jul
(67) |
Aug
(28) |
Sep
(22) |
Oct
(39) |
Nov
(9) |
Dec
(15) |
| 2010 |
Jan
(7) |
Feb
(39) |
Mar
(40) |
Apr
(57) |
May
(67) |
Jun
(69) |
Jul
(49) |
Aug
(68) |
Sep
(22) |
Oct
(7) |
Nov
(2) |
Dec
(10) |
| 2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(4) |
May
(6) |
Jun
(10) |
Jul
(16) |
Aug
(23) |
Sep
(9) |
Oct
|
Nov
(28) |
Dec
(3) |
| 2012 |
Jan
(11) |
Feb
(10) |
Mar
(1) |
Apr
|
May
(4) |
Jun
(3) |
Jul
(3) |
Aug
(4) |
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
(7) |
Mar
(30) |
Apr
(4) |
May
(4) |
Jun
(8) |
Jul
(10) |
Aug
(4) |
Sep
|
Oct
(2) |
Nov
(24) |
Dec
(13) |
| 2014 |
Jan
(7) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(9) |
Jun
|
Jul
(3) |
Aug
(9) |
Sep
|
Oct
(2) |
Nov
|
Dec
(3) |
| 2015 |
Jan
(4) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(5) |
Sep
(1) |
Oct
(4) |
Nov
(7) |
Dec
(39) |
| 2016 |
Jan
(17) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(1) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2018 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Dirk B. <db...@us...> - 2005-09-15 16:36:16
|
Update of /cvsroot/win32forth/win32forth/apps/ForthForm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16338/apps/ForthForm Modified Files: FORTHFORM.F Log Message: Replaced our Html display control (w32fHtmlDisplay.dll) with Tom's ActiveX control. So the file w32fHtmlDisplay.dll isn't needed any more. Index: FORTHFORM.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORTHFORM.F,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FORTHFORM.F 21 Aug 2005 06:22:00 -0000 1.7 --- FORTHFORM.F 15 Sep 2005 16:36:08 -0000 1.8 *************** *** 710,714 **** UpdateSystem - InitHtmlControl \ for the help file InitScintillaControl \ for the editor ;M --- 710,713 ---- *************** *** 863,867 **** if Call DeleteObject drop 0 to staticbmp ! then ExitHtmlControl ExitScintillaControl \+ sysgen 0 Call PostQuitMessage \+ sysgen msg-buffer off \ set as no longer running --- 862,866 ---- if Call DeleteObject drop 0 to staticbmp ! then ExitScintillaControl \+ sysgen 0 Call PostQuitMessage \+ sysgen msg-buffer off \ set as no longer running |
|
From: Dirk B. <db...@us...> - 2005-09-15 16:36:16
|
Update of /cvsroot/win32forth/win32forth/apps/PlayVirginRadio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16338/apps/PlayVirginRadio Modified Files: PlayVirginRadio.f Log Message: Replaced our Html display control (w32fHtmlDisplay.dll) with Tom's ActiveX control. So the file w32fHtmlDisplay.dll isn't needed any more. Index: PlayVirginRadio.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/PlayVirginRadio/PlayVirginRadio.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PlayVirginRadio.f 12 Jun 2005 08:37:34 -0000 1.4 --- PlayVirginRadio.f 15 Sep 2005 16:36:08 -0000 1.5 *************** *** 33,37 **** [ WS_OVERLAPPED WS_CAPTION or WS_SYSMENU or WS_MINIMIZEBOX or WS_MINIMIZEBOX or ] literal ;M ! :M StartSize: ( -- w h ) 470 265 ;M --- 33,37 ---- [ WS_OVERLAPPED WS_CAPTION or WS_SYSMENU or WS_MINIMIZEBOX or WS_MINIMIZEBOX or ] literal ;M ! :M StartSize: ( -- w h ) 470 265 ;M *************** *** 128,132 **** : uninit-player ( -- ) DestroyWindow: MainWindow - ExitHtmlControl SoundOn ; unload-chain chain-add-before uninit-player --- 128,131 ---- *************** *** 135,139 **** \ ----------------------------------------------------------------------------- : InitPlayer ( -- ) - InitHtmlControl \ must be called once at startup Start: MainWindow Play: MainWindow \ start playing radio... --- 134,137 ---- *************** *** 154,158 **** : NoConsole ( -- ) ! initialization-chain do-chain default-application ; ' NoConsole is default-hello --- 152,156 ---- : NoConsole ( -- ) ! initialization-chain do-chain default-application ; ' NoConsole is default-hello *************** *** 177,185 **** \+ CONSOLE-DLL? false to CONSOLE-DLL? - \ Tell Imageman that we don't need the w32fHtmlDisplay.dll - \ if possible (in older w32f versions you have to modify - \ Imageman.f to do this). - \+ HTML-DISPLAY-DLL? true to HTML-DISPLAY-DLL? - \ Create the exe-file ' go turnkey PlayVirginRadio.exe --- 175,178 ---- *************** *** 193,195 **** go [then] - |
|
From: Dirk B. <db...@us...> - 2005-09-15 16:31:53
|
Update of /cvsroot/win32forth/win32forth/demos/COM In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15255/demos/COM Added Files: D3Dtest.f EX_ADO.F EX_D3D.F EX_DDRAW.F EX_SAPI.F Log Message: Uploaded Tom's COM support. --- NEW FILE: EX_ADO.F --- \ Example of using ADO \ Thomas Dixon \ This is a very simple sql utility needs fcom 2 7 typelib {EF53050B-882E-4776-B643-EDA472E8E3F2} \ inlude ADO type library _RecordSet ComIFace rec create DSN 1024 allot \ DSN holder create querybuf 1024 allot \ holds the query buffer create cCol 32 allot u" ," cCol uniplace \ Column Delimeter create NL 32 allot crlf$ count >unicode NL uniplace \ New Record Delimeter create nullch 32 allot u" " nullch uniplace \ Null Character Replacement create sqlbuf 0 , 0 , \ holds the returned buffer : DSN! ( str len -- ) 0 CoInitialize drop \ store the connection string (ODBC) rec @ 0= if rec _RecordSet 1 0 RecordSet CoCreateInstance abort" Unable to Create ADO Recordset!" then asc>uni 2dup DSN uniplace drop free drop ; : SQLEXEC ( options locktype cursortype -- ) 0 DSN unicount drop 0 8 0 querybuf unicount drop 0 8 rec open abort" Unable to Execute SQL Query!" ; : records>str ( -- str len ) \ converts recordset to string sqlbuf @ ?dup if free drop then 0 sqlbuf ! sqlbuf nullch unicount drop NL unicount drop ccol unicount drop -1 2 rec GetString abort" Unable to convert data to String!" sqlbuf @ dup zunicount uni>asc 2dup sqlbuf cell+ ! sqlbuf ! rot CoTaskMemFree drop ; : SQL ( str len -- str len ) \ executes a query asc>uni 2dup querybuf uniplace drop free drop adOptionUnspecified adLockUnspecified adOpenDynamic SQLEXEC records>str ; (( \ Here is a simple example I use on my System \ (Assumes 'DBTest' is a dsn on the machine with a table called 'test') s" DSN=DBTest" dsn! \ Load the DSN s" Select * FROM test" SQL cr type \ Execute a query rec close drop \ cleanup )) |
|
From: Dirk B. <db...@us...> - 2005-09-15 16:31:47
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15255/src/lib Added Files: AXControl.F FCOM.F FlashControl.F HTMLcontrol.F PDFControl.F Log Message: Uploaded Tom's COM support. --- NEW FILE: AXControl.F --- \ ActiveX Control Class \ Thomas Dixon anew -AXControl.F needs fcom winlibrary atl.dll 4 proc AtlAxCreateControl 2 proc AtlAxGetControl :CLASS AXControl <SUPER CHILD-WINDOW :M AutoSize: ( -- ) tempRect.AddrOf GetClientRect: Parent 0 0 Right: tempRect Bottom: tempRect \ x,y,h,w Move: self ;M :M AXUCreate: ( ustr -- ) \ calls unicode creation function 0 0 rot hwnd swap AtlAxCreateControl abort" Unable to Create ActiveX Control!" ;M :M AXCreate: ( str len -- ) \ Initialize the ActiveX control 1+ asc>uni over + 0 swap 2 - w! dup >r AXUCreate: self r> free drop ;M :M QueryInterface: ( ppv riid -- flag ) \ flag is true on error 0 >r rp@ hwnd AtlAxGetControl if r> drop true exitm then rp@ COM IUnknown IQueryInterface rp@ COM IUnknown IReleaseRef drop r> drop ;M ;CLASS \s window win start: win axcontrol ax win start: ax s" MSCAL.Calendar.7" axcreate: ax autosize: ax --- NEW FILE: FlashControl.F --- \ Shockwave Flash control written in forth \ Tom Dixon needs AXControl \ Load Shockwave TypeLibrary 1 0 typelib {D27CDB6B-AE6D-11CF-96B8-444553540000} \ We Build off the Generic ActiveX Control :CLASS FlashControl <SUPER AXControl CELL bytes Flash \ pointer to IShockwaveFlash interface 16 bytes xtra \ xtra space for api calls :M Start: ( Parent -- ) Start: super xtra ShockwaveFlash StringFromCLSID abort" Unable to Get Flash CLSID!" xtra @ AXUCreate: self Flash IShockwaveFlash QueryInterface: self abort" Unable to get the IShockwaveFlash Interface!" ;M :M On_Done: ( -- ) Flash @ if Flash COM IShockwaveFlash Release drop 0 Flash ! then ;M \ ShockWave Methods :M PutMovie: ( str len -- f ) >unicode drop flash COM IShockwaveFlash PutMovie ;M :M GetMovie: ( -- str len ) xtra Flash COM IShockwaveFlash GetMovie drop xtra @ dup >r zunicount >ascii r> call SysFreeString drop ;M :M Play: ( -- ) Flash COM IShockwaveFlash Play drop ;M :M Stop: ( -- ) Flash COM IShockwaveFlash Stop drop ;M :M Back: ( -- ) Flash COM IShockwaveFlash Back drop ;M :M Forward: ( -- ) Flash COM IShockwaveFlash Forward drop ;M :M Rewind: ( -- ) Flash COM IShockwaveFlash Rewind drop ;M :M StopPlay: ( -- ) Flash COM IShockwaveFlash StopPlay drop ;M :M GotoFrame: ( n -- ) Flash COM IShockwaveFlash GotoFrame drop ;M :M CurrentFrame: ( -- n ) xtra Flash COM IShockwaveFlash CurrentFrame drop xtra @ ;M :M TotalFrames: ( -- n ) xtra Flash COM IShockwaveFlash GetTotalFrames drop xtra @ ;M :M Playing?: ( -- flag ) xtra Flash COM IShockwaveFlash IsPlaying drop xtra @ ;M :M Loaded%: ( -- percent ) xtra Flash COM IShockwaveFlash PercentLoaded drop xtra @ ;M :M Loop: ( flag -- ) Flash COM IShockwaveFlash PutLoop drop ;M :M Loop?: ( -- flag ) xtra Flash COM IShockwaveFlash GetLoop drop xtra @ ;M :M Pan: ( n n n -- ) Flash COM IShockwaveFlash Pan drop ;M :M Zoom: ( n -- ) Flash COM IShockwaveFlash Zoom drop ;M :M SetZoomRect: ( n n n n -- ) Flash COM IShockwaveFlash SetZoomRect drop ;M :M BGColor: ( -- color ) xtra Flash COM IShockwaveFlash GetBackgroundColor drop xtra @ ;M :M SetBGColor: ( color -- ) Flash COM IShockwaveFlash PutBackgroundColor drop ;M ;CLASS \ We don't need the typelibrary anymore, so unload it now. free-lasttypelib \s \ Example: :class Flashwin <super window Flashcontrol fcntrl :M On_Init: ( -- ) On_Init: super self Start: fcntrl ;M :M On_Size: ( h m w -- ) 2drop drop autosize: fcntrl ;M \ ShockWave Methods :M PutMovie: ( str len -- f ) PutMovie: fcntrl ;M :M GetMovie: ( -- str len ) GetMovie: fcntrl ;M :M Play: ( -- ) Play: fcntrl ;M :M Stop: ( -- ) Stop: fcntrl ;M :M Back: ( -- ) Back: fcntrl ;M :M Forward: ( -- ) Forward: fcntrl ;M :M Rewind: ( -- ) Rewind: fcntrl ;M :M StopPlay: ( -- ) StopPlay: fcntrl ;M :M GotoFrame: ( n -- ) GotoFrame: fcntrl ;M :M CurrentFrame: ( -- n ) CurrentFrame: fcntrl ;M :M TotalFrames: ( -- n ) TotalFrames: fcntrl ;M :M Playing?: ( -- flag ) Playing?: fcntrl ;M :M Loaded%: ( -- percent ) Loaded%: fcntrl ;M :M Loop: ( flag -- ) Loop: fcntrl ;M :M Loop?: ( -- flag ) Loop?: fcntrl ;M :M Pan: ( n n n -- ) Pan: fcntrl ;M :M Zoom: ( n -- ) Zoom: fcntrl ;M :M SetZoomRect: ( n n n n -- ) SetZoomRect: fcntrl ;M :M BGColor: ( -- color ) BGColor: fcntrl ;M :M SetBGColor: ( color -- ) SetBGColor: fcntrl ;M ;class Flashwin fwin start: fwin 0 setbgcolor: fwin s" c:\temp\swf\f02[1].swf" putmovie: fwin drop true loop: fwin --- NEW FILE: HTMLcontrol.F --- \ HTML Control \ Thomas Dixon needs AXControl \ Load MSHTML TypeLibrary 1 1 typelib {EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B} \ We Build off the Generic ActiveX Control :CLASS HTMLControl <SUPER AXControl CELL bytes Web \ pointer to IWebBrowser2 interface 16 bytes xtra \ xtra space for api calls :M Start: ( Parent -- ) Start: super xtra WebBrowser StringFromCLSID abort" Unable to Get WebBrowser CLSID!" xtra @ AXUCreate: self Web IWebBrowser2 QueryInterface: self abort" Unable to get the IWebBrowser2 Interface!" ;M :M On_Done: ( -- ) Web @ if Web COM IWebBrowser2 Release drop 0 Web ! then ;M \ Browser Methods :M GetPath: ( -- str len ) xtra Web COM IWebBrowser2 GetPath drop xtra @ dup >r zunicount >ascii r> call SysFreeString drop ;M :M GetLocationURL: ( -- str len ) xtra Web COM IWebBrowser2 GetLocationURL drop xtra @ dup >r zunicount >ascii r> call SysFreeString drop ;M :M GetLocationName: ( -- str len ) xtra Web COM IWebBrowser2 GetLocationName drop xtra @ dup >r zunicount >ascii r> SysFreeString drop ;M :M Busy?: ( -- flag ) xtra Web COM IWebBrowser2 GetBusy drop xtra @ 1 and ;M \ Navigation Functions :M GoHome: ( -- ) Web COM IWebBrowser2 GoHome drop ;M :M GoSearch: ( -- ) Web COM IWebBrowser2 GoSearch drop ;M :M GoForward: ( -- ) Web COM IWebBrowser2 GoForward drop ;M :M GoBack: ( -- ) Web COM IWebBrowser2 GoBack drop ;M :M Refresh: ( -- ) Web COM IWebBrowser2 Refresh drop ;M :M Stop: ( -- ) Web COM IWebBrowser2 Stop drop ;M :M GoURL: ( str len -- ) \ Navigate to the URL >unicode drop >r 0 0 0 0 r> Web COM IWebBrowser2 Navigate drop ;M ;CLASS \ We don't need the typelibrary anymore, so unload it now. free-lasttypelib \s \ Example: \ Create a simple browser window :class Browserwin <super window HTMLcontrol html :M On_Init: ( -- ) On_Init: super self Start: html ;M :M On_Size: ( h m w -- ) 2drop drop autosize: html ;M :M GetPath: ( -- str len ) GetPath: html ;M :M GetLocationURL: ( -- str len ) GetLocationURL: html ;M :M GetLocationName: ( -- str len ) GetLocationName: html ;M :M Busy?: ( -- flag ) Busy?: html ;M :M GoHome: ( -- ) GoHome: html ;M :M GoSearch: ( -- ) GoSearch: html ;M :M GoForward: ( -- ) GoForward: html ;M :M GoBack: ( -- ) GoBack: html ;M :M Refresh: ( -- ) Refresh: html ;M :M Stop: ( -- ) Stop: html ;M :M GoURL: ( str len -- ) GoURL: html ;M ;class BrowserWin bwin start: bwin \ gohome: bwin s" www.win32forth.org" GoURL: bwin \ and you should have a browser window at your home page --- NEW FILE: PDFControl.F --- \ Acrobat PDF Control \ Thomas Dixon needs AXControl \ We Build off the Generic ActiveX Control :CLASS PDFControl <SUPER AXControl CELL bytes PDF \ pointer to Dispatch Interface 16 bytes xtra \ xtra space for api calls :M Start: ( Parent -- ) Start: super \ You can use PDF.PdfCtrl.6 instead of the ugly clsid string, but this \ way we aren't dependent on the vertion of adobe acrobat s" {CA8A9780-280D-11CF-A24D-444553540000}" AXCreate: self PDF IDispatch QueryInterface: self abort" Unable to get the Dispatch Interface!" ;M :M On_Done: ( -- ) PDF @ if PDF COM IDispatch IReleaseref drop 0 PDF ! then ;M :M LoadFile: ( str len -- flag ) \ flag is true on error >unicode drop VT_BSTR >vt PDF displate" LoadFile" ;M :M SetPage: ( n -- ) VT_I4 >vt PDF displate" setCurrentPage" drop ;M :M gotoFirstPage: ( -- ) PDF displate" gotoFirstPage" drop ;M :M gotoLastPage: ( -- ) PDF displate" gotoLastPage" drop ;M :M gotoNextPage: ( -- ) PDF displate" gotoNextPage" drop ;M :M gotoPreviousPage: ( -- ) PDF displate" gotoPreviousPage" drop ;M :M goForward: ( -- ) PDF displate" goForwardStack" drop ;M :M goBack: ( -- ) PDF displate" goBackwardStack" drop ;M :M Print: ( -- ) PDF displate" Print" drop ;M :M PrintWithDialog: ( -- ) PDF displate" PrintWithDialog" drop ;M :M PrintPages: ( n n -- ) swap VT_I4 >vt VT_I4 >vt PDF displate" PrintPages" drop ;M :M PrintPagesFit: ( flag n n -- ) rot VT_BOOL >vt swap VT_I4 >vt VT_I4 >vt PDF displate" PrintPagesFit" drop ;M :M PrintAll: ( -- ) PDF displate" PrintAll" drop ;M :M PrintAllFit: ( bool -- ) VT_BOOL >vt PDF displate" PrintAllFit" drop ;M :M SetZoom: ( float -- ) \ 100e0 is 100% sfs>ds VT_R4 >vt PDF displate" SetZoom" drop ;M :M SetZoomScroll: ( float float float -- ) 3 0 do sfs>ds VT_R4 loop 3 0 do >vt loop PDF displate" SetZoomScroll" drop ;M :M SetViewRect: ( float float float float -- ) 4 0 do sfs>ds VT_R4 loop 4 0 do >vt loop PDF displate" SetViewRect" drop ;M :M SetPageMode: ( str len -- ) >unicode drop VT_BSTR >vt PDF displate" SetPageMode" drop ;M :M SetLayoutMode: ( str len -- ) >unicode drop VT_BSTR >vt PDF displate" SetLayoutMode" drop ;M :M SetNamedDest: ( str len -- ) >unicode drop VT_BSTR >vt PDF displate" SetNamedDest" drop ;M :M SetShowToolbar: ( flag -- ) VT_BOOL >vt PDF displate" SetShowToolbar" drop ;M :M SetShowScrollbars: ( flag -- ) VT_BOOL >vt PDF displate" SetShowScrollbars" drop ;M :M Aboutbox: ( -- ) PDF displate" AboutBox" drop ;M ;CLASS \s \ Example: \ Create a simple pdf window :class PDFwin <super window PDFControl pdf :M On_Init: ( -- ) On_Init: super self Start: pdf ;M :M On_Size: ( h m w -- ) 2drop drop autosize: pdf ;M :M LoadFile: ( str len -- flag ) LoadFile: pdf ;M :M SetPage: ( n -- ) SetPage: pdf ;M :M gotoFirstPage: ( -- ) gotoFirstPage: pdf ;M :M gotoLastPage: ( -- ) gotoLastPage: pdf ;M :M gotoNextPage: ( -- ) gotoNextPage: pdf ;M :M gotoPreviousPage: ( -- ) gotoPreviousPage: pdf ;M :M goForward: ( -- ) goForward: pdf ;M :M goBack: ( -- ) goBack: pdf ;M :M Print: ( -- ) Print: pdf ;M :M PrintWithDialog: ( -- ) PrintWithDialog: pdf ;M :M PrintPages: ( n n -- ) PrintPages: pdf ;M :M PrintPagesFit: ( flag n n -- ) PrintPagesFit: pdf ;M :M PrintAll: ( -- ) PrintAll: pdf ;M :M PrintAllFit: ( bool -- ) PrintAllFit: pdf ;M :M SetZoom: ( float -- ) SetZoom: pdf ;M :M SetZoomScroll: ( float float float -- ) SetZoomScroll: pdf ;M :M SetViewRect: ( float float float float -- ) SetViewRect: pdf ;M :M SetPageMode: ( str len -- ) SetPageMode: pdf ;M :M SetLayoutMode: ( str len -- ) SetLayoutMode: pdf ;M :M SetNamedDest: ( str len -- ) SetNamedDest: pdf ;M :M SetShowToolbar: ( flag -- ) SetShowToolbar: pdf ;M :M SetShowScrollbars: ( flag -- ) SetShowScrollbars: pdf ;M :M Aboutbox: ( -- ) Aboutbox: pdf ;M ;class pdfwin pwin start: pwin s" doc\Forth_Primer.pdf" Prepend<home>\ loadfile: pwin drop \ This should load a pdf file and display it in a window \ I don't think the PDF viewer was ever ment to be used as an embedded control \ It only supports the dispatch interface and updates (such as resizing) are rather slow --- NEW FILE: FCOM.F --- \ Component Object Module Interface for Win32forth \ Tom Dixon anew -FCOM.f internal external winlibrary OLE32.DLL 1 proc CoInitialize 5 proc CoCreateInstance 6 proc MultiByteToWideChar 8 proc WideCharToMultiByte 2 proc CLSIDFromProgID 2 proc StringFromCLSID 2 proc CLSIDFromString [...1059 lines suppressed...] \ 3 0 IMethod IQueryInterface ( ppv riid -- hres ) \ 1 1 IMethod IAddRef ( -- refs ) \ 1 2 IMethod IReleaseRef ( -- refs ) \ Close-Interface \ you can do the same with structures, but there are better ways to do \ structures. \ My primary purpose in writing this was to make interfacing to COM just as \ easy as using a dll (if not more so). I tried to make it fast, which may \ have lost some of the readability. This only supports early-binding. This \ shouldn't be a problem, because nearly every component out there has a "dual" \ interface anyway. )) \ 2 5 typelib {00000205-0000-0010-8000-00AA006D2EA4} \ 1 0 typelib {CA8A9783-280D-11CF-A24D-444553540000} \ IDispatch comiface disp \ disp IDispatch 1 0 RecordSet CoCreateInstance . |
|
From: Dirk B. <db...@us...> - 2005-09-15 16:31:46
|
Update of /cvsroot/win32forth/win32forth/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15255/doc Modified Files: p-relnotes.6.12.htm Log Message: Uploaded Tom's COM support. Index: p-relnotes.6.12.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/doc/p-relnotes.6.12.htm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** p-relnotes.6.12.htm 12 Jun 2005 08:37:35 -0000 1.3 --- p-relnotes.6.12.htm 15 Sep 2005 16:31:38 -0000 1.4 *************** *** 30,33 **** --- 30,34 ---- <li>Ezra Boyce</li> <li>Dirk Busch</li> + <li>Thomas Dixon</li> <li>Bruno Gauthier</li> <li>George Hubert</li> *************** *** 95,100 **** --- 96,165 ---- enumerate resources in .dll and .exe files (For Win NT4 or better only). </a> </li> + <li><a href="../src/lib/fcom.f">Component Object Module (COM) Interface. </a> + </li> </ul> + <h2>New Classes</h2> + <ul> + <li><a href="../src/lib/HTMLControl.F">browser control</a> + This is a browser control that can be used for all kinds of things. + An example of a browser window is included in at the bottom of the file. + </li> + + <li><a href="../src/lib/PDFControl.F">PDF control</a> + Embeds a adobe acrobat control into your window. This control uses the + dispatch interface to talk to the control (because a real interface wasn't + provided). This requires that you have a adobe reader installed. + Example also included at bottom of the file. + </li> + + <li><a href="../src/lib/FlashControl.F">Shockwave Flash Control</a> + Flash control that can play swf movies. There are many more methods to + the calling interface that I did not include because I didn't know what + they did. Maybe someone who has more experience with flash could help + develop it futher. You do need the shockwave control installed. + </li> + + <li><a href="../src/lib/AXControl.F">Generic Activex Control</a> + <p><pre> + AXControl is a class that can be treated like any other control in + win32forth, except it is enabled to host an activex component. A short + example of it's usage: + window win + start: win + axcontrol ax + win start: ax + s" MSCAL.Calendar" axcreate: ax + autosize: ax + + The example here hosts a calandar control by it's progid. + In order to see this work properly, you need to have that activex + control installed on your machine. ProgID's may also have some + version control to them. "MSCAL.Calendar.7" as the progid would + only host version 7 of the caladar control. + + You may also use the string of the clsid that you want to use instead of + the progid, if it suits your purposes better. Ex: + + s" {8E27C92B-1264-101C-8A2F-040224009C02}" axcreate: ax + autosize: ax + + You may also use a url if you want: + + s" http://www.google.com" axcreate: ax + autosize: ax + + You may also give it html code, if it is proceeded by "MSHTML:" Ex: + + s" MSHTML:<HTML><BODY>Hello World!</BODY></HTML>" axcreate: ax + autosize: ax + + Just having the control there is nice, but the REAL trick is to + communicate with it and exchange data back and forth. The way that + this is done is by getting the control's interface and using it. That is + what was done in all the other activex controls posted. + </pre><p> + </li> + </ul> <h2>New Demos</h2> |
|
From: Dirk B. <db...@us...> - 2005-09-15 16:29:19
|
Update of /cvsroot/win32forth/win32forth/demos/COM In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14601/COM Log Message: Directory /cvsroot/win32forth/win32forth/demos/COM added to the repository |
|
From: Rod O. <rod...@us...> - 2005-09-05 19:58:45
|
Update of /cvsroot/win32forth/win32forth/doc/ProMgr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12229/doc/ProMgr Modified Files: ProjectManager.htm Added Files: prjFileMenu.gif prjHelpMenu.gif prjProjectMenu.gif prjProjectWindow.gif prjViewMenu.gif Log Message: Rod: Project Manager v2.01.00. Corrected bug in finding .res file. Build project now finds AddCursor and AddIcon, .ico and .cur files added to resources section. Cursor drawn in right pane for .cur file Updated doc. --- NEW FILE: prjFileMenu.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: prjHelpMenu.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: prjProjectMenu.gif --- (This appears to be a binary file; contents omitted.) Index: ProjectManager.htm =================================================================== RCS file: /cvsroot/win32forth/win32forth/doc/ProMgr/ProjectManager.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProjectManager.htm 21 Dec 2004 00:19:01 -0000 1.1 --- ProjectManager.htm 5 Sep 2005 19:58:34 -0000 1.2 *************** *** 8,12 **** <body> ! <h1 align="center"> Forth Project Manager</h1> <p> Project Manager is a utility written to help manage the files associated with a Forth project. It allows files associated with an application to be easily transferred to other disk media --- 8,12 ---- <body> ! <h1 align="center"> Forth Project Manager Version 2</h1> <p> Project Manager is a utility written to help manage the files associated with a Forth project. It allows files associated with an application to be easily transferred to other disk media *************** *** 14,20 **** a selected file. Associated applications can be opened on a selected file. ! <p> To start Project Manager go to the folder where it was installed and run the file <b>project.exe</b>. ! The following window will be displayed. (Click on the "+" next to project to show the full tree).<br> ! <p align="center"> <img src="prjProject Window.gif" width="508" height="346" alt="" border="0" > <p>Files for an application are divided into the six categories shown: modules, forms, dlls, --- 14,22 ---- a selected file. Associated applications can be opened on a selected file. ! <p> To start Project Manager go to the folder where it was installed and run the file <b>Project.exe</b>. ! The following window will be displayed. You can also open Project Manager with a previously saved project ! (.fpj) file by double clicking it if the file association has been set up. (Ctrl + + will fully open the ! tree).<br> ! <p align="center"> <img src="prjProjectWindow.gif" width="622" height="480" alt="" border="0" > <p>Files for an application are divided into the six categories shown: modules, forms, dlls, *************** *** 31,57 **** <p>Menu Functions:<br> ! <pre><b>File Project Help</pre></b> ! <img src="prjFile Menu.gif" width="146" height="152" alt="" border="0" align="top"> ! <img src="prjProject Menu.gif" width="166" height="117" alt="" border="0" align="top"> ! <img src="prjHelp Menu.gif" width="76" height="40" alt="" border="0"><BR CLEAR=LEFT><br> ! ! <pre><b>New Module</b> - creates a blank .f file, adds it to the module list and opens the default application on ! the file. ! <b>Remove from project</b> - deletes highlighted file. ! <b>Add files to project</b> - opens a dialog allowing single or multiple file selection. ! <b>Add open Forms</b> - If ForthForm is open add any forms open. Requires ForthForm 2.02 or later. ! <b>Copy files</b> - copy all project files to selected location. ! <b>Zip files</b> - archive project files to zip file of choice. ! <b>New</b> - start a new project ! <b>Open</b> - open a previously saved project <b>Save</b> - save current project. A project is saved as a standard text file. ! <b>Rename</b> - rename current project i.e the root name ! <b>Set search path for build</b> - set the path to search for files with option to save to disk <b>Build</b> - build project. The build file would be the main file of the project. Scans the build file for needs, include and fload statements and add specified files. Recurses found files. ! <b>Help</b> - opens this help file ! <b>About</b> - about dialog</pre> <p>When a file is selected in the treeview a viewer is opened in the right window. This viewer allows --- 33,68 ---- <p>Menu Functions:<br> ! <pre><b>File View Project Help</pre></b> ! <img src="prjFileMenu.gif" width="129" height="117" alt="" border="0" align="top"> ! <img src="prjViewMenu.gif" width="134" height="100" alt="" border="0" align="top"> ! <img src="prjProjectMenu.gif" width="204" height="195" alt="" border="0" align="top"> ! <img src="prjHelpMenu.gif" width="102" height="57" alt="" border="0"><BR CLEAR=LEFT><br> ! <pre><b>New</b> - start a new project. ! <b>Open</b> - open a previously saved project. <b>Save</b> - save current project. A project is saved as a standard text file. ! <b>Save As</b> - save a copy of the project. ! <b>Rename</b> - rename current project i.e the root name. ! <b>Exit</b> - you will be prompted to save a modified project file. ! ! <b>Flat Toolbar</b> - choose whether the toolbar is flat or has buttons. ! <b>Toolbar</b> - show/hide the toolbar. ! <b>Statusbar</b> - show/hide the statusbar. ! <b>Build</b> - build project. The build file would be the main file of the project. Scans the build file for needs, include and fload statements and add specified files. Recurses found files. + <b>Set search path for build</b> - set the path to search for files with option to save to disk. + <b>Compile</b> - opens a forth console and floads the main build file. + <b>Set Forth Name</b> - give the full path to Win32For.exe, defaults to the directory Project.exe is in. + <b>New Module</b> - creates a blank .f file, adds it to the module list and opens the default application on + the file. + <b>Add files to project</b> - opens a dialog allowing single or multiple file selection. + <b>Delete from project</b> - deletes highlighted file. + <b>Add open Forms</b> - If ForthForm is open add any forms open. Requires ForthForm 2.02 or later. + <b>Copy/Zip files</b> - copy or zip project files to selected location. ! <b>Help</b> - opens this help file. ! <b>About</b> - about dialog. ! <b>Uninstall</b> - closes this application and removes all settings saved in the registry.</pre> <p>When a file is selected in the treeview a viewer is opened in the right window. This viewer allows --- NEW FILE: prjViewMenu.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: prjProjectWindow.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Rod O. <rod...@us...> - 2005-09-05 19:58:45
|
Update of /cvsroot/win32forth/win32forth/apps/ProMgr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12229/apps/ProMgr Modified Files: ProjectManager.f Log Message: Rod: Project Manager v2.01.00. Corrected bug in finding .res file. Build project now finds AddCursor and AddIcon, .ico and .cur files added to resources section. Cursor drawn in right pane for .cur file Updated doc. Index: ProjectManager.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ProMgr/ProjectManager.f,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ProjectManager.f 21 Aug 2005 06:22:00 -0000 1.8 --- ProjectManager.f 5 Sep 2005 19:58:34 -0000 1.9 *************** *** 5,8 **** --- 5,14 ---- comment: + September 5th, 2005 Rod - version 2.01.00 + + Corrected bug in finding .res file + Build project now finds AddCursor and AddIcon, .ico and .cur files added to resources section + Cursor drawn in right pane for .cur file + July 10th, 2005 Rod - additional features and tidying of code for version 2 *************** *** 90,94 **** \ Odd minor version numbers are possibly unstable beta releases. ! Create ProjectVersion ," 2.00.00" needs linklist.f --- 96,100 ---- \ Odd minor version numbers are possibly unstable beta releases. ! Create ProjectVersion ," 2.01.00" needs linklist.f *************** *** 1005,1009 **** 16 +loop drop Thebuffer Settextz: Viewbox ; ! int hFileIcon :M Show-file: ( -- ) --- 1011,1017 ---- 16 +loop drop Thebuffer Settextz: Viewbox ; ! : LoadCursor ( z$ -- h ) >r LR_LOADFROMFILE 0 0 IMAGE_CURSOR r> 0 call LoadImage ; ! ! int hImage :M Show-file: ( -- ) *************** *** 1015,1019 **** Case s" .bmp" "Of GetBuffer: viewerfile drop SetBitmap: BitmapFile Endof ! s" .ico" "Of Getname: SelectedItem LoadIcon to hFileIcon Endof s" .htm" "Of start-htmlbox GetName: SelectedItem SetURL: HtmlBox Endof s" .html" "Of start-htmlbox GetName: SelectedItem SetURL: HtmlBox Endof --- 1023,1028 ---- Case s" .bmp" "Of GetBuffer: viewerfile drop SetBitmap: BitmapFile Endof ! s" .ico" "Of Getname: SelectedItem LoadIcon to hImage Endof ! s" .cur" "Of Getname: SelectedItem LoadCursor to hImage Endof s" .htm" "Of start-htmlbox GetName: SelectedItem SetURL: HtmlBox Endof s" .html" "Of start-htmlbox GetName: SelectedItem SetURL: HtmlBox Endof *************** *** 1035,1057 **** GetHandle: HtmlBox if Autosize: HtmlBox then ;M ! (( ! : DrawIcon ( hIcon -- ) >r ! DI_NORMAL ! \ NULL ! WHITE_BRUSH Call GetStockObject ! NULL ! 0 0 ! r> ! 0 0 ! dc.hdc ! Call DrawIconEx drop ; ! )) :M On_Paint: ( -- ) \ all painting to the dc should be done here so that only invalidated areas are updated FileExt Case s" .bmp" "Of 0 0 dc.hdc ShowBitmap: BitmapFile Endof ! \ s" .ico" "Of hFileIcon DrawIcon Endof ! s" .ico" "Of DI_NORMAL WHITE_BRUSH Call GetStockObject ! 0 0 0 hFileIcon 0 0 dc.hdc Call DrawIconEx drop Endof EndCase ;M --- 1044,1056 ---- GetHandle: HtmlBox if Autosize: HtmlBox then ;M ! ! : DrawIcon ( hIcon -- ) 0 0 dc.hdc call DrawIcon drop ; ! :M On_Paint: ( -- ) \ all painting to the dc should be done here so that only invalidated areas are updated FileExt Case s" .bmp" "Of 0 0 dc.hdc ShowBitmap: BitmapFile Endof ! s" .ico" "Of hImage DrawIcon Endof ! s" .cur" "Of hImage DrawIcon Endof EndCase ;M *************** *** 1503,1508 **** : AddFile ( a n -- ) \ add this file to needed list ! 2dup ".ext-only" pad place ! pad dup count lower Case s" .f" "of addmodule: TheProject endof --- 1502,1507 ---- : AddFile ( a n -- ) \ add this file to needed list ! 2dup ".ext-only" FileExt place ! FileExt dup count lower Case s" .f" "of addmodule: TheProject endof *************** *** 1511,1514 **** --- 1510,1514 ---- s" .bmp" "of addresource: TheProject endof s" .ico" "of addresource: TheProject endof + s" .cur" "of addresource: TheProject endof s" .res" "of addresource: TheProject endof s" .h" "of addresource: TheProject endof *************** *** 1547,1554 **** THEN ; ! : needed-file? ( -- f ) \ if next word but one is needed-file or loadbitmapfile >in @ \ or 4th/5th word is AddAppIcon then add file to project ! bl word drop ! bl word count 2dup s" loadbitmapfile" caps-compare 0= -rot s" needed-file" caps-compare 0= or bl word drop bl word count s" AddAppIcon" caps-compare 0= or \ 4th word bl word count s" AddAppIcon" caps-compare 0= or \ 5th word --- 1547,1561 ---- THEN ; ! : needed-file? ( -- f ) \ if 2nd word is needed-file or loadbitmapfile >in @ \ or 4th/5th word is AddAppIcon then add file to project ! bl word drop \ skip 1st word ! bl word dup count lower \ 2nd word ! Case ! s" loadbitmapfile" "of true endof ! s" needed-file" "of true endof ! s" addcursor" "of true endof ! s" addicon" "of true endof ! ( default ) false swap ! Endcase bl word drop bl word count s" AddAppIcon" caps-compare 0= or \ 4th word bl word count s" AddAppIcon" caps-compare 0= or \ 5th word *************** *** 1635,1650 **** if is-file? if ! dialog? IF ! 2dup pad place -2 pad c+! s" .res" pad +place ! pad count ( ThisFile place ) addfile ! THEN ! 2dup ( ThisFile place ) addfile ! \ ThisFile +NULL ! \ ThisFile 1+ 0 SetText: ProjectStatusBar ! 2dup asciiz 0 SetText: ProjectStatusBar ! skip-recurse? ! if 2drop ! else comment? -rot recurse to comment? \ save comment? on stack ! then then then ( false to skip-recurse? ) --- 1642,1656 ---- if is-file? if ! 2dup addfile ! 2dup asciiz 0 SetText: ProjectStatusBar ! dialog? IF ! 2dup pad place -2 pad c+! s" .res" pad +place ! pad count addfile ! 2dup asciiz 0 SetText: ProjectStatusBar ! THEN ! skip-recurse? ! if 2drop ! else comment? -rot recurse to comment? \ save comment? on stack ! then then then ( false to skip-recurse? ) *************** *** 1995,2001 **** DOC s" doc\promgr\ProjectManager.htm" needed-file ! s" doc\promgr\prjFileMenu.gif" needed-file **** these are not found with spaces in filenames! ! s" doc\promgr\prjHelpMenu.gif" needed-file **** e.g. "prjFile Menu.gif" s" doc\promgr\prjProjectMenu.gif" needed-file ! s" doc\promgr\prjProjectWindow.gif" needed-file ENDDOC --- 2001,2008 ---- DOC s" doc\promgr\ProjectManager.htm" needed-file ! s" doc\promgr\prjProjectWindow.gif" needed-file **** these are not found with spaces in filenames! ! s" doc\promgr\prjFileMenu.gif" needed-file **** e.g. "prjFile Menu.gif" ! s" doc\promgr\prjViewMenu.gif" needed-file s" doc\promgr\prjProjectMenu.gif" needed-file ! s" doc\promgr\prjHelpMenu.gif" needed-file ENDDOC |
|
From: George H. <geo...@us...> - 2005-09-05 15:52:11
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15920/win32forth/src Modified Files: Window.f Log Message: gah: fixed bug in defaulticon: for w32F w/o icons Index: Window.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/Window.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Window.f 29 Aug 2005 15:56:28 -0000 1.4 --- Window.f 5 Sep 2005 15:51:46 -0000 1.5 *************** *** 3,7 **** cr .( Loading Window Class...) ! \ Window class only forth also definitions --- 3,7 ---- cr .( Loading Window Class...) ! \ Window class only forth also definitions *************** *** 193,197 **** \ Temporarily moved here to overcome problem with offset of ints : +DialogList ( -- ) \ link into dialog list ! (dialoglock) Dialog-link link, self , Dialog-link @ (dialogunlock) to mydialoglink ; --- 193,197 ---- \ Temporarily moved here to overcome problem with offset of ints : +DialogList ( -- ) \ link into dialog list ! (dialoglock) Dialog-link link, self , Dialog-link @ (dialogunlock) to mydialoglink ; *************** *** 362,366 **** 4 to wndExtra appInst to hInstance ! DefaultIcon: [ self ] to hIcon DefaultCursor: [ self ] NULL Call LoadCursor to hCursor WHITE_BRUSH Call GetStockObject to hbrBackground --- 362,366 ---- 4 to wndExtra appInst to hInstance ! DefaultIcon: [ self ] to hIcon DefaultCursor: [ self ] NULL Call LoadCursor to hCursor WHITE_BRUSH Call GetStockObject to hbrBackground *************** *** 423,427 **** :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window 101 appInst Call LoadIcon dup 0= ! if 100 z" w32fConsole.dll" Call GetModuleHandle Call LoadIcon then ;M --- 423,427 ---- :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window 101 appInst Call LoadIcon dup 0= ! if drop 100 z" w32fConsole.dll" Call GetModuleHandle Call LoadIcon then ;M |
|
From: Jos v.d.V. <jo...@us...> - 2005-09-04 14:14:05
|
Update of /cvsroot/win32forth/Win32Forth_cvs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11678 Removed Files: test.txt Log Message: --- test.txt DELETED --- |
|
From: Jos v.d.V. <jo...@us...> - 2005-09-04 14:12:58
|
Update of /cvsroot/win32forth/Win32Forth_cvs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11434 Added Files: test.txt Log Message: --- NEW FILE: test.txt --- test |
|
From: Jos v.d.V. <jo...@us...> - 2005-09-04 14:08:41
|
Update of /cvsroot/win32forth/Win32Forth_cvs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10636 Removed Files: test.txt Log Message: --- test.txt DELETED --- |
|
From: Jos v.d.V. <jo...@us...> - 2005-09-04 14:07:19
|
Update of /cvsroot/win32forth/Win32Forth_cvs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296 Added Files: test.txt Log Message: Test for deletion --- NEW FILE: test.txt --- test |
|
From: Jos v.d.V. <jo...@us...> - 2005-09-03 11:17:54
|
Update of /cvsroot/win32forth/win32for4web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10319 Added Files: howtojoin.htm Log Message: Jos: Described how to keep win32forweb in sync. --- NEW FILE: howtojoin.htm --- <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="GENERATOR" content="Microsoft FrontPage Express 2.0"> <title>Howto join us</title> </head> <body> <h1 align="center"><img src="doc/FORTHPRO.gif"> Win32Forth</h1> <h2 align="center"><font size="5">Howto join us</font></h2> <p>We exchange idea´s about Win32Forth at <a href="http://groups.yahoo.com/group/win32forth">http://groups.yahoo.com/group/win32forth</a><br> Join us by subscribing to: <a href="mailto:win...@ya...">win...@ya...</a></p> <p><font size="4">There is a CVS at </font><a href="http://sourceforge.net/projects/win32forth"><font size="4">http://sourceforge.net/projects/win32forth</font></a><br> A CVS (Concurrent Versions System) is a tool used by many software developers to manage changes within their source code tree. Our CVS contains the newest developver release of Win32Forth <br> The program TortoiseCVS is used to upload (commit) and download (update on your harddisk) the CVS.<br> <br> <a name="Here is how you can join us at the CVS to improve Win32Forth:"><font size="4">Here is how you can join us at the CVS to improve Win32Forth:</font></a></p> <ol> <li>You must be a developer on the Win32Forth project. <br> To become a developer:<br> - you must create an account at sourceforge <a href="http://sourceforge.net/account/newuser_emailverify.php">http://sourceforge.net/account/newuser_emailverify.php</a><br> - request to be a developer to one of the current project administrators. or mail us at <a href="mailto:win...@ya...">win...@ya...</a> <br> </li> <li>Get puttygen for Windows, if you haven't got it already, because you need to generate a public and a private key for SSH (secure shell) use. Download it from here: <a href="http://the.earth.li/~sgtatham/putty/latest/x86/puttygen.exe">http://the.earth.li/~sgtatham/putty/latest/x86/puttygen.exe</a><br> Run it and create a key; I used an SSH2 RSA 1024 key. Follow the instructions for saving the keys on your local hard drive<br> </li> <li>Update SF and tell it about your SSH keys. <br> Login using SSL to <a href="http://www.sourceforge.net">www.sourceforge.net</a> (top left), then click on the "My SF.NET" tab on the top line. You should get "Personal Page For: yourusername". <br> Click on "Account<br> Options" underneath the tabs, and then scroll all the way down to the bottom. <br> Click on "Edit SSH Keys for Shell/CVS", then copy and paste your PUBLIC KEY (not your private key!) into the text box, and <br> press Update.<br> Wait 5 hours. Seriously!<br> </li> <li>Now you must get and run pageant.exe from here; http://the.earth.li/~sgtatham/putty/latest/x86/pageant.exe and add your PRIVATE KEY (not your public key!).<br> You may want to start pageant every time your PC boots; add it into your startup folder.<br> </li> <li>Download and install TortoiseCVS from <a href="http://www.tortoisecvs.org">http://www.tortoisecvs.org</a> <br> <br> Getting CVS set up and working is quite easy. You need to follow these steps (note that you can install to any directory you want; I am just using "D:\WIN32FORTH" as an example<br> <br> 1. Get Tortoise CVS at http://www.tortoisecvs.org/ and install it.<br> 2. Create the D:\WIN32FORTH directory (or whatever dir you want to install to)<br> 3. Using Windows Explorer, navigate to the parent of that directory (D:\) and right-click<br> 4. You should see an item CVS Checkout on the context menu... select it<br> 5. Fill in the form with appropriate values.<br> <br> The "appropriate values" are:<br> Protocol: Secure shell (:ext:)<br> Server: cvs.sourceforge.net<br> Repository folder: /cvsroot/win32forth/<br> User name: yourusername<br> Module: win32forth<br> <br> So the CVSROOT: is:<a href="mailto::ext:you...@cv...:/cvsroot/win32forth/">:ext:you...@cv...:/cvsroot/win32forth/</a> <br> Press OK. Now you will be able to use the CVS system.<br> <br> <font size="4">Fine --- so how do I use the system? Also very easy:</font><br> 1.Right-click inside the D:\WIN32FORTH directory (using Explorer) and select CVS Update when prompted for a password, say "yourpassword"<br> 2.Make your edits are on your machine and you are using the newest version.<br> 3.When done with your edits, just right-click in the directory and say CVS Commit<br> </li> <li>Subsribe to <a href="mailto:Win...@li...">Win...@li...</a> at : <a href="https://lists.sourceforge.net/lists/listinfo/win32forth-cvs">https://lists.sourceforge.net/lists/listinfo/win32forth-cvs</a> to monitor the newest changes in the CVS.</li> </ol> <p><font size="4">Download CVS instructions anonymous:<br> </font>Run TortoiseCVS. The CVSROOT: is <a href="mailto::pserver:ano...@cv...:/cvsroot/win32forth">:pserver:ano...@cv...:/cvsroot/win32forth</a> <br> The module name is: <strong>win32forth</strong><br> Note: is also possible to use: <a href="mailto::ext:you...@cv...:/cvsroot/win32forth">:ext:you...@cv...:/cvsroot/win32forth</a> </p> <p><font size="4">Updating our homepage at </font><a href="http://win32forth.sourceforge.net"><font size="4">http://win32forth.sourceforge.net</font></a><br> When you are a developer you can update it. Be sure you are able to use your SSH key at sourceforge.<br> See the first 4 steps of the chapter: <a href="howtojoin.htm#Here is how you can join us at the CVS to improve Win32Forth:">Here is how you can join us at the CVS to improve Win32Forth</a><br> <br> We like to be informed about new developments, so there is a copy of<strong> http://win32forth.sourceforge.net</strong> in the <strong>CVS</strong>. <br> First Checkout TortoiseCVS with a new module:</p> <ol> <li>Create a new directory on your PC EG: <a href="c:\win32for4web">c:\win32for4web</a></li> <li>Click right on <a href="c:\win32for4web">c:\win32for4web</a></li> <li>Choose CVS Checkout...</li> <li>The module name is: <strong>win32for4web<br> </strong>Note: The CVSROOT is still: <a href="mailto::ext:you...@cv...:/cvsroot/win32forth/">ext:you...@cv...:/cvsroot/win32forth/</a> </li> <li>Press OK. Now you will be able to use the CVS system.<br> When the operation is succesfull the new module will be seen under the Previous CVSROOTS in TortoiseCVS.</li> </ol> <p>Then:</p> <ol> <li>Download and install WinSCP from <a href="http://winscp.net/eng/download.php">http://winscp.net/eng/download.php</a></li> <li>Create a new session:</li> <li>The Hostname is: shell.sourceforge.net</li> <li>Port number: 22</li> <li>Private Key file: Your private_key.pkk file</li> <li>Protocol: SFTP</li> <li>The path to our home page content is: /home/groups/w/wi/win32forth/htdocs/<br> Note after loggin in with the WinSCP you can change ANY other unprotected homepage at SF, too. <br> So make shure that you only change the files in the home/groups/w/wi/win32forth/htdocs/ directory !<br> With <CTRL+B> you can add a bookmark to /home/groups/w/wi/win32forth/htdocs/<br> <br> <strong>Please check the rights of the uploaded or changed files and folders.</strong><br> Make sure we That the group win32for is able to overwrite it! ( rwxrwxr-x )</li> </ol> <p>It is important that the <strong>CVS</strong> and <strong>http://win32forth.sourceforge.net</strong> have the same content.</p> <p>So:<br> 1. Make your changes and upload them to the CVS using TortoiseCVS<br> 2. Upload your changed files to the webspace using WinSCP.</p> <p><br> Feel free to contribute Win32Forth related material.</p> <p align="center">Back to <a href="http://win32forth.sourceforge.net/index.htm">the index of theWin32Forth Project Group</a>.<br> Last Change: <!--webbot bot="Timestamp" startspan s-type="EDITED" s-format="%m/%d/%y" -->09/03/05<!--webbot bot="Timestamp" i-checksum="12910" endspan --></p> </body> </html> |
|
From: Dirk B. <db...@us...> - 2005-09-03 10:18:31
|
Update of /cvsroot/win32forth/win32forth/src/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31321/src/kernel Modified Files: version.f Log Message: Updated to match te ne version 6.11.05 on www.win32forth.org Index: version.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/kernel/version.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** version.f 6 Aug 2005 09:18:47 -0000 1.4 --- version.f 3 Sep 2005 10:18:23 -0000 1.5 *************** *** 3,7 **** cr .( Loading META version info) ! 61104 VALUE #VERSION# \ Change only the version number above; the build number is automatically assigned. --- 3,7 ---- cr .( Loading META version info) ! 61105 VALUE #VERSION# \ Change only the version number above; the build number is automatically assigned. *************** *** 140,150 **** and new demo 'AccelDemo.f' dbu September 8th, 2003 primhash.f [ ------ ] added EXITM wich was lost in Version 6.07.00 ! dbu September 8th, 2003 (various) [ ------ ] removed registry entries 'Directory' and 'Version' dbu September 9th, 2003 utils.f [ ------ ] fixed a bug in $locate witch broke locate and linelist dbu September 9th, 2003 utils.f [ ------ ] changed [$edit] to work with blanks in the filename ! dbu September 9th, 2003 wincon.dll [ ------ ] switch back to old wincon.dll because of missing constants in the new one ! dbu September 9th, 2003 fkernel.f [ ------ ] changed NAME-MAX-CHARS to 0xff; because filenames are compiled into the dictionary (see LINKFILE) --- 140,150 ---- and new demo 'AccelDemo.f' dbu September 8th, 2003 primhash.f [ ------ ] added EXITM wich was lost in Version 6.07.00 ! dbu September 8th, 2003 (various) [ ------ ] removed registry entries 'Directory' and 'Version' dbu September 9th, 2003 utils.f [ ------ ] fixed a bug in $locate witch broke locate and linelist dbu September 9th, 2003 utils.f [ ------ ] changed [$edit] to work with blanks in the filename ! dbu September 9th, 2003 wincon.dll [ ------ ] switch back to old wincon.dll because of missing constants in the new one ! dbu September 9th, 2003 fkernel.f [ ------ ] changed NAME-MAX-CHARS to 0xff; because filenames are compiled into the dictionary (see LINKFILE) *************** *** 208,215 **** _MAKEALL.BAT, MAKEWINED.BAT, EXTEND.BAT, META.BAT now point at new version of SETUP program. Unused modifiaction batch files (ADDMODS etc) now removed. ! 2. PATHS.F now contains much of the code that works with paths/directories. Will be used as a new base for fixing existing path problems. ! 3. WINCON.DLL updated to WindowsXP level; now contains some 13,000 constants. --- 208,215 ---- _MAKEALL.BAT, MAKEWINED.BAT, EXTEND.BAT, META.BAT now point at new version of SETUP program. Unused modifiaction batch files (ADDMODS etc) now removed. ! 2. PATHS.F now contains much of the code that works with paths/directories. Will be used as a new base for fixing existing path problems. ! 3. WINCON.DLL updated to WindowsXP level; now contains some 13,000 constants. *************** *** 223,227 **** 1. New SETUP program in Forth to simplify installation for novices. Run _MAKEALL.BAT to build new system. Can be run at any time; builds kernel, win32for and wined ! -------------------------------------- 6.07.06 ------------------------------------ --- 223,227 ---- 1. New SETUP program in Forth to simplify installation for novices. Run _MAKEALL.BAT to build new system. Can be run at any time; builds kernel, win32for and wined ! -------------------------------------- 6.07.06 ------------------------------------ *************** *** 271,275 **** One exception to this new code area is the thunk built for subclassing Windows; ! the thunk is built in the data section of the class, and that hasn't (and won't be) changed. --- 271,275 ---- One exception to this new code area is the thunk built for subclassing Windows; ! the thunk is built in the data section of the class, and that hasn't (and won't be) changed. *************** *** 280,288 **** taken exactly as supplied by Dirk, and there is only currently skeleton support. Changes to CALLBACK.F and WINDOWS.F introduce new variables; ! ACCEL-HNDL Handle of the accelerator table ACCEL-PTR Pointer to accelerator table ACCEL-KEY Deferred word for handler for key entries, currently a NOOP ! Further work will be needed to take Dirk's work and integrate, particularly into WINED and other menu-based apps. --- 280,288 ---- taken exactly as supplied by Dirk, and there is only currently skeleton support. Changes to CALLBACK.F and WINDOWS.F introduce new variables; ! ACCEL-HNDL Handle of the accelerator table ACCEL-PTR Pointer to accelerator table ACCEL-KEY Deferred word for handler for key entries, currently a NOOP ! Further work will be needed to take Dirk's work and integrate, particularly into WINED and other menu-based apps. *************** *** 297,301 **** 1. Multitasking MULTITHR.F is now obsolete, and has been replaced by TASK.F. ! Impact: Jos vd Ven uses MULTITHR.F in many of his programs. Any code that uses MULTITHR.F will not work. --- 297,301 ---- 1. Multitasking MULTITHR.F is now obsolete, and has been replaced by TASK.F. ! Impact: Jos vd Ven uses MULTITHR.F in many of his programs. Any code that uses MULTITHR.F will not work. *************** *** 366,372 **** . allows more flexibility about the order of FLOADs in EXTEND.F . permits assembler to be loaded early if required ! -- CLASS changes ! . new root class allows simplified and smaller classes that don't require RECORD: support --- 366,372 ---- . allows more flexibility about the order of FLOADs in EXTEND.F . permits assembler to be loaded early if required ! -- CLASS changes ! . new root class allows simplified and smaller classes that don't require RECORD: support *************** *** 374,382 **** . better text output identifies labels by name rather than by hex offset . bug fixes ! -- Hidden words in kernel support ! . Internal words in the kernel are now hidden, reduces size of the dictionary. ! Bugs fixed ---------- --- 374,382 ---- . better text output identifies labels by name rather than by hex offset . bug fixes ! -- Hidden words in kernel support ! . Internal words in the kernel are now hidden, reduces size of the dictionary. ! Bugs fixed ---------- *************** *** 388,396 **** . Dialog loading was miscalculating the offsets inside a RES file causing spurious errors. ! . FIND with class support was finding words of the form x.y, even though x ! did not exist, or x was not an object. . Optimiser was generating invalid code and/or generating an exception for a non-zero origin kernel ! . Optimiser assumed that all code ended with NEXT, and generated incorrect code if not. . Cosmetic tidy up, some spelling corrected in messages --- 388,396 ---- . Dialog loading was miscalculating the offsets inside a RES file causing spurious errors. ! . FIND with class support was finding words of the form x.y, even though x ! did not exist, or x was not an object. . Optimiser was generating invalid code and/or generating an exception for a non-zero origin kernel ! . Optimiser assumed that all code ended with NEXT, and generated incorrect code if not. . Cosmetic tidy up, some spelling corrected in messages *************** *** 408,414 **** not good. Depends on the version of Windows in use. . probably lots of others... ! >>>>>>> 1.2 - \ No newline at end of file --- 408,413 ---- not good. Depends on the version of Windows in use. . probably lots of others... ! >>>>>>> 1.2 |
|
From: Dirk B. <db...@us...> - 2005-09-03 10:18:31
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31321 Modified Files: fkernel.exe setup.exe Log Message: Updated to match te ne version 6.11.05 on www.win32forth.org Index: setup.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/setup.exe,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvsWq8coe and /tmp/cvsJxmdHO differ Index: fkernel.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 Binary files /tmp/cvsPwgbrg and /tmp/cvsmHw0NQ differ |
|
From: Dirk B. <db...@us...> - 2005-09-03 10:18:17
|
Update of /cvsroot/win32forth/win32for4web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31272 Modified Files: index.htm Log Message: Updated to match te ne version 6.11.05 on www.win32forth.org Index: index.htm =================================================================== RCS file: /cvsroot/win32forth/win32for4web/index.htm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** index.htm 12 Aug 2005 16:34:24 -0000 1.10 --- index.htm 3 Sep 2005 10:18:02 -0000 1.11 *************** *** 96,102 **** See release <a href="doc/p-relnotes.6.10.htm">notes</a> for more information. </li> ! <li><a href="downloads/w32f61104.exe">Our current Win32Forth ! developer release 6.11.04</a> (the snapshot was taken ! from our CVS on <b>August 6th,</b> 2005). See release <a href="doc/p-relnotes.6.12.htm">notes</a> for more information. </li> --- 96,102 ---- See release <a href="doc/p-relnotes.6.10.htm">notes</a> for more information. </li> ! <li><a href="http://prdownloads.sourceforge.net/win32forth/w32f61105.exe?download">Our current Win32Forth ! developer release 6.11.05</a> (the snapshot was taken ! from our CVS on <b>September 3rd,</b> 2005). See release <a href="doc/p-relnotes.6.12.htm">notes</a> for more information. </li> *************** *** 193,208 **** i-checksum="12920" endspan --></p> ! <p><!-- Begin Nedstat Basic code --> <!-- Title: Win32Forth Project Group --> <!-- URL: http://www.win32forth.org/ --> <script language="JavaScript" type="text/javascript" ! src="http://m1.nedstatbasic.net/basic.js"> </script> <script ! language="JavaScript" type="text/javascript"> <!-- nedstatbasic("ACuuJgGYTcxB9cKZQqe7Qfv26SzA", 0); // --> ! </script> <noscript> <a ! href="http://www.nedstatbasic.net/stats?ACuuJgGYTcxB9cKZQqe7Qfv26SzA" ! target="_blank"><img ! src="http://m1.nedstatbasic.net/n?id=ACuuJgGYTcxB9cKZQqe7Qfv26SzA" alt="Nedstat Basic" border="0" width="18" height="18"></a><br> <a href="http://www.nedstatbasic.net/" target="_blank">Nedstat Basic</a> </noscript> <!-- End Nedstat Basic code --> </p> </body> </html> --- 193,212 ---- i-checksum="12920" endspan --></p> ! <p><!-- Begin Nedstat Basic code --> ! <!-- Title: Win32Forth Project Group --> ! <!-- URL: http://www.win32forth.org/ --> ! <script language="JavaScript" type="text/javascript" ! src="http://m1.nedstatbasic.net/basic.js"> </script> ! <script language="JavaScript" type="text/javascript"> ! <!-- nedstatbasic("ACuuJgGYTcxB9cKZQqe7Qfv26SzA", 0); // --> ! </script> <noscript> ! <a href="http://www.nedstatbasic.net/stats?ACuuJgGYTcxB9cKZQqe7Qfv26SzA" ! target="_blank"><img src="http://m1.nedstatbasic.net/n?id=ACuuJgGYTcxB9cKZQqe7Qfv26SzA" alt="Nedstat Basic" border="0" width="18" height="18"></a><br> <a href="http://www.nedstatbasic.net/" target="_blank">Nedstat Basic</a> </noscript> <!-- End Nedstat Basic code --> </p> + </body> </html> |
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/extsrc/w32fScintilla/include Modified Files: KeyWords.h Platform.h PropSet.h SString.h SciLexer.h Scintilla.h Scintilla.iface ScintillaWidget.h Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: Platform.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include/Platform.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Platform.h 22 Dec 2004 20:25:55 -0000 1.1 --- Platform.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 288,291 **** --- 288,292 ---- void SetID(FontID id_) { id = id_; } friend class Surface; + friend class SurfaceImpl; }; *************** *** 393,399 **** virtual void SetFont(Font &font)=0; ! virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_)=0; virtual void SetAverageCharWidth(int width)=0; virtual void SetVisibleRows(int rows)=0; virtual PRectangle GetDesiredRect()=0; virtual int CaretFromEdge()=0; --- 394,401 ---- virtual void SetFont(Font &font)=0; ! virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool unicodeMode_)=0; virtual void SetAverageCharWidth(int width)=0; virtual void SetVisibleRows(int rows)=0; + virtual int GetVisibleRows() const=0; virtual PRectangle GetDesiredRect()=0; virtual int CaretFromEdge()=0; *************** *** 408,411 **** --- 410,414 ---- virtual void ClearRegisteredImages()=0; virtual void SetDoubleClickAction(CallBackAction, void *)=0; + virtual void SetList(const char* list, char separator, char typesep)=0; }; Index: SString.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include/SString.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SString.h 22 Dec 2004 20:25:55 -0000 1.1 --- SString.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 198,202 **** return !operator==(sOther); } ! bool contains(char ch) { return (s && *s) ? strchr(s, ch) != 0 : false; } --- 198,202 ---- return !operator==(sOther); } ! bool contains(char ch) const { return (s && *s) ? strchr(s, ch) != 0 : false; } *************** *** 254,258 **** bool endswith(const char *suffix); int search(const char *sFind, lenpos_t start=0) const; ! bool contains(const char *sFind) { return search(sFind) >= 0; } --- 254,258 ---- bool endswith(const char *suffix); int search(const char *sFind, lenpos_t start=0) const; ! bool contains(const char *sFind) const { return search(sFind) >= 0; } Index: KeyWords.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include/KeyWords.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** KeyWords.h 22 Dec 2004 20:25:55 -0000 1.1 --- KeyWords.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 30,33 **** --- 30,35 ---- const char *languageName_=0, LexerFunction fnFolder_=0, const char * const wordListDescriptions_[] = NULL); + virtual ~LexerModule() { + } int GetLanguage() const { return language; } Index: ScintillaWidget.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include/ScintillaWidget.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaWidget.h 22 Dec 2004 20:25:55 -0000 1.1 --- ScintillaWidget.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 35,39 **** }; ! guint scintilla_get_type (void); GtkWidget* scintilla_new (void); void scintilla_set_id (ScintillaObject *sci,int id); --- 35,39 ---- }; ! GtkType scintilla_get_type (void); GtkWidget* scintilla_new (void); void scintilla_set_id (ScintillaObject *sci,int id); Index: Scintilla.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include/Scintilla.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Scintilla.h 22 Dec 2004 20:25:55 -0000 1.1 --- Scintilla.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 12,15 **** --- 12,19 ---- #define SCINTILLA_H + #if LCCWIN + typedef BOOL bool; + #endif + #if PLAT_WIN // Return false on failure: *************** *** 114,117 **** --- 118,122 ---- #define SC_MARK_ARROWS 24 #define SC_MARK_PIXMAP 25 + #define SC_MARK_FULLRECT 26 #define SC_MARK_CHARACTER 10000 #define SC_MARKNUM_FOLDEREND 25 *************** *** 162,165 **** --- 167,171 ---- #define SC_CHARSET_OEM 255 #define SC_CHARSET_RUSSIAN 204 + #define SC_CHARSET_CYRILLIC 1251 #define SC_CHARSET_SHIFTJIS 128 #define SC_CHARSET_SYMBOL 2 *************** *** 170,173 **** --- 176,180 ---- #define SC_CHARSET_VIETNAMESE 163 #define SC_CHARSET_THAI 222 + #define SC_CHARSET_8859_15 1000 #define SCI_STYLECLEARALL 2050 #define SCI_STYLESETFORE 2051 *************** *** 252,255 **** --- 259,266 ---- #define SCI_AUTOCGETTYPESEPARATOR 2285 #define SCI_AUTOCSETTYPESEPARATOR 2286 + #define SCI_AUTOCSETMAXWIDTH 2208 + #define SCI_AUTOCGETMAXWIDTH 2209 + #define SCI_AUTOCSETMAXHEIGHT 2210 + #define SCI_AUTOCGETMAXHEIGHT 2211 #define SCI_SETINDENT 2122 #define SCI_GETINDENT 2123 *************** *** 349,352 **** --- 360,364 ---- #define SCI_VISIBLEFROMDOCLINE 2220 #define SCI_DOCLINEFROMVISIBLE 2221 + #define SCI_WRAPCOUNT 2235 #define SC_FOLDLEVELBASE 0x400 #define SC_FOLDLEVELWHITEFLAG 0x1000 *************** *** 387,390 **** --- 399,403 ---- #define SC_WRAP_NONE 0 #define SC_WRAP_WORD 1 + #define SC_WRAP_CHAR 2 #define SCI_SETWRAPMODE 2268 #define SCI_GETWRAPMODE 2269 *************** *** 588,591 **** --- 601,607 ---- #define SCI_ENCODEDFROMUTF8 2449 #define SCI_FINDCOLUMN 2456 + #define SCI_GETCARETSTICKY 2457 + #define SCI_SETCARETSTICKY 2458 + #define SCI_TOGGLECARETSTICKY 2459 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 *************** *** 598,601 **** --- 614,620 ---- #define SCI_SETLEXERLANGUAGE 4006 #define SCI_LOADLEXERLIBRARY 4007 + #define SCI_GETPROPERTY 4008 + #define SCI_GETPROPERTYEXPANDED 4009 + #define SCI_GETPROPERTYINT 4010 #define SC_MOD_INSERTTEXT 0x1 #define SC_MOD_DELETETEXT 0x2 *************** *** 605,613 **** #define SC_PERFORMED_UNDO 0x20 #define SC_PERFORMED_REDO 0x40 #define SC_LASTSTEPINUNDOREDO 0x100 #define SC_MOD_CHANGEMARKER 0x200 #define SC_MOD_BEFOREINSERT 0x400 #define SC_MOD_BEFOREDELETE 0x800 ! #define SC_MODEVENTMASKALL 0xF77 #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 --- 624,634 ---- #define SC_PERFORMED_UNDO 0x20 #define SC_PERFORMED_REDO 0x40 + #define SC_MULTISTEPUNDOREDO 0x80 #define SC_LASTSTEPINUNDOREDO 0x100 #define SC_MOD_CHANGEMARKER 0x200 #define SC_MOD_BEFOREINSERT 0x400 #define SC_MOD_BEFOREDELETE 0x800 ! #define SC_MULTILINEUNDOREDO 0x1000 ! #define SC_MODEVENTMASKALL 0x1FFF #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 *************** *** 654,657 **** --- 675,679 ---- #define SCN_HOTSPOTDOUBLECLICK 2020 #define SCN_CALLTIPCLICK 2021 + #define SCN_AUTOCSELECTION 2022 //--Autogenerated -- end of section automatically generated from Scintilla.iface *************** *** 706,710 **** int modifiers; // SCN_KEY int modificationType; // SCN_MODIFIED ! const char *text; // SCN_MODIFIED int length; // SCN_MODIFIED int linesAdded; // SCN_MODIFIED --- 728,732 ---- int modifiers; // SCN_KEY int modificationType; // SCN_MODIFIED ! const char *text; // SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION int length; // SCN_MODIFIED int linesAdded; // SCN_MODIFIED Index: Scintilla.iface =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include/Scintilla.iface,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Scintilla.iface 22 Dec 2004 20:25:55 -0000 1.1 --- Scintilla.iface 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 268,271 **** --- 268,272 ---- val SC_MARK_ARROWS=24 val SC_MARK_PIXMAP=25 + val SC_MARK_FULLRECT=26 val SC_MARK_CHARACTER=10000 *************** *** 367,370 **** --- 368,372 ---- val SC_CHARSET_OEM=255 val SC_CHARSET_RUSSIAN=204 + val SC_CHARSET_CYRILLIC=1251 val SC_CHARSET_SHIFTJIS=128 val SC_CHARSET_SYMBOL=2 *************** *** 375,378 **** --- 377,381 ---- val SC_CHARSET_VIETNAMESE=163 val SC_CHARSET_THAI=222 + val SC_CHARSET_8859_15=1000 # Clear all the styles and make equivalent to the global default style. *************** *** 608,611 **** --- 611,628 ---- set void AutoCSetTypeSeparator=2286(int separatorCharacter,) + # Set the maximum width, in characters, of auto-completion and user lists. + # Set to 0 to autosize to fit longest item, which is the default. + set void AutoCSetMaxWidth=2208(int characterCount,) + + # Get the maximum width, in characters, of auto-completion and user lists. + get int AutoCGetMaxWidth=2209(,) + + # Set the maximum height, in rows, of auto-completion and user lists. + # The default is 5 rows. + set void AutoCSetMaxHeight=2210(int rowCount,) + + # Set the maximum height, in rows, of auto-completion and user lists. + get int AutoCGetMaxHeight=2211(,) + # Set the number of spaces used for one level of indentation. set void SetIndent=2122(int indentSize,) *************** *** 906,909 **** --- 923,929 ---- fun int DocLineFromVisible=2221(int lineDisplay,) + # The number of display lines needed to wrap a document line + fun int WrapCount=2235(int line,) + enu FoldLevel=SC_FOLDLEVEL val SC_FOLDLEVELBASE=0x400 *************** *** 995,998 **** --- 1015,1019 ---- val SC_WRAP_NONE=0 val SC_WRAP_WORD=1 + val SC_WRAP_CHAR=2 # Sets whether text is word wrapped. *************** *** 1060,1064 **** # Retrieve whether the maximum scroll position has the last # line at the bottom of the view. ! get int GetEndAtLastLine=2278(,) # Retrieve the height of a particular line of text in pixels. --- 1081,1085 ---- # Retrieve whether the maximum scroll position has the last # line at the bottom of the view. ! get bool GetEndAtLastLine=2278(,) # Retrieve the height of a particular line of text in pixels. *************** *** 1588,1592 **** # Set the length of the utf8 argument for calling EncodedFromUTF8. ! # Set to 0 and the string will be measured to the first nul. fun void SetLengthForEncode=2448(int bytes,) --- 1609,1613 ---- # Set the length of the utf8 argument for calling EncodedFromUTF8. ! # Set to -1 and the string will be measured to the first nul. fun void SetLengthForEncode=2448(int bytes,) *************** *** 1596,1603 **** fun int EncodedFromUTF8=2449(string utf8, stringresult encoded) ! # Find the position of a column on a line taking into account tabs and # multi-byte characters. If beyond end of line, return line end position. fun int FindColumn=2456(int line, int column) # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) --- 1617,1633 ---- fun int EncodedFromUTF8=2449(string utf8, stringresult encoded) ! # Find the position of a column on a line taking into account tabs and # multi-byte characters. If beyond end of line, return line end position. fun int FindColumn=2456(int line, int column) + # Can the caret preferred x position only be changed by explicit movement commands? + get bool GetCaretSticky=2457(,) + + # Stop the caret preferred x position changing when the user types. + set void SetCaretSticky=2458(bool useCaretStickyBehaviour,) + + # Switch between sticky and non-sticky: meant to be bound to a key. + fun void ToggleCaretSticky=2459(,) + # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) *************** *** 1630,1633 **** --- 1660,1674 ---- fun void LoadLexerLibrary=4007(, string path) + # Retrieve a "property" value previously set with SetProperty. + fun int GetProperty=4008(string key, stringresult buf) + + # Retrieve a "property" value previously set with SetProperty, + # with "$()" variable replacement on returned buffer. + fun int GetPropertyExpanded=4009(string key, stringresult buf) + + # Retrieve a "property" value previously set with SetProperty, + # interpreted as an int AFTER any "$()" variable replacement. + get int GetPropertyInt=4010(string key,) + # Notifications # Type of modification and the action which caused the modification. *************** *** 1642,1650 **** val SC_PERFORMED_UNDO=0x20 val SC_PERFORMED_REDO=0x40 val SC_LASTSTEPINUNDOREDO=0x100 val SC_MOD_CHANGEMARKER=0x200 val SC_MOD_BEFOREINSERT=0x400 val SC_MOD_BEFOREDELETE=0x800 ! val SC_MODEVENTMASKALL=0xF77 # For compatibility, these go through the COMMAND notification rather than NOTIFY --- 1683,1693 ---- val SC_PERFORMED_UNDO=0x20 val SC_PERFORMED_REDO=0x40 + val SC_MULTISTEPUNDOREDO=0x80 val SC_LASTSTEPINUNDOREDO=0x100 val SC_MOD_CHANGEMARKER=0x200 val SC_MOD_BEFOREINSERT=0x400 val SC_MOD_BEFOREDELETE=0x800 ! val SC_MULTILINEUNDOREDO=0x1000 ! val SC_MODEVENTMASKALL=0x1FFF # For compatibility, these go through the COMMAND notification rather than NOTIFY *************** *** 1716,1721 **** val SCLEX_BULLANT=27 val SCLEX_VBSCRIPT=28 - val SCLEX_ASP=29 - val SCLEX_PHP=30 val SCLEX_BAAN=31 val SCLEX_MATLAB=32 --- 1759,1762 ---- *************** *** 1752,1755 **** --- 1793,1807 ---- val SCLEX_ASN1=63 val SCLEX_VHDL=64 + val SCLEX_CAML=65 + val SCLEX_BLITZBASIC=66 + val SCLEX_PUREBASIC=67 + val SCLEX_HASKELL=68 + val SCLEX_PHPSCRIPT=69 + val SCLEX_TADS3=70 + val SCLEX_REBOL=71 + val SCLEX_SMALLTALK=72 + val SCLEX_FLAGSHIP=73 + val SCLEX_CSOUND=74 + val SCLEX_FREEBASIC=75 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a *************** *** 1758,1762 **** # Lexical states for SCLEX_PYTHON lex Python=SCLEX_PYTHON SCE_P_ - lex Ruby=SCLEX_RUBY SCE_P_ val SCE_P_DEFAULT=0 val SCE_P_COMMENTLINE=1 --- 1810,1813 ---- *************** *** 1775,1779 **** # Lexical states for SCLEX_CPP lex Cpp=SCLEX_CPP SCE_C_ - lex SQL=SCLEX_SQL SCE_C_ lex Pascal=SCLEX_PASCAL SCE_C_ lex TCL=SCLEX_TCL SCE_C_ --- 1826,1829 ---- *************** *** 1945,1948 **** --- 1995,1999 ---- val SCE_PL_HASH=14 val SCE_PL_SYMBOLTABLE=15 + val SCE_PL_VARIABLE_INDEXER=16 val SCE_PL_REGEX=17 val SCE_PL_REGSUBST=18 *************** *** 1959,1962 **** --- 2010,2050 ---- val SCE_PL_STRING_QR=29 val SCE_PL_STRING_QW=30 + val SCE_PL_POD_VERB=31 + # Lexical states for SCLEX_RUBY + lex Ruby=SCLEX_RUBY SCE_RB_ + val SCE_RB_DEFAULT=0 + val SCE_RB_ERROR=1 + val SCE_RB_COMMENTLINE=2 + val SCE_RB_POD=3 + val SCE_RB_NUMBER=4 + val SCE_RB_WORD=5 + val SCE_RB_STRING=6 + val SCE_RB_CHARACTER=7 + val SCE_RB_CLASSNAME=8 + val SCE_RB_DEFNAME=9 + val SCE_RB_OPERATOR=10 + val SCE_RB_IDENTIFIER=11 + val SCE_RB_REGEX=12 + val SCE_RB_GLOBAL=13 + val SCE_RB_SYMBOL=14 + val SCE_RB_MODULE_NAME=15 + val SCE_RB_INSTANCE_VAR=16 + val SCE_RB_CLASS_VAR=17 + val SCE_RB_BACKTICKS=18 + val SCE_RB_DATASECTION=19 + val SCE_RB_HERE_DELIM=20 + val SCE_RB_HERE_Q=21 + val SCE_RB_HERE_QQ=22 + val SCE_RB_HERE_QX=23 + val SCE_RB_STRING_Q=24 + val SCE_RB_STRING_QQ=25 + val SCE_RB_STRING_QX=26 + val SCE_RB_STRING_QR=27 + val SCE_RB_STRING_QW=28 + val SCE_RB_WORD_DEMOTED=29 + val SCE_RB_STDIN=30 + val SCE_RB_STDOUT=31 + val SCE_RB_STDERR=40 + val SCE_RB_UPPER_BOUND=41 # Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC lex VB=SCLEX_VB SCE_B_ *************** *** 1978,1981 **** --- 2066,2073 ---- val SCE_B_CONSTANT=13 val SCE_B_ASM=14 + val SCE_B_LABEL=15 + val SCE_B_ERROR=16 + val SCE_B_HEXNUMBER=17 + val SCE_B_BINNUMBER=18 # Lexical states for SCLEX_PROPERTIES lex Properties=SCLEX_PROPERTIES SCE_PROPS_ *************** *** 2127,2134 **** --- 2219,2230 ---- val SCE_LISP_NUMBER=2 val SCE_LISP_KEYWORD=3 + val SCE_LISP_KEYWORD_KW=4 + val SCE_LISP_SYMBOL=5 val SCE_LISP_STRING=6 val SCE_LISP_STRINGEOL=8 val SCE_LISP_IDENTIFIER=9 val SCE_LISP_OPERATOR=10 + val SCE_LISP_SPECIAL=11 + val SCE_LISP_MULTI_COMMENT=12 # Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW lex Eiffel=SCLEX_EIFFEL SCE_EIFFEL_ *************** *** 2253,2256 **** --- 2349,2353 ---- val SCE_CSS_SINGLESTRING=14 val SCE_CSS_IDENTIFIER2=15 + val SCE_CSS_ATTRIBUTE=16 # Lexical states for SCLEX_POV lex POV=SCLEX_POV SCE_POV_ *************** *** 2334,2337 **** --- 2431,2438 ---- val SCE_NSIS_STRINGVAR=13 val SCE_NSIS_NUMBER=14 + val SCE_NSIS_SECTIONGROUP=15 + val SCE_NSIS_PAGEEX=16 + val SCE_NSIS_FUNCTIONDEF=17 + val SCE_NSIS_COMMENTBOX=18 # Lexical states for SCLEX_MMIXAL lex MMIXAL=SCLEX_MMIXAL SCE_MMIXAL_ *************** *** 2366,2374 **** val SCE_CLW_KEYWORD=8 val SCE_CLW_COMPILER_DIRECTIVE=9 ! val SCE_CLW_BUILTIN_PROCEDURES_FUNCTION=10 ! val SCE_CLW_STRUCTURE_DATA_TYPE=11 ! val SCE_CLW_ATTRIBUTE=12 ! val SCE_CLW_STANDARD_EQUATE=13 ! val SCE_CLW_ERROR=14 # Lexical states for SCLEX_LOT lex LOT=SCLEX_LOT SCE_LOT_ --- 2467,2477 ---- val SCE_CLW_KEYWORD=8 val SCE_CLW_COMPILER_DIRECTIVE=9 ! val SCE_CLW_RUNTIME_EXPRESSIONS=10 ! val SCE_CLW_BUILTIN_PROCEDURES_FUNCTION=11 ! val SCE_CLW_STRUCTURE_DATA_TYPE=12 ! val SCE_CLW_ATTRIBUTE=13 ! val SCE_CLW_STANDARD_EQUATE=14 ! val SCE_CLW_ERROR=15 ! val SCE_CLW_DEPRECATED=16 # Lexical states for SCLEX_LOT lex LOT=SCLEX_LOT SCE_LOT_ *************** *** 2518,2521 **** --- 2621,2626 ---- val SCE_AU3_PREPROCESSOR=11 val SCE_AU3_SPECIAL=12 + val SCE_AU3_EXPAND=13 + val SCE_AU3_COMOBJ=14 # Lexical states for SCLEX_APDL lex APDL=SCLEX_APDL SCE_APDL_ *************** *** 2579,2582 **** --- 2684,2861 ---- val SCE_VHDL_STDTYPE=13 val SCE_VHDL_USERWORD=14 + # Lexical states for SCLEX_CAML + lex Caml=SCLEX_CAML SCE_CAML_ + val SCE_CAML_DEFAULT=0 + val SCE_CAML_IDENTIFIER=1 + val SCE_CAML_TAGNAME=2 + val SCE_CAML_KEYWORD=3 + val SCE_CAML_KEYWORD2=4 + val SCE_CAML_LINENUM=5 + val SCE_CAML_OPERATOR=6 + val SCE_CAML_NUMBER=7 + val SCE_CAML_CHAR=8 + val SCE_CAML_STRING=9 + val SCE_CAML_COMMENT=10 + val SCE_CAML_COMMENT1=11 + val SCE_CAML_COMMENT2=12 + val SCE_CAML_COMMENT3=13 + # Lexical states for SCLEX_HASKELL + lex Haskell=SCLEX_HASKELL SCE_HA_ + val SCE_HA_DEFAULT=0 + val SCE_HA_IDENTIFIER=1 + val SCE_HA_KEYWORD=2 + val SCE_HA_NUMBER=3 + val SCE_HA_STRING=4 + val SCE_HA_CHARACTER=5 + val SCE_HA_CLASS=6 + val SCE_HA_MODULE=7 + val SCE_HA_CAPITAL=8 + val SCE_HA_DATA=9 + val SCE_HA_IMPORT=10 + val SCE_HA_OPERATOR=11 + val SCE_HA_INSTANCE=12 + val SCE_HA_COMMENTLINE=13 + val SCE_HA_COMMENTBLOCK=14 + val SCE_HA_COMMENTBLOCK2=15 + val SCE_HA_COMMENTBLOCK3=16 + # Lexical states of SCLEX_TADS3 + lex TADS3=SCLEX_TADS3 SCE_T3_ + val SCE_T3_DEFAULT=0 + val SCE_T3_X_DEFAULT=1 + val SCE_T3_PREPROCESSOR=2 + val SCE_T3_BLOCK_COMMENT=3 + val SCE_T3_LINE_COMMENT=4 + val SCE_T3_OPERATOR=5 + val SCE_T3_KEYWORD=6 + val SCE_T3_NUMBER=7 + val SCE_T3_IDENTIFIER=8 + val SCE_T3_S_STRING=9 + val SCE_T3_D_STRING=10 + val SCE_T3_X_STRING=11 + val SCE_T3_LIB_DIRECTIVE=12 + val SCE_T3_MSG_PARAM=13 + val SCE_T3_HTML_TAG=14 + val SCE_T3_HTML_DEFAULT=15 + val SCE_T3_HTML_STRING=16 + val SCE_T3_USER1=17 + val SCE_T3_USER2=18 + val SCE_T3_USER3=19 + # Lexical states for SCLEX_REBOL + lex Rebol=SCLEX_REBOL SCE_REBOL_ + val SCE_REBOL_DEFAULT=0 + val SCE_REBOL_COMMENTLINE=1 + val SCE_REBOL_COMMENTBLOCK=2 + val SCE_REBOL_PREFACE=3 + val SCE_REBOL_OPERATOR=4 + val SCE_REBOL_CHARACTER=5 + val SCE_REBOL_QUOTEDSTRING=6 + val SCE_REBOL_BRACEDSTRING=7 + val SCE_REBOL_NUMBER=8 + val SCE_REBOL_PAIR=9 + val SCE_REBOL_TUPLE=10 + val SCE_REBOL_BINARY=11 + val SCE_REBOL_MONEY=12 + val SCE_REBOL_ISSUE=13 + val SCE_REBOL_TAG=14 + val SCE_REBOL_FILE=15 + val SCE_REBOL_EMAIL=16 + val SCE_REBOL_URL=17 + val SCE_REBOL_DATE=18 + val SCE_REBOL_TIME=19 + val SCE_REBOL_IDENTIFIER=20 + val SCE_REBOL_WORD=21 + val SCE_REBOL_WORD2=22 + val SCE_REBOL_WORD3=23 + val SCE_REBOL_WORD4=24 + val SCE_REBOL_WORD5=25 + val SCE_REBOL_WORD6=26 + val SCE_REBOL_WORD7=27 + val SCE_REBOL_WORD8=28 + # Lexical states for SCLEX_SQL + lex SQL=SCLEX_SQL SCE_SQL_ + val SCE_SQL_DEFAULT=0 + val SCE_SQL_COMMENT=1 + val SCE_SQL_COMMENTLINE=2 + val SCE_SQL_COMMENTDOC=3 + val SCE_SQL_NUMBER=4 + val SCE_SQL_WORD=5 + val SCE_SQL_STRING=6 + val SCE_SQL_CHARACTER=7 + val SCE_SQL_SQLPLUS=8 + val SCE_SQL_SQLPLUS_PROMPT=9 + val SCE_SQL_OPERATOR=10 + val SCE_SQL_IDENTIFIER=11 + val SCE_SQL_SQLPLUS_COMMENT=13 + val SCE_SQL_COMMENTLINEDOC=15 + val SCE_SQL_WORD2=16 + val SCE_SQL_COMMENTDOCKEYWORD=17 + val SCE_SQL_COMMENTDOCKEYWORDERROR=18 + val SCE_SQL_USER1=19 + val SCE_SQL_USER2=20 + val SCE_SQL_USER3=21 + val SCE_SQL_USER4=22 + # Lexical states for SCLEX_SMALLTALK + lex Smalltalk=SCLEX_SMALLTALK SCE_ST_ + val SCE_ST_DEFAULT=0 + val SCE_ST_STRING=1 + val SCE_ST_NUMBER=2 + val SCE_ST_COMMENT=3 + val SCE_ST_SYMBOL=4 + val SCE_ST_BINARY=5 + val SCE_ST_BOOL=6 + val SCE_ST_SELF=7 + val SCE_ST_SUPER=8 + val SCE_ST_NIL=9 + val SCE_ST_GLOBAL=10 + val SCE_ST_RETURN=11 + val SCE_ST_SPECIAL=12 + val SCE_ST_KWSEND=13 + val SCE_ST_ASSIGN=14 + val SCE_ST_CHARACTER=15 + val SCE_ST_SPEC_SEL=16 + # Lexical states for SCLEX_FLAGSHIP (clipper) + lex FlagShip=SCLEX_FLAGSHIP SCE_B_ + val SCE_FS_DEFAULT=0 + val SCE_FS_COMMENT=1 + val SCE_FS_COMMENTLINE=2 + val SCE_FS_COMMENTDOC=3 + val SCE_FS_COMMENTLINEDOC=4 + val SCE_FS_COMMENTDOCKEYWORD=5 + val SCE_FS_COMMENTDOCKEYWORDERROR=6 + val SCE_FS_KEYWORD=7 + val SCE_FS_KEYWORD2=8 + val SCE_FS_KEYWORD3=9 + val SCE_FS_KEYWORD4=10 + val SCE_FS_NUMBER=11 + val SCE_FS_STRING=12 + val SCE_FS_PREPROCESSOR=13 + val SCE_FS_OPERATOR=14 + val SCE_FS_IDENTIFIER=15 + val SCE_FS_DATE=16 + val SCE_FS_STRINGEOL=17 + val SCE_FS_CONSTANT=18 + val SCE_FS_ASM=19 + val SCE_FS_LABEL=20 + val SCE_FS_ERROR=21 + val SCE_FS_HEXNUMBER=22 + val SCE_FS_BINNUMBER=23 + # Lexical states for SCLEX_CSOUND + lex Csound=SCLEX_CSOUND SCE_CSOUND_ + val SCE_CSOUND_DEFAULT=0 + val SCE_CSOUND_COMMENT=1 + val SCE_CSOUND_NUMBER=2 + val SCE_CSOUND_OPERATOR=3 + val SCE_CSOUND_INSTR=4 + val SCE_CSOUND_IDENTIFIER=5 + val SCE_CSOUND_OPCODE=6 + val SCE_CSOUND_HEADERSTMT=7 + val SCE_CSOUND_USERKEYWORD=8 + val SCE_CSOUND_COMMENTBLOCK=9 + val SCE_CSOUND_PARAM=10 + val SCE_CSOUND_ARATE_VAR=11 + val SCE_CSOUND_KRATE_VAR=12 + val SCE_CSOUND_IRATE_VAR=13 + val SCE_CSOUND_GLOBAL_VAR=14 + val SCE_CSOUND_STRINGEOL=15 # Events *************** *** 2604,2607 **** --- 2883,2887 ---- evt void HotSpotDoubleClick=2020(int modifiers, int position) evt void CallTipClick=2021(int position) + evt void AutoCSelection=2022(string text) cat Deprecated *************** *** 2617,2618 **** --- 2897,2901 ---- evt void PosChanged=2012(int position) + # SCLEX_HTML should be used in preference to these. + val SCLEX_ASP=29 + val SCLEX_PHP=30 Index: PropSet.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include/PropSet.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PropSet.h 22 Dec 2004 20:25:55 -0000 1.1 --- PropSet.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- Property *enumnext; int enumhash; + static bool caseSensitiveFilenames; static unsigned int HashString(const char *s, size_t len) { unsigned int ret = 0; *************** *** 59,65 **** bool GetFirst(char **key, char **val); bool GetNext(char **key, char **val); private: ! // copy-value semantics not implemented PropSet(const PropSet ©); void operator=(const PropSet &assign); --- 60,69 ---- bool GetFirst(char **key, char **val); bool GetNext(char **key, char **val); + static void SetCaseSensitiveFilenames(bool caseSensitiveFilenames_) { + caseSensitiveFilenames = caseSensitiveFilenames_; + } private: ! // copy-value semantics not implemented PropSet(const PropSet ©); void operator=(const PropSet &assign); *************** *** 77,83 **** bool onlyLineEnds; ///< Delimited by any white space or only line ends bool sorted; int starts[256]; WordList(bool onlyLineEnds_ = false) : ! words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {} ~WordList() { Clear(); } operator bool() { return len ? true : false; } --- 81,89 ---- bool onlyLineEnds; ///< Delimited by any white space or only line ends bool sorted; + bool sortedNoCase; int starts[256]; WordList(bool onlyLineEnds_ = false) : ! words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), ! sorted(false), sortedNoCase(false) {} ~WordList() { Clear(); } operator bool() { return len ? true : false; } *************** *** 88,91 **** --- 94,98 ---- void SetFromAllocated(); bool InList(const char *s); + bool InListAbbreviated(const char *s, const char marker); const char *GetNearestWord(const char *wordStart, int searchLen, bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1); Index: SciLexer.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/include/SciLexer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SciLexer.h 22 Dec 2004 20:25:55 -0000 1.1 --- SciLexer.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 44,49 **** #define SCLEX_BULLANT 27 #define SCLEX_VBSCRIPT 28 - #define SCLEX_ASP 29 - #define SCLEX_PHP 30 #define SCLEX_BAAN 31 #define SCLEX_MATLAB 32 --- 44,47 ---- *************** *** 80,83 **** --- 78,92 ---- #define SCLEX_ASN1 63 #define SCLEX_VHDL 64 + #define SCLEX_CAML 65 + #define SCLEX_BLITZBASIC 66 + #define SCLEX_PUREBASIC 67 + #define SCLEX_HASKELL 68 + #define SCLEX_PHPSCRIPT 69 + #define SCLEX_TADS3 70 + #define SCLEX_REBOL 71 + #define SCLEX_SMALLTALK 72 + #define SCLEX_FLAGSHIP 73 + #define SCLEX_CSOUND 74 + #define SCLEX_FREEBASIC 75 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 *************** *** 242,245 **** --- 251,255 ---- #define SCE_PL_HASH 14 #define SCE_PL_SYMBOLTABLE 15 + #define SCE_PL_VARIABLE_INDEXER 16 #define SCE_PL_REGEX 17 #define SCE_PL_REGSUBST 18 *************** *** 256,259 **** --- 266,304 ---- #define SCE_PL_STRING_QR 29 #define SCE_PL_STRING_QW 30 + #define SCE_PL_POD_VERB 31 + #define SCE_RB_DEFAULT 0 + #define SCE_RB_ERROR 1 + #define SCE_RB_COMMENTLINE 2 + #define SCE_RB_POD 3 + #define SCE_RB_NUMBER 4 + #define SCE_RB_WORD 5 + #define SCE_RB_STRING 6 + #define SCE_RB_CHARACTER 7 + #define SCE_RB_CLASSNAME 8 + #define SCE_RB_DEFNAME 9 + #define SCE_RB_OPERATOR 10 + #define SCE_RB_IDENTIFIER 11 + #define SCE_RB_REGEX 12 + #define SCE_RB_GLOBAL 13 + #define SCE_RB_SYMBOL 14 + #define SCE_RB_MODULE_NAME 15 + #define SCE_RB_INSTANCE_VAR 16 + #define SCE_RB_CLASS_VAR 17 + #define SCE_RB_BACKTICKS 18 + #define SCE_RB_DATASECTION 19 + #define SCE_RB_HERE_DELIM 20 + #define SCE_RB_HERE_Q 21 + #define SCE_RB_HERE_QQ 22 + #define SCE_RB_HERE_QX 23 + #define SCE_RB_STRING_Q 24 + #define SCE_RB_STRING_QQ 25 + #define SCE_RB_STRING_QX 26 + #define SCE_RB_STRING_QR 27 + #define SCE_RB_STRING_QW 28 + #define SCE_RB_WORD_DEMOTED 29 + #define SCE_RB_STDIN 30 + #define SCE_RB_STDOUT 31 + #define SCE_RB_STDERR 40 + #define SCE_RB_UPPER_BOUND 41 #define SCE_B_DEFAULT 0 #define SCE_B_COMMENT 1 *************** *** 271,274 **** --- 316,323 ---- #define SCE_B_CONSTANT 13 #define SCE_B_ASM 14 + #define SCE_B_LABEL 15 + #define SCE_B_ERROR 16 + #define SCE_B_HEXNUMBER 17 + #define SCE_B_BINNUMBER 18 #define SCE_PROPS_DEFAULT 0 #define SCE_PROPS_COMMENT 1 *************** *** 396,403 **** --- 445,456 ---- #define SCE_LISP_NUMBER 2 #define SCE_LISP_KEYWORD 3 + #define SCE_LISP_KEYWORD_KW 4 + #define SCE_LISP_SYMBOL 5 #define SCE_LISP_STRING 6 #define SCE_LISP_STRINGEOL 8 #define SCE_LISP_IDENTIFIER 9 #define SCE_LISP_OPERATOR 10 + #define SCE_LISP_SPECIAL 11 + #define SCE_LISP_MULTI_COMMENT 12 #define SCE_EIFFEL_DEFAULT 0 #define SCE_EIFFEL_COMMENTLINE 1 *************** *** 420,425 **** #define SCE_NNCRONTAB_ENVIRONMENT 9 #define SCE_NNCRONTAB_IDENTIFIER 10 ! ! /* Our own defines are in LexForth.cpp (dbu) #define SCE_FORTH_DEFAULT 0 #define SCE_FORTH_COMMENT 1 --- 473,477 ---- #define SCE_NNCRONTAB_ENVIRONMENT 9 #define SCE_NNCRONTAB_IDENTIFIER 10 ! /* #define SCE_FORTH_DEFAULT 0 #define SCE_FORTH_COMMENT 1 *************** *** 434,439 **** #define SCE_FORTH_STRING 10 #define SCE_FORTH_LOCALE 11 ! */ ! #define SCE_MATLAB_DEFAULT 0 #define SCE_MATLAB_COMMENT 1 --- 486,490 ---- #define SCE_FORTH_STRING 10 #define SCE_FORTH_LOCALE 11 ! */ #define SCE_MATLAB_DEFAULT 0 #define SCE_MATLAB_COMMENT 1 *************** *** 507,510 **** --- 558,562 ---- #define SCE_CSS_SINGLESTRING 14 #define SCE_CSS_IDENTIFIER2 15 + #define SCE_CSS_ATTRIBUTE 16 #define SCE_POV_DEFAULT 0 #define SCE_POV_COMMENT 1 *************** *** 578,581 **** --- 630,637 ---- #define SCE_NSIS_STRINGVAR 13 #define SCE_NSIS_NUMBER 14 + #define SCE_NSIS_SECTIONGROUP 15 + #define SCE_NSIS_PAGEEX 16 + #define SCE_NSIS_FUNCTIONDEF 17 + #define SCE_NSIS_COMMENTBOX 18 #define SCE_MMIXAL_LEADWS 0 #define SCE_MMIXAL_COMMENT 1 *************** *** 606,614 **** #define SCE_CLW_KEYWORD 8 #define SCE_CLW_COMPILER_DIRECTIVE 9 ! #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 10 ! #define SCE_CLW_STRUCTURE_DATA_TYPE 11 ! #define SCE_CLW_ATTRIBUTE 12 ! #define SCE_CLW_STANDARD_EQUATE 13 ! #define SCE_CLW_ERROR 14 #define SCE_LOT_DEFAULT 0 #define SCE_LOT_HEADER 1 --- 662,672 ---- #define SCE_CLW_KEYWORD 8 #define SCE_CLW_COMPILER_DIRECTIVE 9 ! #define SCE_CLW_RUNTIME_EXPRESSIONS 10 ! #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 11 ! #define SCE_CLW_STRUCTURE_DATA_TYPE 12 ! #define SCE_CLW_ATTRIBUTE 13 ! #define SCE_CLW_STANDARD_EQUATE 14 ! #define SCE_CLW_ERROR 15 ! #define SCE_CLW_DEPRECATED 16 #define SCE_LOT_DEFAULT 0 #define SCE_LOT_HEADER 1 *************** *** 736,739 **** --- 794,799 ---- #define SCE_AU3_PREPROCESSOR 11 #define SCE_AU3_SPECIAL 12 + #define SCE_AU3_EXPAND 13 + #define SCE_AU3_COMOBJ 14 #define SCE_APDL_DEFAULT 0 #define SCE_APDL_COMMENT 1 *************** *** 789,792 **** --- 849,1012 ---- #define SCE_VHDL_STDTYPE 13 #define SCE_VHDL_USERWORD 14 + #define SCE_CAML_DEFAULT 0 + #define SCE_CAML_IDENTIFIER 1 + #define SCE_CAML_TAGNAME 2 + #define SCE_CAML_KEYWORD 3 + #define SCE_CAML_KEYWORD2 4 + #define SCE_CAML_LINENUM 5 + #define SCE_CAML_OPERATOR 6 + #define SCE_CAML_NUMBER 7 + #define SCE_CAML_CHAR 8 + #define SCE_CAML_STRING 9 + #define SCE_CAML_COMMENT 10 + #define SCE_CAML_COMMENT1 11 + #define SCE_CAML_COMMENT2 12 + #define SCE_CAML_COMMENT3 13 + #define SCE_HA_DEFAULT 0 + #define SCE_HA_IDENTIFIER 1 + #define SCE_HA_KEYWORD 2 + #define SCE_HA_NUMBER 3 + #define SCE_HA_STRING 4 + #define SCE_HA_CHARACTER 5 + #define SCE_HA_CLASS 6 + #define SCE_HA_MODULE 7 + #define SCE_HA_CAPITAL 8 + #define SCE_HA_DATA 9 + #define SCE_HA_IMPORT 10 + #define SCE_HA_OPERATOR 11 + #define SCE_HA_INSTANCE 12 + #define SCE_HA_COMMENTLINE 13 + #define SCE_HA_COMMENTBLOCK 14 + #define SCE_HA_COMMENTBLOCK2 15 + #define SCE_HA_COMMENTBLOCK3 16 + #define SCE_T3_DEFAULT 0 + #define SCE_T3_X_DEFAULT 1 + #define SCE_T3_PREPROCESSOR 2 + #define SCE_T3_BLOCK_COMMENT 3 + #define SCE_T3_LINE_COMMENT 4 + #define SCE_T3_OPERATOR 5 + #define SCE_T3_KEYWORD 6 + #define SCE_T3_NUMBER 7 + #define SCE_T3_IDENTIFIER 8 + #define SCE_T3_S_STRING 9 + #define SCE_T3_D_STRING 10 + #define SCE_T3_X_STRING 11 + #define SCE_T3_LIB_DIRECTIVE 12 + #define SCE_T3_MSG_PARAM 13 + #define SCE_T3_HTML_TAG 14 + #define SCE_T3_HTML_DEFAULT 15 + #define SCE_T3_HTML_STRING 16 + #define SCE_T3_USER1 17 + #define SCE_T3_USER2 18 + #define SCE_T3_USER3 19 + #define SCE_REBOL_DEFAULT 0 + #define SCE_REBOL_COMMENTLINE 1 + #define SCE_REBOL_COMMENTBLOCK 2 + #define SCE_REBOL_PREFACE 3 + #define SCE_REBOL_OPERATOR 4 + #define SCE_REBOL_CHARACTER 5 + #define SCE_REBOL_QUOTEDSTRING 6 + #define SCE_REBOL_BRACEDSTRING 7 + #define SCE_REBOL_NUMBER 8 + #define SCE_REBOL_PAIR 9 + #define SCE_REBOL_TUPLE 10 + #define SCE_REBOL_BINARY 11 + #define SCE_REBOL_MONEY 12 + #define SCE_REBOL_ISSUE 13 + #define SCE_REBOL_TAG 14 + #define SCE_REBOL_FILE 15 + #define SCE_REBOL_EMAIL 16 + #define SCE_REBOL_URL 17 + #define SCE_REBOL_DATE 18 + #define SCE_REBOL_TIME 19 + #define SCE_REBOL_IDENTIFIER 20 + #define SCE_REBOL_WORD 21 + #define SCE_REBOL_WORD2 22 + #define SCE_REBOL_WORD3 23 + #define SCE_REBOL_WORD4 24 + #define SCE_REBOL_WORD5 25 + #define SCE_REBOL_WORD6 26 + #define SCE_REBOL_WORD7 27 + #define SCE_REBOL_WORD8 28 + #define SCE_SQL_DEFAULT 0 + #define SCE_SQL_COMMENT 1 + #define SCE_SQL_COMMENTLINE 2 + #define SCE_SQL_COMMENTDOC 3 + #define SCE_SQL_NUMBER 4 + #define SCE_SQL_WORD 5 + #define SCE_SQL_STRING 6 + #define SCE_SQL_CHARACTER 7 + #define SCE_SQL_SQLPLUS 8 + #define SCE_SQL_SQLPLUS_PROMPT 9 + #define SCE_SQL_OPERATOR 10 + #define SCE_SQL_IDENTIFIER 11 + #define SCE_SQL_SQLPLUS_COMMENT 13 + #define SCE_SQL_COMMENTLINEDOC 15 + #define SCE_SQL_WORD2 16 + #define SCE_SQL_COMMENTDOCKEYWORD 17 + #define SCE_SQL_COMMENTDOCKEYWORDERROR 18 + #define SCE_SQL_USER1 19 + #define SCE_SQL_USER2 20 + #define SCE_SQL_USER3 21 + #define SCE_SQL_USER4 22 + #define SCE_ST_DEFAULT 0 + #define SCE_ST_STRING 1 + #define SCE_ST_NUMBER 2 + #define SCE_ST_COMMENT 3 + #define SCE_ST_SYMBOL 4 + #define SCE_ST_BINARY 5 + #define SCE_ST_BOOL 6 + #define SCE_ST_SELF 7 + #define SCE_ST_SUPER 8 + #define SCE_ST_NIL 9 + #define SCE_ST_GLOBAL 10 + #define SCE_ST_RETURN 11 + #define SCE_ST_SPECIAL 12 + #define SCE_ST_KWSEND 13 + #define SCE_ST_ASSIGN 14 + #define SCE_ST_CHARACTER 15 + #define SCE_ST_SPEC_SEL 16 + #define SCE_FS_DEFAULT 0 + #define SCE_FS_COMMENT 1 + #define SCE_FS_COMMENTLINE 2 + #define SCE_FS_COMMENTDOC 3 + #define SCE_FS_COMMENTLINEDOC 4 + #define SCE_FS_COMMENTDOCKEYWORD 5 + #define SCE_FS_COMMENTDOCKEYWORDERROR 6 + #define SCE_FS_KEYWORD 7 + #define SCE_FS_KEYWORD2 8 + #define SCE_FS_KEYWORD3 9 + #define SCE_FS_KEYWORD4 10 + #define SCE_FS_NUMBER 11 + #define SCE_FS_STRING 12 + #define SCE_FS_PREPROCESSOR 13 + #define SCE_FS_OPERATOR 14 + #define SCE_FS_IDENTIFIER 15 + #define SCE_FS_DATE 16 + #define SCE_FS_STRINGEOL 17 + #define SCE_FS_CONSTANT 18 + #define SCE_FS_ASM 19 + #define SCE_FS_LABEL 20 + #define SCE_FS_ERROR 21 + #define SCE_FS_HEXNUMBER 22 + #define SCE_FS_BINNUMBER 23 + #define SCE_CSOUND_DEFAULT 0 + #define SCE_CSOUND_COMMENT 1 + #define SCE_CSOUND_NUMBER 2 + #define SCE_CSOUND_OPERATOR 3 + #define SCE_CSOUND_INSTR 4 + #define SCE_CSOUND_IDENTIFIER 5 + #define SCE_CSOUND_OPCODE 6 + #define SCE_CSOUND_HEADERSTMT 7 + #define SCE_CSOUND_USERKEYWORD 8 + #define SCE_CSOUND_COMMENTBLOCK 9 + #define SCE_CSOUND_PARAM 10 + #define SCE_CSOUND_ARATE_VAR 11 + #define SCE_CSOUND_KRATE_VAR 12 + #define SCE_CSOUND_IRATE_VAR 13 + #define SCE_CSOUND_GLOBAL_VAR 14 + #define SCE_CSOUND_STRINGEOL 15 + #define SCLEX_ASP 29 + #define SCLEX_PHP 30 //--Autogenerated -- end of section automatically generated from Scintilla.iface |
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/extsrc/w32fScintilla/src Modified Files: AutoComplete.cxx AutoComplete.h CallTip.cxx CallTip.h CellBuffer.cxx Document.cxx Document.h DocumentAccessor.cxx DocumentAccessor.h Editor.cxx Editor.h KeyWords.cxx LexAU3.cxx LexAVE.cxx LexBash.cxx LexCLW.cxx LexCPP.cxx LexCSS.cxx LexEiffel.cxx LexFortran.cxx LexGen.py LexHTML.cxx LexLisp.cxx LexLua.cxx LexMSSQL.cxx LexNsis.cxx LexOthers.cxx LexPOV.cxx LexPS.cxx LexPerl.cxx LexPython.cxx LexRuby.cxx LexSQL.cxx LexTeX.cxx LexVB.cxx LineMarker.cxx PropSet.cxx RESearch.h ScintillaBase.cxx ScintillaBase.h StyleContext.h XPM.cxx Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: CallTip.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/CallTip.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CallTip.h 22 Dec 2004 20:25:56 -0000 1.1 --- CallTip.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 16,21 **** char *val; Font font; ! int xUp; ! int xDown; int lineHeight; int offsetMain; --- 16,21 ---- char *val; Font font; ! PRectangle rectUp; ! PRectangle rectDown; int lineHeight; int offsetMain; Index: Document.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/Document.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Document.h 22 Dec 2004 20:25:57 -0000 1.1 --- Document.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 135,138 **** --- 135,139 ---- // Gateways to modifying document + void ModifiedAt(int pos); bool DeleteChars(int pos, int len); bool InsertStyledString(int position, char *s, int insertLength); *************** *** 229,232 **** --- 230,234 ---- int WordPartRight(int pos); int ExtendStyleRange(int pos, int delta, bool singleLine = false); + bool IsWhiteLine(int line); int ParaUp(int pos); int ParaDown(int pos); *************** *** 234,242 **** private: charClassification WordCharClass(unsigned char ch); bool IsWordStartAt(int pos); bool IsWordEndAt(int pos); bool IsWordAt(int start, int end); - void ModifiedAt(int pos); void NotifyModifyAttempt(); --- 236,245 ---- private: + void CheckReadOnly(); + charClassification WordCharClass(unsigned char ch); bool IsWordStartAt(int pos); bool IsWordEndAt(int pos); bool IsWordAt(int start, int end); void NotifyModifyAttempt(); *************** *** 262,266 **** DocModification(int modificationType_, int position_=0, int length_=0, ! int linesAdded_=0, const char *text_=0) : modificationType(modificationType_), position(position_), --- 265,269 ---- DocModification(int modificationType_, int position_=0, int length_=0, ! int linesAdded_=0, const char *text_=0, int line_=0) : modificationType(modificationType_), position(position_), *************** *** 268,276 **** linesAdded(linesAdded_), text(text_), ! line(0), foldLevelNow(0), foldLevelPrev(0) {} ! DocModification(int modificationType_, const Action &act, int linesAdded_=0) : modificationType(modificationType_), position(act.position / 2), --- 271,279 ---- linesAdded(linesAdded_), text(text_), ! line(line_), foldLevelNow(0), foldLevelPrev(0) {} ! DocModification(int modificationType_, const Action &act, int linesAdded_=0) : modificationType(modificationType_), position(act.position / 2), Index: LexAVE.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/LexAVE.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LexAVE.cxx 22 Dec 2004 20:25:57 -0000 1.1 --- LexAVE.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 13,17 **** #include <stdarg.h> #include <stdio.h> - #include <fcntl.h> #include "Platform.h" --- 13,16 ---- *************** *** 184,188 **** levelCurrent++; } ! if ((strcmp(s, "end") == 0)) { levelCurrent--; } --- 183,189 ---- levelCurrent++; } ! if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0)) { ! // Normally "elseif" and "then" will be on the same line and will cancel ! // each other out. // As implemented, this does not support fold.at.else. levelCurrent--; } Index: LexHTML.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/LexHTML.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LexHTML.cxx 22 Dec 2004 20:25:58 -0000 1.1 --- LexHTML.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 36,46 **** } ! static script_type segIsScriptingIndicator(Accessor &styler, unsigned int start, unsigned int end, script_type prevValue) { ! char s[30 + 1]; ! unsigned int i = 0; ! for (; i < end - start + 1 && i < 30; i++) { ! s[i] = static_cast<char>(tolower(styler[start + i])); } s[i] = '\0'; //Platform::DebugPrintf("Scripting indicator [%s]\n", s); if (strstr(s, "src")) // External script --- 36,57 ---- } ! static inline int MakeLowerCase(int ch) { ! if (ch < 'A' || ch > 'Z') ! return ch; ! else ! return ch - 'A' + 'a'; ! } ! ! static void GetTextSegment(Accessor &styler, unsigned int start, unsigned int end, char *s, size_t len) { ! size_t i = 0; ! for (; (i < end - start + 1) && (i < len-1); i++) { ! s[i] = static_cast<char>(MakeLowerCase(styler[start + i])); } s[i] = '\0'; + } + + static script_type segIsScriptingIndicator(Accessor &styler, unsigned int start, unsigned int end, script_type prevValue) { + char s[100]; + GetTextSegment(styler, start, end, s, sizeof(s)); //Platform::DebugPrintf("Scripting indicator [%s]\n", s); if (strstr(s, "src")) // External script *************** *** 64,73 **** static int PrintScriptingIndicatorOffset(Accessor &styler, unsigned int start, unsigned int end) { int iResult = 0; ! char s[30 + 1]; ! unsigned int i = 0; ! for (; i < end - start + 1 && i < 30; i++) { ! s[i] = static_cast<char>(tolower(styler[start + i])); ! } ! s[i] = '\0'; if (0 == strncmp(s, "php", 3)) { iResult = 3; --- 75,80 ---- static int PrintScriptingIndicatorOffset(Accessor &styler, unsigned int start, unsigned int end) { int iResult = 0; ! char s[100]; ! GetTextSegment(styler, start, end, s, sizeof(s)); if (0 == strncmp(s, "php", 3)) { iResult = 3; *************** *** 184,193 **** chAttr = SCE_H_NUMBER; } else { ! char s[30 + 1]; ! unsigned int i = 0; ! for (; i < end - start + 1 && i < 30; i++) { ! s[i] = static_cast<char>(tolower(styler[start + i])); ! } ! s[i] = '\0'; if (keywords.InList(s)) chAttr = SCE_H_ATTRIBUTE; --- 191,196 ---- chAttr = SCE_H_NUMBER; } else { ! char s[100]; ! GetTextSegment(styler, start, end, s, sizeof(s)); if (keywords.InList(s)) chAttr = SCE_H_ATTRIBUTE; *************** *** 208,212 **** char ch = styler[cPos]; if ((ch != '<') && (ch != '/')) { ! s[i++] = caseSensitive ? ch : static_cast<char>(tolower(ch)); } } --- 211,215 ---- char ch = styler[cPos]; if ((ch != '<') && (ch != '/')) { ! s[i++] = caseSensitive ? ch : static_cast<char>(MakeLowerCase(ch)); } } *************** *** 271,280 **** chAttr = SCE_HB_NUMBER; else { ! char s[30 + 1]; ! unsigned int i = 0; ! for (; i < end - start + 1 && i < 30; i++) { ! s[i] = static_cast<char>(tolower(styler[start + i])); ! } ! s[i] = '\0'; if (keywords.InList(s)) { chAttr = SCE_HB_WORD; --- 274,279 ---- chAttr = SCE_HB_NUMBER; else { ! char s[100]; ! GetTextSegment(styler, start, end, s, sizeof(s)); if (keywords.InList(s)) { chAttr = SCE_HB_WORD; *************** *** 319,328 **** chAttr = SCE_HPHP_NUMBER; else { ! char s[100 + 1]; ! unsigned int i = 0; ! for (; i < end - start + 1 && i < 100; i++) { ! s[i] = static_cast<char>(tolower(styler[start + i])); ! } ! s[i] = '\0'; if (keywords.InList(s)) chAttr = SCE_HPHP_WORD; --- 318,323 ---- chAttr = SCE_HPHP_NUMBER; else { ! char s[100]; ! GetTextSegment(styler, start, end, s, sizeof(s)); if (keywords.InList(s)) chAttr = SCE_HPHP_WORD; *************** *** 407,410 **** --- 402,410 ---- } + static bool IsScriptCommentState(const int state) { + return state == SCE_HJ_COMMENT || state == SCE_HJ_COMMENTLINE || state == SCE_HJA_COMMENT || + state == SCE_HJA_COMMENTLINE || state == SCE_HB_COMMENTLINE || state == SCE_HBA_COMMENTLINE; + } + static bool isLineEnd(char ch) { return ch == '\r' || ch == '\n'; *************** *** 425,428 **** --- 425,430 ---- static int FindPhpStringDelimiter(char *phpStringDelimiter, const int phpStringDelimiterSize, int i, const int lengthDoc, Accessor &styler) { int j; + while (i < lengthDoc && (styler[i] == ' ' || styler[i] == '\t')) + i++; phpStringDelimiter[0] = '\n'; for (j = i; j < lengthDoc && styler[j] != '\n' && styler[j] != '\r'; j++) { *************** *** 606,612 **** case SCE_HJ_COMMENT: case SCE_HJ_COMMENTDOC: ! // SCE_HJ_COMMENTLINE removed as this is a common thing done to hide ! // the end of script marker from some JS interpreters. ! //case SCE_HJ_COMMENTLINE: case SCE_HJ_DOUBLESTRING: case SCE_HJ_SINGLESTRING: --- 608,613 ---- case SCE_HJ_COMMENT: case SCE_HJ_COMMENTDOC: ! //case SCE_HJ_COMMENTLINE: // removed as this is a common thing done to hide ! // the end of script marker from some JS interpreters. case SCE_HJ_DOUBLESTRING: case SCE_HJ_SINGLESTRING: *************** *** 618,621 **** --- 619,635 ---- break; default : + // check if the closing tag is a script tag + if (state == SCE_HJ_COMMENTLINE) { + char tag[7]; // room for the <script> tag + char chr; // current char + int j=0; + chr = styler.SafeGetCharAt(i+2); + while (j < 6 && !isspacechar(chr)) { + tag[j++] = static_cast<char>(MakeLowerCase(chr)); + chr = styler.SafeGetCharAt(i+2+j); + } + tag[j] = '\0'; + if (strcmp(tag, "script") != 0) break; + } // closing tag of the script (it's a closing HTML tag anyway) styler.ColourTo(i - 1, StateToPrint); *************** *** 637,641 **** (state != SCE_HPHP_COMMENT) && (ch == '<') && ! (chNext == '?')) { scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment() + 2, i + 10, eScriptPHP); if (scriptLanguage != eScriptPHP && isStringState(state)) continue; --- 651,656 ---- (state != SCE_HPHP_COMMENT) && (ch == '<') && ! (chNext == '?') && ! !IsScriptCommentState(state) ) { scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment() + 2, i + 10, eScriptPHP); if (scriptLanguage != eScriptPHP && isStringState(state)) continue; *************** *** 666,670 **** // handle the start of ASP pre-processor = Non-HTML ! else if (!isCommentASPState(state) && (ch == '<') && (chNext == '%')) { styler.ColourTo(i - 1, StateToPrint); beforePreProc = state; --- 681,685 ---- // handle the start of ASP pre-processor = Non-HTML ! else if (!isCommentASPState(state) && (ch == '<') && (chNext == '%') && !isPHPStringState(state)) { styler.ColourTo(i - 1, StateToPrint); beforePreProc = state; *************** *** 707,719 **** // handle the start of SGML language (DTD) else if (((scriptLanguage == eScriptNone) || (scriptLanguage == eScriptXML)) && ! (chPrev == '<') && ! (ch == '!') && ! (StateToPrint != SCE_H_CDATA) && (!IsCommentState(StateToPrint))) { beforePreProc = state; styler.ColourTo(i - 2, StateToPrint); if ((chNext == '-') && (chNext2 == '-')) { state = SCE_H_COMMENT; // wait for a pending command ! } ! else if (isWordCdata(i + 1, i + 7, styler)) { state = SCE_H_CDATA; } else { --- 722,737 ---- // handle the start of SGML language (DTD) else if (((scriptLanguage == eScriptNone) || (scriptLanguage == eScriptXML)) && ! (chPrev == '<') && ! (ch == '!') && ! (StateToPrint != SCE_H_CDATA) && ! (!IsCommentState(StateToPrint)) && ! (!IsScriptCommentState(StateToPrint)) ) { beforePreProc = state; styler.ColourTo(i - 2, StateToPrint); if ((chNext == '-') && (chNext2 == '-')) { state = SCE_H_COMMENT; // wait for a pending command ! styler.ColourTo(i + 2, SCE_H_COMMENT); ! i += 2; // follow styling after the -- ! } else if (isWordCdata(i + 1, i + 7, styler)) { state = SCE_H_CDATA; } else { *************** *** 1497,1501 **** break; case SCE_HPHP_NUMBER: ! if (!IsADigit(ch) && ch != '.' && ch != 'e' && ch != 'E' && (ch != '-' || (chPrev != 'e' && chPrev != 'E'))) { styler.ColourTo(i - 1, SCE_HPHP_NUMBER); if (isoperator(ch)) --- 1515,1522 ---- break; case SCE_HPHP_NUMBER: ! // recognize bases 8,10 or 16 integers OR floating-point numbers ! if (!IsADigit(ch) ! && strchr(".xXabcdefABCDEF", ch) == NULL ! && ((ch != '-' && ch != '+') || (chPrev != 'e' && chPrev != 'E'))) { styler.ColourTo(i - 1, SCE_HPHP_NUMBER); if (isoperator(ch)) *************** *** 1947,1950 **** --- 1968,1977 ---- } + static void ColourisePHPScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], + Accessor &styler) { + if(startPos == 0) initStyle = SCE_HPHP_DEFAULT; + ColouriseHyperTextDoc(startPos,length,initStyle,keywordlists,styler); + } + static const char * const htmlWordListDesc[] = { "HTML elements and attributes", *************** *** 1957,1962 **** --- 1984,2001 ---- }; + static const char * const phpscriptWordListDesc[] = { + "", //Unused + "", //Unused + "", //Unused + "", //Unused + "PHP keywords", + "", //Unused + 0, + }; + LexerModule lmHTML(SCLEX_HTML, ColouriseHyperTextDoc, "hypertext", 0, htmlWordListDesc); LexerModule lmXML(SCLEX_XML, ColouriseHyperTextDoc, "xml", 0, htmlWordListDesc); + // SCLEX_ASP and SCLEX_PHP should not be used in new code: use SCLEX_HTML instead. LexerModule lmASP(SCLEX_ASP, ColouriseASPDoc, "asp", 0, htmlWordListDesc); LexerModule lmPHP(SCLEX_PHP, ColourisePHPDoc, "php", 0, htmlWordListDesc); + LexerModule lmPHPSCRIPT(SCLEX_PHPSCRIPT, ColourisePHPScriptDoc, "phpscript", 0, phpscriptWordListDesc); Index: LexLua.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/LexLua.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LexLua.cxx 22 Dec 2004 20:25:58 -0000 1.1 --- LexLua.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 13,17 **** #include <stdarg.h> #include <stdio.h> - #include <fcntl.h> #include "Platform.h" --- 13,16 ---- *************** *** 24,36 **** #include "SciLexer.h" ! static inline bool IsAWordChar(const int ch) { ! return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.'); } ! static inline bool IsAWordStart(const int ch) { ! return (ch < 0x80) && (isalnum(ch) || ch == '_'); } ! static inline bool IsANumberChar(const int ch) { // Not exactly following number definition (several dots are seen as OK, etc.) // but probably enough in most cases. --- 23,38 ---- #include "SciLexer.h" ! // Extended to accept accented characters ! static inline bool IsAWordChar(int ch) { ! return ch >= 0x80 || ! (isalnum(ch) || ch == '.' || ch == '_'); } ! static inline bool IsAWordStart(int ch) { ! return ch >= 0x80 || ! (isalpha(ch) || ch == '_'); } ! static inline bool IsANumberChar(int ch) { // Not exactly following number definition (several dots are seen as OK, etc.) // but probably enough in most cases. *************** *** 85,89 **** // Do not leak onto next line ! if (initStyle == SCE_LUA_STRINGEOL) { initStyle = SCE_LUA_DEFAULT; } --- 87,91 ---- // Do not leak onto next line ! if (initStyle == SCE_LUA_STRINGEOL || initStyle == SCE_LUA_COMMENTLINE || initStyle == SCE_LUA_PREPROCESSOR) { initStyle = SCE_LUA_DEFAULT; } *************** *** 163,173 **** sc.SetState(SCE_LUA_DEFAULT); } ! } else if (sc.state == SCE_LUA_COMMENTLINE ) { if (sc.atLineEnd) { ! sc.SetState(SCE_LUA_DEFAULT); } ! } else if (sc.state == SCE_LUA_PREPROCESSOR ) { if (sc.atLineEnd) { ! sc.SetState(SCE_LUA_DEFAULT); } } else if (sc.state == SCE_LUA_STRING) { --- 165,175 ---- sc.SetState(SCE_LUA_DEFAULT); } ! } else if (sc.state == SCE_LUA_COMMENTLINE) { if (sc.atLineEnd) { ! sc.ForwardSetState(SCE_LUA_DEFAULT); } ! } else if (sc.state == SCE_LUA_PREPROCESSOR) { if (sc.atLineEnd) { ! sc.ForwardSetState(SCE_LUA_DEFAULT); } } else if (sc.state == SCE_LUA_STRING) { *************** *** 268,272 **** bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); if (style == SCE_LUA_WORD) { ! if (ch == 'i' || ch == 'd' || ch == 'f' || ch == 'e') { for (unsigned int j = 0; j < 8; j++) { if (!iswordchar(styler[i + j])) { --- 270,274 ---- bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); if (style == SCE_LUA_WORD) { ! if (ch == 'i' || ch == 'd' || ch == 'f' || ch == 'e' || ch == 'r' || ch == 'u') { for (unsigned int j = 0; j < 8; j++) { if (!iswordchar(styler[i + j])) { *************** *** 277,284 **** } ! if ((strcmp(s, "if") == 0) || (strcmp(s, "do") == 0) || (strcmp(s, "function") == 0)) { levelCurrent++; } ! if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0)) { levelCurrent--; } --- 279,286 ---- } ! if ((strcmp(s, "if") == 0) || (strcmp(s, "do") == 0) || (strcmp(s, "function") == 0) || (strcmp(s, "repeat") == 0)) { levelCurrent++; } ! if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0) || (strcmp(s, "until") == 0)) { levelCurrent--; } *************** *** 290,293 **** --- 292,301 ---- levelCurrent--; } + } else if (style == SCE_LUA_LITERALSTRING || style == SCE_LUA_COMMENT) { + if (ch == '[') { + levelCurrent++; + } else if (ch == ']') { + levelCurrent--; + } } *************** *** 322,327 **** "String, (table) & math functions", "(coroutines), I/O & system facilities", ! "XXX", ! "XXX", 0 }; --- 330,337 ---- "String, (table) & math functions", "(coroutines), I/O & system facilities", ! "user1", ! "user2", ! "user3", ! "user4", 0 }; Index: ScintillaBase.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/ScintillaBase.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaBase.h 22 Dec 2004 20:25:58 -0000 1.1 --- ScintillaBase.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 38,42 **** int listType; ///< 0 is an autocomplete list ! SString userListSelected; ///< Receives listbox selected string #ifdef SCI_LEXER --- 38,45 ---- int listType; ///< 0 is an autocomplete list ! SString listSelected; ///< Receives listbox selected string ! int maxListWidth; /// Maximum width of list, in average character widths ! ! bool performingStyle; ///< Prevent reentrance #ifdef SCI_LEXER Index: KeyWords.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/KeyWords.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** KeyWords.cxx 22 Dec 2004 20:25:57 -0000 1.1 --- KeyWords.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 130,199 **** //++Autogenerated -- run src/LexGen.py to regenerate //**\(\tLINK_LEXER(\*);\n\) - - /* We use the Forth and Null lexer's only (dbu) - LINK_LEXER(lmAda); - LINK_LEXER(lmAPDL); - LINK_LEXER(lmAsm); - LINK_LEXER(lmAns1); - LINK_LEXER(lmAU3); - LINK_LEXER(lmAVE); - LINK_LEXER(lmBaan); - LINK_LEXER(lmBash); - LINK_LEXER(lmBullant); - LINK_LEXER(lmClw); - LINK_LEXER(lmClwNoCase); - LINK_LEXER(lmConf); - LINK_LEXER(lmCPP); - LINK_LEXER(lmCPPNoCase); - LINK_LEXER(lmTCL); - LINK_LEXER(lmNncrontab); - LINK_LEXER(lmCss); - LINK_LEXER(lmEiffel); - LINK_LEXER(lmEiffelkw); - LINK_LEXER(lmErlang); - LINK_LEXER(lmESCRIPT); - LINK_LEXER(lmForth); - LINK_LEXER(lmFortran); - LINK_LEXER(lmF77); - LINK_LEXER(lmGui4Cli); - LINK_LEXER(lmHTML); - LINK_LEXER(lmXML); - LINK_LEXER(lmASP); - LINK_LEXER(lmPHP); - LINK_LEXER(lmKix); - LINK_LEXER(lmLISP); - LINK_LEXER(lmLout); - LINK_LEXER(lmLua); - LINK_LEXER(lmMatlab); - LINK_LEXER(lmOctave); - LINK_LEXER(lmMETAPOST); - LINK_LEXER(lmMMIXAL); - LINK_LEXER(lmLot); - LINK_LEXER(lmMSSQL); - LINK_LEXER(lmNsis); - LINK_LEXER(lmBatch); - LINK_LEXER(lmDiff); - LINK_LEXER(lmProps); - LINK_LEXER(lmMake); - LINK_LEXER(lmErrorList); - LINK_LEXER(lmLatex); - LINK_LEXER(lmNull); - LINK_LEXER(lmPascal); - LINK_LEXER(lmPB); - LINK_LEXER(lmPerl); - LINK_LEXER(lmPOV); - LINK_LEXER(lmPS); - LINK_LEXER(lmPython); - LINK_LEXER(lmRuby); - LINK_LEXER(lmScriptol); - LINK_LEXER(lmSpecman); - LINK_LEXER(lmSQL); - LINK_LEXER(lmTeX); - LINK_LEXER(lmVB); - LINK_LEXER(lmVBScript); - LINK_LEXER(lmVerilog); - LINK_LEXER(lmVHDL); - LINK_LEXER(lmYAML); - */ LINK_LEXER(lmForth); LINK_LEXER(lmNull); --- 130,133 ---- Index: RESearch.h =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/RESearch.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RESearch.h 22 Dec 2004 20:25:58 -0000 1.1 --- RESearch.h 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 21,24 **** --- 21,26 ---- public: virtual char CharAt(int index)=0; + virtual ~CharacterIndexer() { + } }; Index: CellBuffer.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/CellBuffer.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CellBuffer.cxx 22 Dec 2004 20:25:56 -0000 1.1 --- CellBuffer.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 255,265 **** } if (levels) { ! // Level information merges back onto previous line ! int posAbove = pos - 1; ! if (posAbove < 0) ! posAbove = 0; ! for (int j = posAbove; j < lines; j++) { levels[j] = levels[j + 1]; } } lines--; --- 255,266 ---- } if (levels) { ! // Move up following lines but merge header flag from this line ! // to line before to avoid a temporary disappearence causing expansion. ! int firstHeader = levels[pos] & SC_FOLDLEVELHEADERFLAG; ! for (int j = pos; j < lines; j++) { levels[j] = levels[j + 1]; } + if (pos > 0) + levels[pos-1] |= firstHeader; } lines--; *************** *** 1029,1033 **** bool CellBuffer::CanUndo() { ! return (!readOnly) && (uh.CanUndo()); } --- 1030,1034 ---- bool CellBuffer::CanUndo() { ! return uh.CanUndo(); } *************** *** 1057,1061 **** bool CellBuffer::CanRedo() { ! return (!readOnly) && (uh.CanRedo()); } --- 1058,1062 ---- bool CellBuffer::CanRedo() { ! return uh.CanRedo(); } Index: LexMSSQL.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/LexMSSQL.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LexMSSQL.cxx 22 Dec 2004 20:25:58 -0000 1.1 --- LexMSSQL.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 3,7 **** ** Lexer for MSSQL. **/ ! // Copyright 1998-2002 by Filip Yaghob <fy...@eg...> --- 3,7 ---- ** Lexer for MSSQL. **/ ! // By Filip Yaghob <fy...@gm...> *************** *** 28,49 **** #define KW_MSSQL_OPERATORS 6 - //~ val SCE_MSSQL_DEFAULT=0 - //~ val SCE_MSSQL_COMMENT=1 - //~ val SCE_MSSQL_LINE_COMMENT=2 - //~ val SCE_MSSQL_NUMBER=3 - //~ val SCE_MSSQL_STRING=4 - //~ val SCE_MSSQL_OPERATOR=5 - //~ val SCE_MSSQL_IDENTIFIER=6 - //~ val SCE_MSSQL_VARIABLE=7 - //~ val SCE_MSSQL_COLUMN_NAME=8 - //~ val SCE_MSSQL_STATEMENT=9 - //~ val SCE_MSSQL_DATATYPE=10 - //~ val SCE_MSSQL_SYSTABLE=11 - //~ val SCE_MSSQL_GLOBAL_VARIABLE=12 - //~ val SCE_MSSQL_FUNCTION=13 - //~ val SCE_MSSQL_STORED_PROCEDURE=14 - //~ val SCE_MSSQL_DEFAULT_PREF_DATATYPE 15 - //~ val SCE_MSSQL_COLUMN_NAME_2 16 - static bool isMSSQLOperator(char ch) { if (isascii(ch) && isalnum(ch)) --- 28,31 ---- *************** *** 134,153 **** int lineCurrent = styler.GetLine(startPos); int spaceFlags = 0; - /* - WordList &kwStatements = *keywordlists[KW_MSSQL_STATEMENTS]; - WordList &kwDataTypes = *keywordlists[KW_MSSQL_DATA_TYPES]; - WordList &kwSystemTables = *keywordlists[KW_MSSQL_SYSTEM_TABLES]; - WordList &kwGlobalVariables = *keywordlists[KW_MSSQL_GLOBAL_VARIABLES]; - WordList &kwFunctions = *keywordlists[KW_MSSQL_FUNCTIONS]; - char s[100]; - int iixx = 0; - s[0] = 's'; s[1] = 'e'; s[2] = 'l'; s[3] = 'e'; s[4] = 'c'; s[5] = 't'; s[6] = 0; - if (kwStatements.InList(s)) - iixx = 1; - s[0] = 's'; s[1] = 'e'; s[2] = 'r'; s[3] = 'v'; s[4] = 'e'; s[5] = 'r'; s[6] = 'n'; s[7] = 'a'; s[8] = 'm'; s[9] = 'e'; s[10] = 0; - if (kwGlobalVariables.InList(s)) - iixx += 2; - */ int state = initStyle; int prevState = initStyle; --- 116,120 ---- *************** *** 316,319 **** --- 283,349 ---- } + static void FoldMSSQLDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { + bool foldComment = styler.GetPropertyInt("fold.comment") != 0; + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + unsigned int endPos = startPos + length; + int visibleChars = 0; + int lineCurrent = styler.GetLine(startPos); + int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK; + int levelCurrent = levelPrev; + char chNext = styler[startPos]; + bool inComment = (styler.StyleAt(startPos-1) == SCE_MSSQL_COMMENT); + char s[10]; + for (unsigned int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int style = styler.StyleAt(i); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + // Comment folding + if (foldComment) { + if (!inComment && (style == SCE_MSSQL_COMMENT)) + levelCurrent++; + else if (inComment && (style != SCE_MSSQL_COMMENT)) + levelCurrent--; + inComment = (style == SCE_MSSQL_COMMENT); + } + if (style == SCE_MSSQL_STATEMENT) { + // Folding between begin and end + if (ch == 'b' || ch == 'e') { + for (unsigned int j = 0; j < 5; j++) { + if (!iswordchar(styler[i + j])) { + break; + } + s[j] = styler[i + j]; + s[j + 1] = '\0'; + } + if (strcmp(s, "begin") == 0) { + levelCurrent++; + } + if (strcmp(s, "end") == 0) { + levelCurrent--; + } + } + } + if (atEOL) { + int lev = levelPrev; + if (visibleChars == 0 && foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if ((levelCurrent > levelPrev) && (visibleChars > 0)) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + lineCurrent++; + levelPrev = levelCurrent; + visibleChars = 0; + } + if (!isspacechar(ch)) + visibleChars++; + } + // Fill in the real level of the next line, keeping the current flags as they will be filled in later + int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK; + styler.SetLevel(lineCurrent, levelPrev | flagsNext); + } + static const char * const sqlWordListDesc[] = { "Statements", *************** *** 327,329 **** }; ! LexerModule lmMSSQL(SCLEX_MSSQL, ColouriseMSSQLDoc, "mssql", 0, sqlWordListDesc); --- 357,359 ---- }; ! LexerModule lmMSSQL(SCLEX_MSSQL, ColouriseMSSQLDoc, "mssql", FoldMSSQLDoc, sqlWordListDesc); Index: LexOthers.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/LexOthers.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LexOthers.cxx 22 Dec 2004 20:25:58 -0000 1.1 --- LexOthers.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 31,35 **** static inline bool AtEOL(Accessor &styler, unsigned int i) { return (styler[i] == '\n') || ! ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')); } --- 31,47 ---- static inline bool AtEOL(Accessor &styler, unsigned int i) { return (styler[i] == '\n') || ! ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')); ! } ! ! // Tests for BATCH Operators ! static bool IsBOperator(char ch) { ! return (ch == '=') || (ch == '+') || (ch == '>') || (ch == '<') || ! (ch == '|') || (ch == '?') || (ch == '*'); ! } ! ! // Tests for BATCH Separators ! static bool IsBSeparator(char ch) { ! return (ch == ':') || (ch == '\\') || (ch == '.') || (ch == ';') || ! (ch == '\"') || (ch == '\'') || (ch == '/') || (ch == ')'); } *************** *** 42,134 **** Accessor &styler) { ! unsigned int i = 0; ! unsigned int state = SCE_BAT_DEFAULT; ! while ((i < lengthLine) && isspacechar(lineBuffer[i])) { // Skip initial spaces ! i++; ! } ! if (lineBuffer[i] == '@') { // Hide command (ECHO OFF) ! styler.ColourTo(startLine + i, SCE_BAT_HIDE); ! i++; ! while ((i < lengthLine) && isspacechar(lineBuffer[i])) { // Skip next spaces ! i++; ! } } ! if (lineBuffer[i] == ':') { ! // Label ! if (lineBuffer[i + 1] == ':') { ! // :: is a fake label, similar to REM, see http://content.techweb.com/winmag/columns/explorer/2000/21.htm styler.ColourTo(endPos, SCE_BAT_COMMENT); ! } else { // Real label styler.ColourTo(endPos, SCE_BAT_LABEL); } ! } else { ! // Check if initial word is a keyword ! char wordBuffer[21]; ! unsigned int wbl = 0, offset = i; ! // Copy word in buffer ! for (; offset < lengthLine && wbl < 20 && !isspacechar(lineBuffer[offset]); wbl++, offset++) { wordBuffer[wbl] = static_cast<char>(tolower(lineBuffer[offset])); } wordBuffer[wbl] = '\0'; ! // Check if it is a comment if (CompareCaseInsensitive(wordBuffer, "rem") == 0) { styler.ColourTo(endPos, SCE_BAT_COMMENT); ! return ; } ! // Check if it is in the list ! if (keywords.InList(wordBuffer)) { ! styler.ColourTo(startLine + offset - 1, SCE_BAT_WORD); // Regular keyword ! } else { ! // Search end of word (can be a long path) ! while (offset < lengthLine && ! !isspacechar(lineBuffer[offset])) { ! offset++; } - styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND); // External command / program } ! // Remainder of the line: colourise the variables. ! ! while (offset < lengthLine) { ! if (state == SCE_BAT_DEFAULT && lineBuffer[offset] == '%') { ! styler.ColourTo(startLine + offset - 1, state); ! if (Is0To9(lineBuffer[offset + 1])) { ! styler.ColourTo(startLine + offset + 1, SCE_BAT_IDENTIFIER); ! offset += 2; ! } else if (lineBuffer[offset + 1] == '%' && ! !isspacechar(lineBuffer[offset + 2])) { ! // Should be safe, as there is CRLF at the end of the line... ! styler.ColourTo(startLine + offset + 2, SCE_BAT_IDENTIFIER); ! offset += 3; } else { ! state = SCE_BAT_IDENTIFIER; } - } else if (state == SCE_BAT_IDENTIFIER && lineBuffer[offset] == '%') { - styler.ColourTo(startLine + offset, state); - state = SCE_BAT_DEFAULT; - } else if (state == SCE_BAT_DEFAULT && - (lineBuffer[offset] == '*' || - lineBuffer[offset] == '?' || - lineBuffer[offset] == '=' || - lineBuffer[offset] == '<' || - lineBuffer[offset] == '>' || - lineBuffer[offset] == '|')) { - styler.ColourTo(startLine + offset - 1, state); - styler.ColourTo(startLine + offset, SCE_BAT_OPERATOR); } offset++; } - // if (endPos > startLine + offset - 1) { - styler.ColourTo(endPos, SCE_BAT_DEFAULT); // Remainder of line, currently not lexed - // } } ! } - // ToDo: (not necessarily at beginning of line) GOTO, [IF] NOT, ERRORLEVEL - // IF [NO] (test) (command) -- test is EXIST (filename) | (string1)==(string2) | ERRORLEVEL (number) - // FOR %%(variable) IN (set) DO (command) -- variable is [a-zA-Z] -- eg for %%X in (*.txt) do type %%X - // ToDo: %n (parameters), %EnvironmentVariable% colourising - // ToDo: Colourise = > >> < | " static void ColouriseBatchDoc( --- 54,442 ---- Accessor &styler) { ! unsigned int offset = 0; // Line Buffer Offset ! unsigned int enVarEnd; // Environment Variable End point ! unsigned int cmdLoc; // External Command / Program Location ! char wordBuffer[81]; // Word Buffer - large to catch long paths ! unsigned int wbl; // Word Buffer Length ! unsigned int wbo; // Word Buffer Offset - also Special Keyword Buffer Length ! bool forFound = false; // No Local Variable without FOR statement ! // CHOICE, ECHO, GOTO, PROMPT and SET have Default Text that may contain Regular Keywords ! // Toggling Regular Keyword Checking off improves readability ! // Other Regular Keywords and External Commands / Programs might also benefit from toggling ! // Need a more robust algorithm to properly toggle Regular Keyword Checking ! bool continueProcessing = true; // Used to toggle Regular Keyword Checking ! // Special Keywords are those that allow certain characters without whitespace after the command ! // Examples are: cd. cd\ md. rd. dir| dir> echo: echo. path= ! // Special Keyword Buffer used to determine if the first n characters is a Keyword ! char sKeywordBuffer[10]; // Special Keyword Buffer ! bool sKeywordFound; // Exit Special Keyword for-loop if found ! // Skip initial spaces ! while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) { ! offset++; } ! // Colorize Default Text ! styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT); ! // Set External Command / Program Location ! cmdLoc = offset; ! ! // Check for Fake Label (Comment) or Real Label - return if found ! if (lineBuffer[offset] == ':') { ! if (lineBuffer[offset + 1] == ':') { ! // Colorize Fake Label (Comment) - :: is similar to REM, see http://content.techweb.com/winmag/columns/explorer/2000/21.htm styler.ColourTo(endPos, SCE_BAT_COMMENT); ! } else { ! // Colorize Real Label styler.ColourTo(endPos, SCE_BAT_LABEL); } ! return; ! // Check for Drive Change (Drive Change is internal command) - return if found ! } else if ((isalpha(lineBuffer[offset])) && ! (lineBuffer[offset + 1] == ':') && ! ((isspacechar(lineBuffer[offset + 2])) || ! (((lineBuffer[offset + 2] == '\\')) && ! (isspacechar(lineBuffer[offset + 3]))))) { ! // Colorize Regular Keyword ! styler.ColourTo(endPos, SCE_BAT_WORD); ! return; ! } ! ! // Check for Hide Command (@ECHO OFF/ON) ! if (lineBuffer[offset] == '@') { ! styler.ColourTo(startLine + offset, SCE_BAT_HIDE); ! offset++; ! // Check for Argument (%n) or Environment Variable (%x...%) ! } else if (lineBuffer[offset] == '%') { ! enVarEnd = offset + 1; ! // Search end of word for second % (can be a long path) ! while ((enVarEnd < lengthLine) && ! (!isspacechar(lineBuffer[enVarEnd])) && ! (lineBuffer[enVarEnd] != '%') && ! (!IsBOperator(lineBuffer[enVarEnd])) && ! (!IsBSeparator(lineBuffer[enVarEnd]))) { ! enVarEnd++; ! } ! // Check for Argument (%n) ! if ((Is0To9(lineBuffer[offset + 1])) && ! (lineBuffer[enVarEnd] != '%')) { ! // Colorize Argument ! styler.ColourTo(startLine + offset + 1, SCE_BAT_IDENTIFIER); ! offset += 2; ! // Check for External Command / Program ! if (!isspacechar(lineBuffer[offset])) { ! cmdLoc = offset; ! } ! // Check for Environment Variable (%x...%) ! } else if ((lineBuffer[offset + 1] != '%') && ! (lineBuffer[enVarEnd] == '%')) { ! offset = enVarEnd; ! // Colorize Environment Variable ! styler.ColourTo(startLine + offset, SCE_BAT_IDENTIFIER); ! offset++; ! // Check for External Command / Program ! if (!isspacechar(lineBuffer[offset])) { ! cmdLoc = offset; ! } ! } ! } ! // Skip next spaces ! while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) { ! offset++; ! } ! ! // Read remainder of line word-at-a-time or remainder-of-word-at-a-time ! while (offset < lengthLine) { ! if (offset > startLine) { ! // Colorize Default Text ! styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT); ! } ! // Copy word from Line Buffer into Word Buffer ! wbl = 0; ! for (; offset < lengthLine && wbl < 80 && !isspacechar(lineBuffer[offset]); wbl++, offset++) { wordBuffer[wbl] = static_cast<char>(tolower(lineBuffer[offset])); } wordBuffer[wbl] = '\0'; ! wbo = 0; ! ! // Check for Comment - return if found if (CompareCaseInsensitive(wordBuffer, "rem") == 0) { styler.ColourTo(endPos, SCE_BAT_COMMENT); ! return; } ! // Check for Separator ! if (IsBSeparator(wordBuffer[0])) { ! // Check for External Command / Program ! if ((cmdLoc == offset - wbl) && ! ((wordBuffer[0] == ':') || ! (wordBuffer[0] == '\\') || ! (wordBuffer[0] == '.'))) { ! // Reset Offset to re-process remainder of word ! offset -= (wbl - 1); ! // Colorize External Command / Program ! styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND); ! // Reset External Command / Program Location ! cmdLoc = offset; ! } else { ! // Reset Offset to re-process remainder of word ! offset -= (wbl - 1); ! // Colorize Default Text ! styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT); ! } ! // Check for Regular Keyword in list ! } else if ((keywords.InList(wordBuffer)) && ! (continueProcessing)) { ! // Local Variables do not exist if no FOR statement ! if (CompareCaseInsensitive(wordBuffer, "for") == 0) { ! forFound = true; ! } ! // ECHO, GOTO, PROMPT and SET require no further Regular Keyword Checking ! if ((CompareCaseInsensitive(wordBuffer, "echo") == 0) || ! (CompareCaseInsensitive(wordBuffer, "goto") == 0) || ! (CompareCaseInsensitive(wordBuffer, "prompt") == 0) || ! (CompareCaseInsensitive(wordBuffer, "set") == 0)) { ! continueProcessing = false; ! } ! // Identify External Command / Program Location for ERRORLEVEL, and EXIST ! if ((CompareCaseInsensitive(wordBuffer, "errorlevel") == 0) || ! (CompareCaseInsensitive(wordBuffer, "exist") == 0)) { ! // Reset External Command / Program Location ! cmdLoc = offset; ! // Skip next spaces ! while ((cmdLoc < lengthLine) && ! (isspacechar(lineBuffer[cmdLoc]))) { ! cmdLoc++; ! } ! // Skip comparison ! while ((cmdLoc < lengthLine) && ! (!isspacechar(lineBuffer[cmdLoc]))) { ! cmdLoc++; ! } ! // Skip next spaces ! while ((cmdLoc < lengthLine) && ! (isspacechar(lineBuffer[cmdLoc]))) { ! cmdLoc++; ! } ! // Identify External Command / Program Location for CALL, DO, LOADHIGH and LH ! } else if ((CompareCaseInsensitive(wordBuffer, "call") == 0) || ! (CompareCaseInsensitive(wordBuffer, "do") == 0) || ! (CompareCaseInsensitive(wordBuffer, "loadhigh") == 0) || ! (CompareCaseInsensitive(wordBuffer, "lh") == 0)) { ! // Reset External Command / Program Location ! cmdLoc = offset; ! // Skip next spaces ! while ((cmdLoc < lengthLine) && ! (isspacechar(lineBuffer[cmdLoc]))) { ! cmdLoc++; ! } ! } ! // Colorize Regular keyword ! styler.ColourTo(startLine + offset - 1, SCE_BAT_WORD); ! // No need to Reset Offset ! // Check for Special Keyword in list, External Command / Program, or Default Text ! } else if ((wordBuffer[0] != '%') && ! (!IsBOperator(wordBuffer[0])) && ! (continueProcessing)) { ! // Check for Special Keyword ! // Affected Commands are in Length range 2-6 ! // Good that ERRORLEVEL, EXIST, CALL, DO, LOADHIGH, and LH are unaffected ! sKeywordFound = false; ! for (unsigned int keywordLength = 2; keywordLength < wbl && keywordLength < 7 && !sKeywordFound; keywordLength++) { ! wbo = 0; ! // Copy Keyword Length from Word Buffer into Special Keyword Buffer ! for (; wbo < keywordLength; wbo++) { ! sKeywordBuffer[wbo] = static_cast<char>(wordBuffer[wbo]); ! } ! sKeywordBuffer[wbo] = '\0'; ! // Check for Special Keyword in list ! if ((keywords.InList(sKeywordBuffer)) && ! ((IsBOperator(wordBuffer[wbo])) || ! (IsBSeparator(wordBuffer[wbo])))) { ! sKeywordFound = true; ! // ECHO requires no further Regular Keyword Checking ! if (CompareCaseInsensitive(sKeywordBuffer, "echo") == 0) { ! continueProcessing = false; ! } ! // Colorize Special Keyword as Regular Keyword ! styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_WORD); ! // Reset Offset to re-process remainder of word ! offset -= (wbl - wbo); } } ! // Check for External Command / Program or Default Text ! if (!sKeywordFound) { ! wbo = 0; ! // Check for External Command / Program ! if (cmdLoc == offset - wbl) { ! // Read up to %, Operator or Separator ! while ((wbo < wbl) && ! (wordBuffer[wbo] != '%') && ! (!IsBOperator(wordBuffer[wbo])) && ! (!IsBSeparator(wordBuffer[wbo]))) { ! wbo++; ! } ! // Reset External Command / Program Location ! cmdLoc = offset - (wbl - wbo); ! // Reset Offset to re-process remainder of word ! offset -= (wbl - wbo); ! // CHOICE requires no further Regular Keyword Checking ! if (CompareCaseInsensitive(wordBuffer, "choice") == 0) { ! continueProcessing = false; ! } ! // Check for START (and its switches) - What follows is External Command \ Program ! if (CompareCaseInsensitive(wordBuffer, "start") == 0) { ! // Reset External Command / Program Location ! cmdLoc = offset; ! // Skip next spaces ! while ((cmdLoc < lengthLine) && ! (isspacechar(lineBuffer[cmdLoc]))) { ! cmdLoc++; ! } ! // Reset External Command / Program Location if command switch detected ! if (lineBuffer[cmdLoc] == '/') { ! // Skip command switch ! while ((cmdLoc < lengthLine) && ! (!isspacechar(lineBuffer[cmdLoc]))) { ! cmdLoc++; ! } ! // Skip next spaces ! while ((cmdLoc < lengthLine) && ! (isspacechar(lineBuffer[cmdLoc]))) { ! cmdLoc++; ! } ! } ! } ! // Colorize External command / program ! styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND); ! // No need to Reset Offset ! // Check for Default Text } else { ! // Read up to %, Operator or Separator ! while ((wbo < wbl) && ! (wordBuffer[wbo] != '%') && ! (!IsBOperator(wordBuffer[wbo])) && ! (!IsBSeparator(wordBuffer[wbo]))) { ! wbo++; ! } ! // Colorize Default Text ! styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT); ! // Reset Offset to re-process remainder of word ! offset -= (wbl - wbo); } } + // Check for Argument (%n), Environment Variable (%x...%) or Local Variable (%%a) + } else if (wordBuffer[0] == '%') { + // Colorize Default Text + styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT); + wbo++; + // Search to end of word for second % (can be a long path) + while ((wbo < wbl) && + (wordBuffer[wbo] != '%') && + (!IsBOperator(wordBuffer[wbo])) && + (!IsBSeparator(wordBuffer[wbo]))) { + wbo++; + } + // Check for Argument (%n) + if ((Is0To9(wordBuffer[1])) && + (wordBuffer[wbo] != '%')) { + // Check for External Command / Program + if (cmdLoc == offset - wbl) { + cmdLoc = offset - (wbl - 2); + } + // Colorize Argument + styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_IDENTIFIER); + // Reset Offset to re-process remainder of word + offset -= (wbl - 2); + // Check for Environment Variable (%x...%) + } else if ((wordBuffer[1] != '%') && + (wordBuffer[wbo] == '%')) { + wbo++; + // Check for External Command / Program + if (cmdLoc == offset - wbl) { + cmdLoc = offset - (wbl - wbo); + } + // Colorize Environment Variable + styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_IDENTIFIER); + // Reset Offset to re-process remainder of word + offset -= (wbl - wbo); + // Check for Local Variable (%%a) + } else if ((forFound) && + (wordBuffer[1] == '%') && + (wordBuffer[2] != '%') && + (!IsBOperator(wordBuffer[2])) && + (!IsBSeparator(wordBuffer[2]))) { + // Check for External Command / Program + if (cmdLoc == offset - wbl) { + cmdLoc = offset - (wbl - 3); + } + // Colorize Local Variable + styler.ColourTo(startLine + offset - 1 - (wbl - 3), SCE_BAT_IDENTIFIER); + // Reset Offset to re-process remainder of word + offset -= (wbl - 3); + } + // Check for Operator + } else if (IsBOperator(wordBuffer[0])) { + // Colorize Default Text + styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT); + // Check for Comparison Operator + if ((wordBuffer[0] == '=') && (wordBuffer[1] == '=')) { + // Identify External Command / Program Location for IF + cmdLoc = offset; + // Skip next spaces + while ((cmdLoc < lengthLine) && + (isspacechar(lineBuffer[cmdLoc]))) { + cmdLoc++; + } + // Colorize Comparison Operator + styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_OPERATOR); + // Reset Offset to re-process remainder of word + offset -= (wbl - 2); + // Check for Pipe Operator + } else if (wordBuffer[0] == '|') { + // Reset External Command / Program Location + cmdLoc = offset - wbl + 1; + // Skip next spaces + while ((cmdLoc < lengthLine) && + (isspacechar(lineBuffer[cmdLoc]))) { + cmdLoc++; + } + // Colorize Pipe Operator + styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_OPERATOR); + // Reset Offset to re-process remainder of word + offset -= (wbl - 1); + // Check for Other Operator + } else { + // Check for > Operator + if (wordBuffer[0] == '>') { + // Turn Keyword and External Command / Program checking back on + continueProcessing = true; + } + // Colorize Other Operator + styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_OPERATOR); + // Reset Offset to re-process remainder of word + offset -= (wbl - 1); + } + // Check for Default Text + } else { + // Read up to %, Operator or Separator + while ((wbo < wbl) && + (wordBuffer[wbo] != '%') && + (!IsBOperator(wordBuffer[wbo])) && + (!IsBSeparator(wordBuffer[wbo]))) { + wbo++; + } + // Colorize Default Text + styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT); + // Reset Offset to re-process remainder of word + offset -= (wbl - wbo); + } + // Skip next spaces - nothing happens if Offset was Reset + while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) { offset++; } } ! // Colorize Default Text for remainder of line - currently not lexed ! styler.ColourTo(endPos, SCE_BAT_DEFAULT); } static void ColouriseBatchDoc( *************** *** 241,245 **** if (prevLevel & SC_FOLDLEVELHEADERFLAG) nextLevel = (prevLevel & SC_FOLDLEVELNUMBERMASK) + 1; ! int lineType = styler.StyleAt(curLineStart); if (lineType == SCE_DIFF_COMMAND) --- 549,553 ---- if (prevLevel & SC_FOLDLEVELHEADERFLAG) nextLevel = (prevLevel & SC_FOLDLEVELNUMBERMASK) + 1; ! int lineType = styler.StyleAt(curLineStart); if (lineType == SCE_DIFF_COMMAND) *************** *** 249,253 **** } else if (lineType == SCE_DIFF_POSITION) nextLevel = (SC_FOLDLEVELBASE + 3) | SC_FOLDLEVELHEADERFLAG; ! if ((nextLevel & SC_FOLDLEVELHEADERFLAG) && (nextLevel == prevLevel)) styler.SetLevel(curLine-1, prevLevel & ~SC_FOLDLEVELHEADERFLAG); --- 557,561 ---- } else if (lineType == SCE_DIFF_POSITION) nextLevel = (SC_FOLDLEVELBASE + 3) | SC_FOLDLEVELHEADERFLAG; ! if ((nextLevel & SC_FOLDLEVELHEADERFLAG) && (nextLevel == prevLevel)) styler.SetLevel(curLine-1, prevLevel & ~SC_FOLDLEVELHEADERFLAG); *************** *** 255,259 **** styler.SetLevel(curLine, nextLevel); prevLevel = nextLevel; ! curLineStart = styler.LineStart(++curLine); } while (static_cast<int>(startPos) + length > curLineStart); --- 563,567 ---- styler.SetLevel(curLine, nextLevel); prevLevel = nextLevel; ! curLineStart = styler.LineStart(++curLine); } while (static_cast<int>(startPos) + length > curLineStart); *************** *** 373,377 **** lineCurrent++; visibleChars = 0; ! headerPoint=false; } if (!isspacechar(ch)) --- 681,685 ---- lineCurrent++; visibleChars = 0; ! headerPoint = false; } if (!isspacechar(ch)) *************** *** 476,527 **** } ! static bool strstart(char *haystack, char *needle) { return strncmp(haystack, needle, strlen(needle)) == 0; } ! static void ColouriseErrorListLine( ! char *lineBuffer, ! unsigned int lengthLine, ! // unsigned int startLine, ! unsigned int endPos, ! Accessor &styler) { ! const int unRecognized = 99; if (lineBuffer[0] == '>') { // Command or return status ! styler.ColourTo(endPos, SCE_ERR_CMD); } else if (lineBuffer[0] == '<') { // Diff removal, but not interested. Trapped to avoid hitting CTAG cases. ! styler.ColourTo(endPos, SCE_ERR_DEFAULT); } else if (lineBuffer[0] == '!') { ! styler.ColourTo(endPos, SCE_ERR_DIFF_CHANGED); } else if (lineBuffer[0] == '+') { ! styler.ColourTo(endPos, SCE_ERR_DIFF_ADDITION); ! } else if (lineBuffer[0] == '-' && lineBuffer[1] == '-' && lineBuffer[2] == '-') { ! styler.ColourTo(endPos, SCE_ERR_DIFF_MESSAGE); } else if (lineBuffer[0] == '-') { ! styler.ColourTo(endPos, SCE_ERR_DIFF_DELETION); } else if (strstart(lineBuffer, "cf90-")) { // Absoft Pro Fortran 90/95 v8.2 error and/or warning message ! styler.ColourTo(endPos, SCE_ERR_ABSF); } else if (strstart(lineBuffer, "fortcom:")) { // Intel Fortran Compiler v8.0 error/warning message ! styler.ColourTo(endPos, SCE_ERR_IFORT); } else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) { ! styler.ColourTo(endPos, SCE_ERR_PYTHON); } else if (strstr(lineBuffer, " in ") && strstr(lineBuffer, " on line ")) { ! styler.ColourTo(endPos, SCE_ERR_PHP); } else if ((strstart(lineBuffer, "Error ") || ! strstart(lineBuffer, "Warning ")) && ! strstr(lineBuffer, " at (") && ! strstr(lineBuffer, ") : ") && ! (strstr(lineBuffer, " at (") < strstr(lineBuffer, ") : "))) { // Intel Fortran Compiler error/warning message ! styler.ColourTo(endPos, SCE_ERR_IFC); } else if (strstart(lineBuffer, "Error ")) { // Borland error message ! styler.ColourTo(endPos, SCE_ERR_BORLAND); } else if (strstart(lineBuffer, "Warning ")) { // Borland warning message ! styler.ColourTo(endPos, SCE_ERR_BORLAND); } else if (strstr(lineBuffer, "at line " ) && (strstr(lineBuffer, "at line " ) < (lineBuffer + lengthLine)) && --- 784,835 ---- } ! static bool strstart(const char *haystack, const char *needle) { return strncmp(haystack, needle, strlen(needle)) == 0; } ! static int RecogniseErrorListLine(const char *lineBuffer, unsigned int lengthLine) { if (lineBuffer[0] == '>') { // Command or return status ! return SCE_ERR_CMD; } else if (lineBuffer[0] == '<') { // Diff removal, but not interested. Trapped to avoid hitting CTAG cases. ! return SCE_ERR_DEFAULT; } else if (lineBuffer[0] == '!') { ! return SCE_ERR_DIFF_CHANGED; } else if (lineBuffer[0] == '+') { ! if (strstart(lineBuffer, "+++ ")) { ! return SCE_ERR_DIFF_MESSAGE; ! } else { ! return SCE_ERR_DIFF_ADDITION; ! } } else if (lineBuffer[0] == '-') { ! if (strstart(lineBuffer, "--- ")) { ! return SCE_ERR_DIFF_MESSAGE; ! } else { ! return SCE_ERR_DIFF_DELETION; ! } } else if (strstart(lineBuffer, "cf90-")) { // Absoft Pro Fortran 90/95 v8.2 error and/or warning message ! return SCE_ERR_ABSF; } else if (strstart(lineBuffer, "fortcom:")) { // Intel Fortran Compiler v8.0 error/warning message ! return SCE_ERR_IFORT; } else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) { ! return SCE_ERR_PYTHON; } else if (strstr(lineBuffer, " in ") && strstr(lineBuffer, " on line ")) { ! return SCE_ERR_PHP; } else if ((strstart(lineBuffer, "Error ") || ! strstart(lineBuffer, "Warning ")) && ! strstr(lineBuffer, " at (") && ! strstr(lineBuffer, ") : ") && ! (strstr(lineBuffer, " at (") < strstr(lineBuffer, ") : "))) { // Intel Fortran Compiler error/warning message ! return SCE_ERR_IFC; } else if (strstart(lineBuffer, "Error ")) { // Borland error message ! return SCE_ERR_BORLAND; } else if (strstart(lineBuffer, "Warning ")) { // Borland warning message ! return SCE_ERR_BORLAND; } else if (strstr(lineBuffer, "at line " ) && (strstr(lineBuffer, "at line " ) < (lineBuffer + lengthLine)) && *************** *** 529,571 **** (strstr(lineBuffer, "file ") < (lineBuffer + lengthLine))) { // Lua 4 error message ! styler.ColourTo(endPos, SCE_ERR_LUA); } else if (strstr(lineBuffer, " at " ) && (strstr(lineBuffer, " at " ) < (lineBuffer + lengthLine)) && strstr(lineBuffer, " line ") && (strstr(lineBuffer, " line ") < (lineBuffer + lengthLine)) && ! (strstr(lineBuffer, " at " ) < (strstr(lineBuffer, " line ")))) { // perl error message ! styler.ColourTo(endPos, SCE_ERR_PERL); } else if ((memcmp(lineBuffer, " at ", 6) == 0) && ! strstr(lineBuffer, ":line ")) { // A .NET traceback ! styler.ColourTo(endPos, SCE_ERR_NET); } else if (strstart(lineBuffer, "Line ") && ! strstr(lineBuffer, ", file ")) { // Essential Lahey Fortran error message ! styler.ColourTo(endPos, SCE_ERR_ELF); } else if (strstart(lineBuffer, "line ") && ! strstr(lineBuffer, " column ")) { // HTML tidy style: line 42 column 1 ! styler.ColourTo(endPos, SCE_ERR_TIDY); } else if (strstart(lineBuffer, "\tat ") && ! strstr(lineBuffer, "(") && ! strstr(lineBuffer, ".java:")) { // Java stack back trace ! styler.ColourTo(endPos, SCE_ERR_JAVA_STACK); } else { ! // Look for GCC <filename>:<line>:message ! // Look for Microsoft <filename>(line) :message ! // Look for Microsoft <filename>(line,pos)message ! // Look for CTags \tmessage ! // Look for Lua 5 traceback \t<filename>:<line>:message bool initialTab = (lineBuffer[0] == '\t'); ! int state = 0; for (unsigned int i = 0; i < lengthLine; i++) { char ch = lineBuffer[i]; char chNext = ' '; ! if ((i+1) < lengthLine) ! chNext = lineBuffer[i+1]; ! if (state == 0) { if (ch == ':') { // May be GCC, or might be Lua 5 (Lua traceback same but with tab prefix) --- 837,887 ---- (strstr(lineBuffer, "file ") < (lineBuffer + lengthLine))) { // Lua 4 error message ! return SCE_ERR_LUA; } else if (strstr(lineBuffer, " at " ) && (strstr(lineBuffer, " at " ) < (lineBuffer + lengthLine)) && strstr(lineBuffer, " line ") && (strstr(lineBuffer, " line ") < (lineBuffer + lengthLine)) && ! (strstr(lineBuffer, " at " ) < (strstr(lineBuffer, " line ")))) { // perl error message ! return SCE_ERR_PERL; } else if ((memcmp(lineBuffer, " at ", 6) == 0) && ! strstr(lineBuffer, ":line ")) { // A .NET traceback ! return SCE_ERR_NET; } else if (strstart(lineBuffer, "Line ") && ! strstr(lineBuffer, ", file ")) { // Essential Lahey Fortran error message ! return SCE_ERR_ELF; } else if (strstart(lineBuffer, "line ") && ! strstr(lineBuffer, " column ")) { // HTML tidy style: line 42 column 1 ! return SCE_ERR_TIDY; } else if (strstart(lineBuffer, "\tat ") && ! strstr(lineBuffer, "(") && ! strstr(lineBuffer, ".java:")) { // Java stack back trace ! return SCE_ERR_JAVA_STACK; } else { ! // Look for one of the following formats: ! // GCC: <filename>:<line>:<message> ! // Microsoft: <filename>(<line>) :<message> ! // Common: <filename>(<line>): warning|error|note|remark|catastrophic|fatal ! // Common: <filename>(<line>) warning|error|note|remark|catastrophic|fatal ! // Microsoft: <filename>(<line>,<column>)<message> ! // CTags: \t<message> ! // Lua 5 traceback: \t<filename>:<line>:<message> bool initialTab = (lineBuffer[0] == '\t'); ! enum { stInitial, ! stGccStart, stGccDigit, stGcc, ! stMsStart, stMsDigit, stMsBracket, stMsVc, stMsDigitComma, stMsDotNet, ! stCtagsStart, stCtagsStartString, stCtagsStringDollar, stCtags, ! stUnrecognized ! } state = stInitial; for (unsigned int i = 0; i < lengthLine; i++) { char ch = lineBuffer[i]; char chNext = ' '; ! if ((i + 1) < lengthLine) ! chNext = lineBuffer[i + 1]; ! if (state == stInitial) { if (ch == ':') { // May be GCC, or might be Lua 5 (Lua traceback same but with tab prefix) *************** *** 573,645 **** // This check is not completely accurate as may be on // GTK+ with a file name that includes ':'. ! state = 1; } } else if ((ch == '(') && Is1To9(chNext) && (!initialTab)) { // May be Microsoft // Check against '0' often removes phone numbers ! state = 10; } else if ((ch == '\t') && (!initialTab)) { // May be CTags ! state = 20; } ! } else if (state == 1) { ! state = Is1To9(ch) ? 2 : unRecognized; ! } else if (state == 2) { if (ch == ':') { ! state = 3; // :9.*: is GCC break; } else if (!Is0To9(ch)) { ! state = unRecognized; } ! } else if (state == 10) { ! state = Is0To9(ch) ? 11 : unRecognized; ! } else if (state == 11) { if (ch == ',') { ! state = 14; } else if (ch == ')') { ! state = 12; } else if ((ch != ' ') && !Is0To9(ch)) { ! state = unRecognized; } ! } else if (state == 12) { if ((ch == ' ') && (chNext == ':')) { ! state = 13; } else { ! state = unRecognized; } ! } else if (state == 14) { if (ch == ')') { ! state = 15; break; } else if ((ch != ' ') && !Is0To9(ch)) { ! state = unRecognized; } ! } else if (state == 20) { ! if ((lineBuffer[i-1] == '\t') && ! ((ch == '/' && lineBuffer[i+1] == '^') || Is0To9(ch))) { ! state = 24; break; ! } else if ((ch == '/') && (lineBuffer[i+1] == '^')) { ! state = 21; } ! } else if ((state == 21) && ((lineBuffer[i] == '$') && (lineBuffer[i+1] == '/'))) { ! state = 22; break; } } ! if (state == 3) { ! styler.ColourTo(endPos, SCE_ERR_GCC); ! } else if ((state == 13) || (state == 14) || (state == 15)) { ! styler.ColourTo(endPos, SCE_ERR_MS); ! } else if ((state == 22) || (state == 24)) { ! styler.ColourTo(endPos, SCE_ERR_CTAG); } else { ! styler.ColourTo(endPos, SCE_ERR_DEFAULT); } } } static void ColouriseErrorListDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { ! char lineBuffer[1024]; styler.StartAt(startPos); styler.StartSegment(startPos); --- 889,988 ---- // This check i... [truncated message content] |
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/extsrc/w32fScintilla/win32 Modified Files: PlatWin.cxx ScintRes.aps ScintRes.rc ScintillaWin.cxx deps.mak makefile scintilla.mak scintilla_vc6.mak Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: PlatWin.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/PlatWin.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlatWin.cxx 22 Dec 2004 20:26:00 -0000 1.1 --- PlatWin.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 377,381 **** fontOld = 0; } ! font =0; if (bitmapOld) { ::SelectObject(reinterpret_cast<HDC>(hdc), bitmapOld); --- 377,381 ---- fontOld = 0; } ! font = 0; if (bitmapOld) { [...1157 lines suppressed...] WNDCLASSEX wndclassc; wndclassc.cbSize = sizeof(wndclassc); + // We need CS_HREDRAW and CS_VREDRAW because of the ellipsis that might be drawn for + // truncated items in the list and the appearance/disappearance of the vertical scroll bar. + // The list repaint is double-buffered to avoid the flicker this would otherwise cause. wndclassc.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW; wndclassc.cbClsExtra = 0; *************** *** 1442,1446 **** void Platform_Initialise(void *hInstance) { ! OSVERSIONINFO osv = {sizeof(OSVERSIONINFO),0,0,0,0,""}; ::GetVersionEx(&osv); onNT = osv.dwPlatformId == VER_PLATFORM_WIN32_NT; --- 1977,1981 ---- void Platform_Initialise(void *hInstance) { ! OSVERSIONINFO osv = {sizeof(OSVERSIONINFO),0,0,0,0,TEXT("")}; ::GetVersionEx(&osv); onNT = osv.dwPlatformId == VER_PLATFORM_WIN32_NT; Index: makefile =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile 22 Dec 2004 20:26:00 -0000 1.1 --- makefile 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- CC = g++ DLLWRAP = dllwrap + DEL = del /q COMPONENT = ../bin/Scintilla.dll *************** *** 25,33 **** vpath %.cxx ../src ! LDFLAGS=-mwindows -lstdc++ -limm32 -lole32 -luuid # Add -MMD to get dependencies #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti INCLUDEDIRS=-I ../include -I ../src ! CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions $(THUNKFLAGS) -fno-rtti ifdef DEBUG --- 26,34 ---- vpath %.cxx ../src ! LDFLAGS=-mwindows -lstdc++ -limm32 -lole32 -luuid -mno-cygwin # Add -MMD to get dependencies #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti INCLUDEDIRS=-I ../include -I ../src ! CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic $(INCLUDEDIRS) -Os -fno-exceptions $(THUNKFLAGS) -fno-rtti -mno-cygwin ifdef DEBUG *************** *** 43,47 **** clean: ! del /q *.exe *.o *.obj *.dll *.res *.map deps: --- 44,48 ---- clean: ! $(DEL) *.exe *.o *.obj *.dll *.res *.map deps: *************** *** 51,61 **** #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ ! LexAda.o LexAPDL.o LexAsm.o LexAU3.o LexAVE.o LexBaan.o LexBash.o LexBullant.o \ ! LexCLW.o LexConf.o LexCPP.o LexCrontab.o LexCSS.o LexEiffel.o LexErlang.o \ ! LexEScript.o LexForth.o LexFortran.o LexGui4Cli.o LexHTML.o LexKix.o LexLisp.o \ LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \ ! LexPython.o LexRuby.o LexScriptol.o LexSpecman.o LexSQL.o LexTeX.o LexVB.o \ ! LexVerilog.o LexYAML.o #--Autogenerated -- end of automatically generated section --- 52,63 ---- #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ ! LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \ ! LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \ ! LexCsound.o LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o \ ! LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o \ LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \ ! LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \ ! LexSQL.o LexTADS3.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section Index: ScintRes.aps =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/ScintRes.aps,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsYCYIkB and /tmp/cvsc0EJcW differ Index: ScintillaWin.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/ScintillaWin.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaWin.cxx 22 Dec 2004 20:26:00 -0000 1.1 --- ScintillaWin.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 185,188 **** --- 185,189 ---- virtual bool HaveMouseCapture(); virtual void ScrollText(int linesToMove); + virtual void UpdateSystemCaret(); virtual void SetVerticalScrollPos(); virtual void SetHorizontalScrollPos(); *************** *** 199,204 **** virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); virtual void ClaimSelection(); - virtual int KeyDefault(int key, int modifiers); // 4.7.2004 dbu - void NotifyKey(int key, int modifiers); // 4.7.2004 dbu // DBCS --- 200,203 ---- *************** *** 206,210 **** void ImeEndComposition(); ! void AddCharBytes(char b0, char b1=0); void GetIntelliMouseParameters(); --- 205,209 ---- void ImeEndComposition(); ! void AddCharBytes(char b0, char b1); void GetIntelliMouseParameters(); *************** *** 214,217 **** --- 213,218 ---- void RealizeWindowPalette(bool inBackGround); void FullPaint(); + void FullPaintDC(HDC dc); + bool IsCompatibleDC(HDC dc); virtual int SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw); *************** *** 254,257 **** --- 255,267 ---- return drag.rectangular && (fmt == cfColumnSelect); } + + private: + // For use in creating a system caret + bool HasCaretSizeChanged(); + BOOL CreateSystemCaret(); + BOOL DestroySystemCaret(); + HBITMAP sysCaretBitmap; + int sysCaretWidth; + int sysCaretHeight; }; *************** *** 279,282 **** --- 289,296 ---- dt.sci = this; + sysCaretBitmap = 0; + sysCaretWidth = 0; + sysCaretHeight = 0; + Initialise(); } *************** *** 295,298 **** --- 309,313 ---- SetTicking(false); SetIdle(false); + DestroySystemCaret(); ::RevokeDragDrop(MainHWND()); ::OleUninitialize(); *************** *** 432,437 **** return 0; #else ! sptr_t ret; ! if ((lParam & GCS_RESULTSTR) && (IsNT())) { HIMC hIMC = ::ImmGetContext(MainHWND()); if (hIMC) { --- 447,451 ---- return 0; #else ! if (lParam & GCS_RESULTSTR) { HIMC hIMC = ::ImmGetContext(MainHWND()); if (hIMC) { *************** *** 455,476 **** } } ::ImmReleaseContext(MainHWND(), hIMC); } ! ret = 0; ! } else { ! ret = ::DefWindowProc(MainHWND(), WM_IME_COMPOSITION, wParam, lParam); ! } ! if ((lParam & GCS_RESULTSTR)) { ! HIMC hIMC = ::ImmGetContext(MainHWND()); ! Point pos = LocationFromPosition(currentPos); ! COMPOSITIONFORM CompForm; ! CompForm.dwStyle = CFS_POINT; ! CompForm.ptCurrentPos.x = pos.x; ! CompForm.ptCurrentPos.y = pos.y; ! ::ImmSetCompositionWindow(hIMC, &CompForm); ! ::ImmReleaseContext(MainHWND(), hIMC); ! DropCaret(); ! } ! return ret; #endif } --- 469,484 ---- } } + // Set new position after converted + Point pos = LocationFromPosition(currentPos); + COMPOSITIONFORM CompForm; + CompForm.dwStyle = CFS_POINT; + CompForm.ptCurrentPos.x = pos.x; + CompForm.ptCurrentPos.y = pos.y; + ::ImmSetCompositionWindow(hIMC, &CompForm); ::ImmReleaseContext(MainHWND(), hIMC); } ! return 0; ! } ! return ::DefWindowProc(MainHWND(), WM_IME_COMPOSITION, wParam, lParam); #endif } *************** *** 520,532 **** case WM_COMMAND: #ifdef TOTAL_CONTROL - if (LoWord(wParam) == idAutoComplete) { - int cmd = HiWord(wParam); - if (cmd == LBN_DBLCLK) { - AutoCompleteCompleted(); - } else { - if (cmd != LBN_SETFOCUS) - ::SetFocus(MainHWND()); - } - } Command(LoWord(wParam)); #endif --- 528,531 ---- *************** *** 536,539 **** --- 535,547 ---- return WndPaint(wParam); + case WM_PRINTCLIENT: { + HDC hdc = reinterpret_cast<HDC>(wParam); + if (!IsCompatibleDC(hdc)) { + return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam); + } + FullPaintDC(hdc); + } + break; + case WM_VSCROLL: ScrollMessage(wParam); *************** *** 626,630 **** return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam); ! case WM_LBUTTONDOWN: //Platform::DebugPrintf("Buttdown %d %x %x %x %x %x\n",iMessage, wParam, lParam, // Platform::IsKeyDown(VK_SHIFT), --- 634,643 ---- return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam); ! case WM_LBUTTONDOWN: { ! // For IME, set the composition string as the result string. ! HIMC hIMC = ::ImmGetContext(MainHWND()); ! ::ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); ! ::ImmReleaseContext(MainHWND(), hIMC); ! // //Platform::DebugPrintf("Buttdown %d %x %x %x %x %x\n",iMessage, wParam, lParam, // Platform::IsKeyDown(VK_SHIFT), *************** *** 636,639 **** --- 649,653 ---- Platform::IsKeyDown(VK_MENU)); ::SetFocus(MainHWND()); + } break; *************** *** 681,690 **** //UTF8FromUCS2(wcs, 1, utfval, len); //AddCharUTF(utfval, len); ! AddCharBytes(static_cast<char>(wParam & 0xff)); } else { ! AddChar(static_cast<char>(wParam & 0xff)); } } ! return 1; case WM_UNICHAR: --- 695,704 ---- //UTF8FromUCS2(wcs, 1, utfval, len); //AddCharUTF(utfval, len); ! AddCharBytes('\0', LOBYTE(wParam)); } else { ! AddChar(LOBYTE(wParam)); } } ! return 0; case WM_UNICHAR: *************** *** 740,748 **** case WM_KILLFOCUS: { HWND wOther = reinterpret_cast<HWND>(wParam); ! HWND wThis = reinterpret_cast<HWND>(wMain.GetID()); HWND wCT = reinterpret_cast<HWND>(ct.wCallTip.GetID()); if (!wParam || !(::IsChild(wThis,wOther) || (wOther == wCT))) { SetFocusState(false); } } --- 754,763 ---- case WM_KILLFOCUS: { HWND wOther = reinterpret_cast<HWND>(wParam); ! HWND wThis = MainHWND(); HWND wCT = reinterpret_cast<HWND>(ct.wCallTip.GetID()); if (!wParam || !(::IsChild(wThis,wOther) || (wOther == wCT))) { SetFocusState(false); + DestroySystemCaret(); } } *************** *** 753,756 **** --- 768,773 ---- SetFocusState(true); RealizeWindowPalette(false); + DestroySystemCaret(); + CreateSystemCaret(); break; *************** *** 784,791 **** case WM_IME_CHAR: { ! if (HIBYTE(wParam) == '\0') ! AddChar(LOBYTE(wParam)); ! else ! AddCharBytes(HIBYTE(wParam), LOBYTE(wParam)); return 0; } --- 801,805 ---- case WM_IME_CHAR: { ! AddCharBytes(HIBYTE(wParam), LOBYTE(wParam)); return 0; } *************** *** 891,895 **** CharacterRange *pCR = reinterpret_cast<CharacterRange *>(lParam); selType = selStream; ! if (pCR->cpMax == 0 && pCR->cpMax == -1) { SetSelection(pCR->cpMin, pdoc->Length()); } else { --- 905,909 ---- CharacterRange *pCR = reinterpret_cast<CharacterRange *>(lParam); selType = selStream; ! if (pCR->cpMin == 0 && pCR->cpMax == -1) { SetSelection(pCR->cpMin, pdoc->Length()); } else { *************** *** 981,984 **** --- 995,1009 ---- } + void ScintillaWin::UpdateSystemCaret() { + if (hasFocus) { + if (HasCaretSizeChanged()) { + DestroySystemCaret(); + CreateSystemCaret(); + } + Point pos = LocationFromPosition(currentPos); + ::SetCaretPos(pos.x, pos.y); + } + } + int ScintillaWin::SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) { return ::SetScrollInfo(MainHWND(), nBar, lpsi, bRedraw); *************** *** 997,1000 **** --- 1022,1026 ---- GetScrollInfo(barType, &sci); if (sci.nPos != pos) { + DwellEnd(true); sci.nPos = pos; SetScrollInfo(barType, &sci, TRUE); *************** *** 1097,1119 **** } - // added 4.7.2004 dbu - void ScintillaWin::NotifyKey(int key, int modifiers) { - static SCNotification scn; - - memset( &scn, 0, sizeof(SCNotification) ); - scn.nmhdr.code = SCN_KEY; - scn.ch = key; - scn.modifiers = modifiers; - - NotifyParent(scn); - } - - // added 4.7.2004 dbu - int ScintillaWin::KeyDefault(int key, int modifiers) { - NotifyKey( key, modifiers ); - return 0; - } - - void ScintillaWin::Copy() { //Platform::DebugPrintf("Copy\n"); --- 1123,1126 ---- *************** *** 1135,1174 **** } void ScintillaWin::Paste() { ! if (!::OpenClipboard(MainHWND())) return; pdoc->BeginUndoAction(); - int selStart = SelectionStart(); ClearSelection(); bool isRectangular = ::IsClipboardFormatAvailable(cfColumnSelect) != 0; ! HGLOBAL hmemUSelection = 0; ! if (IsUnicodeMode()) { ! hmemUSelection = ::GetClipboardData(CF_UNICODETEXT); ! if (hmemUSelection) { ! wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(hmemUSelection)); ! if (uptr) { unsigned int bytes = ::GlobalSize(hmemUSelection); ! unsigned int len = UTF8Length(uptr, bytes/2); ! char *putf = new char[len+1]; if (putf) { ! UTF8FromUCS2(uptr, bytes/2, putf, len); ! if (isRectangular) { ! PasteRectangular(selStart, putf, len); ! } else { ! if (pdoc->InsertString(currentPos, putf, len)) { ! SetEmptySelection(currentPos + len); ! } } - delete []putf; } } - ::GlobalUnlock(hmemUSelection); } ! } ! if (!hmemUSelection) { HGLOBAL hmemSelection = ::GetClipboardData(CF_TEXT); if (hmemSelection) { char *ptr = static_cast<char *>( ! ::GlobalLock(hmemSelection)); if (ptr) { unsigned int bytes = ::GlobalSize(hmemSelection); --- 1142,1218 ---- } + static UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage) { + CHARSETINFO ci = { 0, 0, { { 0, 0, 0, 0 }, { 0, 0 } } }; + BOOL bci = ::TranslateCharsetInfo((DWORD*)characterSet, + &ci, TCI_SRCCHARSET); + + UINT cp; + if (bci) + cp = ci.ciACP; + else + cp = documentCodePage; + + CPINFO cpi; + if (!IsValidCodePage(cp) && !GetCPInfo(cp, &cpi)) + cp = CP_ACP; + + return cp; + } + void ScintillaWin::Paste() { ! if (!::OpenClipboard(MainHWND())) return; pdoc->BeginUndoAction(); ClearSelection(); + int selStart = SelectionStart(); bool isRectangular = ::IsClipboardFormatAvailable(cfColumnSelect) != 0; ! ! // Always use CF_UNICODETEXT if available ! HGLOBAL hmemUSelection = ::GetClipboardData(CF_UNICODETEXT); ! if (hmemUSelection) { ! wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(hmemUSelection)); ! if (uptr) { ! unsigned int len; ! char *putf; ! // Default Scintilla behaviour in Unicode mode ! if (IsUnicodeMode()) { unsigned int bytes = ::GlobalSize(hmemUSelection); ! len = UTF8Length(uptr, bytes / 2); ! putf = new char[len + 1]; if (putf) { ! UTF8FromUCS2(uptr, bytes / 2, putf, len); ! } ! } else { ! // CF_UNICODETEXT available, but not in Unicode mode ! // Convert from Unicode to current Scintilla code page ! UINT cpDest = CodePageFromCharSet( ! vs.styles[STYLE_DEFAULT].characterSet, pdoc->dbcsCodePage); ! len = ::WideCharToMultiByte(cpDest, 0, uptr, -1, ! NULL, 0, NULL, NULL) - 1; // subtract 0 terminator ! putf = new char[len + 1]; ! if (putf) { ! ::WideCharToMultiByte(cpDest, 0, uptr, -1, ! putf, len + 1, NULL, NULL); ! } ! } ! ! if (putf) { ! if (isRectangular) { ! PasteRectangular(selStart, putf, len); ! } else { ! if (pdoc->InsertString(currentPos, putf, len)) { ! SetEmptySelection(currentPos + len); } } + delete []putf; } } ! ::GlobalUnlock(hmemUSelection); ! } else { ! // CF_UNICODETEXT not available, paste ANSI text HGLOBAL hmemSelection = ::GetClipboardData(CF_TEXT); if (hmemSelection) { char *ptr = static_cast<char *>( ! ::GlobalLock(hmemSelection)); if (ptr) { unsigned int bytes = ::GlobalSize(hmemSelection); *************** *** 1178,1186 **** len = i; } ! if (isRectangular) { ! PasteRectangular(selStart, ptr, len); } else { ! pdoc->InsertString(currentPos, ptr, len); ! SetEmptySelection(currentPos + len); } } --- 1222,1257 ---- len = i; } ! ! // In Unicode mode, convert clipboard text to UTF-8 ! if (IsUnicodeMode()) { ! wchar_t *uptr = static_cast<wchar_t *>(::GlobalAlloc(GPTR, ! len * 2 + 2)); ! ! unsigned int ulen = ::MultiByteToWideChar(CP_ACP, 0, ! ptr, len, uptr, GlobalSize(static_cast<wchar_t *>(uptr))); ! ! unsigned int mlen = UTF8Length(uptr, ulen); ! char *putf = new char[mlen + 1]; ! if (putf) { ! // CP_UTF8 not available on Windows 95, so use UTF8FromUCS2() ! UTF8FromUCS2(uptr, ulen, putf, mlen); ! } ! ! ::GlobalFree(static_cast<wchar_t *>(uptr)); ! ! if (isRectangular) { ! PasteRectangular(selStart, putf, mlen); ! } else { ! pdoc->InsertString(currentPos, putf, mlen); ! SetEmptySelection(currentPos + mlen); ! } ! delete []putf; } else { ! if (isRectangular) { ! PasteRectangular(selStart, ptr, len); ! } else { ! pdoc->InsertString(currentPos, ptr, len); ! SetEmptySelection(currentPos + len); ! } } } *************** *** 1197,1201 **** #ifdef TOTAL_CONTROL if (!ct.wCallTip.Created()) { ! ct.wCallTip = ::CreateWindow(callClassName, "ACallTip", WS_POPUP, 100, 100, 150, 20, MainHWND(), 0, --- 1268,1272 ---- #ifdef TOTAL_CONTROL if (!ct.wCallTip.Created()) { ! ct.wCallTip = ::CreateWindow(callClassName, TEXT("ACallTip"), WS_POPUP, 100, 100, 150, 20, MainHWND(), 0, *************** *** 1398,1403 **** bool formatOK = (pFE->cfFormat == CF_TEXT) || ! ((pFE->cfFormat == CF_UNICODETEXT) && pd->sci->IsUnicodeMode()) || ! (pFE->cfFormat == CF_HDROP); if (!formatOK || pFE->ptd != 0 || --- 1469,1473 ---- bool formatOK = (pFE->cfFormat == CF_TEXT) || ! ((pFE->cfFormat == CF_UNICODETEXT) && pd->sci->IsUnicodeMode()); if (!formatOK || pFE->ptd != 0 || *************** *** 1551,1555 **** // The logfont for the IME is recreated here. int styleHere = (pdoc->StyleAt(currentPos)) & 31; ! LOGFONT lf = {0,0,0,0,0,0,0,0,0,0,0,0,0,""}; int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel; if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1 --- 1621,1625 ---- // The logfont for the IME is recreated here. int styleHere = (pdoc->StyleAt(currentPos)) & 31; ! LOGFONT lf = {0,0,0,0,0,0,0,0,0,0,0,0,0,TEXT("")}; int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel; if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1 *************** *** 1589,1602 **** char utfval[4]="\0\0\0"; char ansiChars[3]; - ansiChars[0] = b0; - ansiChars[1] = b1; - ansiChars[2] = '\0'; wchar_t wcs[2]; ! ::MultiByteToWideChar(inputCodePage, 0, ansiChars, 2, wcs, 1); unsigned int len = UTF8Length(wcs, 1); UTF8FromUCS2(wcs, 1, utfval, len); utfval[len] = '\0'; AddCharUTF(utfval,len); ! } else if (b1) { char dbcsChars[3]; dbcsChars[0] = b0; --- 1659,1678 ---- char utfval[4]="\0\0\0"; char ansiChars[3]; wchar_t wcs[2]; ! if (b0) { // Two bytes from IME ! ansiChars[0] = b0; ! ansiChars[1] = b1; ! ansiChars[2] = '\0'; ! ::MultiByteToWideChar(inputCodePage, 0, ansiChars, 2, wcs, 1); ! } else { ! ansiChars[0] = b1; ! ansiChars[1] = '\0'; ! ::MultiByteToWideChar(inputCodePage, 0, ansiChars, 1, wcs, 1); ! } unsigned int len = UTF8Length(wcs, 1); UTF8FromUCS2(wcs, 1, utfval, len); utfval[len] = '\0'; AddCharUTF(utfval,len); ! } else if (b0) { char dbcsChars[3]; dbcsChars[0] = b0; *************** *** 1605,1609 **** AddCharUTF(dbcsChars, 2, true); } else { ! AddChar(b0); } } --- 1681,1685 ---- AddCharUTF(dbcsChars, 2, true); } else { ! AddChar(b1); } } *************** *** 1616,1640 **** void ScintillaWin::CopyToClipboard(const SelectionText &selectedText) { if (!::OpenClipboard(MainHWND())) ! return; ::EmptyClipboard(); ! HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! selectedText.len); ! if (hand) { ! char *ptr = static_cast<char *>(::GlobalLock(hand)); ! memcpy(ptr, selectedText.s, selectedText.len); ! ::GlobalUnlock(hand); ! ::SetClipboardData(CF_TEXT, hand); ! } if (IsUnicodeMode()) { int uchars = UCS2Length(selectedText.s, selectedText.len); ! HGLOBAL uhand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! 2 * (uchars)); if (uhand) { ! wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(uhand)); UCS2FromUTF8(selectedText.s, selectedText.len, uptr, uchars); ! ::GlobalUnlock(uhand); ! ::SetClipboardData(CF_UNICODETEXT, uhand); } } --- 1692,1754 ---- void ScintillaWin::CopyToClipboard(const SelectionText &selectedText) { if (!::OpenClipboard(MainHWND())) ! return ; ::EmptyClipboard(); ! HGLOBAL uhand; ! wchar_t *uptr = 0; + // Default Scintilla behaviour in Unicode mode if (IsUnicodeMode()) { int uchars = UCS2Length(selectedText.s, selectedText.len); ! uhand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! 2 * (uchars)); if (uhand) { ! uptr = static_cast<wchar_t *>(::GlobalLock(uhand)); UCS2FromUTF8(selectedText.s, selectedText.len, uptr, uchars); ! } ! } else { ! // Not Unicode mode ! // Convert to Unicode using the current Scintilla code page ! UINT cpSrc = CodePageFromCharSet( ! selectedText.characterSet, selectedText.codePage); ! uhand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! 2 * (selectedText.len + 1)); ! if (uhand) { ! uptr = static_cast<wchar_t *>(::GlobalLock(uhand)); ! ::MultiByteToWideChar(cpSrc, 0, ! selectedText.s, selectedText.len, uptr, GlobalSize(uhand)); ! } ! } ! ! // Copy ANSI text to clipboard on Windows 9x ! // Convert from Unicode text, so other ANSI programs can ! // paste the text ! // Windows NT, 2k, XP automatically generates CF_TEXT ! if (!IsNT() && uhand) { ! HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! selectedText.len); ! if (hand) { ! char *ptr = static_cast<char *>(::GlobalLock(hand)); ! ::WideCharToMultiByte(CP_ACP, 0, uptr, -1, ptr, GlobalSize(hand), ! NULL, NULL); ! ::GlobalUnlock(hand); ! ::SetClipboardData(CF_TEXT, hand); ! } ! } ! ! if (uhand) { ! ::GlobalUnlock(uhand); ! ::SetClipboardData(CF_UNICODETEXT, uhand); ! } ! ! // There was a failure - try to copy at least ANSI text ! if (!uhand) { ! HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! selectedText.len); ! if (hand) { ! char *ptr = static_cast<char *>(::GlobalLock(hand)); ! memcpy(ptr, selectedText.s, selectedText.len); ! ::GlobalUnlock(hand); ! ::SetClipboardData(CF_TEXT, hand); } } *************** *** 1719,1722 **** --- 1833,1838 ---- RefreshStyleData(); HDC hdc = ::GetDC(MainHWND()); + // Select a stock font to prevent warnings from BoundsChecker + ::SelectObject(hdc, GetStockFont(DEFAULT_GUI_FONT)); AutoSurface surfaceWindow(hdc, this); if (surfaceWindow) { *************** *** 1734,1741 **** */ void ScintillaWin::FullPaint() { paintState = painting; rcPaint = GetClientRectangle(); paintingAllText = true; - HDC hdc = ::GetDC(MainHWND()); AutoSurface surfaceWindow(hdc, this); if (surfaceWindow) { --- 1850,1866 ---- */ void ScintillaWin::FullPaint() { + HDC hdc = ::GetDC(MainHWND()); + FullPaintDC(hdc); + ::ReleaseDC(MainHWND(), hdc); + } + + /** + * Redraw all of text area on the specified DC. + * This paint will not be abandoned. + */ + void ScintillaWin::FullPaintDC(HDC hdc) { paintState = painting; rcPaint = GetClientRectangle(); paintingAllText = true; AutoSurface surfaceWindow(hdc, this); if (surfaceWindow) { *************** *** 1743,1750 **** surfaceWindow->Release(); } - ::ReleaseDC(MainHWND(), hdc); paintState = notPainting; } /// Implement IUnknown STDMETHODIMP ScintillaWin::QueryInterface(REFIID riid, PVOID *ppv) { --- 1868,1890 ---- surfaceWindow->Release(); } paintState = notPainting; } + static bool CompareDevCap(HDC hdc, HDC hOtherDC, int nIndex) { + return ::GetDeviceCaps(hdc, nIndex) == ::GetDeviceCaps(hOtherDC, nIndex); + } + + bool ScintillaWin::IsCompatibleDC(HDC hOtherDC) { + HDC hdc = ::GetDC(MainHWND()); + bool isCompatible = + CompareDevCap(hdc, hOtherDC, TECHNOLOGY) && + CompareDevCap(hdc, hOtherDC, LOGPIXELSY) && + CompareDevCap(hdc, hOtherDC, LOGPIXELSX) && + CompareDevCap(hdc, hOtherDC, BITSPIXEL) && + CompareDevCap(hdc, hOtherDC, PLANES); + ::ReleaseDC(MainHWND(), hdc); + return isCompatible; + } + /// Implement IUnknown STDMETHODIMP ScintillaWin::QueryInterface(REFIID riid, PVOID *ppv) { *************** *** 1907,1912 **** STDMETHODIMP ScintillaWin::GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) { bool formatOK = (pFEIn->cfFormat == CF_TEXT) || ! ((pFEIn->cfFormat == CF_UNICODETEXT) && IsUnicodeMode()) || ! (pFEIn->cfFormat == CF_HDROP); if (!formatOK || pFEIn->ptd != 0 || --- 2047,2051 ---- STDMETHODIMP ScintillaWin::GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) { bool formatOK = (pFEIn->cfFormat == CF_TEXT) || ! ((pFEIn->cfFormat == CF_UNICODETEXT) && IsUnicodeMode()); if (!formatOK || pFEIn->ptd != 0 || *************** *** 1919,1927 **** } pSTM->tymed = TYMED_HGLOBAL; - if (pFEIn->cfFormat == CF_HDROP) { - pSTM->hGlobal = 0; - pSTM->pUnkForRelease = 0; - return S_OK; - } //Platform::DebugPrintf("DOB GetData OK %d %x %x\n", lenDrag, pFEIn, pSTM); --- 2058,2061 ---- *************** *** 2020,2023 **** --- 2154,2197 ---- } + bool ScintillaWin::HasCaretSizeChanged() { + if ( + ( (0 != vs.caretWidth) && (sysCaretWidth != vs.caretWidth) ) + || (0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight) + ) { + return true; + } + return false; + } + + BOOL ScintillaWin::CreateSystemCaret() { + sysCaretWidth = vs.caretWidth; + if (0 == sysCaretWidth) { + sysCaretWidth = 1; + } + sysCaretHeight = vs.lineHeight; + int bitmapSize = (((sysCaretWidth + 15) & ~15) >> 3) * + sysCaretHeight; + char *bits = new char[bitmapSize]; + memset(bits, 0, bitmapSize); + sysCaretBitmap = ::CreateBitmap(sysCaretWidth, sysCaretHeight, 1, + 1, reinterpret_cast<BYTE *>(bits)); + delete []bits; + BOOL retval = ::CreateCaret( + MainHWND(), sysCaretBitmap, + sysCaretWidth, sysCaretHeight); + ::ShowCaret(MainHWND()); + return retval; + } + + BOOL ScintillaWin::DestroySystemCaret() { + ::HideCaret(MainHWND()); + BOOL retval = ::DestroyCaret(); + if (sysCaretBitmap) { + ::DeleteObject(sysCaretBitmap); + sysCaretBitmap = 0; + } + return retval; + } + // Take care of 32/64 bit pointers #ifdef GetWindowLongPtr Index: deps.mak =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/deps.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** deps.mak 22 Dec 2004 20:26:00 -0000 1.1 --- deps.mak 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 1,137 **** - ExternalLexer.o: ExternalLexer.cxx ../include/Platform.h \ - ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \ - ExternalLexer.h PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \ ! ../src/UniConversion.h ../src/XPM.h ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ ! ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ! ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ ! ../src/AutoComplete.h ../src/ViewStyle.h ../src/Document.h \ ! ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/CallTip.h CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \ ! ../src/ContractionState.h Document.o: ../src/Document.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/Document.h ../src/RESearch.h DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../src/SVector.h \ ! ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \ ! ../include/Scintilla.h ../src/Document.h ! Editor.o: ../src/Editor.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \ ! ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ ! ../src/Document.h ../src/Editor.h Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/Indicator.h ! KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/KeyMap.h KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexAda.o: ../src/LexAda.cxx ../include/Platform.h \ ! ../include/Accessor.h ../src/StyleContext.h ../include/PropSet.h \ ! ../include/SString.h ../include/KeyWords.h ../include/SciLexer.h LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexConf.o: ../src/LexConf.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ! ../src/StyleContext.h ! LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h ! PropSet.o: ../src/PropSet.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h RESearch.o: ../src/RESearch.cxx ../src/RESearch.h ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ ! ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ ! ../src/AutoComplete.h ../src/Document.h ../src/Editor.h \ ! ../src/ScintillaBase.h Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ! ../src/Style.h StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/WindowAccessor.h ../include/Scintilla.h XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h --- 1,210 ---- PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \ ! ../src/UniConversion.h ../src/XPM.h ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ ! ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ! ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ ! ../src/AutoComplete.h ../src/ViewStyle.h ../src/Document.h \ ! ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/CallTip.h CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \ ! ../src/ContractionState.h Document.o: ../src/Document.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/Document.h ../src/RESearch.h DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../src/SVector.h \ ! ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \ ! ../include/Scintilla.h ../src/Document.h ! Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ ! ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ! ../src/Style.h ../src/ViewStyle.h ../src/Document.h ../src/Editor.h ! ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \ ! ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ ! ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \ ! ../src/ExternalLexer.h Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/Indicator.h ! KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ! ../src/KeyMap.h KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \ ! ../include/KeyWords.h ../include/SciLexer.h ! LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexForth.o: ../src/LexForth.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexKix.o: ../src/LexKix.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ! ../src/StyleContext.h ! LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ! ../src/StyleContext.h ! LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h ! PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h RESearch.o: ../src/RESearch.cxx ../src/RESearch.h ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ ! ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ ! ../src/AutoComplete.h ../src/Document.h ../src/Editor.h \ ! ../src/ScintillaBase.h Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ! ../src/Style.h StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/WindowAccessor.h ../include/Scintilla.h XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h Index: scintilla_vc6.mak =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/scintilla_vc6.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** scintilla_vc6.mak 22 Dec 2004 20:26:00 -0000 1.1 --- scintilla_vc6.mak 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 115,134 **** --- 115,140 ---- $(DIR_O)\LexAPDL.obj \ $(DIR_O)\LexAsm.obj \ + $(DIR_O)\LexAsn1.obj \ $(DIR_O)\LexAU3.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ $(DIR_O)\LexBash.obj \ + $(DIR_O)\LexBasic.obj \ $(DIR_O)\LexBullant.obj \ + $(DIR_O)\LexCaml.obj \ $(DIR_O)\LexCLW.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexCrontab.obj \ + $(DIR_O)\LexCsound.obj \ $(DIR_O)\LexCSS.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ $(DIR_O)\LexEScript.obj \ + $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ $(DIR_O)\LexGui4Cli.obj \ + $(DIR_O)\LexHaskell.obj \ $(DIR_O)\LexHTML.obj \ $(DIR_O)\LexKix.obj \ *************** *** 149,159 **** --- 155,169 ---- $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ + $(DIR_O)\LexSmalltalk.obj \ $(DIR_O)\LexSpecman.obj \ $(DIR_O)\LexSQL.obj \ + $(DIR_O)\LexTADS3.obj \ $(DIR_O)\LexTeX.obj \ $(DIR_O)\LexVB.obj \ $(DIR_O)\LexVerilog.obj \ + $(DIR_O)\LexVHDL.obj \ $(DIR_O)\LexYAML.obj \ *************** *** 272,275 **** --- 282,287 ---- $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) + $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS) *************** *** 280,285 **** --- 292,301 ---- $(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS) + $(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS) + $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) + $(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS) + $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) *************** *** 290,293 **** --- 306,311 ---- $(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS) + $(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS) + $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS) *************** *** 298,301 **** --- 316,321 ---- $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) + $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) + $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) *************** *** 304,307 **** --- 324,329 ---- $(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS) + $(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS) + $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS) *************** *** 340,351 **** --- 362,379 ---- $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) + $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS) + $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS) $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS) + $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS) *************** *** 354,357 **** --- 382,387 ---- $(DIR_O)\LexVerilog.obj: ..\src\LexVerilog.cxx $(LEX_HEADERS) + $(DIR_O)\LexVHDL.obj: ..\src\LexVHDL.cxx $(LEX_HEADERS) + $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) Index: ScintRes.rc =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/ScintRes.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ScintRes.rc 23 Jan 2005 16:38:02 -0000 1.2 --- ScintRes.rc 3 Sep 2005 10:13:13 -0000 1.3 *************** *** 32,37 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1,6,2,7 ! PRODUCTVERSION 1,6,2,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG --- 32,37 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1,6,6,1 ! PRODUCTVERSION 1,6,6,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG *************** *** 51,62 **** VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Scintilla Source Editing Component\0" ! VALUE "FileVersion", "1, 6, 2, 7\0" VALUE "InternalName", "Scintilla\0" ! VALUE "LegalCopyright", "Copyright 1998-2004 by Neil Hodgson, 2004-2005 by Win32Forth developer team\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "w32fScintilla.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "1, 6, 2, 5\0" VALUE "SpecialBuild", "\0" END --- 51,62 ---- VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Scintilla Source Editing Component\0" ! VALUE "FileVersion", "1, 6, 6, 1\0" VALUE "InternalName", "Scintilla\0" ! VALUE "LegalCopyright", "Copyright 1998-2005 by Neil Hodgson, 2004-2005 by Win32Forth developer team\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "w32fScintilla.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "1, 6, 6, 1\0" VALUE "SpecialBuild", "\0" END Index: scintilla.mak =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/scintilla.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** scintilla.mak 22 Dec 2004 20:26:00 -0000 1.1 --- scintilla.mak 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 53,57 **** LD=ilink32 ! CXXFLAGS=-P -tWM -w -w-prc -w-inl -RT- -x- # Above turns off warnings for clarfying parentheses and inlines with for not expanded CXXDEBUG=-Od -v -DDEBUG --- 53,57 ---- LD=ilink32 ! CXXFLAGS=-P -tWM -w -w-prc -w-inl -w-pin -RT- -x- # Above turns off warnings for clarfying parentheses and inlines with for not expanded CXXDEBUG=-Od -v -DDEBUG *************** *** 113,132 **** --- 113,138 ---- $(DIR_O)\LexAPDL.obj \ $(DIR_O)\LexAsm.obj \ + $(DIR_O)\LexAsn1.obj \ $(DIR_O)\LexAU3.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ $(DIR_O)\LexBash.obj \ + $(DIR_O)\LexBasic.obj \ $(DIR_O)\LexBullant.obj \ + $(DIR_O)\LexCaml.obj \ $(DIR_O)\LexCLW.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexCrontab.obj \ + $(DIR_O)\LexCsound.obj \ $(DIR_O)\LexCSS.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ $(DIR_O)\LexEScript.obj \ + $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ $(DIR_O)\LexGui4Cli.obj \ + $(DIR_O)\LexHaskell.obj \ $(DIR_O)\LexHTML.obj \ $(DIR_O)\LexKix.obj \ *************** *** 147,157 **** --- 153,167 ---- $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ + $(DIR_O)\LexSmalltalk.obj \ $(DIR_O)\LexSpecman.obj \ $(DIR_O)\LexSQL.obj \ + $(DIR_O)\LexTADS3.obj \ $(DIR_O)\LexTeX.obj \ $(DIR_O)\LexVB.obj \ $(DIR_O)\LexVerilog.obj \ + $(DIR_O)\LexVHDL.obj \ $(DIR_O)\LexYAML.obj \ *************** *** 270,273 **** --- 280,285 ---- $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) + $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS) *************** *** 278,283 **** --- 290,299 ---- $(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS) + $(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS) + $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) + $(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS) + $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) *************** *** 288,291 **** --- 304,309 ---- $(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS) + $(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS) + $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS) *************** *** 296,299 **** --- 314,319 ---- $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) + $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) + $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) *************** *** 302,305 **** --- 322,327 ---- $(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS) + $(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS) + $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS) *************** *** 338,349 **** --- 360,377 ---- $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) + $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS) + $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS) $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS) + $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS) *************** *** 352,355 **** --- 380,385 ---- $(DIR_O)\LexVerilog.obj: ..\src\LexVerilog.cxx $(LEX_HEADERS) + $(DIR_O)\LexVHDL.obj: ..\src\LexVHDL.cxx $(LEX_HEADERS) + $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) |
|
From: Dirk B. <db...@us...> - 2005-09-03 10:13:22
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/extsrc/w32fScintilla/gtk Modified Files: PlatGTK.cxx ScintillaGTK.cxx makefile scintilla.mak Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: PlatGTK.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/gtk/PlatGTK.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlatGTK.cxx 22 Dec 2004 20:25:53 -0000 1.1 --- PlatGTK.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 287,290 **** --- 287,292 ---- case SC_CHARSET_RUSSIAN: return "*-r"; + case SC_CHARSET_CYRILLIC: + return "*-cp1251"; case SC_CHARSET_SHIFTJIS: return "jisx0208.1983-*"; *************** *** 303,306 **** --- 305,310 ---- case SC_CHARSET_THAI: return "*-1"; + case SC_CHARSET_8859_15: + return "iso8859-15"; default: return "*-*"; *************** *** 743,746 **** --- 747,752 ---- case SC_CHARSET_RUSSIAN: return "KOI8-R"; + case SC_CHARSET_CYRILLIC: + return "CP1251"; case SC_CHARSET_SHIFTJIS: return "SHIFT-JIS"; *************** *** 759,762 **** --- 765,770 ---- case SC_CHARSET_THAI: return "ISO-8859-1"; + case SC_CHARSET_8859_15: + return "ISO-8859-15"; default: return ""; *************** *** 1251,1254 **** --- 1259,1263 ---- int totalWidth = 0; #ifdef USE_PANGO + const int lenPositions = len; if (PFont(font_)->pfd) { if (len == 1) { *************** *** 1264,1278 **** // Simple and direct as UTF-8 is native Pango encoding pango_layout_set_text(layout, s, len); ! PangoLayoutIter *iter = pango_layout_get_iter (layout); int i = 0; ! while (pango_layout_iter_next_cluster (iter)) { pango_layout_iter_get_cluster_extents(iter, NULL, &pos); int position = PANGO_PIXELS(pos.x); ! int curIndex = pango_layout_iter_get_index (iter); while (i < curIndex) { positions[i++] = position; } } ! pango_layout_iter_free (iter); } else { int positionsCalculated = 0; --- 1273,1291 ---- // Simple and direct as UTF-8 is native Pango encoding pango_layout_set_text(layout, s, len); ! PangoLayoutIter *iter = pango_layout_get_iter(layout); ! pango_layout_iter_get_cluster_extents(iter, NULL, &pos); int i = 0; ! while (pango_layout_iter_next_cluster(iter)) { pango_layout_iter_get_cluster_extents(iter, NULL, &pos); int position = PANGO_PIXELS(pos.x); ! int curIndex = pango_layout_iter_get_index(iter); while (i < curIndex) { positions[i++] = position; } } ! while (i < lenPositions) ! positions[i++] = PANGO_PIXELS(pos.x + pos.width); ! pango_layout_iter_free(iter); ! PLATFORM_ASSERT(i == lenPositions); } else { int positionsCalculated = 0; *************** *** 1288,1296 **** int i = 0; int utfIndex = 0; ! PangoLayoutIter *iter = pango_layout_get_iter (layout); ! while (pango_layout_iter_next_cluster (iter)) { pango_layout_iter_get_cluster_extents (iter, NULL, &pos); int position = PANGO_PIXELS(pos.x); ! int utfIndexNext = pango_layout_iter_get_index (iter); while (utfIndex < utfIndexNext) { size_t lenChar = MultiByteLenFromIconv(convMeasure, s+i, len-i); --- 1301,1310 ---- int i = 0; int utfIndex = 0; ! PangoLayoutIter *iter = pango_layout_get_iter(layout); ! pango_layout_iter_get_cluster_extents(iter, NULL, &pos); ! while (pango_layout_iter_next_cluster(iter)) { pango_layout_iter_get_cluster_extents (iter, NULL, &pos); int position = PANGO_PIXELS(pos.x); ! int utfIndexNext = pango_layout_iter_get_index(iter); while (utfIndex < utfIndexNext) { size_t lenChar = MultiByteLenFromIconv(convMeasure, s+i, len-i); *************** *** 1303,1308 **** } } ! pango_layout_iter_free (iter); delete []utfForm; } } --- 1317,1325 ---- } } ! while (i < lenPositions) ! positions[i++] = PANGO_PIXELS(pos.x + pos.width); ! pango_layout_iter_free(iter); delete []utfForm; + PLATFORM_ASSERT(i == lenPositions); } } *************** *** 1317,1325 **** pango_layout_set_text(layout, utfForm, len); int i = 0; ! PangoLayoutIter *iter = pango_layout_get_iter (layout); ! while (pango_layout_iter_next_cluster (iter)) { pango_layout_iter_get_cluster_extents(iter, NULL, &pos); positions[i++] = PANGO_PIXELS(pos.x); } pango_layout_iter_free(iter); if (useGFree) { --- 1334,1345 ---- pango_layout_set_text(layout, utfForm, len); int i = 0; ! PangoLayoutIter *iter = pango_layout_get_iter(layout); ! pango_layout_iter_get_cluster_extents(iter, NULL, &pos); ! while (pango_layout_iter_next_cluster(iter)) { pango_layout_iter_get_cluster_extents(iter, NULL, &pos); positions[i++] = PANGO_PIXELS(pos.x); } + while (i < lenPositions) + positions[i++] = PANGO_PIXELS(pos.x + pos.width); pango_layout_iter_free(iter); if (useGFree) { *************** *** 1328,1331 **** --- 1348,1352 ---- delete []utfForm; } + PLATFORM_ASSERT(i == lenPositions); } } *************** *** 1464,1471 **** // This string contains a good range of characters to test for size. ! const char largeSizeString[] = "ÂÃÅÄ `~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890" ! "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; const char sizeString[] = "`~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890" "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; int SurfaceImpl::Ascent(Font &font_) { --- 1485,1494 ---- // This string contains a good range of characters to test for size. ! //const char largeSizeString[] = "ÂÃÅÄ `~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890" ! // "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; ! #ifndef FAST_WAY const char sizeString[] = "`~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890" "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + #endif int SurfaceImpl::Ascent(Font &font_) { *************** *** 1718,1722 **** } ! gdk_window_set_cursor(PWidget(id)->window, gdkCurs); gdk_cursor_destroy(gdkCurs); } --- 1741,1746 ---- } ! if (PWidget(id)->window) ! gdk_window_set_cursor(PWidget(id)->window, gdkCurs); gdk_cursor_destroy(gdkCurs); } *************** *** 1794,1800 **** } virtual void SetFont(Font &font); ! virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_); virtual void SetAverageCharWidth(int width); virtual void SetVisibleRows(int rows); virtual PRectangle GetDesiredRect(); virtual int CaretFromEdge(); --- 1818,1825 ---- } virtual void SetFont(Font &font); ! virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_); virtual void SetAverageCharWidth(int width); virtual void SetVisibleRows(int rows); + virtual int GetVisibleRows() const; virtual PRectangle GetDesiredRect(); virtual int CaretFromEdge(); *************** *** 1812,1815 **** --- 1837,1841 ---- doubleClickActionData = data; } + virtual void SetList(const char* list, char separator, char typesep); }; *************** *** 1842,1846 **** } ! void ListBoxX::Create(Window &, int, int, bool) { id = gtk_window_new(GTK_WINDOW_POPUP); --- 1868,1872 ---- } ! void ListBoxX::Create(Window &, int, Point, int, bool) { id = gtk_window_new(GTK_WINDOW_POPUP); *************** *** 1936,1939 **** --- 1962,1969 ---- } + int ListBoxX::GetVisibleRows() const { + return desiredVisibleRows; + } + PRectangle ListBoxX::GetDesiredRect() { // Before any size allocated pretend its 100 wide so not scrolled *************** *** 2280,2283 **** --- 2310,2343 ---- } + void ListBoxX::SetList(const char* list, char separator, char typesep) { + Clear(); + int count = strlen(list) + 1; + char *words = new char[count]; + if (words) { + memcpy(words, list, count); + char *startword = words; + char *numword = NULL; + int i = 0; + for (; words[i]; i++) { + if (words[i] == separator) { + words[i] = '\0'; + if (numword) + *numword = '\0'; + Append(startword, numword?atoi(numword + 1):-1); + startword = words + i + 1; + numword = NULL; + } else if (words[i] == typesep) { + numword = words + i; + } + } + if (startword) { + if (numword) + *numword = '\0'; + Append(startword, numword?atoi(numword + 1):-1); + } + delete []words; + } + } + Menu::Menu() : id(0) {} *************** *** 2307,2311 **** pt.y = screenHeight - requisition.height; } ! gtk_item_factory_popup(factory, pt.x - 4, pt.y, 3, 0); } --- 2367,2376 ---- pt.y = screenHeight - requisition.height; } ! #if GTK_MAJOR_VERSION >= 2 ! gtk_item_factory_popup(factory, pt.x - 4, pt.y - 4, 3, ! gtk_get_current_event_time()); ! #else ! gtk_item_factory_popup(factory, pt.x - 4, pt.y - 4, 3, 0); ! #endif } Index: makefile =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/gtk/makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile 22 Dec 2004 20:25:54 -0000 1.1 --- makefile 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 24,28 **** INCLUDEDIRS=-I ../include -I ../src ! CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) ifdef NOTHREADS --- 24,28 ---- INCLUDEDIRS=-I ../include -I ../src ! CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) ifdef NOTHREADS *************** *** 65,74 **** LEXOBJS=\ LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \ ! LexBullant.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o LexCSS.o LexEiffel.o \ ! LexErlang.o LexEScript.o LexForth.o LexFortran.o LexGui4Cli.o LexHTML.o \ ! LexKix.o LexLisp.o LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o \ ! LexMPT.o LexMSSQL.o LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \ ! LexPOV.o LexPS.o LexPython.o LexRuby.o LexScriptol.o LexSpecman.o LexSQL.o \ ! LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section --- 65,75 ---- LEXOBJS=\ LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \ ! LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \ ! LexCsound.o LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o \ ! LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o \ ! LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ ! LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \ ! LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \ ! LexSQL.o LexTADS3.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section Index: ScintillaGTK.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/gtk/ScintillaGTK.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaGTK.cxx 22 Dec 2004 20:25:53 -0000 1.1 --- ScintillaGTK.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 480,483 **** --- 480,484 ---- gtk_widget_unrealize(PWidget(wPreeditDraw)); g_object_unref(im_context); + im_context = NULL; #endif #endif *************** *** 586,599 **** gdk_im_begin(sciThis->ic, widget->window); #else ! gchar *str; ! gint cursor_pos; ! gtk_im_context_get_preedit_string(sciThis->im_context, &str, NULL, &cursor_pos); ! if (strlen(str) > 0){ ! gtk_widget_show(PWidget(sciThis->wPreedit)); ! } else{ ! gtk_widget_hide(PWidget(sciThis->wPreedit)); } - g_free(str); - gtk_im_context_focus_in(sciThis->im_context); #endif #endif --- 587,605 ---- gdk_im_begin(sciThis->ic, widget->window); #else ! if (sciThis->im_context != NULL) { ! gchar *str = NULL; ! gint cursor_pos; ! ! gtk_im_context_get_preedit_string(sciThis->im_context, &str, NULL, &cursor_pos); ! if (PWidget(sciThis->wPreedit) != NULL) { ! if (strlen(str) > 0) { ! gtk_widget_show(PWidget(sciThis->wPreedit)); ! } else { ! gtk_widget_hide(PWidget(sciThis->wPreedit)); ! } ! } ! g_free(str); ! gtk_im_context_focus_in(sciThis->im_context); } #endif #endif *************** *** 612,617 **** gdk_im_end(); #else ! gtk_widget_hide(PWidget(sciThis->wPreedit)); ! gtk_im_context_focus_out(sciThis->im_context); #endif #endif --- 618,625 ---- gdk_im_end(); #else ! if (PWidget(sciThis->wPreedit) != NULL) ! gtk_widget_hide(PWidget(sciThis->wPreedit)); ! if (sciThis->im_context != NULL) ! gtk_im_context_focus_out(sciThis->im_context); #endif #endif *************** *** 622,626 **** void ScintillaGTK::SizeRequest(GtkWidget *widget, GtkRequisition *requisition) { requisition->width = 600; ! requisition->height = 2000; ScintillaGTK *sciThis = ScintillaFromWidget(widget); GtkRequisition child_requisition; --- 630,634 ---- void ScintillaGTK::SizeRequest(GtkWidget *widget, GtkRequisition *requisition) { requisition->width = 600; ! requisition->height = gdk_screen_height(); ScintillaGTK *sciThis = ScintillaFromWidget(widget); GtkRequisition child_requisition; *************** *** 826,830 **** // Return the length of the result in bytes. int ScintillaGTK::EncodedFromUTF8(char *utf8, char *encoded) { ! int inputLength = lengthForEncode ? lengthForEncode : strlen(utf8); if (IsUnicodeMode()) { if (encoded) { --- 834,838 ---- // Return the length of the result in bytes. int ScintillaGTK::EncodedFromUTF8(char *utf8, char *encoded) { ! int inputLength = (lengthForEncode >= 0) ? lengthForEncode : strlen(utf8); if (IsUnicodeMode()) { if (encoded) { *************** *** 882,886 **** case SCI_ENCODEDFROMUTF8: ! return EncodedFromUTF8(reinterpret_cast<char*>(wParam), reinterpret_cast<char*>(lParam)); --- 890,894 ---- case SCI_ENCODEDFROMUTF8: ! return EncodedFromUTF8(reinterpret_cast<char*>(wParam), reinterpret_cast<char*>(lParam)); *************** *** 1052,1059 **** --- 1060,1069 ---- void ScintillaGTK::SetVerticalScrollPos() { + DwellEnd(true); gtk_adjustment_set_value(GTK_ADJUSTMENT(adjustmentv), topLine); } void ScintillaGTK::SetHorizontalScrollPos() { + DwellEnd(true); gtk_adjustment_set_value(GTK_ADJUSTMENT(adjustmenth), xOffset / 2); } *************** *** 1111,1115 **** void ScintillaGTK::NotifyKey(int key, int modifiers) { ! SCNotification scn; scn.nmhdr.code = SCN_KEY; scn.ch = key; --- 1121,1125 ---- void ScintillaGTK::NotifyKey(int key, int modifiers) { ! SCNotification scn = {0}; scn.nmhdr.code = SCN_KEY; scn.ch = key; *************** *** 1120,1124 **** void ScintillaGTK::NotifyURIDropped(const char *list) { ! SCNotification scn; scn.nmhdr.code = SCN_URIDROPPED; scn.text = list; --- 1130,1134 ---- void ScintillaGTK::NotifyURIDropped(const char *list) { ! SCNotification scn = {0}; scn.nmhdr.code = SCN_URIDROPPED; scn.text = list; *************** *** 1449,1456 **** pdoc->BeginUndoAction(); - int selStart = SelectionStart(); if (selection_data->selection != GDK_SELECTION_PRIMARY) { ClearSelection(); } if (selText.rectangular) { --- 1459,1466 ---- pdoc->BeginUndoAction(); if (selection_data->selection != GDK_SELECTION_PRIMARY) { ClearSelection(); } + int selStart = SelectionStart(); if (selText.rectangular) { *************** *** 2406,2411 **** extern void Platform_Finalise(); ! guint scintilla_get_type() { ! static guint scintilla_type = 0; if (!scintilla_type) { --- 2416,2421 ---- extern void Platform_Finalise(); ! GtkType scintilla_get_type() { ! static GtkType scintilla_type = 0; if (!scintilla_type) { Index: scintilla.mak =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/gtk/scintilla.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** scintilla.mak 22 Dec 2004 20:25:55 -0000 1.1 --- scintilla.mak 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 148,163 **** --- 148,168 ---- $(DIR_O)\LexBaan.obj \ $(DIR_O)\LexBash.obj \ + $(DIR_O)\LexBasic.obj \ $(DIR_O)\LexBullant.obj \ + $(DIR_O)\LexCaml.obj \ $(DIR_O)\LexCLW.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexCrontab.obj \ + $(DIR_O)\LexCsound.obj \ $(DIR_O)\LexCSS.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ $(DIR_O)\LexEScript.obj \ + $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ $(DIR_O)\LexGui4Cli.obj \ + $(DIR_O)\LexHaskell.obj \ $(DIR_O)\LexHTML.obj \ $(DIR_O)\LexKix.obj \ *************** *** 178,185 **** --- 183,193 ---- $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ + $(DIR_O)\LexSmalltalk.obj \ $(DIR_O)\LexSpecman.obj \ $(DIR_O)\LexSQL.obj \ + $(DIR_O)\LexTADS3.obj \ $(DIR_O)\LexTeX.obj \ $(DIR_O)\LexVB.obj \ *************** *** 319,324 **** --- 327,336 ---- $(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS) + $(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS) + $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) + $(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS) + $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) *************** *** 329,332 **** --- 341,346 ---- $(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS) + $(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS) + $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS) *************** *** 337,340 **** --- 351,356 ---- $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) + $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) + $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) *************** *** 343,346 **** --- 359,364 ---- $(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS) + $(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS) + $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS) *************** *** 379,390 **** --- 397,414 ---- $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) + $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS) + $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS) $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS) + $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS) |
|
From: Dirk B. <db...@us...> - 2005-09-03 10:13:22
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/vcbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/extsrc/w32fScintilla/vcbuild Modified Files: SciLexer.dsp Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: SciLexer.dsp =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/vcbuild/SciLexer.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SciLexer.dsp 23 Jan 2005 16:38:02 -0000 1.2 --- SciLexer.dsp 3 Sep 2005 10:13:13 -0000 1.3 *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SciLexer_EXPORTS" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MD /W3 /O1 /I "..\include" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SCI_LEXER" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SciLexer_EXPORTS" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MD /W3 /O1 /I "..\include" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 123,130 **** # Begin Source File - SOURCE=..\src\ExternalLexer.cxx - # End Source File - # Begin Source File - SOURCE=..\src\Indicator.cxx # End Source File --- 123,126 ---- |
|
From: Dirk B. <db...@us...> - 2005-09-03 10:13:21
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/extsrc/w32fScintilla/doc Modified Files: SciTEIco.png ScintillaDoc.html ScintillaDownload.html ScintillaHistory.html ScintillaRelated.html ScintillaToDo.html Steps.html index.html Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: index.html =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/doc/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.html 22 Dec 2004 20:25:38 -0000 1.1 --- index.html 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 10,14 **** <meta name="Description" content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." /> ! <meta name="Date.Modified" content="20041031" /> <style type="text/css"> .versionlist { --- 10,14 ---- <meta name="Description" content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." /> ! <meta name="Date.Modified" content="20050826" /> <style type="text/css"> .versionlist { *************** *** 37,42 **** </td> <td width="40%" align="right"> ! <font color="#FFCC99" size="3"> Release version 1.62<br /> ! Site last modified October 31 2004</font> </td> <td width="20%"> --- 37,42 ---- </td> <td width="40%" align="right"> ! <font color="#FFCC99" size="3"> Release version 1.66<br /> ! Site last modified August 26 2005</font> </td> <td width="20%"> *************** *** 55,94 **** <tr> <td width="100%"> ! <span class="versionlist"> Version 1.62 adds lexers for VHDL and ASN.1 and ! is more supportive of screen reader applications on Windows. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.61 improves selection handling on GTK+. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.60 includes continuation markers on wrapped lines. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.59 contains minor ! improvements and fixes including a partial retreat from GTK+ input ! method use for European languages. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.58 contains minor fixes.</span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.57 contains minor new features and ! bug fixes.</span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.56 adds rectangular selection from keyboard ! and fixes some problems with line wrapping.</span> </td> </tr> --- 55,94 ---- <tr> <td width="100%"> ! <span class="versionlist">Version 1.66 has a new Ruby lexer and fixes bugs on GTK+ ! with Pango 1.8.</span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist">Version 1.65 contains minor enhancements and bug fixes. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist">Version 1.64 supports ! TADS3, Smalltalk, Rebol, Flagship (Clipper / XBase), and CSound. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.63 improves autocompletion on Windows, ! can line wrap Asian languages better and adds lexers for BlitzBasic, Haskell, ! Objective Caml, and PureBasic. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.62 adds lexers for VHDL and ASN.1 and ! is more supportive of screen reader applications on Windows. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.61 improves selection handling on GTK+. </span> </td> </tr> <tr> <td width="100%"> ! <span class="versionlist"> Version 1.60 includes continuation markers on wrapped lines. </span> </td> </tr> *************** *** 172,175 **** --- 172,178 ---- </p> <p> + <a href="http://scintilla.sourceforge.net/Icons.html">Icons that can be used with Scintilla.</a> + </p> + <p> Questions and comments about Scintilla should be directed to the <a href="http://mailman.lyra.org/mailman/listinfo/scintilla-interest">scintilla-interest</a> Index: Steps.html =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/doc/Steps.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Steps.html 22 Dec 2004 20:25:38 -0000 1.1 --- Steps.html 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 31,35 **** hwndScintilla = CreateWindowEx(0, ! "Scintilla","", WS_CHILD|WS_VISIBLE|WS_TABSTOP, 10,10,500,400,hwndParent,(HMENU)GuiID, hInstance,NULL); </pre> --- 31,35 ---- hwndScintilla = CreateWindowEx(0, ! "Scintilla","", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPCHILDREN, 10,10,500,400,hwndParent,(HMENU)GuiID, hInstance,NULL); </pre> Index: ScintillaDownload.html =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/doc/ScintillaDownload.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaDownload.html 22 Dec 2004 20:25:38 -0000 1.1 --- ScintillaDownload.html 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 26,32 **** <tr> <td> ! <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla162.zip?download"> Windows</a> ! <a href="http://prdownloads.sourceforge.net/scintilla/scintilla162.tgz?download"> GTK+/Linux</a> </font> --- 26,32 ---- <tr> <td> ! <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla166.zip?download"> Windows</a> ! <a href="http://prdownloads.sourceforge.net/scintilla/scintilla166.tgz?download"> GTK+/Linux</a> </font> *************** *** 42,46 **** </p> <h3> ! Release 1.62 </h3> <h4> --- 42,46 ---- </p> <h3> ! Release 1.66 </h3> <h4> *************** *** 50,55 **** executable code and is available in <ul> ! <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla162.zip?download">zip format</a> (590K) commonly used on Windows</li> ! <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla162.tgz?download">tgz format</a> (500K) commonly used on Linux and compatible operating systems</li> </ul> Instructions for building on both Windows and Linux are included in the readme file. --- 50,55 ---- executable code and is available in <ul> ! <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla166.zip?download">zip format</a> (680K) commonly used on Windows</li> ! <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla166.tgz?download">tgz format</a> (570K) commonly used on Linux and compatible operating systems</li> </ul> Instructions for building on both Windows and Linux are included in the readme file. Index: ScintillaRelated.html =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/doc/ScintillaRelated.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaRelated.html 22 Dec 2004 20:25:38 -0000 1.1 --- ScintillaRelated.html 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 30,33 **** --- 30,43 ---- </h3> <p> + <a href="http://sourceforge.net/projects/jintilla/">Jintilla</a> + is a JNI wrapper that allows Scintilla to be used in Java with + both SWT and AWT. + </p> + <p> + <a href="http://delphisci.sourceforge.net/">Delphi Scintilla Interface Components</a> + is a FREE collection of components that makes it easy to use the + Scintilla source code editing control from within Delphi and C++ Builder. + </p> + <p> <a href="http://www.lehigh.edu/~jrl1/">wxStEdit</a> is a library and sample program that provides extra features over wxStyledTextControl. *************** *** 108,112 **** <h3> Projects using Scintilla ! </h3> <p> <a href="http://xined.sourceforge.net/"> --- 118,139 ---- <h3> Projects using Scintilla ! </h3> ! <p> ! <a href="http://notepad-plus.sourceforge.net/uk/site.htm"> ! Notepad++</a> is a free source code editor under Windows. ! </p> ! <p> ! <a href="http://gubed.mccabe.nu/"> ! Gubed</a> is a cross platform program to debug PHP scripts. ! </p> ! <p> ! <a href="http://www.lesser-software.com/lswdnl.htm"> ! LSW DotNet-Lab</a> is a development environment for the .NET platform. ! </p> ! <p> ! <a href="http://glintercept.nutty.org/"> ! GLIntercept</a> is an OpenGL function call interceptor that uses SciTE as a ! run-time shader editor. ! </p> <p> <a href="http://xined.sourceforge.net/"> *************** *** 187,191 **** </p> <p> ! <a href="http://www.capitalsoftware.it/radon/">RAD.On++</a> is a free C++ Rapid Application Developer for Win32. </p> --- 214,218 ---- </p> <p> ! <a href="http://www.codejoin.com/radon/">RAD.On++</a> is a free C++ Rapid Application Developer for Win32. </p> *************** *** 337,340 **** --- 364,372 ---- </h3> <p> + <a href="http://gtksourceview.sourceforge.net/index.html">GtkSourceView</a> + is a text widget that extends the standard GTK+ 2.x text widget and improves it + by implementing syntax highlighting and other features typical of a source editor. + </p> + <p> <a href="http://aeditor.rubyforge.org/">AEditor</a> is a free source code editing component implemented in Ruby. Index: SciTEIco.png =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/doc/SciTEIco.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsY5yms0 and /tmp/cvsJzPhwj differ Index: ScintillaHistory.html =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/doc/ScintillaHistory.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaHistory.html 22 Dec 2004 20:25:38 -0000 1.1 --- ScintillaHistory.html 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 1,3 **** ! <?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> *************** *** 6,10 **** <meta name="generator" content="HTML Tidy, see www.w3.org" /> <meta name="generator" content="SciTE" /> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <title> Scintilla and SciTE --- 6,10 ---- <meta name="generator" content="HTML Tidy, see www.w3.org" /> <meta name="generator" content="SciTE" /> ! <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title> Scintilla and SciTE *************** *** 57,61 **** <li>Paul Winwood</li> <li>Maxim Baranov</li> ! <li>Ragnar Højland</li> <li>Christian Obrecht</li> <li>Andreas Neukoetter</li> --- 57,61 ---- <li>Paul Winwood</li> <li>Maxim Baranov</li> ! <li>Ragnar Højland</li> <li>Christian Obrecht</li> <li>Andreas Neukoetter</li> *************** *** 79,83 **** <li>Edward K. Ream</li> <li>Valery Kondakoff</li> ! <li>Smári McCarthy</li> <li>Clemens Wyss</li> <li>Simon Steele</li> --- 79,83 ---- <li>Edward K. Ream</li> <li>Valery Kondakoff</li> ! <li>Smári McCarthy</li> <li>Clemens Wyss</li> <li>Simon Steele</li> *************** *** 95,99 **** <li>Martin Alderson</li> <li>Robert Gustavsson</li> ! <li>José Fonseca</li> <li>Holger Kiemes</li> <li>Francis Irving</li> --- 95,99 ---- <li>Martin Alderson</li> <li>Robert Gustavsson</li> ! <li>José Fonseca</li> <li>Holger Kiemes</li> <li>Francis Irving</li> *************** *** 114,118 **** <li>Ryan Christianson</li> <li>Martin Steffensen</li> ! <li>Jakub Vrána</li> <li>The Black Horus</li> <li>Bernd Kreuss</li> --- 114,118 ---- <li>Ryan Christianson</li> <li>Martin Steffensen</li> ! <li>Jakub Vrána</li> <li>The Black Horus</li> <li>Bernd Kreuss</li> *************** *** 137,142 **** <li>Denis Sureau</li> <li>Kaspar Schiess</li> ! <li>Christoph Hösler</li> ! <li>João Paulo F Farias</li> <li>Ron Schofield</li> <li>Stefan Wosnik</li> --- 137,142 ---- <li>Denis Sureau</li> <li>Kaspar Schiess</li> ! <li>Christoph Hösler</li> ! <li>João Paulo F Farias</li> <li>Ron Schofield</li> <li>Stefan Wosnik</li> *************** *** 181,184 **** --- 181,213 ---- <li>Phil Reid</li> <li>Iago Rubio</li> + <li>Régis Vaquette</li> + <li>Massimo Corà </li> + <li>Elias Pschernig</li> + <li>Chris Jones</li> + <li>Josiah Reynolds</li> + <li>Robert Roessler <a href="http://www.rftp.com">rftp.com</a></li> + <li>Steve Donovan</li> + <li>Jan Martin Pettersen</li> + <li>Sergey Philippov</li> + <li>Borujoa</li> + <li>Michael Owens</li> + <li>Franck Marcia</li> + <li>Massimo Maria Ghisalberti</li> + <li>Frank Wunderlich</li> + <li>Josepmaria Roca</li> + <li>Tobias Engvall</li> + <li>Suzumizaki Kimitaka</li> + <li>Michael Cartmell</li> + <li>Pascal Hurni</li> + <li>Andre</li> + <li>Randy Butler</li> + <li>Georg Ritter</li> + <li>Michael Goffioul</li> + <li>Ben Harper</li> + <li>Adam Strzelecki</li> + <li>Kamen Stanev</li> + <li>Steve Menard</li> + <li>Oliver Yeoh</li> + <li>Eric Promislow</li> </ul> <p> *************** *** 192,195 **** --- 221,671 ---- </ul> <h3> + <a href="http://prdownloads.sourceforge.net/scintilla/scite166.zip?download">Release 1.66</a> + </h3> + <ul> + <li> + Released on 26 August 2005. + </li> + <li> + New, more ambitious Ruby lexer. + </li> + <li> + SciTE Find in Files dialog has options for matching case and whole words which are + enabled when the internal find command is used. + </li> + <li> + SciTE output pane can display automatic completion after "$(" typed. + An initial ">" on a line is ignored when Enter pressed. + </li> + <li> + C++ lexer recognises keywords within line doc comments. It continues styles over line + end characters more consistently so that eolfilled style can be used for preprocessor lines + and line comments. + </li> + <li> + VB lexer improves handling of file numbers and date literals. + </li> + <li> + Lua folder handles repeat until, nested comments and nested strings. + </li> + <li> + POV lexer improves handling of comment lines. + </li> + <li> + AU3 lexer and folder updated. COMOBJ style added. + </li> + <li> + Bug fixed with text display on GTK+ with Pango 1.8. + </li> + <li> + Caret painting avoided when not focused. + </li> + <li> + SciTE on GTK+ handles file names used to reference properties as case-sensitive. + </li> + <li> + SciTE on GTK+ Save As and Export commands set the file name field. + On GTK+ the Export commands modify the file name in the same way as on Windows. + </li> + <li> + Fixed SciTE problem where confirmation was not displaying when closing a file where all + contents had been deleted. + </li> + <li> + Middle click on SciTE tab now closes correct buffer on Windows when tool bar is visible. + </li> + <li> + SciTE bugs fixed where files contained in directory that includes '.' character. + </li> + <li> + SciTE bug fixed where import in user options was reading file from directory of + global options. + </li> + <li> + SciTE calltip bug fixed where single line calltips had arrow displayed incorrectly. + </li> + <li> + SciTE folding bug fixed where empty lines were shown for no reason. + </li> + <li> + Bug fixed where 2 byte per pixel XPM images caused crash although they are still not + displayed. + </li> + <li> + Autocompletion list size tweaked. + </li> + </ul> + <h3> + <a href="http://prdownloads.sourceforge.net/scintilla/scite165.zip?download">Release 1.65</a> + </h3> + <ul> + <li> + Released on 1 August 2005. + </li> + <li> + FreeBasic support. + </li> + <li> + SciTE on Windows handles command line arguments + "-" (read standard input into buffer), + "--" (read standard input into output pane) and + "-@" (read file names from standard input and open each). + </li> + <li> + SciTE includes a simple implementation of Find in Files which is used if no find.command is set. + </li> + <li> + SciTE can close tabs with a mouse middle click. + </li> + <li> + SciTE includes a save.all.for.build setting. + </li> + <li> + Folder for MSSQL. + </li> + <li> + Batch file lexer understands more of the syntax and the behaviour of built in commands. + </li> + <li> + Perl lexer handles here docs better; disambiguates barewords, quote-like delimiters, and repetition operators; + handles Pods after __END__; recognises numbers better; and handles some typeglob special variables. + </li> + <li> + Lisp adds more lexical states. + </li> + <li> + PHP allows spaces after <<<. + </li> + <li> + TADS3 has a simpler set of states and recognizes identifiers. + </li> + <li> + Avenue elseif folds better. + </li> + <li> + Errorlist lexer treats lines starting with '+++' and '---' as separate + styles from '+' and '-' as they indicate file names in diffs. + </li> + <li> + SciTE error recogniser handles file paths in extra explanatory lines from MSVC + and in '+++' and '---' lines from diff. + </li> + <li> + Bugs fixed in SciTE and Scintilla folding behaviour when text pasted before + folded text caused unnecessary + unfolding and cutting text could lead to text being irretrievably hidden. + </li> + <li> + SciTE on Windows uses correct font for dialogs and better font for tab bar + allowing better localisation + </li> + <li> + When Windows is used with a secondary monitor before the primary + monitor, autocompletion lists are not forced onto the primary monitor. + </li> + <li> + Scintilla calltip bug fixed where down arrow setting wrong value in notification + if not in first line. SciTE bug fixed where second arrow only shown on multiple line + calltip and was therefore misinterpreting the notification value. + </li> + <li> + Lexers will no longer be re-entered recursively during, for example, fold level setting. + </li> + <li> + Undo of typing in overwrite mode undoes one character at a time rather than requiring a removal + and addition step for each character. + </li> + <li> + EM_EXSETSEL(0,-1) fixed. + </li> + <li> + Bug fixed where part of a rectangular selection was not shown as selected. + </li> + <li> + Autocomplete window size fixed. + </li> + </ul> + <h3> + <a href="http://prdownloads.sourceforge.net/scintilla/scite164.zip?download">Release 1.64</a> + </h3> + <ul> + <li> + Released on 6 June 2005. + </li> + <li> + TADS3 support + </li> + <li> + Smalltalk support. + </li> + <li> + Rebol support. + </li> + <li> + Flagship (Clipper / XBase) support. + </li> + <li> + CSound support. + </li> + <li> + SQL enhanced to support SQL*Plus. + </li> + <li> + SC_MARK_FULLRECT margin marker fills the whole marker margin for marked + lines with a colour. + </li> + <li> + Performance improved for some large undo and redo operations and modification flags + added in notifications. + </li> + <li> + SciTE adds command equivalents for fold margin mouse actions. + </li> + <li> + SciTE adds OnUpdateUI to set of events that can be handled by a Lua script. + </li> + <li> + Properties set in Scintilla can be read. + </li> + <li> + GTK+ SciTE exit confirmation adds Cancel button. + </li> + <li> + More accurate lexing of numbers in PHP and Caml. + </li> + <li> + Perl can fold POD and package sections. POD verbatim section style. + Globbing syntax recognized better. + </li> + <li> + Context menu moved slightly on GTK+ so that it will be under the mouse and will + stay open if just clicked rather than held. + </li> + <li> + Rectangular selection paste works the same whichever direction the selection was dragged in. + </li> + <li> + EncodedFromUTF8 handles -1 length argument as documented. + </li> + <li> + Undo and redo can cause SCN_MODIFYATTEMPTRO notifications. + </li> + <li> + Indicators display correctly when they start at the second character on a line. + </li> + <li> + SciTE Export As HTML uses standards compliant CSS. + </li> + <li> + SciTE automatic indentation handles keywords for indentation better. + </li> + <li> + SciTE fold.comment.python property removed as does not work. + </li> + <li> + Fixed problem with character set conversion when pasting on GTK+. + </li> + <li> + SciTE default character set changed from ANSI_CHARSET to DEFAULT_CHARSET. + </li> + <li> + Fixed crash when creating empty autocompletion list. + </li> + <li> + Autocomplete window size made larger under some conditions to make truncation less common. + </li> + <li> + Bug fixed where changing case of a selection did not affect initial character of lines + in multi-byte encodings. + </li> + <li> + Bug fixed where rectangular selection not displayed after Alt+Shift+Click. + </li> + </ul> + <h3> + <a href="http://prdownloads.sourceforge.net/scintilla/scite163.zip?download">Release 1.63</a> + </h3> + <ul> + <li> + Released on 4 April 2005. + </li> + <li> + Autocompletion on Windows changed to use popup window, be faster, + allow choice of maximum width and height, and to highlight only the text of the + selected item rather than both the text and icon if any. + </li> + <li> + Extra items can be added to the context menu in SciTE. + </li> + <li> + Character wrap mode in Scintilla helps East Asian languages. + </li> + <li> + Lexer added for Haskell. + </li> + <li> + Objective Caml support. + </li> + <li> + BlitzBasic and PureBasic support. + </li> + <li> + CSS support updated to handle CSS2. + </li> + <li> + C++ lexer is more selective about document comment keywords. + </li> + <li> + AutoIt 3 lexer improved. + </li> + <li> + Lua lexer styles end of line characters on comment and preprocessor + lines so that the eolfilled style can be applied to them. + </li> + <li> + NSIS support updated for line continuations, box comments, SectionGroup and + PageEx, and with more up-to-date properties. + </li> + <li> + Clarion lexer updated to perform folding and have more styles. + </li> + <li> + SQL lexer gains second set of keywords. + </li> + <li> + Errorlist lexer recognises Borland Delphi error messages. + </li> + <li> + Method added for determining number of visual lines occupied by a document + line due to wrapping. + </li> + <li> + Sticky caret mode does not modify the preferred caret x position when typing + and may be useful for typing columns of text. + </li> + <li> + Dwell end notification sent when scroll occurs. + </li> + <li> + On GTK+, Scintilla requisition height is screen height rather than large fixed value. + </li> + <li> + Case insensitive autocompletion prefers exact case match. + </li> + <li> + SCI_PARADOWN and SCI_PARAUP treat lines containing only white + space as empty and handle text hidden by folding. + </li> + <li> + Scintilla on Windows supports WM_PRINTCLIENT although there are some + limitations. + </li> + <li> + SCN_AUTOCSELECTION notification sent when user selects from autoselection list. + </li> + <li> + SciTE's standard properties file sets buffers to 10, uses Pango fonts on GTK+ and + has dropped several languages to make the menu fit on screen. + </li> + <li> + SciTE's encoding cookie detection loosened so that common XML files will load + in UTF-8 if that is their declared encoding. + </li> + <li> + SciTE on GTK+ changes menus and toolbars to not be detachable unless turned + on with a property. Menus no longer tear off. The toolbar may be set to use the + default theme icons rather than SciTE's set. Changed key for View | End of Line + because of a conflict. Language menu can contain more items. + </li> + <li> + SciTE on GTK+ 2.x allows the height and width of the file open file chooser to + be set, for the show hidden files check box to be set from an option and for it + to be opened in the directory of the current file explicitly. Enter key works in + save chooser. + </li> + <li> + Scintilla lexers should no longer see bits in style bytes that are outside the set + they modify so should be able to correctly lex documents where the container + has used indicators. + </li> + <li> + SciTE no longer asks to save before performing a revert. + </li> + <li> + SciTE director interface adds a reloadproperties command to reload properties + from files. + </li> + <li> + Allow build on CYGWIN platform. + </li> + <li> + Allow use from LccWin compiler. + </li> + <li> + SCI_COLOURISE for SCLEX_CONTAINER causes a + SCN_STYLENEEDED notification. + </li> + <li> + Bugs fixed in lexing of HTML/ASP/JScript. + </li> + <li> + Fix for folding becoming confused. + </li> + <li> + On Windows, fixes for Japanese Input Method Editor and for 8 bit Katakana + characters. + </li> + <li> + Fixed buffer size bug avoided when typing long words by making buffer bigger. + </li> + <li> + Undo after automatic indentation more sensible. + </li> + <li> + SciTE menus on GTK+ uses Shift and Ctrl rather than old style abbreviations. + </li> + <li> + SciTE full screen mode on Windows calculates size more correctly. + </li> + <li> + SciTE on Windows menus work better with skinning applications. + </li> + <li> + Searching bugs fixed. + </li> + <li> + Colours reallocated when changing image using SCI_REGISTERIMAGE. + </li> + <li> + Caret stays visible when Enter held down. + </li> + <li> + Undo of automatic indentation more reasonable. + </li> + <li> + High processor usage fixed in background wrapping under some + circumstances. + </li> + <li> + Crashing bug fixed on AMD64. + </li> + <li> + SciTE crashing bug fixed when position.height or position.width not set. + </li> + <li> + Crashing bug on GTK+ fixed when setting cursor and window is NULL. + </li> + <li> + Crashing bug on GTK+ preedit window fixed. + </li> + <li> + SciTE crashing bug fixed in incremental search on Windows ME. + </li> + <li> + SciTE on Windows has a optional find and replace dialogs that can search through + all buffers and search within a particular style number. + </li> + </ul> + <h3> <a href="http://prdownloads.sourceforge.net/scintilla/scite162.zip?download">Release 1.62</a> </h3> *************** *** 217,221 **** </li> <li> ! SciTE calltips allow setting the characters used to start and end parameter lists and to separate parameters. </li> --- 693,697 ---- </li> <li> ! SciTE calltips allow setting the characters used to start and end parameter lists and to separate parameters. </li> *************** *** 226,257 **** <li> On Windows, when Scintilla copies text to the clipboard as Unicode, it avoids ! adding an ANSI copy as the system will automatically convert as required in a context-sensitive manner. </li> <li> ! SciTE indent.auto setting automatically determines indent.size and use.tabs from document contents. </li> <li> ! SciTE defines a CurrentMessage property that holds the most recently selected output pane message. </li> <li> ! SciTE Lua scripting enhanced with <ul> ! <li>A Lua table called 'buffer' is associated with each buffer and can be used to maintain buffer-specific state.</li> ! <li>A 'scite' object allows interaction with the application such as opening files from script.</li> ! <li>Dynamic properties can be reset by assigning nil to a given key in the props table.</li> ! <li>An 'OnClear' event fires whenever properties and extension scripts are about to be reloaded.</li> ! <li>On Windows, loadlib is enabled and can be used to access Lua binary modules / DLLs.</li></ul> </li> <li> ! SciTE Find in Files on Windows can be used in a modeless way and gains a '..' ! button to move up to the parent directory. It is also wider so that longer paths can be seen. </li> --- 702,733 ---- <li> On Windows, when Scintilla copies text to the clipboard as Unicode, it avoids ! adding an ANSI copy as the system will automatically convert as required in a context-sensitive manner. </li> <li> ! SciTE indent.auto setting automatically determines indent.size and use.tabs from document contents. </li> <li> ! SciTE defines a CurrentMessage property that holds the most recently selected output pane message. </li> <li> ! SciTE Lua scripting enhanced with <ul> ! <li>A Lua table called 'buffer' is associated with each buffer and can be used to maintain buffer-specific state.</li> ! <li>A 'scite' object allows interaction with the application such as opening files from script.</li> ! <li>Dynamic properties can be reset by assigning nil to a given key in the props table.</li> ! <li>An 'OnClear' event fires whenever properties and extension scripts are about to be reloaded.</li> ! <li>On Windows, loadlib is enabled and can be used to access Lua binary modules / DLLs.</li></ul> </li> <li> ! SciTE Find in Files on Windows can be used in a modeless way and gains a '..' ! button to move up to the parent directory. It is also wider so that longer paths can be seen. </li> *************** *** 263,267 **** </li> <li> ! SciTE use.monospaced setting removed. More information in the <a href="SciTEFAQ.html">FAQ</a>. </li> --- 739,743 ---- </li> <li> ! SciTE use.monospaced setting removed. More information in the <a href="SciTEFAQ.html">FAQ</a>. </li> *************** *** 276,280 **** </li> <li> ! Cpp lexer now only matches exactly three slashes as starting a doc-comment so that lines of slashes are seen as a normal comment. Line ending characters are appear in default style on preprocessor and single line --- 752,756 ---- </li> <li> ! Cpp lexer now only matches exactly three slashes as starting a doc-comment so that lines of slashes are seen as a normal comment. Line ending characters are appear in default style on preprocessor and single line *************** *** 303,307 **** </li> <li> ! Properties file folder changed to leave lines before a header at the base level and thus avoid a vertical line when using connected folding symbols. </li> --- 779,783 ---- </li> <li> ! Properties file folder changed to leave lines before a header at the base level and thus avoid a vertical line when using connected folding symbols. </li> *************** *** 332,336 **** </li> <li> ! SciTE thread synchronization for scripts no longer uses HWND_MESSAGE so is compatible with older versions of Windows. Other Lua scripting bugs fixed. --- 808,812 ---- </li> <li> ! SciTE thread synchronization for scripts no longer uses HWND_MESSAGE so is compatible with older versions of Windows. Other Lua scripting bugs fixed. *************** *** 341,353 **** </li> <li> ! SciTE on Windows full screen mode now fits better when menu different height to title bar height. </li> <li> ! SC_MARK_EMPTY marker is now invisible and does not change the background colour. </li> <li> ! Bug fixed in HTML lexer to allow use of <?xml in strings in scripts without triggering xml mode. </li> --- 817,829 ---- </li> <li> ! SciTE on Windows full screen mode now fits better when menu different height to title bar height. </li> <li> ! SC_MARK_EMPTY marker is now invisible and does not change the background colour. </li> <li> ! Bug fixed in HTML lexer to allow use of <?xml in strings in scripts without triggering xml mode. </li> *************** *** 356,360 **** </li> <li> ! Bug fixed when searching for a whole word string that ends one character before end of document. </li> --- 832,836 ---- </li> <li> ! Bug fixed when searching for a whole word string that ends one character before end of document. </li> *************** *** 382,394 **** </li> <li> ! Bugs fixed where calltips with unicode or other non-ASCII text would display incorrectly. </li> <li> ! Bug fixed in determining if at save point after undoing from save point and then performing changes. </li> <li> ! Bug fixed on GTK+ using unsupported code pages where extraneous text could be drawn. </li> --- 858,870 ---- </li> <li> ! Bugs fixed where calltips with unicode or other non-ASCII text would display incorrectly. </li> <li> ! Bug fixed in determining if at save point after undoing from save point and then performing changes. </li> <li> ! Bug fixed on GTK+ using unsupported code pages where extraneous text could be drawn. </li> *************** *** 404,408 **** </li> <li> ! SciTE crashing bug fixed when both Find and Replace dialogs shown by disallowing this situation. </li> --- 880,884 ---- </li> <li> ! SciTE crashing bug fixed when both Find and Replace dialogs shown by disallowing this situation. </li> *************** *** 420,424 **** <li> SciTE on GTK+ 2.4 uses the improved file chooser which allows ! file extension filters, multiple selection, and remembers favourite directories. </li> --- 896,900 ---- <li> SciTE on GTK+ 2.4 uses the improved file chooser which allows ! file extension filters, multiple selection, and remembers favourite directories. </li> *************** *** 462,466 **** </li> <li> ! SciTE Lua scripting bugs fixed included a crashing bug when using an undefined function name that would go before first actual name. </li> --- 938,942 ---- </li> <li> ! SciTE Lua scripting bugs fixed included a crashing bug when using an undefined function name that would go before first actual name. </li> Index: ScintillaDoc.html =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/doc/ScintillaDoc.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaDoc.html 22 Dec 2004 20:25:38 -0000 1.1 --- ScintillaDoc.html 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 39,43 **** <h1>Scintilla Documentation</h1> ! <p>Last edited 29/May/2004 NH</p> <p>There is <a class="jump" href="Design.html">an overview of the internal design of --- 39,43 ---- <h1>Scintilla Documentation</h1> ! <p>Last edited 31/July/2005 RBR</p> <p>There is <a class="jump" href="Design.html">an overview of the internal design of *************** *** 311,314 **** --- 311,317 ---- <a class="message" href="#SCI_SETSTYLEBITS">SCI_SETSTYLEBITS(int bits)</a><br /> <a class="message" href="#SCI_GETSTYLEBITS">SCI_GETSTYLEBITS</a><br /> + <a class="message" href="#SCI_TARGETASUTF8">SCI_TARGETASUTF8(<unused>, char *s)</a><br /> + <a class="message" href="#SCI_ENCODEDFROMUTF8">SCI_ENCODEDFROMUTF8(const char *utf8, char *encoded)</a><br /> + <a class="message" href="#SCI_SETLENGTHFORENCODE">SCI_SETLENGTHFORENCODE(int bytes)</a><br /> </code> *************** *** 427,432 **** <p><b id="SCI_INSERTTEXT">SCI_INSERTTEXT(int pos, const char *text)</b><br /> This inserts the zero terminated <code>text</code> string at position <code>pos</code> or at ! the current position if <code>pos</code> is -1. The current position is set at the end of the ! inserted text, but it is not scrolled into view.</p> <p><b id="SCI_CLEARALL">SCI_CLEARALL</b><br /> --- 430,435 ---- <p><b id="SCI_INSERTTEXT">SCI_INSERTTEXT(int pos, const char *text)</b><br /> This inserts the zero terminated <code>text</code> string at position <code>pos</code> or at ! the current position if <code>pos</code> is -1. If the current position is after the insertion point ! then it is moved along with its surrounding text but no scrolling is performed.</p> <p><b id="SCI_CLEARALL">SCI_CLEARALL</b><br /> *************** *** 468,471 **** --- 471,493 ---- </pre> + <h3 id="EncodedAccess">GTK+-specific: Access to encoded text</h3> + + <p><b id="SCI_TARGETASUTF8">SCI_TARGETASUTF8(<unused>, char *s)</b><br /> + This method retrieves the value of the target encoded as UTF-8 which is the default + encoding of GTK+ so is useful for retrieving text for use in other parts of the user interface, + such as find and replace dialogs. The length of the encoded text in bytes is returned. + </p> + + <p><b id="SCI_ENCODEDFROMUTF8">SCI_ENCODEDFROMUTF8(const char *utf8, char *encoded)</b><br /> + <b id="SCI_SETLENGTHFORENCODE">SCI_SETLENGTHFORENCODE(int bytes)</b><br /> + <code>SCI_ENCODEDFROMUTF8</code> converts a UTF-8 string into the document's + encoding which is useful for taking the results of a find dialog, for example, and receiving + a string of bytes that can be searched for in the document. Since the text can contain nul bytes, + the <code>SCI_SETLENGTHFORENCODE</code> method can be used to set the + length that will be converted. If set to -1, the length is determined by finding a nul byte. + The length of the converted string is returned. + </p> + + <h2 id="Searching">Searching</h2> <code><a class="message" href="#SCI_FINDTEXT">SCI_FINDTEXT(int flags, TextToFind *************** *** 787,790 **** --- 809,816 ---- unless the document is read-only.</p> + <p>On X, the clipboard is asynchronous and may require several messages between + the destination and source applications. Data from SCI_PASTE will not arrive in the + document immediately.</p> + <b id="SCI_COPYRANGE">SCI_COPYRANGE(int start, int end)</b><br /> <b id="SCI_COPYTEXT">SCI_COPYTEXT(int length, const char *text)</b><br /> *************** *** 911,915 **** <a class="message" href="#SCI_GETCURLINE">SCI_GETCURLINE(int textLen, char *text)</a><br /> <a class="message" href="#SCI_SELECTIONISRECTANGLE">SCI_SELECTIONISRECTANGLE</a><br /> ! <a class="message" href="#SCI_SETSELECTIONMODE">SCI_SETSELECTIONMODE</a><br /> <a class="message" href="#SCI_GETSELECTIONMODE">SCI_GETSELECTIONMODE</a><br /> <a class="message" href="#SCI_GETLINESELSTARTPOSITION">SCI_GETLINESELSTARTPOSITION(int line)</a><br /> --- 937,941 ---- <a class="message" href="#SCI_GETCURLINE">SCI_GETCURLINE(int textLen, char *text)</a><br /> <a class="message" href="#SCI_SELECTIONISRECTANGLE">SCI_SELECTIONISRECTANGLE</a><br /> ! <a class="message" href="#SCI_SETSELECTIONMODE">SCI_SETSELECTIONMODE(int mode)</a><br /> <a class="message" href="#SCI_GETSELECTIONMODE">SCI_GETSELECTIONMODE</a><br /> <a class="message" href="#SCI_GETLINESELSTARTPOSITION">SCI_GETLINESELSTARTPOSITION(int line)</a><br /> *************** *** 1055,1064 **** <p><b id="SCI_GETLINEENDPOSITION">SCI_GETLINEENDPOSITION(int line)</b><br /> ! This returns the position at the end of the line, before any line end characters. If ! <code>line</code> is negative, the result is 0. If <code>line</code> is the last line in the ! document, (which does not have any end of line characters), the result is the size of the ! document. If <code>line</code> is negative, the result is -1. If <code>line</code> is >= ! <code>SCI_GETLINECOUNT()</code>, the result is currently <code>SCI_GETLENGTH()-1</code>... ! (undefined?).</p> <p><b id="SCI_LINELENGTH">SCI_LINELENGTH(int line)</b><br /> --- 1081,1088 ---- <p><b id="SCI_GETLINEENDPOSITION">SCI_GETLINEENDPOSITION(int line)</b><br /> ! This returns the position at the end of the line, before any line end characters. If <code>line</code> ! is the last line in the document (which does not have any end of line characters), the result is the size of the ! document. If <code>line</code> is negative or <code>line</code> >= <a class="message" ! href="#SCI_GETLINECOUNT"><code>SCI_GETLINECOUNT()</code></a>, the result is undefined.</p> <p><b id="SCI_LINELENGTH">SCI_LINELENGTH(int line)</b><br /> *************** *** 1097,1106 **** This returns 1 if the current selection is in rectangle mode, 0 if not.</p> ! <p><b id="SCI_SETSELECTIONMODE">SCI_SETSELECTIONMODE</b><br /> <b id="SCI_GETSELECTIONMODE">SCI_GETSELECTIONMODE</b><br /> The two functions set and get the selection mode, which can be ! stream (<code>SC_SEL_STREAM</code>=1) or ! rectangular (<code>SC_SEL_RECTANGLE</code>=2) ! or by lines (<code>SC_SEL_LINES</code>=3). When set in these modes, regular caret moves will extend or reduce the selection, until the mode is cancelled by a call with same value or with <code>SCI_CANCEL</code>. --- 1121,1130 ---- This returns 1 if the current selection is in rectangle mode, 0 if not.</p> ! <p><b id="SCI_SETSELECTIONMODE">SCI_SETSELECTIONMODE(int mode)</b><br /> <b id="SCI_GETSELECTIONMODE">SCI_GETSELECTIONMODE</b><br /> The two functions set and get the selection mode, which can be ! stream (<code>SC_SEL_STREAM</code>=0) or ! rectangular (<code>SC_SEL_RECTANGLE</code>=1) ! or by lines (<code>SC_SEL_LINES</code>=2). When set in these modes, regular caret moves will extend or reduce the selection, until the mode is cancelled by a call with same value or with <code>SCI_CANCEL</code>. *************** *** 1988,1992 **** strings in Russian would display correctly in C and C++ (<code>SCE_C_STRING</code> is the style number used by the C and C++ lexer to display literal strings; it has the value 6). This ! feature currently only works fully on Windows.</p> <p>The character sets supported on Windows are:<br /> --- 2012,2016 ---- strings in Russian would display correctly in C and C++ (<code>SCE_C_STRING</code> is the style number used by the C and C++ lexer to display literal strings; it has the value 6). This ! feature works differently on Windows and GTK+.</p> <p>The character sets supported on Windows are:<br /> *************** *** 1996,2006 **** <code>SC_CHARSET_GREEK</code>, <code>SC_CHARSET_HANGUL</code>, <code>SC_CHARSET_HEBREW</code>, <code>SC_CHARSET_JOHAB</code>, <code>SC_CHARSET_MAC</code>, <code>SC_CHARSET_OEM</code>, <code>SC_CHARSET_SHIFTJIS</code>, <code>SC_CHARSET_SYMBOL</code>, <code>SC_CHARSET_THAI</code>, <code>SC_CHARSET_TURKISH</code>, and <code>SC_CHARSET_VIETNAMESE</code>.</p> <p>The character sets supported on GTK+ are:<br /> ! <code>SC_CHARSET_ANSI</code>, <code>SC_CHARSET_EASTEUROPE</code>, ! <code>SC_CHARSET_GB2312</code>, <code>SC_CHARSET_HANGUL</code>, and ! <code>SC_CHARSET_SHIFTJIS</code>.</p> <p><b id="SCI_STYLESETCASE">SCI_STYLESETCASE(int styleNumber, int caseMode)</b><br /> --- 2020,2033 ---- <code>SC_CHARSET_GREEK</code>, <code>SC_CHARSET_HANGUL</code>, <code>SC_CHARSET_HEBREW</code>, <code>SC_CHARSET_JOHAB</code>, <code>SC_CHARSET_MAC</code>, <code>SC_CHARSET_OEM</code>, + <code>SC_CHARSET_RUSSIAN</code> (code page 1251), <code>SC_CHARSET_SHIFTJIS</code>, <code>SC_CHARSET_SYMBOL</code>, <code>SC_CHARSET_THAI</code>, <code>SC_CHARSET_TURKISH</code>, and <code>SC_CHARSET_VIETNAMESE</code>.</p> <p>The character sets supported on GTK+ are:<br /> ! <code>SC_CHARSET_ANSI</code>, <code>SC_CHARSET_CYRILLIC</code> (code page 1251), ! <code>SC_CHARSET_EASTEUROPE</code>, ! <code>SC_CHARSET_GB2312</code>, <code>SC_CHARSET_HANGUL</code>, ! <code>SC_CHARSET_RUSSIAN</code> (KOI8-R), <code>SC_CHARSET_SHIFTJIS</code>, and ! <code>SC_CHARSET_8859_15</code>.</p> <p><b id="SCI_STYLESETCASE">SCI_STYLESETCASE(int styleNumber, int caseMode)</b><br /> *************** *** 2062,2065 **** --- 2089,2095 ---- symbol)</a><br /> <a class="message" href="#SCI_GETCONTROLCHARSYMBOL">SCI_GETCONTROLCHARSYMBOL</a><br /> + <a class="message" href="#SCI_SETCARETSTICKY">SCI_SETCARETSTICKY</a><br /> + <a class="message" href="#SCI_GETCARETSTICKY">SCI_GETCARETSTICKY</a><br /> + <a class="message" href="#SCI_TOGGLECARETSTICKY">SCI_TOGGLECARETSTICKY</a><br /> </code> *************** *** 2131,2134 **** --- 2161,2171 ---- The default symbol value is 0.</p> + <p><b id="SCI_SETCARETSTICKY">SCI_SETCARETSTICKY(bool useCaretStickyBehaviour)</b><br /> + <b id="SCI_GETCARETSTICKY">SCI_GETCARETSTICKY</b><br /> + <b id="SCI_TOGGLECARETSTICKY">SCI_TOGGLECARETSTICKY</b><br /> + These messages set, get or toggle the caretSticky flag which controls when the last position + of the caret on the line is saved. When set to true, the position is not saved when you type + a character, a tab, paste the clipboard content or press backspace.</p> + <h2 id="Margins">Margins</h2> *************** *** 2320,2325 **** are drawn separately leading to visual glitches. Bi-directional text is not supported.</p> ! <p>On Windows, code page can be set to 932 (Japanese Shift-JIS), 936 (Simplified Chinese GBK), ! 949 (Korean), and 950 (Traditional Chinese Big5) although these may require installation of language specific support.</p> --- 2357,2362 ---- are drawn separately leading to visual glitches. Bi-directional text is not supported.</p> ! <p>On Windows, code page can be set to 932 (Japanese Shift-JIS), 936 (Simplified Chinese GBK), ! 949 (Korean), and 950 (Traditional Chinese Big5) although these may require installation of language specific support.</p> *************** *** 2548,2553 **** <code>SC_MARK_SMALLRECT</code>, <code>SC_MARK_SHORTARROW</code>, <code>SC_MARK_EMPTY</code>, <code>SC_MARK_ARROWDOWN</code>, <code>SC_MARK_MINUS</code>, <code>SC_MARK_PLUS</code>, ! <code>SC_MARK_ARROWS</code>, <code>SC_MARK_DOTDOTDOT</code>, <code>SC_MARK_EMPTY</code> and ! <code>SC_MARK_BACKGROUND</code>.</p> <p><b id="SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber, const char --- 2585,2590 ---- <code>SC_MARK_SMALLRECT</code>, <code>SC_MARK_SHORTARROW</code>, <code>SC_MARK_EMPTY</code>, <code>SC_MARK_ARROWDOWN</code>, <code>SC_MARK_MINUS</code>, <code>SC_MARK_PLUS</code>, ! <code>SC_MARK_ARROWS</code>, <code>SC_MARK_DOTDOTDOT</code>, <code>SC_MARK_EMPTY</code>, ! <code>SC_MARK_BACKGROUND</code> and <code>SC_MARK_FULLRECT</code>.</p> <p><b id="SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber, const char *************** *** 2559,2562 **** --- 2596,2600 ---- <p>The <code>SC_MARK_BACKGROUND</code> marker changes the background colour of the line only. + The <code>SC_MARK_FULLRECT</code> symbol mirrors this, changing only the margin background colour. The <code>SC_MARK_EMPTY</code> symbol is invisible, allowing client code to track the movement of lines. You would also use it if you changed the folding style and wanted one or more of the *************** *** 2761,2764 **** --- 2799,2811 ---- and <a class="message" href="#SCI_SETSTYLING"><code>SCI_SETSTYLING</code></a> with the values <code>INDIC0_MASK</code>, <code>INDIC1_MASK</code> and <code>INDIC2_MASK</code>.</p> + + <p>If you are using indicators in a buffer that has a lexer active + (see <a class="message" href="#SCI_SETLEXER"><code>SCI_SETLEXER</code></a>), + you must save lexing state information before setting any indicators and restore it afterwards. + Use <a class="message" href="#SCI_GETENDSTYLED"><code>SCI_GETENDSTYLED</code></a> + to retrieve the current "styled to" position and + <a class="message" href="#SCI_STARTSTYLING"><code>SCI_STARTSTYLING</code></a> + to reset the styling position and mask (<code>0x1f </code> in the default layout of 5 style bits and 3 indicator bits) + when you are done.</p> <p>The number of bits used for styles can be altered with <a class="message" *************** *** 2873,2877 **** <h2 id="Autocompletion">Autocompletion</h2> ! <p>Autocompletion displays a list box showing likely identifiers based upon the users typing. The user chooses the currently selected item by pressing the tab character or another character that is a member of the fillup character set defined with <code>SCI_AUTOCSETFILLUPS</code>. --- 2920,2924 ---- <h2 id="Autocompletion">Autocompletion</h2> ! <p>Autocompletion displays a list box showing likely identifiers based upon the user's typing. The user chooses the currently selected item by pressing the tab character or another character that is a member of the fillup character set defined with <code>SCI_AUTOCSETFILLUPS</code>. *************** *** 2883,2886 **** --- 2930,2939 ---- activate the list.</p> + <p>When the user makes a selection from the list the container is sent a <code><a class="message" + href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a></code> <a class="jump" + href="#Notifications">notification message</a>. On return from the notification Scintilla will insert + the selected text unless the autocompletion list has been cancelled, for example by the container sending + <code><a class="message" href="#SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</a></code>.</p> + <p>To make use of autocompletion you must monitor each character added to the document. See <code>SciTEBase::CharAdded()</code> in SciTEBase.cxx for an example of autocompletion.</p> *************** *** 2919,2922 **** --- 2972,2979 ---- <a class="message" href="#SCI_AUTOCSETTYPESEPARATOR">SCI_AUTOCSETTYPESEPARATOR(char separatorCharacter)</a><br /> <a class="message" href="#SCI_AUTOCGETTYPESEPARATOR">SCI_AUTOCGETTYPESEPARATOR</a><br /> + <a class="message" href="#SCI_AUTOCSETMAXHEIGHT">SCI_AUTOCSETMAXHEIGHT(int rowCount)</a><br /> + <a class="message" href="#SCI_AUTOCGETMAXHEIGHT">SCI_AUTOCGETMAXHEIGHT</a><br /> + <a class="message" href="#SCI_AUTOCSETMAXWIDTH">SCI_AUTOCSETMAXWIDTH(int characterCount)</a><br /> + <a class="message" href="#SCI_AUTOCGETMAXWIDTH">SCI_AUTOCGETMAXWIDTH</a><br /> </code> *************** *** 3028,3031 **** --- 3085,3105 ---- </p> + <p> + <b id="SCI_AUTOCSETMAXHEIGHT">SCI_AUTOCSETMAXHEIGHT(int rowCount)</b><br /> + <b id="SCI_AUTOCGETMAXHEIGHT">SCI_AUTOCGETMAXHEIGHT</b><br /> + + Get or set the maximum number of rows that will be visible in an autocompletion list. If there are more rows in the list, then a vertical + scrollbar is shown. The default is 5. + </p> + + <p> + <b id="SCI_AUTOCSETMAXWIDTH">SCI_AUTOCSETMAX(int characterCount)</b><br /> + <b id="SCI_AUTOCGETMAXWIDTH">SCI_AUTOCGETMAX</b><br /> + + Get or set the maximum width of an autocompletion list expressed as the number of characters in the longest item that will be totally visible. + If zero (the default) then the list's width is calculated to fit the item with the most characters. Any items that cannot be fully displayed within + the available width are indicated by the presence of ellipsis. + </p> + <h2 id="UserLists">User lists</h2> *************** *** 3039,3043 **** o When the user makes a selection you are sent a <code><a class="message" href="#SCN_USERLISTSELECTION">SCN_USERLISTSELECTION</a></code> <a class="jump" ! href="#Notifications">notification message</a>.</p> <p>BEWARE: if you have set fillup characters or stop characters, these will still be active --- 3113,3118 ---- o When the user makes a selection you are sent a <code><a class="message" href="#SCN_USERLISTSELECTION">SCN_USERLISTSELECTION</a></code> <a class="jump" ! href="#Notifications">notification message</a> rather than <code><a class="message" ! href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a></code>.</p> <p>BEWARE: if you have set fillup characters or stop characters, these will still be active *************** *** 3583,3591 **** <b id="SCI_GETPRINTWRAPMODE">SCI_GETPRINTWRAPMODE</b><br /> These two functions get and set the printer wrap mode. <code>wrapMode</code> can be ! set to <code>SC_WRAP_NONE</code> (0) or <code>SC_WRAP_WORD</code> (1). The default is <code>SC_WRAP_WORD</code>, which wraps printed output so that all characters fit into the print rectangle. If you set <code>SC_WRAP_NONE</code>, each line of text generates one line of output and the line is truncated if it is too long to fit ! into the print area.</p> <h2 id="DirectAccess">Direct access</h2> --- 3658,3672 ---- <b id="SCI_GETPRINTWRAPMODE">SCI_GETPRINTWRAPMODE</b><br /> These two functions get and set the printer wrap mode. <code>wrapMode</code> can be ! set to <code>SC_WRAP_NONE</code> (0), <code>SC_WRAP_WORD</code> (1) or ! <code>SC_WRAP_CHAR</code> (2). The default is <code>SC_WRAP_WORD</code>, which wraps printed output so that all characters fit into the print rectangle. If you set <code>SC_WRAP_NONE</code>, each line of text generates one line of output and the line is truncated if it is too long to fit ! into the print area.<br /> ! <code>SC_WRAP_WORD</code> tries to wrap only between words as indicated by ! white space or style changes although if a word is longer than a line, it will be wrapped before ! the line end. <code>SC_WRAP_CHAR</code> is preferred to ! <code>SC_WRAP_WORD</code> for Asian languages where there is no white space ! between words.</p> <h2 id="DirectAccess">Direct access</h2> *************** *** 3714,3718 **** in this section of the documentation and see how they are used. You will also need to use markers and a folding margin to complete your folding implementation. ! The <code>"fold"</code> property should be set to <code>"1"</code> with <code>SCI_SETPROPERTY("fold", "1")</code> to enable folding. </p> <code><a class="message" href="#SCI_VISIBLEFROMDOCLINE">SCI_VISIBLEFROMDOCLINE(int --- 3795,3799 ---- in this section of the documentation and see how they are used. You will also need to use markers and a folding margin to complete your folding implementation. ! The <code>"fold"</code> property should be set to <code>"1"</code> with <code>SCI_SETPROPERTY("fold", "1")</code> to enable folding. </p> <code><a class="message" href="#SCI_VISIBLEFROMDOCLINE">SCI_VISIBLEFROMDOCLINE(int *************** *** 3894,3897 **** --- 3975,3979 ---- <a class="message" href="#SCI_LINESSPLIT">SCI_LINESSPLIT</a><br /> <a class="message" href="#SCI_LINESJOIN">SCI_LINESJOIN</a><br /> + <a class="message" href="#SCI_WRAPCOUNT">SCI_WRAPCOUNT(int docLine)</a><br /> </code> *************** *** 3928,3933 **** <p><b id="SCI_SETWRAPMODE">SCI_SETWRAPMODE(int wrapMode)</b><br /> <b id="SCI_GETWRAPMODE">SCI_GETWRAPMODE</b><br /> ! Set wrapMode to <code>SC_WRAP_WORD</code> (1) to enable line wrapping and to ! <code>SC_WRAP_NONE</code> (0) to disable line wrapping.</p> <p><b id="SCI_SETWRAPVISUALFLAGS">SCI_SETWRAPVISUALFLAGS(int wrapVisualFlags)</b><br /> --- 4010,4020 ---- <p><b id="SCI_SETWRAPMODE">SCI_SETWRAPMODE(int wrapMode)</b><br /> <b id="SCI_GETWRAPMODE">SCI_GETWRAPMODE</b><br /> ! Set wrapMode to <code>SC_WRAP_WORD</code> (1) to enable wrapping ! on word boundaries, <code>SC_WRAP_CHAR</code> (2) to enable wrapping ! between any characters, and to <code>SC_WRAP_NONE</code> (0) to disable line ! wrapping. <code>SC_WRAP_CHAR</code> is preferred to ! <code>SC_WRAP_WORD</code> for Asian languages where there is no white space ! between words.</p> ! <p><b id="SCI_SETWRAPVISUALFLAGS">SCI_SETWRAPVISUALFLAGS(int wrapVisualFlags)</b><br /> *************** *** 4079,4082 **** --- 4166,4173 ---- </p> + <p><b id="SCI_WRAPCOUNT">SCI_WRAPCOUNT(int docLine)</b><br /> + Document lines can occupy more than one display line if they wrap and this + returns the number of display lines needed to wrap a document line.</p> + <h2 id="Zooming">Zooming</h2> *************** *** 4198,4201 **** --- 4289,4295 ---- <a class="message" href="#SCI_COLOURISE">SCI_COLOURISE(int start, int end)</a><br /> <a class="message" href="#SCI_SETPROPERTY">SCI_SETPROPERTY(const char *key, const char *value)</a><br /> + <a class="message" href="#SCI_GETPROPERTY">SCI_GETPROPERTY(const char *key, char *value)</a><br /> + <a class="message" href="#SCI_GETPROPERTYEXPANDED">SCI_GETPROPERTYEXPANDED(const char *key, char *value)</a><br /> + <a class="message" href="#SCI_GETPROPERTYINT">SCI_GETPROPERTYINT(const char *key, int default)</a><br /> <a class="message" href="#SCI_SETKEYWORDS">SCI_SETKEYWORDS(int keyWordSet, const char *keyWordList)</a><br /> *************** *** 4230,4234 **** <p><b id="SCI_COLOURISE">SCI_COLOURISE(int startPos, int endPos)</b><br /> ! This forces the current lexer or the container (if the lexer is set to <code>SCLEX_CONTAINER</code>) to style the document between <code>startPos</code> and <code>endPos</code>. If <code>endPos</code> is -1, the document is styled from --- 4324,4328 ---- <p><b id="SCI_COLOURISE">SCI_COLOURISE(int startPos, int endPos)</b><br /> ! This requests the current lexer or the container (if the lexer is set to <code>SCLEX_CONTAINER</code>) to style the document between <code>startPos</code> and <code>endPos</code>. If <code>endPos</code> is -1, the document is styled from *************** *** 4257,4260 **** --- 4351,4384 ---- properties are used.</p> + <p><b id="SCI_GETPROPERTY">SCI_GETPROPERTY(const char *key, char *value)</b><br /> + Lookup a keyword:value pair using the specified key; if found, copy the value to the user-supplied + buffer and return the length (not including the terminating 0). If not found, copy an empty string + to the buffer and return 0.</p> + + <p>Note that "keyword replacement" as described in <a class="message" href="#SCI_SETPROPERTY"> + <code>SCI_SETPROPERTY</code></a> will not be performed.</p> + + <p>If the value argument is 0 then the length that should be allocated to store the value is returned; + again, the terminating 0 is not included.</p> + + <p><b id="SCI_GETPROPERTYEXPANDED">SCI_GETPROPERTYEXPANDED(const char *key, char *value)</b><br /> + Lookup a keyword:value pair using the specified key; if found, copy the value to the user-supplied + buffer an... [truncated message content] |
|
From: Dirk B. <db...@us...> - 2005-09-03 10:13:21
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/extsrc/w32fScintilla Modified Files: tgzsrc version.txt Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: version.txt =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/version.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** version.txt 22 Dec 2004 20:25:27 -0000 1.1 --- version.txt 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 1 **** ! 162 --- 1 ---- ! 166 Index: tgzsrc =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/tgzsrc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tgzsrc 22 Dec 2004 20:25:27 -0000 1.1 --- tgzsrc 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 1,5 **** cd .. rm -f scintilla.tgz ! tar --create scintilla/* \ ! --exclude=*.o --exclude=*.obj --exclude=*.dll --exclude=*.exe --exclude=*.a \ | gzip -c >scintilla.tgz --- 1,4 ---- cd .. rm -f scintilla.tgz ! tar --create --exclude \*.o --exclude \*.obj --exclude \*.dll --exclude \*.exe --exclude \*.a scintilla/* \ | gzip -c >scintilla.tgz |
|
From: Dirk B. <db...@us...> - 2005-09-03 09:05:59
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19999 Modified Files: w32fScintilla.dll Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: w32fScintilla.dll =================================================================== RCS file: /cvsroot/win32forth/win32forth/w32fScintilla.dll,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsPBab0U and /tmp/cvsAY0vSY differ |
1040 messages has been excluded from this view by a project administrator.
