replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls

[ardour.git] / gtk2_ardour / ardour_window.cc

diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc
index 3bc80dfc46ee89a151cbdcf435aa4e9edec0b6ad..956b3608d486d7bab7091772b9f4f45bdd1b6ed9 100644 (file)
--- a/gtk2_ardour/ardour_window.cc
+++ b/gtk2_ardour/ardour_window.cc
@@ -24,6 +24,7 @@
 
 #include "ardour_window.h"
 #include "ardour_ui.h"
+#include "ui_config.h"
 #include "keyboard.h"
 #include "utils.h"
 
@@ -38,41 +39,52 @@ ArdourWindow::ArdourWindow (string title)
 {
        set_title (title);
        init ();
-       set_position (Gtk::WIN_POS_CENTER);
+       set_position (Gtk::WIN_POS_MOUSE);
 }
 
-ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/)
+ArdourWindow::ArdourWindow (Gtk::Window& parent, string title)
        : Window ()
        , VisibilityTracker (*((Gtk::Window*)this))
 {
        init ();
+       set_title (title);
        set_transient_for (parent);
        set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
 }
 
 ArdourWindow::~ArdourWindow ()
 {
-       WM::Manager::instance().remove (proxy);
+       // WM::Manager::instance().remove (proxy);
 }
 
 bool
 ArdourWindow::on_key_press_event (GdkEventKey* ev)
 {
-       return relay_key_press (ev, this);
+       bool handled = Gtk::Window::on_key_press_event (ev);
+
+       if (!handled) {
+               if (!get_modal()) {
+                       handled = relay_key_press (ev, this);
+               }
+       }
+
+       return handled;
 }
 
 bool
-ArdourWindow::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourWindow::on_focus_in_event (GdkEventFocus *ev)
 {
-       Keyboard::the_keyboard().enter_window (ev, this);
-       return Window::on_enter_notify_event (ev);
+       Keyboard::the_keyboard().focus_in_window (ev, this);
+       return Window::on_focus_in_event (ev);
 }
 
 bool
-ArdourWindow::on_leave_notify_event (GdkEventCrossing *ev)
+ArdourWindow::on_focus_out_event (GdkEventFocus *ev)
 {
-       Keyboard::the_keyboard().leave_window (ev, this);
-       return Window::on_leave_notify_event (ev);
+       if (!get_modal()) {
+               Keyboard::the_keyboard().focus_out_window (ev, this);
+       }
+       return Window::on_focus_out_event (ev);
 }
 
 void
@@ -92,32 +104,42 @@ void
 ArdourWindow::init ()
 {
        set_border_width (10);
+       add_events (Gdk::FOCUS_CHANGE_MASK);
 
-        /* ArdourWindows are not dialogs (they have no "OK" or "Close" button) but
-           they should be considered part of the same "window level" as a dialog. This
-           works on X11 and Quartz, in that:
-           
-           (a) utility & dialog windows are considered to be part of the same level
-           (b) they will float above normal windows without any particular effort
+       /* ArdourWindows are not dialogs (they have no "OK" or "Close" button) but
+          they should be considered part of the same "window level" as a dialog. This
+          works on X11 in that:
+
+          (a) there are no window "levels"
+          (b) they will float above normal windows without any particular effort
           (c) present()-ing them will make a utility float over a dialog or
-               vice versa.
-        */
+              vice versa.
+
+          Some X11 Window managers (e.g. KDE) get this wrong, and so we allow the user
+          to select what type of window hint is used.
+
+          GTK+ on OS X uses different levels for DIALOG and UTILITY, and Cocoa has a bug/design
+          issue that it will not transfer keyboard focus across levels when hiding a window.
+          So on OS X, we use DIALOG for all ArdourWindows to ensure that keyboard focus
+          will return to the main window(s) when this window is hidden.
+       */
 
-       if (ARDOUR_UI::config()->get_all_floating_windows_are_dialogs()) {
+#ifdef __APPLE__
+       set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+#else
+       if (UIConfiguration::instance().get_all_floating_windows_are_dialogs()) {
                set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
        } else {
                set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
        }
+#endif
 
        Gtk::Window* parent = WM::Manager::instance().transient_parent();
 
        if (parent) {
                set_transient_for (*parent);
        }
-       
-       ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide));
 
-       proxy = new WM::ProxyTemporary (get_title(), this);
-       WM::Manager::instance().register_window (proxy);
+       ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide));
 }