diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-21 14:05:29 +1000 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-03-30 14:51:37 -0700 |
| commit | 5eb20062208177172ff3443e522096a2e8f2f1e8 (patch) | |
| tree | f679f17cd0c4cd5193e4395eecb42bf319b84b76 | |
| parent | a095f7ae96a353073add83e78f88f29d854d289d (diff) | |
dix: set raw event values before adding up relative values (#46976)
Regression introduced in 4e52cc0ef48145134cd58d357fb7289e6f8bb709
Raw event values are values as-is from the driver, modified only be
transformation or acceleration. 4e52cc caused the mask to be updated from
relative to absolute coordinates which then got written into the raw events.
Move the raw event update into the respective branches for absolute/relative
events.
X.Org Bug 46976 <http://bugs.freedesktop.org/show_bug.cgi?id=46976>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Sven Arvidsson <sa@whiz.se>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
(cherry picked from commit 908ab3d580188533168c8cdfd2cab9dc689b4218)
| -rw-r--r-- | dix/getevents.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 260955b0b..fa85fe7cf 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -1314,18 +1314,19 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, transformAbsolute(pDev, &mask); clipAbsolute(pDev, &mask); + if ((flags & POINTER_NORAW) == 0) + set_raw_valuators(raw, &mask, raw->valuators.data); } else { if (flags & POINTER_ACCELERATE) accelPointer(pDev, &mask, ms); + if ((flags & POINTER_NORAW) == 0) + set_raw_valuators(raw, &mask, raw->valuators.data); + moveRelative(pDev, &mask); } /* valuators are in device coordinate system in absolute coordinates */ - - if ((flags & POINTER_NORAW) == 0) - set_raw_valuators(raw, &mask, raw->valuators.data); - scale_to_desktop(pDev, &mask, &devx, &devy, &screenx, &screeny); scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, &mask, &devx, &devy, &screenx, &screeny); |