diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2022-04-25 19:26:19 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2022-04-25 19:26:19 +0000 |
| commit | e4a52cfda403448652942cacda0927846c01c4e4 (patch) | |
| tree | 88b781feb05d3b60273529f6cf1bfecb853ed7d4 /lib/libX11/modules | |
| parent | b44fee0a07313bfc44155c2f810882ad90a69551 (diff) | |
Update to libX11 1.7.5. No API / ABI changes. ok tb@
Diffstat (limited to 'lib/libX11/modules')
| -rw-r--r-- | lib/libX11/modules/im/ximcp/imDefLkup.c | 3 | ||||
| -rw-r--r-- | lib/libX11/modules/im/ximcp/imThaiFlt.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/libX11/modules/im/ximcp/imDefLkup.c b/lib/libX11/modules/im/ximcp/imDefLkup.c index dea7f66d5..dd1adf535 100644 --- a/lib/libX11/modules/im/ximcp/imDefLkup.c +++ b/lib/libX11/modules/im/ximcp/imDefLkup.c @@ -88,7 +88,8 @@ _XimSetEventMaskCallback( if (imid == im->private.proto.imid) { if (icid) { - ic = _XimICOfXICID(im, icid); + if (!(ic = _XimICOfXICID(im, icid))) + return False; _XimProcICSetEventMask(ic, (XPointer)&buf_s[2]); } else { _XimProcIMSetEventMask(im, (XPointer)&buf_s[2]); diff --git a/lib/libX11/modules/im/ximcp/imThaiFlt.c b/lib/libX11/modules/im/ximcp/imThaiFlt.c index 1f963f6fd..2b41a6ec8 100644 --- a/lib/libX11/modules/im/ximcp/imThaiFlt.c +++ b/lib/libX11/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)) { |