aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/ScintillaGTK.cxx5
-rw-r--r--src/Editor.cxx126
-rw-r--r--src/Editor.h6
-rw-r--r--win32/ScintillaWin.cxx1
4 files changed, 115 insertions, 23 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 426630603..7c190f75a 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -127,7 +127,7 @@ public: // Public for scintilla_send_message
private:
virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
virtual void SetTicking(bool on);
- virtual void SetIdle(bool on);
+ virtual bool SetIdle(bool on);
virtual void SetMouseCapture(bool on);
virtual bool HaveMouseCapture();
void FullPaint();
@@ -685,6 +685,7 @@ void ScintillaGTK::SetIdle(bool on) {
gtk_idle_remove(GPOINTER_TO_UINT(idler.idlerID));
}
}
+ return true;
}
void ScintillaGTK::SetMouseCapture(bool on) {
@@ -1976,7 +1977,7 @@ int ScintillaGTK::IdleCallback(ScintillaGTK *sciThis) {
// to do while idle.
bool ret = sciThis->Idle();
if (ret == false) {
- // FIXME: This will remove the idler from GTK, we don't want to
+ // FIXME: This will remove the idler from GTK, we don't want to
// remove it as it is removed automatically when this function
// returns false (although, it should be harmless).
sciThis->SetIdle(false);
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 470b30ea3..c722f80ad 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -391,7 +391,6 @@ Editor::~Editor() {
pdoc->Release();
pdoc = 0;
DropGraphics();
- /* SetIdle(false) must be called in a platform independent way */
delete pixmapLine;
delete pixmapSelMargin;
delete pixmapSelPattern;
@@ -1306,18 +1305,62 @@ void Editor::InvalidateCaret() {
InvalidateRange(currentPos, currentPos + 1);
}
-void Editor::NeedWrapping(int docLineStartWrapping) {
+void Editor::NeedWrapping(int docLineStartWrapping, int docLineEndWrapping) {
+ bool noWrap = (docLastLineToWrap == docLineLastWrapped);
if (docLineLastWrapped > (docLineStartWrapping - 1)) {
docLineLastWrapped = docLineStartWrapping - 1;
if (docLineLastWrapped < -1)
docLineLastWrapped = -1;
llc.Invalidate(LineLayout::llPositions);
}
+ if (noWrap) {
+ docLastLineToWrap = docLineEndWrapping;
+ if (docLastLineToWrap < -1)
+ docLastLineToWrap = -1;
+ if (docLastLineToWrap > pdoc->LinesTotal())
+ docLastLineToWrap = pdoc->LinesTotal();
+ } else if (docLastLineToWrap < docLineEndWrapping) {
+ docLastLineToWrap = docLineEndWrapping + 1;
+ if (docLastLineToWrap < -1)
+ docLastLineToWrap = -1;
+ if (docLastLineToWrap > pdoc->LinesTotal())
+ docLastLineToWrap = pdoc->LinesTotal();
+ }
+ // Wrap lines during idle.
+ if (docLastLineToWrap != docLineLastWrapped)
+ SetIdle(true);
}
// Check if wrapping needed and perform any needed wrapping.
+// fullwrap: if true, all lines which need wrapping will be done,
+// in this single call.
+// priorityWrapLineStart: If greater than zero, all lines starting from
+// here to 100 lines past will be wrapped (even if there are
+// more lines under wrapping process in idle).
+// If it is neither fullwrap, nor priorityWrap, then 100 lines will be
+// wrapped, if there are any wrapping going on in idle. (Generally this
+// condition is called only from idler).
// Return true if wrapping occurred.
-bool Editor::WrapLines() {
+bool Editor::WrapLines(bool fullWrap, int priorityWrapLineStart) {
+ // If there are any pending wraps do them during idle.
+ if (wrapState != eWrapNone) {
+ if (docLineLastWrapped < docLastLineToWrap) {
+ if (!SetIdle(true)) {
+ // If platform does not have Idle events, perform full wrap
+ fullWrap = true;
+ }
+ }
+ if (!fullWrap && priorityWrapLineStart >= 0 &&
+ // .. and if the paint window is outside pending wraps
+ (((priorityWrapLineStart + 100) < docLineLastWrapped) ||
+ (priorityWrapLineStart > docLastLineToWrap))) {
+ // No priority wrap pending
+ return false;
+ }
+ } else {
+ // If there is no wrap, disable the idle call.
+ SetIdle(false);
+ }
int goodTopLine = topLine;
bool wrapOccurred = false;
if (docLineLastWrapped < pdoc->LinesTotal()) {
@@ -1342,19 +1385,44 @@ bool Editor::WrapLines() {
pdoc->EnsureStyledTo(pdoc->Length());
AutoSurface surface(this);
if (surface) {
- int lastLineToWrap = pdoc->LinesTotal();
- while (docLineLastWrapped <= lastLineToWrap) {
- docLineLastWrapped++;
- AutoLineLayout ll(llc, RetrieveLineLayout(docLineLastWrapped));
+ bool priorityWrap = false;
+ int lastLineToWrap = docLastLineToWrap;
+ int firstLineToWrap = docLineLastWrapped;
+ if (!fullWrap) {
+ if (priorityWrapLineStart >= 0) {
+ // This is a priority wrap.
+ firstLineToWrap = priorityWrapLineStart;
+ lastLineToWrap = firstLineToWrap + 100;
+ priorityWrap = true;
+ } else {
+ // This is idle wrap.
+ lastLineToWrap = docLineLastWrapped + 100;
+ if (lastLineToWrap >= docLastLineToWrap)
+ lastLineToWrap = docLastLineToWrap;
+ }
+ } // else do a fullWrap.
+
+ // printf("Wraplines: full = %d, priorityStart = %d (wrapping: %d to %d)\n", fullWrap, priorityWrapLineStart, firstLineToWrap, lastLineToWrap);
+ // printf("Pending wraps: %d to %d\n", docLineLastWrapped, docLastLineToWrap);
+ while (firstLineToWrap <= lastLineToWrap) {
+ firstLineToWrap++;
+ if (!priorityWrap)
+ docLineLastWrapped++;
+ AutoLineLayout ll(llc, RetrieveLineLayout(firstLineToWrap));
int linesWrapped = 1;
if (ll) {
- LayoutLine(docLineLastWrapped, surface, vs, ll, wrapWidth);
+ LayoutLine(firstLineToWrap, surface, vs, ll, wrapWidth);
linesWrapped = ll->lines;
}
- if (cs.SetHeight(docLineLastWrapped, linesWrapped)) {
+ if (cs.SetHeight(firstLineToWrap, linesWrapped)) {
wrapOccurred = true;
}
}
+ // If wrapping is done, bring it to resting position
+ if (docLineLastWrapped > docLastLineToWrap) {
+ docLineLastWrapped = -1;
+ docLastLineToWrap = -1;
+ }
}
goodTopLine = cs.DisplayFromDoc(lineDocTop);
if (subLineTop < cs.GetHeight(lineDocTop))
@@ -2371,9 +2439,15 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
PaintSelMargin(surfaceWindow, rcArea);
- if (WrapLines()) {
- // The wrapping process has changed the height of some lines so abandon this
- // paint for a complete repaint.
+ // Call priority lines wrap on a window of lines which are likely
+ // to rendered with the following paint (that is wrap the visible
+ // lines first).
+ int startLineToWrap = cs.DocFromDisplay(topLine) - 5;
+ if (startLineToWrap < 0)
+ startLineToWrap = 0;
+ if (WrapLines(false, startLineToWrap)) {
+ // The wrapping process has changed the height of some lines so
+ // abandon this paint for a complete repaint.
if (AbandonPaint()) {
return;
}
@@ -3251,14 +3325,14 @@ void Editor::CheckModificationForWrap(DocModification mh) {
if (surface && ll) {
LayoutLine(lineDoc, surface, vs, ll, wrapWidth);
if (cs.GetHeight(lineDoc) != ll->lines) {
- NeedWrapping(lineDoc - 1);
+ NeedWrapping(lineDoc - 1, lineDoc + 1);
Redraw();
}
} else {
- NeedWrapping(lineDoc);
+ NeedWrapping(lineDoc, lineDoc + 1);
}
} else {
- NeedWrapping(lineDoc);
+ NeedWrapping(lineDoc, lineDoc + 1);
}
}
}
@@ -3577,7 +3651,8 @@ void Editor::LineDuplicate() {
delete []thisLine;
}
-void Editor::CancelModes() {}
+void Editor::CancelModes() {
+}
void Editor::NewLine() {
ClearSelection();
@@ -4756,6 +4831,23 @@ void Editor::Tick() {
}
}
+bool Editor::Idle() {
+
+ bool idleDone = false;
+ // Wrap lines during idle.
+ WrapLines(false, -1);
+ // No more wrapping
+ if (docLineLastWrapped == docLastLineToWrap)
+ idleDone = true;
+
+ // Add more idle things to do here, but make sure idleDone is
+ // set correctly before the function returns. returning
+ // false will stop calling this idle funtion until SetIdle() is
+ // called again.
+
+ return !idleDone;
+}
+
void Editor::SetFocusState(bool focusState) {
hasFocus = focusState;
NotifyFocus(hasFocus);
@@ -4969,7 +5061,7 @@ void Editor::ToggleContraction(int line) {
void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) {
// In case in need of wrapping to ensure DisplayFromDoc works.
- WrapLines();
+ WrapLines(true, -1);
if (!cs.GetVisible(lineDoc)) {
int lineParent = pdoc->GetFoldParent(lineDoc);
diff --git a/src/Editor.h b/src/Editor.h
index d0dfcccc1..24bc20765 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -345,8 +345,8 @@ protected: // ScintillaBase subclass needs access to much of Editor
void DropCaret();
void InvalidateCaret();
- void NeedWrapping(int docLineStartWrapping=0);
- bool WrapLines();
+ void NeedWrapping(int docLineStartWrapping = 0, int docLineEndWrapping = 0x7ffffff);
+ bool WrapLines(bool fullWrap, int priorityWrapLineStart);
void LinesJoin();
void LinesSplit(int pixelWidth);
@@ -466,7 +466,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void Tick();
bool Idle();
virtual void SetTicking(bool on) = 0;
- virtual void SetIdle(bool on) = 0;
+ virtual bool SetIdle(bool) { return false; }
virtual void SetMouseCapture(bool on) = 0;
virtual bool HaveMouseCapture() = 0;
void SetFocusState(bool focusState);
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 410f8711b..0d1993462 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -195,7 +195,6 @@ class ScintillaWin :
sptr_t HandleComposition(uptr_t wParam, sptr_t lParam);
virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
virtual void SetTicking(bool on);
- virtual void SetIdle(bool) {}
virtual void SetMouseCapture(bool on);
virtual bool HaveMouseCapture();
virtual void ScrollText(int linesToMove);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 04:59:58 +0000