diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index f38a484b04..b99fe79135 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -18,7 +18,6 @@ */ #include -#include #include #include @@ -36,6 +35,8 @@ #include "ardour/filesystem_paths.h" #include "ardour/rc_configuration.h" +#include "gtkmm2ext/actions.h" + #include "utils.h" #include "actions.h" #include "i18n.h" @@ -65,8 +66,6 @@ vector > ActionManager::jack_opposite_sensitive_actions; vector > ActionManager::transport_sensitive_actions; vector > ActionManager::edit_point_in_region_sensitive_actions; -RefPtr ActionManager::ui_manager; -string ActionManager::unbound_string = "--"; void ActionManager::init () @@ -99,256 +98,6 @@ ActionManager::init () } } -RefPtr -ActionManager::register_action (RefPtr group, const char * name, const char * label, slot sl) -{ - RefPtr act; - - act = Action::create (name, label); - group->add (act, sl); - - return act; -} - -RefPtr -ActionManager::register_action (RefPtr group, const char * name, const char * label) -{ - RefPtr act; - - act = Action::create (name, label); - group->add (act); - - return act; -} - - -RefPtr -ActionManager::register_radio_action (RefPtr group, RadioAction::Group& rgroup, const char * name, const char * label, slot sl) -{ - RefPtr act; - - act = RadioAction::create (rgroup, name, label); - group->add (act, sl); - - return act; -} - -RefPtr -ActionManager::register_toggle_action (RefPtr group, const char * name, const char * label, slot sl) -{ - RefPtr act; - - act = ToggleAction::create (name, label); - group->add (act, sl); - - return act; -} - -bool -ActionManager::lookup_entry (const ustring accel_path, Gtk::AccelKey& key) -{ - GtkAccelKey gkey; - bool known = gtk_accel_map_lookup_entry (accel_path.c_str(), &gkey); - - if (known) { - key = AccelKey (gkey.accel_key, Gdk::ModifierType (gkey.accel_mods)); - } else { - key = AccelKey (GDK_VoidSymbol, Gdk::ModifierType (0)); - } - - return known; -} - -struct SortActionsByLabel { - bool operator() (Glib::RefPtr a, Glib::RefPtr b) { - ustring astr = a->get_accel_path(); - ustring bstr = b->get_accel_path(); - return astr < bstr; - } -}; - -void -ActionManager::get_all_actions (vector& groups, vector& names, vector& bindings) -{ - /* the C++ API for functions used here appears to be broken in - gtkmm2.6, so we fall back to the C level. - */ - - GList* list = gtk_ui_manager_get_action_groups (ui_manager->gobj()); - GList* node; - GList* acts; - - for (node = list; node; node = g_list_next (node)) { - - GtkActionGroup* group = (GtkActionGroup*) node->data; - - /* first pass: collect them all */ - - typedef std::list > action_list; - action_list the_acts; - - for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) { - GtkAction* action = (GtkAction*) acts->data; - the_acts.push_back (Glib::wrap (action, true)); - } - - /* now sort by label */ - - SortActionsByLabel cmp; - the_acts.sort (cmp); - - for (action_list::iterator a = the_acts.begin(); a != the_acts.end(); ++a) { - - string accel_path = (*a)->get_accel_path (); - - groups.push_back (gtk_action_group_get_name(group)); - names.push_back (accel_path.substr (accel_path.find_last_of ('/') + 1)); - - AccelKey key; - lookup_entry (accel_path, key); - bindings.push_back (AccelKey (key.get_key(), Gdk::ModifierType (key.get_mod()))); - } - } -} - -void -ActionManager::get_all_actions (vector& names, vector& paths, vector& keys, vector& bindings) -{ - /* the C++ API for functions used here appears to be broken in - gtkmm2.6, so we fall back to the C level. - */ - - GList* list = gtk_ui_manager_get_action_groups (ui_manager->gobj()); - GList* node; - GList* acts; - - for (node = list; node; node = g_list_next (node)) { - - GtkActionGroup* group = (GtkActionGroup*) node->data; - - /* first pass: collect them all */ - - typedef std::list > action_list; - action_list the_acts; - - for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) { - GtkAction* action = (GtkAction*) acts->data; - the_acts.push_back (Glib::wrap (action, true)); - } - - /* now sort by label */ - - SortActionsByLabel cmp; - the_acts.sort (cmp); - - for (action_list::iterator a = the_acts.begin(); a != the_acts.end(); ++a) { - - string accel_path = (*a)->get_accel_path (); - ustring label = (*a)->property_label(); - - names.push_back (label); - paths.push_back (accel_path); - - AccelKey key; - keys.push_back (get_key_representation (accel_path, key)); - bindings.push_back (AccelKey (key.get_key(), Gdk::ModifierType (key.get_mod()))); - } - } -} - -void -ActionManager::add_action_group (RefPtr grp) -{ - ui_manager->insert_action_group (grp); -} - -Widget* -ActionManager::get_widget (const char * name) -{ - return ui_manager->get_widget (name); -} - -RefPtr -ActionManager::get_action (const char* path) -{ - GtkAction* _act; - RefPtr act; - - if ((_act = gtk_ui_manager_get_action (ui_manager->gobj(), path)) != 0) { - return Glib::wrap (_act, true); - } - - return act; -} - -RefPtr -ActionManager::get_action (const char* group_name, const char* action_name) -{ - /* the C++ API for functions used here appears to be broken in - gtkmm2.6, so we fall back to the C level. - */ - - GList* list = gtk_ui_manager_get_action_groups (ui_manager->gobj()); - GList* node; - RefPtr act; - - for (node = list; node; node = g_list_next (node)) { - - GtkActionGroup* _ag = (GtkActionGroup*) node->data; - - if (strcmp (group_name, gtk_action_group_get_name (_ag)) == 0) { - - GtkAction* _act; - - if ((_act = gtk_action_group_get_action (_ag, action_name)) != 0) { - act = Glib::wrap (_act, true); - break; - } - } - } - - return act; -} - -void -ActionManager::set_sensitive (vector >& actions, bool state) -{ - for (vector >::iterator i = actions.begin(); i != actions.end(); ++i) { - (*i)->set_sensitive (state); - } -} - -void -ActionManager::uncheck_toggleaction (const char * name) -{ - const char *last_slash = strrchr (name, '/'); - - if (last_slash == 0) { - fatal << string_compose (_("programmer error: %1 %2"), X_("illegal toggle action name"), name) << endmsg; - /*NOTREACHED*/ - return; - } - - /* 10 = strlen ("/") */ - size_t len = last_slash - (name + 10); - - char* group_name = new char[len+1]; - memcpy (group_name, name + 10, len); - group_name[len] = '\0'; - - const char* action_name = last_slash + 1; - - RefPtr act = get_action (group_name, action_name); - if (act) { - RefPtr tact = RefPtr::cast_dynamic(act); - tact->set_active (false); - } else { - error << string_compose (_("Unknown action name: %1"), name) << endmsg; - } - - delete [] group_name; -} - /** Examine the state of a Configuration setting and a toggle action, and toggle the Configuration * setting if its state doesn't match the toggle action. * @param group Action group. diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h index 4557e7f8c4..4394408229 100644 --- a/gtk2_ardour/actions.h +++ b/gtk2_ardour/actions.h @@ -21,95 +21,40 @@ #define __ardour_gtk_actions_h__ #include -#include -#include -#include -#include -#include +#include "gtkmm2ext/actions.h" #include "ardour/rc_configuration.h" -namespace Gtk { - class UIManager; +namespace ActionManager { + + /* Ardour specific */ + + extern void init (); + + extern std::vector > session_sensitive_actions; + extern std::vector > write_sensitive_actions; + extern std::vector > region_list_selection_sensitive_actions; + extern std::vector > plugin_selection_sensitive_actions; + + extern std::vector > region_selection_sensitive_actions; + extern std::vector > track_selection_sensitive_actions; + extern std::vector > point_selection_sensitive_actions; + extern std::vector > time_selection_sensitive_actions; + extern std::vector > line_selection_sensitive_actions; + extern std::vector > playlist_selection_sensitive_actions; + extern std::vector > mouse_edit_point_requires_canvas_actions; + + extern std::vector > range_sensitive_actions; + extern std::vector > transport_sensitive_actions; + extern std::vector > jack_sensitive_actions; + extern std::vector > jack_opposite_sensitive_actions; + extern std::vector > edit_point_in_region_sensitive_actions; + + extern void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const); + extern void map_some_state (const char* group, const char* action, sigc::slot); + extern void toggle_config_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*set)(bool), bool (ARDOUR::RCConfiguration::*get)(void) const); + extern void toggle_config_state_foo (const char* group, const char* action, sigc::slot, sigc::slot); } -class ActionManager -{ - public: - ActionManager() {} - virtual ~ActionManager () {} - - static void init (); - - static std::vector > session_sensitive_actions; - static std::vector > write_sensitive_actions; - static std::vector > region_list_selection_sensitive_actions; - static std::vector > plugin_selection_sensitive_actions; - - static std::vector > region_selection_sensitive_actions; - static std::vector > track_selection_sensitive_actions; - static std::vector > point_selection_sensitive_actions; - static std::vector > time_selection_sensitive_actions; - static std::vector > line_selection_sensitive_actions; - static std::vector > playlist_selection_sensitive_actions; - static std::vector > mouse_edit_point_requires_canvas_actions; - - static std::vector > range_sensitive_actions; - static std::vector > transport_sensitive_actions; - static std::vector > jack_sensitive_actions; - static std::vector > jack_opposite_sensitive_actions; - static std::vector > edit_point_in_region_sensitive_actions; - - static void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const); - static void map_some_state (const char* group, const char* action, sigc::slot); - static void toggle_config_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*set)(bool), bool (ARDOUR::RCConfiguration::*get)(void) const); - static void toggle_config_state_foo (const char* group, const char* action, sigc::slot, sigc::slot); - - static void set_sensitive (std::vector >& actions, bool); - - static std::string get_key_representation (const std::string& accel_path, Gtk::AccelKey& key); - - static std::string unbound_string; /* the key string returned if an action is not bound */ - static Glib::RefPtr ui_manager; - - static Gtk::Widget* get_widget (const char * name); - static Glib::RefPtr get_action (const char* group, const char* name); - static Glib::RefPtr get_action (const char* path); - - static void add_action_group (Glib::RefPtr); - - static Glib::RefPtr register_action (Glib::RefPtr group, - const char * name, const char * label); - static Glib::RefPtr register_action (Glib::RefPtr group, - const char * name, const char * label, sigc::slot sl, - guint key, Gdk::ModifierType mods); - static Glib::RefPtr register_action (Glib::RefPtr group, - const char * name, const char * label, sigc::slot sl); - - static Glib::RefPtr register_radio_action (Glib::RefPtr group, Gtk::RadioAction::Group&, - const char * name, const char * label, sigc::slot sl, - guint key, Gdk::ModifierType mods); - static Glib::RefPtr register_radio_action (Glib::RefPtr group, Gtk::RadioAction::Group&, - const char * name, const char * label, sigc::slot sl); - - static Glib::RefPtr register_toggle_action (Glib::RefPtr group, - const char * name, const char * label, sigc::slot sl, - guint key, Gdk::ModifierType mods); - static Glib::RefPtr register_toggle_action (Glib::RefPtr group, - const char * name, const char * label, sigc::slot sl); - - static bool lookup_entry (const Glib::ustring accel_path, Gtk::AccelKey& key); - - static void get_all_actions (std::vector& names, - std::vector& paths, - std::vector& keys, - std::vector& bindings); - - static void get_all_actions (std::vector& groups, - std::vector& paths, - std::vector& bindings); - - static void uncheck_toggleaction (const char * actionname); -}; #endif /* __ardour_gtk_actions_h__ */ diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 0607a03e54..234f05705d 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -44,13 +44,13 @@ #include "pbd/memento_command.h" #include "pbd/file_utils.h" -#include -#include -#include -#include -#include -#include -#include +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/click_box.h" +#include "gtkmm2ext/fastmeter.h" +#include "gtkmm2ext/stop_signal.h" +#include "gtkmm2ext/popup.h" +#include "gtkmm2ext/window_title.h" #include "midi++/manager.h" diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc new file mode 100644 index 0000000000..1145987764 --- /dev/null +++ b/libs/gtkmm2ext/actions.cc @@ -0,0 +1,296 @@ +/* + Copyright (C) 2005 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 +#include + +#include +#include + +#include "pbd/error.h" + +#include "gtkmm2ext/actions.h" + +#include "i18n.h" + +using namespace std; +using namespace Gtk; +using namespace Glib; +using namespace sigc; +using namespace PBD; + +RefPtr ActionManager::ui_manager; +string ActionManager::unbound_string = "--"; + + +RefPtr +ActionManager::register_action (RefPtr group, const char * name, const char * label, slot sl) +{ + RefPtr act; + + act = Action::create (name, label); + group->add (act, sl); + + return act; +} + +RefPtr +ActionManager::register_action (RefPtr group, const char * name, const char * label) +{ + RefPtr act; + + act = Action::create (name, label); + group->add (act); + + return act; +} + + +RefPtr +ActionManager::register_radio_action (RefPtr group, RadioAction::Group& rgroup, const char * name, const char * label, slot sl) +{ + RefPtr act; + + act = RadioAction::create (rgroup, name, label); + group->add (act, sl); + + return act; +} + +RefPtr +ActionManager::register_toggle_action (RefPtr group, const char * name, const char * label, slot sl) +{ + RefPtr act; + + act = ToggleAction::create (name, label); + group->add (act, sl); + + return act; +} + +bool +ActionManager::lookup_entry (const ustring accel_path, Gtk::AccelKey& key) +{ + GtkAccelKey gkey; + bool known = gtk_accel_map_lookup_entry (accel_path.c_str(), &gkey); + + if (known) { + key = AccelKey (gkey.accel_key, Gdk::ModifierType (gkey.accel_mods)); + } else { + key = AccelKey (GDK_VoidSymbol, Gdk::ModifierType (0)); + } + + return known; +} + +struct SortActionsByLabel { + bool operator() (Glib::RefPtr a, Glib::RefPtr b) { + ustring astr = a->get_accel_path(); + ustring bstr = b->get_accel_path(); + return astr < bstr; + } +}; + +void +ActionManager::get_all_actions (vector& groups, vector& names, vector& bindings) +{ + /* the C++ API for functions used here appears to be broken in + gtkmm2.6, so we fall back to the C level. + */ + + GList* list = gtk_ui_manager_get_action_groups (ui_manager->gobj()); + GList* node; + GList* acts; + + for (node = list; node; node = g_list_next (node)) { + + GtkActionGroup* group = (GtkActionGroup*) node->data; + + /* first pass: collect them all */ + + typedef std::list > action_list; + action_list the_acts; + + for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) { + GtkAction* action = (GtkAction*) acts->data; + the_acts.push_back (Glib::wrap (action, true)); + } + + /* now sort by label */ + + SortActionsByLabel cmp; + the_acts.sort (cmp); + + for (action_list::iterator a = the_acts.begin(); a != the_acts.end(); ++a) { + + string accel_path = (*a)->get_accel_path (); + + groups.push_back (gtk_action_group_get_name(group)); + names.push_back (accel_path.substr (accel_path.find_last_of ('/') + 1)); + + AccelKey key; + lookup_entry (accel_path, key); + bindings.push_back (AccelKey (key.get_key(), Gdk::ModifierType (key.get_mod()))); + } + } +} + +void +ActionManager::get_all_actions (vector& names, vector& paths, vector& keys, vector& bindings) +{ + /* the C++ API for functions used here appears to be broken in + gtkmm2.6, so we fall back to the C level. + */ + + GList* list = gtk_ui_manager_get_action_groups (ui_manager->gobj()); + GList* node; + GList* acts; + + for (node = list; node; node = g_list_next (node)) { + + GtkActionGroup* group = (GtkActionGroup*) node->data; + + /* first pass: collect them all */ + + typedef std::list > action_list; + action_list the_acts; + + for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) { + GtkAction* action = (GtkAction*) acts->data; + the_acts.push_back (Glib::wrap (action, true)); + } + + /* now sort by label */ + + SortActionsByLabel cmp; + the_acts.sort (cmp); + + for (action_list::iterator a = the_acts.begin(); a != the_acts.end(); ++a) { + + string accel_path = (*a)->get_accel_path (); + ustring label = (*a)->property_label(); + + names.push_back (label); + paths.push_back (accel_path); + + AccelKey key; + keys.push_back (get_key_representation (accel_path, key)); + bindings.push_back (AccelKey (key.get_key(), Gdk::ModifierType (key.get_mod()))); + } + } +} + +void +ActionManager::add_action_group (RefPtr grp) +{ + ui_manager->insert_action_group (grp); +} + +Widget* +ActionManager::get_widget (const char * name) +{ + return ui_manager->get_widget (name); +} + +RefPtr +ActionManager::get_action (const char* path) +{ + GtkAction* _act; + RefPtr act; + + if ((_act = gtk_ui_manager_get_action (ui_manager->gobj(), path)) != 0) { + return Glib::wrap (_act, true); + } + + return act; +} + +RefPtr +ActionManager::get_action (const char* group_name, const char* action_name) +{ + /* the C++ API for functions used here appears to be broken in + gtkmm2.6, so we fall back to the C level. + */ + + GList* list = gtk_ui_manager_get_action_groups (ui_manager->gobj()); + GList* node; + RefPtr act; + + for (node = list; node; node = g_list_next (node)) { + + GtkActionGroup* _ag = (GtkActionGroup*) node->data; + + if (strcmp (group_name, gtk_action_group_get_name (_ag)) == 0) { + + GtkAction* _act; + + if ((_act = gtk_action_group_get_action (_ag, action_name)) != 0) { + act = Glib::wrap (_act, true); + break; + } + } + } + + return act; +} + +void +ActionManager::set_sensitive (vector >& actions, bool state) +{ + for (vector >::iterator i = actions.begin(); i != actions.end(); ++i) { + (*i)->set_sensitive (state); + } +} + +void +ActionManager::uncheck_toggleaction (const char * name) +{ + const char *last_slash = strrchr (name, '/'); + + if (last_slash == 0) { + fatal << string_compose ("programmer error: %1 %2", "illegal toggle action name", name) << endmsg; + /*NOTREACHED*/ + return; + } + + /* 10 = strlen ("/") */ + size_t len = last_slash - (name + 10); + + char* group_name = new char[len+1]; + memcpy (group_name, name + 10, len); + group_name[len] = '\0'; + + const char* action_name = last_slash + 1; + + RefPtr act = get_action (group_name, action_name); + if (act) { + RefPtr tact = RefPtr::cast_dynamic(act); + tact->set_active (false); + } else { + error << string_compose (_("Unknown action name: %1"), name) << endmsg; + } + + delete [] group_name; +} diff --git a/libs/gtkmm2ext/gtkmm2ext/actions.h b/libs/gtkmm2ext/gtkmm2ext/actions.h new file mode 100644 index 0000000000..3c3825944f --- /dev/null +++ b/libs/gtkmm2ext/gtkmm2ext/actions.h @@ -0,0 +1,82 @@ +/* + Copyright (C) 2000-2007 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. + +*/ + +#ifndef __libgtkmm2ext_actions_h__ +#define __libgtkmm2ext_actions_h__ + +#include +#include +#include +#include +#include +#include + +namespace Gtk { + class UIManager; +} + +namespace ActionManager { + + extern std::string unbound_string; /* the key string returned if an action is not bound */ + extern Glib::RefPtr ui_manager; + + extern void set_sensitive (std::vector >& actions, bool); + extern std::string get_key_representation (const std::string& accel_path, Gtk::AccelKey& key); + + extern Gtk::Widget* get_widget (const char * name); + extern Glib::RefPtr get_action (const char* group, const char* name); + extern Glib::RefPtr get_action (const char* path); + + extern void add_action_group (Glib::RefPtr); + + extern Glib::RefPtr register_action (Glib::RefPtr group, + const char * name, const char * label); + extern Glib::RefPtr register_action (Glib::RefPtr group, + const char * name, const char * label, sigc::slot sl, + guint key, Gdk::ModifierType mods); + extern Glib::RefPtr register_action (Glib::RefPtr group, + const char * name, const char * label, sigc::slot sl); + + extern Glib::RefPtr register_radio_action (Glib::RefPtr group, Gtk::RadioAction::Group&, + const char * name, const char * label, sigc::slot sl, + guint key, Gdk::ModifierType mods); + extern Glib::RefPtr register_radio_action (Glib::RefPtr group, Gtk::RadioAction::Group&, + const char * name, const char * label, sigc::slot sl); + + extern Glib::RefPtr register_toggle_action (Glib::RefPtr group, + const char * name, const char * label, sigc::slot sl, + guint key, Gdk::ModifierType mods); + extern Glib::RefPtr register_toggle_action (Glib::RefPtr group, + const char * name, const char * label, sigc::slot sl); + + extern bool lookup_entry (const Glib::ustring accel_path, Gtk::AccelKey& key); + + extern void get_all_actions (std::vector& names, + std::vector& paths, + std::vector& keys, + std::vector& bindings); + + extern void get_all_actions (std::vector& groups, + std::vector& paths, + std::vector& bindings); + + extern void uncheck_toggleaction (const char * actionname); +}; + +#endif /* __libgtkmm2ext_actions_h__ */ diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 5ca8d5344d..8e348602cb 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -19,6 +19,7 @@ APPNAME = 'gtkmm2ext' VERSION = GTKMM2EXT_VERSION gtkmm2ext_sources = [ + 'actions.cc', 'auto_spin.cc', 'barcontroller.cc', 'binding_proxy.cc', diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc index af57871da9..9c60e5c4ce 100644 --- a/libs/pbd/pool.cc +++ b/libs/pbd/pool.cc @@ -148,7 +148,6 @@ SingleAllocMultiReleasePool::release (void* ptr) static void free_per_thread_pool (void* ptr) { - cerr << "Deleting a per thread pool @ " << ptr << endl; Pool* pptr = static_cast(ptr); delete pptr; }