enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / LyXKeySym.h

diff --git a/src/frontends/LyXKeySym.h b/src/frontends/LyXKeySym.h
index 7c60b169eef5e267d05f5867ec255adc2d78c99f..4bad77316c861d4f34d7f2a2c2c86c2ca33cba30 100644 (file)
--- a/src/frontends/LyXKeySym.h
+++ b/src/frontends/LyXKeySym.h
@@ -4,15 +4,18 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Asger and Juergen
+ * \author Asger and Jürgen
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYXKEYSYM_H
 #define LYXKEYSYM_H
 
-#include "LString.h"
+#include <string>
+
+#include "key_state.h"
+
 #include <boost/shared_ptr.hpp>
 
 /**
@@ -28,7 +31,7 @@ public:
        virtual ~LyXKeySym() {}
 
        /// Initialize with the name of a key. F. ex. "space" or "a"
-       virtual void init(string const & symbolname) = 0;
+       virtual void init(std::string const & symbolname) = 0;
 
        /// Is this a valid key?
        virtual bool isOK() const = 0;
@@ -36,15 +39,23 @@ public:
        /// Is this a modifier key only?
        virtual bool isModifier() const = 0;
 
+       /// Is this normal insertable text ? (last ditch attempt only)
+       virtual bool isText() const = 0;
+
        /// What is the symbolic name of this key? F.ex. "Return" or "c"
-       virtual string getSymbolName() const = 0;
+       virtual std::string getSymbolName() const = 0;
+
+       /**
+        * Return the value of the keysym into the UCS-4 encoding.
+        * This converts the LyXKeySym to a 32-bit encoded character.
+        */
+       virtual size_t getUCSEncoded() const = 0;
 
        /**
-        * Return the value of the keysym into the local ISO encoding.
-        * This converts the LyXKeySym to a 8-bit encoded character.
-        * This relies on user to use the right encoding.
+        * Return a string describing the KeySym with modifier mod.
+        * This should use the native UI format when applicable
         */
-       virtual char getISOEncoded() const = 0;
+       virtual std::string const print(key_modifier::state mod) const = 0;
 };
 
 
@@ -52,7 +63,7 @@ public:
  * We need to be able to equality compare these for the
  * sake of the keymap business.
  */
-bool operator==(LyXKeySym const & k1, LyXKeySym const & k1);
+bool operator==(LyXKeySym const & k1, LyXKeySym const & k2);
 
 typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;