X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.h;h=63bf3c05db07f3a764572e57f5155b4cb6e353e7;hb=e94889a041628203c50b66b9a4add63210de6928;hp=38516d8644bc512fbab831eab05721cd7bd9e8da;hpb=0f9678630c661df5e3376c16cab3a5b2824871e9;p=lyx.git

diff --git a/src/kbmap.h b/src/kbmap.h
index 38516d8644..63bf3c05db 100644
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -14,15 +14,17 @@
 #ifndef KBMAP_H
 #define KBMAP_H
 
+#include "funcrequest.h"
+
 #include "frontends/key_state.h"
+#include "frontends/LyXKeySym.h"
 
 #include <boost/shared_ptr.hpp>
 
-#include "support/std_string.h"
 #include <vector>
+#include <deque>
 
 class kb_sequence;
-class LyXKeySym;
 
 /// Defines key maps and actions for key sequences
 class kb_keymap {
@@ -33,37 +35,50 @@ public:
 	 * occurs.
 	 * See kb_sequence::parse for the syntax of the seq string
 	 */
-	string::size_type bind(string const & seq, int action);
+	std::string::size_type bind(std::string const & seq, FuncRequest const & func);
 
 	// Parse a bind file
-	bool kb_keymap::read(string const & bind_file);
+	bool read(std::string const & bind_file);
 
 	/// print all available keysyms
-	string const print() const;
+	std::string const print() const;
 
-	///
-	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
 	/**
 	 * Look up a key press in the keymap.
 	 * @param key the keysym
 	 * @param mod the modifiers
 	 * @param seq the current key sequence so far
-	 * @return the action / LFUN_PREFIX / LFUN_UNKNOWN_ACTION
+	 * @return the action / LFUN_COMMAND_PREFIX / LFUN_UNKNOWN_ACTION
 	 */
-	int lookup(LyXKeySymPtr key,
-		   key_modifier::state mod, kb_sequence * seq) const;
+	FuncRequest const &
+	lookup(LyXKeySymPtr key,
+	       key_modifier::state mod, kb_sequence * seq) const;
+
+	///
+	typedef std::deque<kb_sequence> Bindings;
 
 	/// Given an action, find all keybindings.
-	string const findbinding(int action,
-				 string const & prefix = string()) const;
+	Bindings findbindings(FuncRequest const & func) const;
+
+	/// Given an action, print the keybindings.
+	std::string const printbindings(FuncRequest const & func) const;
+
+	/**
+	 *  Given an action, find the first 1-key binding (if it exists).
+	 *  The LyXKeySym pointer is 0 is no key is found.
+	 *  [only used by the Qt/Mac frontend]
+	 */
+	std::pair<LyXKeySym const *, key_modifier::state>
+	find1keybinding(FuncRequest const & func) const;
+
 
 	/**
 	 * Returns a string of the given keysym, with modifiers.
 	 * @param key the key as a keysym
 	 * @param mod the modifiers
 	 */
-	static string const printKeysym(LyXKeySymPtr key,
-					key_modifier::state mod);
+	static std::string const printKeySym(LyXKeySym const & key,
+					     key_modifier::state mod);
 
 	typedef std::pair<key_modifier::state, key_modifier::state> modifier_pair;
 
@@ -80,17 +95,26 @@ private:
 		boost::shared_ptr<kb_keymap> table;
 
 		/// Action for !prefix keys
-		int action;
+		FuncRequest func;
 	};
 
 	/**
 	 * Define an action for a key sequence.
 	 * @param r internal recursion level
 	 */
-	void defkey(kb_sequence * seq, int action, unsigned int r = 0);
+	void defkey(kb_sequence * seq, FuncRequest const & func,
+		    unsigned int r = 0);
 
 	///  Returns a string of the given key
-	string const printKey(kb_key const & key) const;
+	std::string const printKey(kb_key const & key) const;
+
+	/**
+	 * Given an action, find all keybindings
+	 * @param func the action
+	 * @param prefix a sequence to prepend the results
+	 */
+	Bindings findbindings(FuncRequest const & func,
+			      kb_sequence const & prefix) const;
 
 	/// is the table empty ?
 	bool empty() const {