diff options
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/getevents.c | 2 | ||||
| -rw-r--r-- | xorg-server/dix/touch.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index c12864460..dd99c2895 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -254,7 +254,7 @@ set_valuators(DeviceIntPtr dev, DeviceEvent *event, ValuatorMask *mask) SetBit(event->valuators.mode, i); event->valuators.data[i] = valuator_mask_get_double(mask, i); } - else if (valuator_get_mode(dev, i) == Absolute) + else event->valuators.data[i] = dev->valuator->axisVal[i]; } } diff --git a/xorg-server/dix/touch.c b/xorg-server/dix/touch.c index a4b6d7eea..a7ea213ba 100644 --- a/xorg-server/dix/touch.c +++ b/xorg-server/dix/touch.c @@ -895,8 +895,7 @@ TouchAddActiveGrabListener(DeviceIntPtr dev, TouchPointInfoPtr ti, if (!ti->emulate_pointer && grab->grabtype == XI2 && - (grab->type != XI_TouchBegin && grab->type != XI_TouchEnd && - grab->type != XI_TouchUpdate)) + !xi2mask_isset(grab->xi2mask, dev, XI_TouchBegin)) return; TouchAddGrabListener(dev, ti, ev, grab); |