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

dix: set the device state for XI valuator events. 

Valuator events need to include the device's state, while other device
events need to include the state of the core devices.

Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-06-03 12:19:14 +10:00
parent 08fd2ae652
commit eb3fe72cbc
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dix/eventconvert.c
View File

@ -46,6 +46,7 @@
#include "exglobals.h" #include "exglobals.h"
#include "eventconvert.h" #include "eventconvert.h"
#include "querydev.h" #include "querydev.h"
#include "xkbsrv.h"
static int countValuators(DeviceEvent *ev, int *first); static int countValuators(DeviceEvent *ev, int *first);
@ -279,9 +280,19 @@ static int
getValuatorEvents(DeviceEvent *ev, deviceValuator *xv) getValuatorEvents(DeviceEvent *ev, deviceValuator *xv)
{ {
int i; int i;
int state = 0;
int first_valuator, num_valuators; int first_valuator, num_valuators;
num_valuators = countValuators(ev, &first_valuator); num_valuators = countValuators(ev, &first_valuator);
if (num_valuators > 0)
{
DeviceIntPtr dev = NULL;
dixLookupDevice(&dev, ev->deviceid, serverClient, DixUseAccess);
/* State needs to be assembled BEFORE the device is updated. */
state = (dev && dev->key) ? XkbStateFieldFromRec(&dev->key->xkbInfo->state) : 0;
state |= (dev && dev->button) ? (dev->button->state) : 0;
}
/* FIXME: non-continuous valuator data in internal events*/ /* FIXME: non-continuous valuator data in internal events*/
for (i = 0; i < num_valuators; i += 6, xv++) { for (i = 0; i < num_valuators; i += 6, xv++) {
@ -289,6 +300,7 @@ getValuatorEvents(DeviceEvent *ev, deviceValuator *xv)
xv->first_valuator = first_valuator + i; xv->first_valuator = first_valuator + i;
xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i); xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i);
xv->deviceid = ev->deviceid; xv->deviceid = ev->deviceid;
xv->device_state = state;
switch (xv->num_valuators) { switch (xv->num_valuators) {
case 6: case 6:
xv->valuator5 = ev->valuators.data[i + 5]; xv->valuator5 = ev->valuators.data[i + 5];