get rid of LYX_LIBS

[lyx.git] / src / sp_spell.C

diff --git a/src/sp_spell.C b/src/sp_spell.C
index 55fdd0484762fbe806901732ba9d558126b6490a..3563c32cbe3aa96d642d80643bb56b3b29417d5e 100644 (file)
--- a/src/sp_spell.C
+++ b/src/sp_spell.C
@@ -17,6 +17,8 @@
 #pragma implementation
 #endif
 
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -46,6 +48,7 @@
 #include "LString.h"
 #include "support/lstrings.h"
 #include "lyxrc.h"
+#include "language.h"
 #include "debug.h"
 #include "encoding.h"
 #include "sp_ispell.h"
@@ -57,9 +60,6 @@ namespace {
        pid_t isp_pid = -1; 
 }
 
-/// can be found in src/insets/figinset.C
-extern void sigchldchecker(pid_t pid, int * status);
-
 ///
 // ------------------- start special pspell code/class --------------------
 ///
@@ -74,22 +74,20 @@ extern void sigchldchecker(pid_t pid, int * status);
 
 
 PSpell::PSpell() 
+       : sc(0), els(0), spell_error_object(0), flag(ISP_UNKNOWN),
+         alive_(false)
 {
-       els = 0;
-       sc = 0;
-       spell_error_object = 0;
-       flag = ISP_UNKNOWN;
 }
 
+
 PSpell::PSpell(BufferParams const & params, string const & lang)
+       : sc(0), els(0), spell_error_object(0), flag(ISP_UNKNOWN),
+         alive_(false)
 {
-       els = 0;
-       sc = 0;
-       spell_error_object = 0;
-       flag = ISP_UNKNOWN;
        initialize(params, lang);
 }
 
+
 PSpell::~PSpell() 
 {
        cleanUp();
@@ -102,9 +100,7 @@ PSpell::~PSpell()
 void PSpell::initialize(BufferParams const &, string const & lang)
 {
        PspellConfig * config = new_pspell_config();
-       string code;
-       split(lang, code, '_');
-       config->replace("language-tag", code.c_str());
+       config->replace("language-tag", lang.c_str());
        spell_error_object = new_pspell_manager(config);
        if (pspell_error_number(spell_error_object) != 0) {
                error_ = pspell_error_message(spell_error_object);
@@ -112,6 +108,7 @@ void PSpell::initialize(BufferParams const &, string const & lang)
                error_ = 0;
                sc = to_pspell_manager(spell_error_object);
                spell_error_object = 0;
+               alive_ = true;
        }
 }
 
@@ -184,15 +181,12 @@ char const * PSpell::nextMiss()
        return "";
 }
 
+
 char const * PSpell::error()
 {
        return error_;
 }
 
-void PSpell::sigchldhandler(pid_t pid, int * status)
-{
-       sigchldchecker(pid, status);
-}
 
 #endif
 
@@ -201,16 +195,13 @@ void PSpell::sigchldhandler(pid_t pid, int * status)
 ///
 
 ISpell::ISpell()
-{
-       str = 0;
-       flag = ISP_UNKNOWN;
-}
+       : str(0), flag(ISP_UNKNOWN)
+{}
 
 
 ISpell::ISpell(BufferParams const & params, string const & lang)
+       : str(0), flag(ISP_UNKNOWN)
 {
-       str = 0;
-       flag = ISP_UNKNOWN;
        initialize(params, lang);
 }
 
@@ -234,7 +225,8 @@ char const * ISpell::nextMiss()
 void ISpell::initialize(BufferParams const & params, string const & lang)
 {
        static char o_buf[BUFSIZ];  // jc: it could be smaller
-       int pipein[2], pipeout[2];
+       int pipein[2];
+       int pipeout[2];
        char * argv[14];
        int argc;
 
@@ -338,7 +330,8 @@ void ISpell::initialize(BufferParams const & params, string const & lang)
                                : params.inputenc;
                        string::size_type n = enc.length();
                        tmp = new char[3];
-                       string("-T").copy(tmp, 2); tmp[2] = '\0';
+                       string("-T").copy(tmp, 2);
+                       tmp[2] = '\0';
                        argv[argc++] = tmp; // Input encoding
                        tmp = new char[n + 1];
                        enc.copy(tmp, n);
@@ -352,7 +345,7 @@ void ISpell::initialize(BufferParams const & params, string const & lang)
 
                // free the memory used by string::copy in the
                // setup of argv
-               for (int i= 0; i < argc -1; ++i)
+               for (int i = 0; i < argc - 1; ++i)
                        delete[] argv[i];
                
                lyxerr << "LyX: Failed to start ispell!" << endl;
@@ -414,17 +407,31 @@ void ISpell::initialize(BufferParams const & params, string const & lang)
        if (isp_pid == -1) {
                error_ = 
                        "\n\n"
-                       "The ispell-process has died for some reason. *One* possible reason\n"
-                       "could be that you do not have a dictionary file\n"
-                       "for the language of this document installed.\n"
-                       "Check /usr/lib/ispell or set another\n"
-                       "dictionary in the Spellchecker Options menu.";
+                       "The spellcheck-process has died for some reason.\n"
+                       "*One* possible reason could be that you do not have\n"
+                       "a dictionary file for the language of this document\n"
+                       "installed.\n"
+                       "Check your spellchecker or set another dictionary\n"
+                       "in the Spellchecker Options menu.\n\n";
        } else {
                error_ = 0;
        }
 }
 
 
+/* FIXME: this is a minimalist solution until the above
+ * code is able to work with forkedcall.h. We only need
+ * to reap the zombies here.
+ */
+void reapSpellchecker(void)
+{
+       if (isp_pid == -1) 
+               return;
+
+       waitpid(isp_pid, 0, WNOHANG);
+}
+
+ 
 bool ISpell::alive()
 {
        return isp_pid != -1;
@@ -447,8 +454,8 @@ enum ISpell::spellStatus ISpell::check(string const & word)
        char buf[1024];
        ::fgets(buf, 1024, in); 
   
-       /* I think we have to check if ispell is still alive here because
-          the signal-handler could have disabled blocking on the fd */
+       // 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 ISP_UNKNOWN;
 
        switch (*buf) {
@@ -491,10 +498,10 @@ enum ISpell::spellStatus ISpell::check(string const & word)
 
 void ISpell::close()
 {
-        // Note: If you decide to optimize this out when it is not 
-        // needed please note that when Aspell is used this command 
-        // is also needed to save the replacement dictionary.
-        // -- Kevin Atkinson (kevinatk@home.com)
+       // Note: If you decide to optimize this out when it is not 
+       // needed please note that when Aspell is used this command 
+       // is also needed to save the replacement dictionary.
+       // -- Kevin Atkinson (kevinatk@home.com)
 
        fputs("#\n", out); // Save personal dictionary
 
@@ -521,29 +528,16 @@ void ISpell::accept(string const & word)
 
 void ISpell::store(string const & mis, string const & cor)
 {
-        if (actual_spell_checker == ASC_ASPELL) {
-                ::fputs("$$ra ", out);
-                ::fputs(mis.c_str(), out);
-                ::fputc(',', out);
-                ::fputs(cor.c_str(), out);
-                ::fputc('\n', out);
-        }
-}
-
-
-void ISpell::sigchldhandler(pid_t pid, int * status)
-{
-       if (isp_pid > 0) {
-               if (pid == isp_pid) {
-                       isp_pid= -1;
-                       fcntl(isp_fd, F_SETFL, O_NONBLOCK); /* set the file descriptor
-                                                              to nonblocking so we can 
-                                                              continue */
-               }
+       if (actual_spell_checker == ASC_ASPELL) {
+               ::fputs("$$ra ", out);
+               ::fputs(mis.c_str(), out);
+               ::fputc(',', out);
+               ::fputs(cor.c_str(), out);
+               ::fputc('\n', out);
        }
-       sigchldchecker(pid, status);
 }
 
+
 char const * ISpell::error()
 {
        return error_;