Skip to content
This repository has been archived by the owner on Aug 12, 2018. It is now read-only.

Commit

Permalink
Update Scintilla to v3.6.7.
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Sep 5, 2016
1 parent 2db3008 commit 7529a6b
Show file tree
Hide file tree
Showing 21 changed files with 261 additions and 88 deletions.
28 changes: 12 additions & 16 deletions scintilla/doc/Design.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,21 @@ <h4>
the name of a macro on Windows.
</p>
<h4>
Colour, ColourPair, Palette
ColourDesired
</h4>
<p>
Colour holds a platform specific colour identifier - COLORREF for Windows and GdkColor for
GTK+. The red, green and blue components that make up the colour are limited to the 8 bits of
precision available on Windows. ColourPairs are used because not all possible colours are
always available. Using an 8 bit colour mode, which is a common setting for both Windows and
GTK+, only 256 colours are possible on the display. Thus when an application asks for a dull
red, say #400000, it may only be allocated an already available colour such as #800000 or
#330000. With 16 or 2 colour modes even less choice is available and the application will
have to use the limited set of already available colours.
</p>
A Palette object holds a set of colour pairs and can make the appropriate calls to ask to
allocate these colours and to see what the platform has decided will be allowed.
This is a simple class holding an expected colour. It is internally represented as a single
32 bit integer in BGR format with 8 bits per colour, but also provides a convenient API to fetch
each component separately.
As a platform might not be able to represent the exact desired colour if it doesn't have 24 bit
depth available, it might not actually represent the exact desired colour but select a best fit
that it can actually render.
</p>
<h4>
Font
</h4>
<p>
Font holds a platform specific font identifier - HFONT for Windows, GdkFont* for GTK+. It
Font holds a platform specific font identifier - HFONT for Windows, PangoFontDescription* for GTK+. It
does not own the identifier and so will not delete the platform font object in its
destructor. Client code should call Destroy at appropriate times.
</p>
Expand All @@ -116,8 +112,8 @@ <h4>
Surface is an abstraction over each platform's concept of somewhere that graphical drawing
operations can be done. It may wrap an already created drawing place such as a window or be
used to create a bitmap that can be drawn into and later copied onto another surface. On
Windows it wraps a HDC and possibly a HBITMAP. On GTK+ it wraps a GdkDrawable* and possibly a
GdkPixmap*. Other platform specific objects are created (and correctly destroyed) whenever
Windows it wraps a HDC and possibly a HBITMAP. On GTK+ it wraps a cairo_surface_t*.
Other platform specific objects are created (and correctly destroyed) whenever
required to perform drawing actions.
</p>
<p>
Expand Down Expand Up @@ -147,7 +143,7 @@ <h4>
</h4>
<p>
Menu is a small helper class for constructing popup menus. It contains the platform specific
menu identifier - HMENU for Windows, GtkItemFactory* for GTK+. Most of the work in
menu identifier - HMENU for Windows, GtkMenu* for GTK+. Most of the work in
constructing menus requires access to platform events and so is done in the Platform Events
and API layer.
</p>
Expand Down
91 changes: 73 additions & 18 deletions scintilla/doc/ScintillaDoc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1696,9 +1696,14 @@ <h2 id="MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</
<b id="SCI_SETVIRTUALSPACEOPTIONS">SCI_SETVIRTUALSPACEOPTIONS(int virtualSpace)</b><br />
<b id="SCI_GETVIRTUALSPACEOPTIONS">SCI_GETVIRTUALSPACEOPTIONS</b><br />
Virtual space can be enabled or disabled for rectangular selections or in other circumstances or in both.
There are two bit flags <code>SCVS_RECTANGULARSELECTION</code>=1 and
<code>SCVS_USERACCESSIBLE</code>=2 which can be set independently.
There are three bit flags <code>SCVS_RECTANGULARSELECTION</code>=1,
<code>SCVS_USERACCESSIBLE</code>=2, and
<code>SCVS_NOWRAPLINESTART</code>=4 which can be set independently.
<code>SCVS_NONE</code>=0, the default, disables all use of virtual space.</p>
<p><code>SCVS_NOWRAPLINESTART</code> prevents left arrow movement and selection
from wrapping to the previous line.
This is most commonly desired in conjunction with virtual space but is an independent
setting so works without virtual space.</p>

<p>
<b id="SCI_SETRECTANGULARSELECTIONMODIFIER">SCI_SETRECTANGULARSELECTIONMODIFIER(int modifier)</b><br />
Expand Down Expand Up @@ -2718,24 +2723,66 @@ <h2 id="StyleDefinition">Style definition</h2>
<code>SCI_STYLESETCHARACTERSET(SCE_C_STRING, SC_CHARSET_RUSSIAN)</code> would ensure that
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>
feature works differently on Windows and GTK+.<br />
The default character set is <code>SC_CHARSET_DEFAULT</code>.</p>

<p>The character sets supported on Windows are:<br />
<code>SC_CHARSET_ANSI</code>, <code>SC_CHARSET_ARABIC</code>, <code>SC_CHARSET_BALTIC</code>,
<code>SC_CHARSET_CHINESEBIG5</code>, <code>SC_CHARSET_DEFAULT</code>,
<code>SC_CHARSET_EASTEUROPE</code>, <code>SC_CHARSET_GB2312</code>,
<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>
<code>SC_CHARSET_ANSI</code>,
<code>SC_CHARSET_ARABIC</code>,
<code>SC_CHARSET_BALTIC</code>,
<code>SC_CHARSET_CHINESEBIG5</code>,
<code>SC_CHARSET_DEFAULT</code>,
<code>SC_CHARSET_EASTEUROPE</code>,
<code>SC_CHARSET_GB2312</code>,
<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>.<br />
<code>SC_CHARSET_ANSI</code> and <code>SC_CHARSET_DEFAULT</code> specify European Windows
code page 1252 unless the code page is set.</p>

<p>The character sets supported on GTK+ are:<br />
<code>SC_CHARSET_ANSI</code>, <code>SC_CHARSET_OEM866</code> (code page 866), <code>SC_CHARSET_CYRILLIC</code> (code page 1251),
<code>SC_CHARSET_ANSI</code>,
<code>SC_CHARSET_DEFAULT</code> (8859-1),
<code>SC_CHARSET_OEM866</code> (code page 866),
<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>The character sets supported on Cocoa are:<br />
<code>SC_CHARSET_8859_15</code>,
<code>SC_CHARSET_ANSI</code> (8859-1),
<code>SC_CHARSET_ARABIC</code>,
<code>SC_CHARSET_BALTIC</code>,
<code>SC_CHARSET_CHINESEBIG5</code>,
<code>SC_CHARSET_CYRILLIC</code> (code page 1251),
<code>SC_CHARSET_DEFAULT</code> (8859-1),
<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>
<code>SC_CHARSET_GB2312</code>,
<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>,
<code>SC_CHARSET_VIETNAMESE</code>.</p>

<p><b id="SCI_STYLESETCASE">SCI_STYLESETCASE(int styleNumber, int caseMode)</b><br />
<b id="SCI_STYLEGETCASE">SCI_STYLEGETCASE(int styleNumber)</b><br />
Expand Down Expand Up @@ -3312,7 +3359,14 @@ <h2 id="OtherSettings">Other settings</h2>
These messages turn buffered drawing on or off and report the buffered drawing state. Buffered
drawing draws each line into a bitmap rather than directly to the screen and then copies the
bitmap to the screen. This avoids flickering although it does take longer. The default is for
drawing to be buffered.</p>
drawing to be buffered on Win32 and GTK+ and to not be buffered on Cocoa and Qt.
Buffered drawing is not supported on Cocoa.
</p>

<p>Current platforms perform window buffering so it is almost always better for this option to be turned off.
For Win32 and GTK+, client code should turn off buffering at initialisation.
There are some older platforms and unusual modes where buffering may still be useful.
</p>

<p><b id="SCI_SETPHASESDRAW">SCI_SETPHASESDRAW(int phases)</b><br />
<b id="SCI_GETPHASESDRAW">SCI_GETPHASESDRAW</b><br />
Expand Down Expand Up @@ -3989,8 +4043,9 @@ <h2 id="Indicators">Indicators</h2>

<p>Indicators are stored in a format similar to run length encoding which is efficient in both
speed and storage for sparse information.</p>
<p>An indicator may store different values for each range but currently all values are drawn the same.
In the future, it may be possible to draw different values in different styles.</p>
<p>An indicator may store different values for each range but normally all values are drawn the same.
The <a class="message" href="#SCI_INDICSETFLAGS">SCI_INDICSETFLAGS</a>
API may be used to display different colours for different values.</p>

<p>Originally, Scintilla used a different technique for indicators but this
has been <a href="#RemovedFeatures">removed</a>
Expand Down
10 changes: 5 additions & 5 deletions scintilla/doc/ScintillaDownload.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
<td>
<font size="4"> <a href="http://www.scintilla.org/scintilla366.zip">
<font size="4"> <a href="http://www.scintilla.org/scintilla367.zip">
Windows</a>&nbsp;&nbsp;
<a href="http://www.scintilla.org/scintilla366.tgz">
<a href="http://www.scintilla.org/scintilla367.tgz">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
Expand All @@ -42,16 +42,16 @@ <h2>
containing very few restrictions.
</p>
<h3>
Release 3.6.6
Release 3.6.7
</h3>
<h4>
Source Code
</h4>
The source code package contains all of the source code for Scintilla but no binary
executable code and is available in
<ul>
<li><a href="http://www.scintilla.org/scintilla366.zip">zip format</a> (1500K) commonly used on Windows</li>
<li><a href="http://www.scintilla.org/scintilla366.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
<li><a href="http://www.scintilla.org/scintilla367.zip">zip format</a> (1500K) commonly used on Windows</li>
<li><a href="http://www.scintilla.org/scintilla367.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
</ul>
Instructions for building on both Windows and Linux are included in the readme file.
<h4>
Expand Down
90 changes: 87 additions & 3 deletions scintilla/doc/ScintillaHistory.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,15 @@ <h3>
<td>Pavel Sountsov</td>
<td>Dirk Lorenzen</td>
<td>Kasper B. Graversen</td>
<td>Chris Mayo</td>
</tr><tr>
<td>Van de Bugger</td>
<td>Tse Kit Yam</td>
<td><a href="https://www.smartsharesystems.com/">SmartShare Systems</a></td>
<td>Morten Brørup</td>
</tr><tr>
<td>Alexey Denisov</td>
<td>jedailey</td>
</tr>
</table>
<p>
Expand All @@ -501,6 +510,81 @@ <h3>
Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
</li>
</ul>
<h3>
<a href="http://www.scintilla.org/scite367.zip">Release 3.6.7</a>
</h3>
<ul>
<li>
Released 4 September 2016.
</li>
<li>
C++11 range-based for loops used in SciTE so GCC 4.6 is now the minimum supported version.
</li>
<li>
SC_CHARSET_DEFAULT now means code page 1252 on Windows unless a code page is set.
This prevents unexpected behaviour and crashes on East Asian systems where default locales are commonly DBCS.
Projects which want to default to DBCS code pages in East Asian locales should set the code page and
character set explicitly.
</li>
<li>
SCVS_NOWRAPLINESTART option stops left arrow from wrapping to the previous line.
Most commonly wanted when virtual space is used.
<a href="http://sourceforge.net/p/scintilla/bugs/1648/">Bug #1648</a>.
</li>
<li>
The C++ lexer can fold on #else and #elif with the fold.cpp.preprocessor.at.else property.
<a href="http://sourceforge.net/p/scintilla/feature-requests/210/">Bug #210</a>.
</li>
<li>
The errorlist lexer detects warnings from Visual C++ which do not contain line numbers.
</li>
<li>
The HTML lexer no longer treats "&lt;?" inside a string in a script as potentially starting an XML document.
<a href="http://sourceforge.net/p/scintilla/bugs/767/">Bug #767</a>.
</li>
<li>
The HTML lexer fixes a problem resuming at a script start where the starting state continued
past where it should.
<a href="http://sourceforge.net/p/scintilla/bugs/1849/">Bug #1849</a>.
</li>
<li>
When inserting spaces for virtual space and the position is in indentation and tabs are enabled
for indentation then use tabs.
<a href="http://sourceforge.net/p/scintilla/bugs/1850/">Bug #1850</a>.
</li>
<li>
Fix fold expand when some child text not styled.
Caused by fixes for Bug #1799.
<a href="http://sourceforge.net/p/scintilla/bugs/1842/">Bug #1842</a>.
</li>
<li>
Fix key binding bug on Cocoa for control+.
<a href="http://sourceforge.net/p/scintilla/bugs/1854/">Bug #1854</a>.
</li>
<li>
Fix scroll bar size warnings on GTK+ caused by #1831.
<a href="http://sourceforge.net/p/scintilla/bugs/1851/">Bug #1851</a>.
</li>
<li>
Small fixes for GTK+ makefile.
<a href="http://sourceforge.net/p/scintilla/bugs/1844/">Bug #1844</a>.
<a href="http://sourceforge.net/p/scintilla/bugs/1845/">Bug #1845</a>.
<a href="http://sourceforge.net/p/scintilla/bugs/1846/">Bug #1846</a>.
</li>
<li>
Fix SciTE indentation after code like "void function () {}".
</li>
<li>
Fix SciTE global regex replace of "^" with something which missed the line after empty
lines with LF line ends.
<a href="http://sourceforge.net/p/scintilla/bugs/1839/">Bug #1839</a>.
</li>
<li>
Fix SciTE on GTK+ 3.20 bug where toggle buttons on find and replace strips
did not show active state.
<a href="http://sourceforge.net/p/scintilla/bugs/1853/">Bug #1853</a>.
</li>
</ul>
<h3>
<a href="http://www.scintilla.org/scite366.zip">Release 3.6.6</a>
</h3>
Expand All @@ -512,7 +596,7 @@ <h3>
C++ 11 &lt;regex&gt; support built by default. Can be disabled by defining NO_CXX11_REGEX.
</li>
<li>
SciTE_USERHOME environment variable allows separate location for writable properties files.
SciTE_USERHOME environment variable allows separate location for writeable properties files.
<a href="http://sourceforge.net/p/scintilla/feature-requests/965/">Feature #965.</a>
</li>
<li>
Expand Down Expand Up @@ -873,7 +957,7 @@ <h3>
</li>
<li>
The errorlist lexer understands some ANSI escape sequences to change foreground colour and intensity.
This is sufficient to colour diagnotic output from gcc and clang when -fdiagnostics-color set.
This is sufficient to colour diagnostic output from gcc and clang when -fdiagnostics-color set.
</li>
<li>
The errorlist lexer allows the line number to be 0 in GCC errors as some tools report whole file
Expand Down Expand Up @@ -936,7 +1020,7 @@ <h3>
</li>
<li>
External interfaces use the Sci_Position and Sci_PositionU typedefs instead of int and unsigned int
to allow for changes to a 64-bit interface on 64-bit plactforms in the future.
to allow for changes to a 64-bit interface on 64-bit platforms in the future.
Applications and external lexers should start using the new type names so that
they will be compatible when the 64-bit change occurs.
There is also Sci_PositionCR (long) for use in the Sci_CharacterRange struct which will
Expand Down
12 changes: 4 additions & 8 deletions scintilla/doc/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
<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="20160524" />
<meta name="Date.Modified" content="20160904" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
#versionlist {
Expand Down Expand Up @@ -56,8 +56,8 @@
GTK+, and OS X</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 3.6.6<br />
Site last modified May 24 2016</font>
<font color="#FFCC99" size="3"> Release version 3.6.7<br />
Site last modified September 4 2016</font>
</td>
<td width="20%">
&nbsp;
Expand All @@ -72,13 +72,9 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 3.6.7 changes SC_CHARSET_DEFAULT on Windows to mean European code page 1252 unless a code page is set.
<li>Version 3.6.6 enables C++11 &lt;regex&gt; by default.
<li>Version 3.6.5 adds a JSON lexer and removes the font cache on GTK+.
<li>Version 3.6.4 avoids some folding bugs by automatically unfolding and improves clipboard robustness on Win32.</li>
<li>Version 3.6.3 supports idle-time styling.</li>
<li>Version 3.6.2 fixes crashes and other bugs, particularly on Cocoa.</li>
<li>Version 3.6.1 adds minor features and fixes bugs.</li>
<li>Version 3.6.0 implements more multiple selection operations.
Type definitions Sci_Position, Sci_PositionU, and Sci_PositionCR allow client
code to prepare for a future change allowing larger than 2 GB documents.</li>
</ul>
Expand Down
1 change: 1 addition & 0 deletions scintilla/include/Scintilla.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCVS_NONE 0
#define SCVS_RECTANGULARSELECTION 1
#define SCVS_USERACCESSIBLE 2
#define SCVS_NOWRAPLINESTART 4
#define SCI_SETVIRTUALSPACEOPTIONS 2596
#define SCI_GETVIRTUALSPACEOPTIONS 2597
#define SCI_SETRECTANGULARSELECTIONMODIFIER 2598
Expand Down
1 change: 1 addition & 0 deletions scintilla/include/Scintilla.iface
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2331,6 +2331,7 @@ enu VirtualSpace=SCVS_
val SCVS_NONE=0
val SCVS_RECTANGULARSELECTION=1
val SCVS_USERACCESSIBLE=2
val SCVS_NOWRAPLINESTART=4

set void SetVirtualSpaceOptions=2596(int virtualSpaceOptions,)
get int GetVirtualSpaceOptions=2597(,)
Expand Down
Loading

0 comments on commit 7529a6b

Please sign in to comment.