diff options
| -rw-r--r-- | doc/ScintillaDoc.html | 74 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 40 | ||||
| -rw-r--r-- | src/Document.cxx | 12 | ||||
| -rw-r--r-- | src/Editor.cxx | 34 | ||||
| -rw-r--r-- | win32/PlatWin.cxx | 22 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 |
6 files changed, 93 insertions, 93 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index 1c2dd7c2f..495d81639 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -323,7 +323,7 @@ <td>o <a class="toc" href="#ProvisionalMessages"><span class="provisional">Provisional messages</span></a></td> <td>o <a class="toc" href="#DeprecatedMessages">Deprecated messages</a></td> - + </tr> <tr> @@ -560,7 +560,7 @@ <code>SCI_RELEASEALLEXTENDEDSTYLES</code> releases any extended styles allocated by the container. <code>SCI_ALLOCATEEXTENDEDSTYLES</code> allocates a range of style numbers after the byte style values and returns the number of the first allocated style. - Ranges for margin and annotation styles should be allocated before calling + Ranges for margin and annotation styles should be allocated before calling <a class="message" href="#SCI_MARGINSETSTYLEOFFSET">SCI_MARGINSETSTYLEOFFSET</a> or <a class="message" href="#SCI_ANNOTATIONSETSTYLEOFFSET">SCI_ANNOTATIONSETSTYLEOFFSET</a>.</p> @@ -2207,7 +2207,7 @@ struct Sci_TextToFind { <p>Scintilla can handle the major line end conventions <span class="provisional">and, depending on settings and the current lexer also support additional Unicode line ends</span>.</p> - + <p>Scintilla can interpret any of the Macintosh (\r), Unix (\n) and Windows (\r\n) line ends. When the user presses the Enter key, one of these line @@ -2559,7 +2559,7 @@ struct Sci_TextToFind { <p>The weight or boldness of a font can be set with <code>SCI_STYLESETBOLD</code> or <code>SCI_STYLESETWEIGHT</code>. The weight is a number between 1 and 999 with 1 being very light and 999 very heavy. While any value can be used, fonts often only support between 2 and 4 weights with three weights - being common enough to have symbolic names: + being common enough to have symbolic names: <code>SC_WEIGHT_NORMAL</code> (400), <code>SC_WEIGHT_SEMIBOLD</code> (600), and <code>SC_WEIGHT_BOLD</code> (700). @@ -2999,10 +2999,10 @@ struct Sci_TextToFind { <p> <b id="SCI_SETMARGINOPTIONS">SCI_SETMARGINOPTIONS(int marginOptions)</b><br /> <b id="SCI_GETMARGINOPTIONS">SCI_GETMARGINOPTIONS</b><br /> - Define margin options by enabling appropriate bit flags. At the moment, only one flag is available - <code>SC_MARGINOPTION_SUBLINESELECT</code>=1, which controls how wrapped lines are selected when clicking - on margin in front of them. If <code>SC_MARGINOPTION_SUBLINESELECT</code> is set only sub line of wrapped - line is selected, otherwise whole wrapped line is selected. Margin options are set to + Define margin options by enabling appropriate bit flags. At the moment, only one flag is available + <code>SC_MARGINOPTION_SUBLINESELECT</code>=1, which controls how wrapped lines are selected when clicking + on margin in front of them. If <code>SC_MARGINOPTION_SUBLINESELECT</code> is set only sub line of wrapped + line is selected, otherwise whole wrapped line is selected. Margin options are set to <code>SC_MARGINOPTION_NONE</code>=0 by default. </p> @@ -3224,7 +3224,7 @@ struct Sci_TextToFind { <p><b id="SCI_GETWORDCHARS">SCI_GETWORDCHARS(<unused>, char *characters)</b><br /> This fills the characters parameter with all the characters included in words. - The characters parameter must be large enough to hold all of the characters. + The characters parameter must be large enough to hold all of the characters. If the characters parameter is 0 then the length that should be allocated to store the entire set is returned.</p> @@ -3637,7 +3637,7 @@ struct Sci_TextToFind { <p><b id="SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber, const char *xpm)</b><br /> - Markers can be set to pixmaps with this message. The + Markers can be set to pixmaps with this message. The <a class="jump" href="#XPM">XPM format</a> is used for the pixmap. Pixmaps use the <code>SC_MARK_PIXMAP</code> marker symbol. </p> @@ -3646,9 +3646,9 @@ struct Sci_TextToFind { <b id="SCI_RGBAIMAGESETHEIGHT">SCI_RGBAIMAGESETHEIGHT(int height)</b><br /> <b id="SCI_RGBAIMAGESETSCALE">SCI_RGBAIMAGESETSCALE(int scalePercent)</b><br /> <b id="SCI_MARKERDEFINERGBAIMAGE">SCI_MARKERDEFINERGBAIMAGE(int markerNumber, const char *pixels)</b><br /> - Markers can be set to translucent pixmaps with this message. The + Markers can be set to translucent pixmaps with this message. The <a class="jump" href="#RGBA">RGBA format</a> is used for the pixmap. - The width and height must previously been set with the <code>SCI_RGBAIMAGESETWIDTH</code> and + The width and height must previously been set with the <code>SCI_RGBAIMAGESETWIDTH</code> and <code>SCI_RGBAIMAGESETHEIGHT</code> messages.</p> <p>A scale factor in percent may be set with <code>SCI_RGBAIMAGESETSCALE</code>. This is useful on OS X with a retina display where each display unit is 2 pixels: use a factor of 200 so that each image pixel is dsplayed using a screen pixel. @@ -4027,7 +4027,7 @@ struct Sci_TextToFind { <p><b id="SCI_FINDINDICATORSHOW">SCI_FINDINDICATORSHOW(int start, int end)</b><br /> <b id="SCI_FINDINDICATORFLASH">SCI_FINDINDICATORFLASH(int start, int end)</b><br /> These two messages show and animate the find indicator. The indicator remains visible with - <code>SCI_FINDINDICATORSHOW</code> and fades out after showing for half a second with + <code>SCI_FINDINDICATORSHOW</code> and fades out after showing for half a second with <code>SCI_FINDINDICATORFLASH</code>. <code>SCI_FINDINDICATORSHOW</code> behaves similarly to the OS X TextEdit and Safari applications and is best suited to editing documentation where the search target is often a word. @@ -4270,10 +4270,10 @@ struct Sci_TextToFind { Autocompletion list items may display an image as well as text. Each image is first registered with an integer type. Then this integer is included in the text of the list separated by a '?' from the text. For example, "fclose?2 fopen" displays image 2 before the string "fclose" and no image before "fopen". - The images are in either the <a class="jump" href="#XPM">XPM format</a> (<code>SCI_REGISTERIMAGE</code>) or + The images are in either the <a class="jump" href="#XPM">XPM format</a> (<code>SCI_REGISTERIMAGE</code>) or <a class="jump" href="#RGBA">RGBA format</a> (<code>SCI_REGISTERRGBAIMAGE</code>). For <code>SCI_REGISTERRGBAIMAGE</code> the width and height must previously been set with - the <a class="message" href="#SCI_RGBAIMAGESETWIDTH"><code>SCI_RGBAIMAGESETWIDTH</code></a> and + the <a class="message" href="#SCI_RGBAIMAGESETWIDTH"><code>SCI_RGBAIMAGESETWIDTH</code></a> and <a class="message" href="#SCI_RGBAIMAGESETHEIGHT"><code>SCI_RGBAIMAGESETHEIGHT</code></a> messages. The set of registered images can be cleared with <code>SCI_CLEARREGISTEREDIMAGES</code> and the '?' separator changed with <code>SCI_AUTOCSETTYPESEPARATOR</code>. @@ -4433,7 +4433,7 @@ struct Sci_TextToFind { <p><b id="SCI_CALLTIPSETPOSITION">SCI_CALLTIPSETPOSITION(bool above)</b><br /> By default the calltip is displayed below the text, setting above to <code>true</code> (1) will display it above the text.</p> - + <h2 id="KeyboardCommands">Keyboard commands</h2> @@ -4748,7 +4748,7 @@ struct Sci_TextToFind { <p>The modifiers are a combination of zero or more of <code>SCMOD_ALT</code>, <code>SCMOD_CTRL</code>, <code>SCMOD_SHIFT</code>, and <code>SCMOD_META</code>. - On OS X, the Command key is mapped to <code>SCMOD_CTRL</code> and the Control key to + On OS X, the Command key is mapped to <code>SCMOD_CTRL</code> and the Control key to <code>SCMOD_META</code>. If you are building a table, you might want to use <code>SCMOD_NORM</code>, which has the value 0, to mean no modifiers.</p> @@ -4851,7 +4851,7 @@ struct Sci_RangeToFormat { The Surface IDs are not really used for measurement (<code>bDraw=0</code>) but can be set to a bitmap context (created with <code>CGBitmapContextCreate</code>) to avoid runtime warnings.</p> - <p>On GTK+, the surface IDs to use can be found from the printing context with + <p>On GTK+, the surface IDs to use can be found from the printing context with <code>gtk_print_context_get_cairo_context(context)</code>.</p> <code>chrg.cpMin</code> and <code>chrg.cpMax</code> define the start position and maximum @@ -5024,7 +5024,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ <p><code>SCI_GETRANGEPOINTER</code> provides direct access to just the range requested. The gap is not moved unless it is within the requested range so this call - can be faster than <code>SCI_GETCHARACTERPOINTER</code>. + can be faster than <code>SCI_GETCHARACTERPOINTER</code>. This can be used by application code that is able to act on blocks of text or ranges of lines.</p> <p><code>SCI_GETGAPPOSITION</code> returns the current gap position. @@ -5387,7 +5387,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ </tbody> </table> <p></p> - + <p><b id="SCI_EXPANDCHILDREN">SCI_EXPANDCHILDREN(int line, int level)</b><br /> This is used to respond to a change to a line causing its fold level or whether it is a header to change, perhaps when adding or removing a '{'.</p> @@ -6331,7 +6331,7 @@ To allow lexers to determine the end position of a line and thus more easily sup <span class="S10">};</span><br /> </div> -<p>The <code>ILexer</code>, <code>ILexerWithSubStyles</code>, <code>IDocument</code>, and +<p>The <code>ILexer</code>, <code>ILexerWithSubStyles</code>, <code>IDocument</code>, and <code>IDocumentWithLineEnd</code> interfaces may be expanded in the future with extended versions (<code>ILexer2</code>...). The <code>Version</code> method indicates which interface is @@ -6436,11 +6436,11 @@ struct SCNotification { <p><b id="SCI_SETIDENTIFIER">SCI_SETIDENTIFIER(int identifier)</b><br /> <b id="SCI_GETIDENTIFIER">SCI_GETIDENTIFIER</b><br /> - These two messages set and get the identifier of the Scintilla instance which is included in notifications as the - <code>idFrom</code> field. + These two messages set and get the identifier of the Scintilla instance which is included in notifications as the + <code>idFrom</code> field. When an application creates multiple Scintilla widgets, this allows the source of each notification to be found. - On Windows, this value is initialised in the <code>CreateWindow</code> call and stored as the - <code>GWLP_ID</code> attribute of the window. + On Windows, this value is initialised in the <code>CreateWindow</code> call and stored as the + <code>GWLP_ID</code> attribute of the window. The value should be small, preferrably less than 16 bits, rather than a pointer as some of the functions will only transmit 16 or 32 bits. </p> @@ -7165,17 +7165,17 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next <p><b id="SCN_AUTOCCHARDELETED">SCN_AUTOCCHARDELETED</b><br /> The user deleted a character while autocompletion list was active. There is no other information in SCNotification.</p> - + <h2 id="Images">Images</h2> - + <p>Two formats are supported for images used in margin markers and autocompletion lists, RGBA and XPM.</p> <h3 id="RGBA">RGBA</h3> - + <p>The RGBA format allows translucency with an <a class="jump" href="#alpha">alpha</a> value for each pixel. It is simpler than <code>XPM</code> and more capable.</p> - + <p>The data is a sequence of 4 byte pixel values starting with the pixels for the top line, with the leftmost pixel first, then continuing with the pixels for subsequent lines. There is no gap between lines for alignment reasons.</p> @@ -7184,22 +7184,22 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next The colour bytes are not premultiplied by the alpha value. That is, a fully red pixel that is 25% opaque will be [FF, 00, 00, 3F]</p> - <p>Since the RGBA pixel data does not include any size information the - width and height must previously been set with the - <a class="message" href="#SCI_RGBAIMAGESETWIDTH"><code>SCI_RGBAIMAGESETWIDTH</code></a> and + <p>Since the RGBA pixel data does not include any size information the + width and height must previously been set with the + <a class="message" href="#SCI_RGBAIMAGESETWIDTH"><code>SCI_RGBAIMAGESETWIDTH</code></a> and <a class="message" href="#SCI_RGBAIMAGESETHEIGHT"><code>SCI_RGBAIMAGESETHEIGHT</code></a> messages.</p> - + <p>GUI platforms often include functions for reading image file formats like PNG into memory in the RGBA form or a similar form. If there is no suitable platform support, the <a href="http://lodev.org/lodepng/">LodePNG and picoPNG</a> libraries are small libraries for loading and decoding PNG files available under a BSD-style license.</p> - + <p>RGBA format is supported on Windows, GTK+ and OS X Cocoa.</p> <h3 id="XPM">XPM</h3> - - <p>The XPM format is - <a class="jump" href="http://en.wikipedia.org/wiki/X_PixMap">described here</a>. + + <p>The XPM format is + <a class="jump" href="http://en.wikipedia.org/wiki/X_PixMap">described here</a>. Scintilla is only able to handle XPM pixmaps that use one character per pixel with no named colours. There may be a completely transparent colour named "None".</p> <p>There are two forms of data structure used for XPM images, the first "lines form" format is well suited diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 1288f76ac..cd57f33a0 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -470,7 +470,7 @@ </li> <li> Fix crash on Cocoa when view deallocated. - <a href="http://sourceforge.net/p/scintilla/bugs/1466/">Bug #1466</a>, + <a href="http://sourceforge.net/p/scintilla/bugs/1466/">Bug #1466</a>, </li> <li> Fix display of DBCS documents on Windows Direct2D/DirectWrite with default character set. @@ -490,7 +490,7 @@ <li> Most lexers now lex an extra NUL byte at the end of the document which makes it more likely they will classify keywords at document end correctly. - <a href="http://sourceforge.net/p/scintilla/bugs/574/">Bug #574</a>, + <a href="http://sourceforge.net/p/scintilla/bugs/574/">Bug #574</a>, <a href="http://sourceforge.net/p/scintilla/bugs/588/">Bug #588.</a> </li> <li> @@ -1135,7 +1135,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3510979&group_id=2439">Feature #3510979.</a> </li> <li> - Fixed single quoted strings in bash lexer. + Fixed single quoted strings in bash lexer. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512208&group_id=2439">Bug #3512208.</a> </li> <li> @@ -1163,7 +1163,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a> </li> <li> - Fix printing crash when using Direct2D to display on-screen. + Fix printing crash when using Direct2D to display on-screen. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3513946&group_id=2439">Bug #3513946.</a> </li> <li> @@ -1171,22 +1171,22 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514885&group_id=2439">Bug #3514885.</a> </li> <li> - Fixed the Move Selected Lines command when last line does not end with a line end character. + Fixed the Move Selected Lines command when last line does not end with a line end character. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3511023&group_id=2439">Bug #3511023.</a> </li> <li> - Fix word wrap indentation printing to use printer settings instead of screen settings. + Fix word wrap indentation printing to use printer settings instead of screen settings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512961&group_id=2439">Bug #3512961.</a> </li> <li> - Fix SciTE bug where executing an empty command prevented executing further commands + Fix SciTE bug where executing an empty command prevented executing further commands <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512976&group_id=2439">Bug #3512976.</a> </li> <li> Fix SciTE bugs with focus in user strips and made strips more robust with invalid definitions. </li> <li> - Suppress SciTE regular expression option when searching with find next selection. + Suppress SciTE regular expression option when searching with find next selection. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3510985&group_id=2439">Bug #3510985.</a> </li> <li> @@ -1198,7 +1198,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3501321&group_id=2439">Bug #3501321.</a> </li> <li> - Fix column finding method so that tab is counted correctly. + Fix column finding method so that tab is counted correctly. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3483713&group_id=2439">Bug #3483713.</a> </li> </ul> @@ -1223,7 +1223,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488209&group_id=2439">Feature #3488209.</a> </li> <li> - CPP lexer fixes styling after document comment keywords. + CPP lexer fixes styling after document comment keywords. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495445&group_id=2439">Bug #3495445.</a> </li> <li> @@ -1239,7 +1239,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495836&group_id=2439">Bug #3495836.</a> </li> <li> - SciTE xml.auto.close.tags no longer closes with PHP code similar to <a $this-> + SciTE xml.auto.close.tags no longer closes with PHP code similar to <a $this-> <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488067&group_id=2439">Bug #3488067.</a> </li> <li> @@ -1247,11 +1247,11 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487440&group_id=2439">Bug #3487440.</a> </li> <li> - Crash fixed for SCI_MOVESELECTEDLINESDOWN with empty vertical selection. + Crash fixed for SCI_MOVESELECTEDLINESDOWN with empty vertical selection. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3496403&group_id=2439">Bug #3496403.</a> </li> <li> - Differences between buffered and unbuffered mode on Direct2D eliminated. + Differences between buffered and unbuffered mode on Direct2D eliminated. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495791&group_id=2439">Bug #3495791.</a> </li> <li> @@ -1295,7 +1295,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488481&group_id=2439">Bug #3488481.</a> </li> <li> - SciTE on Windows Find in Files sets focus to dialog when already created; allows opening dialog when a job is running. + SciTE on Windows Find in Files sets focus to dialog when already created; allows opening dialog when a job is running. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480635&group_id=2439">Bug #3480635.</a> <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3486657&group_id=2439">Bug #3486657.</a> </li> @@ -1320,7 +1320,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484179&group_id=2439">Bug #3484179.</a> </li> <li> - Selected line ends are highlighted more consistently. + Selected line ends are highlighted more consistently. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484330&group_id=2439">Bug #3484330.</a> </li> <li> @@ -1328,7 +1328,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3482777&group_id=2439">Bug #3482777.</a> </li> <li> - Fix failure messages from empty commands in SciTE. + Fix failure messages from empty commands in SciTE. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480645&group_id=2439">Bug #3480645.</a> </li> <li> @@ -1348,7 +1348,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486654&group_id=2439">Feature #3486654.</a> </li> <li> - SciTE allows optional use of character escapes in calltips. + SciTE allows optional use of character escapes in calltips. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495239&group_id=2439">Feature #3495239.</a> </li> <li> @@ -1607,7 +1607,7 @@ On Windows Vista or newer, drawing may be performed with Direct2D and DirectWrite instead of GDI. </li> <li> - Cairo is now used for all drawing on GTK+. GDK drawing was removed. + Cairo is now used for all drawing on GTK+. GDK drawing was removed. </li> <li> Paletted display support removed. @@ -1679,7 +1679,7 @@ </li> <li> The set of properties files imported by SciTE can be controlled with the properties imports.include and imports.exclude. - The import statement has been extended to allow "import *". + The import statement has been extended to allow "import *". The properties files for some languages are no longer automatically loaded by default. The properties files affected are avenue, baan, escript, lot, metapost, and mmixal. </li> @@ -1798,7 +1798,7 @@ <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3324563&group_id=2439">Bug #3324563.</a> </li> <li> - Python lexer has lexer.python.keywords2.no.sub.identifiers option to avoid highlighting second set of + Python lexer has lexer.python.keywords2.no.sub.identifiers option to avoid highlighting second set of keywords following '.'. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3325333&group_id=2439">Bug #3325333.</a> </li> diff --git a/src/Document.cxx b/src/Document.cxx index d62dd64e0..068d406cf 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -420,7 +420,7 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in int lookLine = line; int lookLineLevel = level; int lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || + while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum >= (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))))) { lookLineLevel = GetLevel(--lookLine); lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; @@ -453,8 +453,8 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in } } if (firstChangeableLineBefore == -1) { - for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - lookLine >= beginFoldBlock; + for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLine >= beginFoldBlock; lookLineLevel = GetLevel(--lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) { if ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || (lookLineLevelNum > (level & SC_FOLDLEVELNUMBERMASK))) { firstChangeableLineBefore = lookLine; @@ -466,8 +466,8 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in firstChangeableLineBefore = beginFoldBlock - 1; int firstChangeableLineAfter = -1; - for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - lookLine <= endFoldBlock; + for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLine <= endFoldBlock; lookLineLevel = GetLevel(++lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) { if ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum < (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))) { firstChangeableLineAfter = lookLine; @@ -715,7 +715,7 @@ bool SCI_METHOD Document::IsDBCSLeadByte(char ch) const { // Shift_jis return ((uch >= 0x81) && (uch <= 0x9F)) || ((uch >= 0xE0) && (uch <= 0xFC)); - // Lead bytes F0 to FC may be a Microsoft addition. + // Lead bytes F0 to FC may be a Microsoft addition. case 936: // GBK return (uch >= 0x81) && (uch <= 0xFE); diff --git a/src/Editor.cxx b/src/Editor.cxx index 783633c2e..8f023ee5f 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -106,7 +106,7 @@ Editor::Editor() { stylesValid = false; technology = SC_TECHNOLOGY_DEFAULT; scaleRGBAImage = 100; - + printMagnification = 0; printColourMode = SC_PRINT_NORMAL; printWrapState = eWrapWord; @@ -149,7 +149,7 @@ Editor::Editor() { caretYPolicy = CARET_EVEN; caretYSlop = 0; - + visiblePolicy = 0; visibleSlop = 0; @@ -1765,7 +1765,7 @@ static int WidthStyledText(Surface *surface, ViewStyle &vs, int styleOffset, size_t endSegment = start; while ((endSegment+1 < len) && (static_cast<size_t>(styles[endSegment+1]) == style)) endSegment++; - width += surface->WidthText(vs.styles[style+styleOffset].font, text + start, + width += surface->WidthText(vs.styles[style+styleOffset].font, text + start, static_cast<int>(endSegment - start + 1)); start = endSegment + 1; } @@ -2287,7 +2287,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou if (vstyle.styles[ll->styles[charInLine]].visible) { if (isControl) { if (ll->chars[charInLine] == '\t') { - ll->positions[charInLine + 1] = + ll->positions[charInLine + 1] = ((static_cast<int>((startsegx + 2) / tabWidth) + 1) * tabWidth) - startsegx; } else if (controlCharSymbol < 32) { if (ctrlCharWidth[ll->chars[charInLine]] == 0) { @@ -4444,7 +4444,7 @@ void Editor::DelCharBack(bool allowLineStartDeletion) { void Editor::NotifyFocus(bool) {} void Editor::SetCtrlID(int identifier) { - ctrlID = identifier; + ctrlID = identifier; } void Editor::NotifyStyleToNeeded(int endStyleNeeded) { @@ -6374,7 +6374,7 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b if (inSelMargin) { // Inside margin selection type should be either selSubLine or selWholeLine. if (selectionType == selSubLine) { - // If it is selSubLine, we're inside a *double* click and word wrap is enabled, + // If it is selSubLine, we're inside a *double* click and word wrap is enabled, // so we switch to selWholeLine in order to select whole line. selectionType = selWholeLine; } else if (selectionType != selSubLine && selectionType != selWholeLine) { @@ -6386,7 +6386,7 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b selectionType = selWord; doubleClick = true; } else if (selectionType == selWord) { - // Since we ended up here, we're inside a *triple* click, which should always select + // Since we ended up here, we're inside a *triple* click, which should always select // whole line irregardless of word wrap being enabled or not. selectionType = selWholeLine; } else { @@ -6451,7 +6451,7 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b lineAnchorPos = sel.MainAnchor() - 1; else lineAnchorPos = sel.MainAnchor(); - // Reset selection type if there is an empty selection. + // Reset selection type if there is an empty selection. // This ensures that we don't end up stuck in previous selection mode, which is no longer valid. // Otherwise, if there's a non empty selection, reset selection type only if it differs from selSubLine and selWholeLine. // This ensures that we continue selecting in the same selection mode. @@ -7095,7 +7095,7 @@ void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) { WrapLines(true, -1); if (!cs.GetVisible(lineDoc)) { - // Back up to find a non-blank line + // Back up to find a non-blank line int lookLine = lineDoc; int lookLineLevel = pdoc->GetLevel(lookLine); while ((lookLine > 0) && (lookLineLevel & SC_FOLDLEVELWHITEFLAG)) { @@ -7103,7 +7103,7 @@ void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) { } int lineParent = pdoc->GetFoldParent(lookLine); if (lineParent < 0) { - // Backed up to a top level line, so try to find parent of initial line + // Backed up to a top level line, so try to find parent of initial line lineParent = pdoc->GetFoldParent(lineDoc); } if (lineParent >= 0) { @@ -8044,10 +8044,10 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { case SCI_GETLINEENDTYPESALLOWED: return pdoc->GetLineEndTypesAllowed(); - + case SCI_GETLINEENDTYPESACTIVE: return pdoc->GetLineEndTypesActive(); - + case SCI_STARTSTYLING: pdoc->StartStyling(wParam, static_cast<char>(lParam)); break; @@ -8429,7 +8429,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { case SCI_MARKERGET: return pdoc->GetMark(wParam); - case SCI_MARKERNEXT: + case SCI_MARKERNEXT: return pdoc->MarkerNext(wParam, lParam); case SCI_MARKERPREVIOUS: { @@ -8719,7 +8719,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { EnsureLineVisible(wParam, true); break; - case SCI_SCROLLRANGE: + case SCI_SCROLLRANGE: ScrollRange(SelectionRange(lParam, wParam)); break; @@ -9657,18 +9657,18 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { case SCI_CHANGELEXERSTATE: pdoc->ChangeLexerState(wParam, lParam); break; - + case SCI_SETIDENTIFIER: SetCtrlID(wParam); break; - + case SCI_GETIDENTIFIER: return GetCtrlID(); case SCI_SETTECHNOLOGY: // No action by default break; - + case SCI_GETTECHNOLOGY: return technology; diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 6d9c45978..0ecb80311 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -860,7 +860,7 @@ void SurfaceGDI::DrawRGBAImage(PRectangle rc, int width, int height, const unsig DIB_RGB_COLORS, reinterpret_cast<void **>(&image), NULL, 0); if (hbmMem) { HBITMAP hbmOld = SelectBitmap(hMemDC, hbmMem); - + for (int y=height-1; y>=0; y--) { for (int x=0; x<width; x++) { unsigned char *pixel = image + (y*width+x) * 4; @@ -872,7 +872,7 @@ void SurfaceGDI::DrawRGBAImage(PRectangle rc, int width, int height, const unsig pixel[3] = static_cast<unsigned char>(*pixelsImage++); } } - + BLENDFUNCTION merge = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; AlphaBlendFn(reinterpret_cast<HDC>(hdc), rc.left, rc.top, rc.Width(), rc.Height(), hMemDC, 0, 0, width, height, merge); @@ -1339,7 +1339,7 @@ void SurfaceD2D::D2DPenColour(ColourDesired fore, int alpha) { pBrush->SetColor(col); } else { HRESULT hr = pRenderTarget->CreateSolidColorBrush(col, &pBrush); - if (!SUCCEEDED(hr) && pBrush) { + if (!SUCCEEDED(hr) && pBrush) { pBrush->Release(); pBrush = 0; } @@ -1407,11 +1407,11 @@ void SurfaceD2D::LineTo(int x_, int y_) { pRenderTarget->FillRectangle(&rectangle1, pBrush); } else if ((abs(xDiff) == abs(yDiff))) { // 45 degree slope - pRenderTarget->DrawLine(D2D1::Point2F(x + 0.5, y + 0.5), + pRenderTarget->DrawLine(D2D1::Point2F(x + 0.5, y + 0.5), D2D1::Point2F(x_ + 0.5 - xDelta, y_ + 0.5 - yDelta), pBrush); } else { // Line has a different slope so difficult to avoid last pixel - pRenderTarget->DrawLine(D2D1::Point2F(x + 0.5, y + 0.5), + pRenderTarget->DrawLine(D2D1::Point2F(x + 0.5, y + 0.5), D2D1::Point2F(x_ + 0.5, y_ + 0.5), pBrush); } x = x_; @@ -1558,7 +1558,7 @@ void SurfaceD2D::DrawRGBAImage(PRectangle rc, int width, int height, const unsig ID2D1Bitmap *bitmap = 0; D2D1_SIZE_U size = D2D1::SizeU(width, height); - D2D1_BITMAP_PROPERTIES props = {{DXGI_FORMAT_B8G8R8A8_UNORM, + D2D1_BITMAP_PROPERTIES props = {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, 72.0, 72.0}; HRESULT hr = pRenderTarget->CreateBitmap(size, &image[0], width * 4, &props, &bitmap); @@ -1594,7 +1594,7 @@ void SurfaceD2D::Copy(PRectangle rc, Point from, Surface &surfaceSource) { if (SUCCEEDED(hr)) { D2D1_RECT_F rcDestination = {rc.left, rc.top, rc.right, rc.bottom}; D2D1_RECT_F rcSource = {from.x, from.y, from.x + rc.Width(), from.y + rc.Height()}; - pRenderTarget->DrawBitmap(pBitmap, rcDestination, 1.0f, + pRenderTarget->DrawBitmap(pBitmap, rcDestination, 1.0f, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, rcSource); pRenderTarget->Flush(); pBitmap->Release(); @@ -1611,8 +1611,8 @@ void SurfaceD2D::DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase, co D2D1_RECT_F rcClip = {rc.left, rc.top, rc.right, rc.bottom}; pRenderTarget->PushAxisAlignedClip(rcClip, D2D1_ANTIALIAS_MODE_ALIASED); } - - // Explicitly creating a text layout appears a little faster + + // Explicitly creating a text layout appears a little faster IDWriteTextLayout *pTextLayout; HRESULT hr = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat, rc.Width(), rc.Height(), &pTextLayout); @@ -1811,7 +1811,7 @@ XYPOSITION SurfaceD2D::AverageCharWidth(Font &font_) { // Create a layout IDWriteTextLayout *pTextLayout = 0; const WCHAR wszAllAlpha[] = L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; - HRESULT hr = pIDWriteFactory->CreateTextLayout(wszAllAlpha, static_cast<UINT32>(wcslen(wszAllAlpha)), + HRESULT hr = pIDWriteFactory->CreateTextLayout(wszAllAlpha, static_cast<UINT32>(wcslen(wszAllAlpha)), pTextFormat, 1000.0, 1000.0, &pTextLayout); if (SUCCEEDED(hr)) { DWRITE_TEXT_METRICS textMetrics; @@ -1907,7 +1907,7 @@ void Window::SetPositionRelative(PRectangle rc, Window w) { // If hMonitor is NULL, that's just the main screen anyways. //::GetMonitorInfo(hMonitor, &mi); RECT rcWork = RectFromMonitor(hMonitor); - + if (rcWork.left < rcWork.right) { // Now clamp our desired rectangle to fit inside the work area // This way, the menu will fit wholly on one screen. An improvement even diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 9775f4ba7..7db2fc0fd 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -780,7 +780,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam ::SendMessage(hWnd, iMessage, wParam, lParam); break; } - + // Don't handle datazoom. // (A good idea for datazoom would be to "fold" or "unfold" details. // i.e. if datazoomed out only class structures are visible, when datazooming in the control @@ -1167,7 +1167,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case SCI_GETKEYSUNICODE: return keysAlwaysUnicode; - + case SCI_SETTECHNOLOGY: if ((wParam == SC_TECHNOLOGY_DEFAULT) || (wParam == SC_TECHNOLOGY_DIRECTWRITE)) { if (technology != static_cast<int>(wParam)) { |