X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsplash.cc;h=756749c6e617729709a3b182c391a96c19915d67;hb=2dc3c8b3650266eba09cf7fe53c39c6728d4d5b6;hp=893ecc3d2c7cfa29dcd1df78b558db68dc8ab183;hpb=8aa9508c82f32efcf9c7c00e2c9e76268d4dddce;p=ardour.git diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc index 893ecc3d2c..756749c6e6 100644 --- a/gtk2_ardour/splash.cc +++ b/gtk2_ardour/splash.cc @@ -1,17 +1,45 @@ +/* + 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 -#include -#include -#include +#include "pbd/failed_constructor.h" +#include "pbd/file_utils.h" +#include "pbd/stacktrace.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; +using namespace PBD; using namespace std; using namespace ARDOUR; @@ -19,49 +47,105 @@ Splash* Splash::the_splash = 0; Splash::Splash () { - sys::path splash_file; + assert (the_splash == 0); + + std::string splash_file; + + Searchpath rc (ARDOUR::ardour_data_search_path()); + rc.add_subdirectory_to_paths ("resources"); - if (!find_file_in_search_path (ardour_search_path(), "splash.png", splash_file)) { + 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 += ""; layout->set_markup (str); darea.show (); - darea.signal_expose_event().connect (mem_fun (*this, &Splash::expose)); + darea.signal_expose_event().connect (sigc::mem_fun (*this, &Splash::expose)); 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 (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 () +{ + idle_connection.disconnect (); + expose_done = true; + hide (); + 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 (get_window()) { +#if defined __APPLE__ || defined PLATFORM_WINDOWS + show (); +#else + gdk_window_restack(get_window()->gobj(), NULL, true); +#endif + } +} + +void +Splash::hide () +{ + Gtk::Window::hide(); } void @@ -72,10 +156,15 @@ Splash::on_realize () layout->set_font_description (get_style()->get_font()); } - bool Splash::on_button_release_event (GdkEventButton* ev) { + RefPtr window = get_window(); + + if (!window || ev->window != window->gobj()) { + return false; + } + hide (); return true; } @@ -92,15 +181,24 @@ Splash::expose (GdkEventExpose* ev) window->draw_pixbuf (get_style()->get_bg_gc (STATE_NORMAL), pixbuf, ev->area.x, ev->area.y, ev->area.x, ev->area.y, - min ((pixbuf->get_width() - ev->area.x), ev->area.width), + 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 style = darea.get_style(); Glib::RefPtr white = style->get_white_gc(); window->draw_layout (white, 10, pixbuf->get_height() - 30, layout); + /* this must execute AFTER the GDK idle update mechanism + */ + + if (expose_is_the_one) { + idle_connection = Glib::signal_idle().connect ( + sigc::mem_fun (this, &Splash::idle_after_expose), + GDK_PRIORITY_REDRAW+2); + } + return true; } @@ -110,19 +208,61 @@ 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_events_pending()) { + 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); - darea.queue_draw (); - Glib::RefPtr win = darea.get_window(); + if (win) { - win->process_updates (true); - gdk_flush (); + if (win->is_visible ()) { + win->invalidate_rect (Gdk::Rectangle (0, darea.get_height() - 30, darea.get_width(), 30), true); + } else { + darea.queue_draw (); + } + if (expose_done) { + ARDOUR::GUIIdle (); + } } } + +bool +Splash::on_map_event (GdkEventAny* ev) +{ + expose_is_the_one = true; + return Window::on_map_event (ev); +}