diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-12 08:22:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-12 08:22:55 +0200 |
| commit | ffce4319c2fb6f4f663cc5a9660e1d5837fcde87 (patch) | |
| tree | 603d92313dadf957fbaba55afa634de25d3bbd96 /xorg-server/dix | |
| parent | c6069c33e3a4a6d48aa059dbe9a78702dabff9cc (diff) | |
| download | vcxsrv-ffce4319c2fb6f4f663cc5a9660e1d5837fcde87.tar.gz vcxsrv-ffce4319c2fb6f4f663cc5a9660e1d5837fcde87.tar.bz2 vcxsrv-ffce4319c2fb6f4f663cc5a9660e1d5837fcde87.zip | |
libxtrans fontconfig mesa xserver git update 12 Jul 2013
xserver commit 59a6d3f1eb03010ab831b32b03706a1d6143c732
libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0
fontconfig commit 338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408
mesa commit 1b0d6aef03161eff4c9933548e964fec1258ea44
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/events.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index e5db348c6..03b2d2ea7 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -1522,13 +1522,20 @@ DeactivatePointerGrab(DeviceIntPtr mouse) for (i = 0; !wasPassive && mouse->touch && i < mouse->touch->num_touches; i++) { TouchPointInfoPtr ti = mouse->touch->touches + i; if (ti->active && TouchResourceIsOwner(ti, grab_resource)) { + int mode = XIRejectTouch; /* Rejecting will generate a TouchEnd, but we must not emulate a ButtonRelease here. So pretend the listener already has the end event */ if (grab->grabtype == CORE || grab->grabtype == XI || - !xi2mask_isset(mouse->deviceGrab.grab->xi2mask, mouse, XI_TouchBegin)) + !xi2mask_isset(mouse->deviceGrab.grab->xi2mask, mouse, XI_TouchBegin)) { + mode = XIAcceptTouch; + /* NOTE: we set the state here, but + * ProcessTouchOwnershipEvent() will still call + * TouchEmitTouchEnd for this listener. The other half of + * this hack is in DeliverTouchEndEvent */ ti->listeners[0].state = LISTENER_HAS_END; - TouchListenerAcceptReject(mouse, ti, 0, XIRejectTouch); + } + TouchListenerAcceptReject(mouse, ti, 0, mode); } } |