#include "support/os.h"
#include "support/ProgressInterface.h"
+#include "LyX.h"
#include "LyXRC.h"
#include <cstdlib>
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() {}
return trim(outcmd[0]);
}
-} // namespace anon
-
+} // namespace
int Systemcall::startscript(Starttype how, string const & what,
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;
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, lpath, 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, 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()));
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;
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;
}
-QString SystemcallPrivate::errorMessage() const
+QString SystemcallPrivate::errorMessage() const
{
if (!process_)
return "No QProcess available";