if (mod & ControlModifier)
buf += "C-";
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+ if (mod & MetaModifier)
+ buf += "M-";
+ if (mod & AltModifier)
+ buf += "A-";
+#else
if (mod & AltModifier)
buf += "M-";
+#endif
if (mod & ShiftModifier)
buf += "S-";
LYXERR(Debug::KBMAP, "Warning: New binding for '"
<< to_utf8(seq->print(KeySequence::Portable))
<< "' is overriding old binding...");
- if (it->prefixes.get()) {
+ if (it->prefixes)
it->prefixes.reset();
- }
it->func = func;
it->func.setOrigin(FuncRequest::KEYBOARD);
return;
- } else if (!it->prefixes.get()) {
+ } else if (!it->prefixes) {
lyxerr << "Error: New binding for '"
<< to_utf8(seq->print(KeySequence::Portable))
<< "' is overriding old binding..."
if (r + 1 == seq->length()) {
if (it->func == func) {
remove = it;
- if (it->prefixes.get())
+ if (it->prefixes)
it->prefixes.reset();
}
- } else if (it->prefixes.get()) {
+ } else if (it->prefixes) {
it->prefixes->unbind(seq, func, r + 1);
if (it->prefixes->empty())
remove = it;
&& mod2 == it->mod.second) {
if (r + 1 == seq.length())
return it->func;
- else if (it->prefixes.get())
+ else if (it->prefixes)
return it->prefixes->getBinding(seq, r + 1);
}
}
if (cit->code == key && cit->mod.first == check) {
// match found
- if (cit->prefixes.get()) {
+ if (cit->prefixes) {
// this is a prefix key - set new map
seq->curmap = cit->prefixes.get();
- static FuncRequest prefix(LFUN_COMMAND_PREFIX);
+ static const FuncRequest prefix(LFUN_COMMAND_PREFIX);
return prefix;
} else {
// final key - reset map
Table::const_iterator end = table.end();
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
- if (cit->prefixes.get()) {
+ if (cit->prefixes) {
KeySequence seq = prefix;
seq.addkey(cit->code, cit->mod.first);
Bindings res2 = cit->prefixes->findBindings(func, seq);
Table::const_iterator it_end = table.end();
for (; it != it_end; ++it) {
// a LFUN_COMMAND_PREFIX
- if (it->prefixes.get()) {
+ if (it->prefixes) {
KeySequence seq = prefix;
seq.addkey(it->code, it->mod.first);
it->prefixes->listBindings(list, seq, tag);