Add cancel button to password change menu. (#5720)

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

diff --git a/src/keycode.h b/src/keycode.h
index 4105d43b8a3c1f117626bbcfacb6175465560cf0..4cd0b707e5e015fee3dd0a79549e0dc4cbc44d07 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define KEYCODE_HEADER
 
 #include "irrlichttypes.h"
+#include "Keycodes.h"
 #include <IEventReceiver.h>
 #include <string>
 
@@ -33,18 +34,16 @@ public:
        KeyPress();
        KeyPress(const char *name);
 
-       KeyPress(const irr::SEvent::SKeyInput &in);
+       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);
+               return (Char > 0 && Char == o.Char) || (valid_kcode(Key) && Key == o.Key);
        }
 
        const char *sym() const;
        const char *name() const;
 
-       std::string debug() const;
 protected:
        static bool valid_kcode(irr::EKEY_CODE k)
        {
@@ -57,6 +56,7 @@ protected:
 };
 
 extern const KeyPress EscapeKey;
+extern const KeyPress CancelKey;
 extern const KeyPress NumberKey[10];
 
 // Key configuration getter
@@ -65,5 +65,6 @@ KeyPress getKeySetting(const char *settingname);
 // Clear fast lookup cache
 void clearKeyCache();
 
-#endif
+irr::EKEY_CODE keyname_to_keycode(const char *name);
 
+#endif