diff options
| -rw-r--r-- | doc/ScintillaDoc.html | 11 | ||||
| -rw-r--r-- | doc/index.html | 19 | ||||
| -rw-r--r-- | include/Scintilla.h | 1 | ||||
| -rw-r--r-- | src/Editor.cxx | 5 |
4 files changed, 29 insertions, 7 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index 4046638fd..fc86444af 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -166,6 +166,7 @@ SCI_SETANCHOR(int position) SCI_GETCURLINE(int textlen, char *text) SCI_LINELENGTH(int line) SCI_SETCARETPOLICY(int policy) +SCI_LINESONSCREEN </pre> <p> Scintilla maintains a selection which stretches between two points, the anchor and the @@ -245,6 +246,8 @@ SCI_GETENDSTYLED SCI_STARTSTYLING(int position, int mask) SCI_SETSTYLING(int length, int style) SCI_SETSTYLINGEX(int length, stylesequence *s) +SCI_SETLINESTATE(int line, int value) +SCI_GETLINESTATE(int line) </pre> <p> Scintilla keeps a record of the last character that is likely to be styled correctly. This @@ -252,6 +255,7 @@ SCI_SETSTYLINGEX(int length, stylesequence *s) to the text of the document before it. Before drawing text, this position is checked to see if any styling is needed and a notification message sent to the container if so. The container can send SCI_GETENDSTYLED to work out where it needs to start styling. + Scintilla will always ask to style whole lines. </p> <p> To perform the actual styling, SCI_STARTSTYLING is sent with the position to start at and a @@ -261,7 +265,12 @@ SCI_SETSTYLINGEX(int length, stylesequence *s) syntax errors and using indicators to show where these are. After SCI_STARTSTYLING, multiple SCI_SETSTYLING messages are sent for each lexical entity to be styled. </p> - <h3> + <p> + As well as the 8 bits of lexical state stored for each character there is also an integer stored + for each line. This can be used for longer lived parse states such as what the current scripting + language is in an ASP page. + </p> + <h3> Style Definition </h3> <pre> diff --git a/doc/index.html b/doc/index.html index d0d59c0b8..9c462da41 100644 --- a/doc/index.html +++ b/doc/index.html @@ -10,6 +10,12 @@ <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="20000227" /> + <script> + function IsRemote() { + var loc = '' + window.location; + return loc.indexOf('http:') != -1; + } + </script> <title> Scintilla and SciTE </title> @@ -65,8 +71,13 @@ <td> <font size="4"> <a href="SciTEImage.html">Screenshot</a> <a href="ScintillaDownload.html">Download</a> <a href="ScintillaDoc.html"> - Documentation</a> <a href="ScintillaToDo.html">Bugs</a> <a - href="SciTEDoc.html">SciTE</a> <a href="ScintillaHistory.html"> + Documentation</a> <a href="ScintillaToDo.html">Bugs</a> +<script type="text/javascript" language="JavaScript"><!-- +if (IsRemote()) { + document.write('<a href="SciTEDoc.html">SciTE</a> '); +} +//--></script> + <a href="ScintillaHistory.html"> History</a> <a href="ScintillaRelated.html">Related</a> </font> </td> </tr> @@ -130,11 +141,9 @@ </p> <script type="text/javascript" language="JavaScript"> <!-- -//document.write(window.location); document.write('There is a <a href="https://sourceforge.net/project/?group_id=2439">Scintilla project page<\/a>'); document.write(' hosted on '); -var loc = '' + window.location -if (loc.indexOf('http:') != -1) { +if (IsRemote()) { document.write('<a href="http://sourceforge.net">'); document.write('<img src="http://sourceforge.net/sflogo.php?group_id=2439&type=1" width="88" height="31" border="0" /><\/a> '); } else { diff --git a/include/Scintilla.h b/include/Scintilla.h index 4319571a1..e030aa859 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -311,6 +311,7 @@ extern "C" { // OR this with CARET_SLOP to reposition whenever outside slop border #define SCI_SETCARETPOLICY SCI_START + 369 +#define SCI_LINESONSCREEN SCI_START + 370 // GTK+ Specific #define SCI_GRABFOCUS SCI_START + 400 diff --git a/src/Editor.cxx b/src/Editor.cxx index 7f9ce5980..bcefa8aec 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -3520,7 +3520,10 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) { caretSlop = lParam; break; -#ifdef INCLUDE_DEPRECATED_FEATURES + case SCI_LINESONSCREEN: + return LinesOnScreen(); + + #ifdef INCLUDE_DEPRECATED_FEATURES case SCI_SETFORE: vs.styles[STYLE_DEFAULT].fore.desired = Colour(wParam); InvalidateStyleRedraw(); |