diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-22 08:40:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-22 08:40:04 (GMT) |
| commit | 418047d43e5fde9bc3489580cc881324f5f3da7d (patch) | |
| tree | fc76865ff3f7f68aaab00c51dbb667977ecbcdb3 /win | |
| parent | 29df448c956c297a8f4c1dfda0ee2c257c48e030 (diff) | |
| download | tk-418047d43e5fde9bc3489580cc881324f5f3da7d.zip tk-418047d43e5fde9bc3489580cc881324f5f3da7d.tar.gz tk-418047d43e5fde9bc3489580cc881324f5f3da7d.tar.bz2 | |
Revert part of [27e083eed755bf65], which broke the Windows build.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinKey.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tkWinKey.c b/win/tkWinKey.c index 83d2b3f..2c20b64 100644 --- a/win/tkWinKey.c +++ b/win/tkWinKey.c @@ -415,7 +415,7 @@ TkpGetKeySym( TkpInitKeymapInfo(dispPtr); } - sym = XkbKeycodeToKeysym(eventPtr->xkey.keycode, state, 0, 0); + sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0); /* * Special handling: if this is a ctrl-alt or shifted key, and there is no @@ -424,11 +424,11 @@ TkpGetKeySym( if ((sym == NoSymbol) && ((state & ControlMask) || (state & Mod2Mask))) { state &= ~(ControlMask | Mod2Mask); - sym = XkbKeycodeToKeysym(eventPtr->xkey.keycode, state, 0, 0); + sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0); } if ((sym == NoSymbol) && (state & ShiftMask)) { state &= ~ShiftMask; - sym = XkbKeycodeToKeysym(eventPtr->xkey.keycode, state, 0, 0); + sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0); } return sym; } @@ -477,7 +477,7 @@ TkpInitKeymapInfo( if (*codePtr == 0) { continue; } - keysym = XkbKeycodeToKeysym(*codePtr, 0, 0, 1); + keysym = KeycodeToKeysym(*codePtr, 0, 1); if (keysym == XK_Shift_Lock) { dispPtr->lockUsage = LU_SHIFT; break; @@ -503,7 +503,7 @@ TkpInitKeymapInfo( if (*codePtr == 0) { continue; } - keysym = XkbKeycodeToKeysym(*codePtr, 0, 0, 1); + keysym = KeycodeToKeysym(*codePtr, 0, 1); if (keysym == XK_Mode_switch) { dispPtr->modeModMask |= ShiftMask << (i/modMapPtr->max_keypermod); } |