X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.C;h=b026b8630fee0a19c8565bfd159533b79080bc18;hb=4c1fb15143fb203b763f3dcdeee55567bbad8b1f;hp=c6ef06ed3ec2b0e669cc144c5d4457a932e81969;hpb=91de22ef340abbf1e9ba7d422bcd9024fa90d63f;p=lyx.git diff --git a/src/kbmap.C b/src/kbmap.C index c6ef06ed3e..b026b8630f 100644 --- a/src/kbmap.C +++ b/src/kbmap.C @@ -14,21 +14,34 @@ #include #include "kbmap.h" + +#include "debug.h" #include "kbsequence.h" #include "LyXAction.h" -#include "support/filetools.h" #include "lyxlex.h" -#include "debug.h" + +#include "frontends/LyXKeySym.h" + +#include "support/filetools.h" + +#include + + +namespace lyx { + +using support::FileName; +using support::i18nLibFileSearch; using std::endl; -using lyx::support::i18nLibFileSearch; +using std::string; + -string const kb_keymap::printKeysym(LyXKeySymPtr key, +string const kb_keymap::printKeySym(LyXKeySym const & key, key_modifier::state mod) { string buf; - string const s = key->getSymbolName(); + string const s = key.getSymbolName(); if (mod & key_modifier::shift) buf += "S-"; @@ -42,25 +55,19 @@ string const kb_keymap::printKeysym(LyXKeySymPtr key, } -string const kb_keymap::printKey(kb_key const & key) const -{ - return printKeysym(key.code, key.mod.first); -} - - -string::size_type kb_keymap::bind(string const & seq, int action) +string::size_type kb_keymap::bind(string const & seq, FuncRequest const & func) { if (lyxerr.debugging(Debug::KBMAP)) { lyxerr << "BIND: Sequence `" << seq << "' Action `" - << action << '\'' << endl; + << func.action << '\'' << endl; } kb_sequence k(0, 0); string::size_type const res = k.parse(seq); if (res == string::npos) { - defkey(&k, action); + defkey(&k, func); } else { lyxerr[Debug::KBMAP] << "Parse error at position " << res << " in key sequence '" << seq << "'." @@ -86,7 +93,7 @@ keyword_item bindTags[] = { } -bool kb_keymap::read(string const & bind_file) +bool kb_keymap::read(string const & bind_file) { const int bindCount = sizeof(bindTags) / sizeof(keyword_item); @@ -94,10 +101,10 @@ bool kb_keymap::read(string const & bind_file) 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:" + lyxerr << "kb_keymap::read: cannot open bind file:" << tmp << endl; return false; } @@ -105,7 +112,7 @@ bool kb_keymap::read(string const & bind_file) lyxerr[Debug::KBMAP] << "Reading bind file:" << tmp << endl; bool error = false; - while (!error && lexrc.isOK()) { + while (lexrc.isOK()) { switch (lexrc.lex()) { case LyXLex::LEX_UNDEF: lexrc.printError("Unknown tag `$$Token'"); @@ -116,7 +123,7 @@ bool kb_keymap::read(string const & bind_file) case BN_BIND: { string seq, cmd; - + if (lexrc.next()) { seq = lexrc.getString(); } else { @@ -124,7 +131,7 @@ bool kb_keymap::read(string const & bind_file) error = true; break; } - + if (lexrc.next(true)) { cmd = lexrc.getString(); } else { @@ -132,22 +139,22 @@ bool kb_keymap::read(string const & bind_file) error = true; break; } - - int action = lyxaction.LookupFunc(cmd); - if (!action == LFUN_UNKNOWN_ACTION) { + + FuncRequest func = lyxaction.lookupFunc(cmd); + if (func. action == LFUN_UNKNOWN_ACTION) { lexrc.printError("BN_BIND: Unknown LyX" " function `$$Token'"); error = true; break; } - - bind(seq, kb_action(action)); + + bind(seq, func); break; } case BN_BINDFILE: if (lexrc.next()) { string const tmp(lexrc.getString()); - error = !read(tmp); + error |= !read(tmp); } else { lexrc.printError("BN_BINDFILE: Missing file name"); error = true; @@ -159,19 +166,22 @@ bool kb_keymap::read(string const & bind_file) } if (error) - lyxerr << "kb_keymap::read: error while reading bind file:" + lyxerr << "kb_keymap::read: error while reading bind file:" << tmp << endl; return !error; } -int kb_keymap::lookup(LyXKeySymPtr key, - key_modifier::state mod, kb_sequence * seq) const +FuncRequest const & +kb_keymap::lookup(LyXKeySymPtr key, + key_modifier::state mod, kb_sequence * seq) const { + static FuncRequest const unknown(LFUN_UNKNOWN_ACTION); + if (table.empty()) { seq->curmap = seq->stdmap; seq->mark_deleted(); - return LFUN_UNKNOWN_ACTION; + return unknown; } Table::const_iterator end = table.end(); @@ -185,12 +195,13 @@ int kb_keymap::lookup(LyXKeySymPtr key, if (cit->table.get()) { // this is a prefix key - set new map seq->curmap = cit->table.get(); - return LFUN_PREFIX; + static FuncRequest prefix(LFUN_COMMAND_PREFIX); + return prefix; } else { // final key - reset map seq->curmap = seq->stdmap; seq->mark_deleted(); - return cit->action; + return cit->func; } } } @@ -198,23 +209,25 @@ int kb_keymap::lookup(LyXKeySymPtr key, // error - key not found: seq->curmap = seq->stdmap; seq->mark_deleted(); - return LFUN_UNKNOWN_ACTION; + + return unknown; } -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; } -void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r) +void kb_keymap::defkey(kb_sequence * seq, + FuncRequest const & func, unsigned int r) { LyXKeySymPtr code = seq->sequence[r]; if (!code->isOK()) @@ -233,21 +246,23 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r) if (r + 1 == seq->length()) { 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->action = action; + 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; } else { - it->table->defkey(seq, action, r + 1); + it->table->defkey(seq, func, r + 1); return; } } @@ -257,35 +272,73 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r) newone->code = code; newone->mod = seq->modifiers[r]; if (r + 1 == seq->length()) { - newone->action = action; + newone->func = func; + newone->func.origin = FuncRequest::KEYBOARD; newone->table.reset(); - return; } else { newone->table.reset(new kb_keymap); - newone->table->defkey(seq, action, r + 1); - return; + newone->table->defkey(seq, func, r + 1); } } -string const kb_keymap::findbinding(int act, string const & prefix) const +docstring const kb_keymap::printbindings(FuncRequest const & func) const +{ + odocstringstream res; + Bindings bindings = findbindings(func); + for (Bindings::const_iterator cit = bindings.begin(); + cit != bindings.end() ; ++cit) + res << '[' << cit->print(true) << ']'; + return res.str(); +} + + +kb_keymap::Bindings +kb_keymap::findbindings(FuncRequest const & func) const { - string res; + return findbindings(func, kb_sequence(0, 0)); +} + + +kb_keymap::Bindings +kb_keymap::findbindings(FuncRequest const & func, + kb_sequence const & prefix) const +{ + Bindings res; if (table.empty()) return res; Table::const_iterator end = table.end(); for (Table::const_iterator cit = table.begin(); cit != end; ++cit) { if (cit->table.get()) { - res += cit->table->findbinding(act, - prefix - + printKey((*cit)) - + ' '); - } else if (cit->action == act) { - res += '['; - res += prefix + printKey((*cit)); - res += "] "; + kb_sequence seq = prefix; + seq.addkey(cit->code, cit->mod.first); + Bindings res2 = + cit->table->findbindings(func, seq); + res.insert(res.end(), res2.begin(), res2.end()); + } else if (cit->func == func) { + kb_sequence seq = prefix; + seq.addkey(cit->code, cit->mod.first); + res.push_back(seq); } } + return res; } + + +std::pair +kb_keymap::find1keybinding(FuncRequest const & func) const +{ + Table::const_iterator end = table.end(); + for (Table::const_iterator cit = table.begin(); + cit != end; ++cit) { + if (!cit->table.get() && cit->func == func) + return std::make_pair(cit->code.get(), cit->mod.first); + } + + return std::make_pair(0, key_modifier::none); +} + + +} // namespace lyx