From 33425dc5b7862b88cfdf64555cc16b3f1e227719 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 30 Nov 2012 20:56:00 +0100 Subject: [PATCH] Upgraded to scintilla 3.2.3 Signed-off-by: Sven Strickroth --- ext/build/ScintillaLexer.vcproj | 4 + ext/scintilla/doc/ScintillaDoc.html | 35 +++++- ext/scintilla/doc/ScintillaDownload.html | 10 +- ext/scintilla/doc/ScintillaHistory.html | 199 +++++++++++++++++++++++++++++++ ext/scintilla/doc/ScintillaRelated.html | 4 + ext/scintilla/doc/index.html | 10 +- ext/scintilla/include/Platform.h | 5 + ext/scintilla/include/SciLexer.h | 7 ++ ext/scintilla/include/Scintilla.h | 8 +- ext/scintilla/include/Scintilla.iface | 21 ++++ ext/scintilla/include/ScintillaWidget.h | 4 +- ext/scintilla/lexers/LexBash.cxx | 156 ++++++++++++++++++++++-- ext/scintilla/lexers/LexCPP.cxx | 15 ++- ext/scintilla/lexers/LexHTML.cxx | 2 +- ext/scintilla/lexers/LexLua.cxx | 2 +- ext/scintilla/lexers/LexOthers.cxx | 93 ++------------- ext/scintilla/lexers/LexPO.cxx | 149 +++++++++++++++++++++++ ext/scintilla/lexers/LexRuby.cxx | 14 ++- ext/scintilla/lexers/LexSQL.cxx | 33 +++-- ext/scintilla/lexers/LexYAML.cxx | 2 +- ext/scintilla/src/AutoComplete.cxx | 4 +- ext/scintilla/src/AutoComplete.h | 2 + ext/scintilla/src/CallTip.cxx | 18 +-- ext/scintilla/src/CallTip.h | 5 + ext/scintilla/src/Catalogue.cxx | 2 +- ext/scintilla/src/Document.cxx | 24 +++- ext/scintilla/src/Document.h | 6 +- ext/scintilla/src/Editor.cxx | 106 +++++++++------- ext/scintilla/src/Editor.h | 6 +- ext/scintilla/src/Indicator.cxx | 51 ++++++-- ext/scintilla/src/LineMarker.cxx | 12 +- ext/scintilla/src/LineMarker.h | 2 +- ext/scintilla/src/RESearch.cxx | 2 +- ext/scintilla/src/RunStyles.cxx | 1 + ext/scintilla/src/ScintillaBase.cxx | 4 +- ext/scintilla/src/XPM.cxx | 13 +- ext/scintilla/src/XPM.h | 6 +- ext/scintilla/version.txt | 2 +- ext/scintilla/win32/CheckD2D.cxx | 3 + ext/scintilla/win32/PlatWin.cxx | 129 +++++++++++--------- ext/scintilla/win32/ScintRes.rc | 4 +- ext/scintilla/win32/ScintillaWin.cxx | 63 +++++----- ext/scintilla/win32/scintilla.mak | 11 +- ext/scintilla/win32/scintilla_vc6.mak | 3 + 44 files changed, 931 insertions(+), 321 deletions(-) create mode 100644 ext/scintilla/lexers/LexPO.cxx create mode 100644 ext/scintilla/win32/CheckD2D.cxx diff --git a/ext/build/ScintillaLexer.vcproj b/ext/build/ScintillaLexer.vcproj index 43e23ee07..57279cd63 100644 --- a/ext/build/ScintillaLexer.vcproj +++ b/ext/build/ScintillaLexer.vcproj @@ -839,6 +839,10 @@ > + + diff --git a/ext/scintilla/doc/ScintillaDoc.html b/ext/scintilla/doc/ScintillaDoc.html index 619fb00b7..4eda3ca03 100644 --- a/ext/scintilla/doc/ScintillaDoc.html +++ b/ext/scintilla/doc/ScintillaDoc.html @@ -79,7 +79,7 @@

Scintilla Documentation

-

Last edited 27/June/2012 NH

+

Last edited 21/July/2012 NH

There is an overview of the internal design of Scintilla.
@@ -911,8 +911,8 @@ struct Sci_TextToFind { pasting from the clipboard into the document, and clearing the document. SCI_CANPASTE returns non-zero if the document isn't read-only and if the selection doesn't contain protected text. If you need a "can copy" or "can cut", use - SCI_GETSELECTIONSTART()-SCI_GETSELECTIONEND(), which will be non-zero if you can - copy or cut to the clipboard.

+ SCI_GETSELECTIONEMPTY(), which will be zero if there are any non-empty + selection ranges implying that a copy or cut to the clipboard should work.

GTK+ does not really support SCI_CANPASTE and always returns TRUE unless the document is read-only.

@@ -1504,6 +1504,7 @@ struct Sci_TextToFind {
SCI_GETSELECTIONS
+ SCI_GETSELECTIONEMPTY
SCI_CLEARSELECTIONS
SCI_SETSELECTION(int caret, int anchor)
SCI_ADDSELECTION(int caret, int anchor)
@@ -1615,6 +1616,10 @@ struct Sci_TextToFind { Return the number of selections currently active.

+ SCI_GETSELECTIONEMPTY
+ Return 1 if every selected range is empty else 0.

+ +

SCI_CLEARSELECTIONS
Set a single empty selection at 0 as the only selection.

@@ -3360,6 +3365,7 @@ struct Sci_TextToFind { const char *xpm)
SCI_RGBAIMAGESETWIDTH(int width)
SCI_RGBAIMAGESETHEIGHT(int height)
+ SCI_RGBAIMAGESETSCALE(int scalePercent)
SCI_MARKERDEFINERGBAIMAGE(int markerNumber, const char *pixels)
SCI_MARKERSYMBOLDEFINED(int markerNumber) @@ -3549,12 +3555,16 @@ struct Sci_TextToFind {

SCI_RGBAIMAGESETWIDTH(int width)
SCI_RGBAIMAGESETHEIGHT(int height)
+ SCI_RGBAIMAGESETSCALE(int scalePercent)
SCI_MARKERDEFINERGBAIMAGE(int markerNumber, const char *pixels)
Markers can be set to translucent pixmaps with this message. The RGBA format is used for the pixmap. The width and height must previously been set with the SCI_RGBAIMAGESETWIDTH and - SCI_RGBAIMAGESETHEIGHT messages. - Pixmaps use the SC_MARK_RGBAIMAGE marker symbol.

+ SCI_RGBAIMAGESETHEIGHT messages.

+

A scale factor in percent may be set with SCI_RGBAIMAGESETSCALE. 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. + The default scale, 100, will stretch each image pixel to cover 4 screen pixels on a retina display.

+

Pixmaps use the SC_MARK_RGBAIMAGE marker symbol.

SCI_MARKERSYMBOLDEFINED(int markerNumber)
Returns the symbol defined for a markerNumber with SCI_MARKERDEFINE @@ -3801,6 +3811,17 @@ struct Sci_TextToFind { Not available for OS X Carbon. + + INDIC_SQUIGGLEPIXMAP + + 13 + + A version of INDIC_SQUIGGLE that draws using a pixmap instead of + as a series of line segments for performance. + Measured to be between 3 and 6 times faster than INDIC_SQUIGGLE on GTK+. + Apperance will not be as good as INDIC_SQUIGGLE on OS X in HiDPI mode. + + @@ -4397,6 +4418,10 @@ struct Sci_TextToFind { SCI_VCHOMEWRAP SCI_VCHOMEWRAPEXTEND + + SCI_VCHOMEDISPLAY + + SCI_VCHOMEDISPLAYEXTEND diff --git a/ext/scintilla/doc/ScintillaDownload.html b/ext/scintilla/doc/ScintillaDownload.html index ea8c56d9c..9b305fe3e 100644 --- a/ext/scintilla/doc/ScintillaDownload.html +++ b/ext/scintilla/doc/ScintillaDownload.html @@ -25,9 +25,9 @@ @@ -41,7 +41,7 @@ containing very few restrictions.

- Release 3.2.1 + Release 3.2.3

Source Code @@ -49,8 +49,8 @@ The source code package contains all of the source code for Scintilla but no binary executable code and is available in
    -
  • zip format (1250K) commonly used on Windows
    • -
  • tgz format (1100K) commonly used on Linux and compatible operating systems
    • +
  • zip format (1250K) commonly used on Windows
    • +
  • tgz format (1100K) commonly used on Linux and compatible operating systems
Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/ext/scintilla/doc/ScintillaHistory.html b/ext/scintilla/doc/ScintillaHistory.html index d17c556d4..13f7fc7c9 100644 --- a/ext/scintilla/doc/ScintillaHistory.html +++ b/ext/scintilla/doc/ScintillaHistory.html @@ -409,6 +409,10 @@

+ + + +
- + Windows   - + GTK+/Linux   Denis Shelomovskij darmar John VellaChinh Nguyen
Sakshi VermaJoel B. Mohler

@@ -421,6 +425,201 @@

+ Release 3.2.3 +

+ +

+ Release 3.2.2 +

+ +

Release 3.2.1