X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fbindings.cc;h=291cd6068693a128ea5cb600fb6a62685111109c;hb=8dcc28c9ad91baade9c30a2ec6d59a1f799dc654;hp=d06a3a28c1ed3d97ba6ca55f9e2456a6a66cd82b;hpb=1550f3af353e8d0924703763cbd1d59b2166726f;p=ardour.git diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index d06a3a28c1..291cd60686 100644 --- a/libs/gtkmm2ext/bindings.cc +++ b/libs/gtkmm2ext/bindings.cc @@ -26,6 +26,7 @@ #include "pbd/convert.h" #include "pbd/debug.h" #include "pbd/error.h" +#include "pbd/replace_all.h" #include "pbd/xml++.h" #include "gtkmm2ext/actions.h" @@ -34,7 +35,7 @@ #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Glib; @@ -176,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); } @@ -234,6 +225,96 @@ KeyboardKey::name () const return str; } +string +KeyboardKey::native_name () const +{ + int s = state(); + + string str; + + if (s & Keyboard::PrimaryModifier) { + str += Keyboard::primary_modifier_name (); + } + if (s & Keyboard::SecondaryModifier) { + if (!str.empty()) { + str += '-'; + } + str += Keyboard::secondary_modifier_name (); + } + if (s & Keyboard::TertiaryModifier) { + if (!str.empty()) { + str += '-'; + } + str += Keyboard::tertiary_modifier_name (); + } + if (s & Keyboard::Level4Modifier) { + if (!str.empty()) { + str += '-'; + } + str += Keyboard::level4_modifier_name (); + } + + if (!str.empty()) { + str += '-'; + } + + char const *gdk_name = gdk_keyval_name (key()); + + if (gdk_name) { + str += gdk_name; + } else { + /* fail! */ + return string(); + } + + return str; +} + +string +KeyboardKey::native_short_name () const +{ + int s = state(); + + string str; + + if (s & Keyboard::PrimaryModifier) { + str += Keyboard::primary_modifier_short_name (); + } + if (s & Keyboard::SecondaryModifier) { + if (!str.empty()) { + str += '-'; + } + str += Keyboard::secondary_modifier_short_name (); + } + if (s & Keyboard::TertiaryModifier) { + if (!str.empty()) { + str += '-'; + } + str += Keyboard::tertiary_modifier_short_name (); + } + if (s & Keyboard::Level4Modifier) { + if (!str.empty()) { + str += '-'; + } + str += Keyboard::level4_modifier_short_name (); + } + + if (!str.empty()) { + str += '-'; + } + + char const *gdk_name = gdk_keyval_name (key()); + + if (gdk_name) { + str += gdk_name; + } else { + /* fail! */ + return string(); + } + + return str; +} + bool KeyboardKey::make_key (const string& str, KeyboardKey& k) { @@ -506,7 +587,10 @@ Bindings::push_to_gtk (KeyboardKey kb, RefPtr what) * happens. */ - Gtk::AccelMap::add_entry (what->get_accel_path(), kb.key(), (Gdk::ModifierType) kb.state()); + + int mod = kb.state(); + + Gtk::AccelMap::add_entry (what->get_accel_path(), kb.key(), (Gdk::ModifierType) mod); } } @@ -518,23 +602,33 @@ Bindings::replace (KeyboardKey kb, Operation op, string const & action_name, boo } if (is_registered(op, action_name)) { - remove(op, action_name, can_save); + remove (op, action_name, can_save); } - add (kb, op, action_name, can_save); + + /* XXX need a way to get the old group name */ + add (kb, op, action_name, 0, can_save); + return true; } bool -Bindings::add (KeyboardKey kb, Operation op, string const& action_name, bool can_save) +Bindings::add (KeyboardKey kb, Operation op, string const& action_name, XMLProperty const* group, bool can_save) { if (is_registered (op, action_name)) { return false; } KeybindingMap& kbm = get_keymap (op); + if (group) { + KeybindingMap::value_type new_pair = make_pair (kb, ActionInfo (action_name, group->value())); + (void) kbm.insert (new_pair).first; + } else { + KeybindingMap::value_type new_pair = make_pair (kb, ActionInfo (action_name)); + (void) kbm.insert (new_pair).first; + } - KeybindingMap::value_type new_pair (kb, ActionInfo (action_name)); - 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 (); @@ -604,7 +698,7 @@ Bindings::activate (MouseButton bb, Operation op) } void -Bindings::add (MouseButton bb, Operation op, string const& action_name) +Bindings::add (MouseButton bb, Operation op, string const& action_name, XMLProperty const* /*group*/) { MouseButtonBindingMap& bbm = get_mousemap(op); @@ -636,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); } @@ -659,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); } @@ -683,84 +777,128 @@ Bindings::save_all_bindings_as_html (ostream& ostr) return; } - ostr << "\n\n"; + + ostr << "<html>\n<head>\n<title>"; ostr << PROGRAM_NAME; - ostr << "\n\n\n"; + ostr << "\n"; + ostr << "\n\n"; + + ostr << "\n\n"; + ostr << "\n\n"; + + /* first column: separate by group */ + ostr << "\n\n"; - ostr << "\n"; - ostr << "\n"; -} + //second column + ostr << "\n\n"; -void -Bindings::save_as_html (ostream& ostr) const -{ - ostr << "

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

\n"; - if (!press_bindings.empty() || !button_press_bindings.empty()) { + 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 << "

"; - ostr << _("Press"); - ostr << "

\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; - if (!press_bindings.empty()) { + Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions); - ostr << "
\n"; + vector::iterator k; + vector::iterator p; + vector::iterator l; - for (KeybindingMap::const_iterator k = press_bindings.begin(); k != press_bindings.end(); ++k) { - if (k->first.name().empty()) { - continue; - } + for (p = paths.begin(), k = keys.begin(), l = labels.begin(); p != paths.end(); ++k, ++p, ++l) { - RefPtr action; + if ((*k).empty()) { + ostr << *p << " ( " << *l << " ) " << "
" << endl; + } else { + ostr << *p << " ( " << *l << " ) " << " => " << *k << "
" << endl; + } + } + } + ostr << "
\n\n"; + + ostr << "\n"; + ostr << "\n"; +} - if (k->second.action) { - action = k->second.action; - } else { - if (_action_map) { - action = _action_map->find_action (k->second.action_name); - } - } +void +Bindings::save_as_html (ostream& ostr, bool categorize) const +{ - if (!action) { - continue; - } + if (!press_bindings.empty()) { - ostr << "
" << k->first.name() << "
\n"; - ostr << "
" << action->get_label() << "
\n"; - } + ostr << "

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

\n\n"; - ostr << "\n"; - } - } + typedef std::map > GroupMap; + GroupMap group_map; - if (!release_bindings.empty() || !release_bindings.empty()) { + for (KeybindingMap::const_iterator k = press_bindings.begin(); k != press_bindings.end(); ++k) { + + if (k->first.name().empty()) { + continue; + } - ostr << "

"; - ostr << _("Release"); - ostr << "

\n"; + string group_name; + if (categorize && !k->second.group_name.empty()) { + group_name = k->second.group_name; + } else { + group_name = _("Uncategorized"); + } - if (!release_bindings.empty()) { - ostr << "
\n"; + GroupMap::iterator gm = group_map.find (group_name); + if (gm == group_map.end()) { + std::vector li; + li.push_back (k); + group_map.insert (make_pair (group_name,li)); + } else { + gm->second.push_back (k); + } + } - for (KeybindingMap::const_iterator k = release_bindings.begin(); k != release_bindings.end(); ++k) { + + for (GroupMap::const_iterator gm = group_map.begin(); gm != group_map.end(); ++gm) { + + if (categorize) { + ostr << "

" << gm->first << "

\n"; + } + + for (vector::const_iterator k = gm->second.begin(); k != gm->second.end(); ++k) { - if (k->first.name().empty()) { + if ((*k)->first.name().empty()) { continue; } RefPtr action; - if (k->second.action) { - action = k->second.action; + if ((*k)->second.action) { + action = (*k)->second.action; } else { if (_action_map) { - action = _action_map->find_action (k->second.action_name); + action = _action_map->find_action ((*k)->second.action_name); } } @@ -768,12 +906,48 @@ Bindings::save_as_html (ostream& ostr) const continue; } - ostr << "
" << k->first.name() << "
\n"; - ostr << "
" << action->get_label() << "
\n"; + 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; + + char const *targets[] = { X_("Separator"), X_("Add"), X_("Subtract"), X_("Decimal"), X_("Divide"), + X_("grave"), X_("comma"), X_("period"), X_("asterisk"), X_("backslash"), + X_("apostrophe"), X_("minus"), X_("plus"), X_("slash"), X_("semicolon"), + X_("colon"), X_("equal"), X_("bracketleft"), X_("bracketright"), + X_("ampersand"), X_("numbersign"), X_("parenleft"), X_("parenright"), + X_("quoteright"), X_("quoteleft"), X_("exclam"), X_("quotedbl"), + 0 + }; + + char const *replacements[] = { X_("-"), X_("+"), X_("-"), X_("."), X_("/"), + X_("`"), X_(","), X_("."), X_("*"), X_("\\"), + X_("'"), X_("-"), X_("+"), X_("/"), X_(";"), + X_(":"), X_("="), X_("{"), X_("{"), + X_("&"), X_("#"), X_("("), X_(")"), + X_("`"), X_("'"), X_("!"), X_("\""), + }; + + for (size_t n = 0; targets[n]; ++n) { + if ((pos = key_name.find (targets[n])) != string::npos) { + key_name.replace (pos, strlen (targets[n]), replacements[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"; } + + ostr << "\n"; } } @@ -813,11 +987,13 @@ Bindings::load_operation (XMLNode const& node) XMLProperty const * ap; XMLProperty const * kp; XMLProperty const * bp; + XMLProperty const * gp; XMLNode const * child = *p; ap = child->property ("action"); kp = child->property ("key"); bp = child->property ("button"); + gp = child->property ("group"); if (!ap || (!kp && !bp)) { continue; @@ -828,13 +1004,13 @@ Bindings::load_operation (XMLNode const& node) if (!KeyboardKey::make_key (kp->value(), k)) { continue; } - add (k, op, ap->value()); + add (k, op, ap->value(), gp); } else { MouseButton b; if (!MouseButton::make_button (bp->value(), b)) { continue; } - add (b, op, ap->value()); + add (b, op, ap->value(), gp); } } } @@ -911,6 +1087,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 { @@ -997,6 +1184,13 @@ ActionMap::find_action (const string& name) 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 @@ -1170,5 +1364,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()); }