X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=1c9da0112f1439bf4e50e737fab033607f0a52d2;hb=b115a04babe8435eeaba36469eeb6145250c70cd;hp=34027ca0c3600f3f207e2b460034234a15662389;hpb=e5e12acc5698090f2c0c614385e457cc0b46fbb0;p=ardour.git

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 34027ca0c3..1c9da0112f 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -37,7 +37,7 @@ using namespace ARDOUR_UI_UTILS;
 ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
 	: Dialog (title, modal, use_seperator)
 	, proxy (0)
-        , _splash_pushed (false)
+	, _splash_pushed (false)
 {
 	init ();
 	set_position (Gtk::WIN_POS_MOUSE);
@@ -45,7 +45,7 @@ ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
 
 ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
 	: Dialog (title, parent, modal, use_seperator)
-        , _splash_pushed (false)
+	, _splash_pushed (false)
 {
 	init ();
 	set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
@@ -53,37 +53,58 @@ ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool
 
 ArdourDialog::~ArdourDialog ()
 {
-        if (_splash_pushed) {
-                Splash* spl = Splash::instance();
-                
-                if (spl) {
-                        spl->pop_front();
-                }
-        }
+	pop_splash ();
+	Keyboard::the_keyboard().focus_out_window (0, this);
 	WM::Manager::instance().remove (proxy);
 }
 
-bool
-ArdourDialog::on_key_press_event (GdkEventKey* ev)
+void
+ArdourDialog::on_response (int response_id)
+{
+	pop_splash ();
+	hide ();
+	ARDOUR::GUIIdle ();
+	Gtk::Dialog::on_response (response_id);
+}
+
+void
+ArdourDialog::close_self ()
 {
-	if (!relay_key_press (ev, this)) {
-		return Gtk::Window::on_key_press_event(ev);
+	/* Don't call Idle, don't pop splash.
+	 * This is used at exit and session-close and invoked
+	 * via close_all_dialogs.
+	 */
+	hide ();
+	Gtk::Dialog::on_response (RESPONSE_CANCEL);
+}
+
+void
+ArdourDialog::pop_splash ()
+{
+	if (_splash_pushed) {
+		Splash* spl = Splash::instance();
+
+		if (spl) {
+			spl->pop_front();
+		}
+		_splash_pushed = false;
 	}
-	return true;
 }
 
 bool
-ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
 {
-	Keyboard::the_keyboard().enter_window (ev, this);
-	return Dialog::on_enter_notify_event (ev);
+	Keyboard::the_keyboard().focus_in_window (ev, this);
+	return Dialog::on_focus_in_event (ev);
 }
 
 bool
-ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
 {
-	Keyboard::the_keyboard().leave_window (ev, this);
-	return Dialog::on_leave_notify_event (ev);
+	if (!get_modal()) {
+		Keyboard::the_keyboard().focus_out_window (ev, this);
+	}
+	return Dialog::on_focus_out_event (ev);
 }
 
 void
@@ -104,7 +125,7 @@ ArdourDialog::on_show ()
 
 	if (spl && spl->is_visible()) {
 		spl->pop_back_for (*this);
-                _splash_pushed = true;
+		_splash_pushed = true;
 	}
 }
 
@@ -119,7 +140,7 @@ void
 ArdourDialog::init ()
 {
 	set_border_width (10);
-
+	add_events (Gdk::FOCUS_CHANGE_MASK);
 	set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
 
 	Gtk::Window* parent = WM::Manager::instance().transient_parent();
@@ -128,7 +149,7 @@ ArdourDialog::init ()
 		set_transient_for (*parent);
 	}
 
-	ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
+	ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourDialog::close_self)); /* send a RESPONSE_CANCEL to self */
 
 	proxy = new WM::ProxyTemporary (get_title(), this);
 	WM::Manager::instance().register_window (proxy);