Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-27 04:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
Related to #1528.

(cherry picked from commit d232bcfcdd)
This commit is contained in:
Camilla Löwy 2019-07-11 19:06:06 +02:00
parent b3eb6dd38b
commit ff2c00091d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/x11_window.c
View File

@ -1180,12 +1180,15 @@ static void processEvent(XEvent *event)
} }
} }
if (_glfw.x11.xkb.available && event->type == _glfw.x11.xkb.eventBase) if (_glfw.x11.xkb.available)
{ {
if (((XkbEvent *)event)->any.xkb_type == XkbStateNotify && if (event->type == _glfw.x11.xkb.eventBase + XkbEventCode)
((XkbEvent *)event)->state.changed & XkbGroupStateMask)
{ {
_glfw.x11.xkb.group = ((XkbEvent *)event)->state.group; if (((XkbEvent*) event)->any.xkb_type == XkbStateNotify &&
(((XkbEvent*) event)->state.changed & XkbGroupStateMask))
{
_glfw.x11.xkb.group = ((XkbEvent*) event)->state.group;
}
} }
} }
@ -2789,7 +2792,8 @@ const char* _glfwPlatformGetScancodeName(int scancode)
if (!_glfw.x11.xkb.available) if (!_glfw.x11.xkb.available)
return NULL; return NULL;
const KeySym keysym = XkbKeycodeToKeysym(_glfw.x11.display, scancode, _glfw.x11.xkb.group, 0); const KeySym keysym = XkbKeycodeToKeysym(_glfw.x11.display,
scancode, _glfw.x11.xkb.group, 0);
if (keysym == NoSymbol) if (keysym == NoSymbol)
return NULL; return NULL;