diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-29 08:50:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-29 08:50:02 +0200 |
| commit | 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (patch) | |
| tree | 30b754ce6f4bb714f948a1bcec554335d402e42b /xorg-server/dix | |
| parent | 8647aa1a5029fcd96f134103331ddf3c21bc0a0b (diff) | |
| download | vcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.tar.gz vcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.tar.bz2 vcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.zip | |
libX11 mesa xserver git update 29 July 2013
xserver commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449
libX11 commit 208e586c808e88a2ee819e4450dc27f557afc2bf
mesa commit e847b5ae066bf9a209dad482fcc664f944983633
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 f5ab8c458..14b65cabc 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/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/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); |