#include "frontends/LyXKeySym.h"
#include "support/filetools.h"
-#include "support/std_sstream.h"
-using lyx::support::i18nLibFileSearch;
+#include <sstream>
+
+
+namespace lyx {
+
+using support::FileName;
+using support::i18nLibFileSearch;
using std::endl;
using std::string;
}
-string const kb_keymap::printKey(kb_key const & key) const
-{
- return key.code->print(key.mod.first);
-}
-
-
string::size_type kb_keymap::bind(string const & seq, FuncRequest const & func)
{
if (lyxerr.debugging(Debug::KBMAP)) {
if (res == string::npos) {
defkey(&k, func);
} else {
- lyxerr[Debug::KBMAP] << "Parse error at position " << res
+ LYXERR(Debug::KBMAP) << "Parse error at position " << res
<< " in key sequence '" << seq << "'."
<< endl;
}
if (lyxerr.debugging(Debug::PARSER))
lexrc.printTable(lyxerr);
- string const tmp = i18nLibFileSearch("bind", bind_file, "bind");
+ FileName const tmp(i18nLibFileSearch("bind", bind_file, "bind"));
lexrc.setFile(tmp);
if (!lexrc.isOK()) {
lyxerr << "kb_keymap::read: cannot open bind file:"
return false;
}
- lyxerr[Debug::KBMAP] << "Reading bind file:" << tmp << endl;
+ LYXERR(Debug::KBMAP) << "Reading bind file:" << tmp << endl;
bool error = false;
while (lexrc.isOK()) {
if (cit->table.get()) {
// this is a prefix key - set new map
seq->curmap = cit->table.get();
- static FuncRequest prefix(LFUN_PREFIX);
+ static FuncRequest prefix(LFUN_COMMAND_PREFIX);
return prefix;
} else {
// final key - reset map
}
-string const kb_keymap::print() const
+docstring const kb_keymap::print(bool forgui) const
{
- string buf;
+ docstring buf;
Table::const_iterator end = table.end();
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
- buf += printKey((*cit));
+ buf += cit->code->print(cit->mod.first, forgui);
buf += ' ';
}
return buf;
&& mod2 == it->mod.second) {
// overwrite binding
if (r + 1 == seq->length()) {
- lyxerr[Debug::KBMAP]
+ LYXERR(Debug::KBMAP)
<< "Warning: New binding for '"
- << seq->print()
+ << to_utf8(seq->print(false))
<< "' is overriding old binding..."
<< endl;
if (it->table.get()) {
it->table.reset();
}
it->func = func;
+ it->func.origin = FuncRequest::KEYBOARD;
return;
} else if (!it->table.get()) {
- lyxerr << "Error: New binding for '" << seq->print()
+ lyxerr << "Error: New binding for '"
+ << to_utf8(seq->print(false))
<< "' is overriding old binding..."
<< endl;
return;
newone->mod = seq->modifiers[r];
if (r + 1 == seq->length()) {
newone->func = func;
+ newone->func.origin = FuncRequest::KEYBOARD;
newone->table.reset();
- return;
} else {
newone->table.reset(new kb_keymap);
newone->table->defkey(seq, func, r + 1);
- return;
}
}
-string const kb_keymap::printbindings(FuncRequest const & func) const
+docstring const kb_keymap::printbindings(FuncRequest const & func) const
{
- std::ostringstream res;
+ odocstringstream res;
Bindings bindings = findbindings(func);
for (Bindings::const_iterator cit = bindings.begin();
cit != bindings.end() ; ++cit)
- res << '[' << cit->print() << ']';
+ res << '[' << cit->print(true) << ']';
return res.str();
}
-kb_keymap::Bindings
+kb_keymap::Bindings
kb_keymap::findbindings(FuncRequest const & func) const
{
return findbindings(func, kb_sequence(0, 0));
}
-kb_keymap::Bindings
+kb_keymap::Bindings
kb_keymap::findbindings(FuncRequest const & func,
kb_sequence const & prefix) const
{
if (cit->table.get()) {
kb_sequence seq = prefix;
seq.addkey(cit->code, cit->mod.first);
- Bindings res2 =
+ Bindings res2 =
cit->table->findbindings(func, seq);
res.insert(res.end(), res2.begin(), res2.end());
} else if (cit->func == func) {
Table::const_iterator end = table.end();
for (Table::const_iterator cit = table.begin();
cit != end; ++cit) {
- if (!cit->table.get() && cit->func == func)
+ if (!cit->table.get() && cit->func == func)
return std::make_pair(cit->code.get(), cit->mod.first);
}
return std::make_pair<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
-}
+}
+
+
+} // namespace lyx