X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.C;h=b026b8630fee0a19c8565bfd159533b79080bc18;hb=27a777ccc624b19c5d1961a6279c0db97594c0fb;hp=1278af359d46ce00e44e2787901c95846d7a3d99;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/kbmap.C b/src/kbmap.C
index 1278af359d..b026b8630f 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -24,18 +24,24 @@
 
 #include "support/filetools.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::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-";
@@ -49,12 +55,6 @@ 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, FuncRequest const & func)
 {
 	if (lyxerr.debugging(Debug::KBMAP)) {
@@ -101,7 +101,7 @@ 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:"
@@ -112,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'");
@@ -154,7 +154,7 @@ bool kb_keymap::read(string const & bind_file)
 		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;
@@ -195,7 +195,7 @@ kb_keymap::lookup(LyXKeySymPtr key,
 			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
@@ -214,12 +214,12 @@ kb_keymap::lookup(LyXKeySymPtr key,
 }
 
 
-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;
@@ -246,16 +246,18 @@ void kb_keymap::defkey(kb_sequence * seq,
 			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->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;
@@ -271,36 +273,72 @@ void kb_keymap::defkey(kb_sequence * seq,
 	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::findbinding(FuncRequest const & func,
-				    string const & prefix) const
+docstring const kb_keymap::printbindings(FuncRequest const & func) const
 {
-	string res;
+	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
+{
+	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(func,
-						       prefix
-						       + printKey((*cit))
-						       + ' ');
+			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) {
-			res += '[';
-			res += prefix + printKey((*cit));
-			res += "] ";
+			kb_sequence seq = prefix;
+			seq.addkey(cit->code, cit->mod.first);
+			res.push_back(seq);
 		}
 	}
 
 	return res;
 }
+
+
+std::pair<LyXKeySym const *, key_modifier::state>
+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<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
+}
+
+
+} // namespace lyx