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 /Xi/ungrdevk.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 'Xi/ungrdevk.c')
| -rw-r--r-- | Xi/ungrdevk.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c index 8d9cdb17d..7f5e4aab0 100644 --- a/Xi/ungrdevk.c +++ b/Xi/ungrdevk.c @@ -60,6 +60,8 @@ SOFTWARE. #include <X11/extensions/XIproto.h> #include "exglobals.h" #include "dixgrabs.h" +#include "xkbsrv.h" +#include "xkbstr.h" #include "ungrdevk.h" @@ -124,8 +126,8 @@ ProcXUngrabDeviceKey(ClientPtr client) if (rc != Success) return rc; - if (((stuff->key > dev->key->curKeySyms.maxKeyCode) || - (stuff->key < dev->key->curKeySyms.minKeyCode)) + if (((stuff->key > dev->key->xkbInfo->desc->max_key_code) || + (stuff->key < dev->key->xkbInfo->desc->min_key_code)) && (stuff->key != AnyKey)) return BadValue; |