CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-07-21 21:02:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

chore: Update to Scintilla v5.6.4

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2026-07-09 09:13:51 +02:00
parent 92a3be7a99
commit 4e6054641f
38 changed files with 440 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scintilla/call/ScintillaCall.cxx
View File

@ -3567,6 +3567,14 @@ void ScintillaCall::SetILexer(void *ilexer) {
CallPointer(Message::SetILexer, 0, ilexer);
}
void ScintillaCall::SetScaleTechnique(Scintilla::ScaleTechnique technique) {
Call(Message::SetScaleTechnique, static_cast<uintptr_t>(technique));
}
ScaleTechnique ScintillaCall::ScaleTechnique() {
return static_cast<Scintilla::ScaleTechnique>(Call(Message::GetScaleTechnique));
}
Bidirectional ScintillaCall::Bidirectional() {
return static_cast<Scintilla::Bidirectional>(Call(Message::GetBidirectional));
}

4
scintilla/cppcheck.suppress
View File

@ -43,6 +43,9 @@ knownConditionTrueFalse:scintilla/win32/ScintillaWin.cxx
// GetData is implementing interface so shouldn't add const
constParameterPointer:scintilla/win32/ScintillaWin.cxx
// Window::SetCursor could be static if only on Win32 but not on other platforms
functionStatic:scintilla/win32/PlatWin.cxx
// Doesn't handle intptr_t (long long) being signed
knownConditionTrueFalse:scintilla/src/Editor.cxx
knownConditionTrueFalse:scintilla/src/EditView.cxx
@ -94,7 +97,6 @@ unusedFunction:scintilla/call/ScintillaCall.cxx
// Don't want to unnecessarily allow const pointers to be made mutable through reinterpret_cast
constParameterPointer:scintilla/call/ScintillaCall.cxx
constParameterPointer:scintilla/src/Editor.cxx
constVariablePointer:scintilla/src/Editor.cxx
// The performance cost of by-value passing is often small and using a reference decreases

31
scintilla/doc/ScintillaDoc.html
View File

@ -5106,6 +5106,8 @@ struct Sci_TextToFindFull {
</code>
<div class="provisional">
<code>
<a class="message" href="#SCI_SETSCALETECHNIQUE">SCI_SETSCALETECHNIQUE(int technique)</a><br />
<a class="message" href="#SCI_GETSCALETECHNIQUE">SCI_GETSCALETECHNIQUE &rarr; int</a><br />
<a class="message" href="#SCI_SETBIDIRECTIONAL"><span class="provisional">SCI_SETBIDIRECTIONAL(int bidirectional)</span></a><br />
<a class="message" href="#SCI_GETBIDIRECTIONAL">SCI_GETBIDIRECTIONAL &rarr; int</a><br />
</code>
@ -5355,6 +5357,35 @@ struct Sci_TextToFindFull {
<a class="message" href="#SCN_CHARADDED">SCN_CHARADDED</a>
notification (with <code class="parameter">characterSource</code> set to <code>SC_CHARACTERSOURCE_TENTATIVE_INPUT</code>) is sent for each character.</p>
<div class="provisional">
<p><b id="SCI_SETSCALETECHNIQUE">SCI_SETSCALETECHNIQUE(int technique)</b><br />
<b id="SCI_GETSCALETECHNIQUE">SCI_GETSCALETECHNIQUE &rarr; int</b><br />
This setting changes the implementation of display scaling on some platforms.</p>
<table class="standard" summary="Technology choice">
<tbody valign="top">
<tr>
<th align="left"><code>SCALE_TECHNIQUE_DEFAULT</code></th>
<td>0</td>
<td>Default behaviour for the platform.</td>
</tr>
<tr>
<th align="left"><code>SCALE_TECHNIQUE_PIXEL_ALIGNED</code></th>
<td>1</td>
<td>Align top and bottom of lines to physical pixels and avoid 'seams' between background rectangles for fractional scaling.
Implemented on Qt. This mode may be slower than the default.</td>
</tr>
</tbody>
</table>
</div>
<br />
<div class="provisional">
<a href="#ProvisionalMessages">These bidirectional features are experimental and incomplete.</a><br />
<p><b id="SCI_SETBIDIRECTIONAL">SCI_SETBIDIRECTIONAL(int bidirectional)</b><br />

10
scintilla/doc/ScintillaDownload.html
View File

@ -26,9 +26,9 @@
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
<td>
<font size="4"> <a href="https://www.scintilla.org/scintilla562.zip">
<font size="4"> <a href="https://www.scintilla.org/scintilla564.zip">
Windows</a>&nbsp;&nbsp;
<a href="https://www.scintilla.org/scintilla562.tgz">
<a href="https://www.scintilla.org/scintilla564.tgz">
GTK/Linux</a>&nbsp;&nbsp;
</font>
</td>
@ -42,7 +42,7 @@
containing very few restrictions.
</p>
<h3>
Release 5.6.2
Release 5.6.4
</h3>
<h4>
Source Code
@ -50,8 +50,8 @@
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="https://www.scintilla.org/scintilla562.zip">zip format</a> (1.8M) commonly used on Windows</li>
<li><a href="https://www.scintilla.org/scintilla562.tgz">tgz format</a> (1.7M) commonly used on Linux and compatible operating systems</li>
<li><a href="https://www.scintilla.org/scintilla564.zip">zip format</a> (1.8M) commonly used on Windows</li>
<li><a href="https://www.scintilla.org/scintilla564.tgz">tgz format</a> (1.7M) 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>

59
scintilla/doc/ScintillaHistory.html
View File

@ -595,9 +595,68 @@
<td>Nathaniel Braun</td>
</tr><tr>
<td>Stephan T. Lavavej</td>
<td>RealMalWare</td>
<td>Schreiner</td>
</tr>
</table>
<h2 id="Releases">Releases</h2>
<h3>
<a href="https://www.scintilla.org/scintilla564.zip">Release 5.6.4</a>
</h3>
<ul>
<li>
Released 6 July 2026.
</li>
<li>
On Qt improve display for fractional scaling by providing SCI_SETSCALETECHNIQUE API.
The SCALE_TECHNIQUE_PIXEL_ALIGNED value will eliminate potential 'seams' between lines
and between runs on a line.
<a href="https://sourceforge.net/p/scintilla/bugs/2450/">Bug #2450</a>.
</li>
<li>
Scintilla.iface is augmented with comments indicating which APIs take pixel values so may
be automatically scaled by wrappers.
For compatibility this is currently indicated in comments after each affected API but this will
change to using the 'pixels' type in a future version,
Downstream projects should examine this and make any needed changes, such as using floating
point types for wrapper methods.
To help migration, the scripts/FilterPixels.py script can convert this Scintilla.iface into the previous form
with no mention of 'pixels' or into the final form with 'pixels' as the only type for these features.
</li>
<li>
On Qt always place ScintillaEditBase library in scintilla/bin instead of depending on Qt version.
</li>
<li>
Optimize SCI_CHANGEINSERTION that sets empty insertion by not producing empty undo action
and potential save point change.
<a href="https://sourceforge.net/p/scintilla/feature-requests/1588/">Feature #1588</a>.
</li>
</ul>
<h3>
<a href="https://www.scintilla.org/scintilla563.zip">Release 5.6.3</a>
</h3>
<ul>
<li>
Released 6 June 2026.
</li>
<li>
Restore selection and scroll position for undo and redo on additional views instead of just the view
performing the undo or redo.
<a href="https://github.com/notepad-plus-plus/notepad-plus-plus/pull/18014">Notepad++ Pull Request #18014</a>.
</li>
<li>
Improve performance of rectangular paste when many spaces must be inserted.
<a href="https://sourceforge.net/p/scintilla/bugs/2302/">Bug #2302</a>.
</li>
<li>
On Win32, close the clipboard before inserting pasted or dropped text so that the clipboard is not blocked while
the insertion is performed.
<a href="https://sourceforge.net/p/scintilla/bugs/2507/">Bug #2507</a>.
</li>
<li>
On Qt with Wayland, fix failures with displaying calltips and autocompletion lists.
</li>
</ul>
<h3>
<a href="https://www.scintilla.org/scintilla562.zip">Release 5.6.2</a>
</h3>

10
scintilla/doc/index.html
View File

@ -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="20260429" />
<meta name="Date.Modified" content="20260706" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
.logo {
@ -61,8 +61,8 @@
GTK, and macOS</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 5.6.2<br />
Site last modified April 29 2026</font>
<font color="#FFCC99" size="3"> Release version 5.6.4<br />
Site last modified July 6 2026</font>
</td>
<td width="20%">
&nbsp;
@ -77,11 +77,11 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 5.6.4 implements pixel-aligned fractional scaling for Qt.</li>
<li>Version 5.6.3 restores selection and scroll position for undo and redo on additional views.</li>
<li>Version 5.6.2 adds error status SC_STATUS_OUTSIDE_DOCUMENT and stops out-of-bounds insertions earlier.</li>
<li>Version 5.6.1 adds mode to draw tabs as HT blobs and fixes a regression in SCI_CONVERTEOLS.</li>
<li>Version 5.6.0 fixes crash when window is too narrow to show any text.</li>
<li>Version 5.5.9 adds an option to disable drag &amp; drop. Fixes colour after line end.</li>
<li>Version 5.5.8 changes format of SCI_GETSELECTIONSERIALIZED and fixes redraw after undo.</li>
</ul>
<ul id="menu">
<li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>

4
scintilla/include/Scintilla.h
View File

@ -1351,6 +1351,10 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
#define SCN_MARGINRIGHTCLICK 2031
#define SCN_AUTOCSELECTIONCHANGE 2032
#ifndef SCI_DISABLE_PROVISIONAL
#define SCALE_TECHNIQUE_DEFAULT 0
#define SCALE_TECHNIQUE_PIXEL_ALIGNED 1
#define SCI_SETSCALETECHNIQUE 2820
#define SCI_GETSCALETECHNIQUE 2821
#define SC_BIDIRECTIONAL_DISABLED 0
#define SC_BIDIRECTIONAL_L2R 1
#define SC_BIDIRECTIONAL_R2L 2

50
scintilla/include/Scintilla.iface
View File

@ -66,6 +66,7 @@
## keymod -> integer containing key in low half and modifiers in high half
## formatrange
## formatrangefull
## pixels -> intptr_t pixel positions and sizes (experimental: used in ## line following definition)
## Enumeration types always start with a capital letter
## Types no longer used:
## findtextex -> searchrange
@ -214,10 +215,12 @@ set void SetTabDrawMode=2699(TabDrawMode tabDrawMode,)
# Find the position from a point within the window.
fun position PositionFromPoint=2022(int x, int y)
## fun position PositionFromPoint=2022(pixels x, pixels y)
# Find the position from a point within the window but return
# INVALID_POSITION if not close to text.
fun position PositionFromPointClose=2023(int x, int y)
## fun position PositionFromPointClose=2023(pixels x, pixels y)
# Set caret to start of a line and ensure it is visible.
fun void GotoLine=2024(line line,)
@ -276,9 +279,11 @@ get int GetTabWidth=2121(,)
# Set the minimum visual width of a tab.
set void SetTabMinimumWidth=2724(int pixels,)
## set void SetTabMinimumWidth=2724(pixels pixels,)
# Get the minimum visual width of a tab.
get int GetTabMinimumWidth=2725(,)
## get pixels GetTabMinimumWidth=2725(,)
# Clear explicit tabstops on a line.
fun void ClearTabStops=2675(line line,)
@ -443,6 +448,7 @@ set void MarkerSetBackSelectedTranslucent=2296(int markerNumber, colouralpha bac
# Set the width of strokes used in .01 pixels so 50 = 1/2 pixel width.
set void MarkerSetStrokeWidth=2297(int markerNumber, int hundredths)
## set void MarkerSetStrokeWidth=2297(int markerNumber, pixels hundredths)
# Enable/disable highlight for current folding block (smallest one that contains the caret)
fun void MarkerEnableHighlight=2293(bool enabled,)
@ -502,9 +508,11 @@ get MarginType GetMarginTypeN=2241(int margin,)
# Set the width of a margin to a width expressed in pixels.
set void SetMarginWidthN=2242(int margin, int pixelWidth)
## set void SetMarginWidthN=2242(int margin, pixels pixelWidth)
# Retrieve the width of a margin in pixels.
get int GetMarginWidthN=2243(int margin,)
## get pixels GetMarginWidthN=2243(int margin,)
# Set a mask that determines which markers are displayed in a margin.
set void SetMarginMaskN=2244(int margin, int mask)
@ -1023,9 +1031,11 @@ get IndicFlag IndicGetFlags=2685(int indicator,)
# Set the stroke width of an indicator in hundredths of a pixel.
set void IndicSetStrokeWidth=2751(int indicator, int hundredths)
## set void IndicSetStrokeWidth=2751(int indicator, pixels hundredths)
# Retrieve the stroke width of an indicator.
get int IndicGetStrokeWidth=2752(int indicator,)
## get pixels IndicGetStrokeWidth=2752(int indicator,)
# Set the foreground colour of all whitespace and whether to use this setting.
fun void SetWhitespaceFore=2084(bool useSetting, colour fore)
@ -1035,9 +1045,11 @@ fun void SetWhitespaceBack=2085(bool useSetting, colour back)
# Set the size of the dots used to mark space characters.
set void SetWhitespaceSize=2086(int size,)
## set void SetWhitespaceSize=2086(pixels size,)
# Get the size of the dots used to mark space characters.
get int GetWhitespaceSize=2087(,)
## get pixels GetWhitespaceSize=2087(,)
# Used to hold extra styling information for each line.
set void SetLineState=2092(line line, int state)
@ -1063,10 +1075,12 @@ set void SetCaretLineBack=2098(colour back,)
# Retrieve the caret line frame width.
# Width = 0 means this option is disabled.
get int GetCaretLineFrame=2704(,)
## get pixels GetCaretLineFrame=2704(,)
# Display the caret line framed.
# Set width != 0 to enable this option and width = 0 to disable it.
set void SetCaretLineFrame=2705(int width,)
## set void SetCaretLineFrame=2705(pixels width,)
# Set a style to be changeable or not (read only).
# Experimental feature, currently buggy.
@ -1390,15 +1404,19 @@ set void AllocateLines=2089(line lines,)
# Sets the size in pixels of the left margin.
set void SetMarginLeft=2155(, int pixelWidth)
## set void SetMarginLeft=2155(, pixels pixelWidth)
# Returns the size in pixels of the left margin.
get int GetMarginLeft=2156(,)
## get pixels GetMarginLeft=2156(,)
# Sets the size in pixels of the right margin.
set void SetMarginRight=2157(, int pixelWidth)
## set void SetMarginRight=2157(, pixels pixelWidth)
# Returns the size in pixels of the right margin.
get int GetMarginRight=2158(,)
## get pixels GetMarginRight=2158(,)
# Is the document different from when it was last saved?
get bool GetModify=2159(,)
@ -1427,9 +1445,11 @@ get bool GetSelectionHidden=2088(,)
# Retrieve the x value of the point in the window where a position is displayed.
fun int PointXFromPosition=2164(, position pos)
## fun pixels PointXFromPosition=2164(, position pos)
# Retrieve the y value of the point in the window where a position is displayed.
fun int PointYFromPosition=2165(, position pos)
## fun pixels PointYFromPosition=2165(, position pos)
# Retrieve the line containing a position.
fun line LineFromPosition=2166(position pos,)
@ -1513,9 +1533,11 @@ get bool GetOvertype=2187(,)
# Set the width of the insert mode caret.
set void SetCaretWidth=2188(int pixelWidth,)
## set void SetCaretWidth=2188(pixels pixelWidth,)
# Returns the width of the insert mode caret.
get int GetCaretWidth=2189(,)
## get pixels GetCaretWidth=2189(,)
# Sets the position that starts the target which is used for updating the
# document without affecting the scroll position.
@ -1612,6 +1634,7 @@ set void CallTipSetForeHlt=2207(colour fore,)
# Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
set void CallTipUseStyle=2212(int tabSize,)
## set void CallTipUseStyle=2212(pixels tabSize,)
# Set position of calltip, above or below text.
set void CallTipSetPosition=2213(bool above,)
@ -1830,9 +1853,11 @@ get WrapVisualLocation GetWrapVisualFlagsLocation=2463(,)
# Set the start indent for wrapped lines.
set void SetWrapStartIndent=2464(int indent,)
## set void SetWrapStartIndent=2464(pixels indent,)
# Retrive the start indent for wrapped lines.
get int GetWrapStartIndent=2465(,)
## get pixels GetWrapStartIndent=2465(,)
enu WrapIndentMode=SC_WRAPINDENT_
val SC_WRAPINDENT_FIXED=0
@ -1862,9 +1887,11 @@ get LineCache GetLayoutCache=2273(,)
# Sets the document width assumed for scrolling.
set void SetScrollWidth=2274(int pixelWidth,)
## set void SetScrollWidth=2274(pixels pixelWidth,)
# Retrieve the document width assumed for scrolling.
get int GetScrollWidth=2275(,)
## get pixels GetScrollWidth=2275(,)
# Sets whether the maximum width line displayed is used to set scroll width.
set void SetScrollWidthTracking=2516(bool tracking,)
@ -1876,6 +1903,7 @@ get bool GetScrollWidthTracking=2517(,)
# NUL terminated text argument.
# Does not handle tab or control characters.
fun int TextWidth=2276(int style, string text)
## fun pixels TextWidth=2276(int style, string text)
# Sets the scroll range so that maximum scroll position has
# the last line at the bottom of the view (default).
@ -1888,6 +1916,7 @@ get bool GetEndAtLastLine=2278(,)
# Retrieve the height of a particular line of text in pixels.
fun int TextHeight=2279(line line,)
## fun pixels TextHeight=2279(line line,)
# Show or hide the vertical scroll bar.
set void SetVScrollBar=2280(bool visible,)
@ -1950,6 +1979,7 @@ fun void LinesJoin=2288(,)
# Split the lines in the target into lines that are less wide than pixelWidth
# where possible.
fun void LinesSplit=2289(int pixelWidth,)
## fun void LinesSplit=2289(pixels pixelWidth,)
# Set one of the colours used as a chequerboard pattern in the fold margin
fun void SetFoldMarginColour=2290(bool useSetting, colour back)
@ -2368,9 +2398,11 @@ fun void DelLineRight=2396(,)
# Set the xOffset (ie, horizontal scroll position).
set void SetXOffset=2397(int xOffset,)
## set void SetXOffset=2397(pixels xOffset,)
# Get the xOffset (ie, horizontal scroll position).
get int GetXOffset=2398(,)
## get pixels GetXOffset=2398(,)
# Set the last x chosen value to be the caret x position.
fun void ChooseCaretX=2399(,)
@ -2405,6 +2437,7 @@ val CARET_EVEN=0x08
# Set the way the caret is kept visible when going sideways.
# The exclusion zone is given in pixels.
fun void SetXCaretPolicy=2402(CaretPolicy caretPolicy, int caretSlop)
## fun void SetXCaretPolicy=2402(CaretPolicy caretPolicy, pixels caretSlop)
# Set the way the line the caret is on is kept visible.
# The exclusion zone is given in lines.
@ -2773,15 +2806,19 @@ get Alpha IndicGetOutlineAlpha=2559(int indicator,)
# Set extra ascent for each line
set void SetExtraAscent=2525(int extraAscent,)
## set void SetExtraAscent=2525(pixels extraAscent,)
# Get extra ascent for each line
get int GetExtraAscent=2526(,)
## get pixels GetExtraAscent=2526(,)
# Set extra descent for each line
set void SetExtraDescent=2527(int extraDescent,)
## set void SetExtraDescent=2527(pixels extraDescent,)
# Get extra descent for each line
get int GetExtraDescent=2528(,)
## get pixels GetExtraDescent=2528(,)
# Which symbol was defined for markerNumber with MarkerDefine
fun MarkerSymbol MarkerSymbolDefined=2529(int markerNumber,)
@ -2882,10 +2919,12 @@ fun void AddUndoAction=2560(int token, UndoFlags flags)
# Find the position of a character from a point within the window.
fun position CharPositionFromPoint=2561(int x, int y)
## fun position CharPositionFromPoint=2561(pixels x, pixels y)
# Find the position of a character from a point within the window.
# Return INVALID_POSITION if not close to text.
fun position CharPositionFromPointClose=2562(int x, int y)
## fun position CharPositionFromPointClose=2562(pixels x, pixels y)
# Set whether switching to rectangular mode while selecting with the mouse is allowed.
set void SetMouseSelectionRectangularSwitch=2668(bool mouseSelectionRectangularSwitch,)
@ -2934,6 +2973,7 @@ fun void AddSelection=2573(position caret, position anchor)
# Find the selection index for a point. -1 when not at a selection.
fun int SelectionFromPoint=2474(int x, int y)
## fun int SelectionFromPoint=2474(pixels x, pixels y)
# Drop one selection
fun void DropSelectionN=2671(int selection,)
@ -3558,6 +3598,16 @@ evt void AutoCSelectionChange=2032(int listType, string text, int position)
cat Provisional
enu ScaleTechnique=SCALE_TECHNIQUE_
val SCALE_TECHNIQUE_DEFAULT=0
val SCALE_TECHNIQUE_PIXEL_ALIGNED=1
# Set the scale technique
set void SetScaleTechnique=2820(ScaleTechnique technique,)
# Get the scale technique
get ScaleTechnique GetScaleTechnique=2821(,)
enu Bidirectional=SC_BIDIRECTIONAL_
val SC_BIDIRECTIONAL_DISABLED=0
val SC_BIDIRECTIONAL_L2R=1

2
scintilla/include/ScintillaCall.h
View File

@ -937,6 +937,8 @@ public:
int DescriptionOfStyle(int style, char *description);
std::string DescriptionOfStyle(int style);
void SetILexer(void *ilexer);
void SetScaleTechnique(Scintilla::ScaleTechnique technique);
Scintilla::ScaleTechnique ScaleTechnique();
Scintilla::Bidirectional Bidirectional();
void SetBidirectional(Scintilla::Bidirectional bidirectional);

2
scintilla/include/ScintillaMessages.h
View File

@ -833,6 +833,8 @@ enum class Message {
TagsOfStyle = 4031,
DescriptionOfStyle = 4032,
SetILexer = 4033,
SetScaleTechnique = 2820,
GetScaleTechnique = 2821,
GetBidirectional = 2708,
SetBidirectional = 2709,
};

5
scintilla/include/ScintillaTypes.h
View File

@ -679,6 +679,11 @@ enum class CharacterSource {
ImeResult = 2,
};
enum class ScaleTechnique {
Default = 0,
PixelAligned = 1,
};
enum class Bidirectional {
Disabled = 0,
L2R = 1,

28
scintilla/scripts/Face.py
View File

@ -67,12 +67,17 @@ class Face:
self.events = {}
self.aliases = {}
def ReadFromFile(self, name):
def ReadFromFile(self, name, pickUpPixels=False):
currentCategory = ""
currentComment = []
currentCommentFinished = 0
file = open(name)
for line in file:
if pickUpPixels:
stripped = line.strip()
if stripped.startswith("## "):
self.ApplyPixelComment(stripped[3:])
continue
line = sanitiseLine(line)
if line:
if line[0] == "#":
@ -145,3 +150,24 @@ class Face:
self.aliases[name] = value
currentComment = []
file.close()
def ApplyPixelComment(self, featureVal):
# A '## <fun|get|set ... pixels ...>' comment below a message re-types
# the named feature's pixels slots, so a caller passing pickUpPixels=True
# sees them. Other consumers ignore it, since sanitiseLine strips '##'.
featureType, _, rest = featureVal.partition(" ")
if featureType not in ("fun", "get", "set") or not rest:
return
try:
retType, name, value, param1, param2 = decodeFunction(rest)
except ValueError:
return
feature = self.features.get(name)
if feature is None:
return
if retType == "pixels":
feature["ReturnType"] = "pixels"
if decodeParam(param1)[0] == "pixels":
feature["Param1Type"] = "pixels"
if decodeParam(param2)[0] == "pixels":
feature["Param2Type"] = "pixels"

5
scintilla/scripts/HeaderOrder.txt
View File

@ -37,7 +37,9 @@
// C++ standard library
#include <stdexcept>
#include <system_error>
#include <new>
#include <utility>
#include <string>
#include <string_view>
#include <vector>
@ -54,6 +56,8 @@
#include <chrono>
#include <charconv>
#include <regex>
#include <ios>
#include <ostream>
#include <iostream>
#include <sstream>
#include <fstream>
@ -63,6 +67,7 @@
#include <thread>
#include <future>
#include <type_traits>
#include <locale>
// GTK headers
#include <glib.h>

1
scintilla/src/ChangeHistory.cxx
View File

@ -11,6 +11,7 @@
#include <cassert>
#include <stdexcept>
#include <utility>
#include <vector>
#include <set>
#include <algorithm>

1
scintilla/src/CharacterCategoryMap.cxx
View File

@ -9,6 +9,7 @@
// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed.
#include <utility>
#include <vector>
#include <algorithm>
#include <iterator>

1
scintilla/src/ContractionState.cxx
View File

@ -10,6 +10,7 @@
#include <cstring>
#include <stdexcept>
#include <utility>
#include <string_view>
#include <vector>
#include <optional>

1
scintilla/src/Decoration.cxx
View File

@ -12,6 +12,7 @@
#include <cstdarg>
#include <stdexcept>
#include <utility>
#include <string_view>
#include <vector>
#include <optional>

21
scintilla/src/Document.cxx
View File

@ -14,6 +14,8 @@
#include <cmath>
#include <stdexcept>
#include <new>
#include <utility>
#include <string>
#include <string_view>
#include <vector>
@ -22,6 +24,7 @@
#include <forward_list>
#include <optional>
#include <algorithm>
#include <iterator>
#include <memory>
#include <chrono>
@ -1509,6 +1512,10 @@ Sci::Position Document::InsertString(Sci::Position position, const char *s, Sci:
position, insertLength,
0, s));
if (insertionSet) {
if (insertion.empty()) {
enteredModification--;
return 0;
}
s = insertion.c_str();
insertLength = insertion.length();
}
@ -1630,7 +1637,7 @@ Sci::Position Document::Undo() {
modFlags |= ModificationFlags::MultilineUndoRedo;
}
NotifyModified(DocModification(modFlags, action.position, action.lenData,
linesAdded, action.data));
linesAdded, action.data, 0, newPos));
}
const bool endSavePoint = cb.IsSavePoint();
@ -1690,7 +1697,7 @@ Sci::Position Document::Redo() {
}
NotifyModified(
DocModification(modFlags, action.position, action.lenData,
linesAdded, action.data));
linesAdded, action.data, 0, newPos));
}
const bool endSavePoint = cb.IsSavePoint();
@ -1896,13 +1903,13 @@ constexpr std::string_view EOLForMode(EndOfLine eolMode) noexcept {
// Convert line endings for a piece of text to a particular mode.
// Stop at len or when a NUL is found.
std::string Document::TransformLineEnds(const char *s, size_t len, EndOfLine eolModeWanted) {
std::string Document::TransformLineEnds(std::string_view s, EndOfLine eolModeWanted) {
std::string dest;
const std::string_view eol = EOLForMode(eolModeWanted);
for (size_t i = 0; (i < len) && (s[i]); i++) {
for (size_t i = 0; (i < s.length()) && (s[i]); i++) {
if (s[i] == '\n' || s[i] == '\r') {
dest.append(eol);
if ((s[i] == '\r') && (i+1 < len) && (s[i+1] == '\n')) {
if ((s[i] == '\r') && (i+1 < s.length()) && (s[i+1] == '\n')) {
i++;
}
} else {
@ -1912,6 +1919,10 @@ std::string Document::TransformLineEnds(const char *s, size_t len, EndOfLine eol
return dest;
}
std::string Document::TransformLineEnds(const char *s, size_t len, EndOfLine eolModeWanted) {
return TransformLineEnds(std::string_view(s, len), eolModeWanted);
}
void Document::ConvertLineEnds(EndOfLine eolModeSet) {
UndoGroup ug(this);

12
scintilla/src/Document.h
View File

@ -138,6 +138,9 @@ struct StyledText {
size_t StyleAt(size_t i) const noexcept {
return multipleStyles ? styles[i] : style;
}
std::string_view AsView() const noexcept {
return { text, length };
}
};
class HighlightDelimiter {
@ -470,7 +473,8 @@ public:
Sci::Position CountUTF16(Sci::Position startPos, Sci::Position endPos) const noexcept;
Sci::Position FindColumn(Sci::Line line, Sci::Position column) const noexcept;
void Indent(bool forwards, Sci::Line lineBottom, Sci::Line lineTop);
static std::string TransformLineEnds(const char *s, size_t len, Scintilla::EndOfLine eolModeWanted);
static std::string TransformLineEnds(std::string_view s, Scintilla::EndOfLine eolModeWanted);
[[deprecated]]static std::string TransformLineEnds(const char *s, size_t len, Scintilla::EndOfLine eolModeWanted);
void ConvertLineEnds(Scintilla::EndOfLine eolModeSet);
std::string_view EOLString() const noexcept;
void SetReadOnly(bool set) noexcept { cb.SetReadOnly(set); }
@ -658,9 +662,10 @@ public:
Scintilla::FoldLevel foldLevelPrev;
Sci::Line annotationLinesAdded;
Sci::Position token;
Sci::Position newPos = -1; /**< Reasonable new caret position after undo or redo. */
DocModification(Scintilla::ModificationFlags modificationType_, Sci::Position position_=0, Sci::Position length_=0,
Sci::Line linesAdded_=0, const char *text_=nullptr, Sci::Line line_=0) noexcept :
Sci::Line linesAdded_=0, const char *text_=nullptr, Sci::Line line_=0, Sci::Position newPos_=-1) noexcept :
modificationType(modificationType_),
position(position_),
length(length_),
@ -670,7 +675,8 @@ public:
foldLevelNow(Scintilla::FoldLevel::None),
foldLevelPrev(Scintilla::FoldLevel::None),
annotationLinesAdded(0),
token(0) {}
token(0),
newPos(newPos_) {}
DocModification(Scintilla::ModificationFlags modificationType_, const Action &act, Sci::Line linesAdded_=0) noexcept :
modificationType(modificationType_),

3
scintilla/src/EditView.cxx
View File

@ -14,6 +14,7 @@
#include <cmath>
#include <stdexcept>
#include <utility>
#include <string>
#include <string_view>
#include <vector>
@ -806,7 +807,7 @@ Sci::Position EditView::StartEndDisplayLine(Surface *surface, const EditModel &m
const Sci::Position posLineStart = model.pdoc->LineStart(line);
LayoutLine(model, surface, vs, ll.get(), model.wrapWidth);
const Sci::Position posInLine = pos - posLineStart;
if (posInLine <= ll->maxLineLength) {
if (posInLine <= ll->numCharsInLine) {
for (int subLine = 0; subLine < ll->lines; subLine++) {
if ((posInLine >= ll->LineStart(subLine)) &&
(posInLine <= ll->LineStart(subLine + 1)) &&

153
scintilla/src/Editor.cxx
View File

@ -14,6 +14,7 @@
#include <cmath>
#include <stdexcept>
#include <utility>
#include <string>
#include <string_view>
#include <vector>
@ -115,6 +116,10 @@ constexpr bool IsAllSpacesOrTabs(std::string_view sv) noexcept {
return true;
}
sptr_t SPtrFromPtr(const void *ptr) noexcept {
return reinterpret_cast<sptr_t>(ptr);
}
}
Timer::Timer() noexcept :
@ -1613,10 +1618,10 @@ bool Editor::WrapBlock(Surface *surface, Sci::Line lineToWrap, Sci::Line lineToW
std::shared_ptr<LineLayout> llLarge = std::make_shared<LineLayout>(-1, 200);
for (size_t indexLarge = 0; indexLarge < linesBeingWrapped; indexLarge++) {
const Sci::Line lineNumber = lineToWrap + indexLarge;
const Range rangeLine = pdoc->LineRange(lineNumber);
const Sci::Position lengthLine = rangeLine.Length();
if (lengthLine >= lengthToMultiThread) {
if (linesAfterWrap[indexLarge] == 0) {
const Sci::Line lineNumber = lineToWrap + indexLarge;
const Range rangeLine = pdoc->LineRange(lineNumber);
const Sci::Position lengthLine = rangeLine.Length();
std::shared_ptr<LineLayout> ll;
if (significantLines.LineMayCache(lineNumber)) {
ll = view.RetrieveLineLayout(lineNumber, *this);
@ -2170,7 +2175,7 @@ void Editor::InsertCharacter(std::string_view sv, CharacterSource charSource) {
if (recordingMacro && charSource != CharacterSource::TentativeInput) {
std::string copy(sv); // ensure NUL-terminated
NotifyMacroRecord(Message::ReplaceSel, 0, reinterpret_cast<sptr_t>(copy.data()));
NotifyMacroRecord(Message::ReplaceSel, 0, SPtrFromPtr(copy.data()));
}
}
@ -2199,11 +2204,11 @@ void Editor::ClearBeforeTentativeStart() {
}
}
void Editor::InsertPaste(const char *text, Sci::Position len) {
void Editor::InsertPaste(std::string_view text) {
if (multiPasteMode == MultiPaste::Once) {
SelectionPosition selStart = sel.Start();
selStart = RealizeVirtualSpace(selStart);
const Sci::Position lengthInserted = pdoc->InsertString(selStart.Position(), text, len);
const Sci::Position lengthInserted = pdoc->InsertString(selStart.Position(), text);
if (lengthInserted > 0) {
SetEmptySelection(selStart.Position() + lengthInserted);
}
@ -2214,7 +2219,7 @@ void Editor::InsertPaste(const char *text, Sci::Position len) {
Sci::Position positionInsert = sel.Range(r).Start().Position();
ClearSelectionRange(sel.Range(r));
positionInsert = RealizeVirtualSpace(positionInsert, sel.Range(r).caret.VirtualSpace());
const Sci::Position lengthInserted = pdoc->InsertString(positionInsert, text, len);
const Sci::Position lengthInserted = pdoc->InsertString(positionInsert, text);
if (lengthInserted > 0) {
sel.Range(r) = SelectionRange(positionInsert + lengthInserted);
}
@ -2224,22 +2229,25 @@ void Editor::InsertPaste(const char *text, Sci::Position len) {
}
}
void Editor::InsertPasteShape(const char *text, Sci::Position len, PasteShape shape) {
void Editor::InsertPaste(const char *text, Sci::Position len) {
InsertPaste(std::string_view(text, len));
}
void Editor::InsertPasteShape(std::string_view text, PasteShape shape) {
std::string convertedText;
if (convertPastes) {
// Convert line endings of the paste into our local line-endings mode
convertedText = Document::TransformLineEnds(text, len, pdoc->eolMode);
len = convertedText.length();
text = convertedText.c_str();
convertedText = Document::TransformLineEnds(text, pdoc->eolMode);
text = convertedText;
}
if (shape == PasteShape::rectangular) {
PasteRectangular(sel.Start(), text, len);
PasteRectangular(sel.Start(), text);
} else {
if (shape == PasteShape::line) {
const Sci::Position insertPos = pdoc->LineStartPosition(sel.MainCaret());
Sci::Position lengthInserted = pdoc->InsertString(insertPos, text, len);
Sci::Position lengthInserted = pdoc->InsertString(insertPos, text);
// add the newline if necessary
if ((len > 0) && (text[len - 1] != '\n' && text[len - 1] != '\r')) {
if ((!text.empty()) && (!AnyOf(text.back(), '\n', '\r'))) {
const std::string_view endline = pdoc->EOLString();
lengthInserted += pdoc->InsertString(insertPos + lengthInserted, endline);
}
@ -2247,11 +2255,15 @@ void Editor::InsertPasteShape(const char *text, Sci::Position len, PasteShape sh
SetEmptySelection(sel.MainCaret() + lengthInserted);
}
} else {
InsertPaste(text, len);
InsertPaste(text);
}
}
}
void Editor::InsertPasteShape(const char *text, Sci::Position len, PasteShape shape) {
InsertPasteShape(std::string_view(text, len), shape);
}
void Editor::ClearSelection(bool retainMultipleSelections) {
if (!sel.IsRectangular() && !retainMultipleSelections)
FilterSelections();
@ -2331,7 +2343,7 @@ void Editor::Cut() {
}
}
void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Position len) {
void Editor::PasteRectangular(SelectionPosition pos, std::string_view text) {
if (pdoc->IsReadOnly() || SelectionContainsProtected()) {
return;
}
@ -2342,11 +2354,17 @@ void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Posit
sel.RangeMain().caret = RealizeVirtualSpace(sel.RangeMain().caret);
const int xInsert = XFromPosition(sel.RangeMain().caret);
bool prevCr = false;
while ((len > 0) && IsEOLCharacter(ptr[len-1]))
len--;
for (Sci::Position i = 0; i < len; i++) {
if (IsEOLCharacter(ptr[i])) {
if ((ptr[i] == '\r') || (!prevCr))
constexpr Sci::Position maxBatchSpaces = 8192;
XYPOSITION maxSpaceWidth = 0;
for (const Style &style : vs.styles) {
maxSpaceWidth = std::max(maxSpaceWidth, style.spaceWidth);
}
while ((!text.empty()) && IsEOLCharacter(text.back())) {
text.remove_suffix(1);
}
for (size_t i = 0; i < text.length(); i++) {
if (IsEOLCharacter(text[i])) {
if ((text[i] == '\r') || (!prevCr))
line++;
if (line >= pdoc->LinesTotal()) {
const std::string_view eol = pdoc->EOLString();
@ -2354,16 +2372,33 @@ void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Posit
}
// Pad the end of lines with spaces if required
sel.RangeMain().caret.SetPosition(PositionFromLineX(line, xInsert));
if ((XFromPosition(sel.RangeMain().caret) < xInsert) && (i + 1 < len)) {
const int xCurrent = XFromPosition(sel.RangeMain().caret);
if ((xCurrent < xInsert) && (i + 1 < text.length())) {
if (pdoc->IsLineEndPosition(sel.MainCaret())) {
int xAfterBatch = xCurrent;
while ((xAfterBatch < xInsert) && (maxSpaceWidth > 0)) {
const int missing = xInsert - xAfterBatch;
const Sci::Position spacesEstimate = static_cast<Sci::Position>(missing / maxSpaceWidth);
if (spacesEstimate <= 2) {
break;
}
const Sci::Position batchSpaces = std::min(spacesEstimate - 1, maxBatchSpaces);
const std::string pad(static_cast<size_t>(batchSpaces), ' ');
const Sci::Position lengthInserted = pdoc->InsertString(sel.MainCaret(), pad);
sel.RangeMain().caret.Add(lengthInserted);
xAfterBatch = XFromPosition(sel.RangeMain().caret);
}
}
while (XFromPosition(sel.RangeMain().caret) < xInsert) {
assert(pdoc);
const Sci::Position lengthInserted = pdoc->InsertString(sel.MainCaret(), " ", 1);
sel.RangeMain().caret.Add(lengthInserted);
}
}
prevCr = ptr[i] == '\r';
prevCr = text[i] == '\r';
} else {
const Sci::Position lengthInserted = pdoc->InsertString(sel.MainCaret(), ptr + i, 1);
const Sci::Position lengthInserted = pdoc->InsertString(sel.MainCaret(), text.substr(i, 1));
sel.RangeMain().caret.Add(lengthInserted);
prevCr = false;
}
@ -2371,6 +2406,10 @@ void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Posit
SetEmptySelection(pos);
}
void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Position len) {
PasteRectangular(pos, std::string_view(ptr, len));
}
bool Editor::CanPaste() {
return !pdoc->IsReadOnly() && !SelectionContainsProtected();
}
@ -2446,15 +2485,13 @@ void Editor::RestoreSelection(Sci::Position newPos, UndoRedo history) {
void Editor::Undo() {
if (pdoc->CanUndo()) {
InvalidateCaret();
const Sci::Position newPos = pdoc->Undo();
RestoreSelection(newPos, UndoRedo::undo);
pdoc->Undo();
}
}
void Editor::Redo() {
if (pdoc->CanRedo()) {
const Sci::Position newPos = pdoc->Redo();
RestoreSelection(newPos, UndoRedo::redo);
pdoc->Redo();
}
}
@ -2926,6 +2963,14 @@ void Editor::NotifyModified(Document *, DocModification mh, void *) {
Redraw();
}
if (FlagSet(mh.modificationType, ModificationFlags::Undo | ModificationFlags::Redo)
&& FlagSet(mh.modificationType, ModificationFlags::LastStepInUndoRedo)
&& !pdoc->TentativeActive()) {
// Update selection and scroll
RestoreSelection(mh.newPos,
FlagSet(mh.modificationType, ModificationFlags::Undo) ? UndoRedo::undo : UndoRedo::redo);
}
// If client wants to see this modification
if (FlagSet(mh.modificationType, modEventMask)) {
if (commandEvents) {
@ -3321,7 +3366,7 @@ void Editor::NewLine() {
NotifyChar(ch, CharacterSource::DirectInput);
if (recordingMacro) {
const char txt[2] = { ch, '\0' };
NotifyMacroRecord(Message::ReplaceSel, 0, reinterpret_cast<sptr_t>(txt));
NotifyMacroRecord(Message::ReplaceSel, 0, SPtrFromPtr(txt));
}
}
}
@ -3464,12 +3509,14 @@ Sci::Position Editor::StartEndDisplayLine(Sci::Position pos, bool start) {
namespace {
constexpr short HighShortFromWParam(uptr_t x) {
return static_cast<short>(x >> 16);
constexpr KeyMod KeyModFromWParam(uptr_t x) {
constexpr uptr_t shiftForKeyMod = 16;
return static_cast<KeyMod>(x >> shiftForKeyMod);
}
constexpr short LowShortFromWParam(uptr_t x) {
return static_cast<short>(x & 0xffff);
constexpr Keys KeysFromWParam(uptr_t x) {
constexpr uptr_t maskForKeys = 0xffff;
return static_cast<Keys>(x & maskForKeys);
}
constexpr Message WithExtends(Message iMessage) noexcept {
@ -4529,7 +4576,7 @@ void Editor::StartDrag() {
// Always handled by subclasses
}
void Editor::DropAt(SelectionPosition position, const char *value, size_t lengthValue, bool moving, bool rectangular) {
void Editor::DropAt(SelectionPosition position, std::string_view value, bool moving, bool rectangular) {
//Platform::DebugPrintf("DropAt %d %d\n", inDragDrop, position);
if (inDragDrop == DragDrop::dragging)
dropWentOutside = false;
@ -4569,10 +4616,10 @@ void Editor::DropAt(SelectionPosition position, const char *value, size_t length
}
position = positionAfterDeletion;
std::string convertedText = Document::TransformLineEnds(value, lengthValue, pdoc->eolMode);
std::string convertedText = Document::TransformLineEnds(value, pdoc->eolMode);
if (rectangular) {
PasteRectangular(position, convertedText.c_str(), convertedText.length());
PasteRectangular(position, convertedText);
// Should try to select new rectangle but it may not be a rectangle now so just select the drop position
SetEmptySelection(position);
} else {
@ -4591,8 +4638,12 @@ void Editor::DropAt(SelectionPosition position, const char *value, size_t length
}
}
void Editor::DropAt(SelectionPosition position, const char *value, size_t lengthValue, bool moving, bool rectangular) {
DropAt(position, std::string_view(value, lengthValue), moving, rectangular);
}
void Editor::DropAt(SelectionPosition position, const char *value, bool moving, bool rectangular) {
DropAt(position, value, strlen(value), moving, rectangular);
DropAt(position, std::string_view(value), moving, rectangular);
}
/**
@ -6208,10 +6259,6 @@ constexpr Selection::SelTypes SelTypeFromMode(SelectionMode mode) {
}
}
sptr_t SPtrFromPtr(void *ptr) noexcept {
return reinterpret_cast<sptr_t>(ptr);
}
}
void Editor::SetSelectionMode(uptr_t wParam, bool setMoveExtends) {
@ -6357,7 +6404,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
if (!sel.Empty()) {
ClearSelection(); // want to replace rectangular selection contents
}
InsertPasteShape(ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam), PasteShape::rectangular);
InsertPasteShape(std::string_view(ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam)), PasteShape::rectangular);
break;
}
@ -8097,13 +8144,13 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
return vs.caret.width;
case Message::AssignCmdKey:
kmap.AssignCmdKey(static_cast<Keys>(LowShortFromWParam(wParam)),
static_cast<KeyMod>(HighShortFromWParam(wParam)), static_cast<Message>(lParam));
kmap.AssignCmdKey(KeysFromWParam(wParam),
KeyModFromWParam(wParam), static_cast<Message>(lParam));
break;
case Message::ClearCmdKey:
kmap.AssignCmdKey(static_cast<Keys>(LowShortFromWParam(wParam)),
static_cast<KeyMod>(HighShortFromWParam(wParam)), Message::Null);
kmap.AssignCmdKey(KeysFromWParam(wParam),
KeyModFromWParam(wParam), Message::Null);
break;
case Message::ClearAllCmdKeys:
@ -8473,7 +8520,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
doc->SetUndoCollection(false);
pcs = ContractionStateCreate(pdoc->IsLarge());
ILoader *loader = doc;
return reinterpret_cast<sptr_t>(loader);
return SPtrFromPtr(loader);
}
case Message::SetModEventMask:
@ -8706,10 +8753,10 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
return convertPastes ? 1 : 0;
case Message::GetCharacterPointer:
return reinterpret_cast<sptr_t>(pdoc->BufferPointer());
return SPtrFromPtr(pdoc->BufferPointer());
case Message::GetRangePointer:
return reinterpret_cast<sptr_t>(pdoc->RangePointer(
return SPtrFromPtr(pdoc->RangePointer(
PositionFromUPtr(wParam), lParam));
case Message::GetGapPosition:
@ -8776,7 +8823,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::MarginGetText: {
const StyledText st = pdoc->MarginStyledText(LineFromUPtr(wParam));
return BytesResult(lParam, reinterpret_cast<const unsigned char *>(st.text), st.length);
return BytesResult(lParam, st.AsView());
}
case Message::MarginSetStyle:
@ -8807,7 +8854,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::AnnotationGetText: {
const StyledText st = pdoc->AnnotationStyledText(LineFromUPtr(wParam));
return BytesResult(lParam, reinterpret_cast<const unsigned char *>(st.text), st.length);
return BytesResult(lParam, st.AsView());
}
case Message::AnnotationGetStyle: {
@ -8856,7 +8903,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::EOLAnnotationGetText: {
const StyledText st = pdoc->EOLAnnotationStyledText(LineFromUPtr(wParam));
return BytesResult(lParam, reinterpret_cast<const unsigned char *>(st.text), st.length);
return BytesResult(lParam, st.AsView());
}
case Message::EOLAnnotationGetStyle: {

20
scintilla/src/Editor.h
View File

@ -100,9 +100,15 @@ public:
size_t Length() const noexcept {
return s.length();
}
std::string_view AsView() const noexcept {
return std::string_view(s);
}
size_t LengthWithTerminator() const noexcept {
return s.length() + 1;
}
std::string_view AsViewWithTerminator() const noexcept {
return std::string_view(s.c_str(), s.length()+1);
}
bool Empty() const noexcept {
return s.empty();
}
@ -443,14 +449,17 @@ protected: // ScintillaBase subclass needs access to much of Editor
virtual void InsertCharacter(std::string_view sv, Scintilla::CharacterSource charSource);
void ClearSelectionRange(SelectionRange &range);
void ClearBeforeTentativeStart();
void InsertPaste(const char *text, Sci::Position len);
void InsertPaste(std::string_view text);
[[deprecated]] void InsertPaste(const char *text, Sci::Position len);
enum class PasteShape { stream=0, rectangular = 1, line = 2 };
void InsertPasteShape(const char *text, Sci::Position len, PasteShape shape);
void InsertPasteShape(std::string_view text, PasteShape shape);
[[deprecated]] void InsertPasteShape(const char *text, Sci::Position len, PasteShape shape);
void ClearSelection(bool retainMultipleSelections = false);
void ClearAll();
void ClearDocumentStyle();
virtual void Cut();
void PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Position len);
void PasteRectangular(SelectionPosition pos, std::string_view text);
[[deprecated]] void PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Position len);
virtual void Copy() = 0;
void CopyAllowLine();
void CutAllowLine();
@ -544,8 +553,9 @@ protected: // ScintillaBase subclass needs access to much of Editor
virtual void DisplayCursor(Window::Cursor c);
virtual bool DragThreshold(Point ptStart, Point ptNow) noexcept;
virtual void StartDrag();
void DropAt(SelectionPosition position, const char *value, size_t lengthValue, bool moving, bool rectangular);
void DropAt(SelectionPosition position, const char *value, bool moving, bool rectangular);
void DropAt(SelectionPosition position, std::string_view value, bool moving, bool rectangular);
[[deprecated]] void DropAt(SelectionPosition position, const char *value, size_t lengthValue, bool moving, bool rectangular);
[[deprecated]] void DropAt(SelectionPosition position, const char *value, bool moving, bool rectangular);
/** PositionInSelection returns true if position in selection. */
bool PositionInSelection(Sci::Position pos);
bool PointInSelection(Point pt);

13
scintilla/src/Geometry.h
View File

@ -45,6 +45,10 @@ public:
return Point(x - other.x, y - other.y);
}
constexpr Point operator*(XYPOSITION multiplier) const noexcept {
return Point(x * multiplier, y * multiplier);
}
// Other automatically defined methods (assignment, copy constructor, destructor) are fine
};
@ -101,6 +105,15 @@ public:
return (rc.left == left) && (rc.right == right) &&
(rc.top == top) && (rc.bottom == bottom);
}
constexpr PRectangle operator*(XYPOSITION multiplier) const noexcept {
return PRectangle(left * multiplier, top * multiplier, right * multiplier, bottom * multiplier);
}
constexpr PRectangle operator/(XYPOSITION divisor) const noexcept {
return PRectangle(left / divisor, top / divisor, right / divisor, bottom / divisor);
}
constexpr bool Contains(Point pt) const noexcept {
return (pt.x >= left) && (pt.x <= right) &&
(pt.y >= top) && (pt.y <= bottom);

1
scintilla/src/PerLine.cxx
View File

@ -11,6 +11,7 @@
#include <cstring>
#include <stdexcept>
#include <utility>
#include <string_view>
#include <vector>
#include <forward_list>

23
scintilla/src/PositionCache.cxx
View File

@ -12,6 +12,7 @@
#include <cmath>
#include <stdexcept>
#include <utility>
#include <string>
#include <string_view>
#include <vector>
@ -64,20 +65,7 @@ void BidiData::Resize(size_t maxLineLength_) {
}
LineLayout::LineLayout(Sci::Line lineNumber_, int maxLineLength_) :
lenLineStarts(0),
lineNumber(lineNumber_),
maxLineLength(-1),
numCharsInLine(0),
numCharsBeforeEOL(0),
validity(ValidLevel::invalid),
xHighlightGuide(0),
highlightColumn(false),
containsCaret(false),
edgeColumn(0),
bracePreviousStyles{},
widthLine(wrapWidthInfinite),
lines(1),
wrapIndent(0) {
lineNumber(lineNumber_) {
Resize(maxLineLength_);
}
@ -270,11 +258,6 @@ int LineLayout::FindPositionFromX(XYPOSITION x, Range range, bool charPosition)
Point LineLayout::PointFromPosition(int posInLine, int lineHeight, PointEnd pe) const noexcept {
Point pt;
// In case of very long line put x at arbitrary large position
if (posInLine > maxLineLength) {
pt.x = positions[maxLineLength] - positions[LineStart(lines)];
}
for (int subLine = 0; subLine < lines; subLine++) {
const Range rangeSubLine = SubLineRange(subLine, Scope::visibleOnly);
if (posInLine >= rangeSubLine.start) {
@ -617,7 +600,7 @@ std::shared_ptr<LineLayout> LineLayoutCache::Retrieve(Sci::Line lineNumber, Sci:
if (pos < cache.size()) {
if (cache[pos] && !cache[pos]->CanHold(lineNumber, maxChars)) {
cache[pos].reset();
cache[pos]->ReSet(lineNumber, maxChars);
}
if (!cache[pos]) {
cache[pos] = std::make_shared<LineLayout>(lineNumber, maxChars);

27
scintilla/src/PositionCache.h
View File

@ -49,31 +49,32 @@ public:
class LineLayout {
private:
std::unique_ptr<int []>lineStarts;
int lenLineStarts;
int lenLineStarts = 0;
/// Drawing is only performed for @a maxLineLength characters on each line.
Sci::Line lineNumber;
public:
enum { wrapWidthInfinite = 0x7ffffff };
int maxLineLength;
int numCharsInLine;
int numCharsBeforeEOL;
enum class ValidLevel { invalid, checkTextAndStyle, positions, lines } validity;
int xHighlightGuide;
bool highlightColumn;
bool containsCaret;
int edgeColumn;
int maxLineLength = -1;
int numCharsInLine = 0;
int numCharsBeforeEOL = 0;
enum class ValidLevel { invalid, checkTextAndStyle, positions, lines };
ValidLevel validity = ValidLevel::invalid;
int xHighlightGuide = 0;
bool highlightColumn = false;
bool containsCaret = false;
unsigned char bracePreviousStyles[2]{};
int edgeColumn = 0;
std::unique_ptr<char[]> chars;
std::unique_ptr<unsigned char[]> styles;
std::unique_ptr<XYPOSITION[]> positions;
unsigned char bracePreviousStyles[2];
std::unique_ptr<BidiData> bidiData;
// Wrapped line support
int widthLine;
int lines;
XYPOSITION wrapIndent; // In pixels
int widthLine = wrapWidthInfinite;
int lines = 1;
XYPOSITION wrapIndent = 0; // In pixels
LineLayout(Sci::Line lineNumber_, int maxLineLength_);
void Resize(int maxLineLength_);

2
scintilla/src/Selection.cxx
View File

@ -9,6 +9,8 @@
#include <cstdlib>
#include <stdexcept>
#include <system_error>
#include <utility>
#include <string>
#include <string_view>
#include <vector>

1
scintilla/src/Style.cxx
View File

@ -8,6 +8,7 @@
#include <cstdint>
#include <stdexcept>
#include <utility>
#include <string_view>
#include <vector>
#include <optional>

1
scintilla/src/UndoHistory.cxx
View File

@ -15,6 +15,7 @@
#include <climits>
#include <stdexcept>
#include <utility>
#include <string>
#include <string_view>
#include <vector>

1
scintilla/src/ViewStyle.cxx
View File

@ -12,6 +12,7 @@
#include <cmath>
#include <stdexcept>
#include <utility>
#include <string>
#include <string_view>
#include <vector>

1
scintilla/src/XPM.cxx
View File

@ -11,6 +11,7 @@
#include <climits>
#include <stdexcept>
#include <utility>
#include <string_view>
#include <vector>
#include <map>

2
scintilla/version.txt
View File

@ -1 +1 @@
562
564

1
scintilla/win32/ListBox.cxx
View File

@ -15,6 +15,7 @@
#include <cmath>
#include <climits>
#include <string>
#include <string_view>
#include <vector>
#include <map>

1
scintilla/win32/PlatWin.cxx
View File

@ -15,6 +15,7 @@
#include <cmath>
#include <climits>
#include <utility>
#include <string_view>
#include <vector>
#include <map>

4
scintilla/win32/ScintRes.rc
View File

@ -6,8 +6,8 @@
#include <windows.h>
#define VERSION_SCINTILLA "5.6.2"
#define VERSION_WORDS 5, 6, 2, 0
#define VERSION_SCINTILLA "5.6.4"
#define VERSION_WORDS 5, 6, 4, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS

71
scintilla/win32/ScintillaWin.cxx
View File

@ -16,6 +16,7 @@
#include <stdexcept>
#include <new>
#include <utility>
#include <string>
#include <string_view>
#include <vector>
@ -1419,7 +1420,7 @@ void ScintillaWin::SelectionToHangul() {
const std::string hangul = StringEncode(uniStr, CodePageOfDocument());
UndoGroup ug(pdoc);
ClearSelection();
InsertPaste(hangul.data(), hangul.size());
InsertPaste(hangul);
}
}
}
@ -2558,7 +2559,7 @@ sptr_t ScintillaWin::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
}
} catch (std::bad_alloc &) {
errorStatus = Status::BadAlloc;
} catch (Failure &failure) {
} catch (const Failure &failure) {
errorStatus = failure.status;
} catch (...) {
errorStatus = Status::Failure;
@ -3135,32 +3136,44 @@ bool SupportedFormat(const FORMATETC *pFE) noexcept {
}
void ScintillaWin::Paste() {
Clipboard clipboard(MainHWND());
if (!clipboard) {
return;
}
UndoGroup ug(pdoc);
const bool isLine = SelectionEmpty() &&
(::IsClipboardFormatAvailable(cfLineSelect) || ::IsClipboardFormatAvailable(cfVSLineTag));
ClearSelection(multiPasteMode == MultiPaste::Each);
bool isRectangular = (::IsClipboardFormatAvailable(cfColumnSelect) != 0);
bool isLine = false;
bool isRectangular = false;
bool hasUnicodeText = false;
std::string putf;
if (!isRectangular) {
// Evaluate "Borland IDE Block Type" explicitly
GlobalMemory memBorlandSelection(::GetClipboardData(cfBorlandIDEBlockType));
if (memBorlandSelection) {
isRectangular = (memBorlandSelection.Size() == 1) && (static_cast<BYTE *>(memBorlandSelection.ptr)[0] == 0x02);
memBorlandSelection.Unlock();
{
Clipboard clipboard(MainHWND());
if (!clipboard) {
return;
}
isLine = SelectionEmpty() &&
(::IsClipboardFormatAvailable(cfLineSelect) || ::IsClipboardFormatAvailable(cfVSLineTag));
isRectangular = (::IsClipboardFormatAvailable(cfColumnSelect) != 0);
if (!isRectangular) {
// Evaluate "Borland IDE Block Type" explicitly
GlobalMemory memBorlandSelection(::GetClipboardData(cfBorlandIDEBlockType));
if (memBorlandSelection) {
isRectangular = (memBorlandSelection.Size() == 1) && (static_cast<BYTE *>(memBorlandSelection.ptr)[0] == 0x02);
memBorlandSelection.Unlock();
}
}
// Use CF_UNICODETEXT if available
GlobalMemory memUSelection(::GetClipboardData(CF_UNICODETEXT));
if (const wchar_t *uptr = static_cast<const wchar_t *>(memUSelection.ptr)) {
hasUnicodeText = true;
putf = EncodeWString(uptr);
memUSelection.Unlock();
}
}
const PasteShape pasteShape = isRectangular ? PasteShape::rectangular : (isLine ? PasteShape::line : PasteShape::stream);
// Use CF_UNICODETEXT if available
GlobalMemory memUSelection(::GetClipboardData(CF_UNICODETEXT));
if (const wchar_t *uptr = static_cast<const wchar_t *>(memUSelection.ptr)) {
const std::string putf = EncodeWString(uptr);
InsertPasteShape(putf.c_str(), putf.length(), pasteShape);
memUSelection.Unlock();
if (hasUnicodeText) {
UndoGroup ug(pdoc);
const PasteShape pasteShape = isRectangular ? PasteShape::rectangular : (isLine ? PasteShape::line : PasteShape::stream);
ClearSelection(multiPasteMode == MultiPaste::Each);
InsertPasteShape(putf, pasteShape);
}
Redraw();
}
@ -3583,7 +3596,7 @@ void ScintillaWin::GetMouseParameters() noexcept {
}
void ScintillaWin::CopyToGlobal(GlobalMemory &gmUnicode, const SelectionText &selectedText) {
const std::string_view svSelected(selectedText.Data(), selectedText.LengthWithTerminator());
const std::string_view svSelected = selectedText.AsViewWithTerminator();
if (IsUnicodeMode()) {
const size_t uchars = UTF16Length(svSelected);
gmUnicode.Allocate(2 * uchars);
@ -3875,6 +3888,9 @@ STDMETHODIMP ScintillaWin::Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState,
memUDrop.Unlock();
}
// Free data
::ReleaseStgMedium(&medium);
if (putf.empty()) {
return S_OK;
}
@ -3886,10 +3902,7 @@ STDMETHODIMP ScintillaWin::Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState,
::ScreenToClient(MainHWND(), &rpt);
const SelectionPosition movePos = SPositionFromLocation(PointFromPOINT(rpt), false, false, UserVirtualSpace());
DropAt(movePos, putf.c_str(), putf.size(), *pdwEffect == DROPEFFECT_MOVE, isRectangular);
// Free data
::ReleaseStgMedium(&medium);
DropAt(movePos, putf, *pdwEffect == DROPEFFECT_MOVE, isRectangular);
return S_OK;
} catch (...) {

3
scintilla/win32/SurfaceD2D.cxx
View File

@ -15,6 +15,9 @@
#include <cmath>
#include <climits>
#include <stdexcept>
#include <utility>
#include <string>
#include <string_view>
#include <vector>
#include <map>

1
scintilla/win32/SurfaceGDI.cxx
View File

@ -15,6 +15,7 @@
#include <cmath>
#include <climits>
#include <stdexcept>
#include <string_view>
#include <vector>
#include <map>