ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
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
798ec9af9b
commit
7fd78b28fb
1 changed files with 80 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 158
      src/Magnum/Platform/GlfwApplication.h

158
src/Magnum/Platform/GlfwApplication.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save