Moved canvas colors and theme file selection into new ui specific config system

[ardour.git] / gtk2_ardour / vst_pluginui.cc

diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc
index 1dcd2940f0212365bc5be80e2d84844895209683..e1378dbb2a41ff3aac13ddf22a5aaab495a8b44a 100644 (file)
--- a/gtk2_ardour/vst_pluginui.cc
+++ b/gtk2_ardour/vst_pluginui.cc
@@ -15,35 +15,32 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <fst.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-
-#include <ardour/insert.h>
+#include <gtk/gtksocket.h>
+#include <ardour/processor.h>
 #include <ardour/vst_plugin.h>
 
 #include "plugin_ui.h"
-#include "prompter.h"
 
-#include "i18n.h"
+#include <gdk/gdkx.h>
 
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace PBD;
 
-VSTPluginUI::VSTPluginUI (PluginInsert& pi, VSTPlugin& vp)
+VSTPluginUI::VSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp)
        : PlugUIBase (pi),
          vst (vp)
 {
-       fst_run_editor (vst.fst());
+       fst_run_editor (vst->fst());
 
        preset_box.pack_end (bypass_button, false, false, 10);
        preset_box.pack_end (save_button, false, false);
        preset_box.pack_end (combo, false, false);
 
-       bypass_button.set_active (!insert.active());
+       bypass_button.set_active (!insert->active());
        
        pack_start (preset_box, false, false);
        pack_start (socket, true, true);
@@ -57,68 +54,61 @@ VSTPluginUI::~VSTPluginUI ()
 int
 VSTPluginUI::get_preferred_height ()
 {
-       return vst.fst()->height;
+       return vst->fst()->height;
 }
 
 int
 VSTPluginUI::package (Gtk::Window& win)
 {
-       /* for GTK+2, remove this: you cannot add to a realized socket */
-
-       socket.realize ();
-
        /* forward configure events to plugin window */
 
-       win.configure_event.connect (bind (slot (*this, &VSTPluginUI::configure_handler), socket.gobj()));
+       win.signal_configure_event().connect (bind (mem_fun (*this, &VSTPluginUI::configure_handler), &socket), false);
 
-       /* XXX in GTK2, use add_id() instead of steal, although add_id()
-          assumes that the window's owner understands the XEmbed protocol.
+       /*
+          this assumes that the window's owner understands the XEmbed protocol.
        */
        
-       socket.steal (fst_get_XID (vst.fst()));
+       socket.add_id (fst_get_XID (vst->fst()));
 
        return 0;
 }
 
-gboolean
-VSTPluginUI::configure_handler (GdkEventConfigure* ev, GtkSocket *socket)
+bool
+VSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket)
 {
        XEvent event;
-
        gint x, y;
+       GdkWindow* w;
 
-       if (socket->plug_window == NULL) {
-               return FALSE;
+       if (socket == 0 || ((w = socket->gobj()->plug_window) == 0)) {
+               return false;
        }
 
        event.xconfigure.type = ConfigureNotify;
-       event.xconfigure.event = GDK_WINDOW_XWINDOW (socket->plug_window);
-       event.xconfigure.window = GDK_WINDOW_XWINDOW (socket->plug_window);
+       event.xconfigure.event = GDK_WINDOW_XWINDOW (w);
+       event.xconfigure.window = GDK_WINDOW_XWINDOW (w);
 
        /* The ICCCM says that synthetic events should have root relative
         * coordinates. We still aren't really ICCCM compliant, since
         * we don't send events when the real toplevel is moved.
         */
        gdk_error_trap_push ();
-       gdk_window_get_origin (socket->plug_window, &x, &y);
+       gdk_window_get_origin (w, &x, &y);
        gdk_error_trap_pop ();
 
        event.xconfigure.x = x;
        event.xconfigure.y = y;
-       event.xconfigure.width = GTK_WIDGET(socket)->allocation.width;
-       event.xconfigure.height = GTK_WIDGET(socket)->allocation.height;
+       event.xconfigure.width = GTK_WIDGET(socket->gobj())->allocation.width;
+       event.xconfigure.height = GTK_WIDGET(socket->gobj())->allocation.height;
 
        event.xconfigure.border_width = 0;
        event.xconfigure.above = None;
        event.xconfigure.override_redirect = False;
 
        gdk_error_trap_push ();
-       XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
-                   GDK_WINDOW_XWINDOW (socket->plug_window),
-                   False, StructureNotifyMask, &event);
-       // gdk_display_sync (GDK_WINDOW_XDISPLAY (socket->plug_window));
+       XSendEvent (GDK_WINDOW_XDISPLAY (w), GDK_WINDOW_XWINDOW (w), False, StructureNotifyMask, &event);
        gdk_error_trap_pop ();
 
-       return FALSE;
+       return false;
 }