diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-29 08:51:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-29 08:51:48 +0200 |
| commit | 04f3d1515878e535b7e3876264eaa4d43a1e6d54 (patch) | |
| tree | 58867d9fa0097be91f1717a693a7ca4b3eb77d71 /xorg-server/dix | |
| parent | ff986553659472cf191804eadb13c21e8f2b44c0 (diff) | |
| parent | 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (diff) | |
| download | vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.gz vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.bz2 vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xserver git update 29 July 2013
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); |