#include "KeyMap.h"
-#include "debug.h"
+#include "support/debug.h"
#include "KeySequence.h"
#include "LyXAction.h"
#include "Lexer.h"
+#include "support/docstream.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include <fstream>
#include <sstream>
#include <utility>
-using std::endl;
-using std::ios;
-using std::ofstream;
-using std::string;
-using boost::make_tuple;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::FileName;
-using support::i18nLibFileSearch;
-
string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
{
string const s = key.getSymbolName();
- if (mod & ShiftModifier)
- buf += "S-";
if (mod & ControlModifier)
buf += "C-";
if (mod & AltModifier)
buf += "M-";
+ if (mod & ShiftModifier)
+ buf += "S-";
buf += s;
return buf;
size_t KeyMap::bind(string const & seq, FuncRequest const & func)
{
- LYXERR(Debug::KBMAP) << "BIND: Sequence `"
- << seq << "' Action `"
- << func.action << '\'' << endl;
+ LYXERR(Debug::KBMAP, "BIND: Sequence `" << seq << "' Action `"
+ << func.action << '\'');
KeySequence k(0, 0);
string::size_type const res = k.parse(seq);
if (res == string::npos) {
- defkey(&k, func);
+ bind(&k, func);
} else {
- LYXERR(Debug::KBMAP) << "Parse error at position " << res
- << " in key sequence '" << seq << "'."
- << endl;
+ LYXERR(Debug::KBMAP, "Parse error at position " << res
+ << " in key sequence '" << seq << "'.");
}
return res == string::npos ? 0 : res;
string::size_type const res = k.parse(seq);
if (res == string::npos)
- delkey(&k, func);
+ unbind(&k, func);
else
- LYXERR(Debug::KBMAP) << "Parse error at position " << res
- << " in key sequence '" << seq << "'."
- << endl;
+ LYXERR(Debug::KBMAP, "Parse error at position " << res
+ << " in key sequence '" << seq << "'.");
return res == string::npos ? 0 : res;
}
return false;
}
- LYXERR(Debug::KBMAP) << "Reading bind file:" << tmp << endl;
+ LYXERR(Debug::KBMAP, "Reading bind file:" << tmp);
bool error = false;
while (lexrc.isOK()) {
BindingList::const_iterator it = list.begin();
BindingList::const_iterator it_end = list.end();
for (; it != it_end; ++it) {
- kb_action action = it->get<0>().action;
- string arg = to_utf8(it->get<0>().argument());
+ kb_action action = it->request.action;
+ string arg = to_utf8(it->request.argument());
os << tag << " \""
- << to_utf8(it->get<1>().print(KeySequence::BindFile))
+ << to_utf8(it->sequence.print(KeySequence::BindFile))
<< "\" \""
<< lyxaction.getActionName(action)
<< (arg.empty() ? "" : " ") << arg
}
-void KeyMap::defkey(KeySequence * seq, FuncRequest const & func, unsigned int r)
+void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
KeySymbol code = seq->sequence[r];
if (!code.isOK())
&& mod2 == it->mod.second) {
// overwrite binding
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))
- << "' is overriding old binding..."
- << endl;
+ << "' is overriding old binding...");
if (it->table.get()) {
it->table.reset();
}
<< endl;
return;
} else {
- it->table->defkey(seq, func, r + 1);
+ it->table->bind(seq, func, r + 1);
return;
}
}
newone->table.reset();
} else {
newone->table.reset(new KeyMap);
- newone->table->defkey(seq, func, r + 1);
+ newone->table->bind(seq, func, r + 1);
}
}
-void KeyMap::delkey(KeySequence * seq, FuncRequest const & func, unsigned int r)
+void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
KeySymbol code = seq->sequence[r];
if (!code.isOK())
it->table.reset();
}
} else if (it->table.get()) {
- it->table->delkey(seq, func, r + 1);
+ it->table->unbind(seq, func, r + 1);
if (it->table->empty())
remove = it;
return;
}
-docstring const KeyMap::printbindings(FuncRequest const & func) const
+docstring KeyMap::printBindings(FuncRequest const & func) const
{
- Bindings bindings = findbindings(func);
+ Bindings bindings = findBindings(func);
if (bindings.empty())
return docstring();
}
-KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func) const
+KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func) const
{
- return findbindings(func, KeySequence(0, 0));
+ return findBindings(func, KeySequence(0, 0));
}
-KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func,
+KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func,
KeySequence const & prefix) const
{
Bindings res;
- if (table.empty()) return res;
+ if (table.empty())
+ return res;
Table::const_iterator end = table.end();
- for (Table::const_iterator cit = table.begin();
- cit != end; ++cit) {
+ for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
if (cit->table.get()) {
KeySequence seq = prefix;
seq.addkey(cit->code, cit->mod.first);
- Bindings res2 =
- cit->table->findbindings(func, seq);
+ Bindings res2 = cit->table->findBindings(func, seq);
res.insert(res.end(), res2.begin(), res2.end());
} else if (cit->func == func) {
KeySequence seq = prefix;
BindingList::const_iterator it = list.begin();
BindingList::const_iterator it_end = list.end();
for (; it != it_end; ++it)
- if (it->get<0>().action == action) {
+ if (it->request.action == action) {
has_action = true;
break;
}
if (!has_action)
- list.push_back(make_tuple(action, KeySequence(0, 0), tag));
+ list.push_back(Binding(FuncRequest(action), KeySequence(0, 0), tag));
}
}
return list;
} else {
KeySequence seq = prefix;
seq.addkey(it->code, it->mod.first);
- list.push_back(make_tuple(it->func, seq, tag));
+ list.push_back(Binding(it->func, seq, tag));
}
}
}