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

Input: Don't allow DDX to generate repeat events 

We always use soft-repeat at the moment; XKB posts a release/press sequence,
which admittedly needs cleaning up, but that's for another day.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2009-01-17 19:35:15 +02:00
parent 6aef4e96af
commit c05f3bc935
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Xi/exevents.c
View File

@ -705,11 +705,9 @@ ChangeMasterDeviceClasses(DeviceIntPtr device,
* return values are * return values are
* DEFAULT ... process as normal * DEFAULT ... process as normal
* DONT_PROCESS ... return immediately from caller * DONT_PROCESS ... return immediately from caller
* IS_REPEAT .. event is a repeat event.
*/ */
#define DEFAULT 0 #define DEFAULT 0
#define DONT_PROCESS 1 #define DONT_PROCESS 1
#define IS_REPEAT 2
int int
UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count) UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count)
{ {
@ -813,9 +811,8 @@ UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count)
return DONT_PROCESS; return DONT_PROCESS;
kptr = &k->down[key >> 3]; kptr = &k->down[key >> 3];
if (*kptr & bit) { /* allow ddx to generate multiple downs */ if (*kptr & bit) /* don't allow ddx to generate multiple downs */
return IS_REPEAT; return DONT_PROCESS;
}
if (device->valuator) if (device->valuator)
device->valuator->motionHintWindow = NullWindow; device->valuator->motionHintWindow = NullWindow;
*kptr |= bit; *kptr |= bit;
@ -895,7 +892,6 @@ void
ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count) ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
{ {
int i; int i;
CARD16 modifiers;
GrabPtr grab = device->deviceGrab.grab; GrabPtr grab = device->deviceGrab.grab;
Bool deactivateDeviceGrab = FALSE; Bool deactivateDeviceGrab = FALSE;
int key = 0, rootX, rootY; int key = 0, rootX, rootY;
@ -973,17 +969,6 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
} }
if (xE->u.u.type == DeviceKeyPress) { if (xE->u.u.type == DeviceKeyPress) {
if (ret == IS_REPEAT) { /* allow ddx to generate multiple downs */
modifiers = k->xkbInfo->desc->map->modmap[key];
if (!modifiers) {
xE->u.u.type = DeviceKeyRelease;
ProcessOtherEvent(xE, device, count);
xE->u.u.type = DeviceKeyPress;
/* release can have side effects, don't fall through */
ProcessOtherEvent(xE, device, count);
}
return;
}
if (!grab && CheckDeviceGrabs(device, xE, 0, count)) { if (!grab && CheckDeviceGrabs(device, xE, 0, count)) {
device->deviceGrab.activatingKey = key; device->deviceGrab.activatingKey = key;
return; return;