Browse Source

Change GLFW keymappings to use actual GLFW defines

Note that the `Plus` and `Percent` keys are not available without using
the SHIFT key on the typical US English keyboard layout, and as such do
not have dedicated `#define`'s in `GLFW.h`.
pull/160/head
Elliot Saba 10 years ago
parent
commit
7fd78b28fb
  1. 158
      src/Magnum/Platform/GlfwApplication.h

158
src/Magnum/Platform/GlfwApplication.h

@ -558,84 +558,86 @@ class GlfwApplication::KeyEvent: public GlfwApplication::InputEvent {
* @see @ref key()
*/
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 */
F4 = GLFW_KEY_F4, /**< F4 */
F5 = GLFW_KEY_F5, /**< F5 */
F6 = GLFW_KEY_F6, /**< F6 */
F7 = GLFW_KEY_F7, /**< F7 */
F8 = GLFW_KEY_F8, /**< F8 */
F9 = GLFW_KEY_F9, /**< F9 */
F10 = GLFW_KEY_F10, /**< F10 */
F11 = GLFW_KEY_F11, /**< F11 */
F12 = GLFW_KEY_F12, /**< F12 */
Space = ' ', /**< Space */
Tab = '\t', /**< Tab */
Comma = ',', /**< Comma */
Period = '.', /**< Period */
Minus = '-', /**< Minus */
Plus = '+', /**< Plus */
Slash = '/', /**< Slash */
Percent = '%', /**< Percent */
Smicolon = ';', /**< Semicolon */
Equal = '=', /**< Equal */
Zero = '0', /**< Zero */
One = '1', /**< One */
Two = '2', /**< Two */
Three = '3', /**< Three */
Four = '4', /**< Four */
Five = '5', /**< Five */
Six = '6', /**< Six */
Seven = '7', /**< Seven */
Eight = '8', /**< Eight */
Nine = '9', /**< Nine */
A = 'a', /**< Letter A */
B = 'b', /**< Letter B */
C = 'c', /**< Letter C */
D = 'd', /**< Letter D */
E = 'e', /**< Letter E */
F = 'f', /**< Letter F */
G = 'g', /**< Letter G */
H = 'h', /**< Letter H */
I = 'i', /**< Letter I */
J = 'j', /**< Letter J */
K = 'k', /**< Letter K */
L = 'l', /**< Letter L */
M = 'm', /**< Letter M */
N = 'n', /**< Letter N */
O = 'o', /**< Letter O */
P = 'p', /**< Letter P */
Q = 'q', /**< Letter Q */
R = 'r', /**< Letter R */
S = 's', /**< Letter S */
T = 't', /**< Letter T */
U = 'u', /**< Letter U */
V = 'v', /**< Letter V */
W = 'w', /**< Letter W */
X = 'x', /**< Letter X */
Y = 'y', /**< Letter Y */
Z = 'z', /**< Letter Z */
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 */
F4 = GLFW_KEY_F4, /**< F4 */
F5 = GLFW_KEY_F5, /**< F5 */
F6 = GLFW_KEY_F6, /**< F6 */
F7 = GLFW_KEY_F7, /**< F7 */
F8 = GLFW_KEY_F8, /**< F8 */
F9 = GLFW_KEY_F9, /**< F9 */
F10 = GLFW_KEY_F10, /**< F10 */
F11 = GLFW_KEY_F11, /**< F11 */
F12 = GLFW_KEY_F12, /**< F12 */
Space = GLFW_KEY_SPACE, /**< Space */
Tab = GLFW_KEY_TAB, /**< Tab */
Comma = GLFW_KEY_COMMA, /**< Comma */
Period = GLFW_KEY_PERIOD, /**< Period */
Minus = GLFW_KEY_MINUS, /**< Minus */
/* Note: This may only be represented as SHIFT + = */
Plus = '+', /**< Plus */
Slash = GLFW_KEY_SLASH, /**< Slash */
/* Note: This may only be represented as SHIFT + 5 */
Percent = '%', /**< Percent */
Smicolon = GLFW_KEY_SEMICOLON, /**< Semicolon */
Equal = GLFW_KEY_EQUAL, /**< Equal */
Zero = GLFW_KEY_0, /**< Zero */
One = GLFW_KEY_1, /**< One */
Two = GLFW_KEY_2, /**< Two */
Three = GLFW_KEY_3, /**< Three */
Four = GLFW_KEY_4, /**< Four */
Five = GLFW_KEY_5, /**< Five */
Six = GLFW_KEY_6, /**< Six */
Seven = GLFW_KEY_7, /**< Seven */
Eight = GLFW_KEY_8, /**< Eight */
Nine = GLFW_KEY_9, /**< Nine */
A = GLFW_KEY_A, /**< Letter A */
B = GLFW_KEY_B, /**< Letter B */
C = GLFW_KEY_C, /**< Letter C */
D = GLFW_KEY_D, /**< Letter D */
E = GLFW_KEY_E, /**< Letter E */
F = GLFW_KEY_F, /**< Letter F */
G = GLFW_KEY_G, /**< Letter G */
H = GLFW_KEY_H, /**< Letter H */
I = GLFW_KEY_I, /**< Letter I */
J = GLFW_KEY_J, /**< Letter J */
K = GLFW_KEY_K, /**< Letter K */
L = GLFW_KEY_L, /**< Letter L */
M = GLFW_KEY_M, /**< Letter M */
N = GLFW_KEY_N, /**< Letter N */
O = GLFW_KEY_O, /**< Letter O */
P = GLFW_KEY_P, /**< Letter P */
Q = GLFW_KEY_Q, /**< Letter Q */
R = GLFW_KEY_R, /**< Letter R */
S = GLFW_KEY_S, /**< Letter S */
T = GLFW_KEY_T, /**< Letter T */
U = GLFW_KEY_U, /**< Letter U */
V = GLFW_KEY_V, /**< Letter V */
W = GLFW_KEY_W, /**< Letter W */
X = GLFW_KEY_X, /**< Letter X */
Y = GLFW_KEY_Y, /**< Letter Y */
Z = GLFW_KEY_Z, /**< Letter Z */
/* Function keys */
CapsLock = GLFW_KEY_CAPS_LOCK, /**< Caps lock */

Loading…
Cancel
Save