Fix OSX builds (closes #6289, fixes #6270) (#6306)

[dragonfireclient.git] / src / keycode.h

diff --git a/src/keycode.h b/src/keycode.h
index 9c62004d8f744644185d61ad4ded8bfab9abb4a1..7036705d16a486dcf8d0673b386b11c27001c3d8 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -1,34 +1,67 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef KEYCODE_HEADER
-#define KEYCODE_HEADER
+#pragma once
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
+#include "Keycodes.h"
+#include <IEventReceiver.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() = default;
+
+       KeyPress(const char *name);
+
+       KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character = false);
+
+       bool operator==(const KeyPress &o) const
+       {
+               return (Char > 0 && Char == o.Char) || (valid_kcode(Key) && Key == o.Key);
+       }
+
+       const char *sym() const;
+       const char *name() const;
+
+protected:
+       static bool valid_kcode(irr::EKEY_CODE k)
+       {
+               return k > 0 && k < irr::KEY_KEY_CODES_COUNT;
+       }
+
+       irr::EKEY_CODE Key = irr::KEY_KEY_CODES_COUNT;
+       wchar_t Char = L'\0';
+       std::string m_name = "";
+};
+
+extern const KeyPress EscapeKey;
+extern const KeyPress CancelKey;
 
 // Key configuration getter
-irr::EKEY_CODE getKeySetting(const char *settingname);
-std::string keycode_to_keyname(s32 keycode);
-void clearCache();
+KeyPress getKeySetting(const char *settingname);
 
-#endif
+// Clear fast lookup cache
+void clearKeyCache();
 
+irr::EKEY_CODE keyname_to_keycode(const char *name);