LYXERR(Debug::KBMAP, "Warning: New binding for '"
<< to_utf8(seq->print(KeySequence::Portable))
<< "' is overriding old binding...");
- if (it->table.get()) {
- it->table.reset();
+ if (it->prefixes.get()) {
+ it->prefixes.reset();
}
it->func = func;
it->func.origin = FuncRequest::KEYBOARD;
return;
- } else if (!it->table.get()) {
+ } else if (!it->prefixes.get()) {
lyxerr << "Error: New binding for '"
<< to_utf8(seq->print(KeySequence::Portable))
<< "' is overriding old binding..."
<< endl;
return;
} else {
- it->table->bind(seq, func, r + 1);
+ it->prefixes->bind(seq, func, r + 1);
return;
}
}
if (r + 1 == seq->length()) {
newone->func = func;
newone->func.origin = FuncRequest::KEYBOARD;
- newone->table.reset();
+ newone->prefixes.reset();
} else {
- newone->table.reset(new KeyMap);
- newone->table->bind(seq, func, r + 1);
+ newone->prefixes.reset(new KeyMap);
+ newone->prefixes->bind(seq, func, r + 1);
}
}
if (r + 1 == seq->length()) {
if (it->func == func) {
remove = it;
- if (it->table.get())
- it->table.reset();
+ if (it->prefixes.get())
+ it->prefixes.reset();
}
- } else if (it->table.get()) {
- it->table->unbind(seq, func, r + 1);
- if (it->table->empty())
+ } else if (it->prefixes.get()) {
+ it->prefixes->unbind(seq, func, r + 1);
+ if (it->prefixes->empty())
remove = it;
return;
}
&& mod2 == it->mod.second) {
if (r + 1 == seq.length())
return it->func;
- else if (it->table.get())
- return it->table->getBinding(seq, r + 1);
+ else if (it->prefixes.get())
+ return it->prefixes->getBinding(seq, r + 1);
}
}
return FuncRequest::unknown;
if (cit->code == key && cit->mod.first == check) {
// match found
- if (cit->table.get()) {
+ if (cit->prefixes.get()) {
// this is a prefix key - set new map
- seq->curmap = cit->table.get();
+ seq->curmap = cit->prefixes.get();
static FuncRequest prefix(LFUN_COMMAND_PREFIX);
return prefix;
} else {
Table::const_iterator end = table.end();
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
- if (cit->table.get()) {
+ if (cit->prefixes.get()) {
KeySequence seq = prefix;
seq.addkey(cit->code, cit->mod.first);
- Bindings res2 = cit->table->findBindings(func, seq);
+ Bindings res2 = cit->prefixes->findBindings(func, seq);
res.insert(res.end(), res2.begin(), res2.end());
} else if (cit->func == func) {
KeySequence seq = prefix;
Table::const_iterator it_end = table.end();
for (; it != it_end; ++it) {
// a LFUN_COMMAND_PREFIX
- if (it->table.get()) {
+ if (it->prefixes.get()) {
KeySequence seq = prefix;
seq.addkey(it->code, it->mod.first);
- it->table->listBindings(list, seq, tag);
+ it->prefixes->listBindings(list, seq, tag);
} else {
KeySequence seq = prefix;
seq.addkey(it->code, it->mod.first);