diff options
| author | Keith Packard <keithp@keithp.com> | 2013-07-25 22:50:27 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-07-25 22:50:27 -0700 |
| commit | ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449 (patch) | |
| tree | acf999f52cff36872d9b1c48c7e945fbf90498c6 /dix | |
| parent | bdd1e22cbde9ea2324e4e1991c9e152f22f88151 (diff) | |
| parent | 4360514d1cc8e3132f93f56172d291074e8c770f (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/getevents.c | 2 | ||||
| -rw-r--r-- | dix/touch.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index f5ab8c458..14b65cabc 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -239,7 +239,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/dix/touch.c b/dix/touch.c index a4b6d7eea..a7ea213ba 100644 --- a/dix/touch.c +++ b/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); |