Fix fuer #209

[lyx.git] / src / lyxfind.C

diff --git a/src/lyxfind.C b/src/lyxfind.C
index e5d0f75afbc6eb18d592aeb27ad6b1153d604f2f..5a44645f906b52790f4bff8dee5c5c9799dc30f9 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -7,13 +7,17 @@
 #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"
 
+using lyx::pos_type;
+
+
 ///
 // locally used enum
 ///
@@ -28,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);
 
@@ -53,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;
        }
@@ -140,7 +144,7 @@ bool LyXFind(BufferView * bv,
                else {
                        text = bv->getLyXText();
                        Paragraph * par = text->cursor.par();
-                       Paragraph::size_type pos = text->cursor.pos();
+                       pos_type pos = text->cursor.pos();
                        if (forward) {
                                if (pos < par->size() - 1)
                                        ++pos;
@@ -183,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)
 {
@@ -191,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;
                }
        }
@@ -220,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)) {
@@ -235,41 +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;
-#if 0
-       } 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);
-               if (!bv->theLockingInset()) {
-                       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 {
-                       return SR_NOT_FOUND;
-               }
-#endif
-       } 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;
+       }
 }
 
 
@@ -281,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();
@@ -311,17 +301,10 @@ SearchResult SearchBackward(BufferView * bv, LyXText * text,
        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);
+               return SR_NOT_FOUND;
        }
-#if 0
-       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);
-               if (!bv->theLockingInset()) {
-                       return SearchBackward(bv, bv->getLyXText(), str, cs, mw);
-               }
-       }
-#endif
-       return SR_NOT_FOUND;
 }