#include "support/os.h"
#include "support/ProgressInterface.h"
-#include "frontends/Application.h"
-
#include "LyX.h"
-#include "LyXRC.h"
#include <cstdlib>
#include <iostream>
in_double_quote = !in_double_quote;
}
} else if (c == '\\' && !escaped) {
- escaped = !escaped;
+ escaped = true;
} else if (c == '>' && !(in_double_quote || escaped)) {
if (suffixIs(outcmd[o], " 2")) {
outcmd[o] = rtrim(outcmd[o], "2");
} // namespace
+void Systemcall::killscript()
+{
+ SystemcallPrivate::kill_script = true;
+}
+
+
int Systemcall::startscript(Starttype how, string const & what,
string const & path, string const & lpath,
bool process_events)
SystemcallPrivate d(infile, outfile, errfile);
bool do_events = process_events || how == WaitLoop;
-#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, lpath, false);
- if (!d.waitWhile(SystemcallPrivate::Starting, do_events, -1)) {
- if (d.state == SystemcallPrivate::Error) {
- LYXERR0("Systemcall: '" << cmd << "' did not start!");
- LYXERR0("error " << d.errorMessage());
- return NOSTART;
- } else if (d.state == SystemcallPrivate::Killed) {
- LYXERR0("Killed: " << cmd);
- return KILLED;
- }
- }
- if (how == DontWait) {
- d.releaseProcess();
- return OK;
- }
-#else
d.startProcess(cmd, path, lpath, how == DontWait);
if (how == DontWait && d.state == SystemcallPrivate::Running)
return OK;
return KILLED;
}
}
-#endif
if (!d.waitWhile(SystemcallPrivate::Running, do_events,
os::timeout_min() * 60 * 1000)) {
}
+bool SystemcallPrivate::kill_script = 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),
cmd_ = cmd;
if (detached) {
state = SystemcallPrivate::Running;
+#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;
bool SystemcallPrivate::waitAndCheck()
{
Sleep::millisec(100);
- if (theApp() && theApp()->cancel_export) {
+ if (kill_script) {
// is there a better place to reset this?
process_->kill();
state = Killed;
- theApp()->cancel_export = false;
+ kill_script = false;
LYXERR0("Export Canceled!!");
return false;
}