#include "KeySequence.h"
#include "LyXAction.h"
-#include "Lexer.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/FileName.h"
#include "support/filetools.h"
#include "support/gettext.h"
+#include "support/Lexer.h"
#include "support/lstrings.h"
#include "support/TempFile.h"
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)
// 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
- && mod1 == it->mod.first
- && mod2 == it->mod.second) {
+ for (auto & key : table) {
+ if (code == key.code
+ && mod1 == key.mod.first
+ && mod2 == key.mod.second) {
// overwrite binding
if (r + 1 == seq->length()) {
LYXERR(Debug::KBMAP, "Warning: New binding for '"
<< to_utf8(seq->print(KeySequence::Portable))
<< "' is overriding old binding...");
- if (it->prefixes)
- it->prefixes.reset();
- it->func = func;
- it->func.setOrigin(FuncRequest::KEYBOARD);
+ if (key.prefixes)
+ key.prefixes.reset();
+ key.func = func;
+ key.func.setOrigin(FuncRequest::KEYBOARD);
return;
- } else if (!it->prefixes) {
+ } else if (!key.prefixes) {
lyxerr << "Error: New binding for '"
<< to_utf8(seq->print(KeySequence::Portable))
<< "' is overriding old binding..."
<< endl;
return;
} else {
- it->prefixes->bind(seq, func, r + 1);
+ key.prefixes->bind(seq, func, r + 1);
return;
}
}
KeyModifier const mod2 = seq->modifiers[r].second;
// check if key is already there
+ vector <Table::iterator> removes;
Table::iterator end = table.end();
- Table::iterator remove = end;
for (Table::iterator it = table.begin(); it != end; ++it) {
if (code == it->code
&& mod1 == it->mod.first
&& mod2 == it->mod.second) {
// remove
if (r + 1 == seq->length()) {
- if (it->func == func) {
- remove = it;
+ if (it->func == func || func == FuncRequest::unknown) {
+ removes.push_back(it);
if (it->prefixes)
it->prefixes.reset();
}
} else if (it->prefixes) {
it->prefixes->unbind(seq, func, r + 1);
if (it->prefixes->empty())
- remove = it;
+ removes.push_back(it);
return;
}
}
}
- if (remove != end)
- table.erase(remove);
+
+ for (unsigned i = removes.size(); i > 0; --i)
+ table.erase(removes[i-1]);
}
KeyModifier const mod2 = seq.modifiers[r].second;
// check if key is already there
- Table::iterator end = table.end();
- for (Table::iterator it = table.begin(); it != end; ++it) {
- if (code == it->code
- && mod1 == it->mod.first
- && mod2 == it->mod.second) {
+ for (auto const & key : table) {
+ if (code == key.code
+ && mod1 == key.mod.first
+ && mod2 == key.mod.second) {
if (r + 1 == seq.length())
- return it->func;
- else if (it->prefixes)
- return it->prefixes->getBinding(seq, r + 1);
+ return (key.prefixes) ? FuncRequest::prefix : key.func;
+ else if (key.prefixes)
+ return key.prefixes->getBinding(seq, r + 1);
}
}
return FuncRequest::unknown;
}
-bool KeyMap::read(string const & bind_file, KeyMap * unbind_map, BindReadType rt)
+bool KeyMap::read(string const & bind_file, KeyMap * unbind_map, BindReadType rt, bool i18n)
{
- FileName bf = i18nLibFileSearch("bind", bind_file, "bind");
+ FileName bf = i18n ? i18nLibFileSearch("bind", bind_file, "bind")
+ : libFileSearch("bind", bind_file, "bind");
if (bf.empty()) {
if (rt == MissingOK)
return true;
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()) {
string cmd = lexrc.getString();
FuncRequest func = lyxaction.lookupFunc(cmd);
- if (func.action() == LFUN_UNKNOWN_ACTION) {
+ if (func == FuncRequest::unknown) {
lexrc.printError("BN_BIND: Unknown LyX function `$$Token'");
error = true;
break;
break;
}
string cmd = lexrc.getString();
-
- FuncRequest func = lyxaction.lookupFunc(cmd);
- if (func.action() == LFUN_UNKNOWN_ACTION) {
- lexrc.printError("BN_UNBIND: Unknown LyX"
- " function `$$Token'");
- error = true;
- break;
+ FuncRequest func;
+ if (cmd == "*")
+ func = FuncRequest::unknown;
+ else {
+ func = lyxaction.lookupFunc(cmd);
+ if (func == FuncRequest::unknown) {
+ lexrc.printError("BN_UNBIND: Unknown LyX function `$$Token'");
+ error = true;
+ break;
+ }
}
if (unbind_map)
error = true;
break;
}
- string const tmp = lexrc.getString();
- error |= !read(tmp, unbind_map);
+ string tmp = lexrc.getString();
+ if (prefixIs(tmp, "../")) {
+ tmp = split(tmp, '/');
+ // look in top dir
+ error |= !read(tmp, unbind_map, Default, false);
+ } else
+ // i18n search
+ error |= !read(tmp, unbind_map);
break;
}
<< "Format " << LFUN_FORMAT << "\n\n";
string tag = unbind ? "\\unbind" : "\\bind";
- BindingList const list = listBindings(false);
- BindingList::const_iterator it = list.begin();
- BindingList::const_iterator it_end = list.end();
- for (; it != it_end; ++it) {
- FuncCode action = it->request.action();
- string arg = to_utf8(it->request.argument());
-
- string const cmd = lyxaction.getActionName(action)
- + (arg.empty() ? string() : " " + arg) ;
+ for (auto const & bnd : listBindings(false)) {
+ FuncCode const action = bnd.request.action();
+ string const arg = to_utf8(bnd.request.argument());
+
+ string cmd;
+ if (unbind && bnd.request == FuncRequest::unknown)
+ cmd = "*";
+ else
+ cmd = lyxaction.getActionName(action) + (arg.empty() ? string() : " " + arg);
os << tag << " \""
- << to_utf8(it->sequence.print(KeySequence::BindFile))
+ << to_utf8(bnd.sequence.print(KeySequence::BindFile))
<< "\" " << Lexer::quoteString(cmd)
<< "\n";
}
}
-FuncRequest const & KeyMap::lookup(KeySymbol const &key,
+FuncRequest const & KeyMap::lookup(KeySymbol const & keysym,
KeyModifier mod, KeySequence * seq) const
{
if (table.empty()) {
return FuncRequest::unknown;
}
- Table::const_iterator end = table.end();
- for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
- KeyModifier mask = cit->mod.second;
+ for (auto const & key : table) {
+ KeyModifier mask = key.mod.second;
KeyModifier check = static_cast<KeyModifier>(mod & ~mask);
- if (cit->code == key && cit->mod.first == check) {
+ if (key.code == keysym && key.mod.first == check) {
// match found
- if (cit->prefixes) {
+ if (key.prefixes) {
// this is a prefix key - set new map
- seq->curmap = cit->prefixes.get();
- static const FuncRequest prefix(LFUN_COMMAND_PREFIX);
- return prefix;
+ seq->curmap = key.prefixes.get();
+ return FuncRequest::prefix;
} else {
// final key - reset map
seq->reset();
- return cit->func;
+ return key.func;
}
}
}
docstring const KeyMap::print(bool forgui) const
{
docstring buf;
- Table::const_iterator end = table.end();
- for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
- buf += cit->code.print(cit->mod.first, forgui);
+ for (auto const & key : table) {
+ buf += key.code.print(key.mod.first, forgui);
buf += ' ';
}
return buf;
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);
- // more than one shortcuts?
- for (++cit; cit != cit_end; ++cit)
- res << ", " << cit->print(format);
+ bool firstone = true;
+ for (auto const & key : bindings) {
+ if (!firstone)
+ res << ", ";
+ res << key.print(format, untranslated);
+ firstone = true;
+ }
return res.str();
}
KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func) const
{
- return findBindings(func, KeySequence(0, 0));
+ return findBindings(func, KeySequence(nullptr, nullptr));
}
if (table.empty())
return res;
- Table::const_iterator end = table.end();
- for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
- if (cit->prefixes) {
+ for (auto const & key : table) {
+ if (key.prefixes) {
KeySequence seq = prefix;
- seq.addkey(cit->code, cit->mod.first);
- Bindings res2 = cit->prefixes->findBindings(func, seq);
+ seq.addkey(key.code, key.mod.first);
+ Bindings res2 = key.prefixes->findBindings(func, seq);
res.insert(res.end(), res2.begin(), res2.end());
- } else if (cit->func == func) {
+ } else if (key.func == func) {
KeySequence seq = prefix;
- seq.addkey(cit->code, cit->mod.first);
+ seq.addkey(key.code, key.mod.first);
res.push_back(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();
- for (; bit != ben; ++bit)
- if (bit->request.action() == action) {
+ for (auto const & item : list)
+ if (item.request.action() == action) {
has_action = true;
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;
void KeyMap::listBindings(BindingList & list,
KeySequence const & prefix, KeyMap::ItemType tag) const
{
- Table::const_iterator it = table.begin();
- Table::const_iterator it_end = table.end();
- for (; it != it_end; ++it) {
+ for (auto const & key : table) {
// a LFUN_COMMAND_PREFIX
- if (it->prefixes) {
+ if (key.prefixes) {
KeySequence seq = prefix;
- seq.addkey(it->code, it->mod.first);
- it->prefixes->listBindings(list, seq, tag);
+ seq.addkey(key.code, key.mod.first);
+ key.prefixes->listBindings(list, seq, tag);
} else {
KeySequence seq = prefix;
- seq.addkey(it->code, it->mod.first);
- list.push_back(Binding(it->func, seq, tag));
+ seq.addkey(key.code, key.mod.first);
+ list.push_back(Binding(key.func, seq, tag));
}
}
}
projects / lyx.git / blobdiff