summaryrefslogtreecommitdiff
path: root/mi/mieq.c
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2013-03-09 16:54:56 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2013-03-09 16:54:56 +0000
commitf93c38fd889ba3a345daf41a5c8b472433e007b9 (patch)
tree33d4f04e0d4192cddf638923f907b1d3031d48a6 /mi/mieq.c
parent5df71d7065365c8314a3f45741ebbb4bbf9811dc (diff)
parenteec5eb2f09682718e69f42491181ade0b093f52d (diff)
Merge tag 'xorg-server-1.13.3' into cygwin-release-1.13xserver-cygwin-1.13.3-1
xorg-server-1.13.3
Diffstat (limited to 'mi/mieq.c')
-rw-r--r--mi/mieq.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mi/mieq.c b/mi/mieq.c
index b2c7769ec..67d392894 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -623,7 +623,11 @@ mieqProcessInputEvents(void)
mieqProcessDeviceEvent(dev, &event, screen);
/* Update the sprite now. Next event may be from different device. */
- if (event.any.type == ET_Motion && master)
+ if (master &&
+ (event.any.type == ET_Motion ||
+ ((event.any.type == ET_TouchBegin ||
+ event.any.type == ET_TouchUpdate) &&
+ event.device_event.flags & TOUCH_POINTER_EMULATED)))
miPointerUpdateSprite(dev);
#ifdef XQUARTZ