Merge branch 'nsm' of https://github.com/royvegard/ardour

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / gtk_ui.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
index 468aa16f8e54e01b04f0cbe9a5ceef6856a2c061..64176232f05f4a2f36d2cba695fb64217a9e202d 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
@@ -26,6 +26,9 @@
 #include <stdint.h>
 #include <setjmp.h>
 #include <pthread.h>
+
+#include <glibmm/thread.h>
+
 #include <gtkmm/widget.h>
 #include <gtkmm/style.h>
 #ifndef GTK_NEW_TOOLTIP_API
@@ -47,8 +50,8 @@ namespace Gtkmm2ext {
 
 class TextViewer;
 
+extern BaseUI::RequestType NullMessage;
 extern BaseUI::RequestType ErrorMessage;
-extern BaseUI::RequestType Quit;
 extern BaseUI::RequestType CallSlot;
 extern BaseUI::RequestType TouchDisplay;
 extern BaseUI::RequestType StateChange;
@@ -72,18 +75,34 @@ struct UIRequest : public BaseUI::BaseRequestObject {
     Transmitter::Channel chn;
     void *arg;
     const char *msg2;
-    sigc::slot<void> slot;
+
+    UIRequest () {
+            type = NullMessage;
+    }
     
     ~UIRequest () { 
            if (type == ErrorMessage && msg) {
                    /* msg was strdup()'ed */
-                   free ((char *)msg);
+                   free (const_cast<char *>(msg));
            }
     }
- };
+};
 
-class UI : public Receiver, public AbstractUI<UIRequest>
+class UI : public AbstractUI<UIRequest>
 {
+  private:
+       class MyReceiver : public Receiver {
+         public:
+               MyReceiver (UI& ui) : _ui (ui) {}
+               void receive (Transmitter::Channel chn, const char *msg) {
+                       _ui.receive (chn, msg);
+               }
+         private:
+               UI& _ui;
+       };
+
+       MyReceiver _receiver;
+
   public:
        UI (std::string name, int *argc, char **argv[]);
        virtual ~UI ();
@@ -98,22 +117,22 @@ class UI : public Receiver, public AbstractUI<UIRequest>
 
        bool caller_is_ui_thread ();
 
-       static pthread_t thread_id() { return gui_thread; }
-
        /* Gtk-UI specific interfaces */
 
        bool running ();
        void quit    ();
-       void kill    ();
        int  load_rcfile (std::string, bool themechange = false);
        void run (Receiver &old_receiver);
 
        void set_state (Gtk::Widget *w, Gtk::StateType state);
-       void popup_error (const char *text);
+       void popup_error (const std::string& text);
        void flush_pending ();
        void toggle_errors ();
+       void show_errors ();
        void touch_display (Touchable *);
-       void set_tip (Gtk::Widget *w, const gchar *tip, const gchar *hlp);
+       void set_tip (Gtk::Widget &w, const gchar *tip);
+       void set_tip (Gtk::Widget &w, const std::string &tip);
+       void set_tip (Gtk::Widget *w, const gchar *tip, const gchar *hlp="");
        void idle_add (int (*func)(void *), void *arg);
 
        Gtk::Main& main() const { return *theMain; }
@@ -123,6 +142,10 @@ class UI : public Receiver, public AbstractUI<UIRequest>
                Glib::signal_idle().connect (bind (slot (&UI::idle_delete<T>), obj));
        }
 
+       template<class T> void delete_in_self (T *obj) {
+               call_slot (boost::bind (&UI::delete_in_self, this, obj));
+       }
+
        Gdk::Color get_color (const std::string& prompt, bool& picked, const Gdk::Color *initial = 0);
 
        /* starting is sent just before we enter the main loop,
@@ -136,18 +159,15 @@ class UI : public Receiver, public AbstractUI<UIRequest>
 
        static bool just_hide_it (GdkEventAny *, Gtk::Window *);
 
-       static pthread_t the_gui_thread() { return gui_thread; }
-       
   protected:
        virtual void handle_fatal (const char *);
-       virtual void display_message (const char *prefix, gint prefix_len, 
-                                     Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, 
-                                     Glib::RefPtr<Gtk::TextBuffer::Tag> mtag, 
-                                     const char *msg);
+       virtual void display_message (const char *prefix, gint prefix_len,
+                       Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, Glib::RefPtr<Gtk::TextBuffer::Tag> mtag,
+                       const char *msg);
 
   private:
        static UI *theGtkUI;
-       static pthread_t gui_thread;
+
        bool _active;
        Gtk::Main *theMain;
 #ifndef GTK_NEW_TOOLTIP_API
@@ -172,6 +192,7 @@ class UI : public Receiver, public AbstractUI<UIRequest>
        bool color_picked;
 
        void do_request (UIRequest*);
+
 };
 
 } /* namespace */