From 20ec1377638e698a994a0a71aaa41c343c869b4b Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 30 Jun 2015 14:41:17 -0400 Subject: [PATCH] X11: Call XRefreshKeyboardMapping() when we get various MappingNotify events. According to the Xlib docs, you need to do this or Xlib's internal state gets out of sync. --- src/video/x11/SDL_x11events.c | 6 ++++++ src/video/x11/SDL_x11sym.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c index e826c4b5707f8..309c380e9cdc3 100644 --- a/src/video/x11/SDL_x11events.c +++ b/src/video/x11/SDL_x11events.c @@ -649,9 +649,15 @@ X11_DispatchEvent(_THIS) } } else if (xevent.type == MappingNotify) { /* Has the keyboard layout changed? */ + const int request = xevent.xmapping.request; + #ifdef DEBUG_XEVENTS printf("window %p: MappingNotify!\n", data); #endif + if ((request == MappingKeyboard) || (request == MappingModifier)) { + X11_XRefreshKeyboardMapping(&xevent.xmapping); + } + X11_UpdateKeymap(_this); } return; diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h index d5bcdc2682d7d..9245f198bac6d 100644 --- a/src/video/x11/SDL_x11sym.h +++ b/src/video/x11/SDL_x11sym.h @@ -152,6 +152,7 @@ SDL_X11_SYM(unsigned long,_XSetLastRequestRead,(Display* a,xGenericReply* b),(a, SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return) SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return) SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return) +SDL_X11_SYM(void,XRefreshKeyboardMapping,(XMappingEvent *a),(a),) #if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS SDL_X11_SYM(Bool,XGetEventData,(Display* a,XGenericEventCookie* b),(a,b),return)