X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.h;h=b2f2af92102855399ef6157475687945befe392d;hb=0de182f2571c1ab327843cc281bc1f5302058e26;hp=9c1ddecd2259d3858e4dcb7cef6050e96a7b6b8b;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/kbmap.h b/src/kbmap.h
index 9c1ddecd22..b2f2af9210 100644
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -11,14 +11,11 @@
 #ifndef KBMAP_H
 #define KBMAP_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include "LString.h"
+#include "frontends/key_state.h"
+#include "frontends/LyXKeySym.h"
 
 #include <list>
-#include <boost/smart_ptr.hpp>
-
-#include "LString.h"
 
 class kb_sequence;
 
@@ -29,6 +26,7 @@ public:
 	 * Bind a key sequence to an action.
 	 * @return 0 on success, or position in string seq where error
 	 * occurs.
+	 * See kb_sequence::parse for the syntax of the seq string
 	 */
 	string::size_type bind(string const & seq, int action);
 
@@ -42,8 +40,8 @@ public:
 	 * @param seq the current key sequence so far
 	 * @return the action / LFUN_PREFIX / LFUN_UNKNOWN_ACTION
 	 */
-	int lookup(unsigned int key,
-		   unsigned int mod, kb_sequence * seq) const;
+	int lookup(LyXKeySymPtr key,
+		   key_modifier::state mod, kb_sequence * seq) const;
 
 	/// Given an action, find all keybindings.
 	string const findbinding(int action,
@@ -51,22 +49,22 @@ public:
 
 	/**
 	 * Returns a string of the given keysym, with modifiers.
-	 * @param key the key
+	 * @param key the key as a keysym
 	 * @param mod the modifiers
 	 */
-	static string const printKeysym(unsigned int key, unsigned int mod);
+	static string const printKeysym(LyXKeySymPtr key,
+					key_modifier::state mod);
 
-	/// return the ISO value of a keysym
-	static char getiso(unsigned int i);
+	typedef std::pair<key_modifier::state, key_modifier::state> modifier_pair;
 
 private:
 	///
 	struct kb_key {
 		/// Keysym
-		unsigned int code;
+		LyXKeySymPtr code;
 
 		/// Modifier masks
-		unsigned int mod;
+		modifier_pair mod;
 
 		/// Keymap for prefix keys
 		boost::shared_ptr<kb_keymap> table;
@@ -75,7 +73,6 @@ private:
 		int action;
 	};
 
-
 	/**
 	 * Define an action for a key sequence.
 	 * @param r internal recursion level