FIX 309856 353847: correctly advertise exception leads to error message dialogue

[inkscape.git] / src / extension / implementation / script.h

diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 98c4a9fef39acd7fcea501a0662f4d8197ce9897..8e25fb3517b53a74e249952442650a68c230ee1c 100644 (file)
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -62,18 +62,19 @@ public:
      */
     virtual bool check(Inkscape::Extension::Extension *module);
 
+       ImplementationDocumentCache * newDocCache (Inkscape::Extension::Extension * ext, Inkscape::UI::View::View * view);
+
     /**
      *
      */
     virtual Gtk::Widget *prefs_input(Inkscape::Extension::Input *module,
-                                     const Glib::ustring &filename);
-
+                                     gchar const *filename);
 
     /**
      *
      */
     virtual SPDocument *open(Inkscape::Extension::Input *module,
-                             const Glib::ustring &filename);
+                             gchar const *filename);
 
     /**
      *
@@ -85,28 +86,27 @@ public:
      */
     virtual void save(Inkscape::Extension::Output *module,
                       SPDocument *doc,
-                      const Glib::ustring &filename);
-    /**
-     *
-     */
-    virtual Gtk::Widget *prefs_effect(Inkscape::Extension::Effect *module,
-                                      Inkscape::UI::View::View * view);
+                      gchar const *filename);
 
     /**
      *
      */
     virtual void effect(Inkscape::Extension::Effect *module,
-                        Inkscape::UI::View::View *doc);
-
+                        Inkscape::UI::View::View *doc,
+                                               ImplementationDocumentCache * docCache);
 
+    virtual bool cancelProcessing (void);
 
 private:
+    bool _canceled;
+    Glib::Pid _pid;
+    Glib::RefPtr<Glib::MainLoop> _main_loop;
 
     /**
      * The command that has been dirived from
      * the configuration file with appropriate directories
      */
-    Glib::ustring command;
+    std::list<std::string> command;
 
      /**
       * This is the extension that will be used
@@ -115,14 +115,6 @@ private:
       */
     Glib::ustring helper_extension;
 
-    /**
-     * This function actually does the work, everything else is preparing
-     * for this function.  It is the core here
-     */
-    int execute (const Glib::ustring &command,
-                 const Glib::ustring &filein,
-                 const Glib::ustring &fileout);
-
     /**
      * Just a quick function to find and resolve relative paths for
      * the incoming scripts
@@ -143,11 +135,88 @@ private:
     /**
      *
      */
-    void checkStderr (const Glib::ustring &filename, 
+    void checkStderr (const Glib::ustring &filename,
                       Gtk::MessageType type,
                       const Glib::ustring &message);
 
 
+    class file_listener {
+        Glib::ustring _string;
+        sigc::connection _conn;
+        Glib::RefPtr<Glib::IOChannel> _channel;
+        Glib::RefPtr<Glib::MainLoop> _main_loop;
+        bool _dead;
+
+    public:
+        file_listener () : _dead(false) { };
+        virtual ~file_listener () {
+            _conn.disconnect();
+        };
+
+        bool isDead () { return _dead; }
+
+        void init (int fd, Glib::RefPtr<Glib::MainLoop> main) {
+            _channel = Glib::IOChannel::create_from_fd(fd);
+            _channel->set_encoding();
+            _conn = Glib::signal_io().connect(sigc::mem_fun(*this, &file_listener::read), _channel, Glib::IO_IN | Glib::IO_HUP | Glib::IO_ERR);
+            _main_loop = main;
+
+            return;
+        };
+
+        bool read (Glib::IOCondition condition) {
+            if (condition != Glib::IO_IN) {
+                _main_loop->quit();
+                return false;
+            }
+
+            Glib::IOStatus status;
+            Glib::ustring out;
+            status = _channel->read_line(out);
+            _string += out;
+
+            if (status != Glib::IO_STATUS_NORMAL) {
+                _main_loop->quit();
+                _dead = true;
+                return false;
+            }
+
+            return true;
+        };
+
+        // Note, doing a copy here, on purpose
+        Glib::ustring string (void) { return _string; };
+
+        bool toFile (const Glib::ustring &name) {
+            try {
+            Glib::RefPtr<Glib::IOChannel> stdout_file = Glib::IOChannel::create_from_file(name, "w");
+            stdout_file->set_encoding();
+            stdout_file->write(_string);
+            } catch (Glib::FileError &e) {
+                return false;
+            }
+            return true;
+        };
+    };
+
+    int execute (const std::list<std::string> &in_command,
+                 const std::list<std::string> &in_params,
+                 const Glib::ustring &filein,
+                 file_listener &fileout);
+
+       void pump_events (void);
+
+       /** \brief  A definition of an interpreter, which can be specified
+                   in the INX file, but we need to know what to call */
+       struct interpreter_t {
+                       gchar const *identity;    /**< The ID that is in the INX file */
+                       gchar const *prefstring;  /**< The preferences key that can override the default */
+                       gchar const *defaultval;  /**< The default value if there are no preferences */
+       };
+    static interpreter_t const interpreterTab[];
+
+       Glib::ustring resolveInterpreterExecutable(const Glib::ustring &interpNameArg);
+
 }; // class Script