X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsplash.cc;h=8846c9f4e6a168f55fb8ad31daa54657feafcada;hb=4b27094a39cbbe43c3ca2bc3ed64c08f26db22e4;hp=7f38c39588a94d4e0147a9eb25bebbab6841299d;hpb=7295d8e9f675f4441ab626c0655b2d2e6663e47e;p=ardour.git

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 7f38c39588..8846c9f4e6 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -5,6 +5,7 @@
 #include <ardour/ardour.h>
 #include <ardour/filesystem_paths.h>
 
+#include "gui_thread.h"
 #include "splash.h"
 
 #include "i18n.h"
@@ -14,11 +15,13 @@ using namespace Glib;
 using namespace std;
 using namespace ARDOUR;
 
+Splash* Splash::the_splash = 0;
+
 Splash::Splash ()
 {
 	sys::path splash_file;
 
-	if (!find_file_in_search_path (ardour_search_path(), "splash.png", splash_file)) {
+	if (!find_file_in_search_path (ardour_search_path() + system_data_search_path(), "splash.png", splash_file)) {
 		throw failed_constructor();
 	}
 
@@ -31,23 +34,41 @@ Splash::Splash ()
 	}
 	
 	darea.set_size_request (pixbuf->get_width(), pixbuf->get_height());
-	set_type_hint (Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
 	set_keep_above (true);
 	set_position (WIN_POS_CENTER);
 	darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+	darea.set_double_buffered (false);
 
 	layout = create_pango_layout ("");
+	string str = "<b>";
+	string i18n = _("Ardour loading ...");
+	str += i18n;
+	str += "</b>";
+
+	layout->set_markup (str);
 
 	darea.show ();
 	darea.signal_expose_event().connect (mem_fun (*this, &Splash::expose));
 
 	add (darea);
+
+	set_default_size (pixbuf->get_width(), pixbuf->get_height());
+	the_splash = this;
+
+	ARDOUR::BootMessage.connect (mem_fun (*this, &Splash::boot_message));
+}
+
+void
+Splash::pop_back ()
+{
+	set_keep_above (false);
 }
 
 void
 Splash::on_realize ()
 {
 	Window::on_realize ();
+	get_window()->set_decorations (Gdk::WMDecoration(0));
 	layout->set_font_description (get_style()->get_font());
 }
 
@@ -64,12 +85,17 @@ Splash::expose (GdkEventExpose* ev)
 {
 	RefPtr<Gdk::Window> window = darea.get_window();
 
+	/* note: height & width need to be constrained to the pixbuf size
+	   in case a WM provides us with a screwy allocation
+	*/
+
 	window->draw_pixbuf (get_style()->get_bg_gc (STATE_NORMAL), pixbuf,
 			     ev->area.x, ev->area.y,
 			     ev->area.x, ev->area.y,
-			     ev->area.width, ev->area.height,
+			     min ((pixbuf->get_width() - ev->area.x), ev->area.width), 
+			     min ((pixbuf->get_height() - ev->area.y), ev->area.height),
 			     Gdk::RGB_DITHER_NONE, 0, 0);
-
+	
 	Glib::RefPtr<Gtk::Style> style = darea.get_style();
 	Glib::RefPtr<Gdk::GC> white = style->get_white_gc();
 
@@ -78,6 +104,12 @@ Splash::expose (GdkEventExpose* ev)
 	return true;
 }
 
+void
+Splash::boot_message (std::string msg)
+{
+	message (msg);
+}
+
 void
 Splash::message (const string& msg)
 {
@@ -86,6 +118,12 @@ Splash::message (const string& msg)
 	str += "</b>";
 
 	layout->set_markup (str);
-	darea.queue_draw ();
-	get_window()->process_updates (true);
+	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 ();
+	}
 }