Merge pull request #32758 from bruvzg/x11_mod_keys2

Fix X11 modifier keys.
This commit is contained in:
Rémi Verschelde 2019-10-12 08:09:49 +02:00 committed by GitHub
commit a0c10ed492
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1767,7 +1767,8 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) {
XKeyEvent xkeyevent_no_mod = *xkeyevent;
xkeyevent_no_mod.state &= ~ShiftMask;
xkeyevent_no_mod.state &= ~ControlMask;
XLookupString(&xkeyevent_no_mod, str, 256, &keysym_keycode, NULL);
XLookupString(xkeyevent, str, 256, &keysym_unicode, NULL);
XLookupString(&xkeyevent_no_mod, NULL, 0, &keysym_keycode, NULL);
// Meanwhile, XLookupString returns keysyms useful for unicode.
@ -1777,8 +1778,6 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) {
xmblen = 8;
}
keysym_unicode = keysym_keycode;
if (xkeyevent->type == KeyPress && xic) {
Status status;