anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Whoops. I somehow undid the reordering with that last commit. Anyway,

Browse Source 
this fixes that again.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29020 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-04-02 18:59:25 +00:00
parent 62beaaa37f
commit 404f1dc80a
1 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
src/KeyMap.cpp
View File

@ -85,6 +85,95 @@ size_t KeyMap::unbind(string const & seq, FuncRequest const & func)
}
void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
KeySymbol code = seq->sequence[r];
if (!code.isOK())
return;
KeyModifier const mod1 = seq->modifiers[r].first;
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) {
// 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.get()) {
it->prefixes.reset();
}
it->func = func;
it->func.origin = FuncRequest::KEYBOARD;
return;
} else if (!it->prefixes.get()) {
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);
return;
}
}
}
Table::iterator newone = table.insert(table.end(), Key());
newone->code = code;
newone->mod = seq->modifiers[r];
if (r + 1 == seq->length()) {
newone->func = func;
newone->func.origin = FuncRequest::KEYBOARD;
newone->prefixes.reset();
} else {
newone->prefixes.reset(new KeyMap);
newone->prefixes->bind(seq, func, r + 1);
}
}
void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
KeySymbol code = seq->sequence[r];
if (!code.isOK())
return;
KeyModifier const mod1 = seq->modifiers[r].first;
KeyModifier const mod2 = seq->modifiers[r].second;
// check if key is already there
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->prefixes.get())
it->prefixes.reset();
}
} else if (it->prefixes.get()) {
it->prefixes->unbind(seq, func, r + 1);
if (it->prefixes->empty())
remove = it;
return;
}
}
}
if (remove != end)
table.erase(remove);
}
FuncRequest KeyMap::getBinding(KeySequence const & seq, unsigned int r)
{
KeySymbol code = seq.sequence[r];
@ -305,95 +394,6 @@ docstring const KeyMap::print(bool forgui) const
}
void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
KeySymbol code = seq->sequence[r];
if (!code.isOK())
return;
KeyModifier const mod1 = seq->modifiers[r].first;
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) {
// 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.get()) {
it->prefixes.reset();
}
it->func = func;
it->func.origin = FuncRequest::KEYBOARD;
return;
} else if (!it->prefixes.get()) {
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);
return;
}
}
}
Table::iterator newone = table.insert(table.end(), Key());
newone->code = code;
newone->mod = seq->modifiers[r];
if (r + 1 == seq->length()) {
newone->func = func;
newone->func.origin = FuncRequest::KEYBOARD;
newone->prefixes.reset();
} else {
newone->prefixes.reset(new KeyMap);
newone->prefixes->bind(seq, func, r + 1);
}
}
void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
KeySymbol code = seq->sequence[r];
if (!code.isOK())
return;
KeyModifier const mod1 = seq->modifiers[r].first;
KeyModifier const mod2 = seq->modifiers[r].second;
// check if key is already there
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->prefixes.get())
it->prefixes.reset();
}
} else if (it->prefixes.get()) {
it->prefixes->unbind(seq, func, r + 1);
if (it->prefixes->empty())
remove = it;
return;
}
}
}
if (remove != end)
table.erase(remove);
}
docstring KeyMap::printBindings(FuncRequest const & func,
KeySequence::outputFormat format) const
{