X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwindows_vst_plugin_ui.cc;h=52818909639c42ce1cf273cd65bc75923707bdd0;hb=81211a91b1e6ffd77dd31676ffe65c4456aafdd7;hp=dbd61b32689413cba00a5bd7544907e481b3b2a8;hpb=bae2dcd4bf57d2ce54f266f4048df7f641866a69;p=ardour.git diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc index dbd61b3268..5281890963 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.cc +++ b/gtk2_ardour/windows_vst_plugin_ui.cc @@ -17,40 +17,43 @@ */ -#include +#include #include #include +#include #include "ardour/plugin_insert.h" #include "ardour/windows_vst_plugin.h" #include "windows_vst_plugin_ui.h" +#ifdef PLATFORM_WINDOWS +#include +#elif defined __APPLE__ +// TODO +#else #include +#endif using namespace Gtk; using namespace ARDOUR; using namespace PBD; -WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr pi, boost::shared_ptr vp) - : PlugUIBase (pi), - vst (vp) +WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr pi, boost::shared_ptr vp, GtkWidget *parent) + : VSTPluginUI (pi, vp) { - 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 (add_button, false, false); - preset_box.pack_end (_preset_box, false, false); +#ifdef GDK_WINDOWING_WIN32 + gtk_widget_realize(parent); + void* hWndHost = gdk_win32_drawable_get_handle(parent->window); - bypass_button.set_active (!insert->active()); - - pack_start (preset_box, false, false); - pack_start (socket, true, true); + fst_run_editor (_vst->state(), hWndHost); + // TODO pack a placeholder (compare to VSTPluginUI::VSTPluginUI X11 socket) + // have placeholder use VSTPluginUI::get_preferred_height(), width() + // TODO pack plugin_analysis_expander at the bottom. +#else + fst_run_editor (_vst->state(), NULL); pack_start (plugin_analysis_expander, true, true); +#endif } WindowsVSTPluginUI::~WindowsVSTPluginUI () @@ -59,135 +62,77 @@ WindowsVSTPluginUI::~WindowsVSTPluginUI () // and then our PluginUIWindow does the rest } -void -WindowsVSTPluginUI::preset_selected () -{ - socket.grab_focus (); - PlugUIBase::preset_selected (); -} - -int -WindowsVSTPluginUI::get_preferred_height () -{ - return vst->fst()->height; -} - -int -WindowsVSTPluginUI::get_preferred_width () -{ - return vst->fst()->width; -} - int WindowsVSTPluginUI::package (Gtk::Window& win) { - /* forward configure events to plugin window */ - - win.signal_configure_event().connect (sigc::bind (sigc::mem_fun (*this, &WindowsVSTPluginUI::configure_handler), &socket), false); + VSTPluginUI::package (win); - /* - 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()); + fst_move_window_into_view (_vst->state ()); return 0; } -bool -WindowsVSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket) +void +WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev) { - XEvent event; - gint x, y; - GdkWindow* w; - - if (socket == 0 || ((w = socket->gobj()->plug_window) == 0)) { - return false; + if (ev->type != GDK_KEY_PRESS) { + return; } - event.xconfigure.type = ConfigureNotify; - 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 (w, &x, &y); - gdk_error_trap_pop (); + VSTState* fst = _vst->state (); + pthread_mutex_lock (&fst->lock); - event.xconfigure.x = x; - event.xconfigure.y = y; - event.xconfigure.width = GTK_WIDGET(socket->gobj())->allocation.width; - event.xconfigure.height = GTK_WIDGET(socket->gobj())->allocation.height; + if (fst->n_pending_keys == (sizeof (fst->pending_keys) * sizeof (VSTKey))) { + /* buffer full */ + return; + } - event.xconfigure.border_width = 0; - event.xconfigure.above = None; - event.xconfigure.override_redirect = False; + 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; + } - gdk_error_trap_push (); - XSendEvent (GDK_WINDOW_XDISPLAY (w), GDK_WINDOW_XWINDOW (w), False, StructureNotifyMask, &event); - gdk_error_trap_pop (); + 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++; - return false; + pthread_mutex_unlock (&fst->lock); } -void -WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev) +int +WindowsVSTPluginUI::get_XID () { - 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 (VSTKey))) { - /* 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); - } + return _vst->state()->xid; } +#ifdef GDK_WINDOWING_X11 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 ) +fst_xerror_handler (Display* disp, XErrorEvent* ev) { if (disp == the_gtk_display) { printf ("relaying error to gtk\n"); @@ -197,13 +142,17 @@ fst_xerror_handler( Display *disp, XErrorEvent *ev ) return wine_error_handler (disp, ev); } } +#endif void windows_vst_gui_init (int *argc, char **argv[]) { - wine_error_handler = XSetErrorHandler (NULL); gtk_init (argc, argv); + +#ifdef GDK_WINDOWING_X11 + wine_error_handler = XSetErrorHandler (NULL); the_gtk_display = gdk_x11_display_get_xdisplay (gdk_display_get_default()); - gtk_error_handler = XSetErrorHandler( fst_xerror_handler ); + gtk_error_handler = XSetErrorHandler (fst_xerror_handler); +#endif }