X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.C;h=b026b8630fee0a19c8565bfd159533b79080bc18;hb=4c1fb15143fb203b763f3dcdeee55567bbad8b1f;hp=55f7b025238b0d530957525ccaf6bb48e754d660;hpb=025f30b36150bdbe404687a5d9656d3b7fab8445;p=lyx.git

diff --git a/src/kbmap.C b/src/kbmap.C
index 55f7b02523..b026b8630f 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -23,9 +23,14 @@
 #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;
@@ -50,12 +55,6 @@ string const kb_keymap::printKeySym(LyXKeySym const & key,
 }
 
 
-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)) {
@@ -102,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:"
@@ -196,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
@@ -215,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;
@@ -247,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;
@@ -272,35 +273,34 @@ 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::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
 {
@@ -313,7 +313,7 @@ kb_keymap::findbindings(FuncRequest const & func,
 		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) {
@@ -325,3 +325,20 @@ kb_keymap::findbindings(FuncRequest const & func,
 
 	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