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

diff --git a/src/kbmap.C b/src/kbmap.C
index 55f7b02523..30161748cb 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -23,9 +23,13 @@
 #include "frontends/LyXKeySym.h"
 
 #include "support/filetools.h"
-#include "support/std_sstream.h"
 
-using lyx::support::i18nLibFileSearch;
+#include <sstream>
+
+
+namespace lyx {
+
+using support::i18nLibFileSearch;
 
 using std::endl;
 using std::string;
@@ -196,7 +200,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
@@ -254,6 +258,7 @@ void kb_keymap::defkey(kb_sequence * seq,
 					it->table.reset();
 				}
 				it->func = func;
+				it->func.origin = FuncRequest::KEYBOARD;
 				return;
 			} else if (!it->table.get()) {
 				lyxerr << "Error: New binding for '" << seq->print()
@@ -272,6 +277,7 @@ 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 {
@@ -293,14 +299,14 @@ string const kb_keymap::printbindings(FuncRequest const & func) const
 }
 
 
-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 +319,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 +331,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