suspend editor redisplay during batch changes

[ardour.git] / gtk2_ardour / splash.cc

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 78b5547deddcebcf431701e9619349acca7cb478..ff9e133eb02ec08189cc6a33c61ec1f672477834 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"
 
@@ -44,7 +48,7 @@ Splash::Splash ()
        
        std::string splash_file;
 
-       if (!find_file_in_search_path (ardour_data_search_path(), "splash.png", splash_file)) {
+       if (!find_file (ardour_data_search_path(), "splash.png", splash_file)) {
                 cerr << "Cannot find splash screen image file\n";
                throw failed_constructor();
        }
@@ -78,9 +82,12 @@ Splash::Splash ()
        add (darea);
 
        set_default_size (pixbuf->get_width(), pixbuf->get_height());
+       set_resizable (false);
+       set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
        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());
 }
@@ -93,15 +100,36 @@ Splash::~Splash ()
 void
 Splash::pop_back_for (Gtk::Window& win)
 {
+#if defined  __APPLE__ || defined PLATFORM_WINDOWS
+        /* 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.
+
+                                        Oct 2014: The Windows situation is similar, although it should be possible
+                                        to play tricks with gdk's set_type_hint() or directly hack things using
+                                        SetWindowLong() and UpdateLayeredWindow()
+        */
+        (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 ()
 {
-       set_keep_above (true);
+
+#if defined  __APPLE__ || defined PLATFORM_WINDOWS
+        if (get_window()) {
+                show ();
+        }
+#endif
 }
 
 void
@@ -145,8 +173,14 @@ Splash::expose (GdkEventExpose* ev)
        Glib::RefPtr<Gdk::GC> white = style->get_white_gc();
 
        window->draw_layout (white, 10, pixbuf->get_height() - 30, layout);
+
+       /* this must execute AFTER the GDK idle update mechanism 
+        */
        
-       Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose));
+       if (expose_is_the_one) {
+               Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
+                                            GDK_PRIORITY_REDRAW+2);
+       }
 
        return true;
 }
@@ -171,7 +205,8 @@ Splash::display ()
        
        if (!was_mapped) {
                expose_done = false;
-       }
+               expose_is_the_one = false;
+       } 
 
        pop_front ();
        present ();
@@ -180,6 +215,7 @@ Splash::display ()
                while (!expose_done) {
                        gtk_main_iteration ();
                }
+               gdk_display_flush (gdk_display_get_default());
        }
 }
 
@@ -187,19 +223,28 @@ void
 Splash::message (const string& msg)
 {
        string str ("<b>");
-       str += msg;
+       str += Glib::Markup::escape_text (msg);
        str += "</b>";
 
+        show ();
+
        layout->set_markup (str);
        Glib::RefPtr<Gdk::Window> win = darea.get_window();
-
+       
        if (win) {
                 expose_done = false;
-                
-               win->invalidate_rect (Gdk::Rectangle (0, darea.get_height() - 30, darea.get_width(), 30), true);
 
-                while (!expose_done) {
-                        gtk_main_iteration ();
-                }
+               if (win->is_visible ()) {
+                       win->invalidate_rect (Gdk::Rectangle (0, darea.get_height() - 30, darea.get_width(), 30), true);
+               } else {
+                       darea.queue_draw ();
+               }
        }
 }
+
+bool
+Splash::on_map_event (GdkEventAny* ev)
+{
+       expose_is_the_one = true;
+       return Window::on_map_event (ev);
+}