hardour does not yet support wine-builds

[ardour.git] / gtk2_ardour / splash.cc

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 941350646dcad97a86b057b8174f6d7a2e2050a9..ee0566a9100f6d94653456316830ed87806fafb9 100644 (file)
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -25,6 +25,10 @@
 #include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 
+#ifdef check
+#undef check
+#endif
+
 #include "gui_thread.h"
 #include "splash.h"
 
@@ -83,6 +87,7 @@ Splash::Splash ()
        the_splash = this;
 
         expose_done = false;
+        expose_is_the_one = false;
 
        ARDOUR::BootMessage.connect (msg_connection, invalidator (*this), boost::bind (&Splash::boot_message, this, _1), gui_context());
 }
@@ -95,15 +100,34 @@ Splash::~Splash ()
 void
 Splash::pop_back_for (Gtk::Window& win)
 {
+#ifdef __APPLE__
+        /* April 2013: window layering on OS X is a bit different to X Window. at present,
+           the "restack()" functionality in GDK will only operate on windows in the same
+           "level" (e.g. two normal top level windows, or two utility windows) and will not
+           work across them. The splashscreen is on its own "StatusWindowLevel" so restacking 
+           is not going to work.
+
+           So for OS X, we just hide ourselves.
+        */
+        (void) win;
+        hide();
+#else
        set_keep_above (false);
        get_window()->restack (win.get_window(), false);
-       win.signal_hide().connect (sigc::mem_fun (*this, &Splash::pop_front));
+#endif
 }
 
 void
 Splash::pop_front ()
 {
+
+#ifdef __APPLE__
+        if (get_window()) {
+                show ();
+        }
+#else
        set_keep_above (true);
+#endif
 }
 
 void
@@ -151,8 +175,10 @@ Splash::expose (GdkEventExpose* ev)
        /* this must execute AFTER the GDK idle update mechanism 
         */
        
-       Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
-                                    GDK_PRIORITY_REDRAW+2);
+       if (expose_is_the_one) {
+               Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
+                                            GDK_PRIORITY_REDRAW+2);
+       }
 
        return true;
 }
@@ -177,7 +203,8 @@ Splash::display ()
        
        if (!was_mapped) {
                expose_done = false;
-       }
+               expose_is_the_one = false;
+       } 
 
        pop_front ();
        present ();
@@ -186,6 +213,7 @@ Splash::display ()
                while (!expose_done) {
                        gtk_main_iteration ();
                }
+               gdk_display_flush (gdk_display_get_default());
        }
 }
 
@@ -209,7 +237,15 @@ Splash::message (const string& msg)
                }
 
                 while (!expose_done) {
-                        gtk_main_iteration ();
+                        if(gtk_main_iteration ()) return; // quit was called
                 }
+               gdk_display_flush (gdk_display_get_default());
        }
 }
+
+bool
+Splash::on_map_event (GdkEventAny* ev)
+{
+       expose_is_the_one = true;
+       return Window::on_map_event (ev);
+}