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

GetKeyboardValuatorEvents: also take first_valuator param 

Take a first_valuator parameter, which specifies the first valuator.
This commit is contained in:
Daniel Stone 2006-10-08 21:40:53 +03:00 committed by Daniel Stone
parent b05a11478e
commit 1546a39814
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dix/events.c
View File

@ -4639,9 +4639,10 @@ GetKeyboardEvents(xEvent *events, DeviceIntPtr pDev, int type, int key_code) {
* KeyPresses. * KeyPresses.
*/ */
int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
int key_code, int num_valuators, int key_code, int first_valuator,
int *valuators) { int num_valuators, int *valuators) {
int numEvents = 0, ms = 0, first_valuator = 0; int numEvents = 0, ms = 0, i = 0;
int final_valuator = first_valuator + num_valuators;
KeySym sym = pDev->key->curKeySyms.map[key_code * KeySym sym = pDev->key->curKeySyms.map[key_code *
pDev->key->curKeySyms.mapWidth]; pDev->key->curKeySyms.mapWidth];
deviceKeyButtonPointer *kbp = NULL; deviceKeyButtonPointer *kbp = NULL;
@ -4721,27 +4722,26 @@ int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
if (num_valuators) { if (num_valuators) {
kbp->deviceid |= MORE_EVENTS; kbp->deviceid |= MORE_EVENTS;
while (first_valuator < num_valuators) { for (i = first_valuator; i < final_valuator; i += 6) {
xv = (deviceValuator *) ++events; xv = (deviceValuator *) ++events;
xv->type = DeviceValuator; xv->type = DeviceValuator;
xv->first_valuator = first_valuator; xv->first_valuator = i;
xv->num_valuators = num_valuators; xv->num_valuators = num_valuators;
xv->deviceid = kbp->deviceid; xv->deviceid = kbp->deviceid;
switch (num_valuators - first_valuator) { switch (num_valuators - first_valuator) {
case 6: case 6:
xv->valuator5 = valuators[first_valuator+5]; xv->valuator5 = valuators[i+5];
case 5: case 5:
xv->valuator4 = valuators[first_valuator+4]; xv->valuator4 = valuators[i+4];
case 4: case 4:
xv->valuator3 = valuators[first_valuator+3]; xv->valuator3 = valuators[i+3];
case 3: case 3:
xv->valuator2 = valuators[first_valuator+2]; xv->valuator2 = valuators[i+2];
case 2: case 2:
xv->valuator1 = valuators[first_valuator+1]; xv->valuator1 = valuators[i+1];
case 1: case 1:
xv->valuator0 = valuators[first_valuator]; xv->valuator0 = valuators[i];
} }
first_valuator += 6;
} }
} }

3
include/input.h
View File

@ -402,7 +402,8 @@ extern int GetKeyboardValuatorEvents(
DeviceIntPtr pDev, DeviceIntPtr pDev,
int type, int type,
int key_code, int key_code,
int num_axes, int first_valuator,
int num_valuator,
int *valuators); int *valuators);
extern DeviceIntPtr LookupDeviceIntRec( extern DeviceIntPtr LookupDeviceIntRec(