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

Xi: use set_key_up/down instead of manual bit handling. 

We have the wrappers, use them.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2010-07-05 16:47:57 +10:00
parent 10442ce02b
commit c184429080
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Xi/exevents.c
View File

@ -814,23 +814,22 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
if (!k) if (!k)
return DONT_PROCESS; return DONT_PROCESS;
kptr = &k->down[key >> 3]; /* don't allow ddx to generate multiple downs, but repeats are okay */
/* don't allow ddx to generate multiple downs, but repeats are okay */ if (key_is_down(device, key, KEY_PROCESSED) && !event->key_repeat)
if ((*kptr & bit) && !event->key_repeat)
return DONT_PROCESS; return DONT_PROCESS;
if (device->valuator) if (device->valuator)
device->valuator->motionHintWindow = NullWindow; device->valuator->motionHintWindow = NullWindow;
*kptr |= bit; set_key_down(device, key, KEY_PROCESSED);
} else if (event->type == ET_KeyRelease) { } else if (event->type == ET_KeyRelease) {
if (!k) if (!k)
return DONT_PROCESS; return DONT_PROCESS;
kptr = &k->down[key >> 3]; if (!key_is_down(device, key, KEY_PROCESSED)) /* guard against duplicates */
if (!(*kptr & bit)) /* guard against duplicates */
return DONT_PROCESS; return DONT_PROCESS;
if (device->valuator) if (device->valuator)
device->valuator->motionHintWindow = NullWindow; device->valuator->motionHintWindow = NullWindow;
*kptr &= ~bit; set_key_up(device, key, KEY_PROCESSED);
} else if (event->type == ET_ButtonPress) { } else if (event->type == ET_ButtonPress) {
Mask mask; Mask mask;
if (!b) if (!b)