X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fkeycode.h;h=4cd0b707e5e015fee3dd0a79549e0dc4cbc44d07;hb=6658ad3d94c053eeed12bb79e255cdfa46831e19;hp=65f04d8d738aade49277d0748c2114d18dc23ad6;hpb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;p=minetest.git diff --git a/src/keycode.h b/src/keycode.h index 65f04d8d7..4cd0b707e 100644 --- a/src/keycode.h +++ b/src/keycode.h @@ -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 #include @@ -33,18 +34,16 @@ class KeyPress KeyPress(); KeyPress(const char *name); - KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character=false); + 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 @@ class KeyPress }; 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