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

Input: Fix proximity events with valuators 

Initialise num_events to 1, so we always send a proximity event, and then
optionally valuator events.  Also make sure mieq can deal with valuator
events sent after proximity events.
This commit is contained in:
Bartosz Fabianowski 2007-12-07 02:38:14 +00:00 committed by Daniel Stone
parent a14a143832
commit 5b02a6ca5b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/getevents.c
View File

@ -707,7 +707,7 @@ _X_EXPORT int
GetProximityEvents(xEvent *events, DeviceIntPtr pDev, int type, GetProximityEvents(xEvent *events, DeviceIntPtr pDev, int type,
int first_valuator, int num_valuators, int *valuators) int first_valuator, int num_valuators, int *valuators)
{ {
int num_events = 0; int num_events = 1;
deviceKeyButtonPointer *kbp = (deviceKeyButtonPointer *) events; deviceKeyButtonPointer *kbp = (deviceKeyButtonPointer *) events;
/* Sanity checks. */ /* Sanity checks. */

4
mi/mieq.c
View File

@ -128,7 +128,9 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
if (oldtail == miEventQueue.head || if (oldtail == miEventQueue.head ||
!(lastkbp->type == DeviceMotionNotify || !(lastkbp->type == DeviceMotionNotify ||
lastkbp->type == DeviceButtonPress || lastkbp->type == DeviceButtonPress ||
lastkbp->type == DeviceButtonRelease) || lastkbp->type == DeviceButtonRelease ||
lastkbp->type == ProximityIn ||
lastkbp->type == ProximityOut) ||
((lastkbp->deviceid & DEVICE_BITS) != ((lastkbp->deviceid & DEVICE_BITS) !=
(v->deviceid & DEVICE_BITS))) { (v->deviceid & DEVICE_BITS))) {
ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n"); ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n");