[NEW] Make Marker Jumper wrap able.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@562 f5eea248-9336-0410-98b8-ebc06183d4e3

PowerEditor/src/Notepad_plus.cpp

@@ -9739,66 +9739,98 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 	return result;
 }
 
-void Notepad_plus::goToPreviousIndicator(int indicID2Search) const
+bool Notepad_plus::goToPreviousIndicator(int indicID2Search, bool isWrap) const
 {
     int position = _pEditView->execute(SCI_GETCURRENTPOS);
+	int docLen = _pEditView->getCurrentDocLen();
+
     BOOL isInIndicator = _pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search,  position);
     int posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search,  position);
-    int posEnd;
+    int posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search,  position);
+
+	// pre-condition
+	if ((posStart == 0) && (posEnd == docLen - 1))
+		return false;
+
+    if (posStart <= 0)
+	{
+		if (!isWrap)
+			return false;
+
+		isInIndicator = _pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search,  docLen - 1);
+		posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search,  docLen - 1);
+	}
 
-    if (isInIndicator)
+    if (isInIndicator) // try to get out of indicator
     {
-        if (posStart <= 0)
-			return;
         posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, posStart - 1);
         if (posStart <= 0)
-			return;
+		{
-        int newPos = posStart - 1;
+			if (!isWrap)
-        posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
+				return false;
-        posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
+			posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search,  docLen - 1);
-    }
+		}	
-    else
+	}
-    {
+
-        if (posStart <= 0)
+    int newPos = posStart - 1;
-			return;
+    posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
-        int newPos = posStart - 1;
+    posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
-        posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
+
-        posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
+	// found
-    }
+	if (_pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search, posStart))
-    _pEditView->execute(SCI_SETSEL, posEnd, posStart);
+	{
-    _pEditView->execute(SCI_SCROLLCARET);
+		_pEditView->execute(SCI_SETSEL, posEnd, posStart);
+		_pEditView->execute(SCI_SCROLLCARET);
+		return true;
+	}
+	return false;
 }
 
-void Notepad_plus::goToNextIndicator(int indicID2Search) const
+bool Notepad_plus::goToNextIndicator(int indicID2Search, bool isWrap) const
 {
     int position = _pEditView->execute(SCI_GETCURRENTPOS);
 	int docLen = _pEditView->getCurrentDocLen();
+
     BOOL isInIndicator = _pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search,  position);
-    int posStart;
+    int posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search,  position);
     int posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search,  position);
 
-    if (isInIndicator)
+	// pre-condition
+	if ((posStart == 0) && (posEnd == docLen - 1))
+		return false;
+
+    if (posEnd >= docLen)
+	{
+		if (!isWrap)
+			return false;
+
+		isInIndicator = _pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search,  0);
+		posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, 0);
+	}
+
+    if (isInIndicator) // try to get out of indicator
     {
-        if (posEnd >= docLen)
-			return;
         posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, posEnd);
 
         if (posEnd >= docLen)
-			return;
+		{
-        int newPos = posEnd;
+			if (!isWrap)
-        posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
+				return false;
-        posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
+			posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, 0);
-    }
+		}
-    else
-    {
-        if (posEnd >= docLen)
-			return;
-        int newPos = posEnd + 1;
-        posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
-        posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
     }
-    _pEditView->execute(SCI_SETSEL, posStart, posEnd);
+    int newPos = posEnd + 1;
-    _pEditView->execute(SCI_SCROLLCARET);
+    posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
+    posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
+
+	// found
+	if (_pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search, posStart))
+	{
+		_pEditView->execute(SCI_SETSEL, posStart, posEnd);
+		_pEditView->execute(SCI_SCROLLCARET);
+		return true;
+	}
+	return false;
 }
 
 LRESULT CALLBACK Notepad_plus::Notepad_plus_Proc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)

PowerEditor/src/Notepad_plus.h

@@ -573,8 +573,8 @@ private:
 
 	void loadCommandlineParams(const TCHAR * commandLine, CmdLineParams * pCmdParams);
 	bool noOpenedDoc() const;
-	void goToPreviousIndicator(int indicID2Search) const;
+	bool goToPreviousIndicator(int indicID2Search, bool isWrap = true) const;
-	void goToNextIndicator(int indicID2Search) const;
+	bool goToNextIndicator(int indicID2Search, bool isWrap = true) const;
 };
 
 #endif //NOTEPAD_PLUS_H