Fix bug 2195: Slowness in rendering inside insets, especially on the Mac

[lyx.git] / src / ispell.C

diff --git a/src/ispell.C b/src/ispell.C
index f1abc99bf013fc419307554498857b245ad9f765..34c291a648f8a7021db62045c4fdf47f6a7050bc 100644 (file)
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -26,9 +26,13 @@
 
 // HP-UX 11.x doesn't have this header
 #ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
+# include <sys/select.h>
 #endif
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+using boost::shared_ptr;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strcpy;
@@ -44,14 +48,15 @@ using std::string;
 namespace {
 
 class LaunchIspell : public lyx::support::ForkedProcess {
+       typedef lyx::support::ForkedProcess ForkedProcess;
 public:
        ///
        LaunchIspell(BufferParams const & p, string const & l,
                     int * in, int * out, int * err)
                : params(p), lang(l), pipein(in), pipeout(out), pipeerr(err) {}
        ///
-       virtual lyx::support::ForkedProcess * clone() const {
-               return new LaunchIspell(*this);
+       virtual shared_ptr<ForkedProcess> clone() const {
+               return shared_ptr<ForkedProcess>(new LaunchIspell(*this));
        }
        ///
        int start();
@@ -71,7 +76,7 @@ private:
 int LaunchIspell::start()
 {
        command_ = lyxrc.isp_command;
-       return runNonBlocking();
+       return run(DontWait);
 }
 
 
@@ -260,7 +265,7 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
                error_ = buf;
        } else {
                // select returned error
-               error_ = _("The spell process returned an error.\nPerhaps "
+               error_ = _("The ispell process returned an error.\nPerhaps "
                                "it has been configured wrongly ?");
        }
 
@@ -369,19 +374,19 @@ enum ISpell::Result ISpell::check(WordLangTuple const & word)
        bool error = select(err_read);
 
        if (error) {
-               error_ = _("Could not communicate with the spell-checker program.");
-               return UNKNOWN;
+               error_ = _("Could not communicate with the ispell spellchecker process.");
+               return UNKNOWN_WORD;
        }
 
        if (err_read) {
                error_ = buf;
-               return UNKNOWN;
+               return UNKNOWN_WORD;
        }
 
        // I think we have to check if ispell is still alive here because
        // the signal-handler could have disabled blocking on the fd
        if (!alive())
-               return UNKNOWN;
+               return UNKNOWN_WORD;
 
        switch (*buf) {
        case '*':
@@ -391,18 +396,18 @@ enum ISpell::Result ISpell::check(WordLangTuple const & word)
                res = ROOT;
                break;
        case '-':
-               res = COMPOUNDWORD;
+               res = COMPOUND_WORD;
                break;
        case '\n':
-               res = IGNORE;
+               res = IGNORED_WORD;
                break;
        case '#': // Not found, no near misses and guesses
-               res = UNKNOWN;
+               res = UNKNOWN_WORD;
                break;
        case '?': // Not found, and no near misses, but guesses (guesses are ignored)
        case '&': // Not found, but we have near misses
        {
-               res = MISSED;
+               res = SUGGESTED_WORDS;
                char * p = strpbrk(buf, ":");
                str = new char[strlen(p) + 1];
                e   = str;
@@ -410,11 +415,11 @@ enum ISpell::Result ISpell::check(WordLangTuple const & word)
                break;
        }
        default: // This shouldn't happen, but you know Murphy
-               res = UNKNOWN;
+               res = UNKNOWN_WORD;
        }
 
        *buf = 0;
-       if (res != IGNORE) {
+       if (res != IGNORED_WORD) {
                /* wait for ispell to finish */
                while (*buf!= '\n')
                        fgets(buf, 255, in);