X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwindows_vst_plugin_ui.cc;h=7d71ef0f7824afed304d0ef7870d8ab8a56aafa0;hb=17f5fb81d2c9d2394f62169b90c15bf371b44f6c;hp=e8bb51cb1c945bd0c4a2961d9d73dff3608b7060;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc
index e8bb51cb1c..7d71ef0f78 100644
--- a/gtk2_ardour/windows_vst_plugin_ui.cc
+++ b/gtk2_ardour/windows_vst_plugin_ui.cc
@@ -20,7 +20,8 @@
 #include <gtkmm.h>
 #include <gtk/gtk.h>
 #include <gtk/gtksocket.h>
-#include <fst.h>
+#include "gtkmm2ext/gui_thread.h"
+#include "fst.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/windows_vst_plugin.h"
 
@@ -58,16 +59,54 @@ WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boos
 
 WindowsVSTPluginUI::~WindowsVSTPluginUI ()
 {
+	fst_destroy_editor (_vst->state());
+
 	// plugin destructor destroys the custom GUI, via Windows fun-and-games,
 	// and then our PluginUIWindow does the rest
 }
 
+void
+WindowsVSTPluginUI::top_box_allocated (Gtk::Allocation& a)
+{
+	int h = a.get_height() + 12; // 2 * 6px spacing
+	if (_vst->state()->voffset != h) {
+#ifndef NDEBUG
+		printf("WindowsVSTPluginUI:: update voffset to %d px\n", h);
+#endif
+		_vst->state()->voffset = h;
+		resize_callback ();
+	}
+}
+
+void
+WindowsVSTPluginUI::resize_callback ()
+{
+	void* gtk_parent_window = _vst->state()->gtk_window_parent;
+	if (gtk_parent_window) {
+		int width  = _vst->state()->width + _vst->state()->hoffset;
+		int height = _vst->state()->height + _vst->state()->voffset;
+#ifndef NDEBUG
+		printf ("WindowsVSTPluginUI::resize_callback %d x %d\n", width, height);
+#endif
+		set_size_request (width, height);
+		((Gtk::Window*) gtk_parent_window)->set_size_request (width, height);
+		((Gtk::Window*) gtk_parent_window)->resize (width, height);
+		fst_move_window_into_view (_vst->state ());
+	}
+}
+
 int
 WindowsVSTPluginUI::package (Gtk::Window& win)
 {
+#ifndef NDEBUG
+	printf ("WindowsVSTPluginUI::package\n");
+#endif
 	VSTPluginUI::package (win);
+	_vst->state()->gtk_window_parent = (void*) (&win);
 
-	fst_move_window_into_view (_vst->state ());
+	_vst->VSTSizeWindow.connect (_resize_connection, invalidator (*this), boost::bind (&WindowsVSTPluginUI::resize_callback, this), gui_context());
+
+	resize_callback ();
 
 	return 0;
 }
@@ -75,6 +114,10 @@ WindowsVSTPluginUI::package (Gtk::Window& win)
 void
 WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev)
 {
+	if (dispatch_effeditkey (ev)) {
+		return;
+	}
+#ifndef PLATFORM_WINDOWS /* linux + wine ; libs/fst/vstwin.c */
 	if (ev->type != GDK_KEY_PRESS) {
 		return;
 	}
@@ -86,10 +129,10 @@ WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev)
 		/* buffer full */
 		return;
 	}
-	
+
 	int special_windows_key = 0;
 	int character_windows_key = 0;
-	
+
 	switch (ev->keyval) {
 	case GDK_Left:
 		special_windows_key = 0x25;
@@ -111,12 +154,13 @@ WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev)
 		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);
+#endif
 }
 
 int