#include "support/os.h"
#include "support/ProgressInterface.h"
+#include "LyX.h"
#include "LyXRC.h"
#include <cstdlib>
#include <iostream>
#include <QProcess>
-#include <QTime>
+#include <QElapsedTimer>
#include <QThread>
#include <QCoreApplication>
#include <QDebug>
struct Sleep : QThread
{
- static void millisec(unsigned long ms)
+ static void millisec(unsigned long ms)
{
QThread::usleep(ms * 1000);
}
namespace support {
-class ProgressDummy : public ProgressInterface
+class ProgressDummy : public ProgressInterface
{
public:
ProgressDummy() {}
void warning(QString const &, QString const &) {}
void toggleWarning(QString const &, QString const &, QString const &) {}
- void error(QString const &, QString const &) {}
+ void error(QString const &, QString const &, QString const &) {}
void information(QString const &, QString const &) {}
int prompt(docstring const &, docstring const &, int default_but, int,
docstring const &, docstring const &) { return default_but; }
// 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 const python_call = "python -tt";
- string command = to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path)));
-
- if (prefixIs(what, python_call))
- command += os::python() + what.substr(python_call.length());
- else
- command += what;
+ string command =
+ to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path, lpath)))
+ + commandPrep(what);
if (how == DontWait) {
switch (os::shell()) {
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)
{
- LYXERR(Debug::INFO,"Running: " << what);
+ string const what_ss = commandPrep(what);
+ if (verbose)
+ lyxerr << "\nRunning: " << what_ss << endl;
+ else
+ LYXERR(Debug::INFO,"Running: " << what_ss);
string infile;
string outfile;
string errfile;
QString const cmd = QString::fromLocal8Bit(
- parsecmd(what, infile, outfile, errfile).c_str());
+ parsecmd(what_ss, infile, outfile, errfile).c_str());
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;
LYXERR0("error " << d.errorMessage());
return 10;
}
-#endif
if (!d.waitWhile(SystemcallPrivate::Running, process_events,
os::timeout_min() * 60 * 1000)) {
}
-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()));
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 (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+ // FIXME pass command and arguments separated in the first place
+ /* The versions of startDetached() and start() that accept a
+ * QStringList object exist since Qt4, but it is only in Qt 5.15
+ * that splitCommand() was introduced and the plain versions of
+ * start/startDetached() have been deprecated.
+ * The cleanest solution would be to have parsecmd() produce a
+ * QStringList for arguments, instead of transforming the string
+ * into something that the QProcess splitter accepts.
+ */
+ QStringList arguments = QProcess::splitCommand(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_);
+ QString command = (arguments.empty()) ? QString() : arguments.first();
+ if (arguments.size() == 1)
+ arguments.clear();
+ else if (!arguments.empty())
+ arguments.removeFirst();
+#endif
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 (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+ if (!QProcess::startDetached(command, arguments)) {
+#else
+ if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_)) {
+#endif
state = SystemcallPrivate::Error;
return;
}
delete released;
} else if (process_) {
state = SystemcallPrivate::Starting;
- process_->start(toqstr(latexEnvCmdPrefix(path)) + cmd_);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+ process_->start(command, arguments);
+#else
+ process_->start(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_);
+#endif
}
}
1, 1, _("&Stop it"), _("Let it &run")) == 0;
}
-}
+} // namespace
bool SystemcallPrivate::waitWhile(State waitwhile, bool process_events, int timeout)
waitAndProcessEvents();
}
return state != Error;
- }
+ }
// process events while waiting with timeout
- QTime timer;
+ QElapsedTimer timer;
timer.start();
while (state == waitwhile && state != Error && !timedout) {
waitAndProcessEvents();
}
-QString SystemcallPrivate::errorMessage() const
+QString SystemcallPrivate::errorMessage() const
{
if (!process_)
return "No QProcess available";
break;
case QProcess::UnknownError:
default:
- message = "An unknown error occured.";
+ message = "An unknown error occurred.";
break;
}
return message;
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();
projects / lyx.git / blobdiff