utility.h: Change Buffer's interface to be more compatible with SharedBuffer's interf...

[oweals/minetest.git] / src / keycode.h

diff --git a/src/keycode.h b/src/keycode.h
index 614f2e584ca45aac937710f786d0219122fb27d5..28fb3f1fb86ccaf7ba7e3e85c0dd077b82407a65 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -23,11 +23,45 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common_irrlicht.h"
 #include <string>
 
-irr::EKEY_CODE keyname_to_keycode(const char *name);
+/* A key press, consisting of either an Irrlicht keycode
+   or an actual char */
+
+class KeyPress
+{
+public:
+       KeyPress();
+       KeyPress(const char *name);
+
+       KeyPress(const irr::SEvent::SKeyInput &in);
+
+       bool operator==(const KeyPress &o) const
+       {
+               return valid_kcode(Key) ? Key == o.Key : Char == o.Char;
+       }
+
+       const char *sym() const;
+       const char *name() const;
+
+       std::string debug() const;
+protected:
+       static bool valid_kcode(irr::EKEY_CODE k)
+       {
+               return k > 0 && k < irr::KEY_KEY_CODES_COUNT;
+       }
+
+       irr::EKEY_CODE Key;
+       wchar_t Char;
+       std::string m_name;
+};
+
+extern const KeyPress EscapeKey;
+extern const KeyPress NumberKey[10];
 
 // Key configuration getter
-irr::EKEY_CODE getKeySetting(const char *settingname);
-std::string keycode_to_keyname(s32 keycode);
-void clearCache();
+KeyPress getKeySetting(const char *settingname);
+
+// Clear fast lookup cache
+void clearKeyCache();
+
 #endif