diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2016-07-22 18:52:19 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-07-22 18:52:19 +0100 |
| commit | b0d8401365baec49b540cc7a0e3fc760f8c52fff (patch) | |
| tree | 626fb1409ee74aa5d641bcadc10ed9cbab70e634 /Xi/exevents.c | |
| parent | 9c19fd2a809bc507ba4145d82b890f90cf67012a (diff) | |
| parent | 8b312db7d1d98be67f0283d982428545cf948a66 (diff) | |
Merge tag 'xorg-server-1.18.4' into cygwin-release-1.18
xorg-server-1.18.4
Diffstat (limited to 'Xi/exevents.c')
| -rw-r--r-- | Xi/exevents.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index e728310f8..52b91e893 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -1379,6 +1379,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, if (!TouchResourceIsOwner(ti, listener->listener)) return !Success; + if (!ti->emulate_pointer) + return !Success; + nevents = TouchConvertToPointerEvent(ev, &motion, &button); BUG_RETURN_VAL(nevents == 0, BadValue); |