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

diff --git a/src/kbmap.h b/src/kbmap.h
index 9c1ddecd22..f2a9cd1260 100644
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -1,24 +1,24 @@
 // -*- C++ -*-
 /**
  * \file kbmap.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes <larsbj@lyx.org>
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef KBMAP_H
 #define KBMAP_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include <list>
-#include <boost/smart_ptr.hpp>
-
 #include "LString.h"
+#include "frontends/key_state.h"
+#include "frontends/LyXKeySym.h"
+
+#include <vector>
 
 class kb_sequence;
 
@@ -29,9 +29,13 @@ 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);
 
+	// Parse a bind file
+	bool kb_keymap::read(string const & bind_file);
+
 	/// print all available keysyms
 	string const print() const;
 
@@ -42,8 +46,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 +55,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 +79,6 @@ private:
 		int action;
 	};
 
-
 	/**
 	 * Define an action for a key sequence.
 	 * @param r internal recursion level
@@ -90,7 +93,7 @@ private:
 		return table.empty();
 	}
 	///
-	typedef std::list<kb_key> Table;
+	typedef std::vector<kb_key> Table;
 	///
 	Table table;
 };