#include <gtkmm2ext/popup.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/window_title.h>
+#include <gtkmm2ext/actions.h>
#include "i18n.h"
using namespace PBD;
using std::map;
-pthread_t UI::gui_thread;
UI *UI::theGtkUI = 0;
BaseUI::RequestType Gtkmm2ext::ErrorMessage = BaseUI::new_request_type();
-BaseUI::RequestType Gtkmm2ext::Quit = BaseUI::new_request_type();
BaseUI::RequestType Gtkmm2ext::TouchDisplay = BaseUI::new_request_type();
BaseUI::RequestType Gtkmm2ext::StateChange = BaseUI::new_request_type();
BaseUI::RequestType Gtkmm2ext::SetTip = BaseUI::new_request_type();
BaseUI::RequestType Gtkmm2ext::AddIdle = BaseUI::new_request_type();
BaseUI::RequestType Gtkmm2ext::AddTimeout = BaseUI::new_request_type();
-#include <pbd/abstract_ui.cc> /* instantiate the template */
-
+#include "pbd/abstract_ui.cc" /* instantiate the template */
UI::UI (string namestr, int *argc, char ***argv)
- : AbstractUI<UIRequest> (namestr, true)
+ : AbstractUI<UIRequest> (namestr)
{
theMain = new Main (argc, argv);
#ifndef GTK_NEW_TOOLTIP_API
if (!theGtkUI) {
theGtkUI = this;
- gui_thread = pthread_self ();
} else {
fatal << "duplicate UI requested" << endmsg;
/* NOTREACHED */
}
- /* add the pipe to the select/poll loop that GDK does */
+ /* the GUI event loop runs in the main thread of the app,
+ which is assumed to have called this.
+ */
+
+ run_loop_thread = Thread::self();
+
+ /* store "this" as the UI-for-thread of this thread, same argument
+ as for previous line.
+ */
+
+ set_event_loop_for_thread (this);
+
+ /* attach our request source to the default main context */
- gdk_input_add (signal_pipe[0],
- GDK_INPUT_READ,
- UI::signal_pipe_callback,
- this);
+ request_channel.ios()->attach (MainContext::get_default());
- errors = new TextViewer (850,100);
+ errors = new TextViewer (800,600);
errors->text().set_editable (false);
errors->text().set_name ("ErrorText");
errors->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
errors->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
- register_thread (pthread_self(), X_("GUI"));
-
//load_rcfile (rcfile);
}
bool
UI::caller_is_ui_thread ()
{
- return pthread_equal (gui_thread, pthread_self());
+ return Thread::self() == run_loop_thread;
}
int
UI::load_rcfile (string path, bool themechange)
{
+ /* Yes, pointers to Glib::RefPtr. If these are not kept around,
+ * a segfault somewhere deep in the wonderfully robust glib will result.
+ * This does not occur if wiget.get_style is used instead of rc.get_style below,
+ * except that doesn't actually work...
+ */
+
+ static Glib::RefPtr<Style>* fatal_style = 0;
+ static Glib::RefPtr<Style>* error_style = 0;
+ static Glib::RefPtr<Style>* warning_style = 0;
+ static Glib::RefPtr<Style>* info_style = 0;
+
if (path.length() == 0) {
return -1;
}
}
RC rc (path.c_str());
- // RC::reset_styles (Gtk::Settings::get_default());
+ //RC::reset_styles (Gtk::Settings::get_default());
gtk_rc_reset_styles (gtk_settings_get_default());
theme_changed.emit();
/* have to pack widgets into a toplevel window so that styles will stick */
Window temp_window (WINDOW_TOPLEVEL);
+ temp_window.ensure_style ();
+
HBox box;
- Label a_widget1;
- Label a_widget2;
- Label a_widget3;
- Label a_widget4;
+ Label fatal_widget;
+ Label error_widget;
+ Label warning_widget;
+ Label info_widget;
RefPtr<Gtk::Style> style;
RefPtr<TextBuffer> buffer (errors->text().get_buffer());
- box.pack_start (a_widget1);
- box.pack_start (a_widget2);
- box.pack_start (a_widget3);
- box.pack_start (a_widget4);
+ box.pack_start (fatal_widget);
+ box.pack_start (error_widget);
+ box.pack_start (warning_widget);
+ box.pack_start (info_widget);
error_ptag = buffer->create_tag();
error_mtag = buffer->create_tag();
info_ptag = buffer->create_tag();
info_mtag = buffer->create_tag();
- a_widget1.set_name ("FatalMessage");
- a_widget1.ensure_style ();
- style = a_widget1.get_style();
-
- fatal_ptag->property_font_desc().set_value(style->get_font());
- fatal_ptag->property_foreground_gdk().set_value(style->get_fg(STATE_ACTIVE));
- fatal_ptag->property_background_gdk().set_value(style->get_bg(STATE_ACTIVE));
- fatal_mtag->property_font_desc().set_value(style->get_font());
- fatal_mtag->property_foreground_gdk().set_value(style->get_fg(STATE_NORMAL));
- fatal_mtag->property_background_gdk().set_value(style->get_bg(STATE_NORMAL));
-
- a_widget2.set_name ("ErrorMessage");
- a_widget2.ensure_style ();
- style = a_widget2.get_style();
-
- error_ptag->property_font_desc().set_value(style->get_font());
- error_ptag->property_foreground_gdk().set_value(style->get_fg(STATE_ACTIVE));
- error_ptag->property_background_gdk().set_value(style->get_bg(STATE_ACTIVE));
- error_mtag->property_font_desc().set_value(style->get_font());
- error_mtag->property_foreground_gdk().set_value(style->get_fg(STATE_NORMAL));
- error_mtag->property_background_gdk().set_value(style->get_bg(STATE_NORMAL));
-
- a_widget3.set_name ("WarningMessage");
- a_widget3.ensure_style ();
- style = a_widget3.get_style();
-
- warning_ptag->property_font_desc().set_value(style->get_font());
- warning_ptag->property_foreground_gdk().set_value(style->get_fg(STATE_ACTIVE));
- warning_ptag->property_background_gdk().set_value(style->get_bg(STATE_ACTIVE));
- warning_mtag->property_font_desc().set_value(style->get_font());
- warning_mtag->property_foreground_gdk().set_value(style->get_fg(STATE_NORMAL));
- warning_mtag->property_background_gdk().set_value(style->get_bg(STATE_NORMAL));
-
- a_widget4.set_name ("InfoMessage");
- a_widget4.ensure_style ();
- style = a_widget4.get_style();
-
- info_ptag->property_font_desc().set_value(style->get_font());
- info_ptag->property_foreground_gdk().set_value(style->get_fg(STATE_ACTIVE));
- info_ptag->property_background_gdk().set_value(style->get_bg(STATE_ACTIVE));
- info_mtag->property_font_desc().set_value(style->get_font());
- info_mtag->property_foreground_gdk().set_value(style->get_fg(STATE_NORMAL));
- info_mtag->property_background_gdk().set_value(style->get_bg(STATE_NORMAL));
+ fatal_widget.set_name ("FatalMessage");
+ delete fatal_style;
+ fatal_style = new Glib::RefPtr<Style>(rc.get_style(fatal_widget));
+
+ fatal_ptag->property_font_desc().set_value((*fatal_style)->get_font());
+ fatal_ptag->property_foreground_gdk().set_value((*fatal_style)->get_fg(STATE_ACTIVE));
+ fatal_ptag->property_background_gdk().set_value((*fatal_style)->get_bg(STATE_ACTIVE));
+ fatal_mtag->property_font_desc().set_value((*fatal_style)->get_font());
+ fatal_mtag->property_foreground_gdk().set_value((*fatal_style)->get_fg(STATE_NORMAL));
+ fatal_mtag->property_background_gdk().set_value((*fatal_style)->get_bg(STATE_NORMAL));
+
+ error_widget.set_name ("ErrorMessage");
+ delete error_style;
+ error_style = new Glib::RefPtr<Style>(rc.get_style(error_widget));
+
+ error_ptag->property_font_desc().set_value((*error_style)->get_font());
+ error_ptag->property_foreground_gdk().set_value((*error_style)->get_fg(STATE_ACTIVE));
+ error_ptag->property_background_gdk().set_value((*error_style)->get_bg(STATE_ACTIVE));
+ error_mtag->property_font_desc().set_value((*error_style)->get_font());
+ error_mtag->property_foreground_gdk().set_value((*error_style)->get_fg(STATE_NORMAL));
+ error_mtag->property_background_gdk().set_value((*error_style)->get_bg(STATE_NORMAL));
+
+ warning_widget.set_name ("WarningMessage");
+ delete warning_style;
+ warning_style = new Glib::RefPtr<Style>(rc.get_style(warning_widget));
+
+ warning_ptag->property_font_desc().set_value((*warning_style)->get_font());
+ warning_ptag->property_foreground_gdk().set_value((*warning_style)->get_fg(STATE_ACTIVE));
+ warning_ptag->property_background_gdk().set_value((*warning_style)->get_bg(STATE_ACTIVE));
+ warning_mtag->property_font_desc().set_value((*warning_style)->get_font());
+ warning_mtag->property_foreground_gdk().set_value((*warning_style)->get_fg(STATE_NORMAL));
+ warning_mtag->property_background_gdk().set_value((*warning_style)->get_bg(STATE_NORMAL));
+
+ info_widget.set_name ("InfoMessage");
+ delete info_style;
+ info_style = new Glib::RefPtr<Style>(rc.get_style(info_widget));
+
+ info_ptag->property_font_desc().set_value((*info_style)->get_font());
+ info_ptag->property_foreground_gdk().set_value((*info_style)->get_fg(STATE_ACTIVE));
+ info_ptag->property_background_gdk().set_value((*info_style)->get_bg(STATE_ACTIVE));
+ info_mtag->property_font_desc().set_value((*info_style)->get_font());
+ info_mtag->property_foreground_gdk().set_value((*info_style)->get_fg(STATE_NORMAL));
+ info_mtag->property_background_gdk().set_value((*info_style)->get_bg(STATE_NORMAL));
return 0;
}
return _active;
}
-void
-UI::kill ()
-{
- if (_active) {
- pthread_kill (gui_thread, SIGKILL);
- }
-}
-
void
UI::quit ()
{
send_request (req);
}
+void
+UI::set_tip (Widget &w, const gchar *tip)
+{
+ set_tip(&w, tip, "");
+}
+
+void
+UI::set_tip (Widget &w, const std::string& tip)
+{
+ set_tip(&w, tip.c_str(), "");
+}
+
void
UI::set_tip (Widget *w, const gchar *tip, const gchar *hlp)
{
UIRequest *req = get_request (SetTip);
+ std::string msg(tip);
+
+ Glib::RefPtr<Gtk::Action> action = w->get_action();
+ if (action) {
+ Gtk::AccelKey key;
+ bool has_key = ActionManager::lookup_entry(action->get_accel_path(), key);
+ if (has_key && key.get_abbrev() != "") {
+ msg.append("\n\n Key: ").append(key.get_abbrev());
+ }
+ }
+
if (req == 0) {
return;
}
req->widget = w;
- req->msg = tip;
+ req->msg = msg.c_str();
req->msg2 = hlp;
send_request (req);
/* END abstract_ui interfaces */
-void
-UI::signal_pipe_callback (void *arg, int fd, GdkInputCondition /*cond*/)
+/** Create a PBD::EventLoop::InvalidationRecord and attach a callback
+ * to a given sigc::trackable so that PBD::EventLoop::invalidate_request
+ * is called when that trackable is destroyed.
+ */
+PBD::EventLoop::InvalidationRecord*
+__invalidator (sigc::trackable& trackable, const char* file, int line)
{
- char buf[256];
+ PBD::EventLoop::InvalidationRecord* ir = new PBD::EventLoop::InvalidationRecord;
- /* flush (nonblocking) pipe */
+ ir->file = file;
+ ir->line = line;
- while (read (fd, buf, 256) > 0) {}
+ trackable.add_destroy_notify_callback (ir, PBD::EventLoop::invalidate_request);
- ((UI *) arg)->handle_ui_requests ();
+ return ir;
}
void
do_quit ();
} else if (req->type == CallSlot) {
-
- req->slot ();
+#ifndef NDEBUG
+ if (getenv ("DEBUG_THREADED_SIGNALS")) {
+ cerr << "call slot for " << name() << endl;
+ }
+#endif
+ req->the_slot ();
} else if (req->type == TouchDisplay) {
display_message (prefix, prefix_len, ptag, mtag, str);
- if (!errors->is_visible()) {
+ if (!errors->is_visible() && chn != Transmitter::Info) {
toggle_errors();
}
}
win.set_default_size (400, 100);
- string title;
- title = name();
+ WindowTitle title(Glib::get_application_name());
title += ": Fatal Error";
- win.set_title (title);
+ win.set_title (title.get_string());
win.set_position (WIN_POS_MOUSE);
win.set_border_width (12);
}
void
-UI::popup_error (const char *text)
+UI::popup_error (const string& text)
{
PopUp *pup;
projects / ardour.git / blobdiff