X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvst_pluginui.cc;h=8548c535d7bcd125d69b0cb788a7e2807c4ed848;hb=cccc71e011180f610afb2791988933e8c16bf938;hp=1320ccdc7a03ff3642f1565ef5bc875ed6794944;hpb=99904735e066804358f1d0bd138a84f1e9ecda91;p=ardour.git

diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc
index 1320ccdc7a..8548c535d7 100644
--- a/gtk2_ardour/vst_pluginui.cc
+++ b/gtk2_ardour/vst_pluginui.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,11 +18,12 @@
 */
 
 #include <fst.h>
+#include <gtk/gtk.h>
 #include <gtk/gtksocket.h>
-#include <ardour/insert.h>
-#include <ardour/vst_plugin.h>
+#include "ardour/plugin_insert.h"
+#include "ardour/vst_plugin.h"
 
-#include "plugin_ui.h"
+#include "vst_pluginui.h"
 
 #include <gdk/gdkx.h>
 
@@ -36,19 +37,33 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<
 {
 	fst_run_editor (vst->fst());
 
+	preset_box.set_spacing (6);
+	preset_box.set_border_width (6);
+	preset_box.pack_end (focus_button, false, false);
 	preset_box.pack_end (bypass_button, false, false, 10);
+	preset_box.pack_end (delete_button, false, false);
 	preset_box.pack_end (save_button, false, false);
-	preset_box.pack_end (combo, false, false);
+	preset_box.pack_end (add_button, false, false);
+	preset_box.pack_end (_preset_box, false, false);
 
 	bypass_button.set_active (!insert->active());
-	
+
 	pack_start (preset_box, false, false);
 	pack_start (socket, true, true);
+	pack_start (plugin_analysis_expander, true, true);
 }
 
 VSTPluginUI::~VSTPluginUI ()
 {
-	// nothing to do here - plugin destructor destroys the GUI
+	// plugin destructor destroys the custom GUI, via Windows fun-and-games,
+	// and then our PluginUIWindow does the rest
+}
+
+void
+VSTPluginUI::preset_selected ()
+{
+	socket.grab_focus ();
+	PlugUIBase::preset_selected ();
 }
 
 int
@@ -57,19 +72,27 @@ VSTPluginUI::get_preferred_height ()
 	return vst->fst()->height;
 }
 
+int
+VSTPluginUI::get_preferred_width ()
+{
+	return vst->fst()->width;
+}
+
 int
 VSTPluginUI::package (Gtk::Window& win)
 {
 	/* forward configure events to plugin window */
 
-	win.signal_configure_event().connect (bind (mem_fun (*this, &VSTPluginUI::configure_handler), &socket), false);
+	win.signal_configure_event().connect (sigc::bind (sigc::mem_fun (*this, &VSTPluginUI::configure_handler), &socket), false);
 
 	/*
 	   this assumes that the window's owner understands the XEmbed protocol.
 	*/
-	
+
 	socket.add_id (fst_get_XID (vst->fst()));
 
+	fst_move_window_into_view (vst->fst());
+
 	return 0;
 }
 
@@ -112,3 +135,75 @@ VSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket)
 	return false;
 }
 
+void
+VSTPluginUI::forward_key_event (GdkEventKey* ev)
+{
+	if (ev->type == GDK_KEY_PRESS) {
+
+		FST* fst = vst->fst ();
+		pthread_mutex_lock (&fst->lock);
+
+		if (fst->n_pending_keys == (sizeof (fst->pending_keys) * sizeof (FSTKey))) {
+			/* buffer full */
+			return;
+		}
+
+		int special_windows_key = 0;
+		int character_windows_key = 0;
+
+		switch (ev->keyval) {
+		case GDK_Left:
+			special_windows_key = 0x25;
+			break;
+		case GDK_Right:
+			special_windows_key = 0x27;
+			break;
+		case GDK_Up:
+			special_windows_key = 0x26;
+			break;
+		case GDK_Down:
+			special_windows_key = 0x28;
+			break;
+		case GDK_Return:
+		case GDK_KP_Enter:
+			special_windows_key = 0xd;
+			break;
+		default:
+			character_windows_key = ev->keyval;
+			break;
+		}
+
+		fst->pending_keys[fst->n_pending_keys].special = special_windows_key;
+		fst->pending_keys[fst->n_pending_keys].character = character_windows_key;
+		fst->n_pending_keys++;
+
+		pthread_mutex_unlock (&fst->lock);
+	}
+}
+
+typedef int (*error_handler_t)( Display *, XErrorEvent *);
+static Display *the_gtk_display;
+static error_handler_t wine_error_handler;
+static error_handler_t gtk_error_handler;
+
+static int
+fst_xerror_handler( Display *disp, XErrorEvent *ev )
+{
+	if (disp == the_gtk_display) {
+		printf ("relaying error to gtk\n");
+		return gtk_error_handler (disp, ev);
+	} else {
+		printf( "relaying error to wine\n" );
+		return wine_error_handler (disp, ev);
+	}
+}
+
+void
+gui_init (int *argc, char **argv[])
+{
+	wine_error_handler = XSetErrorHandler (NULL);
+	gtk_init (argc, argv);
+	the_gtk_display = gdk_x11_display_get_xdisplay (gdk_display_get_default());
+	gtk_error_handler = XSetErrorHandler( fst_xerror_handler );
+}
+