From 774481b682d56faa3aeff527312c9b582a800566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 22 Apr 2016 17:38:25 +0200 Subject: [PATCH] Platform: MOAR keys in Sdl2Application. And reordered GlfwApplication key enum to be consistent with the rest. --- src/Magnum/Platform/GlfwApplication.h | 22 ++++++++++++---------- src/Magnum/Platform/Sdl2Application.h | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index 3b9dd98b6..77e82bf72 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -577,10 +577,21 @@ class GlfwApplication::KeyEvent: public GlfwApplication::InputEvent { enum class Key: Int { Unknown = GLFW_KEY_UNKNOWN, /**< Unknown key */ + Enter = GLFW_KEY_ENTER, /**< Enter */ + Esc = GLFW_KEY_ESCAPE, /**< Escape */ + Up = GLFW_KEY_UP, /**< Up arrow */ Down = GLFW_KEY_DOWN, /**< Down arrow */ Left = GLFW_KEY_LEFT, /**< Left arrow */ Right = GLFW_KEY_RIGHT, /**< Right arrow */ + Home = GLFW_KEY_HOME, /**< Home */ + End = GLFW_KEY_END, /**< End */ + PageUp = GLFW_KEY_PAGE_UP, /**< Page up */ + PageDown = GLFW_KEY_PAGE_DOWN, /**< Page down */ + Backspace = GLFW_KEY_BACKSPACE, /**< Backspace */ + Insert = GLFW_KEY_INSERT, /**< Insert */ + Delete = GLFW_KEY_DELETE, /**< Delete */ + F1 = GLFW_KEY_F1, /**< F1 */ F2 = GLFW_KEY_F2, /**< F2 */ F3 = GLFW_KEY_F3, /**< F3 */ @@ -593,12 +604,9 @@ class GlfwApplication::KeyEvent: public GlfwApplication::InputEvent { F10 = GLFW_KEY_F10, /**< F10 */ F11 = GLFW_KEY_F11, /**< F11 */ F12 = GLFW_KEY_F12, /**< F12 */ - Home = GLFW_KEY_HOME, /**< Home */ - End = GLFW_KEY_END, /**< End */ - PageUp = GLFW_KEY_PAGE_UP, /**< Page up */ - PageDown = GLFW_KEY_PAGE_DOWN, /**< Page down */ Space = ' ', /**< Space */ + Tab = '\t', /**< Tab */ Comma = ',', /**< Comma */ Period = '.', /**< Period */ Minus = '-', /**< Minus */ @@ -647,12 +655,6 @@ class GlfwApplication::KeyEvent: public GlfwApplication::InputEvent { Z = 'z', /**< Letter Z */ /* Function keys */ - Esc = GLFW_KEY_ESCAPE, /**< Escape */ - Enter = GLFW_KEY_ENTER, /**< Enter */ - Tab = GLFW_KEY_TAB, /**< Tab */ - Backspace = GLFW_KEY_BACKSPACE, /**< Backspace */ - Insert = GLFW_KEY_INSERT, /**< Insert */ - Delete = GLFW_KEY_DELETE, /**< Delete */ CapsLock = GLFW_KEY_CAPS_LOCK, /**< Caps lock */ ScrollLock = GLFW_KEY_SCROLL_LOCK, /**< Scroll lock */ NumLock = GLFW_KEY_NUM_LOCK, /**< Num lock */ diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 38e92bd52..ea14d4a76 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -1004,6 +1004,8 @@ class Sdl2Application::KeyEvent: public Sdl2Application::InputEvent { * @see @ref key() */ enum class Key: SDL_Keycode { + Unknown = SDLK_UNKNOWN, /**< Unknown key */ + Enter = SDLK_RETURN, /**< Enter */ Esc = SDLK_ESCAPE, /**< Escape */ @@ -1011,6 +1013,14 @@ class Sdl2Application::KeyEvent: public Sdl2Application::InputEvent { Down = SDLK_DOWN, /**< Down arrow */ Left = SDLK_LEFT, /**< Left arrow */ Right = SDLK_RIGHT, /**< Right arrow */ + Home = SDLK_HOME, /**< Home */ + End = SDLK_END, /**< End */ + PageUp = SDLK_PAGEUP, /**< Page up */ + PageDown = SDLK_PAGEDOWN, /**< Page down */ + Backspace = SDLK_BACKSPACE, /**< Backspace */ + Insert = SDLK_INSERT, /**< Insert */ + Delete = SDLK_DELETE, /**< Delete */ + F1 = SDLK_F1, /**< F1 */ F2 = SDLK_F2, /**< F2 */ F3 = SDLK_F3, /**< F3 */ @@ -1023,18 +1033,16 @@ class Sdl2Application::KeyEvent: public Sdl2Application::InputEvent { F10 = SDLK_F10, /**< F10 */ F11 = SDLK_F11, /**< F11 */ F12 = SDLK_F12, /**< F12 */ - Home = SDLK_HOME, /**< Home */ - End = SDLK_END, /**< End */ - PageUp = SDLK_PAGEUP, /**< Page up */ - PageDown = SDLK_PAGEDOWN, /**< Page down */ Space = SDLK_SPACE, /**< Space */ + Tab = SDLK_TAB, /**< Tab */ Comma = SDLK_COMMA, /**< Comma */ Period = SDLK_PERIOD, /**< Period */ Minus = SDLK_MINUS, /**< Minus */ Plus = SDLK_PLUS, /**< Plus */ Slash = SDLK_SLASH, /**< Slash */ Percent = SDLK_PERCENT, /**< Percent */ + Semicolon = SDLK_SEMICOLON, /**< Semicolon */ Equal = SDLK_EQUALS, /**< Equal */ Zero = SDLK_0, /**< Zero */