#include "frontends/LyXKeySym.h"
#include "support/filetools.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::support::i18nLibFileSearch;
if (cit->table.get()) {
// this is a prefix key - set new map
seq->curmap = cit->table.get();
- static FuncRequest prefix(LFUN_PREFIX);
+ static FuncRequest prefix(LFUN_COMMAND_PREFIX);
return prefix;
} else {
// final key - reset map
it->table.reset();
}
it->func = func;
+ it->func.origin = FuncRequest::KEYBOARD;
return;
} else if (!it->table.get()) {
lyxerr << "Error: New binding for '" << seq->print()
newone->mod = seq->modifiers[r];
if (r + 1 == seq->length()) {
newone->func = func;
+ newone->func.origin = FuncRequest::KEYBOARD;
newone->table.reset();
return;
} else {
}
-kb_keymap::Bindings
+kb_keymap::Bindings
kb_keymap::findbindings(FuncRequest const & func) const
{
return findbindings(func, kb_sequence(0, 0));
}
-kb_keymap::Bindings
+kb_keymap::Bindings
kb_keymap::findbindings(FuncRequest const & func,
kb_sequence const & prefix) const
{
if (cit->table.get()) {
kb_sequence seq = prefix;
seq.addkey(cit->code, cit->mod.first);
- Bindings res2 =
+ Bindings res2 =
cit->table->findbindings(func, seq);
res.insert(res.end(), res2.begin(), res2.end());
} else if (cit->func == func) {
return res;
}
+
+
+std::pair<LyXKeySym const *, key_modifier::state>
+kb_keymap::find1keybinding(FuncRequest const & func) const
+{
+ Table::const_iterator end = table.end();
+ for (Table::const_iterator cit = table.begin();
+ cit != end; ++cit) {
+ if (!cit->table.get() && cit->func == func)
+ return std::make_pair(cit->code.get(), cit->mod.first);
+ }
+
+ return std::make_pair<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
+}