]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfind.C
Alfredo's second patch
[lyx.git] / src / lyxfind.C
index 78dd3b416b66e44fa983e51123b91641cf41881a..713957d28542edec8becec04760d323a7bbb06ba 100644 (file)
@@ -1,11 +1,8 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxtext.h"
 #include "lyxfind.h"
+#include "paragraph.h"
 #include "frontends/LyXView.h"
 #include "frontends/Alert.h"
 #include "support/textutils.h"
 #include "buffer.h"
 #include "debug.h"
 #include "gettext.h"
+#include "insets/insettext.h"
+#include "changes.h"
 
 using lyx::pos_type;
+using std::endl;
 
 namespace lyxfind {
 
@@ -42,10 +42,13 @@ int LyXReplace(BufferView * bv,
        // 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;
        }
 
@@ -57,7 +60,7 @@ int LyXReplace(BufferView * bv,
                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;
        }
@@ -75,8 +78,7 @@ int LyXReplace(BufferView * bv,
        }
        if (str1 != str2) {
                if (!LyXFind(bv, searchstr, fw, casesens, matchwrd) ||
-                       !replaceall)
-               {
+                       !replaceall) {
                        return 0;
                }
        }
@@ -85,20 +87,30 @@ int LyXReplace(BufferView * bv,
        int replace_count = 0;
        do {
                text = bv->getLyXText();
-               bv->hideCursor();
-               bv->update(text, BufferView::SELECT|BufferView::FITCUR);
-               bv->toggleSelection(false);
-               text->replaceSelectionWithString(bv, replacestr);
-               text->setSelectionOverString(bv, replacestr);
-               bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               ++replace_count;
+               // We have to do this check only because mathed insets don't
+               // 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->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;
 }
+
 
 bool LyXFind(BufferView * bv,
             string const & searchstr, bool forward,
@@ -108,7 +120,7 @@ bool LyXFind(BufferView * bv,
                return false;
 
        bv->hideCursor();
-       bv->update(bv->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
+       bv->update(bv->getLyXText(), BufferView::SELECT);
 
        if (bv->theLockingInset()) {
                bool found = forward ?
@@ -121,7 +133,7 @@ bool LyXFind(BufferView * bv,
                // 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
@@ -129,13 +141,14 @@ bool LyXFind(BufferView * bv,
        // we are!
        LyXText * text = bv->text;
 
+
        if (text->selection.set())
                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);
@@ -146,19 +159,21 @@ bool LyXFind(BufferView * bv,
        // inset did it already.
        if (result == SR_FOUND) {
                bv->unlockInset(bv->theLockingInset());
-               bv->update(text, BufferView::SELECT|BufferView::FITCUR);
-               text->setSelectionOverString(bv, searchstr);
+               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;
 }
+
 
 SearchResult LyXFind(BufferView * bv, LyXText * text,
                     string const & searchstr, bool forward,
@@ -180,29 +195,27 @@ SearchResult LyXFind(BufferView * bv, LyXText * text,
 
 
 // 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;
                }
        }
@@ -215,43 +228,30 @@ bool IsStringInText(Paragraph * par, pos_type pos,
 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;
-               }
+       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;
 
-               ++pos;
-
-               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;
-       }
 }
 
 
@@ -262,45 +262,168 @@ SearchResult SearchBackward(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 pbegin = text->ownerParagraphs().begin();
        pos_type pos = text->cursor.pos();
-       Paragraph * prev_par = par;
 
-       do {
-               if (pos > 0)
+       // 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 {
-                       prev_par = par;
-                       // We skip empty paragraphs (Asger)
-                       do {
-                               par = par->previous();
-                               if (par)
-                                       pos = par->size() - 1;
-                       } while (par && pos < 0);
+               } else if (pit != pbegin) {
+                       --pit;
+                       pos = pit->size();
                }
-               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;
+       }
+
+       return SR_NOT_FOUND;
+}
+
+
+SearchResult nextChange(BufferView * bv, LyXText * text, pos_type & length)
+{
+       ParagraphList::iterator pit = text->cursor.par();
+       ParagraphList::iterator pend = text->ownerParagraphs().end();
+       pos_type pos = text->cursor.pos();
+
+       while (pit != pend) {
+               pos_type parsize = pit->size();
+
+               if (pos < parsize) {
+                       if ((!parsize || pos != parsize)
+                               && pit->lookupChange(pos) != Change::UNCHANGED)
+                               break;
+
+                       if (pit->isInset(pos) && pit->getInset(pos)->isTextInset()) {
+                               UpdatableInset * inset = (UpdatableInset *)pit->getInset(pos);
+                               if (inset->nextChange(bv, length))
+                                       return SR_FOUND_NOUPDATE;
+                       }
                }
-       } while (par && !IsStringInText(par, pos, str, cs, mw));
 
-       if (par) {
-               text->setCursor(bv, par, pos);
-               return SR_FOUND;
-       } else {
-               // go to the last part of the unsuccessful search
-               text->setCursor(bv, prev_par, 0);
+               ++pos;
+
+               if (pos >= parsize) {
+                       ++pit;
+                       pos = 0;
+               }
+       }
+
+       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;
+}
+
+
+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);
+}
+
+
+bool findNextChange(BufferView * bv)
+{
+       if (!bv->available())
+               return false;
+
+       bv->hideCursor();
+       bv->update(bv->getLyXText(), BufferView::SELECT);
+
+       pos_type length;
+
+       if (bv->theLockingInset()) {
+               bool found = bv->theLockingInset()->nextChange(bv, length);
+
+               // We found the stuff inside the inset so we don't have to
+               // do anything as the inset did all the update for us!
+               if (found)
+                       return true;
+
+               // 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(true);
        }
+       // If we arrive here we are in the main text again so we
+       // just start searching from the root LyXText at the position
+       // we are!
+       LyXText * text = bv->text;
+
+       if (text->selection.set())
+               text->cursor = text->selection.end;
+
+       bv->toggleSelection();
+       text->clearSelection();
+
+       SearchResult result = nextChange(bv, text, length);
+
+       bool found = true;
+
+       // If we found the cursor inside an inset we will get back
+       // SR_FOUND_NOUPDATE and we don't have to do anything as the
+       // 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();
+
+       return found;
 }
 
 } // end lyxfind namespace