summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-01-18 18:04:14 -0800
committerPeter Hutterer <peter.hutterer@who-t.net>2012-01-24 13:26:36 +1000
commit9b1e18f42a05a79d9ebec372a37b47442e397ca9 (patch)
tree223923dd0511806cdc400fe2c78a56ae3e78c414
parentf00e5b02f5d9928cd88961e761da91b5faff1b32 (diff)
Only update pointer motion data for pointer emulated touch events
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/getevents.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/dix/getevents.c b/dix/getevents.c
index 2946b16bb..154705937 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1878,9 +1878,13 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
&devx, &devy, &screenx, &screeny);
/* see fill_pointer_events for coordinate systems */
- updateHistory(dev, &mask, ms);
+ if (emulate_pointer)
+ updateHistory(dev, &mask, ms);
+
clipValuators(dev, &mask);
- storeLastValuators(dev, &mask, 0, 1, devx, devy);
+
+ if (emulate_pointer)
+ storeLastValuators(dev, &mask, 0, 1, devx, devy);
event->root = scr->root->drawable.id;