DocBook: simplify code to handle abstracts.

[lyx.git] / src / support / SystemcallPrivate.h

diff --git a/src/support/SystemcallPrivate.h b/src/support/SystemcallPrivate.h
index 93918ac71213a946e26b6fcd7aea0710380bd7b8..6ab479f73c329fd5b68a786b9cd6a608c478e9a2 100644 (file)
--- a/src/support/SystemcallPrivate.h
+++ b/src/support/SystemcallPrivate.h
@@ -13,51 +13,95 @@
 #define SYSTEMCALLPRIVATE_H
 
 #include <QObject>
+#include <QProcess>
 
-class QProcess;
+#include <string>
 
 namespace lyx {
 namespace support {
 
+class Systemcall;
+
 /**
  * Outputs to the console terminal the line buffered standard output and
- * error of a spawned process when there is a controlling terminal and 
+ * error of a spawned process when there is a controlling terminal and
  * stdout/stderr have not been redirected.
  */
-class ConOut : public QObject
+class SystemcallPrivate : public QObject
 {
        Q_OBJECT
+
 public:
-       ConOut(QProcess * proc);
-       ~ConOut();
+       SystemcallPrivate(std::string const & infile, std::string const & outfile,
+                         std::string const & errfile);
+       ~SystemcallPrivate();
+
+       enum State {
+               Starting,
+               Running,
+               Finished,
+               Error,
+               Killed
+       };
+       State state;
+
+       bool waitWhile(State, bool processEvents, int timeout = -1);
+       void startProcess(QString const & cmd, std::string const & path,
+                         std::string const & lpath, bool detach);
+
+       int exitCode();
+
+       QString errorMessage() const;
+       QString exitStatusMessage() const;
+
+       QProcess* releaseProcess();
+
+       static void killProcess(QProcess * p);
+
+       // when true, kill any running script ASAP
+       static bool kill_script;
+
 
-       /// Should the standard output be displayed?
-       void showout() { showout_ = true; }
+public Q_SLOTS:
+       void stdOut();
+       void stdErr();
+       void processError(QProcess::ProcessError);
+       void processStarted();
+       void processFinished(int, QProcess::ExitStatus status);
 
-       /// Should the standard error be displayed?
-       void showerr() { showerr_ = true; }
 
 private:
        /// Pointer to the process to monitor.
-       QProcess * proc_;
+       QProcess * process_;
+
        /// Index to the standard output buffer.
-       size_t outindex_;
+       size_t out_index_;
        /// Index to the standard error buffer.
-       size_t errindex_;
+       size_t err_index_;
+       ///
+       std::string in_file_;
+       ///
+       std::string out_file_;
+       ///
+       std::string err_file_;
+
        /// Size of buffers.
-       static size_t const bufsize_ = 200;
+       static size_t const buffer_size_ = 200;
        /// Standard output buffer.
-       char outdata_[bufsize_];
+       char out_data_[buffer_size_];
        /// Standard error buffer.
-       char errdata_[bufsize_];
-       /// 
-       bool showout_;
-       /// 
-       bool showerr_;
+       char err_data_[buffer_size_];
 
-public Q_SLOTS:
-       void stdOut();
-       void stdErr();
+       QString cmd_;
+       bool process_events_;
+
+       void waitAndProcessEvents();
+       void processEvents();
+       void killProcess();
+
+       /// returns false if we killed the process
+       /// actually returns Systemcall::ReturnValue
+       bool waitAndCheck();
 };
 
 } // namespace support