encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compiling if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM is not defined

This commit is contained in:
Sam Lantinga 2015-06-25 07:17:08 -07:00
parent c5857ab498
commit f1b7a8434f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/x11/SDL_x11events.c
View File

@ -789,7 +789,7 @@ X11_DispatchEvent(_THIS)
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
#else
keysym = XKeycodeToKeysym(display, keycode, 0);
keysym = X11_XKeycodeToKeysym(display, keycode, 0);
#endif
fprintf(stderr,
"The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list <sdl@libsdl.org> X11 KeyCode %d (%d), X11 KeySym 0x%lX (%s).\n",

6
src/video/x11/SDL_x11keyboard.c
View File

@ -154,7 +154,7 @@ X11_KeyCodeToSDLScancode(Display *display, KeyCode keycode)
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
#else
keysym = XKeycodeToKeysym(display, keycode, 0);
keysym = X11_XKeycodeToKeysym(display, keycode, 0);
#endif
if (keysym == NoSymbol) {
return SDL_SCANCODE_UNKNOWN;
@ -184,7 +184,7 @@ X11_KeyCodeToUcs4(Display *display, KeyCode keycode)
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
#else
keysym = XKeycodeToKeysym(display, keycode, 0);
keysym = X11_XKeycodeToKeysym(display, keycode, 0);
#endif
if (keysym == NoSymbol) {
return 0;
@ -265,7 +265,7 @@ X11_InitKeyboard(_THIS)
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
sym = X11_XkbKeycodeToKeysym(data->display, i, 0, 0);
#else
sym = XKeycodeToKeysym(data->display, i, 0);
sym = X11_XKeycodeToKeysym(data->display, i, 0);
#endif
if (sym != NoSymbol) {
SDL_Scancode scancode;