X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvst_pluginui.cc;h=8548c535d7bcd125d69b0cb788a7e2807c4ed848;hb=47a11efb125e7b7927aa1330341031a2a56e7a45;hp=8b40e27070787d623c20f5bd097a7c2828f5c023;hpb=868f557f2612903f72614a2b3a317c7a528188d1;p=ardour.git diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc index 8b40e27070..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 @@ -15,107 +15,195 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include +#include +#include +#include "ardour/plugin_insert.h" +#include "ardour/vst_plugin.h" -#include -#include - -#include "plugin_ui.h" +#include "vst_pluginui.h" #include using namespace Gtk; using namespace ARDOUR; +using namespace PBD; -VSTPluginUI::VSTPluginUI (PluginInsert& pi, VSTPlugin& vp) +VSTPluginUI::VSTPluginUI (boost::shared_ptr pi, boost::shared_ptr vp) : PlugUIBase (pi), vst (vp) { - fst_run_editor (vst.fst()); + 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()); - 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 VSTPluginUI::get_preferred_height () { - return vst.fst()->height; + return vst->fst()->height; } int -VSTPluginUI::package (Gtk::Window& win) +VSTPluginUI::get_preferred_width () { - /* for GTK+2, remove this: you cannot add to a realized socket */ - - //socket.realize (); + 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)); + win.signal_configure_event().connect (sigc::bind (sigc::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.add_id (fst_get_XID (vst.fst())); + + socket.add_id (fst_get_XID (vst->fst())); + + fst_move_window_into_view (vst->fst()); return 0; } -gboolean +bool VSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket) { XEvent event; - gint x, y; + GdkWindow* w; - if (socket->gobj() == 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->get_window()->gobj()); - event.xconfigure.window = GDK_WINDOW_XWINDOW (socket->get_window()->gobj()); + 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->get_window()->gobj(), &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->get_window()->gobj()), - GDK_WINDOW_XWINDOW (socket->get_window()->gobj()), - 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; +} + +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 ); }