#include "support/filetools.h"
-using std::endl;
using lyx::support::i18nLibFileSearch;
+using std::endl;
+using std::string;
+
+
string const kb_keymap::printKeysym(LyXKeySymPtr key,
key_modifier::state mod)
{
}
-string::size_type kb_keymap::bind(string const & seq, int action)
+string::size_type kb_keymap::bind(string const & seq, FuncRequest const & func)
{
if (lyxerr.debugging(Debug::KBMAP)) {
lyxerr << "BIND: Sequence `"
<< seq << "' Action `"
- << action << '\'' << endl;
+ << func.action << '\'' << endl;
}
kb_sequence k(0, 0);
string::size_type const res = k.parse(seq);
if (res == string::npos) {
- defkey(&k, action);
+ defkey(&k, func);
} else {
lyxerr[Debug::KBMAP] << "Parse error at position " << res
<< " in key sequence '" << seq << "'."
break;
}
- int action = lyxaction.LookupFunc(cmd);
- if (!action == LFUN_UNKNOWN_ACTION) {
+ FuncRequest func = lyxaction.lookupFunc(cmd);
+ if (func. action == LFUN_UNKNOWN_ACTION) {
lexrc.printError("BN_BIND: Unknown LyX"
" function `$$Token'");
error = true;
break;
}
- bind(seq, kb_action(action));
+ bind(seq, func);
break;
}
case BN_BINDFILE:
}
-int kb_keymap::lookup(LyXKeySymPtr key,
- key_modifier::state mod, kb_sequence * seq) const
+FuncRequest const &
+kb_keymap::lookup(LyXKeySymPtr key,
+ key_modifier::state mod, kb_sequence * seq) const
{
+ static FuncRequest const unknown(LFUN_UNKNOWN_ACTION);
+
if (table.empty()) {
seq->curmap = seq->stdmap;
seq->mark_deleted();
- return LFUN_UNKNOWN_ACTION;
+ return unknown;
}
Table::const_iterator end = table.end();
if (cit->table.get()) {
// this is a prefix key - set new map
seq->curmap = cit->table.get();
- return LFUN_PREFIX;
+ static FuncRequest prefix(LFUN_PREFIX);
+ return prefix;
} else {
// final key - reset map
seq->curmap = seq->stdmap;
seq->mark_deleted();
- return cit->action;
+ return cit->func;
}
}
}
// error - key not found:
seq->curmap = seq->stdmap;
seq->mark_deleted();
- return LFUN_UNKNOWN_ACTION;
+
+ return unknown;
}
}
-void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
+void kb_keymap::defkey(kb_sequence * seq,
+ FuncRequest const & func, unsigned int r)
{
LyXKeySymPtr code = seq->sequence[r];
if (!code->isOK())
if (it->table.get()) {
it->table.reset();
}
- it->action = action;
+ it->func = func;
return;
} else if (!it->table.get()) {
lyxerr << "Error: New binding for '" << seq->print()
<< endl;
return;
} else {
- it->table->defkey(seq, action, r + 1);
+ it->table->defkey(seq, func, r + 1);
return;
}
}
newone->code = code;
newone->mod = seq->modifiers[r];
if (r + 1 == seq->length()) {
- newone->action = action;
+ newone->func = func;
newone->table.reset();
return;
} else {
newone->table.reset(new kb_keymap);
- newone->table->defkey(seq, action, r + 1);
+ newone->table->defkey(seq, func, r + 1);
return;
}
}
-string const kb_keymap::findbinding(int act, string const & prefix) const
+string const kb_keymap::findbinding(FuncRequest const & func,
+ string const & prefix) const
{
string res;
if (table.empty()) return res;
for (Table::const_iterator cit = table.begin();
cit != end; ++cit) {
if (cit->table.get()) {
- res += cit->table->findbinding(act,
+ res += cit->table->findbinding(func,
prefix
+ printKey((*cit))
+ ' ');
- } else if (cit->action == act) {
+ } else if (cit->func == func) {
res += '[';
res += prefix + printKey((*cit));
res += "] ";
}
}
+
return res;
}