X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsplash.cc;h=1784ac8164584d7a78b59c1ee43cb2718e178d3e;hb=dde13d288e22ba5dd8e23802c47fac288b089c57;hp=f76ded4feb9cf7465cb8180310a74a4600c00802;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc index f76ded4feb..1784ac8164 100644 --- a/gtk2_ardour/splash.cc +++ b/gtk2_ardour/splash.cc @@ -1,14 +1,40 @@ +/* + Copyright (C) 2008 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. + +*/ + #include #include "pbd/failed_constructor.h" #include "pbd/file_utils.h" + #include "ardour/ardour.h" #include "ardour/filesystem_paths.h" +#include "gtkmm2ext/utils.h" + +#ifdef check +#undef check +#endif + #include "gui_thread.h" #include "splash.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Glib; @@ -20,29 +46,36 @@ Splash* Splash::the_splash = 0; Splash::Splash () { - sys::path splash_file; + assert (the_splash == 0); + + std::string splash_file; - if (!find_file_in_search_path (ardour_search_path() + system_data_search_path(), "splash.png", splash_file)) { + Searchpath rc (ARDOUR::ardour_data_search_path()); + rc.add_subdirectory_to_paths ("resources"); + + if (!find_file (rc, PROGRAM_NAME "-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(); } darea.set_size_request (pixbuf->get_width(), pixbuf->get_height()); - set_keep_above (true); + pop_front (); 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 = ""; - string i18n = _("Ardour loading ..."); + string i18n = string_compose (_("%1 loading ..."), PROGRAM_NAME); str += i18n; str += ""; @@ -54,15 +87,54 @@ 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; - ARDOUR::BootMessage.connect (sigc::mem_fun (*this, &Splash::boot_message)); + expose_done = false; + expose_is_the_one = false; + + ARDOUR::BootMessage.connect (msg_connection, invalidator (*this), boost::bind (&Splash::boot_message, this, _1), gui_context()); +} + +Splash::~Splash () +{ + the_splash = 0; } void -Splash::pop_back () +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); +#endif +} + +void +Splash::pop_front () +{ + +#if defined __APPLE__ || defined PLATFORM_WINDOWS + if (get_window()) { + show (); + } +#endif } void @@ -73,10 +145,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 window = get_window(); + + if (!window || ev->window != window->gobj()) { + return false; + } + hide (); return true; } @@ -102,6 +179,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; } @@ -111,20 +196,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 (""); - str += msg; + str += Gtkmm2ext::markup_escape_text (msg); str += ""; + show (); + layout->set_markup (str); Glib::RefPtr 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); +}