X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fbindings.cc;h=cf98bbca4dd6b2080411497d00b6a32436951bef;hb=dd4c788d3e21b4f697f7eb6f2e64bc0d94ebf7fb;hp=1d63cc097237875ad982ac71d0755c67af5da7e8;hpb=727613b4b744658b6a32916a82af2717cd54c11d;p=ardour.git diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index 1d63cc0972..cf98bbca4d 100644 --- a/libs/gtkmm2ext/bindings.cc +++ b/libs/gtkmm2ext/bindings.cc @@ -177,16 +177,6 @@ KeyboardKey::display_label () const uint32_t mod = state(); -#ifdef __APPLE__ - /* We use both bits (MOD2|META) for Primary on OS X, - * but we don't want MOD2 showing up in listings. - */ - - if (mod & GDK_MOD2_MASK) { - mod &= ~GDK_MOD2_MASK; - } -#endif - return gtk_accelerator_get_label (key(), (GdkModifierType) mod); } @@ -599,16 +589,6 @@ Bindings::push_to_gtk (KeyboardKey kb, RefPtr what) int mod = kb.state(); -#ifdef __APPLE__ - /* See comments in Keyboard::Keyboard about GTK handling of MOD2, META and the Command key. - * - * If we do not do this, GTK+ won't show the correct text for shortcuts in menus. - */ - - if (mod & GDK_MOD2_MASK) { - mod = mod | GDK_META_MASK; - } -#endif Gtk::AccelMap::add_entry (what->get_accel_path(), kb.key(), (Gdk::ModifierType) mod); } @@ -647,6 +627,9 @@ Bindings::add (KeyboardKey kb, Operation op, string const& action_name, XMLPrope (void) kbm.insert (new_pair).first; } + DEBUG_TRACE (DEBUG::Bindings, string_compose ("add binding between %1 and %2, group [%3]\n", + kb, action_name, (group ? group->value() : string()))); + if (can_save) { Keyboard::keybindings_changed (); } @@ -747,16 +730,16 @@ Bindings::save (XMLNode& root) } child = new XMLNode (X_("Binding")); - child->add_property (X_("key"), k->first.name()); - child->add_property (X_("action"), k->second.action_name); + child->set_property (X_("key"), k->first.name()); + child->set_property (X_("action"), k->second.action_name); presses->add_child_nocopy (*child); } for (MouseButtonBindingMap::iterator k = button_press_bindings.begin(); k != button_press_bindings.end(); ++k) { XMLNode* child; child = new XMLNode (X_("Binding")); - child->add_property (X_("button"), k->first.name()); - child->add_property (X_("action"), k->second.action_name); + child->set_property (X_("button"), k->first.name()); + child->set_property (X_("action"), k->second.action_name); presses->add_child_nocopy (*child); } @@ -770,16 +753,16 @@ Bindings::save (XMLNode& root) } child = new XMLNode (X_("Binding")); - child->add_property (X_("key"), k->first.name()); - child->add_property (X_("action"), k->second.action_name); + child->set_property (X_("key"), k->first.name()); + child->set_property (X_("action"), k->second.action_name); releases->add_child_nocopy (*child); } for (MouseButtonBindingMap::iterator k = button_release_bindings.begin(); k != button_release_bindings.end(); ++k) { XMLNode* child; child = new XMLNode (X_("Binding")); - child->add_property (X_("button"), k->first.name()); - child->add_property (X_("action"), k->second.action_name); + child->set_property (X_("button"), k->first.name()); + child->set_property (X_("action"), k->second.action_name); releases->add_child_nocopy (*child); } @@ -798,61 +781,97 @@ Bindings::save_all_bindings_as_html (ostream& ostr) ostr << "\n\n"; ostr << PROGRAM_NAME; ostr << "\n"; - - - ostr << "\n"; + ostr << "\n"; ostr << "\n\n"; - ostr << "
\n"; + ostr << "\n\n"; + ostr << "\n\n"; + /* first column: separate by group */ + ostr << "\n\n"; + + //second column + ostr << "\n\n"; + + + ostr << "\n\n"; + ostr << "
\n\n"; for (list::const_iterator b = bindings.begin(); b != bindings.end(); ++b) { - (*b)->save_as_html (ostr); + (*b)->save_as_html (ostr, true); } + ostr << "\n\n"; + for (list::const_iterator b = bindings.begin(); b != bindings.end(); ++b) { + (*b)->save_as_html (ostr, false); + } + ostr << "
\n\n"; + + ostr << "

\n\n"; + ostr << "\n\n"; + ostr << "\n\n"; + ostr << "\n\n"; + ostr << "\n\n"; + ostr << "
\n\n"; + ostr << "

Partial List of Available Actions { => with current shortcut, where applicable }

\n\n"; + { + vector paths; + vector labels; + vector tooltips; + vector keys; + vector > actions; + + Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions); + + vector::iterator k; + vector::iterator p; + vector::iterator l; + + for (p = paths.begin(), k = keys.begin(), l = labels.begin(); p != paths.end(); ++k, ++p, ++l) { + + string print_path = *p; + /* strip / from the start */ + print_path = print_path.substr (10); + + if ((*k).empty()) { + ostr << print_path << " ( " << *l << " ) " << "
" << endl; + } else { + ostr << print_path << " ( " << *l << " ) " << " => " << *k << "
" << endl; + } + } + } + ostr << "
\n\n"; - ostr << "
\n"; ostr << "\n"; ostr << "\n"; } void -Bindings::save_as_html (ostream& ostr) const +Bindings::save_as_html (ostream& ostr, bool categorize) const { if (!press_bindings.empty()) { - ostr << "
\n"; - ostr << "

"; - ostr << name(); - ostr << "

\n\n"; - - /* first pass: separate by group */ + ostr << "

"; + if (categorize) + ostr << _("Window") << ": " << name() << _(" (Categorized)"); + else + ostr << _("Window") << ": " << name() << _(" (Alphabetical)"); + ostr << "

\n\n"; typedef std::map > GroupMap; GroupMap group_map; for (KeybindingMap::const_iterator k = press_bindings.begin(); k != press_bindings.end(); ++k) { + if (k->first.name().empty()) { continue; } string group_name; - if (!k->second.group_name.empty()) { + if (categorize && !k->second.group_name.empty()) { group_name = k->second.group_name; } else { - group_name = X_("nogroup"); + group_name = _("Uncategorized"); } GroupMap::iterator gm = group_map.find (group_name); @@ -865,10 +884,12 @@ Bindings::save_as_html (ostream& ostr) const } } + for (GroupMap::const_iterator gm = group_map.begin(); gm != group_map.end(); ++gm) { - ostr << "
\n"; - ostr << "
" << gm->first << "
\n"; + if (categorize) { + ostr << "

" << gm->first << "

\n"; + } for (vector::const_iterator k = gm->second.begin(); k != gm->second.end(); ++k) { @@ -892,6 +913,7 @@ Bindings::save_as_html (ostream& ostr) const string key_name = (*k)->first.native_short_name (); replace_all (key_name, X_("KP_"), X_("Numpad ")); + replace_all (key_name, X_("nabla"), X_("Tab")); string::size_type pos; @@ -918,13 +940,19 @@ Bindings::save_as_html (ostream& ostr) const } } - ostr << "
" << key_name << "
"; - ostr << "
" << action->get_label() << "
\n"; + key_name.append(" "); + + while (key_name.length()<28) + key_name.append("-"); + + ostr << "" << key_name; + ostr << "" << action->get_label() << "
\n"; } - ostr << "
\n\n"; + ostr << "\n\n"; + } - ostr << "
\n"; + ostr << "\n"; } } @@ -1064,6 +1092,17 @@ Bindings::is_bound (KeyboardKey const& kb, Operation op) const return km.find(kb) != km.end(); } +std::string +Bindings::bound_name (KeyboardKey const& kb, Operation op) const +{ + const KeybindingMap& km = get_keymap(op); + KeybindingMap::const_iterator b = km.find(kb); + if (b == km.end()) { + return ""; + } + return b->second.action_name; +} + bool Bindings::is_registered (Operation op, std::string const& action_name) const { @@ -1135,6 +1174,7 @@ ActionMap::get_actions (ActionMap::Actions& acts) } } + RefPtr ActionMap::find_action (const string& name) { @@ -1144,12 +1184,86 @@ ActionMap::find_action (const string& name) return a->second; } + cerr << "Failed to find action: [" << name << ']' << endl; + return RefPtr(); +} + +RefPtr +ActionMap::find_toggle_action (const string& name) +{ + RefPtr act = find_action (name); + + if (!act) { + return RefPtr(); + } + + return Glib::RefPtr::cast_dynamic (act); +} + +RefPtr +ActionMap::find_radio_action (const string& name) +{ + RefPtr act = find_action (name); + + if (!act) { + return RefPtr(); + } + + return Glib::RefPtr::cast_dynamic (act); +} + +RefPtr +ActionMap::find_action (char const * group_name, char const * action_name) +{ + string fullpath (group_name); + fullpath += '/'; + fullpath += action_name; + + _ActionMap::iterator a = _actions.find (fullpath); + + if (a != _actions.end()) { + return a->second; + } + + cerr << "Failed to find action (2): [" << fullpath << ']' << endl; return RefPtr(); } +RefPtr +ActionMap::find_toggle_action (char const * group_name, char const * action_name) +{ + RefPtr act = find_action (group_name, action_name); + + if (!act) { + return RefPtr(); + } + + return Glib::RefPtr::cast_dynamic (act); +} + +RefPtr +ActionMap::find_radio_action (char const * group_name, char const * action_name) +{ + RefPtr act = find_action (group_name, action_name); + + if (!act) { + return RefPtr(); + } + + return Glib::RefPtr::cast_dynamic (act); +} + + RefPtr ActionMap::create_action_group (const string& name) { + Glib::ListHandle > agl = ActionManager::ui_manager->get_action_groups (); + for (Glib::ListHandle >::iterator i = agl.begin (); i != agl.end (); ++i) { + if ((*i)->get_name () == name) { + return *i; + } + } + RefPtr g = ActionGroup::create (name); /* this is one of the places where our own Action management code @@ -1323,5 +1437,6 @@ ActionMap::get_all_actions (std::vector& paths, std::ostream& operator<<(std::ostream& out, Gtkmm2ext::KeyboardKey const & k) { char const *gdk_name = gdk_keyval_name (k.key()); - return out << "Key " << k.key() << " (" << (gdk_name ? gdk_name : "no-key") << ") state " << hex << k.state() << dec; + return out << "Key " << k.key() << " (" << (gdk_name ? gdk_name : "no-key") << ") state " + << hex << k.state() << dec << ' ' << show_gdk_event_state (k.state()); }