// CutSelection cannot cut a single space, so we have to stop
// in order to avoid endless loop :-(
if (searchstr.length() == 0
- || (searchstr.length() == 1 && searchstr[0] == ' '))
- {
- Alert::alert(_("Sorry!"), _("You cannot replace a single space, "
- "nor an empty character."));
+ || (searchstr.length() == 1 && searchstr[0] == ' ')) {
+#ifdef WITH_WARNINGS
+#warning BLECH. If we have an LFUN for replace, we can sort of fix this bogosity
+#endif
+ Alert::error(_("Cannot replace"),
+ _("You cannot replace a single space or "
+ "an empty character."));
return 0;
}
text->clearSelection();
bv->unlockInset(bv->theLockingInset());
text = bv->text;
- text->cursorTop(bv);
+ text->cursorTop();
// override search direction because we search top to bottom
fw = true;
}
}
if (str1 != str2) {
if (!LyXFind(bv, searchstr, fw, casesens, matchwrd) ||
- !replaceall)
- {
+ !replaceall) {
return 0;
}
}
// return their own LyXText but the LyXText of it's parent!
if (!bv->theLockingInset() ||
((text != bv->text) &&
- (text->inset_owner == text->inset_owner->getLockingInset())))
- {
- bv->hideCursor();
- bv->update(text, BufferView::SELECT|BufferView::FITCUR);
+ (text->inset_owner == text->inset_owner->getLockingInset()))) {
+ bv->update(text, BufferView::SELECT);
bv->toggleSelection(false);
- text->replaceSelectionWithString(bv, replacestr);
- text->setSelectionRange(bv, replacestr.length());
- bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ text->replaceSelectionWithString(replacestr);
+ text->setSelectionRange(replacestr.length());
+ bv->update(text, BufferView::SELECT);
++replace_count;
}
if (!once)
found = LyXFind(bv, searchstr, fw, casesens, matchwrd);
} while (!once && replaceall && found);
+ // FIXME: should be called via an LFUN
+ bv->buffer()->markDirty();
+ bv->fitCursor();
+
return replace_count;
}
if (!bv->available() || searchstr.empty())
return false;
- bv->hideCursor();
- bv->update(bv->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
+ bv->update(bv->getLyXText(), BufferView::SELECT);
if (bv->theLockingInset()) {
bool found = forward ?
// We now are in the main text but if we did a forward
// search we have to put the cursor behind the inset.
if (forward) {
- bv->text->cursorRight(bv, true);
+ bv->text->cursorRight(true);
}
}
// If we arrive here we are in the main text again so we
// we are!
LyXText * text = bv->text;
+
if (text->selection.set())
text->cursor = forward ?
text->selection.end : text->selection.start;
// inset did it already.
if (result == SR_FOUND) {
bv->unlockInset(bv->theLockingInset());
- bv->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->setSelectionRange(bv, searchstr.length());
+ bv->update(text, BufferView::SELECT);
+ text->setSelectionRange(searchstr.length());
bv->toggleSelection(false);
- bv->update(text, BufferView::SELECT|BufferView::FITCUR);
+ bv->update(text, BufferView::SELECT);
} else if (result == SR_NOT_FOUND) {
bv->unlockInset(bv->theLockingInset());
- bv->update(text, BufferView::SELECT|BufferView::FITCUR);
+ bv->update(text, BufferView::SELECT);
found = false;
}
+ bv->fitCursor();
+
return found;
}
// returns true if the specified string is at the specified position
-bool IsStringInText(Paragraph * par, pos_type pos,
+bool IsStringInText(Paragraph const & par, pos_type pos,
string const & str, bool const & cs,
bool const & mw)
{
- if (!par)
- return false;
-
string::size_type size = str.length();
pos_type i = 0;
- while (((pos + i) < par->size())
+ pos_type parsize = par.size();
+ while (((pos + i) < parsize)
&& (string::size_type(i) < size)
- && (cs ? (str[i] == par->getChar(pos + i))
- : (uppercase(str[i]) == uppercase(par->getChar(pos + i)))))
- {
+ && (cs ? (str[i] == par.getChar(pos + i))
+ : (uppercase(str[i]) == uppercase(par.getChar(pos + i))))) {
++i;
}
+
if (size == string::size_type(i)) {
// if necessary, check whether string matches word
if (!mw)
return true;
- if ((pos <= 0 || !IsLetterCharOrDigit(par->getChar(pos - 1)))
- && (pos + pos_type(size) >= par->size()
- || !IsLetterCharOrDigit(par->getChar(pos + size)))) {
+ if ((pos <= 0 || !IsLetterCharOrDigit(par.getChar(pos - 1)))
+ && (pos + pos_type(size) >= parsize
+ || !IsLetterCharOrDigit(par.getChar(pos + size)))) {
return true;
}
}
SearchResult SearchForward(BufferView * bv, LyXText * text, string const & str,
bool const & cs, bool const & mw)
{
- Paragraph * par = text->cursor.par();
+ ParagraphList::iterator pit = text->cursor.par();
+ ParagraphList::iterator pend = text->ownerParagraphs().end();
pos_type pos = text->cursor.pos();
- Paragraph * prev_par = par;
UpdatableInset * inset;
- while (par && !IsStringInText(par, pos, str, cs, mw)) {
- if (par->isInset(pos) &&
- (inset = (UpdatableInset *)par->getInset(pos)) &&
- (inset->isTextInset()))
- {
-#if 0
- // lock the inset!
- text->setCursor(bv, par, pos);
- inset->edit(bv);
-#endif
- if (inset->searchForward(bv, str, cs, mw))
- return SR_FOUND_NOUPDATE;
- }
-
- ++pos;
+ while (pit != pend && !IsStringInText(*pit, pos, str, cs, mw)) {
+ if (pos < pit->size()
+ && pit->isInset(pos)
+ && (inset = (UpdatableInset *)pit->getInset(pos))
+ && inset->isTextInset()
+ && inset->searchForward(bv, str, cs, mw))
+ return SR_FOUND_NOUPDATE;
- if (pos >= par->size()) {
- prev_par = par;
- par = par->next();
+ if (++pos >= pit->size()) {
+ ++pit;
pos = 0;
}
}
- if (par) {
- text->setCursor(bv, par, pos);
+ if (pit != pend) {
+ text->setCursor(pit, pos);
return SR_FOUND;
- } else {
- // make sure we end up at the end of the text,
- // not the start point of the last search
- text->setCursor(bv, prev_par, prev_par->size());
+ } else
return SR_NOT_FOUND;
- }
}
string const & str,
bool const & cs, bool const & mw)
{
- Paragraph * par = text->cursor.par();
+ ParagraphList::iterator pit = text->cursor.par();
+ ParagraphList::iterator pbegin = text->ownerParagraphs().begin();
pos_type pos = text->cursor.pos();
- Paragraph * prev_par = par;
- do {
- if (pos > 0)
- --pos;
- else {
- prev_par = par;
- // We skip empty paragraphs (Asger)
- do {
- par = par->previous();
- if (par)
- pos = par->size() - 1;
- } while (par && pos < 0);
- }
- UpdatableInset * inset;
- if (par && par->isInset(pos) &&
- (inset = (UpdatableInset *)par->getInset(pos)) &&
- (inset->isTextInset()))
- {
-#if 0
- // lock the inset!
- text->setCursor(bv, par, pos);
- inset->edit(bv, false);
-#endif
- if (inset->searchBackward(bv, str, cs, mw))
- return SR_FOUND_NOUPDATE;
- }
- } while (par && !IsStringInText(par, pos, str, cs, mw));
-
- if (par) {
- text->setCursor(bv, par, pos);
- return SR_FOUND;
+ // skip past a match at the current cursor pos
+ if (pos > 0) {
+ --pos;
+ } else if (pit != pbegin) {
+ --pit;
+ pos = pit->size();
} else {
- // go to the last part of the unsuccessful search
- text->setCursor(bv, prev_par, 0);
return SR_NOT_FOUND;
}
+
+ while (true) {
+ if (pos < pit->size()) {
+ if (pit->isInset(pos) && pit->getInset(pos)->isTextInset()) {
+ UpdatableInset * inset = (UpdatableInset *)pit->getInset(pos);
+ if (inset->searchBackward(bv, str, cs, mw))
+ return SR_FOUND_NOUPDATE;
+ }
+
+ if (IsStringInText(*pit, pos, str, cs, mw)) {
+ text->setCursor(pit, pos);
+ return SR_FOUND;
+ }
+ }
+
+ if (pos == 0 && pit == pbegin)
+ break;
+
+ if (pos > 0) {
+ --pos;
+ } else if (pit != pbegin) {
+ --pit;
+ pos = pit->size();
+ }
+ }
+
+ return SR_NOT_FOUND;
}
SearchResult nextChange(BufferView * bv, LyXText * text, pos_type & length)
{
- Paragraph * par = text->cursor.par();
+ ParagraphList::iterator pit = text->cursor.par();
+ ParagraphList::iterator pend = text->ownerParagraphs().end();
pos_type pos = text->cursor.pos();
- Paragraph * prev_par = par;
- UpdatableInset * inset;
- while (par) {
- if ((!par->size() || pos != par->size())
- && par->lookupChange(pos) != Change::UNCHANGED)
- break;
+ while (pit != pend) {
+ pos_type parsize = pit->size();
+
+ if (pos < parsize) {
+ if ((!parsize || pos != parsize)
+ && pit->lookupChange(pos) != Change::UNCHANGED)
+ break;
- if (par->isInset(pos) &&
- (inset = (UpdatableInset *)par->getInset(pos)) &&
- (inset->isTextInset())) {
- if (inset->nextChange(bv, length))
- return SR_FOUND_NOUPDATE;
+ if (pit->isInset(pos) && pit->getInset(pos)->isTextInset()) {
+ UpdatableInset * inset = (UpdatableInset *)pit->getInset(pos);
+ if (inset->nextChange(bv, length))
+ return SR_FOUND_NOUPDATE;
+ }
}
++pos;
- if (pos >= par->size()) {
- prev_par = par;
- par = par->next();
+ if (pos >= parsize) {
+ ++pit;
pos = 0;
}
}
- if (par) {
- text->setCursor(bv, par, pos);
- Change orig_change = par->lookupChangeFull(pos);
- pos_type end = pos;
-
- for (; end != par->size(); ++end) {
- Change change = par->lookupChangeFull(end);
- if (change != orig_change) {
- // slight UI optimisation: for replacements, we get
- // text like : _old_new. Consider that as one change.
- if (!(orig_change.type == Change::DELETED &&
- change.type == Change::INSERTED))
- break;
- }
- }
- length = end - pos;
- return SR_FOUND;
- } else {
- // make sure we end up at the end of the text,
- // not the start point of the last search
- text->setCursor(bv, prev_par, prev_par->size());
+ if (pit == pend)
return SR_NOT_FOUND;
+
+ text->setCursor(pit, pos);
+ Change orig_change = pit->lookupChangeFull(pos);
+ pos_type parsize = pit->size();
+ pos_type end = pos;
+
+ for (; end != parsize; ++end) {
+ Change change = pit->lookupChangeFull(end);
+ if (change != orig_change) {
+ // slight UI optimisation: for replacements, we get
+ // text like : _old_new. Consider that as one change.
+ if (!(orig_change.type == Change::DELETED &&
+ change.type == Change::INSERTED))
+ break;
+ }
}
+ length = end - pos;
+ return SR_FOUND;
}
if (!bv->available())
return false;
- bv->hideCursor();
- bv->update(bv->getLyXText(), BufferView::SELECT | BufferView::FITCUR);
+ bv->update(bv->getLyXText(), BufferView::SELECT);
pos_type length;
// We now are in the main text but if we did a forward
// search we have to put the cursor behind the inset.
- bv->text->cursorRight(bv, true);
+ bv->text->cursorRight(true);
}
// If we arrive here we are in the main text again so we
// just start searching from the root LyXText at the position
SearchResult result = nextChange(bv, text, length);
- lyxerr << "Result is " << result << endl;
-
bool found = true;
// If we found the cursor inside an inset we will get back
// inset did it already.
if (result == SR_FOUND) {
bv->unlockInset(bv->theLockingInset());
- bv->update(text, BufferView::SELECT|BufferView::FITCUR);
- text->setSelectionRange(bv, length);
+ bv->update(text, BufferView::SELECT);
+ text->setSelectionRange(length);
bv->toggleSelection(false);
- bv->update(text, BufferView::SELECT|BufferView::FITCUR);
+ bv->update(text, BufferView::SELECT);
} else if (result == SR_NOT_FOUND) {
bv->unlockInset(bv->theLockingInset());
- bv->update(text, BufferView::SELECT|BufferView::FITCUR);
+ bv->update(text, BufferView::SELECT);
found = false;
}
+ bv->fitCursor();
+
return found;
}