string const s = key.getSymbolName();
- if (mod & ShiftModifier)
- buf += "S-";
if (mod & ControlModifier)
buf += "C-";
if (mod & AltModifier)
buf += "M-";
+ if (mod & ShiftModifier)
+ buf += "S-";
buf += s;
return buf;
string::size_type const res = k.parse(seq);
if (res == string::npos) {
- defkey(&k, func);
+ bind(&k, func);
} else {
LYXERR(Debug::KBMAP) << "Parse error at position " << res
<< " in key sequence '" << seq << "'."
string::size_type const res = k.parse(seq);
if (res == string::npos)
- delkey(&k, func);
+ unbind(&k, func);
else
LYXERR(Debug::KBMAP) << "Parse error at position " << res
<< " in key sequence '" << seq << "'."
}
-void KeyMap::defkey(KeySequence * seq, FuncRequest const & func, unsigned int r)
+void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
KeySymbol code = seq->sequence[r];
if (!code.isOK())
<< endl;
return;
} else {
- it->table->defkey(seq, func, r + 1);
+ it->table->bind(seq, func, r + 1);
return;
}
}
newone->table.reset();
} else {
newone->table.reset(new KeyMap);
- newone->table->defkey(seq, func, r + 1);
+ newone->table->bind(seq, func, r + 1);
}
}
-void KeyMap::delkey(KeySequence * seq, FuncRequest const & func, unsigned int r)
+void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
KeySymbol code = seq->sequence[r];
if (!code.isOK())
it->table.reset();
}
} else if (it->table.get()) {
- it->table->delkey(seq, func, r + 1);
+ it->table->unbind(seq, func, r + 1);
if (it->table->empty())
remove = it;
return;