X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=1c9da0112f1439bf4e50e737fab033607f0a52d2;hb=7e2c002ef67ac7396f2534c0fed7f9f447081a5a;hp=9a5a64a2f2e9cf7293aec996bf20cdee74c24915;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 9a5a64a2f2..1c9da0112f 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -18,152 +18,139 @@
 */
 
 #include <iostream>
+#include <sigc++/bind.h>
 
-#include <gtkmmext/doi.h>
+#include <gtkmm2ext/doi.h>
 
 #include "ardour_dialog.h"
-#include "keyboard.h"
 #include "ardour_ui.h"
+#include "keyboard.h"
+#include "splash.h"
+#include "utils.h"
+#include "window_manager.h"
 
+using namespace std;
+using namespace Gtk;
+using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
 
-ArdourDialog::ArdourDialog (string name)
-	: Gtk::Window (GTK_WINDOW_TOPLEVEL),
-	  KeyboardTarget (*this, name)
-{
-	session = 0;
-	kbd_input = false;
-	running = false;
-	_run_status = 0;
-	_within_hiding = false;
-	hide_on_stop = true;
-}
-
-ArdourDialog::~ArdourDialog ()
+ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
+	: Dialog (title, modal, use_seperator)
+	, proxy (0)
+	, _splash_pushed (false)
 {
+	init ();
+	set_position (Gtk::WIN_POS_MOUSE);
 }
 
-gint
-ArdourDialog::enter_notify_event_impl (GdkEventCrossing *ev)
+ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
+	: Dialog (title, parent, modal, use_seperator)
+	, _splash_pushed (false)
 {
-	if (ev->detail != GDK_NOTIFY_INFERIOR) {
-		Keyboard::the_keyboard().set_current_dialog (this);
-	}
-	return FALSE;
+	init ();
+	set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
 }
 
-gint
-ArdourDialog::leave_notify_event_impl (GdkEventCrossing *ev)
+ArdourDialog::~ArdourDialog ()
 {
-	if (ev->detail != GDK_NOTIFY_INFERIOR) {
-		Keyboard::the_keyboard().set_current_dialog (0);
-	}
-	return FALSE;
+	pop_splash ();
+	Keyboard::the_keyboard().focus_out_window (0, this);
+	WM::Manager::instance().remove (proxy);
 }
 
-gint
-ArdourDialog::unmap_event_impl (GdkEventAny *ev)
+void
+ArdourDialog::on_response (int response_id)
 {
-	_within_hiding = true;
-	 Hiding (); /* EMIT_SIGNAL */
-	_within_hiding = false;
-	return Gtk::Window::unmap_event_impl (ev);
+	pop_splash ();
+	hide ();
+	ARDOUR::GUIIdle ();
+	Gtk::Dialog::on_response (response_id);
 }
 
 void
-ArdourDialog::wm_close()
+ArdourDialog::close_self ()
 {
-	stop (-1);
-	ARDOUR_UI::instance()->allow_focus(false);
+	/* 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::wm_doi ()
+ArdourDialog::pop_splash ()
 {
-	if (!hide_on_stop) {
-		Hiding (); /* EMIT_SIGNAL */
-	}
-	stop (-1);
-	delete_when_idle (this);
-}
+	if (_splash_pushed) {
+		Splash* spl = Splash::instance();
 
-gint
-ArdourDialog::wm_close_event (GdkEventAny* ev)
-{
-	wm_close ();
-	return TRUE;
+		if (spl) {
+			spl->pop_front();
+		}
+		_splash_pushed = false;
+	}
 }
 
-gint
-ArdourDialog::wm_doi_event (GdkEventAny* ev)
+bool
+ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
 {
-	wm_doi ();
-	return TRUE;
+	Keyboard::the_keyboard().focus_in_window (ev, this);
+	return Dialog::on_focus_in_event (ev);
 }
 
-gint
-ArdourDialog::wm_doi_event_stop (GdkEventAny* ev)
+bool
+ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
 {
-	stop (-1);
-	return TRUE;
+	if (!get_modal()) {
+		Keyboard::the_keyboard().focus_out_window (ev, this);
+	}
+	return Dialog::on_focus_out_event (ev);
 }
 
 void
-ArdourDialog::set_hide_on_stop (bool yn)
+ArdourDialog::on_unmap ()
 {
-	hide_on_stop = yn;
+	Keyboard::the_keyboard().leave_window (0, this);
+	Dialog::on_unmap ();
 }
 
 void
-ArdourDialog::close ()
+ArdourDialog::on_show ()
 {
-	hide_all ();
+	Dialog::on_show ();
 
-	if (kbd_input) {
-		ARDOUR_UI::instance()->allow_focus (false);
-	}
-}
-
-void
-ArdourDialog::stop (int rr)
-{
-	_run_status = rr;
+	// never allow the splash screen to obscure any dialog
 
-	if (hide_on_stop) {
-		Hiding (); /* EMIT_SIGNAL */
-		hide_all ();
+	Splash* spl = Splash::instance();
 
-		if (kbd_input) {
-			ARDOUR_UI::instance()->allow_focus (false);
-		}
+	if (spl && spl->is_visible()) {
+		spl->pop_back_for (*this);
+		_splash_pushed = true;
 	}
+}
 
-	if (running) {
-		Gtk::Main::quit ();
-		running = false;
-	}
+bool
+ArdourDialog::on_delete_event (GdkEventAny*)
+{
+	hide ();
+	return false;
 }
 
 void
-ArdourDialog::run ()
+ArdourDialog::init ()
 {
-	show_all ();
+	set_border_width (10);
+	add_events (Gdk::FOCUS_CHANGE_MASK);
+	set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
 
-	if (kbd_input) {
-		ARDOUR_UI::instance()->allow_focus (true);
-	}
+	Gtk::Window* parent = WM::Manager::instance().transient_parent();
 
-	running = true;
-	Gtk::Main::run ();
-}
+	if (parent) {
+		set_transient_for (*parent);
+	}
 
-void
-ArdourDialog::set_keyboard_input (bool yn)
-{
-	kbd_input = yn;
-}
+	ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourDialog::close_self)); /* send a RESPONSE_CANCEL to self */
 
-int
-ArdourDialog::run_status ()
-{
-	return _run_status;
+	proxy = new WM::ProxyTemporary (get_title(), this);
+	WM::Manager::instance().register_window (proxy);
 }