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

Fixed build

This commit is contained in:
Sam Lantinga 2022-04-18 22:57:03 -07:00
parent 49a2e4b0ea
commit 02225aa738
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,7 +735,6 @@ X11_DispatchEvent(_THIS, XEvent *xevent)
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata; SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
Display *display; Display *display;
SDL_WindowData *data; SDL_WindowData *data;
XEvent xevent;
int orig_event_type; int orig_event_type;
KeyCode orig_keycode; KeyCode orig_keycode;
XClientMessageEvent m; XClientMessageEvent m;
@ -744,9 +743,6 @@ X11_DispatchEvent(_THIS, XEvent *xevent)
SDL_assert(videodata != NULL); SDL_assert(videodata != NULL);
display = videodata->display; display = videodata->display;
SDL_zero(xevent); /* valgrind fix. --ryan. */
X11_XNextEvent(display, &xevent);
/* Save the original keycode for dead keys, which are filtered out by /* Save the original keycode for dead keys, which are filtered out by
the XFilterEvent() call below. the XFilterEvent() call below.
*/ */
@ -823,10 +819,13 @@ X11_DispatchEvent(_THIS, XEvent *xevent)
if (!data) { if (!data) {
/* The window for KeymapNotify, etc events is 0 */ /* The window for KeymapNotify, etc events is 0 */
if (xevent->type == KeymapNotify) { if (xevent->type == KeymapNotify) {
#ifdef DEBUG_XEVENTS
printf("window %p: KeymapNotify!\n", data);
#endif
if (SDL_GetKeyboardFocus() != NULL) { if (SDL_GetKeyboardFocus() != NULL) {
X11_ReconcileKeyboardState(_this); X11_ReconcileKeyboardState(_this);
} }
} else if (xevent.type == MappingNotify) { } else if (xevent->type == MappingNotify) {
/* Has the keyboard layout changed? */ /* Has the keyboard layout changed? */
const int request = xevent->xmapping.request; const int request = xevent->xmapping.request;
@ -1023,7 +1022,7 @@ X11_DispatchEvent(_THIS, XEvent *xevent)
SDL_bool handled_by_ime = SDL_FALSE; SDL_bool handled_by_ime = SDL_FALSE;
#ifdef DEBUG_XEVENTS #ifdef DEBUG_XEVENTS
printf("window %p: %s (X11 keycode = 0x%X)\n" data, (xevent->type == KeyPress ? "KeyPress" : "KeyRelease"), xevent->xkey.keycode); printf("window %p: %s (X11 keycode = 0x%X)\n", data, (xevent->type == KeyPress ? "KeyPress" : "KeyRelease"), xevent->xkey.keycode);
#endif #endif
#if 1 #if 1
if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN && keycode) { if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN && keycode) {