]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfind.C
Point fix, earlier forgotten
[lyx.git] / src / lyxfind.C
index 4fc2dcbba9820484a3e8a454c97d6af1acff66a9..fe37598adb0a24526c7145427b938958053c54a6 100644 (file)
@@ -1,3 +1,15 @@
+/**
+ * \file lyxfind.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include "lyxtext.h"
 #include "insets/insettext.h"
 #include "changes.h"
 
+using namespace lyx::support;
+
 using lyx::pos_type;
 using std::endl;
 
-namespace lyxfind {
+namespace lyx {
+namespace find {
 
-/// returns true if the specified string is at the specified  position
-bool IsStringInText(Paragraph * par, pos_type pos,
-                   string const & str, bool const & = true,
-                   bool const & = false);
+namespace {
 
-/// if the string is found: return true and set the cursor to the new position
-SearchResult SearchForward(BufferView *, LyXText * text, string const & str,
-                          bool const & = true, bool const & = false);
-///
-SearchResult SearchBackward(BufferView *, LyXText * text, string const & str,
-                           bool const & = true, bool const & = false);
+// returns true if the specified string is at the specified position
+bool isStringInText(Paragraph const & par, pos_type pos,
+                   string const & str, bool const & cs,
+                   bool const & mw)
+{
+       string::size_type size = str.length();
+       pos_type i = 0;
+       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))))) {
+               ++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) >= parsize
+                       || !IsLetterCharOrDigit(par.getChar(pos + size)))) {
+                       return true;
+               }
+       }
+       return false;
+}
+
+// forward search:
+// if the string can be found: return true and set the cursor to
+// the new position, cs = casesensitive, mw = matchword
+SearchResult searchForward(BufferView * bv, LyXText * text, string const & str,
+                          bool const & cs, bool const & mw)
+{
+       ParagraphList::iterator pit = text->cursor.par();
+       ParagraphList::iterator pend = text->ownerParagraphs().end();
+       pos_type pos = text->cursor.pos();
+       UpdatableInset * inset;
+
+       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 >= pit->size()) {
+                       ++pit;
+                       pos = 0;
+               }
+       }
 
-int LyXReplace(BufferView * bv,
+       if (pit != pend) {
+               text->setCursor(pit, pos);
+               return SR_FOUND;
+       } else
+               return SR_NOT_FOUND;
+}
+
+
+// backward search:
+// if the string can be found: return true and set the cursor to
+// the new position, cs = casesensitive, mw = matchword
+SearchResult searchBackward(BufferView * bv, LyXText * text,
+                           string const & str,
+                           bool const & cs, bool const & mw)
+{
+       ParagraphList::iterator pit = text->cursor.par();
+       ParagraphList::iterator pbegin = text->ownerParagraphs().begin();
+       pos_type pos = text->cursor.pos();
+
+       // skip past a match at the current cursor pos
+       if (pos > 0) {
+               --pos;
+       } else if (pit != pbegin) {
+               --pit;
+               pos = pit->size();
+       } else {
+               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;
+}
+
+} // anon namespace
+
+
+int replace(BufferView * bv,
               string const & searchstr, string const & replacestr,
               bool forward, bool casesens, bool matchwrd, bool replaceall,
               bool once)
@@ -44,7 +162,7 @@ int LyXReplace(BufferView * bv,
        if (searchstr.length() == 0
                || (searchstr.length() == 1 && searchstr[0] == ' ')) {
 #ifdef WITH_WARNINGS
-#warning BLECH. If we have an LFUN for replace, we can fix this bogosity
+#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 "
@@ -71,15 +189,14 @@ int LyXReplace(BufferView * bv,
        string str2;
        if (casesens) {
                str1 = searchstr;
-               str2 = text->selectionAsString(bv->buffer(), false);
+               str2 = text->selectionAsString(*bv->buffer(), false);
        } else {
                str1 = lowercase(searchstr);
-               str2 = lowercase(text->selectionAsString(bv->buffer(), false));
+               str2 = lowercase(text->selectionAsString(*bv->buffer(), false));
        }
        if (str1 != str2) {
-               if (!LyXFind(bv, searchstr, fw, casesens, matchwrd) ||
-                       !replaceall)
-               {
+               if (!find(bv, searchstr, fw, casesens, matchwrd) ||
+                       !replaceall) {
                        return 0;
                }
        }
@@ -92,38 +209,30 @@ int LyXReplace(BufferView * bv,
                // 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);
-                       bv->toggleSelection(false);
+                        (text->inset_owner == text->inset_owner->getLockingInset()))) {
                        text->replaceSelectionWithString(replacestr);
                        text->setSelectionRange(replacestr.length());
-                       bv->update(text, BufferView::SELECT);
                        ++replace_count;
                }
                if (!once)
-                       found = LyXFind(bv, searchstr, fw, casesens, matchwrd);
+                       found = find(bv, searchstr, fw, casesens, matchwrd);
        } while (!once && replaceall && found);
 
        // FIXME: should be called via an LFUN
        bv->buffer()->markDirty();
-       bv->fitCursor();
+       bv->update();
 
        return replace_count;
 }
 
 
-bool LyXFind(BufferView * bv,
+bool find(BufferView * bv,
             string const & searchstr, bool forward,
             bool casesens, bool matchwrd)
 {
        if (!bv->available() || searchstr.empty())
                return false;
 
-       bv->hideCursor();
-       bv->update(bv->getLyXText(), BufferView::SELECT);
-
        if (bv->theLockingInset()) {
                bool found = forward ?
                        bv->theLockingInset()->searchForward(bv, searchstr, casesens, matchwrd) :
@@ -148,12 +257,11 @@ bool LyXFind(BufferView * bv,
                text->cursor = forward ?
                        text->selection.end : text->selection.start;
 
-       bv->toggleSelection();
        text->clearSelection();
 
        SearchResult result = forward ?
-               SearchForward(bv, text, searchstr, casesens, matchwrd) :
-               SearchBackward(bv, text, searchstr, casesens, matchwrd);
+               searchForward(bv, text, searchstr, casesens, matchwrd) :
+               searchBackward(bv, text, searchstr, casesens, matchwrd);
 
        bool found = true;
        // If we found the cursor inside an inset we will get back
@@ -161,23 +269,18 @@ bool LyXFind(BufferView * bv,
        // inset did it already.
        if (result == SR_FOUND) {
                bv->unlockInset(bv->theLockingInset());
-               bv->update(text, BufferView::SELECT);
                text->setSelectionRange(searchstr.length());
-               bv->toggleSelection(false);
-               bv->update(text, BufferView::SELECT);
        } else if (result == SR_NOT_FOUND) {
                bv->unlockInset(bv->theLockingInset());
-               bv->update(text, BufferView::SELECT);
                found = false;
        }
-
-       bv->fitCursor();
+       bv->update();
 
        return found;
 }
 
 
-SearchResult LyXFind(BufferView * bv, LyXText * text,
+SearchResult find(BufferView * bv, LyXText * text,
                     string const & searchstr, bool forward,
                     bool casesens, bool matchwrd)
 {
@@ -185,167 +288,67 @@ SearchResult LyXFind(BufferView * bv, LyXText * text,
                text->cursor = forward ?
                        text->selection.end : text->selection.start;
 
-       bv->toggleSelection();
        text->clearSelection();
 
        SearchResult result = forward ?
-               SearchForward(bv, text, searchstr, casesens, matchwrd) :
-               SearchBackward(bv, text, searchstr, casesens, matchwrd);
+               searchForward(bv, text, searchstr, casesens, matchwrd) :
+               searchBackward(bv, text, searchstr, casesens, matchwrd);
 
        return result;
 }
 
 
-// returns true if the specified string is at the specified position
-bool IsStringInText(Paragraph * 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())
-              && (string::size_type(i) < size)
-              && (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)))) {
-                       return true;
-               }
-       }
-       return false;
-}
-
-// forward search:
-// if the string can be found: return true and set the cursor to
-// the new position, cs = casesensitive, mw = matchword
-SearchResult SearchForward(BufferView * bv, LyXText * text, string const & str,
-                          bool const & cs, bool const & mw)
-{
-       Paragraph * par = text->cursor.par();
-       pos_type pos = text->cursor.pos();
-       UpdatableInset * inset;
-
-       while (par && !IsStringInText(par, pos, str, cs, mw)) {
-               if (pos < par->size() 
-                   && par->isInset(pos) 
-                   && (inset = (UpdatableInset *)par->getInset(pos)) 
-                   && inset->isTextInset()
-                   && inset->searchForward(bv, str, cs, mw))
-                       return SR_FOUND_NOUPDATE;
-
-               if (++pos >= par->size()) {
-                       par = par->next();
-                       pos = 0;
-               }
-       }
-
-       if (par) {
-               text->setCursor(par, pos);
-               return SR_FOUND;
-       } else
-               return SR_NOT_FOUND;
-}
-
-
-// backward search:
-// if the string can be found: return true and set the cursor to
-// the new position, cs = casesensitive, mw = matchword
-SearchResult SearchBackward(BufferView * bv, LyXText * text,
-                           string const & str,
-                           bool const & cs, bool const & mw)
-{
-       Paragraph * par = text->cursor.par();
-       pos_type pos = text->cursor.pos();
-
-       do {
-               if (pos > 0)
-                       --pos;
-               else {
-                       // 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()
-                   && inset->searchBackward(bv, str, cs, mw))
-                       return SR_FOUND_NOUPDATE;
-       } while (par && !IsStringInText(par, pos, str, cs, mw));
-
-       if (par) {
-               text->setCursor(par, pos);
-               return SR_FOUND;
-       } else
-               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(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(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;
 }
 
 
@@ -354,7 +357,6 @@ SearchResult findNextChange(BufferView * bv, LyXText * text, pos_type & length)
        if (text->selection.set())
                text->cursor = text->selection.end;
 
-       bv->toggleSelection();
        text->clearSelection();
 
        return nextChange(bv, text, length);
@@ -366,9 +368,6 @@ bool findNextChange(BufferView * bv)
        if (!bv->available())
                return false;
 
-       bv->hideCursor();
-       bv->update(bv->getLyXText(), BufferView::SELECT);
-
        pos_type length;
 
        if (bv->theLockingInset()) {
@@ -391,13 +390,10 @@ bool findNextChange(BufferView * bv)
        if (text->selection.set())
                text->cursor = text->selection.end;
 
-       bv->toggleSelection();
        text->clearSelection();
 
        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
@@ -405,19 +401,16 @@ bool findNextChange(BufferView * bv)
        // inset did it already.
        if (result == SR_FOUND) {
                bv->unlockInset(bv->theLockingInset());
-               bv->update(text, BufferView::SELECT);
                text->setSelectionRange(length);
-               bv->toggleSelection(false);
-               bv->update(text, BufferView::SELECT);
        } else if (result == SR_NOT_FOUND) {
                bv->unlockInset(bv->theLockingInset());
-               bv->update(text, BufferView::SELECT);
                found = false;
        }
 
-       bv->fitCursor();
+       bv->update();
 
        return found;
 }
 
-} // end lyxfind namespace
+} // find namespace
+} // lyx namespace