}
-docstring const KeyMap::printbindings(FuncRequest const & func) const
+docstring KeyMap::printBindings(FuncRequest const & func) const
{
- Bindings bindings = findbindings(func);
+ Bindings bindings = findBindings(func);
if (bindings.empty())
return docstring();
}
-KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func) const
+KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func) const
{
- return findbindings(func, KeySequence(0, 0));
+ return findBindings(func, KeySequence(0, 0));
}
-KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func,
+KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func,
KeySequence const & prefix) const
{
Bindings res;
- if (table.empty()) return res;
+ if (table.empty())
+ return res;
Table::const_iterator end = table.end();
- for (Table::const_iterator cit = table.begin();
- cit != end; ++cit) {
+ for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
if (cit->table.get()) {
KeySequence seq = prefix;
seq.addkey(cit->code, cit->mod.first);
- Bindings res2 =
- cit->table->findbindings(func, seq);
+ Bindings res2 = cit->table->findBindings(func, seq);
res.insert(res.end(), res2.begin(), res2.end());
} else if (cit->func == func) {
KeySequence seq = prefix;
#include <boost/shared_ptr.hpp>
#include <vector>
-#include <deque>
namespace lyx {
lookup(KeySymbol const & key, KeyModifier mod, KeySequence * seq) const;
///
- typedef std::deque<KeySequence> Bindings;
+ typedef std::vector<KeySequence> Bindings;
/// Given an action, find all keybindings.
- Bindings findbindings(FuncRequest const & func) const;
+ Bindings findBindings(FuncRequest const & func) const;
/// Given an action, print the keybindings.
- docstring const printbindings(FuncRequest const & func) const;
+ docstring printBindings(FuncRequest const & func) const;
struct Binding {
Binding(FuncRequest const & r, KeySequence const & s, int t)
struct Key {
/// Keysym
KeySymbol code;
-
/// Modifier masks
ModifierPair mod;
-
/// Keymap for prefix keys
boost::shared_ptr<KeyMap> table;
-
/// Action for !prefix keys
FuncRequest func;
};
* @param func the action
* @param prefix a sequence to prepend the results
*/
- Bindings findbindings(FuncRequest const & func,
+ Bindings findBindings(FuncRequest const & func,
KeySequence const & prefix) const;
void listBindings(BindingList & list, KeySequence const & prefix,
}
}
- docstring const shortcuts = theTopLevelKeymap().printbindings(cmd);
+ docstring const shortcuts = theTopLevelKeymap().printBindings(cmd);
if (!shortcuts.empty())
comname += ": " + shortcuts;
// Get the keys bound to this action, but keep only the
// first one later
- KeyMap::Bindings bindings = theTopLevelKeymap().findbindings(func_);
+ KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func_);
if (bindings.size()) {
return bindings.begin()->print(KeySequence::ForGui);
case SHORTCUT_INFO: {
FuncRequest func = lyxaction.lookupFunc(name_);
if (func.action != LFUN_UNKNOWN_ACTION)
- setText(theTopLevelKeymap().printbindings(func),
+ setText(theTopLevelKeymap().printBindings(func),
bp_.getFont(), false);
break;
}