anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use ranges

Browse Source
This commit is contained in:
Richard Kimberly Heck 2024-06-03 22:04:57 -04:00
parent 51453c61d6
commit b8cdfd1e1d
1 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/KeyMap.cpp
View File

@ -108,29 +108,28 @@ void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
// check if key is already there // check if key is already there
// FIXME perf: Profiling shows that this is responsible of 99% of the // FIXME perf: Profiling shows that this is responsible of 99% of the
// cost of GuiPrefs::applyView() // cost of GuiPrefs::applyView()
Table::iterator end = table.end(); for (auto & key : table) {
for (Table::iterator it = table.begin(); it != end; ++it) { if (code == key.code
if (code == it->code && mod1 == key.mod.first
&& mod1 == it->mod.first && mod2 == key.mod.second) {
&& mod2 == it->mod.second) {
// overwrite binding // overwrite binding
if (r + 1 == seq->length()) { if (r + 1 == seq->length()) {
LYXERR(Debug::KBMAP, "Warning: New binding for '" LYXERR(Debug::KBMAP, "Warning: New binding for '"
<< to_utf8(seq->print(KeySequence::Portable)) << to_utf8(seq->print(KeySequence::Portable))
<< "' is overriding old binding..."); << "' is overriding old binding...");
if (it->prefixes) if (key.prefixes)
it->prefixes.reset(); key.prefixes.reset();
it->func = func; key.func = func;
it->func.setOrigin(FuncRequest::KEYBOARD); key.func.setOrigin(FuncRequest::KEYBOARD);
return; return;
} else if (!it->prefixes) { } else if (!key.prefixes) {
lyxerr << "Error: New binding for '" lyxerr << "Error: New binding for '"
<< to_utf8(seq->print(KeySequence::Portable)) << to_utf8(seq->print(KeySequence::Portable))
<< "' is overriding old binding..." << "' is overriding old binding..."
<< endl; << endl;
return; return;
} else { } else {
it->prefixes->bind(seq, func, r + 1); key.prefixes->bind(seq, func, r + 1);
return; return;
} }
} }
@ -197,15 +196,14 @@ FuncRequest KeyMap::getBinding(KeySequence const & seq, unsigned int r)
KeyModifier const mod2 = seq.modifiers[r].second; KeyModifier const mod2 = seq.modifiers[r].second;
// check if key is already there // check if key is already there
Table::iterator end = table.end(); for (auto const & key : table) {
for (Table::iterator it = table.begin(); it != end; ++it) { if (code == key.code
if (code == it->code && mod1 == key.mod.first
&& mod1 == it->mod.first && mod2 == key.mod.second) {
&& mod2 == it->mod.second) {
if (r + 1 == seq.length()) if (r + 1 == seq.length())
return (it->prefixes) ? FuncRequest::prefix : it->func; return (key.prefixes) ? FuncRequest::prefix : key.func;
else if (it->prefixes) else if (key.prefixes)
return it->prefixes->getBinding(seq, r + 1); return key.prefixes->getBinding(seq, r + 1);
} }
} }
return FuncRequest::unknown; return FuncRequest::unknown;
@ -439,7 +437,7 @@ void KeyMap::write(string const & bind_file, bool append, bool unbind) const
} }
FuncRequest const & KeyMap::lookup(KeySymbol const &key, FuncRequest const & KeyMap::lookup(KeySymbol const & keysym,
KeyModifier mod, KeySequence * seq) const KeyModifier mod, KeySequence * seq) const
{ {
if (table.empty()) { if (table.empty()) {
@ -447,21 +445,20 @@ FuncRequest const & KeyMap::lookup(KeySymbol const &key,
return FuncRequest::unknown; return FuncRequest::unknown;
} }
Table::const_iterator end = table.end(); for (auto const & key : table) {
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) { KeyModifier mask = key.mod.second;
KeyModifier mask = cit->mod.second;
KeyModifier check = static_cast<KeyModifier>(mod & ~mask); 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 // match found
if (cit->prefixes) { if (key.prefixes) {
// this is a prefix key - set new map // this is a prefix key - set new map
seq->curmap = cit->prefixes.get(); seq->curmap = key.prefixes.get();
return FuncRequest::prefix; return FuncRequest::prefix;
} else { } else {
// final key - reset map // final key - reset map
seq->reset(); seq->reset();
return cit->func; return key.func;
} }
} }
} }
@ -476,9 +473,8 @@ FuncRequest const & KeyMap::lookup(KeySymbol const &key,
docstring const KeyMap::print(bool forgui) const docstring const KeyMap::print(bool forgui) const
{ {
docstring buf; docstring buf;
Table::const_iterator end = table.end(); for (auto const & key : table) {
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) { buf += key.code.print(key.mod.first, forgui);
buf += cit->code.print(cit->mod.first, forgui);
buf += ' '; buf += ' ';
} }
return buf; return buf;
@ -494,13 +490,13 @@ docstring KeyMap::printBindings(FuncRequest const & func,
return docstring(); return docstring();
odocstringstream res; odocstringstream res;
Bindings::const_iterator cit = bindings.begin(); bool firstone = true;
Bindings::const_iterator cit_end = bindings.end(); for (auto const & key : bindings) {
// print the first item if (!firstone)
res << cit->print(format, untranslated); res << ", ";
// more than one shortcuts? res << key.print(format, untranslated);
for (++cit; cit != cit_end; ++cit) firstone = true;
res << ", " << cit->print(format, untranslated); }
return res.str(); return res.str();
} }
@ -518,16 +514,15 @@ KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func,
if (table.empty()) if (table.empty())
return res; return res;
Table::const_iterator end = table.end(); for (auto const & key : table) {
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) { if (key.prefixes) {
if (cit->prefixes) {
KeySequence seq = prefix; KeySequence seq = prefix;
seq.addkey(cit->code, cit->mod.first); seq.addkey(key.code, key.mod.first);
Bindings res2 = cit->prefixes->findBindings(func, seq); Bindings res2 = key.prefixes->findBindings(func, seq);
res.insert(res.end(), res2.begin(), res2.end()); res.insert(res.end(), res2.begin(), res2.end());
} else if (cit->func == func) { } else if (key.func == func) {
KeySequence seq = prefix; KeySequence seq = prefix;
seq.addkey(cit->code, cit->mod.first); seq.addkey(key.code, key.mod.first);
res.push_back(seq); res.push_back(seq);
} }
} }
@ -544,10 +539,8 @@ KeyMap::BindingList KeyMap::listBindings(bool unbound, KeyMap::ItemType tag) con
for (auto const & name_code : lyxaction) { for (auto const & name_code : lyxaction) {
FuncCode action = name_code.second; FuncCode action = name_code.second;
bool has_action = false; bool has_action = false;
BindingList::const_iterator bit = list.begin(); for (auto const & item : list)
BindingList::const_iterator const ben = list.end(); if (item.request.action() == action) {
for (; bit != ben; ++bit)
if (bit->request.action() == action) {
has_action = true; has_action = true;
break; break;
} }
@ -562,18 +555,16 @@ KeyMap::BindingList KeyMap::listBindings(bool unbound, KeyMap::ItemType tag) con
void KeyMap::listBindings(BindingList & list, void KeyMap::listBindings(BindingList & list,
KeySequence const & prefix, KeyMap::ItemType tag) const KeySequence const & prefix, KeyMap::ItemType tag) const
{ {
Table::const_iterator it = table.begin(); for (auto const & key : table) {
Table::const_iterator it_end = table.end();
for (; it != it_end; ++it) {
// a LFUN_COMMAND_PREFIX // a LFUN_COMMAND_PREFIX
if (it->prefixes) { if (key.prefixes) {
KeySequence seq = prefix; KeySequence seq = prefix;
seq.addkey(it->code, it->mod.first); seq.addkey(key.code, key.mod.first);
it->prefixes->listBindings(list, seq, tag); key.prefixes->listBindings(list, seq, tag);
} else { } else {
KeySequence seq = prefix; KeySequence seq = prefix;
seq.addkey(it->code, it->mod.first); seq.addkey(key.code, key.mod.first);
list.push_back(Binding(it->func, seq, tag)); list.push_back(Binding(key.func, seq, tag));
} }
} }
} }