Fix thinkos in cubasish theme

[ardour.git] / gtk2_ardour / ardour_dialog.cc

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 34027ca0c3600f3f207e2b460034234a15662389..fe3a1cc80f6a107cdc0f96d0441e277a6fee3112 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -1,21 +1,24 @@
 /*
-    Copyright (C) 2002 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2005-2006 Taybin Rutkin <taybin@taybin.com>
+ * Copyright (C) 2005-2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2008-2011 David Robillard <d@drobilla.net>
+ * Copyright (C) 2014-2018 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2015 Nick Mainsbridge <mainsbridge@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <iostream>
 #include <sigc++/bind.h>
@@ -37,7 +40,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 +48,8 @@ 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)
+       , proxy (0)
+       , _splash_pushed (false)
 {
        init ();
        set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
@@ -53,37 +57,59 @@ 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);
+       proxy->explicit_delete ();
 }
 
-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 ()
+{
+       /* 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 (!relay_key_press (ev, this)) {
-               return Gtk::Window::on_key_press_event(ev);
+       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
@@ -100,11 +126,13 @@ ArdourDialog::on_show ()
 
        // never allow the splash screen to obscure any dialog
 
-       Splash* spl = Splash::instance();
+       if (Splash::exists()) {
+               Splash* spl = Splash::instance();
 
-       if (spl && spl->is_visible()) {
-               spl->pop_back_for (*this);
-                _splash_pushed = true;
+               if (spl->is_visible()) {
+                       spl->pop_back_for (*this);
+                       _splash_pushed = true;
+               }
        }
 }
 
@@ -119,7 +147,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 +156,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);