AuroraMiddleware/glfw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'marcus-rawkeys'. Changed handling of raw key codes.

Browse Source
This commit is contained in:
marcus256 2011-01-15 00:59:55 +01:00
commit 8943a78a65
21 changed files with 779 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -80,6 +80,10 @@ if (UNIX AND NOT APPLE AND NOT CYGWIN)
list(APPEND GLFW_LIBRARIES ${X11_XF86VIDMODE_LIBRARIES}) list(APPEND GLFW_LIBRARIES ${X11_XF86VIDMODE_LIBRARIES})
endif(X11_XF86VIDMODE_FOUND) endif(X11_XF86VIDMODE_FOUND)
# Check for Xkb (X keyboard extension)
CHECK_FUNCTION_EXISTS(XkbQueryExtension _GLFW_HAS_XKB)
# Check for glXGetProcAddress
CHECK_FUNCTION_EXISTS(glXGetProcAddress _GLFW_HAS_GLXGETPROCADDRESS) CHECK_FUNCTION_EXISTS(glXGetProcAddress _GLFW_HAS_GLXGETPROCADDRESS)
if (NOT _GLFW_HAS_GLXGETPROCADDRESS) if (NOT _GLFW_HAS_GLXGETPROCADDRESS)

2
examples/boing.c
View File

@ -608,7 +608,7 @@ int main( void )
glfwPollEvents(); glfwPollEvents();
/* Check if we are still running */ /* Check if we are still running */
running = glfwIsWindow(window) && !glfwGetKey( window, GLFW_KEY_ESC ); running = glfwIsWindow(window) && !glfwGetKey( window, GLFW_KEY_ESCAPE );
} }
while( running ); while( running );

6
examples/gears.c
View File

@ -220,13 +220,13 @@ void key( GLFWwindow window, int k, int action )
if( action != GLFW_PRESS ) return; if( action != GLFW_PRESS ) return;
switch (k) { switch (k) {
case 'Z': case GLFW_KEY_Z:
if( glfwGetKey( window, GLFW_KEY_LSHIFT ) ) if( glfwGetKey( window, GLFW_KEY_LEFT_SHIFT ) )
view_rotz -= 5.0; view_rotz -= 5.0;
else else
view_rotz += 5.0; view_rotz += 5.0;
break; break;
case GLFW_KEY_ESC: case GLFW_KEY_ESCAPE:
running = 0; running = 0;
break; break;
case GLFW_KEY_UP: case GLFW_KEY_UP:

2
examples/heightmap.c
View File

@ -497,7 +497,7 @@ static void key_callback(GLFWwindow window, int key, int action)
{ {
switch(key) switch(key)
{ {
case GLFW_KEY_ESC: case GLFW_KEY_ESCAPE:
/* Exit program on Escape */ /* Exit program on Escape */
running = GL_FALSE; running = GL_FALSE;
break; break;

2
examples/splitview.c
View File

@ -493,7 +493,7 @@ int main(void)
} // Check if the ESC key was pressed or the window was closed } // Check if the ESC key was pressed or the window was closed
while (glfwIsWindow(window) && while (glfwIsWindow(window) &&
glfwGetKey(window, GLFW_KEY_ESC) != GLFW_PRESS); glfwGetKey(window, GLFW_KEY_ESCAPE) != GLFW_PRESS);
// Close OpenGL window and terminate GLFW // Close OpenGL window and terminate GLFW
glfwTerminate(); glfwTerminate();

2
examples/triangle.c
View File

@ -83,7 +83,7 @@ int main(void)
} // Check if the ESC key was pressed or the window was closed } // Check if the ESC key was pressed or the window was closed
while (glfwIsWindow(window) && while (glfwIsWindow(window) &&
glfwGetKey(window, GLFW_KEY_ESC) != GLFW_PRESS); glfwGetKey(window, GLFW_KEY_ESCAPE) != GLFW_PRESS);
// Close OpenGL window and terminate GLFW // Close OpenGL window and terminate GLFW
glfwTerminate(); glfwTerminate();

6
examples/wave.c
View File

@ -266,7 +266,7 @@ void key_callback(GLFWwindow window, int key, int action)
switch (key) switch (key)
{ {
case GLFW_KEY_ESC: case GLFW_KEY_ESCAPE:
running = 0; running = 0;
break; break;
case GLFW_KEY_SPACE: case GLFW_KEY_SPACE:
@ -284,12 +284,12 @@ void key_callback(GLFWwindow window, int key, int action)
case GLFW_KEY_DOWN: case GLFW_KEY_DOWN:
beta += 5; beta += 5;
break; break;
case GLFW_KEY_PAGEUP: case GLFW_KEY_PAGE_UP:
zoom -= 0.25f; zoom -= 0.25f;
if (zoom < 0.f) if (zoom < 0.f)
zoom = 0.f; zoom = 0.f;
break; break;
case GLFW_KEY_PAGEDOWN: case GLFW_KEY_PAGE_DOWN:
zoom += 0.25f; zoom += 0.25f;
break; break;
default: default:

230
include/GL/glfw3.h
View File

@ -184,83 +184,161 @@ extern "C" {
#define GLFW_RELEASE 0 #define GLFW_RELEASE 0
#define GLFW_PRESS 1 #define GLFW_PRESS 1
/* Keyboard key definitions: 8-bit ISO-8859-1 (Latin 1) encoding is used /* Keyboard raw key codes.
* for printable keys (such as A-Z, 0-9 etc), and values above 256 * These key codes are inspired by the USB HID Usage Tables v1.12 (p. 53-60),
* represent special (non-printable) keys (e.g. F1, Page Up etc). * but re-arranged to map to 7-bit ASCII for printable keys (function keys are
* put in the 256+ range).
* The naming of the key codes follow these rules:
* - The US keyboard layout is used.
* - Names of printable alpha-numeric characters are used (e.g. "A", "R",
* "3", etc).
* - For non-alphanumeric characters, Unicode:ish names are used (e.g.
* "COMMA", "LEFT_SQUARE_BRACKET", etc). Note that some names do not
* correspond to the Unicode standard (usually for brevity).
* - Keys that lack a clear US mapping are named "WORLD_x".
* - For non-printable keys, custom names are used (e.g. "F4",
* "BACKSPACE", etc).
*/ */
#define GLFW_KEY_UNKNOWN -1
#define GLFW_KEY_SPACE 32 /* Printable keys */
#define GLFW_KEY_SPECIAL 256 #define GLFW_KEY_SPACE 32
#define GLFW_KEY_ESC (GLFW_KEY_SPECIAL+1) #define GLFW_KEY_APOSTROPHE 39 /* ' */
#define GLFW_KEY_F1 (GLFW_KEY_SPECIAL+2) #define GLFW_KEY_COMMA 44 /* , */
#define GLFW_KEY_F2 (GLFW_KEY_SPECIAL+3) #define GLFW_KEY_MINUS 45 /* - */
#define GLFW_KEY_F3 (GLFW_KEY_SPECIAL+4) #define GLFW_KEY_PERIOD 46 /* . */
#define GLFW_KEY_F4 (GLFW_KEY_SPECIAL+5) #define GLFW_KEY_SLASH 47 /* / */
#define GLFW_KEY_F5 (GLFW_KEY_SPECIAL+6) #define GLFW_KEY_0 48
#define GLFW_KEY_F6 (GLFW_KEY_SPECIAL+7) #define GLFW_KEY_1 49
#define GLFW_KEY_F7 (GLFW_KEY_SPECIAL+8) #define GLFW_KEY_2 50
#define GLFW_KEY_F8 (GLFW_KEY_SPECIAL+9) #define GLFW_KEY_3 51
#define GLFW_KEY_F9 (GLFW_KEY_SPECIAL+10) #define GLFW_KEY_4 52
#define GLFW_KEY_F10 (GLFW_KEY_SPECIAL+11) #define GLFW_KEY_5 53
#define GLFW_KEY_F11 (GLFW_KEY_SPECIAL+12) #define GLFW_KEY_6 54
#define GLFW_KEY_F12 (GLFW_KEY_SPECIAL+13) #define GLFW_KEY_7 55
#define GLFW_KEY_F13 (GLFW_KEY_SPECIAL+14) #define GLFW_KEY_8 56
#define GLFW_KEY_F14 (GLFW_KEY_SPECIAL+15) #define GLFW_KEY_9 57
#define GLFW_KEY_F15 (GLFW_KEY_SPECIAL+16) #define GLFW_KEY_SEMICOLON 59 /* ; */
#define GLFW_KEY_F16 (GLFW_KEY_SPECIAL+17) #define GLFW_KEY_EQUAL 61 /* = */
#define GLFW_KEY_F17 (GLFW_KEY_SPECIAL+18) #define GLFW_KEY_A 65
#define GLFW_KEY_F18 (GLFW_KEY_SPECIAL+19) #define GLFW_KEY_B 66
#define GLFW_KEY_F19 (GLFW_KEY_SPECIAL+20) #define GLFW_KEY_C 67
#define GLFW_KEY_F20 (GLFW_KEY_SPECIAL+21) #define GLFW_KEY_D 68
#define GLFW_KEY_F21 (GLFW_KEY_SPECIAL+22) #define GLFW_KEY_E 69
#define GLFW_KEY_F22 (GLFW_KEY_SPECIAL+23) #define GLFW_KEY_F 70
#define GLFW_KEY_F23 (GLFW_KEY_SPECIAL+24) #define GLFW_KEY_G 71
#define GLFW_KEY_F24 (GLFW_KEY_SPECIAL+25) #define GLFW_KEY_H 72
#define GLFW_KEY_F25 (GLFW_KEY_SPECIAL+26) #define GLFW_KEY_I 73
#define GLFW_KEY_UP (GLFW_KEY_SPECIAL+27) #define GLFW_KEY_J 74
#define GLFW_KEY_DOWN (GLFW_KEY_SPECIAL+28) #define GLFW_KEY_K 75
#define GLFW_KEY_LEFT (GLFW_KEY_SPECIAL+29) #define GLFW_KEY_L 76
#define GLFW_KEY_RIGHT (GLFW_KEY_SPECIAL+30) #define GLFW_KEY_M 77
#define GLFW_KEY_LSHIFT (GLFW_KEY_SPECIAL+31) #define GLFW_KEY_N 78
#define GLFW_KEY_RSHIFT (GLFW_KEY_SPECIAL+32) #define GLFW_KEY_O 79
#define GLFW_KEY_LCTRL (GLFW_KEY_SPECIAL+33) #define GLFW_KEY_P 80
#define GLFW_KEY_RCTRL (GLFW_KEY_SPECIAL+34) #define GLFW_KEY_Q 81
#define GLFW_KEY_LALT (GLFW_KEY_SPECIAL+35) #define GLFW_KEY_R 82
#define GLFW_KEY_RALT (GLFW_KEY_SPECIAL+36) #define GLFW_KEY_S 83
#define GLFW_KEY_TAB (GLFW_KEY_SPECIAL+37) #define GLFW_KEY_T 84
#define GLFW_KEY_ENTER (GLFW_KEY_SPECIAL+38) #define GLFW_KEY_U 85
#define GLFW_KEY_BACKSPACE (GLFW_KEY_SPECIAL+39) #define GLFW_KEY_V 86
#define GLFW_KEY_INSERT (GLFW_KEY_SPECIAL+40) #define GLFW_KEY_W 87
#define GLFW_KEY_DEL (GLFW_KEY_SPECIAL+41) #define GLFW_KEY_X 88
#define GLFW_KEY_PAGEUP (GLFW_KEY_SPECIAL+42) #define GLFW_KEY_Y 89
#define GLFW_KEY_PAGEDOWN (GLFW_KEY_SPECIAL+43) #define GLFW_KEY_Z 90
#define GLFW_KEY_HOME (GLFW_KEY_SPECIAL+44) #define GLFW_KEY_LEFT_BRACKET 91 /* [ */
#define GLFW_KEY_END (GLFW_KEY_SPECIAL+45) #define GLFW_KEY_BACKSLASH 92 /* \ */
#define GLFW_KEY_KP_0 (GLFW_KEY_SPECIAL+46) #define GLFW_KEY_RIGHT_BRACKET 93 /* ] */
#define GLFW_KEY_KP_1 (GLFW_KEY_SPECIAL+47) #define GLFW_KEY_GRAVE_ACCENT 96 /* ` */
#define GLFW_KEY_KP_2 (GLFW_KEY_SPECIAL+48) #define GLFW_KEY_WORLD_1 161 /* non-US #1 */
#define GLFW_KEY_KP_3 (GLFW_KEY_SPECIAL+49) #define GLFW_KEY_WORLD_2 162 /* non-US #2 */
#define GLFW_KEY_KP_4 (GLFW_KEY_SPECIAL+50)
#define GLFW_KEY_KP_5 (GLFW_KEY_SPECIAL+51) /* Function keys */
#define GLFW_KEY_KP_6 (GLFW_KEY_SPECIAL+52) #define GLFW_KEY_ESCAPE 256
#define GLFW_KEY_KP_7 (GLFW_KEY_SPECIAL+53) #define GLFW_KEY_ENTER 257
#define GLFW_KEY_KP_8 (GLFW_KEY_SPECIAL+54) #define GLFW_KEY_TAB 258
#define GLFW_KEY_KP_9 (GLFW_KEY_SPECIAL+55) #define GLFW_KEY_BACKSPACE 259
#define GLFW_KEY_KP_DIVIDE (GLFW_KEY_SPECIAL+56) #define GLFW_KEY_INSERT 260
#define GLFW_KEY_KP_MULTIPLY (GLFW_KEY_SPECIAL+57) #define GLFW_KEY_DELETE 261
#define GLFW_KEY_KP_SUBTRACT (GLFW_KEY_SPECIAL+58) #define GLFW_KEY_RIGHT 262
#define GLFW_KEY_KP_ADD (GLFW_KEY_SPECIAL+59) #define GLFW_KEY_LEFT 263
#define GLFW_KEY_KP_DECIMAL (GLFW_KEY_SPECIAL+60) #define GLFW_KEY_DOWN 264
#define GLFW_KEY_KP_EQUAL (GLFW_KEY_SPECIAL+61) #define GLFW_KEY_UP 265
#define GLFW_KEY_KP_ENTER (GLFW_KEY_SPECIAL+62) #define GLFW_KEY_PAGE_UP 266
#define GLFW_KEY_KP_NUM_LOCK (GLFW_KEY_SPECIAL+63) #define GLFW_KEY_PAGE_DOWN 267
#define GLFW_KEY_CAPS_LOCK (GLFW_KEY_SPECIAL+64) #define GLFW_KEY_HOME 268
#define GLFW_KEY_SCROLL_LOCK (GLFW_KEY_SPECIAL+65) #define GLFW_KEY_END 269
#define GLFW_KEY_PAUSE (GLFW_KEY_SPECIAL+66) #define GLFW_KEY_CAPS_LOCK 280
#define GLFW_KEY_LSUPER (GLFW_KEY_SPECIAL+67) #define GLFW_KEY_SCROLL_LOCK 281
#define GLFW_KEY_RSUPER (GLFW_KEY_SPECIAL+68) #define GLFW_KEY_NUM_LOCK 282
#define GLFW_KEY_MENU (GLFW_KEY_SPECIAL+69) #define GLFW_KEY_PRINT_SCREEN 283
#define GLFW_KEY_LAST GLFW_KEY_MENU #define GLFW_KEY_PAUSE 284
#define GLFW_KEY_F1 290
#define GLFW_KEY_F2 291
#define GLFW_KEY_F3 292
#define GLFW_KEY_F4 293
#define GLFW_KEY_F5 294
#define GLFW_KEY_F6 295
#define GLFW_KEY_F7 296
#define GLFW_KEY_F8 297
#define GLFW_KEY_F9 298
#define GLFW_KEY_F10 299
#define GLFW_KEY_F11 300
#define GLFW_KEY_F12 301
#define GLFW_KEY_F13 302
#define GLFW_KEY_F14 303
#define GLFW_KEY_F15 304
#define GLFW_KEY_F16 305
#define GLFW_KEY_F17 306
#define GLFW_KEY_F18 307
#define GLFW_KEY_F19 308
#define GLFW_KEY_F20 309
#define GLFW_KEY_F21 310
#define GLFW_KEY_F22 311
#define GLFW_KEY_F23 312
#define GLFW_KEY_F24 313
#define GLFW_KEY_F25 314
#define GLFW_KEY_KP_0 320
#define GLFW_KEY_KP_1 321
#define GLFW_KEY_KP_2 322
#define GLFW_KEY_KP_3 323
#define GLFW_KEY_KP_4 324
#define GLFW_KEY_KP_5 325
#define GLFW_KEY_KP_6 326
#define GLFW_KEY_KP_7 327
#define GLFW_KEY_KP_8 328
#define GLFW_KEY_KP_9 329
#define GLFW_KEY_KP_DECIMAL 330
#define GLFW_KEY_KP_DIVIDE 331
#define GLFW_KEY_KP_MULTIPLY 332
#define GLFW_KEY_KP_SUBTRACT 333
#define GLFW_KEY_KP_ADD 334
#define GLFW_KEY_KP_ENTER 335
#define GLFW_KEY_KP_EQUAL 336
#define GLFW_KEY_LEFT_SHIFT 340
#define GLFW_KEY_LEFT_CONTROL 341
#define GLFW_KEY_LEFT_ALT 342
#define GLFW_KEY_LEFT_SUPER 343
#define GLFW_KEY_RIGHT_SHIFT 344
#define GLFW_KEY_RIGHT_CONTROL 345
#define GLFW_KEY_RIGHT_ALT 346
#define GLFW_KEY_RIGHT_SUPER 347
#define GLFW_KEY_MENU 348
#define GLFW_KEY_LAST GLFW_KEY_MENU
/* GLFW 2.x key name aliases (deprecated) */
#define GLFW_KEY_ESC GLFW_KEY_ESCAPE
#define GLFW_KEY_DEL GLFW_KEY_DELETE
#define GLFW_KEY_PAGEUP GLFW_KEY_PAGE_UP
#define GLFW_KEY_PAGEDOWN GLFW_KEY_PAGE_DOWN
#define GLFW_KEY_KP_NUM_LOCK GLFW_KEY_NUM_LOCK
#define GLFW_KEY_LCTRL GLFW_KEY_LEFT_CONTROL
#define GLFW_KEY_LSHIFT GLFW_KEY_LEFT_SHIFT
#define GLFW_KEY_LALT GLFW_KEY_LEFT_ALT
#define GLFW_KEY_LSUPER GLFW_KEY_LEFT_SUPER
#define GLFW_KEY_RCTRL GLFW_KEY_RIGHT_CONTROL
#define GLFW_KEY_RSHIFT GLFW_KEY_RIGHT_SHIFT
#define GLFW_KEY_RALT GLFW_KEY_RIGHT_ALT
#define GLFW_KEY_RSUPER GLFW_KEY_RIGHT_SUPER
/* Mouse button definitions */ /* Mouse button definitions */
#define GLFW_MOUSE_BUTTON_1 0 #define GLFW_MOUSE_BUTTON_1 0

130
src/cocoa/cocoa_window.m
View File

@ -147,70 +147,70 @@
// TODO: Need to find mappings for F13-F15, volume down/up/mute, and eject. // TODO: Need to find mappings for F13-F15, volume down/up/mute, and eject.
static const unsigned int MAC_TO_GLFW_KEYCODE_MAPPING[128] = static const unsigned int MAC_TO_GLFW_KEYCODE_MAPPING[128] =
{ {
/* 00 */ 'A', /* 00 */ GLFW_KEY_A,
/* 01 */ 'S', /* 01 */ GLFW_KEY_S,
/* 02 */ 'D', /* 02 */ GLFW_KEY_D,
/* 03 */ 'F', /* 03 */ GLFW_KEY_F,
/* 04 */ 'H', /* 04 */ GLFW_KEY_H,
/* 05 */ 'G', /* 05 */ GLFW_KEY_G,
/* 06 */ 'Z', /* 06 */ GLFW_KEY_Z,
/* 07 */ 'X', /* 07 */ GLFW_KEY_X,
/* 08 */ 'C', /* 08 */ GLFW_KEY_C,
/* 09 */ 'V', /* 09 */ GLFW_KEY_V,
/* 0a */ -1, /* 0a */ -1,
/* 0b */ 'B', /* 0b */ GLFW_KEY_B,
/* 0c */ 'Q', /* 0c */ GLFW_KEY_Q,
/* 0d */ 'W', /* 0d */ GLFW_KEY_W,
/* 0e */ 'E', /* 0e */ GLFW_KEY_E,
/* 0f */ 'R', /* 0f */ GLFW_KEY_R,
/* 10 */ 'Y', /* 10 */ GLFW_KEY_Y,
/* 11 */ 'T', /* 11 */ GLFW_KEY_T,
/* 12 */ '1', /* 12 */ GLFW_KEY_1,
/* 13 */ '2', /* 13 */ GLFW_KEY_2,
/* 14 */ '3', /* 14 */ GLFW_KEY_3,
/* 15 */ '4', /* 15 */ GLFW_KEY_4,
/* 16 */ '6', /* 16 */ GLFW_KEY_6,
/* 17 */ '5', /* 17 */ GLFW_KEY_5,
/* 18 */ '=', /* 18 */ GLFW_KEY_EQUAL,
/* 19 */ '9', /* 19 */ GLFW_KEY_9,
/* 1a */ '7', /* 1a */ GLFW_KEY_7,
/* 1b */ '-', /* 1b */ GLFW_KEY_MINUS,
/* 1c */ '8', /* 1c */ GLFW_KEY_8,
/* 1d */ '0', /* 1d */ GLFW_KEY_0,
/* 1e */ ']', /* 1e */ GLFW_KEY_RIGHT_BRACKET,
/* 1f */ 'O', /* 1f */ GLFW_KEY_O,
/* 20 */ 'U', /* 20 */ GLFW_KEY_U,
/* 21 */ '[', /* 21 */ GLFW_KEY_LEFT_BRACKET,
/* 22 */ 'I', /* 22 */ GLFW_KEY_I,
/* 23 */ 'P', /* 23 */ GLFW_KEY_P,
/* 24 */ GLFW_KEY_ENTER, /* 24 */ GLFW_KEY_ENTER,
/* 25 */ 'L', /* 25 */ GLFW_KEY_L,
/* 26 */ 'J', /* 26 */ GLFW_KEY_J,
/* 27 */ '\'', /* 27 */ GLFW_KEY_APOSTROPHE,
/* 28 */ 'K', /* 28 */ GLFW_KEY_K,
/* 29 */ ';', /* 29 */ GLFW_KEY_SEMICOLON,
/* 2a */ '\\', /* 2a */ GLFW_KEY_BACKSLASH,
/* 2b */ ',', /* 2b */ GLFW_KEY_COMMA,
/* 2c */ '/', /* 2c */ GLFW_KEY_SLASH,
/* 2d */ 'N', /* 2d */ GLFW_KEY_N,
/* 2e */ 'M', /* 2e */ GLFW_KEY_M,
/* 2f */ '.', /* 2f */ GLFW_KEY_PERIOD,
/* 30 */ GLFW_KEY_TAB, /* 30 */ GLFW_KEY_TAB,
/* 31 */ GLFW_KEY_SPACE, /* 31 */ GLFW_KEY_SPACE,
/* 32 */ '`', /* 32 */ GLFW_KEY_GRAVE_ACCENT,
/* 33 */ GLFW_KEY_BACKSPACE, /* 33 */ GLFW_KEY_BACKSPACE,
/* 34 */ -1, /* 34 */ -1,
/* 35 */ GLFW_KEY_ESC, /* 35 */ GLFW_KEY_ESCAPE,
/* 36 */ GLFW_KEY_RSUPER, /* 36 */ GLFW_KEY_RIGHT_SUPER,
/* 37 */ GLFW_KEY_LSUPER, /* 37 */ GLFW_KEY_LEFT_SUPER,
/* 38 */ GLFW_KEY_LSHIFT, /* 38 */ GLFW_KEY_LEFT_SHIFT,
/* 39 */ GLFW_KEY_CAPS_LOCK, /* 39 */ GLFW_KEY_CAPS_LOCK,
/* 3a */ GLFW_KEY_LALT, /* 3a */ GLFW_KEY_LEFT_ALT,
/* 3b */ GLFW_KEY_LCTRL, /* 3b */ GLFW_KEY_LEFT_CONTROL,
/* 3c */ GLFW_KEY_RSHIFT, /* 3c */ GLFW_KEY_RIGHT_SHIFT,
/* 3d */ GLFW_KEY_RALT, /* 3d */ GLFW_KEY_RIGHT_ALT,
/* 3e */ GLFW_KEY_RCTRL, /* 3e */ GLFW_KEY_RIGHT_CONTROL,
/* 3f */ -1, /*Function*/ /* 3f */ -1, /* Function */
/* 40 */ GLFW_KEY_F17, /* 40 */ GLFW_KEY_F17,
/* 41 */ GLFW_KEY_KP_DECIMAL, /* 41 */ GLFW_KEY_KP_DECIMAL,
/* 42 */ -1, /* 42 */ -1,
@ -218,10 +218,10 @@ static const unsigned int MAC_TO_GLFW_KEYCODE_MAPPING[128] =
/* 44 */ -1, /* 44 */ -1,
/* 45 */ GLFW_KEY_KP_ADD, /* 45 */ GLFW_KEY_KP_ADD,
/* 46 */ -1, /* 46 */ -1,
/* 47 */ -1, /*KeypadClear*/ /* 47 */ GLFW_KEY_NUM_LOCK, /* Really KeypadClear... */
/* 48 */ -1, /*VolumeUp*/ /* 48 */ -1, /* VolumeUp */
/* 49 */ -1, /*VolumeDown*/ /* 49 */ -1, /* VolumeDown */
/* 4a */ -1, /*Mute*/ /* 4a */ -1, /* Mute */
/* 4b */ GLFW_KEY_KP_DIVIDE, /* 4b */ GLFW_KEY_KP_DIVIDE,
/* 4c */ GLFW_KEY_KP_ENTER, /* 4c */ GLFW_KEY_KP_ENTER,
/* 4d */ -1, /* 4d */ -1,
@ -261,14 +261,14 @@ static const unsigned int MAC_TO_GLFW_KEYCODE_MAPPING[128] =
/* 6f */ GLFW_KEY_F12, /* 6f */ GLFW_KEY_F12,
/* 70 */ -1, /* 70 */ -1,
/* 71 */ GLFW_KEY_F15, /* 71 */ GLFW_KEY_F15,
/* 72 */ GLFW_KEY_INSERT, /*Help*/ /* 72 */ GLFW_KEY_INSERT, /* Really Help... */
/* 73 */ GLFW_KEY_HOME, /* 73 */ GLFW_KEY_HOME,
/* 74 */ GLFW_KEY_PAGEUP, /* 74 */ GLFW_KEY_PAGE_UP,
/* 75 */ GLFW_KEY_DEL, /* 75 */ GLFW_KEY_DELETE,
/* 76 */ GLFW_KEY_F4, /* 76 */ GLFW_KEY_F4,
/* 77 */ GLFW_KEY_END, /* 77 */ GLFW_KEY_END,
/* 78 */ GLFW_KEY_F2, /* 78 */ GLFW_KEY_F2,
/* 79 */ GLFW_KEY_PAGEDOWN, /* 79 */ GLFW_KEY_PAGE_DOWN,
/* 7a */ GLFW_KEY_F1, /* 7a */ GLFW_KEY_F1,
/* 7b */ GLFW_KEY_LEFT, /* 7b */ GLFW_KEY_LEFT,
/* 7c */ GLFW_KEY_RIGHT, /* 7c */ GLFW_KEY_RIGHT,

3
src/config.h.in
View File

@ -47,6 +47,9 @@
// Define this to 1 if Xf86VidMode is available // Define this to 1 if Xf86VidMode is available
#cmakedefine _GLFW_HAS_XF86VIDMODE 1 #cmakedefine _GLFW_HAS_XF86VIDMODE 1
// Define this to 1 if Xkb is available
#cmakedefine _GLFW_HAS_XKB 1
// Define this to 1 if glXGetProcAddress is available // Define this to 1 if glXGetProcAddress is available
#cmakedefine _GLFW_HAS_GLXGETPROCADDRESS 1 #cmakedefine _GLFW_HAS_GLXGETPROCADDRESS 1
// Define this to 1 if glXGetProcAddressARB is available // Define this to 1 if glXGetProcAddressARB is available

135
src/win32/win32_window.c
View File

@ -434,11 +434,11 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
DWORD msg_time; DWORD msg_time;
DWORD scan_code; DWORD scan_code;
// Check for numeric keypad keys // Check for numeric keypad keys.
// Note: This way we always force "NumLock = ON", which at least // Note: This way we always force "NumLock = ON", which is intentional
// enables GLFW users to detect numeric keypad keys // since the returned key code should correspond to a physical
// location.
int hiFlags = HIWORD(lParam); int hiFlags = HIWORD(lParam);
if (!(hiFlags & 0x100)) if (!(hiFlags & 0x100))
{ {
switch (MapVirtualKey(hiFlags & 0xFF, 1)) switch (MapVirtualKey(hiFlags & 0xFF, 1))
@ -458,6 +458,7 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
case VK_SUBTRACT: return GLFW_KEY_KP_SUBTRACT; case VK_SUBTRACT: return GLFW_KEY_KP_SUBTRACT;
case VK_ADD: return GLFW_KEY_KP_ADD; case VK_ADD: return GLFW_KEY_KP_ADD;
case VK_DELETE: return GLFW_KEY_KP_DECIMAL; case VK_DELETE: return GLFW_KEY_KP_DECIMAL;
default: break;
} }
} }
@ -472,9 +473,9 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
// right) // right)
scan_code = MapVirtualKey(VK_RSHIFT, 0); scan_code = MapVirtualKey(VK_RSHIFT, 0);
if (((lParam & 0x01ff0000) >> 16) == scan_code) if (((lParam & 0x01ff0000) >> 16) == scan_code)
return GLFW_KEY_RSHIFT; return GLFW_KEY_RIGHT_SHIFT;
return GLFW_KEY_LSHIFT; return GLFW_KEY_LEFT_SHIFT;
} }
// The CTRL keys require special handling // The CTRL keys require special handling
@ -482,7 +483,7 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
{ {
// Is this an extended key (i.e. right key)? // Is this an extended key (i.e. right key)?
if (lParam & 0x01000000) if (lParam & 0x01000000)
return GLFW_KEY_RCTRL; return GLFW_KEY_RIGHT_CONTROL;
// Here is a trick: "Alt Gr" sends LCTRL, then RALT. We only // Here is a trick: "Alt Gr" sends LCTRL, then RALT. We only
// want the RALT message, so we try to see if the next message // want the RALT message, so we try to see if the next message
@ -499,12 +500,12 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
{ {
// Next message is a RALT down message, which // Next message is a RALT down message, which
// means that this is NOT a proper LCTRL message! // means that this is NOT a proper LCTRL message!
return GLFW_KEY_UNKNOWN; return -1;
} }
} }
} }
return GLFW_KEY_LCTRL; return GLFW_KEY_LEFT_CONTROL;
} }
// The ALT keys require special handling // The ALT keys require special handling
@ -512,9 +513,9 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
{ {
// Is this an extended key (i.e. right key)? // Is this an extended key (i.e. right key)?
if (lParam & 0x01000000) if (lParam & 0x01000000)
return GLFW_KEY_RALT; return GLFW_KEY_RIGHT_ALT;
return GLFW_KEY_LALT; return GLFW_KEY_LEFT_ALT;
} }
// The ENTER keys require special handling // The ENTER keys require special handling
@ -527,16 +528,16 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
return GLFW_KEY_ENTER; return GLFW_KEY_ENTER;
} }
// Special keys (non character keys) // Funcion keys (non-printable keys)
case VK_ESCAPE: return GLFW_KEY_ESC; case VK_ESCAPE: return GLFW_KEY_ESCAPE;
case VK_TAB: return GLFW_KEY_TAB; case VK_TAB: return GLFW_KEY_TAB;
case VK_BACK: return GLFW_KEY_BACKSPACE; case VK_BACK: return GLFW_KEY_BACKSPACE;
case VK_HOME: return GLFW_KEY_HOME; case VK_HOME: return GLFW_KEY_HOME;
case VK_END: return GLFW_KEY_END; case VK_END: return GLFW_KEY_END;
case VK_PRIOR: return GLFW_KEY_PAGEUP; case VK_PRIOR: return GLFW_KEY_PAGE_UP;
case VK_NEXT: return GLFW_KEY_PAGEDOWN; case VK_NEXT: return GLFW_KEY_PAGE_DOWN;
case VK_INSERT: return GLFW_KEY_INSERT; case VK_INSERT: return GLFW_KEY_INSERT;
case VK_DELETE: return GLFW_KEY_DEL; case VK_DELETE: return GLFW_KEY_DELETE;
case VK_LEFT: return GLFW_KEY_LEFT; case VK_LEFT: return GLFW_KEY_LEFT;
case VK_UP: return GLFW_KEY_UP; case VK_UP: return GLFW_KEY_UP;
case VK_RIGHT: return GLFW_KEY_RIGHT; case VK_RIGHT: return GLFW_KEY_RIGHT;
@ -565,7 +566,13 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
case VK_F22: return GLFW_KEY_F22; case VK_F22: return GLFW_KEY_F22;
case VK_F23: return GLFW_KEY_F23; case VK_F23: return GLFW_KEY_F23;
case VK_F24: return GLFW_KEY_F24; case VK_F24: return GLFW_KEY_F24;
case VK_SPACE: return GLFW_KEY_SPACE; case VK_NUMLOCK: return GLFW_KEY_NUM_LOCK;
case VK_CAPITAL: return GLFW_KEY_CAPS_LOCK;
case VK_SCROLL: return GLFW_KEY_SCROLL_LOCK;
case VK_PAUSE: return GLFW_KEY_PAUSE;
case VK_LWIN: return GLFW_KEY_LEFT_SUPER;
case VK_RWIN: return GLFW_KEY_RIGHT_SUPER;
case VK_APPS: return GLFW_KEY_MENU;
// Numeric keypad // Numeric keypad
case VK_NUMPAD0: return GLFW_KEY_KP_0; case VK_NUMPAD0: return GLFW_KEY_KP_0;
@ -583,35 +590,63 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
case VK_SUBTRACT: return GLFW_KEY_KP_SUBTRACT; case VK_SUBTRACT: return GLFW_KEY_KP_SUBTRACT;
case VK_ADD: return GLFW_KEY_KP_ADD; case VK_ADD: return GLFW_KEY_KP_ADD;
case VK_DECIMAL: return GLFW_KEY_KP_DECIMAL; case VK_DECIMAL: return GLFW_KEY_KP_DECIMAL;
case VK_NUMLOCK: return GLFW_KEY_KP_NUM_LOCK;
case VK_CAPITAL: return GLFW_KEY_CAPS_LOCK; // Printable keys are mapped according to US layout
case VK_SCROLL: return GLFW_KEY_SCROLL_LOCK; case VK_SPACE: return GLFW_KEY_SPACE;
case VK_PAUSE: return GLFW_KEY_PAUSE; case 0x30: return GLFW_KEY_0;
case 0x31: return GLFW_KEY_1;
case VK_LWIN: return GLFW_KEY_LSUPER; case 0x32: return GLFW_KEY_2;
case VK_RWIN: return GLFW_KEY_RSUPER; case 0x33: return GLFW_KEY_3;
case VK_APPS: return GLFW_KEY_MENU; case 0x34: return GLFW_KEY_4;
case 0x35: return GLFW_KEY_5;
// The rest (should be printable keys) case 0x36: return GLFW_KEY_6;
default: case 0x37: return GLFW_KEY_7;
{ case 0x38: return GLFW_KEY_8;
// Convert to printable character (ISO-8859-1 or Unicode) case 0x39: return GLFW_KEY_9;
wParam = MapVirtualKey((UINT) wParam, 2) & 0x0000FFFF; case 0x41: return GLFW_KEY_A;
case 0x42: return GLFW_KEY_B;
// Make sure that the character is uppercase case 0x43: return GLFW_KEY_C;
wParam = (WPARAM) CharUpperW((LPWSTR) wParam); case 0x44: return GLFW_KEY_D;
case 0x45: return GLFW_KEY_E;
// Valid ISO-8859-1 character? case 0x46: return GLFW_KEY_F;
if ((wParam >= 32 && wParam <= 126) || case 0x47: return GLFW_KEY_G;
(wParam >= 160 && wParam <= 255)) case 0x48: return GLFW_KEY_H;
{ case 0x49: return GLFW_KEY_I;
return (int) wParam; case 0x4A: return GLFW_KEY_J;
} case 0x4B: return GLFW_KEY_K;
case 0x4C: return GLFW_KEY_L;
return GLFW_KEY_UNKNOWN; case 0x4D: return GLFW_KEY_M;
} case 0x4E: return GLFW_KEY_N;
case 0x4F: return GLFW_KEY_O;
case 0x50: return GLFW_KEY_P;
case 0x51: return GLFW_KEY_Q;
case 0x52: return GLFW_KEY_R;
case 0x53: return GLFW_KEY_S;
case 0x54: return GLFW_KEY_T;
case 0x55: return GLFW_KEY_U;
case 0x56: return GLFW_KEY_V;
case 0x57: return GLFW_KEY_W;
case 0x58: return GLFW_KEY_X;
case 0x59: return GLFW_KEY_Y;
case 0x5A: return GLFW_KEY_Z;
case 0xBD: return GLFW_KEY_MINUS;
case 0xBB: return GLFW_KEY_EQUAL;
case 0xDB: return GLFW_KEY_LEFT_BRACKET;
case 0xDD: return GLFW_KEY_RIGHT_BRACKET;
case 0xDC: return GLFW_KEY_BACKSLASH;
case 0xBA: return GLFW_KEY_SEMICOLON;
case 0xDE: return GLFW_KEY_APOSTROPHE;
case 0xC0: return GLFW_KEY_GRAVE_ACCENT;
case 0xBC: return GLFW_KEY_COMMA;
case 0xBE: return GLFW_KEY_PERIOD;
case 0xBF: return GLFW_KEY_SLASH;
case 0xDF: return GLFW_KEY_WORLD_1;
case 0xE2: return GLFW_KEY_WORLD_2;
default: break;
} }
// No matching translation was found, so return -1
return -1;
} }
@ -785,8 +820,8 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
// Special trick: release both shift keys on SHIFT up event // Special trick: release both shift keys on SHIFT up event
if (wParam == VK_SHIFT) if (wParam == VK_SHIFT)
{ {
_glfwInputKey(window, GLFW_KEY_LSHIFT, GLFW_RELEASE); _glfwInputKey(window, GLFW_KEY_LEFT_SHIFT, GLFW_RELEASE);
_glfwInputKey(window, GLFW_KEY_RSHIFT, GLFW_RELEASE); _glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, GLFW_RELEASE);
} }
else else
_glfwInputKey(window, translateKey(wParam, lParam), GLFW_RELEASE); _glfwInputKey(window, translateKey(wParam, lParam), GLFW_RELEASE);
@ -1743,11 +1778,11 @@ void _glfwPlatformPollEvents(void)
// See if this differs from our belief of what has happened // See if this differs from our belief of what has happened
// (we only have to check for lost key up events) // (we only have to check for lost key up events)
if (!lshift_down && window->key[GLFW_KEY_LSHIFT] == 1) if (!lshift_down && window->key[GLFW_KEY_LEFT_SHIFT] == 1)
_glfwInputKey(window, GLFW_KEY_LSHIFT, GLFW_RELEASE); _glfwInputKey(window, GLFW_KEY_LEFT_SHIFT, GLFW_RELEASE);
if (!rshift_down && window->key[GLFW_KEY_RSHIFT] == 1) if (!rshift_down && window->key[GLFW_KEY_RIGHT_SHIFT] == 1)
_glfwInputKey(window, GLFW_KEY_RSHIFT, GLFW_RELEASE); _glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, GLFW_RELEASE);
} }
// Did we have mouse movement in locked cursor mode? // Did we have mouse movement in locked cursor mode?

16
src/x11/platform.h
View File

@ -64,6 +64,10 @@
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
// The Xkb extension provides improved keyboard support
#if defined(_GLFW_HAS_XKB)
#include <X11/XKBlib.h>
#endif
#define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowX11 X11 #define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowX11 X11
#define _GLFW_PLATFORM_LIBRARY_STATE _GLFWlibraryX11 X11 #define _GLFW_PLATFORM_LIBRARY_STATE _GLFWlibraryX11 X11
@ -161,6 +165,18 @@ typedef struct _GLFWlibraryX11
GLboolean gammaBroken; GLboolean gammaBroken;
} RandR; } RandR;
struct {
GLboolean available;
int majorOpcode;
int eventBase;
int errorBase;
int majorVersion;
int minorVersion;
} Xkb;
// Key code LUT (mapping X11 key codes to GLFW key codes)
int keyCodeLUT[256];
// Screensaver data // Screensaver data
struct { struct {
GLboolean changed; GLboolean changed;

317
src/x11/x11_init.c
View File

@ -62,6 +62,303 @@ static void initLibraries(void)
} }
//========================================================================
// Translate an X11 key code to a GLFW key code.
//========================================================================
static int keyCodeToGLFWKeyCode(int keyCode)
{
int keySym;
// Valid key code range is [8,255], according to the XLib manual
if (keyCode < 8 || keyCode > 255)
return -1;
// Try secondary keysym, for numeric keypad keys
// Note: This way we always force "NumLock = ON", which is intentional
// since the returned key code should correspond to a physical
// location.
keySym = XKeycodeToKeysym(_glfwLibrary.X11.display, keyCode, 1);
switch (keySym)
{
case XK_KP_0: return GLFW_KEY_KP_0;
case XK_KP_1: return GLFW_KEY_KP_1;
case XK_KP_2: return GLFW_KEY_KP_2;
case XK_KP_3: return GLFW_KEY_KP_3;
case XK_KP_4: return GLFW_KEY_KP_4;
case XK_KP_5: return GLFW_KEY_KP_5;
case XK_KP_6: return GLFW_KEY_KP_6;
case XK_KP_7: return GLFW_KEY_KP_7;
case XK_KP_8: return GLFW_KEY_KP_8;
case XK_KP_9: return GLFW_KEY_KP_9;
case XK_KP_Separator:
case XK_KP_Decimal: return GLFW_KEY_KP_DECIMAL;
case XK_KP_Equal: return GLFW_KEY_KP_EQUAL;
case XK_KP_Enter: return GLFW_KEY_KP_ENTER;
default: break;
}
// Now try pimary keysym for function keys (non-printable keys). These
// should not be layout dependent (i.e. US layout and international
// layouts should give the same result).
keySym = XKeycodeToKeysym(_glfwLibrary.X11.display, keyCode, 0);
switch (keySym)
{
case XK_Escape: return GLFW_KEY_ESCAPE;
case XK_Tab: return GLFW_KEY_TAB;
case XK_Shift_L: return GLFW_KEY_LEFT_SHIFT;
case XK_Shift_R: return GLFW_KEY_RIGHT_SHIFT;
case XK_Control_L: return GLFW_KEY_LEFT_CONTROL;
case XK_Control_R: return GLFW_KEY_RIGHT_CONTROL;
case XK_Meta_L:
case XK_Alt_L: return GLFW_KEY_LEFT_ALT;
case XK_Mode_switch: // Mapped to Alt_R on many keyboards
case XK_ISO_Level3_Shift: // AltGr on at least some machines
case XK_Meta_R:
case XK_Alt_R: return GLFW_KEY_RIGHT_ALT;
case XK_Super_L: return GLFW_KEY_LEFT_SUPER;
case XK_Super_R: return GLFW_KEY_RIGHT_SUPER;
case XK_Menu: return GLFW_KEY_MENU;
case XK_Num_Lock: return GLFW_KEY_NUM_LOCK;
case XK_Caps_Lock: return GLFW_KEY_CAPS_LOCK;
case XK_Scroll_Lock: return GLFW_KEY_SCROLL_LOCK;
case XK_Pause: return GLFW_KEY_PAUSE;
case XK_Delete: return GLFW_KEY_DELETE;
case XK_BackSpace: return GLFW_KEY_BACKSPACE;
case XK_Return: return GLFW_KEY_ENTER;
case XK_Home: return GLFW_KEY_HOME;
case XK_End: return GLFW_KEY_END;
case XK_Page_Up: return GLFW_KEY_PAGE_UP;
case XK_Page_Down: return GLFW_KEY_PAGE_DOWN;
case XK_Insert: return GLFW_KEY_INSERT;
case XK_Left: return GLFW_KEY_LEFT;
case XK_Right: return GLFW_KEY_RIGHT;
case XK_Down: return GLFW_KEY_DOWN;
case XK_Up: return GLFW_KEY_UP;
case XK_F1: return GLFW_KEY_F1;
case XK_F2: return GLFW_KEY_F2;
case XK_F3: return GLFW_KEY_F3;
case XK_F4: return GLFW_KEY_F4;
case XK_F5: return GLFW_KEY_F5;
case XK_F6: return GLFW_KEY_F6;
case XK_F7: return GLFW_KEY_F7;
case XK_F8: return GLFW_KEY_F8;
case XK_F9: return GLFW_KEY_F9;
case XK_F10: return GLFW_KEY_F10;
case XK_F11: return GLFW_KEY_F11;
case XK_F12: return GLFW_KEY_F12;
case XK_F13: return GLFW_KEY_F13;
case XK_F14: return GLFW_KEY_F14;
case XK_F15: return GLFW_KEY_F15;
case XK_F16: return GLFW_KEY_F16;
case XK_F17: return GLFW_KEY_F17;
case XK_F18: return GLFW_KEY_F18;
case XK_F19: return GLFW_KEY_F19;
case XK_F20: return GLFW_KEY_F20;
case XK_F21: return GLFW_KEY_F21;
case XK_F22: return GLFW_KEY_F22;
case XK_F23: return GLFW_KEY_F23;
case XK_F24: return GLFW_KEY_F24;
case XK_F25: return GLFW_KEY_F25;
// Numeric keypad
case XK_KP_Divide: return GLFW_KEY_KP_DIVIDE;
case XK_KP_Multiply: return GLFW_KEY_KP_MULTIPLY;
case XK_KP_Subtract: return GLFW_KEY_KP_SUBTRACT;
case XK_KP_Add: return GLFW_KEY_KP_ADD;
// These should have been detected in secondary keysym test above!
case XK_KP_Insert: return GLFW_KEY_KP_0;
case XK_KP_End: return GLFW_KEY_KP_1;
case XK_KP_Down: return GLFW_KEY_KP_2;
case XK_KP_Page_Down: return GLFW_KEY_KP_3;
case XK_KP_Left: return GLFW_KEY_KP_4;
case XK_KP_Right: return GLFW_KEY_KP_6;
case XK_KP_Home: return GLFW_KEY_KP_7;
case XK_KP_Up: return GLFW_KEY_KP_8;
case XK_KP_Page_Up: return GLFW_KEY_KP_9;
case XK_KP_Delete: return GLFW_KEY_KP_DECIMAL;
case XK_KP_Equal: return GLFW_KEY_KP_EQUAL;
case XK_KP_Enter: return GLFW_KEY_KP_ENTER;
// Last resort: Check for printable keys (should not happen if the XKB
// extension is available). This will give a layout dependent mapping
// (which is wrong, and we may miss some keys, especially on non-US
// keyboards), but it's better than nothing...
case XK_a: return GLFW_KEY_A;
case XK_b: return GLFW_KEY_B;
case XK_c: return GLFW_KEY_C;
case XK_d: return GLFW_KEY_D;
case XK_e: return GLFW_KEY_E;
case XK_f: return GLFW_KEY_F;
case XK_g: return GLFW_KEY_G;
case XK_h: return GLFW_KEY_H;
case XK_i: return GLFW_KEY_I;
case XK_j: return GLFW_KEY_J;
case XK_k: return GLFW_KEY_K;
case XK_l: return GLFW_KEY_L;
case XK_m: return GLFW_KEY_M;
case XK_n: return GLFW_KEY_N;
case XK_o: return GLFW_KEY_O;
case XK_p: return GLFW_KEY_P;
case XK_q: return GLFW_KEY_Q;
case XK_r: return GLFW_KEY_R;
case XK_s: return GLFW_KEY_S;
case XK_t: return GLFW_KEY_T;
case XK_u: return GLFW_KEY_U;
case XK_v: return GLFW_KEY_V;
case XK_w: return GLFW_KEY_W;
case XK_x: return GLFW_KEY_X;
case XK_y: return GLFW_KEY_Y;
case XK_z: return GLFW_KEY_Z;
case XK_1: return GLFW_KEY_1;
case XK_2: return GLFW_KEY_2;
case XK_3: return GLFW_KEY_3;
case XK_4: return GLFW_KEY_4;
case XK_5: return GLFW_KEY_5;
case XK_6: return GLFW_KEY_6;
case XK_7: return GLFW_KEY_7;
case XK_8: return GLFW_KEY_8;
case XK_9: return GLFW_KEY_9;
case XK_0: return GLFW_KEY_0;
case XK_space: return GLFW_KEY_SPACE;
case XK_minus: return GLFW_KEY_MINUS;
case XK_equal: return GLFW_KEY_EQUAL;
case XK_bracketleft: return GLFW_KEY_LEFT_BRACKET;
case XK_bracketright: return GLFW_KEY_RIGHT_BRACKET;
case XK_backslash: return GLFW_KEY_BACKSLASH;
case XK_semicolon: return GLFW_KEY_SEMICOLON;
case XK_apostrophe: return GLFW_KEY_APOSTROPHE;
case XK_grave: return GLFW_KEY_GRAVE_ACCENT;
case XK_comma: return GLFW_KEY_COMMA;
case XK_period: return GLFW_KEY_PERIOD;
case XK_slash: return GLFW_KEY_SLASH;
case XK_less: return GLFW_KEY_WORLD_1; // At least in some layouts...
default: break;
}
// No matching translation was found, so return -1
return -1;
}
//========================================================================
// Update the key code LUT
//========================================================================
static void updateKeyCodeLUT(void)
{
int keyCode;
// Clear the LUT
for (keyCode = 0; keyCode < 256; ++keyCode)
{
_glfwLibrary.X11.keyCodeLUT[keyCode] = -1;
}
#if defined(_GLFW_HAS_XKB)
// If the Xkb extension is available, use it to determine physical key
// locations independently of the current keyboard layout
if (_glfwLibrary.X11.Xkb.available)
{
int i, keyCodeGLFW;
char name[XkbKeyNameLength+1];
XkbDescPtr descr;
// Get keyboard description
descr = XkbGetKeyboard(_glfwLibrary.X11.display,
XkbAllComponentsMask,
XkbUseCoreKbd);
// Find the X11 key code -> GLFW key code mapping
for (keyCode = descr->min_key_code; keyCode <= descr->max_key_code; ++keyCode)
{
// Get the key name
for (i = 0; i < XkbKeyNameLength; ++i)
{
name[i] = descr->names->keys[keyCode].name[i];
}
name[XkbKeyNameLength] = 0;
// Map the key name to a GLFW key code. Note: We only map printable
// keys here, and we use the US keyboard layout. The rest of the
// keys (function keys) are mapped using traditional KeySym
// translations.
if (strcmp(name, "TLDE") == 0) keyCodeGLFW = GLFW_KEY_GRAVE_ACCENT;
else if (strcmp(name, "AE01") == 0) keyCodeGLFW = GLFW_KEY_1;
else if (strcmp(name, "AE02") == 0) keyCodeGLFW = GLFW_KEY_2;
else if (strcmp(name, "AE03") == 0) keyCodeGLFW = GLFW_KEY_3;
else if (strcmp(name, "AE04") == 0) keyCodeGLFW = GLFW_KEY_4;
else if (strcmp(name, "AE05") == 0) keyCodeGLFW = GLFW_KEY_5;
else if (strcmp(name, "AE06") == 0) keyCodeGLFW = GLFW_KEY_6;
else if (strcmp(name, "AE07") == 0) keyCodeGLFW = GLFW_KEY_7;
else if (strcmp(name, "AE08") == 0) keyCodeGLFW = GLFW_KEY_8;
else if (strcmp(name, "AE09") == 0) keyCodeGLFW = GLFW_KEY_9;
else if (strcmp(name, "AE10") == 0) keyCodeGLFW = GLFW_KEY_0;
else if (strcmp(name, "AE11") == 0) keyCodeGLFW = GLFW_KEY_MINUS;
else if (strcmp(name, "AE12") == 0) keyCodeGLFW = GLFW_KEY_EQUAL;
else if (strcmp(name, "AD01") == 0) keyCodeGLFW = GLFW_KEY_Q;
else if (strcmp(name, "AD02") == 0) keyCodeGLFW = GLFW_KEY_W;
else if (strcmp(name, "AD03") == 0) keyCodeGLFW = GLFW_KEY_E;
else if (strcmp(name, "AD04") == 0) keyCodeGLFW = GLFW_KEY_R;
else if (strcmp(name, "AD05") == 0) keyCodeGLFW = GLFW_KEY_T;
else if (strcmp(name, "AD06") == 0) keyCodeGLFW = GLFW_KEY_Y;
else if (strcmp(name, "AD07") == 0) keyCodeGLFW = GLFW_KEY_U;
else if (strcmp(name, "AD08") == 0) keyCodeGLFW = GLFW_KEY_I;
else if (strcmp(name, "AD09") == 0) keyCodeGLFW = GLFW_KEY_O;
else if (strcmp(name, "AD10") == 0) keyCodeGLFW = GLFW_KEY_P;
else if (strcmp(name, "AD11") == 0) keyCodeGLFW = GLFW_KEY_LEFT_BRACKET;
else if (strcmp(name, "AD12") == 0) keyCodeGLFW = GLFW_KEY_RIGHT_BRACKET;
else if (strcmp(name, "AC01") == 0) keyCodeGLFW = GLFW_KEY_A;
else if (strcmp(name, "AC02") == 0) keyCodeGLFW = GLFW_KEY_S;
else if (strcmp(name, "AC03") == 0) keyCodeGLFW = GLFW_KEY_D;
else if (strcmp(name, "AC04") == 0) keyCodeGLFW = GLFW_KEY_F;
else if (strcmp(name, "AC05") == 0) keyCodeGLFW = GLFW_KEY_G;
else if (strcmp(name, "AC06") == 0) keyCodeGLFW = GLFW_KEY_H;
else if (strcmp(name, "AC07") == 0) keyCodeGLFW = GLFW_KEY_J;
else if (strcmp(name, "AC08") == 0) keyCodeGLFW = GLFW_KEY_K;
else if (strcmp(name, "AC09") == 0) keyCodeGLFW = GLFW_KEY_L;
else if (strcmp(name, "AC10") == 0) keyCodeGLFW = GLFW_KEY_SEMICOLON;
else if (strcmp(name, "AC11") == 0) keyCodeGLFW = GLFW_KEY_APOSTROPHE;
else if (strcmp(name, "AB01") == 0) keyCodeGLFW = GLFW_KEY_Z;
else if (strcmp(name, "AB02") == 0) keyCodeGLFW = GLFW_KEY_X;
else if (strcmp(name, "AB03") == 0) keyCodeGLFW = GLFW_KEY_C;
else if (strcmp(name, "AB04") == 0) keyCodeGLFW = GLFW_KEY_V;
else if (strcmp(name, "AB05") == 0) keyCodeGLFW = GLFW_KEY_B;
else if (strcmp(name, "AB06") == 0) keyCodeGLFW = GLFW_KEY_N;
else if (strcmp(name, "AB07") == 0) keyCodeGLFW = GLFW_KEY_M;
else if (strcmp(name, "AB08") == 0) keyCodeGLFW = GLFW_KEY_COMMA;
else if (strcmp(name, "AB09") == 0) keyCodeGLFW = GLFW_KEY_PERIOD;
else if (strcmp(name, "AB10") == 0) keyCodeGLFW = GLFW_KEY_SLASH;
else if (strcmp(name, "BKSL") == 0) keyCodeGLFW = GLFW_KEY_BACKSLASH;
else if (strcmp(name, "LSGT") == 0) keyCodeGLFW = GLFW_KEY_WORLD_1;
else keyCodeGLFW = -1;
// Update the key code LUT
if ((keyCode >= 0) && (keyCode < 256))
{
_glfwLibrary.X11.keyCodeLUT[keyCode] = keyCodeGLFW;
}
}
// Free the keyboard description
XkbFreeKeyboard(descr, 0, True);
}
#endif /* _GLFW_HAS_XKB */
// Translate the un-translated key codes using traditional X11 KeySym
// lookups
for (keyCode = 0; keyCode < 256; ++keyCode)
{
if (_glfwLibrary.X11.keyCodeLUT[keyCode] < 0)
{
_glfwLibrary.X11.keyCodeLUT[keyCode] =
keyCodeToGLFWKeyCode(keyCode);
}
}
}
//======================================================================== //========================================================================
// Initialize X11 display and look for supported X11 extensions // Initialize X11 display and look for supported X11 extensions
//======================================================================== //========================================================================
@ -127,6 +424,26 @@ static GLboolean initDisplay(void)
return GL_FALSE; return GL_FALSE;
} }
// Check if Xkb is supported on this display
#if defined(_GLFW_HAS_XKB)
_glfwLibrary.X11.Xkb.majorVersion = 1;
_glfwLibrary.X11.Xkb.minorVersion = 0;
_glfwLibrary.X11.Xkb.available =
XkbQueryExtension(_glfwLibrary.X11.display,
&_glfwLibrary.X11.Xkb.majorOpcode,
&_glfwLibrary.X11.Xkb.eventBase,
&_glfwLibrary.X11.Xkb.errorBase,
&_glfwLibrary.X11.Xkb.majorVersion,
&_glfwLibrary.X11.Xkb.minorVersion);
#else
_glfwLibrary.X11.Xkb.available = GL_FALSE;
#endif /* _GLFW_HAS_XKB */
// Update the key code LUT
// FIXME: We should listen to XkbMapNotify events to track changes to
// the keyboard mapping.
updateKeyCodeLUT();
return GL_TRUE; return GL_TRUE;
} }

125
src/x11/x11_window.c
View File

@ -35,6 +35,12 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB
#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2
#endif
#ifndef GLX_CONTEXT_ES2_PROFILE_BIT_EXT
#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
#endif
// Action for EWMH client messages // Action for EWMH client messages
#define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_REMOVE 0
@ -213,123 +219,14 @@ static GLboolean checkForEWMH(_GLFWwindow* window)
static int translateKey(int keycode) static int translateKey(int keycode)
{ {
KeySym key, key_lc, key_uc; // Use the pre-filled LUT (see updateKeyCodeLUT() ).
if ((keycode >= 0) && (keycode < 256))
// Try secondary keysym, for numeric keypad keys
// Note: This way we always force "NumLock = ON", which at least
// enables GLFW users to detect numeric keypad keys
key = XKeycodeToKeysym(_glfwLibrary.X11.display, keycode, 1);
switch (key)
{ {
// Numeric keypad return _glfwLibrary.X11.keyCodeLUT[keycode];
case XK_KP_0: return GLFW_KEY_KP_0;
case XK_KP_1: return GLFW_KEY_KP_1;
case XK_KP_2: return GLFW_KEY_KP_2;
case XK_KP_3: return GLFW_KEY_KP_3;
case XK_KP_4: return GLFW_KEY_KP_4;
case XK_KP_5: return GLFW_KEY_KP_5;
case XK_KP_6: return GLFW_KEY_KP_6;
case XK_KP_7: return GLFW_KEY_KP_7;
case XK_KP_8: return GLFW_KEY_KP_8;
case XK_KP_9: return GLFW_KEY_KP_9;
case XK_KP_Separator:
case XK_KP_Decimal: return GLFW_KEY_KP_DECIMAL;
case XK_KP_Equal: return GLFW_KEY_KP_EQUAL;
case XK_KP_Enter: return GLFW_KEY_KP_ENTER;
default: break;
} }
else
// Now try pimary keysym
key = XKeycodeToKeysym(_glfwLibrary.X11.display, keycode, 0);
switch (key)
{ {
// Special keys (non character keys) return -1;
case XK_Escape: return GLFW_KEY_ESC;
case XK_Tab: return GLFW_KEY_TAB;
case XK_Shift_L: return GLFW_KEY_LSHIFT;
case XK_Shift_R: return GLFW_KEY_RSHIFT;
case XK_Control_L: return GLFW_KEY_LCTRL;
case XK_Control_R: return GLFW_KEY_RCTRL;
case XK_Meta_L:
case XK_Alt_L: return GLFW_KEY_LALT;
case XK_Mode_switch: // Mapped to Alt_R on many keyboards
case XK_Meta_R:
case XK_ISO_Level3_Shift: // AltGr on at least some machines
case XK_Alt_R: return GLFW_KEY_RALT;
case XK_Super_L: return GLFW_KEY_LSUPER;
case XK_Super_R: return GLFW_KEY_RSUPER;
case XK_Menu: return GLFW_KEY_MENU;
case XK_Num_Lock: return GLFW_KEY_KP_NUM_LOCK;
case XK_Caps_Lock: return GLFW_KEY_CAPS_LOCK;
case XK_Scroll_Lock: return GLFW_KEY_SCROLL_LOCK;
case XK_Pause: return GLFW_KEY_PAUSE;
case XK_KP_Delete:
case XK_Delete: return GLFW_KEY_DEL;
case XK_BackSpace: return GLFW_KEY_BACKSPACE;
case XK_Return: return GLFW_KEY_ENTER;
case XK_KP_Home:
case XK_Home: return GLFW_KEY_HOME;
case XK_KP_End:
case XK_End: return GLFW_KEY_END;
case XK_KP_Page_Up:
case XK_Page_Up: return GLFW_KEY_PAGEUP;
case XK_KP_Page_Down:
case XK_Page_Down: return GLFW_KEY_PAGEDOWN;
case XK_KP_Insert:
case XK_Insert: return GLFW_KEY_INSERT;
case XK_KP_Left:
case XK_Left: return GLFW_KEY_LEFT;
case XK_KP_Right:
case XK_Right: return GLFW_KEY_RIGHT;
case XK_KP_Down:
case XK_Down: return GLFW_KEY_DOWN;
case XK_KP_Up:
case XK_Up: return GLFW_KEY_UP;
case XK_F1: return GLFW_KEY_F1;
case XK_F2: return GLFW_KEY_F2;
case XK_F3: return GLFW_KEY_F3;
case XK_F4: return GLFW_KEY_F4;
case XK_F5: return GLFW_KEY_F5;
case XK_F6: return GLFW_KEY_F6;
case XK_F7: return GLFW_KEY_F7;
case XK_F8: return GLFW_KEY_F8;
case XK_F9: return GLFW_KEY_F9;
case XK_F10: return GLFW_KEY_F10;
case XK_F11: return GLFW_KEY_F11;
case XK_F12: return GLFW_KEY_F12;
case XK_F13: return GLFW_KEY_F13;
case XK_F14: return GLFW_KEY_F14;
case XK_F15: return GLFW_KEY_F15;
case XK_F16: return GLFW_KEY_F16;
case XK_F17: return GLFW_KEY_F17;
case XK_F18: return GLFW_KEY_F18;
case XK_F19: return GLFW_KEY_F19;
case XK_F20: return GLFW_KEY_F20;
case XK_F21: return GLFW_KEY_F21;
case XK_F22: return GLFW_KEY_F22;
case XK_F23: return GLFW_KEY_F23;
case XK_F24: return GLFW_KEY_F24;
case XK_F25: return GLFW_KEY_F25;
// Numeric keypad (should have been detected in secondary keysym!)
case XK_KP_Divide: return GLFW_KEY_KP_DIVIDE;
case XK_KP_Multiply: return GLFW_KEY_KP_MULTIPLY;
case XK_KP_Subtract: return GLFW_KEY_KP_SUBTRACT;
case XK_KP_Add: return GLFW_KEY_KP_ADD;
case XK_KP_Equal: return GLFW_KEY_KP_EQUAL;
case XK_KP_Enter: return GLFW_KEY_KP_ENTER;
// The rest (should be printable keys)
default:
// Make uppercase
XConvertCase(key, &key_lc, &key_uc);
key = key_uc;
// Valid ISO 8859-1 character?
if ((key >= 32 && key <= 126) || (key >= 160 && key <= 255))
return (int) key;
return GLFW_KEY_UNKNOWN;
} }
} }

153
tests/events.c
View File

@ -46,9 +46,60 @@ static const char* get_key_name(int key)
{ {
switch (key) switch (key)
{ {
case GLFW_KEY_UNKNOWN: return "unknown"; // Printable keys
case GLFW_KEY_SPACE: return "space"; case GLFW_KEY_A: return "A";
case GLFW_KEY_ESC: return "escape"; case GLFW_KEY_B: return "B";
case GLFW_KEY_C: return "C";
case GLFW_KEY_D: return "D";
case GLFW_KEY_E: return "E";
case GLFW_KEY_F: return "F";
case GLFW_KEY_G: return "G";
case GLFW_KEY_H: return "H";
case GLFW_KEY_I: return "I";
case GLFW_KEY_J: return "J";
case GLFW_KEY_K: return "K";
case GLFW_KEY_L: return "L";
case GLFW_KEY_M: return "M";
case GLFW_KEY_N: return "N";
case GLFW_KEY_O: return "O";
case GLFW_KEY_P: return "P";
case GLFW_KEY_Q: return "Q";
case GLFW_KEY_R: return "R";
case GLFW_KEY_S: return "S";
case GLFW_KEY_T: return "T";
case GLFW_KEY_U: return "U";
case GLFW_KEY_V: return "V";
case GLFW_KEY_W: return "W";
case GLFW_KEY_X: return "X";
case GLFW_KEY_Y: return "Y";
case GLFW_KEY_Z: return "Z";
case GLFW_KEY_1: return "1";
case GLFW_KEY_2: return "2";
case GLFW_KEY_3: return "3";
case GLFW_KEY_4: return "4";
case GLFW_KEY_5: return "5";
case GLFW_KEY_6: return "6";
case GLFW_KEY_7: return "7";
case GLFW_KEY_8: return "8";
case GLFW_KEY_9: return "9";
case GLFW_KEY_0: return "0";
case GLFW_KEY_SPACE: return "SPACE";
case GLFW_KEY_MINUS: return "MINUS";
case GLFW_KEY_EQUAL: return "EQUAL";
case GLFW_KEY_LEFT_BRACKET: return "LEFT BRACKET";
case GLFW_KEY_RIGHT_BRACKET: return "RIGHT BRACKET";
case GLFW_KEY_BACKSLASH: return "BACKSLASH";
case GLFW_KEY_SEMICOLON: return "SEMICOLON";
case GLFW_KEY_APOSTROPHE: return "APOSTROPHE";
case GLFW_KEY_GRAVE_ACCENT: return "GRAVE ACCENT";
case GLFW_KEY_COMMA: return "COMMA";
case GLFW_KEY_PERIOD: return "PERIOD";
case GLFW_KEY_SLASH: return "SLASH";
case GLFW_KEY_WORLD_1: return "WORLD 1";
case GLFW_KEY_WORLD_2: return "WORLD 2";
// Function keys
case GLFW_KEY_ESCAPE: return "ESCAPE";
case GLFW_KEY_F1: return "F1"; case GLFW_KEY_F1: return "F1";
case GLFW_KEY_F2: return "F2"; case GLFW_KEY_F2: return "F2";
case GLFW_KEY_F3: return "F3"; case GLFW_KEY_F3: return "F3";
@ -74,52 +125,52 @@ static const char* get_key_name(int key)
case GLFW_KEY_F23: return "F23"; case GLFW_KEY_F23: return "F23";
case GLFW_KEY_F24: return "F24"; case GLFW_KEY_F24: return "F24";
case GLFW_KEY_F25: return "F25"; case GLFW_KEY_F25: return "F25";
case GLFW_KEY_UP: return "up"; case GLFW_KEY_UP: return "UP";
case GLFW_KEY_DOWN: return "down"; case GLFW_KEY_DOWN: return "DOWN";
case GLFW_KEY_LEFT: return "left"; case GLFW_KEY_LEFT: return "LEFT";
case GLFW_KEY_RIGHT: return "right"; case GLFW_KEY_RIGHT: return "RIGHT";
case GLFW_KEY_LSHIFT: return "left shift"; case GLFW_KEY_LEFT_SHIFT: return "LEFT SHIFT";
case GLFW_KEY_RSHIFT: return "right shift"; case GLFW_KEY_RIGHT_SHIFT: return "RIGHT SHIFT";
case GLFW_KEY_LCTRL: return "left control"; case GLFW_KEY_LEFT_CONTROL: return "LEFT CONTROL";
case GLFW_KEY_RCTRL: return "right control"; case GLFW_KEY_RIGHT_CONTROL: return "RIGHT CONTROL";
case GLFW_KEY_LALT: return "left alt"; case GLFW_KEY_LEFT_ALT: return "LEFT ALT";
case GLFW_KEY_RALT: return "right alt"; case GLFW_KEY_RIGHT_ALT: return "RIGHT ALT";
case GLFW_KEY_TAB: return "tab"; case GLFW_KEY_TAB: return "TAB";
case GLFW_KEY_ENTER: return "enter"; case GLFW_KEY_ENTER: return "ENTER";
case GLFW_KEY_BACKSPACE: return "backspace"; case GLFW_KEY_BACKSPACE: return "BACKSPACE";
case GLFW_KEY_INSERT: return "insert"; case GLFW_KEY_INSERT: return "INSERT";
case GLFW_KEY_DEL: return "delete"; case GLFW_KEY_DELETE: return "DELETE";
case GLFW_KEY_PAGEUP: return "page up"; case GLFW_KEY_PAGE_UP: return "PAGE UP";
case GLFW_KEY_PAGEDOWN: return "page down"; case GLFW_KEY_PAGE_DOWN: return "PAGE DOWN";
case GLFW_KEY_HOME: return "home"; case GLFW_KEY_HOME: return "HOME";
case GLFW_KEY_END: return "end"; case GLFW_KEY_END: return "END";
case GLFW_KEY_KP_0: return "keypad 0"; case GLFW_KEY_KP_0: return "KEYPAD 0";
case GLFW_KEY_KP_1: return "keypad 1"; case GLFW_KEY_KP_1: return "KEYPAD 1";
case GLFW_KEY_KP_2: return "keypad 2"; case GLFW_KEY_KP_2: return "KEYPAD 2";
case GLFW_KEY_KP_3: return "keypad 3"; case GLFW_KEY_KP_3: return "KEYPAD 3";
case GLFW_KEY_KP_4: return "keypad 4"; case GLFW_KEY_KP_4: return "KEYPAD 4";
case GLFW_KEY_KP_5: return "keypad 5"; case GLFW_KEY_KP_5: return "KEYPAD 5";
case GLFW_KEY_KP_6: return "keypad 6"; case GLFW_KEY_KP_6: return "KEYPAD 6";
case GLFW_KEY_KP_7: return "keypad 7"; case GLFW_KEY_KP_7: return "KEYPAD 7";
case GLFW_KEY_KP_8: return "keypad 8"; case GLFW_KEY_KP_8: return "KEYPAD 8";
case GLFW_KEY_KP_9: return "keypad 9"; case GLFW_KEY_KP_9: return "KEYPAD 9";
case GLFW_KEY_KP_DIVIDE: return "keypad divide"; case GLFW_KEY_KP_DIVIDE: return "KEYPAD DIVIDE";
case GLFW_KEY_KP_MULTIPLY: return "keypad multiply"; case GLFW_KEY_KP_MULTIPLY: return "KEYPAD MULTPLY";
case GLFW_KEY_KP_SUBTRACT: return "keypad subtract"; case GLFW_KEY_KP_SUBTRACT: return "KEYPAD SUBTRACT";
case GLFW_KEY_KP_ADD: return "keypad add"; case GLFW_KEY_KP_ADD: return "KEYPAD ADD";
case GLFW_KEY_KP_DECIMAL: return "keypad decimal"; case GLFW_KEY_KP_DECIMAL: return "KEYPAD DECIMAL";
case GLFW_KEY_KP_EQUAL: return "keypad equal"; case GLFW_KEY_KP_EQUAL: return "KEYPAD EQUAL";
case GLFW_KEY_KP_ENTER: return "keypad enter"; case GLFW_KEY_KP_ENTER: return "KEYPAD ENTER";
case GLFW_KEY_KP_NUM_LOCK: return "keypad num lock"; case GLFW_KEY_NUM_LOCK: return "NUM LOCK";
case GLFW_KEY_CAPS_LOCK: return "caps lock"; case GLFW_KEY_CAPS_LOCK: return "CAPS LOCK";
case GLFW_KEY_SCROLL_LOCK: return "scroll lock"; case GLFW_KEY_SCROLL_LOCK: return "SCROLL LOCK";
case GLFW_KEY_PAUSE: return "pause"; case GLFW_KEY_PAUSE: return "PAUSE";
case GLFW_KEY_LSUPER: return "left super"; case GLFW_KEY_LEFT_SUPER: return "LEFT SUPER";
case GLFW_KEY_RSUPER: return "right super"; case GLFW_KEY_RIGHT_SUPER: return "RIGHT SUPER";
case GLFW_KEY_MENU: return "menu"; case GLFW_KEY_MENU: return "MENU";
}
return NULL; default: return NULL;
}
} }
static const char* get_action_name(int action) static const char* get_action_name(int action)
@ -231,8 +282,6 @@ static void key_callback(GLFWwindow window, int key, int action)
if (name) if (name)
printf(" (%s) was %s\n", name, get_action_name(action)); printf(" (%s) was %s\n", name, get_action_name(action));
else if (isgraph(key))
printf(" (%c) was %s\n", key, get_action_name(action));
else else
printf(" was %s\n", get_action_name(action)); printf(" was %s\n", get_action_name(action));
@ -241,7 +290,7 @@ static void key_callback(GLFWwindow window, int key, int action)
switch (key) switch (key)
{ {
case 'R': case GLFW_KEY_R:
{ {
keyrepeat = !keyrepeat; keyrepeat = !keyrepeat;
if (keyrepeat) if (keyrepeat)
@ -253,7 +302,7 @@ static void key_callback(GLFWwindow window, int key, int action)
break; break;
} }
case 'S': case GLFW_KEY_S:
{ {
systemkeys = !systemkeys; systemkeys = !systemkeys;
if (systemkeys) if (systemkeys)

2
tests/fsfocus.c
View File

@ -49,7 +49,7 @@ static void window_key_callback(GLFWwindow window, int key, int action)
switch (key) switch (key)
{ {
case GLFW_KEY_ESC: case GLFW_KEY_ESCAPE:
{ {
printf("%0.3f: User pressed Escape\n", glfwGetTime()); printf("%0.3f: User pressed Escape\n", glfwGetTime());
running = GL_FALSE; running = GL_FALSE;

14
tests/gamma.c
View File

@ -51,35 +51,35 @@ static void key_callback(GLFWwindow window, int key, int action)
switch (key) switch (key)
{ {
case GLFW_KEY_ESC: case GLFW_KEY_ESCAPE:
glfwCloseWindow(window); glfwCloseWindow(window);
break; break;
case 'Q': case GLFW_KEY_Q:
ggamma += 0.1f; ggamma += 0.1f;
printf("Gamma: %f\n", ggamma); printf("Gamma: %f\n", ggamma);
glfwSetGammaFormula( ggamma, gblacklevel, ggain ); glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break; break;
case 'W': case GLFW_KEY_W:
ggamma -= 0.1f; ggamma -= 0.1f;
printf("Gamma: %f\n", ggamma); printf("Gamma: %f\n", ggamma);
glfwSetGammaFormula( ggamma, gblacklevel, ggain ); glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break; break;
case 'A': case GLFW_KEY_A:
ggain += 0.1f; ggain += 0.1f;
printf("Gain: %f\n", ggain); printf("Gain: %f\n", ggain);
glfwSetGammaFormula( ggamma, gblacklevel, ggain ); glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break; break;
case 'S': case GLFW_KEY_S:
ggain -= 0.1f; ggain -= 0.1f;
printf("Gain: %f\n", ggain); printf("Gain: %f\n", ggain);
glfwSetGammaFormula( ggamma, gblacklevel, ggain ); glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break; break;
case 'Z': case GLFW_KEY_Z:
gblacklevel += 0.1f; gblacklevel += 0.1f;
printf("Black Level: %f\n", gblacklevel); printf("Black Level: %f\n", gblacklevel);
glfwSetGammaFormula( ggamma, gblacklevel, ggain ); glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break; break;
case 'X': case GLFW_KEY_X:
gblacklevel -= 0.1f; gblacklevel -= 0.1f;
printf("Black Level: %f\n", gblacklevel); printf("Black Level: %f\n", gblacklevel);
glfwSetGammaFormula( ggamma, gblacklevel, ggain ); glfwSetGammaFormula( ggamma, gblacklevel, ggain );

2
tests/iconify.c
View File

@ -54,7 +54,7 @@ static void key_callback(GLFWwindow window, int key, int action)
case GLFW_KEY_SPACE: case GLFW_KEY_SPACE:
glfwIconifyWindow(window); glfwIconifyWindow(window);
break; break;
case GLFW_KEY_ESC: case GLFW_KEY_ESCAPE:
glfwCloseWindow(window); glfwCloseWindow(window);
break; break;
} }

2
tests/peter.c
View File

@ -67,7 +67,7 @@ static void key_callback(GLFWwindow window, int key, int action)
break; break;
} }
case 'R': case GLFW_KEY_R:
{ {
if (action == GLFW_PRESS) if (action == GLFW_PRESS)
{ {

4
tests/reopen.c
View File

@ -73,8 +73,8 @@ static void key_callback(GLFWwindow window, int key, int action)
switch (key) switch (key)
{ {
case 'Q': case GLFW_KEY_Q:
case GLFW_KEY_ESC: case GLFW_KEY_ESCAPE:
closed = GL_TRUE; closed = GL_TRUE;
break; break;
} }

2
tests/sharing.c
View File

@ -37,7 +37,7 @@
static void key_callback(GLFWwindow window, int key, int action) static void key_callback(GLFWwindow window, int key, int action)
{ {
if (action == GLFW_PRESS && key == GLFW_KEY_ESC) if (action == GLFW_PRESS && key == GLFW_KEY_ESCAPE)
glfwCloseWindow(window); glfwCloseWindow(window);
} }