diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-10-18 20:26:00 +0100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:59 +1100 |
| commit | 4fa3872dc2bcfd6d1fc88d0a94c7071683eea899 (patch) | |
| tree | 0585901468faf3fac862bf6cb667dc2b302ced91 /Xext/xtest.c | |
| parent | bc909f71367a02297e725bb5769c2bcadab22395 (diff) | |
Input: Remove core keysyms from KeyClassRec
Instead of always keeping two copies of the keymap, only generate the
core keymap from the XKB keymap when we really need to, and use the XKB
keymap as the canonical keymap.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xext/xtest.c')
| -rw-r--r-- | Xext/xtest.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Xext/xtest.c b/Xext/xtest.c index 2383a8799..7e95c8699 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -42,6 +42,8 @@ #include "dixevents.h" #include "sleepuntil.h" #include "mi.h" +#include "xkbsrv.h" +#include "xkbstr.h" #define _XTEST_SERVER_ #include <X11/extensions/XTest.h> #include <X11/extensions/xteststr.h> @@ -321,8 +323,8 @@ ProcXTestFakeInput(ClientPtr client) { case KeyPress: case KeyRelease: - if (ev->u.u.detail < dev->key->curKeySyms.minKeyCode || - ev->u.u.detail > dev->key->curKeySyms.maxKeyCode) + if (ev->u.u.detail < dev->key->xkbInfo->desc->min_key_code || + ev->u.u.detail > dev->key->xkbInfo->desc->max_key_code) { client->errorValue = ev->u.u.detail; return BadValue; |