frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: Fix key down test (bug #12858) 

Fix the botched previous key_is_down test, which would give false positives.
Also move key_autorepeats to a separate inline function.
This commit is contained in:
Naoki Hamada 2007-10-25 18:45:50 +03:00 committed by Daniel Stone
parent 48ca5961ca
commit 242f56f722
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dix/getevents.c
View File

@ -95,7 +95,14 @@ set_key_up(DeviceIntPtr pDev, int key_code)
static Bool static Bool
key_is_down(DeviceIntPtr pDev, int key_code) key_is_down(DeviceIntPtr pDev, int key_code)
{ {
return pDev->key->postdown[key_code >> 3] >> (key_code & 7); return !!(pDev->key->postdown[key_code >> 3] & (1 << (key_code & 7)));
}
static Bool
key_autorepeats(DeviceIntPtr pDev, int key_code)
{
return !!(pDev->kbdfeed->ctrl.autoRepeats[key_code >> 3] &
(1 << (key_code & 7)));
} }
/** /**
@ -444,10 +451,11 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
* FIXME: In theory, if you're repeating with two keyboards in non-XKB, * FIXME: In theory, if you're repeating with two keyboards in non-XKB,
* you could get unbalanced events here. */ * you could get unbalanced events here. */
if (type == KeyPress && key_is_down(pDev, key_code)) { if (type == KeyPress && key_is_down(pDev, key_code)) {
/* If autorepeating is disabled either globally or just for that key,
* or we have a modifier, don't generate a repeat event. */
if (!pDev->kbdfeed->ctrl.autoRepeat || if (!pDev->kbdfeed->ctrl.autoRepeat ||
pDev->key->modifierMap[key_code] || !key_autorepeats(pDev, key_code) ||
!(pDev->kbdfeed->ctrl.autoRepeats[key_code >> 3] pDev->key->modifierMap[key_code])
& (1 << (key_code & 7))))
return 0; return 0;
#ifdef XKB #ifdef XKB