namespace lyx {
-
string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
{
string buf;
size_t KeyMap::bind(string const & seq, FuncRequest const & func)
{
LYXERR(Debug::KBMAP, "BIND: Sequence `" << seq << "' Action `"
- << func.action << '\'');
+ << func.action() << '\'');
KeySequence k(0, 0);
it->prefixes.reset();
}
it->func = func;
- it->func.origin = FuncRequest::KEYBOARD;
+ it->func.setOrigin(FuncRequest::KEYBOARD);
return;
} else if (!it->prefixes.get()) {
lyxerr << "Error: New binding for '"
newone->mod = seq->modifiers[r];
if (r + 1 == seq->length()) {
newone->func = func;
- newone->func.origin = FuncRequest::KEYBOARD;
+ newone->func.setOrigin(FuncRequest::KEYBOARD);
newone->prefixes.reset();
} else {
newone->prefixes.reset(new KeyMap);
bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
+{
+ ReturnValues retval = readWithoutConv(bind_file, unbind_map);
+ if (retval != FormatMismatch)
+ return retval == ReadOK;
+
+ LYXERR(Debug::FILES, "Converting bind file to " << LFUN_FORMAT);
+ FileName const tempfile = FileName::tempName("convert_bind");
+ bool const success = prefs2prefs(bind_file, tempfile, true);
+ if (!success) {
+ LYXERR0 ("Unable to convert " << bind_file <<
+ " to format " << LFUN_FORMAT);
+ return false;
+ }
+ retval = readWithoutConv(tempfile, unbind_map);
+ tempfile.removeFile();
+ return retval == ReadOK;
+}
+
+
+KeyMap::ReturnValues KeyMap::readWithoutConv(FileName const & bind_file, KeyMap * unbind_map)
{
enum {
BN_BIND,
BN_BINDFILE,
- BN_UNBIND,
+ BN_FORMAT,
+ BN_UNBIND
};
LexerKeyword bindTags[] = {
{ "\\bind", BN_BIND },
{ "\\bind_file", BN_BINDFILE },
{ "\\unbind", BN_UNBIND },
+ { "format", BN_FORMAT }
};
Lexer lexrc(bindTags);
lexrc.setFile(bind_file);
if (!lexrc.isOK()) {
- LYXERR0("KeyMap::read: cannot open bind file:" << bind_file.absFilename());
- return false;
+ LYXERR0("KeyMap::read: cannot open bind file:" << bind_file.absFileName());
+ return FileError;
}
- LYXERR(Debug::KBMAP, "Reading bind file:" << bind_file.absFilename());
+ 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;
bool error = false;
while (lexrc.isOK()) {
switch (lexrc.lex()) {
case Lexer::LEX_FEOF:
continue;
+ case BN_FORMAT:
+ if (lexrc.next())
+ format = lexrc.getInteger();
+ break;
+
case BN_BIND: {
if (!lexrc.next()) {
lexrc.printError("BN_BIND: Missing key sequence");
string cmd = lexrc.getString();
FuncRequest func = lyxaction.lookupFunc(cmd);
- if (func.action == LFUN_UNKNOWN_ACTION) {
+ if (func.action() == LFUN_UNKNOWN_ACTION) {
lexrc.printError("BN_BIND: Unknown LyX function `$$Token'");
error = true;
break;
string cmd = lexrc.getString();
FuncRequest func = lyxaction.lookupFunc(cmd);
- if (func.action == LFUN_UNKNOWN_ACTION) {
+ if (func.action() == LFUN_UNKNOWN_ACTION) {
lexrc.printError("BN_UNBIND: Unknown LyX"
" function `$$Token'");
error = true;
break;
}
-
+
if (unbind_map)
unbind_map->bind(seq, func);
else
error |= !read(tmp, unbind_map);
break;
}
+
+ // This is triggered the first time through the loop unless
+ // we hit a format tag.
+ if (format != LFUN_FORMAT)
+ return FormatMismatch;
}
- if (error)
- LYXERR0("KeyMap::read: error while reading bind file:" << bind_file.absFilename());
- return !error;
+ if (error) {
+ LYXERR0("KeyMap::read: error while reading bind file:" << bind_file.absFileName());
+ return ReadError;
+ }
+ return ReadOK;
}
void KeyMap::write(string const & bind_file, bool append, bool unbind) const
{
- ofstream os(bind_file.c_str(),
+ ofstream os(bind_file.c_str(),
append ? (ios::app | ios::out) : ios::out);
if (!append)
os << "## This file is automatically generated by lyx\n"
- << "## All modifications will be lost\n\n";
-
+ << "## All modifications will be lost\n\n"
+ << "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;
+ FuncCode action = it->request.action();
string arg = to_utf8(it->request.argument());
+ string const cmd = lyxaction.getActionName(action)
+ + (arg.empty() ? string() : " " + arg) ;
os << tag << " \""
- << to_utf8(it->sequence.print(KeySequence::BindFile))
- << "\" \""
- << lyxaction.getActionName(action)
- << (arg.empty() ? "" : " ") << arg
- << "\"\n";
+ << to_utf8(it->sequence.print(KeySequence::BindFile))
+ << "\" " << Lexer::quoteString(cmd)
+ << "\n";
}
os << "\n";
os.close();
BindingList::const_iterator bit = list.begin();
BindingList::const_iterator const ben = list.end();
for (; bit != ben; ++bit)
- if (bit->request.action == action) {
+ if (bit->request.action() == action) {
has_action = true;
break;
}