hack to keep UI responsive with heavy AU views.
[ardour.git] / gtk2_ardour / au_pluginui.mm
index f394e305c89bf36507ae615e623b41993e096185..a9640174998ccb023efa72866645adc63aec1d42 100644 (file)
@@ -1,8 +1,9 @@
-#include <gtkmm/stock.h>
-
 #undef  Marker
 #define Marker FuckYouAppleAndYourLackOfNameSpaces
 
+#include <gtkmm/button.h>
+#include <gdk/gdkquartz.h>
+
 #include "pbd/convert.h"
 #include "pbd/error.h"
 
 
 #undef check // stupid gtk, stupid apple
 
-#include <gtkmm/button.h>
-#include <gdk/gdkquartz.h>
-
 #include <gtkmm2ext/utils.h>
 
 #include "au_pluginui.h"
 #include "gui_thread.h"
 
-#include "appleutility/CAAudioUnit.h"
-#include "appleutility/CAComponent.h"
+#include "CAAudioUnit.h"
+#include "CAComponent.h"
 
 #import <AudioUnit/AUCocoaUIView.h>
 #import <CoreAudioKit/AUGenericView.h>
 #include "public_editor.h"
 #include "i18n.h"
 
+#ifdef COREAUDIO105
+#define ArdourCloseComponent CloseComponent
+#else
+#define ArdourCloseComponent AudioComponentInstanceDispose
+#endif
 using namespace ARDOUR;
 using namespace Gtk;
 using namespace Gtkmm2ext;
-using namespace sigc;
 using namespace std;
 using namespace PBD;
 
@@ -50,6 +52,29 @@ static const gchar* _automation_mode_strings[] = {
        0
 };
 
+static void
+dump_view_tree (NSView* view, int depth, int maxdepth)
+{
+       NSArray* subviews = [view subviews];
+       unsigned long cnt = [subviews count];
+
+       for (int d = 0; d < depth; d++) {
+               cerr << '\t';
+       }
+       NSRect frame = [view frame];
+       cerr << " view @ " <<  frame.origin.x << ", " << frame.origin.y
+               << ' ' << frame.size.width << " x " << frame.size.height
+               << endl;
+
+       if (depth >= maxdepth) {
+               return;
+       }
+       for (unsigned long i = 0; i < cnt; ++i) {
+               NSView* subview = [subviews objectAtIndex:i];
+               dump_view_tree (subview, depth+1, maxdepth);
+       }
+}
+
 @implementation NotificationObject
 
 - (NotificationObject*) initWithPluginUI: (AUPluginUI*) apluginui andCocoaParent: (NSWindow*) cp andTopLevelParent: (NSWindow*) tlp
@@ -57,27 +82,29 @@ static const gchar* _automation_mode_strings[] = {
        self = [ super init ];
 
        if (self) {
-               plugin_ui = apluginui; 
+               plugin_ui = apluginui;
                top_level_parent = tlp;
-                
-                if (cp) {
-                        cocoa_parent = cp;
-                        
-                        [[NSNotificationCenter defaultCenter] addObserver:self
-                         selector:@selector(cocoaParentActivationHandler:)
-                         name:NSWindowDidBecomeMainNotification
-                         object:nil];
-                        
-                        [[NSNotificationCenter defaultCenter] addObserver:self
-                         selector:@selector(cocoaParentBecameKeyHandler:)
-                         name:NSWindowDidBecomeKeyNotification
-                         object:nil];
-                }
-        }
+
+               if (cp) {
+                       cocoa_parent = cp;
+
+                       [[NSNotificationCenter defaultCenter]
+                            addObserver:self
+                               selector:@selector(cocoaParentActivationHandler:)
+                                   name:NSWindowDidBecomeMainNotification
+                                 object:NULL];
+
+                       [[NSNotificationCenter defaultCenter]
+                            addObserver:self
+                               selector:@selector(cocoaParentBecameKeyHandler:)
+                                   name:NSWindowDidBecomeKeyNotification
+                                 object:NULL];
+               }
+       }
 
        return self;
 }
-               
+
 - (void)cocoaParentActivationHandler:(NSNotification *)notification
 {
        NSWindow* notification_window = (NSWindow *)[notification object];
@@ -88,7 +115,7 @@ static const gchar* _automation_mode_strings[] = {
                } else {
                        plugin_ui->deactivate();
                }
-       } 
+       }
 }
 
 - (void)cocoaParentBecameKeyHandler:(NSNotification *)notification
@@ -101,12 +128,12 @@ static const gchar* _automation_mode_strings[] = {
                } else {
                        plugin_ui->deactivate();
                }
-       } 
+       }
 }
 
-- (void)auViewResized:(NSNotification *)notification;
+- (void)auViewResized:(NSNotification *)notification
 {
-        (void) notification; // stop complaints about unusued argument
+       (void) notification; // stop complaints about unusued argument
        plugin_ui->cocoa_view_resized();
 }
 
@@ -116,12 +143,20 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
        : PlugUIBase (insert)
        , automation_mode_label (_("Automation"))
        , preset_label (_("Presets"))
-       
+       , mapped (false)
+       , resizable (false)
+       , min_width (0)
+       , min_height (0)
+       , req_width (0)
+       , req_height (0)
+       , alo_width (0)
+       , alo_height (0)
+
 {
        if (automation_mode_strings.empty()) {
                automation_mode_strings = I18N (_automation_mode_strings);
        }
-       
+
        set_popdown_strings (automation_mode_selector, automation_mode_strings);
        automation_mode_selector.set_active_text (automation_mode_strings.front());
 
@@ -136,13 +171,21 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
 
        smaller_hbox->set_spacing (6);
        smaller_hbox->pack_start (preset_label, false, false, 4);
+       smaller_hbox->pack_start (_preset_modified, false, false);
        smaller_hbox->pack_start (_preset_combo, false, false);
+       smaller_hbox->pack_start (add_button, false, false);
+#if 0
+       /* Ardour does not currently allow to overwrite existing presets
+        * see save_property_list() in audio_unit.cc
+        */
        smaller_hbox->pack_start (save_button, false, false);
+#endif
 #if 0
        /* one day these might be useful with an AU plugin, but not yet */
        smaller_hbox->pack_start (automation_mode_label, false, false);
        smaller_hbox->pack_start (automation_mode_selector, false, false);
 #endif
+       smaller_hbox->pack_start (reset_button, false, false);
        smaller_hbox->pack_start (bypass_button, false, true);
 
        VBox* v1_box = manage (new VBox);
@@ -160,7 +203,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
 
        set_spacing (6);
        pack_start (top_box, false, false);
-       pack_start (low_box, false, false);
+       pack_start (low_box, true, true);
 
        preset_label.show ();
        _preset_combo.show ();
@@ -170,13 +213,16 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
        top_box.show ();
        low_box.show ();
 
-       _activating_from_app = false;
        cocoa_parent = 0;
-       _notify = 0;
        cocoa_window = 0;
-       carbon_window = 0;
+
+#ifdef WITH_CARBON
+       _activating_from_app = false;
+       _notify = 0;
        au_view = 0;
        editView = 0;
+       carbon_window = 0;
+#endif
 
        /* prefer cocoa, fall back to cocoa, but use carbon if its there */
 
@@ -190,19 +236,27 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
                create_cocoa_view ();
        }
 
+       low_box.add_events (Gdk::VISIBILITY_NOTIFY_MASK | Gdk::EXPOSURE_MASK);
+
        low_box.signal_realize().connect (mem_fun (this, &AUPluginUI::lower_box_realized));
+       low_box.signal_visibility_notify_event ().connect (mem_fun (this, &AUPluginUI::lower_box_visibility_notify));
+       low_box.signal_size_request ().connect (mem_fun (this, &AUPluginUI::lower_box_size_request));
+       low_box.signal_size_allocate ().connect (mem_fun (this, &AUPluginUI::lower_box_size_allocate));
+       low_box.signal_map ().connect (mem_fun (this, &AUPluginUI::lower_box_map));
+       low_box.signal_unmap ().connect (mem_fun (this, &AUPluginUI::lower_box_unmap));
+       low_box.signal_expose_event ().connect (mem_fun (this, &AUPluginUI::lower_box_expose));
 }
 
 AUPluginUI::~AUPluginUI ()
 {
-        if (_notify) {
-                [[NSNotificationCenter defaultCenter] removeObserver:_notify];
-        }
+       if (_notify) {
+               [[NSNotificationCenter defaultCenter] removeObserver:_notify];
+       }
 
        if (cocoa_parent) {
                NSWindow* win = get_nswindow();
                [win removeChildWindow:cocoa_parent];
-       } 
+       }
 
 #ifdef WITH_CARBON
        if (carbon_window) {
@@ -212,13 +266,13 @@ AUPluginUI::~AUPluginUI ()
 #endif
 
        if (editView) {
-               CloseComponent (editView);
+               ArdourCloseComponent (editView);
        }
 
        if (au_view) {
                /* remove whatever we packed into low_box so that GTK doesn't
                   mess with it.
-               */
+                */
 
                [au_view removeFromSuperview];
        }
@@ -227,14 +281,15 @@ AUPluginUI::~AUPluginUI ()
 bool
 AUPluginUI::test_carbon_view_support ()
 {
+#ifdef WITH_CARBON
        bool ret = false;
-       
+
        carbon_descriptor.componentType = kAudioUnitCarbonViewComponentType;
        carbon_descriptor.componentSubType = 'gnrc';
        carbon_descriptor.componentManufacturer = 'appl';
        carbon_descriptor.componentFlags = 0;
        carbon_descriptor.componentFlagsMask = 0;
-       
+
        OSStatus err;
 
        // ask the AU for its first editor component
@@ -253,8 +308,11 @@ AUPluginUI::test_carbon_view_support ()
        }
 
        return ret;
+#else
+       return false;
+#endif
 }
-       
+
 bool
 AUPluginUI::test_cocoa_view_support ()
 {
@@ -263,7 +321,7 @@ AUPluginUI::test_cocoa_view_support ()
        OSStatus err = AudioUnitGetPropertyInfo(*au->get_au(),
                                                kAudioUnitProperty_CocoaUI, kAudioUnitScope_Global,
                                                0, &dataSize, &isWritable);
-       
+
        return dataSize > 0 && err == noErr;
 }
 
@@ -282,7 +340,7 @@ AUPluginUI::plugin_class_valid (Class pluginClass)
 int
 AUPluginUI::create_cocoa_view ()
 {
-       BOOL wasAbleToLoadCustomView = NO;
+       bool wasAbleToLoadCustomView = false;
        AudioUnitCocoaViewInfo* cocoaViewInfo = NULL;
        UInt32               numberOfClasses = 0;
        UInt32     dataSize;
@@ -292,7 +350,7 @@ AUPluginUI::create_cocoa_view ()
 
        OSStatus result = AudioUnitGetPropertyInfo (*au->get_au(),
                                                    kAudioUnitProperty_CocoaUI,
-                                                   kAudioUnitScope_Global, 
+                                                   kAudioUnitScope_Global,
                                                    0,
                                                    &dataSize,
                                                    &isWritable );
@@ -300,7 +358,7 @@ AUPluginUI::create_cocoa_view ()
        numberOfClasses = (dataSize - sizeof(CFURLRef)) / sizeof(CFStringRef);
 
        // Does view have custom Cocoa UI?
-       
+
        if ((result == noErr) && (numberOfClasses > 0) ) {
 
                DEBUG_TRACE(DEBUG::AudioUnits,
@@ -316,13 +374,13 @@ AUPluginUI::create_cocoa_view ()
                                        &dataSize) == noErr) {
 
                        CocoaViewBundlePath     = (NSURL *)cocoaViewInfo->mCocoaAUViewBundleLocation;
-                               
+
                        // we only take the first view in this example.
                        factoryClassName        = (NSString *)cocoaViewInfo->mCocoaAUViewClass[0];
-                       
+
                        DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("the factory name is %1 bundle is %2\n",
                                                                        [factoryClassName UTF8String], CocoaViewBundlePath));
-                        
+
                } else {
 
                        DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("No cocoaUI property cocoaViewInfo = %1\n", cocoaViewInfo));
@@ -341,7 +399,7 @@ AUPluginUI::create_cocoa_view ()
 
                DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("tried to create bundle, result = %1\n", viewBundle));
 
-               if (viewBundle == nil) {
+               if (viewBundle == NULL) {
                        error << _("AUPluginUI: error loading AU view's bundle") << endmsg;
                        return -1;
                } else {
@@ -351,7 +409,7 @@ AUPluginUI::create_cocoa_view ()
                                error << _("AUPluginUI: error getting AU view's factory class from bundle") << endmsg;
                                return -1;
                        }
-                       
+
                        // make sure 'factoryClass' implements the AUCocoaUIBase protocol
                        if (!plugin_class_valid (factoryClass)) {
                                error << _("AUPluginUI: U view's factory class does not properly implement the AUCocoaUIBase protocol") << endmsg;
@@ -359,7 +417,7 @@ AUPluginUI::create_cocoa_view ()
                        }
                        // make a factory
                        id factory = [[[factoryClass alloc] init] autorelease];
-                       if (factory == nil) {
+                       if (factory == NULL) {
                                error << _("AUPluginUI: Could not create an instance of the AU view factory") << endmsg;
                                return -1;
                        }
@@ -370,17 +428,17 @@ AUPluginUI::create_cocoa_view ()
                        au_view = [factory uiViewForAudioUnit:*au->get_au() withSize:NSZeroSize];
 
                        DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("view created @ %1\n", au_view));
-                       
+
                        // cleanup
                        [CocoaViewBundlePath release];
                        if (cocoaViewInfo) {
                                UInt32 i;
                                for (i = 0; i < numberOfClasses; i++)
                                        CFRelease(cocoaViewInfo->mCocoaAUViewClass[i]);
-                               
+
                                free (cocoaViewInfo);
                        }
-                       wasAbleToLoadCustomView = YES;
+                       wasAbleToLoadCustomView = true;
                }
        }
 
@@ -390,49 +448,40 @@ AUPluginUI::create_cocoa_view ()
                                                                au->get_au()));
                au_view = [[AUGenericView alloc] initWithAudioUnit:*au->get_au()];
                DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("view created @ %1\n", au_view));
-               [(AUGenericView *)au_view setShowsExpertParameters:YES];
+               [(AUGenericView *)au_view setShowsExpertParameters:1];
        }
 
-       // Get the initial size of the new AU View's frame 
-       
-       NSRect rect = [au_view frame];
-       low_box.set_size_request (rect.size.width, rect.size.height);
-       
+       // Get the initial size of the new AU View's frame
+       NSRect  frame = [au_view frame];
+       min_width  = req_width  = CGRectGetWidth(NSRectToCGRect(frame));
+       min_height = req_height = CGRectGetHeight(NSRectToCGRect(frame));
+       resizable  = [au_view autoresizingMask];
+
+       low_box.queue_resize ();
+
        return 0;
 }
 
 void
 AUPluginUI::cocoa_view_resized ()
 {
-        GtkRequisition topsize = top_box.size_request ();
-        NSWindow* window = get_nswindow ();
-        NSSize oldContentSize= [window contentRectForFrameRect:[window frame]].size;
-        NSSize newContentSize= [au_view frame].size;
-        NSRect windowFrame= [window frame];
-        
-        oldContentSize.height -= topsize.height;
-
-        float dy = oldContentSize.height - newContentSize.height;
-        float dx = oldContentSize.width - newContentSize.width;
-
-        windowFrame.origin.y    += dy;
-        windowFrame.origin.x    += dx;
-        windowFrame.size.height -= dy;
-        windowFrame.size.width  -= dx;
-        
-        [[NSNotificationCenter defaultCenter] removeObserver:_notify
-         name:NSViewFrameDidChangeNotification 
-         object:au_view];
-
-        NSUInteger old_auto_resize = [au_view autoresizingMask];
-
-        [au_view setAutoresizingMask:NSViewNotSizable];
-        [window setFrame:windowFrame display:YES];
-        [au_view setAutoresizingMask:old_auto_resize];
-
-        [[NSNotificationCenter defaultCenter] addObserver:_notify
-         selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
-         object:au_view];
+       if (!mapped || alo_width == 0 || alo_height == 0 || !resizable) {
+               return;
+       }
+       /* check for self-resizing plugins (e.g expand settings in AUSampler)
+        * if the widget expands it moves its y-offset (cocoa y-axis points towards the top)
+        */
+       NSRect new_au_frame = [au_view frame];
+
+       //float dx = last_au_frame.origin.x - new_au_frame.origin.x;
+       float dy = last_au_frame.origin.y - new_au_frame.origin.y;
+       //req_width += dx;
+       req_height += dy;
+       if (req_width < min_width) req_width = min_width;
+       if (req_height < min_height) req_height = min_height;
+
+       last_au_frame = new_au_frame;
+       low_box.queue_resize ();
 }
 
 int
@@ -443,29 +492,29 @@ AUPluginUI::create_carbon_view ()
        ControlRef root_control;
 
        Component editComponent = FindNextComponent(NULL, &carbon_descriptor);
-       
+
        OpenAComponent(editComponent, &editView);
        if (!editView) {
                error << _("AU Carbon view: cannot open AU Component") << endmsg;
                return -1;
        }
-       
+
        Rect r = { 100, 100, 100, 100 };
        WindowAttributes attr = WindowAttributes (kWindowStandardHandlerAttribute |
                                                  kWindowCompositingAttribute|
                                                  kWindowNoShadowAttribute|
                                                  kWindowNoTitleBarAttribute);
 
-       if ((err = CreateNewWindow(kDocumentWindowClass, attr, &r, &carbon_window)) != noErr) {
+       if ((err = CreateNewWindow(kUtilityWindowClass, attr, &r, &carbon_window)) != noErr) {
                error << string_compose (_("AUPluginUI: cannot create carbon window (err: %1)"), err) << endmsg;
-               CloseComponent (editView);
+               ArdourCloseComponent (editView);
                return -1;
        }
-       
+
        if ((err = GetRootControl(carbon_window, &root_control)) != noErr) {
                error << string_compose (_("AUPlugin: cannot get root control of carbon window (err: %1)"), err) << endmsg;
                DisposeWindow (carbon_window);
-               CloseComponent (editView);
+               ArdourCloseComponent (editView);
                return -1;
        }
 
@@ -476,7 +525,7 @@ AUPluginUI::create_carbon_view ()
        if ((err = AudioUnitCarbonViewCreate (editView, *au->get_au(), carbon_window, root_control, &location, &size, &viewPane)) != noErr) {
                error << string_compose (_("AUPluginUI: cannot create carbon plugin view (err: %1)"), err) << endmsg;
                DisposeWindow (carbon_window);
-               CloseComponent (editView);
+               ArdourCloseComponent (editView);
                return -1;
        }
 
@@ -487,11 +536,11 @@ AUPluginUI::create_carbon_view ()
        size.x = bounds.right-bounds.left;
        size.y = bounds.bottom-bounds.top;
 
-       prefwidth = (int) (size.x + 0.5);
-       prefheight = (int) (size.y + 0.5);
+       req_width = (int) (size.x + 0.5);
+       req_height = (int) (size.y + 0.5);
 
-       SizeWindow (carbon_window, prefwidth, prefheight,  true);
-       low_box.set_size_request (prefwidth, prefheight);
+       SizeWindow (carbon_window, prefwidth, req_height,  true);
+       low_box.set_size_request (prefwidth, req_height); // ??
 
        return 0;
 #else
@@ -526,7 +575,6 @@ AUPluginUI::activate ()
 #ifdef WITH_CARBON
        ActivateWindow (carbon_window, TRUE);
 #endif
-       // [cocoa_parent makeKeyAndOrderFront:nil];
 }
 
 void
@@ -554,7 +602,7 @@ AUPluginUI::parent_carbon_window ()
                error << _("AUPluginUI: no top level window!") << endmsg;
                return -1;
        }
-       
+
        /* figure out where the cocoa parent window is in carbon-coordinate space, which
           differs from both cocoa-coordinate space and GTK-coordinate space
        */
@@ -573,9 +621,9 @@ AUPluginUI::parent_carbon_window ()
        int packing_extra = 6; // this is the total vertical packing in our top level window
 
        /* move into position, based on parent window position */
-       MoveWindow (carbon_window, 
-                   windowStructureBoundsRect.left, 
-                   windowStructureBoundsRect.top + titlebar_height + top_box.get_height() + packing_extra, 
+       MoveWindow (carbon_window,
+                   windowStructureBoundsRect.left,
+                   windowStructureBoundsRect.top + titlebar_height + top_box.get_height() + packing_extra,
                    false);
        ShowWindow (carbon_window);
 
@@ -584,15 +632,16 @@ AUPluginUI::parent_carbon_window ()
 
        SetWindowActivationScope (carbon_window, kWindowActivationScopeNone);
 
-       _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:cocoa_parent andTopLevelParent:win ]; 
+       _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:cocoa_parent andTopLevelParent:win ];
 
        [win addChildWindow:cocoa_parent ordered:NSWindowAbove];
+       [win setAutodisplay:1]; // turn of GTK stuff for this window
 
        return 0;
 #else
        return -1;
 #endif
-}      
+}
 
 int
 AUPluginUI::parent_cocoa_window ()
@@ -603,53 +652,36 @@ AUPluginUI::parent_cocoa_window ()
                return -1;
        }
 
-       [win setAutodisplay:YES]; // turn of GTK stuff for this window
-
-       Gtk::Container* toplevel = get_toplevel();
-
-       if (!toplevel || !toplevel->is_toplevel()) {
-               error << _("AUPluginUI: no top level window!") << endmsg;
-               return -1;
-       }
-
-       NSView* view = gdk_quartz_window_get_nsview (get_toplevel()->get_window()->gobj());
-       GtkRequisition a = top_box.size_request ();
+       //[win setAutodisplay:1]; // turn off GTK stuff for this window
 
-       /* move the au_view down so that it doesn't overlap the top_box contents */
+       NSView* view = gdk_quartz_window_get_nsview (low_box.get_window()->gobj());
+       [view addSubview:au_view];
 
-       NSPoint origin = { 0, a.height };
-
-       [au_view setFrameOrigin:origin];
-       [view addSubview:au_view positioned:NSWindowBelow relativeTo:nil]; 
+       gint xx, yy;
+       gtk_widget_translate_coordinates(
+                       GTK_WIDGET(low_box.gobj()),
+                       GTK_WIDGET(low_box.get_parent()->gobj()),
+                       8, 6, &xx, &yy);
+       [au_view setFrame:NSMakeRect(xx, yy, req_width, req_height)];
 
+       last_au_frame = [au_view frame];
        // watch for size changes of the view
+       _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:NULL andTopLevelParent:win ];
 
-       _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:nil andTopLevelParent:win ]; 
-
-        [[NSNotificationCenter defaultCenter] addObserver:_notify
-         selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
-         object:au_view];
+       [[NSNotificationCenter defaultCenter] addObserver:_notify
+               selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
+               object:au_view];
 
        return 0;
 }
 
-static void
-dump_view_tree (NSView* view, int depth)
+void
+AUPluginUI::grab_focus()
 {
-       NSArray* subviews = [view subviews];
-       unsigned long cnt = [subviews count];
-
-       for (int d = 0; d < depth; d++) {
-               cerr << '\t';
-       }
-       cerr << " view @ " << view << endl;
-       
-       for (unsigned long i = 0; i < cnt; ++i) {
-               NSView* subview = [subviews objectAtIndex:i];
-               dump_view_tree (subview, depth+1);
+       if (au_view) {
+               [au_view becomeFirstResponder];
        }
 }
-
 void
 AUPluginUI::forward_key_event (GdkEventKey* ev)
 {
@@ -681,7 +713,7 @@ AUPluginUI::on_realize ()
 
        NSWindow* win = get_nswindow ();
        if (win) {
-               [win setShowsResizeIndicator:NO];
+               [win setShowsResizeIndicator:0];
        }
 }
 
@@ -696,11 +728,105 @@ AUPluginUI::lower_box_realized ()
 }
 
 bool
-AUPluginUI::on_map_event (GdkEventAny*)
+AUPluginUI::lower_box_visibility_notify (GdkEventVisibility* ev)
 {
+#ifdef WITH_CARBON
+       if (carbon_window  && ev->state != GDK_VISIBILITY_UNOBSCURED) {
+               ShowWindow (carbon_window);
+               ActivateWindow (carbon_window, TRUE);
+               return true;
+       }
+#endif
        return false;
 }
 
+void
+AUPluginUI::update_view_size ()
+{
+       if (!mapped || alo_width == 0 || alo_height == 0) {
+               return;
+       }
+       gint xx, yy;
+       gtk_widget_translate_coordinates(
+                       GTK_WIDGET(low_box.gobj()),
+                       GTK_WIDGET(low_box.get_parent()->gobj()),
+                       8, 6, &xx, &yy);
+
+       [[NSNotificationCenter defaultCenter] removeObserver:_notify
+               name:NSViewFrameDidChangeNotification
+               object:au_view];
+
+       if (!resizable) {
+               xx += (alo_width - req_width) * .5;
+               [au_view setFrame:NSMakeRect(xx, yy, req_width, req_height)];
+       } else {
+               /* this mitigates issues with plugins that resize themselves
+                * depending on visible options (e.g AUSampler)
+                * since the OSX y-axis points upwards, the plugin adjusts its
+                * own y-offset if the view expands to the bottom to accomodate
+                * subviews inside the main view.
+                */
+               [au_view setAutoresizesSubviews:0];
+               [au_view setFrame:NSMakeRect(xx, yy, alo_width, alo_height)];
+               [au_view setAutoresizesSubviews:1];
+               [au_view setNeedsDisplay:1];
+       }
+
+       last_au_frame = [au_view frame];
+
+       [[NSNotificationCenter defaultCenter]
+            addObserver:_notify
+               selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
+                 object:au_view];
+}
+
+void
+AUPluginUI::lower_box_map ()
+{
+       mapped = true;
+       [au_view setHidden:0];
+       update_view_size ();
+}
+
+void
+AUPluginUI::lower_box_unmap ()
+{
+       mapped = false;
+       [au_view setHidden:1];
+}
+
+void
+AUPluginUI::lower_box_size_request (GtkRequisition* requisition)
+{
+       requisition->width  = req_width;
+       requisition->height = req_height;
+}
+
+void
+AUPluginUI::lower_box_size_allocate (Gtk::Allocation& allocation)
+{
+       alo_width  = allocation.get_width ();
+       alo_height = allocation.get_height ();
+       update_view_size ();
+}
+
+gboolean
+AUPluginUI::lower_box_expose (GdkEventExpose* event)
+{
+#if 0 // AU view magically redraws by itself
+       [au_view drawRect:NSMakeRect(event->area.x,
+                       event->area.y,
+                       event->area.width,
+                       event->area.height)];
+#endif
+       /* hack to keep ardour responsive
+        * some UIs (e.g Addictive Drums) completely hog the CPU
+        */
+       ARDOUR::GUIIdle();
+
+       return true;
+}
+
 void
 AUPluginUI::on_window_hide ()
 {
@@ -710,8 +836,14 @@ AUPluginUI::on_window_hide ()
                ActivateWindow (carbon_window, FALSE);
        }
 #endif
-
        hide_all ();
+
+#if 0
+       NSArray* wins = [NSApp windows];
+       for (uint32_t i = 0; i < [wins count]; i++) {
+               id win = [wins objectAtIndex:i];
+       }
+#endif
 }
 
 bool
@@ -753,19 +885,4 @@ create_au_gui (boost::shared_ptr<PluginInsert> plugin_insert, VBox** box)
        return aup;
 }
 
-bool
-AUPluginUI::on_focus_in_event (GdkEventFocus*)
-{
-       //cerr << "au plugin focus in\n";
-       //Keyboard::magic_widget_grab_focus ();
-       return false;
-}
-
-bool
-AUPluginUI::on_focus_out_event (GdkEventFocus*)
-{
-       //cerr << "au plugin focus out\n";
-       //Keyboard::magic_widget_drop_focus ();
-       return false;
-}