#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
+#include "support/TempFile.h"
#include "frontends/alert.h"
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, "BIND: Sequence `" << seq << "' Action `"
<< func.action() << '\'');
- KeySequence k(0, 0);
+ KeySequence k(nullptr, nullptr);
string::size_type const res = k.parse(seq);
if (res == string::npos) {
size_t KeyMap::unbind(string const & seq, FuncRequest const & func)
{
- KeySequence k(0, 0);
+ KeySequence k(nullptr, nullptr);
string::size_type const res = k.parse(seq);
if (res == string::npos)
KeyModifier const mod2 = seq->modifiers[r].second;
// check if key is already there
+ // FIXME perf: Profiling shows that this is responsible of 99% of the
+ // cost of GuiPrefs::applyView()
Table::iterator end = table.end();
for (Table::iterator it = table.begin(); it != end; ++it) {
if (code == it->code
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);
}
}
return retval == ReadOK;
LYXERR(Debug::FILES, "Converting bind file to " << LFUN_FORMAT);
- FileName const tempfile = FileName::tempName("convert_bind");
+ TempFile tmp("convert_bind");
+ FileName const tempfile = tmp.name();
bool const success = prefs2prefs(bind_file, tempfile, true);
if (!success) {
LYXERR0 ("Unable to convert " << bind_file <<
return false;
}
retval = readWithoutConv(tempfile, unbind_map);
- tempfile.removeFile();
return retval == ReadOK;
}
LYXERR(Debug::KBMAP, "Reading bind file:" << bind_file.absFileName());
// format of pre-2.0 bind files, before this tag was introduced.
- unsigned int format = 0;
+ int format = 0;
bool error = false;
while (lexrc.isOK()) {
switch (lexrc.lex()) {
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
docstring KeyMap::printBindings(FuncRequest const & func,
- KeySequence::outputFormat format) const
+ KeySequence::outputFormat format,
+ bool const untranslated) const
{
Bindings bindings = findBindings(func);
if (bindings.empty())
return docstring();
-
+
odocstringstream res;
Bindings::const_iterator cit = bindings.begin();
Bindings::const_iterator cit_end = bindings.end();
// print the first item
- res << cit->print(format);
+ res << cit->print(format, untranslated);
// more than one shortcuts?
for (++cit; cit != cit_end; ++cit)
- res << ", " << cit->print(format);
+ res << ", " << cit->print(format, untranslated);
return res.str();
}
KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func) const
{
- return findBindings(func, KeySequence(0, 0));
+ return findBindings(func, KeySequence(nullptr, nullptr));
}
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);
KeyMap::BindingList KeyMap::listBindings(bool unbound, KeyMap::ItemType tag) const
{
BindingList list;
- listBindings(list, KeySequence(0, 0), tag);
+ listBindings(list, KeySequence(nullptr, nullptr), tag);
if (unbound) {
- LyXAction::const_iterator fit = lyxaction.func_begin();
- LyXAction::const_iterator const fen = lyxaction.func_end();
- for (; fit != fen; ++fit) {
- FuncCode action = fit->second;
+ for (auto const & name_code : lyxaction) {
+ FuncCode action = name_code.second;
bool has_action = false;
BindingList::const_iterator bit = list.begin();
BindingList::const_iterator const ben = list.end();
break;
}
if (!has_action)
- list.push_back(Binding(FuncRequest(action), KeySequence(0, 0), tag));
- }
+ list.push_back(Binding(FuncRequest(action), KeySequence(nullptr, nullptr), tag));
+ }
}
return list;
}
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);