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

Make sure the X event is an Xkb event before checking the Xkb event type

This commit is contained in:
Sam Lantinga 2021-11-10 12:46:54 -08:00
parent a1c125c1f5
commit eda4c40732
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -808,7 +808,8 @@ X11_DispatchEvent(_THIS, XEvent *xevent)
if (SDL_GetKeyboardFocus() != NULL) { if (SDL_GetKeyboardFocus() != NULL) {
X11_ReconcileKeyboardState(_this); X11_ReconcileKeyboardState(_this);
} }
} else if (xevent->type == MappingNotify || xkbEvent->any.xkb_type == XkbStateNotify) { } else if (xevent->type == MappingNotify ||
(xevent->type == videodata->xkb_event && xkbEvent->any.xkb_type == XkbStateNotify)) {
/* Has the keyboard layout changed? */ /* Has the keyboard layout changed? */
const int request = xevent->xmapping.request; const int request = xevent->xmapping.request;

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

@ -278,7 +278,7 @@ X11_InitKeyboard(_THIS)
int xkb_major = XkbMajorVersion; int xkb_major = XkbMajorVersion;
int xkb_minor = XkbMinorVersion; int xkb_minor = XkbMinorVersion;
if (X11_XkbQueryExtension(data->display, NULL, NULL, NULL, &xkb_major, &xkb_minor)) { if (X11_XkbQueryExtension(data->display, NULL, &data->xkb_event, NULL, &xkb_major, &xkb_minor)) {
data->xkb = X11_XkbGetMap(data->display, XkbAllClientInfoMask, XkbUseCoreKbd); data->xkb = X11_XkbGetMap(data->display, XkbAllClientInfoMask, XkbUseCoreKbd);
} }

1
src/video/x11/SDL_x11video.h
View File

@ -143,6 +143,7 @@ typedef struct SDL_VideoData
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
XkbDescPtr xkb; XkbDescPtr xkb;
#endif #endif
int xkb_event;
KeyCode filter_code; KeyCode filter_code;
Time filter_time; Time filter_time;