dix: Always add valuator information if present
Send valuator information for all event types, not only for MotionEvents and absolute button events.
This commit is contained in:
parent
41991fb991
commit
12e5324032
|
@ -525,9 +525,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
|
||||||
int num_events = 0, final_valuator = 0;
|
int num_events = 0, final_valuator = 0;
|
||||||
CARD32 ms = 0;
|
CARD32 ms = 0;
|
||||||
deviceKeyButtonPointer *kbp = NULL;
|
deviceKeyButtonPointer *kbp = NULL;
|
||||||
/* Thanks to a broken lib, we _always_ have to chase DeviceMotionNotifies
|
|
||||||
* with DeviceValuators. */
|
|
||||||
Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE);
|
|
||||||
DeviceIntPtr cp = inputInfo.pointer;
|
DeviceIntPtr cp = inputInfo.pointer;
|
||||||
int x = 0, y = 0;
|
int x = 0, y = 0;
|
||||||
Bool coreOnly = (pDev == inputInfo.pointer);
|
Bool coreOnly = (pDev == inputInfo.pointer);
|
||||||
|
@ -553,7 +550,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Do we need to send a DeviceValuator event? */
|
/* Do we need to send a DeviceValuator event? */
|
||||||
if (!coreOnly && sendValuators) {
|
if (!coreOnly && num_valuators) {
|
||||||
if ((((num_valuators - 1) / 6) + 1) > MAX_VALUATOR_EVENTS)
|
if ((((num_valuators - 1) / 6) + 1) > MAX_VALUATOR_EVENTS)
|
||||||
num_valuators = MAX_VALUATOR_EVENTS * 6;
|
num_valuators = MAX_VALUATOR_EVENTS * 6;
|
||||||
num_events += ((num_valuators - 1) / 6) + 1;
|
num_events += ((num_valuators - 1) / 6) + 1;
|
||||||
|
@ -684,7 +681,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
|
||||||
kbp->root_y = y;
|
kbp->root_y = y;
|
||||||
|
|
||||||
events++;
|
events++;
|
||||||
if (sendValuators) {
|
if (num_valuators) {
|
||||||
kbp->deviceid |= MORE_EVENTS;
|
kbp->deviceid |= MORE_EVENTS;
|
||||||
clipValuators(pDev, first_valuator, num_valuators, valuators);
|
clipValuators(pDev, first_valuator, num_valuators, valuators);
|
||||||
events = getValuatorEvents(events, pDev, first_valuator,
|
events = getValuatorEvents(events, pDev, first_valuator,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user