GuiCharacter: Add menu to Restore button

[lyx.git] / src / support / Systemcall.cpp

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 9327613dfdedda784546aaf2f0fb99651f77fdd9..d4f71ffcd9eadd9d95edf2cf004f1e22ee4c059f 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -23,6 +23,7 @@
 #include "support/os.h"
 #include "support/ProgressInterface.h"
 
+#include "LyX.h"
 #include "LyXRC.h"
 
 #include <cstdlib>
@@ -39,7 +40,7 @@
 
 struct Sleep : QThread
 {
-       static void millisec(unsigned long ms) 
+       static void millisec(unsigned long ms)
        {
                QThread::usleep(ms * 1000);
        }
@@ -54,7 +55,7 @@ namespace lyx {
 namespace support {
 
 
-class ProgressDummy : public ProgressInterface 
+class ProgressDummy : public ProgressInterface
 {
 public:
        ProgressDummy() {}
@@ -101,9 +102,11 @@ ProgressInterface * ProgressInterface::instance()
 // Reuse of instance
 #ifndef USE_QPROCESS
 int Systemcall::startscript(Starttype how, string const & what,
-                           std::string const & path, bool /*process_events*/)
+                           string const & path, string const & lpath,
+                           bool /*process_events*/)
 {
-       string command = to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path)))
+       string command =
+               to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path, lpath)))
                       + commandPrep(what);
 
        if (how == DontWait) {
@@ -228,15 +231,18 @@ string const parsecmd(string const & incmd, string & infile, string & outfile,
        return trim(outcmd[0]);
 }
 
-} // namespace anon
-
+} // namespace
 
 
 int Systemcall::startscript(Starttype how, string const & what,
-                           string const & path, bool process_events)
+                           string const & path, string const & lpath,
+                           bool process_events)
 {
        string const what_ss = commandPrep(what);
-       LYXERR(Debug::INFO,"Running: " << what_ss);
+       if (verbose)
+               lyxerr << "\nRunning: " << what_ss << endl;
+       else
+               LYXERR(Debug::INFO,"Running: " << what_ss);
 
        string infile;
        string outfile;
@@ -246,24 +252,7 @@ int Systemcall::startscript(Starttype how, string const & what,
 
        SystemcallPrivate d(infile, outfile, errfile);
 
-#ifdef Q_OS_WIN32
-       // QProcess::startDetached cannot provide environment variables. When the
-       // environment variables are set using the latexEnvCmdPrefix and the process
-       // is started with QProcess::startDetached, a console window is shown every 
-       // time a viewer is started. To avoid this, we fall back on Windows to the 
-       // original implementation that creates a QProcess object.
-       d.startProcess(cmd, path, false);
-       if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
-               LYXERR0("Systemcall: '" << cmd << "' did not start!");
-               LYXERR0("error " << d.errorMessage());
-               return 10;
-       }
-       if (how == DontWait) {
-               d.releaseProcess();
-               return 0;
-       }
-#else
-       d.startProcess(cmd, path, how == DontWait);
+       d.startProcess(cmd, path, lpath, how == DontWait);
        if (how == DontWait && d.state == SystemcallPrivate::Running)
                return 0;
 
@@ -273,7 +262,6 @@ int Systemcall::startscript(Starttype how, string const & what,
                LYXERR0("error " << d.errorMessage());
                return 10;
        }
-#endif
 
        if (!d.waitWhile(SystemcallPrivate::Running, process_events,
                         os::timeout_min() * 60 * 1000)) {
@@ -292,16 +280,10 @@ int Systemcall::startscript(Starttype how, string const & what,
 }
 
 
-SystemcallPrivate::SystemcallPrivate(std::string const & sf,
-                                    std::string const & of,
-                                    std::string const & ef) :
-                               process_(new QProcess), 
-                               out_index_(0),
-                               err_index_(0),
-                               in_file_(sf),
-                               out_file_(of), 
-                               err_file_(ef), 
-                               process_events_(false)
+SystemcallPrivate::SystemcallPrivate(std::string const & sf, std::string const & of,
+                                     std::string const & ef)
+       : state(Error), process_(new QProcess), out_index_(0), err_index_(0),
+         in_file_(sf), out_file_(of), err_file_(ef), process_events_(false)
 {
        if (!in_file_.empty())
                process_->setStandardInputFile(QString::fromLocal8Bit(in_file_.c_str()));
@@ -354,18 +336,32 @@ SystemcallPrivate::SystemcallPrivate(std::string const & sf,
 
        connect(process_, SIGNAL(readyReadStandardOutput()), SLOT(stdOut()));
        connect(process_, SIGNAL(readyReadStandardError()), SLOT(stdErr()));
+#if QT_VERSION >= 0x050600
+       connect(process_, SIGNAL(errorOccurred(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
+#else
        connect(process_, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
+#endif
        connect(process_, SIGNAL(started()), this, SLOT(processStarted()));
        connect(process_, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
 }
 
 
-void SystemcallPrivate::startProcess(QString const & cmd, string const & path, bool detached)
+void SystemcallPrivate::startProcess(QString const & cmd, string const & path,
+                                     string const & lpath, bool detached)
 {
        cmd_ = cmd;
        if (detached) {
                state = SystemcallPrivate::Running;
-               if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path)) + cmd_)) {
+#ifdef Q_OS_WIN32
+               // Avoid opening a console window when a viewer is started
+               if (in_file_.empty())
+                       process_->setStandardInputFile(QProcess::nullDevice());
+               if (out_file_.empty())
+                       process_->setStandardOutputFile(QProcess::nullDevice());
+               if (err_file_.empty())
+                       process_->setStandardErrorFile(QProcess::nullDevice());
+#endif
+               if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_)) {
                        state = SystemcallPrivate::Error;
                        return;
                }
@@ -373,7 +369,7 @@ void SystemcallPrivate::startProcess(QString const & cmd, string const & path, b
                delete released;
        } else if (process_) {
                state = SystemcallPrivate::Starting;
-               process_->start(toqstr(latexEnvCmdPrefix(path)) + cmd_);
+               process_->start(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_);
        }
 }
 
@@ -404,7 +400,7 @@ bool queryStopCommand(QString const & cmd)
                        1, 1, _("&Stop it"), _("Let it &run")) == 0;
 }
 
-}
+} // namespace
 
 
 bool SystemcallPrivate::waitWhile(State waitwhile, bool process_events, int timeout)
@@ -447,7 +443,7 @@ bool SystemcallPrivate::waitWhile(State waitwhile, bool process_events, int time
                        waitAndProcessEvents();
                }
                return state != Error;
-       } 
+       }
 
        // process events while waiting with timeout
        QTime timer;
@@ -550,7 +546,7 @@ void SystemcallPrivate::processError(QProcess::ProcessError)
 }
 
 
-QString SystemcallPrivate::errorMessage() const 
+QString SystemcallPrivate::errorMessage() const
 {
        if (!process_)
                return "No QProcess available";
@@ -607,7 +603,9 @@ QString SystemcallPrivate::exitStatusMessage() const
 
 int SystemcallPrivate::exitCode()
 {
-       if (!process_)
+       // From Qt's documentation, in regards to QProcess::exitCode(),
+       // "This value is not valid unless exitStatus() returns NormalExit"
+       if (!process_ || process_->exitStatus() != QProcess::NormalExit)
                return -1;
 
        return process_->exitCode();