]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfind.C
Fix fuer #209
[lyx.git] / src / lyxfind.C
index 4feec5b0484182f1ccbc3050b813b69276848f9f..5a44645f906b52790f4bff8dee5c5c9799dc30f9 100644 (file)
@@ -7,16 +7,15 @@
 #include "lyxtext.h"
 #include "lyxfind.h"
 #include "LyXView.h"
-#include "lyx_gui_misc.h"
+#include "frontends/Alert.h"
 #include "support/textutils.h"
 #include "support/lstrings.h"
 #include "BufferView.h"
 #include "buffer.h"
+#include "debug.h"
 #include "gettext.h"
 
-// declare local prototypes here so they cannot be used without hack
-// externally and also we won't see them in the lyxfind.h file so we
-// know this are internal files!
+using lyx::pos_type;
 
 
 ///
@@ -33,7 +32,7 @@ enum SearchResult {
 
 
 /// returns true if the specified string is at the specified  position
-bool IsStringInText(Paragraph * par, Paragraph::size_type pos,
+bool IsStringInText(Paragraph * par, pos_type pos,
                     string const & str, bool const & = true,
                     bool const & = false);
 
@@ -47,8 +46,8 @@ SearchResult SearchBackward(BufferView *, LyXText * text, string const & str,
 
 int LyXReplace(BufferView * bv,
                string const & searchstr, string const & replacestr,
-               bool const & forward, bool const & casesens,
-               bool const & matchwrd, bool const & replaceall)
+               bool forward, bool casesens, bool matchwrd, bool replaceall,
+               bool once)
 {
        if (!bv->available() || bv->buffer()->isReadonly()) 
                return 0;
@@ -58,7 +57,7 @@ int LyXReplace(BufferView * bv,
        if (searchstr.length() == 0
                || (searchstr.length() == 1 && searchstr[0] == ' '))
        {
-               WriteAlert(_("Sorry!"), _("You cannot replace a single space, "
+               Alert::alert(_("Sorry!"), _("You cannot replace a single space, "
                                          "nor an empty character."));
                return 0;
        }
@@ -69,7 +68,7 @@ int LyXReplace(BufferView * bv,
        // start at top if replaceall
        bool fw = forward;
        if (replaceall) {
-               text->clearSelection(bv);
+               text->clearSelection();
                if (text->inset_owner) {
                        bv->unlockInset(bv->theLockingInset());
                        text = bv->text;
@@ -81,15 +80,24 @@ int LyXReplace(BufferView * bv,
        
        // if nothing selected or selection does not equal search string
        // search and select next occurance and return if no replaceall
-       if (searchstr!=text->selectionAsString(bv->buffer())) {
+       string str1;
+       string str2;
+       if (casesens) {
+               str1 = searchstr;
+               str2 = text->selectionAsString(bv->buffer(), false);
+       } else {
+               str1 = lowercase(searchstr);
+               str2 = lowercase(text->selectionAsString(bv->buffer(), false));
+       }
+       if (str1 != str2) {
                if (!LyXFind(bv, searchstr, fw, false, casesens, matchwrd) ||
                        !replaceall)
                {
                        return 0;
                }
        }
-   
-       bool found;
+
+       bool found = false;
        int replace_count = 0;
        do {
                bv->hideCursor();
@@ -99,8 +107,9 @@ int LyXReplace(BufferView * bv,
                bv->getLyXText()->setSelectionOverString(bv, replacestr);
                bv->update(bv->getLyXText(), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                ++replace_count;
-               found = LyXFind(bv, searchstr, fw, false, casesens, matchwrd);
-       } while (replaceall && found);
+               if (!once)
+                       found = LyXFind(bv, searchstr, fw, false, casesens, matchwrd);
+       } while (!once && replaceall && found);
    
        if (bv->focus())
                bv->showCursor();
@@ -109,9 +118,8 @@ int LyXReplace(BufferView * bv,
 }
 
 bool LyXFind(BufferView * bv,
-             string const & searchstr, bool const & forward,
-                        bool const & frominset,
-             bool const & casesens, bool const & matchwrd)
+             string const & searchstr, bool forward,
+             bool frominset, bool casesens, bool matchwrd)
 {
        if (!bv->available() || searchstr.empty())
                return false;
@@ -133,6 +141,26 @@ bool LyXFind(BufferView * bv,
                        bv->theLockingInset()->searchBackward(bv, searchstr, casesens, matchwrd);
                if (found)
                        result = SR_FOUND_NOUPDATE;
+               else {
+                       text = bv->getLyXText();
+                       Paragraph * par = text->cursor.par();
+                       pos_type pos = text->cursor.pos();
+                       if (forward) {
+                               if (pos < par->size() - 1)
+                                       ++pos;
+                               else {
+                                       pos = 0;
+                                       par = par->next();
+                               }
+                               if (par)
+                                       text->setCursor(bv, par, pos);
+                       }
+                       if (par) {
+                               result = forward ? 
+                                       SearchForward(bv, text, searchstr, casesens, matchwrd) :
+                                       SearchBackward(bv, text, searchstr, casesens, matchwrd);
+                       }
+               }
        } else {
                result = forward ? 
                        SearchForward(bv, text, searchstr, casesens, matchwrd) :
@@ -144,7 +172,7 @@ bool LyXFind(BufferView * bv,
                // the actual text pointer could have changed!
                bv->update(bv->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
                bv->toggleSelection();
-               bv->getLyXText()->clearSelection(bv);
+               bv->getLyXText()->clearSelection();
                bv->getLyXText()->setSelectionOverString(bv, searchstr);
                bv->toggleSelection(false);
                bv->update(bv->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
@@ -159,7 +187,7 @@ bool LyXFind(BufferView * bv,
 
 
 // returns true if the specified string is at the specified position
-bool IsStringInText(Paragraph * par, Paragraph::size_type pos,
+bool IsStringInText(Paragraph * par, pos_type pos,
                    string const & str, bool const & cs,
                    bool const & mw)
 {
@@ -167,22 +195,21 @@ bool IsStringInText(Paragraph * par, Paragraph::size_type pos,
                return false;
    
        string::size_type size = str.length();
-       Paragraph::size_type i = 0;
+       pos_type i = 0;
        while (((pos + i) < par->size())
               && (string::size_type(i) < size)
               && (cs ? (str[i] == par->getChar(pos + i))
-                  : (toupper(str[i]) == toupper(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 || 
-                   (mw && ((pos <= 0 || !IsLetterCharOrDigit(par->getChar(pos - 1)))
-                            && (pos + Paragraph::size_type(size) >= par->size()
-                                || !IsLetterCharOrDigit(par->getChar(pos + size))))
-                    ))
-               {
+               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;
                }
        }
@@ -196,7 +223,8 @@ SearchResult SearchForward(BufferView * bv, LyXText * text, string const & str,
                            bool const & cs, bool const & mw)
 {
        Paragraph * par = text->cursor.par();
-       Paragraph::size_type pos = text->cursor.pos();
+       pos_type pos = text->cursor.pos();
+       Paragraph * prev_par = par;
        UpdatableInset * inset;
 
        while (par && !IsStringInText(par, pos, str, cs, mw)) {
@@ -211,35 +239,25 @@ SearchResult SearchForward(BufferView * bv, LyXText * text, string const & str,
                                return SR_FOUND_NOUPDATE;
                        text = bv->getLyXText();
                }
-               if (pos < par->size() - 1)
-                       ++pos;
-               else {
-                       pos = 0;
+               ++pos;
+               if (pos >= par->size()) {
+                       prev_par = par;
                        par = par->next();
+                       pos = 0;
                }
        }
        if (par) {
                text->setCursor(bv, par, pos);
                return SR_FOUND;
-       } else if (text->inset_owner) {
-               // test if we're inside an inset if yes unlock the inset
-               // and recall us with the outside LyXText!
-               bv->unlockInset((UpdatableInset *)text->inset_owner);
-               text = bv->getLyXText();
-               par = text->cursor.par();
-               pos = text->cursor.pos();
-               if (pos < par->size() - 1)
-                       ++pos;
-               else {
-                       pos = 0;
-                       par = par->next();
-               }
-               if (!par)
-                       return SR_NOT_FOUND;
-               text->setCursor(bv, par, pos);
-               return SearchForward(bv, text, str, cs, mw);
-       } else
+       } 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());
                return SR_NOT_FOUND;
+       }
 }
 
 
@@ -251,12 +269,14 @@ SearchResult SearchBackward(BufferView * bv, LyXText * text,
                             bool const & cs, bool const & mw)
 {
        Paragraph * par = text->cursor.par();
-       Paragraph::size_type pos = text->cursor.pos();
+       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();
@@ -281,12 +301,9 @@ SearchResult SearchBackward(BufferView * bv, LyXText * text,
        if (par) {
                text->setCursor(bv, par, pos);
                return SR_FOUND;
-       } else if (text->inset_owner) {
-               // test if we're inside an inset if yes unlock the inset
-               // and recall us with the outside LyXText!
-               bv->unlockInset((UpdatableInset *)text->inset_owner);
-               return SearchBackward(bv, bv->getLyXText(), str, cs, mw);
        } else {
+               // go to the last part of the unsuccessful search
+               text->setCursor(bv, prev_par, 0);
                return SR_NOT_FOUND;
        }
 }