}
-docstring const kb_keymap::printKey(kb_key const & key) const
-{
- return key.code->print(key.mod.first);
-}
-
-
string::size_type kb_keymap::bind(string const & seq, FuncRequest const & func)
{
- if (lyxerr.debugging(Debug::KBMAP)) {
- lyxerr << "BIND: Sequence `"
- << seq << "' Action `"
- << func.action << '\'' << endl;
- }
+ LYXERR(Debug::KBMAP) << "BIND: Sequence `"
+ << seq << "' Action `"
+ << func.action << '\'' << endl;
kb_sequence k(0, 0);
if (res == string::npos) {
defkey(&k, func);
} else {
- lyxerr[Debug::KBMAP] << "Parse error at position " << res
+ LYXERR(Debug::KBMAP) << "Parse error at position " << res
<< " in key sequence '" << seq << "'."
<< endl;
}
return false;
}
- lyxerr[Debug::KBMAP] << "Reading bind file:" << tmp << endl;
+ LYXERR(Debug::KBMAP) << "Reading bind file:" << tmp << endl;
bool error = false;
while (lexrc.isOK()) {
}
-docstring const kb_keymap::print() const
+docstring const kb_keymap::print(bool forgui) const
{
docstring buf;
Table::const_iterator end = table.end();
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
- buf += printKey((*cit));
+ buf += cit->code->print(cit->mod.first, forgui);
buf += ' ';
}
return buf;
&& mod2 == it->mod.second) {
// overwrite binding
if (r + 1 == seq->length()) {
- lyxerr[Debug::KBMAP]
+ LYXERR(Debug::KBMAP)
<< "Warning: New binding for '"
- << to_utf8(seq->print())
+ << to_utf8(seq->print(false))
<< "' is overriding old binding..."
<< endl;
if (it->table.get()) {
return;
} else if (!it->table.get()) {
lyxerr << "Error: New binding for '"
- << to_utf8(seq->print())
+ << to_utf8(seq->print(false))
<< "' is overriding old binding..."
<< endl;
return;
Bindings bindings = findbindings(func);
for (Bindings::const_iterator cit = bindings.begin();
cit != bindings.end() ; ++cit)
- res << '[' << cit->print() << ']';
+ res << '[' << cit->print(true) << ']';
return res.str();
}