diff options
| author | Adam Tkac <atkac@redhat.com> | 2010-05-18 13:35:37 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2010-05-18 13:35:37 +0000 |
| commit | 54d1c0f70fc09cb3b8927003a88d03630eb30591 (patch) | |
| tree | 6db9a5582532eb32624d6c0957b632ff534d8db2 /unix | |
| parent | 65a8046457fb82355a9d1acc17b2712f40d499e8 (diff) | |
| download | tigervnc-54d1c0f70fc09cb3b8927003a88d03630eb30591.tar.gz tigervnc-54d1c0f70fc09cb3b8927003a88d03630eb30591.zip | |
[Bugfix] Use always XkbConvertCase instead of XConvertCase when compiling
against X.Org 1.8.X and newer. Othewrise keysyms are not mapped correctly
to keycodes.
Reference: https://bugzilla.redhat.com/show_bug.cgi?id=586406
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4057 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/xserver/hw/vnc/Input.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc index d1087633..f1e48018 100644 --- a/unix/xserver/hw/vnc/Input.cc +++ b/unix/xserver/hw/vnc/Input.cc @@ -712,7 +712,12 @@ static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col) } if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) { - XConvertCase(syms[col&~1], &lsym, &usym); +#if XORG >= 18 + XkbConvertCase +#else + XConvertCase +#endif + (syms[col&~1], &lsym, &usym); if (!(col & 1)) return lsym; /* |