X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsplash.cc;h=da22016f07dd1d2c08b11059c5fcc1d963e74da5;hb=e3dd226ffa562d28758555d67961d95723e2a2f0;hp=6cc4cd5ded271934d4f48104bf2f41a3406459c5;hpb=4073e5b7abafe0e72e743424070e922bdd13d85b;p=ardour.git

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 6cc4cd5ded..da22016f07 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -21,9 +21,14 @@
 
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
+
 #include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 
+#ifdef check
+#undef check
+#endif
+
 #include "gui_thread.h"
 #include "splash.h"
 
@@ -41,17 +46,19 @@ Splash::Splash ()
 {
 	assert (the_splash == 0);
 	
-	sys::path splash_file;
+	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();
 	}
 
 	try {
-		pixbuf = Gdk::Pixbuf::create_from_file (splash_file.to_string());
+		pixbuf = Gdk::Pixbuf::create_from_file (splash_file);
 	}
 
 	catch (...) {
+                cerr << "Cannot construct splash screen image\n";
 		throw failed_constructor();
 	}
 
@@ -75,8 +82,13 @@ 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());
 }
 
@@ -88,15 +100,38 @@ 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 ()
 {
+
+#if defined  __APPLE__ || defined PLATFORM_WINDOWS
+        if (get_window()) {
+                show ();
+        }
+#else
 	set_keep_above (true);
+#endif
 }
 
 void
@@ -107,10 +142,15 @@ Splash::on_realize ()
 	layout->set_font_description (get_style()->get_font());
 }
 
-
 bool
-Splash::on_button_release_event (GdkEventButton*)
+Splash::on_button_release_event (GdkEventButton* ev)
 {
+	RefPtr<Gdk::Window> window = get_window();
+        
+        if (!window || ev->window != window->gobj()) {
+                return false;
+        }
+        
 	hide ();
 	return true;
 }
@@ -136,6 +176,14 @@ Splash::expose (GdkEventExpose* ev)
 
 	window->draw_layout (white, 10, pixbuf->get_height() - 30, layout);
 
+	/* this must execute AFTER the GDK idle update mechanism 
+	 */
+       
+	if (expose_is_the_one) {
+		Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
+					     GDK_PRIORITY_REDRAW+2);
+	}
+
 	return true;
 }
 
@@ -145,20 +193,60 @@ Splash::boot_message (std::string msg)
 	message (msg);
 }
 
+bool
+Splash::idle_after_expose ()
+{
+        expose_done = true;
+	return false;
+}
+
+void
+Splash::display ()
+{
+	bool was_mapped = is_mapped ();
+	
+	if (!was_mapped) {
+		expose_done = false;
+		expose_is_the_one = false;
+	} 
+
+	pop_front ();
+	present ();
+	
+	if (!was_mapped) {
+		while (!expose_done) {
+			gtk_main_iteration ();
+		}
+		gdk_display_flush (gdk_display_get_default());
+	}
+}
+
 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) {
-		win->invalidate_rect (Gdk::Rectangle (0, darea.get_height() - 30,
-						      darea.get_width(), 30), true);
-		win->process_updates (true);
-		gdk_flush ();
+                expose_done = false;
+
+		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);
+}