X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_window.cc;h=f6ced5fb492c7c7067fa0c6be4c97c9697a13a3f;hb=c9f9bb263fc3f96e383216d515c62ac6706b56da;hp=6217946940a2be7d9a1927dfc8a40fb238514dd1;hpb=d88999312a97a04548d2fc457d11a3303789c171;p=ardour.git

diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc
index 6217946940..f6ced5fb49 100644
--- a/gtk2_ardour/ardour_window.cc
+++ b/gtk2_ardour/ardour_window.cc
@@ -23,11 +23,14 @@
 #include <gtkmm2ext/doi.h>
 
 #include "ardour_window.h"
+#include "ardour_ui.h"
 #include "keyboard.h"
+#include "utils.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
 
 ArdourWindow::ArdourWindow (string title)
 	: Window ()
@@ -35,6 +38,7 @@ ArdourWindow::ArdourWindow (string title)
 {
 	set_title (title);
 	init ();
+	set_position (Gtk::WIN_POS_CENTER);
 }
 
 ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/)
@@ -48,20 +52,37 @@ ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/)
 
 ArdourWindow::~ArdourWindow ()
 {
+	WM::Manager::instance().remove (proxy);
 }
 
 bool
-ArdourWindow::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourWindow::on_key_press_event (GdkEventKey* ev)
 {
-	Keyboard::the_keyboard().enter_window (ev, this);
-	return Window::on_enter_notify_event (ev);
+	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_leave_notify_event (GdkEventCrossing *ev)
+ArdourWindow::on_focus_in_event (GdkEventFocus *ev)
 {
-	Keyboard::the_keyboard().leave_window (ev, this);
-	return Window::on_leave_notify_event (ev);
+	Keyboard::the_keyboard().focus_in_window (ev, this);
+	return Window::on_focus_in_event (ev);
+}
+
+bool
+ArdourWindow::on_focus_out_event (GdkEventFocus *ev)
+{
+	if (!get_modal()) {
+		Keyboard::the_keyboard().focus_out_window (ev, this);
+	}
+	return Window::on_focus_out_event (ev);
 }
 
 void
@@ -71,19 +92,43 @@ ArdourWindow::on_unmap ()
 	Window::on_unmap ();
 }
 
+bool
+ArdourWindow::on_delete_event (GdkEventAny*)
+{
+	return false;
+}
+
 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
+      /* 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
+	   (c) present()-ing them will make a utility float over a dialog or
+               vice versa.
         */
 
-        set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
+	if (ARDOUR_UI::config()->get_all_floating_windows_are_dialogs()) {
+		set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+	} else {
+		set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
+	}
+
+	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);
 }