update scintilla

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@712 28bd50df-7adb-d945-0439-6e466c6a13cc

1 files changed, 44 insertions, 26 deletions

diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index b643ad3..b461445 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -486,7 +486,7 @@ SelectionPosition Editor::SPositionFromLocation(Point pt, bool canReturnInvalid,
 	pt.x = pt.x - vs.fixedColumnWidth + xOffset;

 	int visibleLine = pt.y / vs.lineHeight + topLine;

 	if (pt.y < 0) {	// Division rounds towards 0

-		visibleLine = (pt.y - (vs.lineHeight - 1)) / vs.lineHeight + topLine;

+		visibleLine = (static_cast<int>(pt.y) - (vs.lineHeight - 1)) / vs.lineHeight + topLine;

 	}

 	if (!canReturnInvalid && (visibleLine < 0))

 		visibleLine = 0;

@@ -1465,6 +1465,12 @@ bool Editor::WrapOneLine(Surface *surface, int lineToWrap) {
 bool Editor::WrapLines(bool fullWrap, int priorityWrapLineStart) {

 	// If there are any pending wraps, do them during idle if possible.

 	int linesInOneCall = LinesOnScreen() + 100;

+	if (priorityWrapLineStart >= 0) {

+		// Using DocFromDisplay() here may result in chicken and egg problem in certain corner cases,

+		// which will hopefully be handled by added 100 lines. If some lines are still missed, idle wrapping will catch on.

+		int docLinesInOneCall = cs.DocFromDisplay(topLine + LinesOnScreen() + 100) - cs.DocFromDisplay(topLine);

+		linesInOneCall = Platform::Maximum(linesInOneCall, docLinesInOneCall);

+	}

 	if (wrapState != eWrapNone) {

 		if (wrapStart < wrapEnd) {

 			if (!SetIdle(true)) {

@@ -2499,9 +2505,6 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 		const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;

 		virtualSpace = sel.VirtualSpaceFor(pdoc->LineEnd(line)) * spaceWidth;

 	}

-

-	// Fill in a PRectangle representing the end of line characters

-

 	XYPOSITION xEol = ll->positions[lineEnd] - subLineStart;

 

 	// Fill the virtual space and show selections within it

@@ -2528,34 +2531,41 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 		}

 	}

 

-	int posAfterLineEnd = pdoc->LineStart(line + 1);

-	int eolInSelection = (subLine == (ll->lines - 1)) ? sel.InSelectionForEOL(posAfterLineEnd) : 0;

-	int alpha = (eolInSelection == 1) ? vsDraw.selAlpha : vsDraw.selAdditionalAlpha;

+	int eolInSelection = 0;

+	int alpha = SC_ALPHA_NOALPHA;

+	if (!hideSelection) {

+		int posAfterLineEnd = pdoc->LineStart(line + 1);

+		eolInSelection = (subLine == (ll->lines - 1)) ? sel.InSelectionForEOL(posAfterLineEnd) : 0;

+		alpha = (eolInSelection == 1) ? vsDraw.selAlpha : vsDraw.selAdditionalAlpha;

+	}

 

 	// Draw the [CR], [LF], or [CR][LF] blobs if visible line ends are on

-	int blobsWidth = 0;

+	XYPOSITION blobsWidth = 0;

 	if (lastSubLine) {

 		for (int eolPos=ll->numCharsBeforeEOL; eolPos<ll->numCharsInLine; eolPos++) {

 			rcSegment.left = xStart + ll->positions[eolPos] - subLineStart + virtualSpace;

 			rcSegment.right = xStart + ll->positions[eolPos+1] - subLineStart + virtualSpace;

 			blobsWidth += rcSegment.Width();

 			const char *ctrlChar = ControlCharacterString(ll->chars[eolPos]);

-			int inSelection = 0;

-			bool inHotspot = false;

 			int styleMain = ll->styles[eolPos];

-			ColourDesired textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, eolPos, ll);

+			ColourDesired textBack = TextBackground(vsDraw, overrideBackground, background, eolInSelection, false, styleMain, eolPos, ll);

 			ColourDesired textFore = vsDraw.styles[styleMain].fore;

-			if (!hideSelection && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1)) {

+			if (eolInSelection && vsDraw.selforeset) {

+				textFore = (eolInSelection == 1) ? vsDraw.selforeground : vsDraw.selAdditionalForeground;

+			}

+			if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1)) {

 				if (alpha == SC_ALPHA_NOALPHA) {

 					surface->FillRectangle(rcSegment, SelectionBackground(vsDraw, eolInSelection == 1));

 				} else {

 					surface->FillRectangle(rcSegment, textBack);

-					SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw, eolInSelection == 1), alpha);

 				}

 			} else {

 				surface->FillRectangle(rcSegment, textBack);

 			}

 			DrawTextBlob(surface, vsDraw, rcSegment, ctrlChar, textBack, textFore, twoPhaseDraw);

+			if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha != SC_ALPHA_NOALPHA)) {

+				SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw, eolInSelection == 1), alpha);

+			}

 		}

 	}

 

@@ -2563,7 +2573,7 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 	rcSegment.left = xEol + xStart + virtualSpace + blobsWidth;

 	rcSegment.right = rcSegment.left + vsDraw.aveCharWidth;

 

-	if (!hideSelection && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha == SC_ALPHA_NOALPHA)) {

+	if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha == SC_ALPHA_NOALPHA)) {

 		surface->FillRectangle(rcSegment, SelectionBackground(vsDraw, eolInSelection == 1));

 	} else {

 		if (overrideBackground) {

@@ -2575,7 +2585,7 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 		} else {

 			surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back);

 		}

-		if (!hideSelection && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha != SC_ALPHA_NOALPHA)) {

+		if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha != SC_ALPHA_NOALPHA)) {

 			SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw, eolInSelection == 1), alpha);

 		}

 	}

@@ -2586,7 +2596,7 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 		rcSegment.left = rcLine.left;

 	rcSegment.right = rcLine.right;

 

-	if (!hideSelection && vsDraw.selEOLFilled && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha == SC_ALPHA_NOALPHA)) {

+	if (eolInSelection && vsDraw.selEOLFilled && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha == SC_ALPHA_NOALPHA)) {

 		surface->FillRectangle(rcSegment, SelectionBackground(vsDraw, eolInSelection == 1));

 	} else {

 		if (overrideBackground) {

@@ -2596,7 +2606,7 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin
 		} else {

 			surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back);

 		}

-		if (!hideSelection && vsDraw.selEOLFilled && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha != SC_ALPHA_NOALPHA)) {

+		if (eolInSelection && vsDraw.selEOLFilled && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha != SC_ALPHA_NOALPHA)) {

 			SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw, eolInSelection == 1), alpha);

 		}

 	}

@@ -2810,7 +2820,8 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis
 	        (!overrideBackground) && (vsDraw.whitespaceBackgroundSet);

 

 	bool inIndentation = subLine == 0;	// Do not handle indentation except on first subline.

-	int indentWidth = pdoc->IndentSize() * vsDraw.spaceWidth;

+	const XYPOSITION indentWidth = pdoc->IndentSize() * vsDraw.spaceWidth;

+	const XYPOSITION epsilon = 0.0001f;	// A small nudge to avoid floating point precision issues

 

 	int posLineStart = pdoc->LineStart(line);

 

@@ -3027,10 +3038,13 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis
 					surface->PenColour(textFore);

 				}

 				if (inIndentation && vsDraw.viewIndentationGuides == ivReal) {

-					for (int xIG = ll->positions[i] / indentWidth * indentWidth; xIG < ll->positions[i + 1]; xIG += indentWidth) {

-						if (xIG >= ll->positions[i] && xIG > 0) {

-							DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIG + xStart, rcSegment,

-							        (ll->xHighlightGuide == xIG));

+					for (int indentCount = (ll->positions[i] + epsilon) / indentWidth;

+						indentCount <= (ll->positions[i + 1] - epsilon) / indentWidth;

+						indentCount++) {

+						if (indentCount > 0) {

+							int xIndent = indentCount * indentWidth;

+							DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIndent + xStart, rcSegment,

+								    (ll->xHighlightGuide == xIndent));

 						}

 					}

 				}

@@ -3097,10 +3111,14 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis
 								}

 							}

 							if (inIndentation && vsDraw.viewIndentationGuides == ivReal) {

-								int startSpace = ll->positions[cpos + startseg];

-								if (startSpace > 0 && (startSpace % indentWidth == 0)) {

-									DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, startSpace + xStart, rcSegment,

-									        (ll->xHighlightGuide == ll->positions[cpos + startseg]));

+								for (int indentCount = (ll->positions[cpos + startseg] + epsilon) / indentWidth;

+									indentCount <= (ll->positions[cpos + startseg + 1] - epsilon) / indentWidth;

+									indentCount++) {

+									if (indentCount > 0) {

+										int xIndent = indentCount * indentWidth;

+										DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIndent + xStart, rcSegment,

+												(ll->xHighlightGuide == xIndent));

+									}

 								}

 							}

 						} else {