diff --git a/modules/im/ximcp/imThaiFlt.c b/modules/im/ximcp/imThaiFlt.c index 1f963f6f..2b41a6ec 100644 --- a/modules/im/ximcp/imThaiFlt.c +++ b/modules/im/ximcp/imThaiFlt.c @@ -903,13 +903,11 @@ XThaiTranslateKeySym( /* if X keysym, convert to ascii by grabbing low 7 bits */ if (symbol == XK_KP_Space) c = XK_space & 0x7F; /* patch encoding botch */ -/* not for Thai - else if (symbol == XK_hyphen) - c = XK_minus & 0xFF; */ /* map to equiv character */ else if (hiBytes == 0xFF) c = symbol & 0x7F; else c = symbol & 0xFF; + /* only apply Control key if it makes sense, else ignore it */ if (modifiers & ControlMask) { if (!(IsKeypadKey(lsym) || lsym==XK_Return || lsym==XK_Tab)) { diff --git a/src/xkb/XKBCvt.c b/src/xkb/XKBCvt.c index 77d09a3d..8cef2f72 100644 --- a/src/xkb/XKBCvt.c +++ b/src/xkb/XKBCvt.c @@ -57,7 +57,6 @@ from The Open Group. static int _XkbHandleSpecialSym(KeySym keysym, char *buffer, int nbytes, int *extra_rtrn) { - /* try to convert to Latin-1, handling ctrl */ if (!(((keysym >= XK_BackSpace) && (keysym <= XK_Clear)) || (keysym == XK_Return) || (keysym == XK_Escape) ||