X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=269b2123707207bbdb095a0db123ff1fdd87ef0f;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=62255c4ba91065625bb50d911b333a2e6bebae82;hpb=5e5115c3767a91d0fad68619e54cb0272ef8dd57;p=lyx.git

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 62255c4ba9..269b212370 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -45,6 +45,7 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
@@ -121,23 +122,6 @@ int findBackwards(DocIterator & cur, MatchString const & match,
 }
 
 
-bool findChange(DocIterator & cur, bool next)
-{
-	if (!next)
-		cur.backwardPos();
-	for (; cur; next ? cur.forwardPos() : cur.backwardPos())
-		if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) {
-			if (!next)
-				// if we search backwards, take a step forward
-				// to correctly set the anchor
-				cur.forwardPos();
-			return true;
-		}
-
-	return false;
-}
-
-
 bool searchAllowed(docstring const & str)
 {
 	if (str.empty()) {
@@ -280,7 +264,8 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
 	cap::replaceSelectionWithString(cur, replacestr);
 	if (forward) {
 		cur.pos() += replacestr.length();
-		LASSERT(cur.pos() <= cur.lastpos(), /* */);
+		LASSERT(cur.pos() <= cur.lastpos(),
+		        cur.pos() = cur.lastpos());
 	}
 	if (findnext)
 		findOne(bv, searchstr, case_sens, whole, forward, false);
@@ -403,34 +388,35 @@ bool lyxreplace(BufferView * bv,
 }
 
 
-bool findNextChange(BufferView * bv)
+namespace {
+bool findChange(DocIterator & cur, bool next)
 {
-	return findChange(bv, true);
-}
-
+	if (!next)
+		cur.backwardPos();
+	for (; cur; next ? cur.forwardPos() : cur.backwardPos())
+		if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) {
+			if (!next)
+				// if we search backwards, take a step forward
+				// to correctly set the anchor
+				cur.forwardPos();
+			return true;
+		}
 
-bool findPreviousChange(BufferView * bv)
-{
-	return findChange(bv, false);
+	return false;
 }
 
 
 bool findChange(BufferView * bv, bool next)
 {
-	if (bv->cursor().selection()) {
-		// set the cursor at the beginning or at the end of the selection
-		// before searching. Otherwise, the current change will be found.
-		if (next != (bv->cursor().top() > bv->cursor().normalAnchor()))
-			bv->cursor().setCursorToAnchor();
-	}
-
-	DocIterator cur = bv->cursor();
+	Cursor cur(*bv);
+	cur.setCursor(next ? bv->cursor().selectionEnd()
+		      : bv->cursor().selectionBegin());
 
 	// Are we within a change ? Then first search forward (backward),
 	// clear the selection and search the other way around (see the end
 	// of this function). This will avoid changes to be selected half.
 	bool search_both_sides = false;
-	DocIterator tmpcur = cur;
+	Cursor tmpcur = cur;
 	// Leave math first
 	while (tmpcur.inMathed())
 		tmpcur.pop_back();
@@ -449,24 +435,24 @@ bool findChange(BufferView * bv, bool next)
 	if (!findChange(cur, next))
 		return false;
 
-	bv->cursor().setCursor(cur);
-	bv->cursor().resetAnchor();
+	bv->mouseSetCursor(cur, false);
+
+	CursorSlice & tip = cur.top();
 
 	if (!next)
 		// take a step into the change
-		cur.backwardPos();
+		tip.backwardPos();
 
-	Change orig_change = cur.paragraph().lookupChange(cur.pos());
+	Change orig_change = tip.paragraph().lookupChange(tip.pos());
 
-	CursorSlice & tip = cur.top();
 	if (next) {
-		for (; !tip.at_end(); tip.forwardPos()) {
+		for (; tip.pit() < tip.lastpit() || tip.pos() < tip.lastpos(); tip.forwardPos()) {
 			Change change = tip.paragraph().lookupChange(tip.pos());
 			if (!change.isSimilarTo(orig_change))
 				break;
 		}
 	} else {
-		for (; !tip.at_begin();) {
+		for (; tip.pit() > 0 || tip.pos() > 0;) {
 			tip.backwardPos();
 			Change change = tip.paragraph().lookupChange(tip.pos());
 			if (!change.isSimilarTo(orig_change)) {
@@ -477,17 +463,30 @@ bool findChange(BufferView * bv, bool next)
 		}
 	}
 
-	// Now put cursor to end of selection:
-	bv->cursor().setCursor(cur);
-	bv->cursor().setSelection();
-
-	if (search_both_sides) {
-		bv->cursor().setSelection(false);
+	if (!search_both_sides) {
+		// Now set the selection.
+		bv->mouseSetCursor(cur, true);
+	} else {
+		bv->mouseSetCursor(cur, false);
 		findChange(bv, !next);
 	}
 
 	return true;
 }
+}
+
+
+bool findNextChange(BufferView * bv)
+{
+	return findChange(bv, true);
+}
+
+
+bool findPreviousChange(BufferView * bv)
+{
+	return findChange(bv, false);
+}
+
 
 namespace {
 
@@ -1063,7 +1062,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 	LYXERR(Debug::FIND, "  with cur.lastpost=" << cur.lastpos() << ", cur.lastrow="
 	       << cur.lastrow() << ", cur.lastcol=" << cur.lastcol());
 	Buffer const & buf = *cur.buffer();
-	LASSERT(buf.params().isLatex(), /* */);
+	LBUFERR(buf.params().isLatex());
 
 	TexRow texrow;
 	odocstringstream ods;
@@ -1140,7 +1139,7 @@ int findAdvFinalize(DocIterator & cur, MatchStringAdv const & match)
 		cur.forwardPos();
 	} while (cur && cur.depth() > d && match(cur) > 0);
 	cur = old_cur;
-	LASSERT(match(cur) > 0, /* */);
+	LASSERT(match(cur) > 0, return 0);
 	LYXERR(Debug::FIND, "Ok");
 
 	// Compute the match length
@@ -1284,7 +1283,8 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match)
 docstring stringifyFromForSearch(FindAndReplaceOptions const & opt,
 				 DocIterator const & cur, int len)
 {
-	LASSERT(cur.pos() >= 0 && cur.pos() <= cur.lastpos(), /* */);
+	LASSERT(cur.pos() >= 0 && cur.pos() <= cur.lastpos(),
+	        return docstring());
 	if (!opt.ignoreformat)
 		return latexifyFromCursor(cur, len);
 	else
@@ -1369,7 +1369,7 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 	       << ", sel_len: " << sel_len << endl);
 	if (sel_len == 0)
 		return;
-	LASSERT(sel_len > 0, /**/);
+	LASSERT(sel_len > 0, return);
 
 	if (!matchAdv(sel_beg, sel_len))
 		return;
@@ -1381,7 +1381,7 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 	string lyx = oss.str();
 	Buffer repl_buffer("", false);
 	repl_buffer.setUnnamed(true);
-	LASSERT(repl_buffer.readString(lyx), /**/);
+	LASSERT(repl_buffer.readString(lyx), return);
 	if (opt.keep_case && sel_len >= 2) {
 		if (cur.inTexted()) {
 			if (firstUppercase(cur))
@@ -1446,13 +1446,8 @@ bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
 	try {
 		MatchStringAdv matchAdv(bv->buffer(), opt);
 		int length = bv->cursor().selectionEnd().pos() - bv->cursor().selectionBegin().pos();
-		if (length > 0) {
-			LYXERR(Debug::FIND, "Putting selection at cur=" << cur << " with length: " << length << " and direction: " << !opt.forward);
-			if (opt.forward)
-				bv->putSelectionAt(bv->cursor().selectionBegin(), length, false);
-			else
-				bv->putSelectionAt(bv->cursor().selectionBegin(), length, true);
-		}
+		if (length > 0)
+			bv->putSelectionAt(bv->cursor().selectionBegin(), length, !opt.forward);
 		findAdvReplace(bv, opt, matchAdv);
 		cur = bv->cursor();
 		if (opt.forward)