diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-05-02 19:27:52 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-05-02 19:27:52 +0000 |
| commit | b9676a49e5a29d619bcd8402e4541d7749197922 (patch) | |
| tree | 67cdb12cda42de5facadc0a36125a32354b3bc29 /xserver/dix/events.c | |
| parent | fbf6414f58c54aab6ef37e4d066bb2699f118269 (diff) | |
Update to xserver 1.15.1.
Tested by at least ajacoutot@, dcoppa@ & jasper@
Diffstat (limited to 'xserver/dix/events.c')
| -rw-r--r-- | xserver/dix/events.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xserver/dix/events.c b/xserver/dix/events.c index e3c0edfc9..4aaa54c85 100644 --- a/xserver/dix/events.c +++ b/xserver/dix/events.c @@ -1244,6 +1244,9 @@ PlayReleasedEvents(void) case ET_KeyRelease: case ET_ProximityIn: case ET_ProximityOut: + case ET_TouchBegin: + case ET_TouchUpdate: + case ET_TouchEnd: ev->root_x += screenInfo.screens[0]->x - pDev->spriteInfo->sprite->screen->x; ev->root_y += screenInfo.screens[0]->y - @@ -4693,7 +4696,7 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse, filter = GetEventFilter(mouse, (xEvent *) event); - if (grab && grab->type == XI2) { + if (grab && grab->grabtype == XI2) { Mask mask; mask = xi2mask_isset(grab->xi2mask, mouse, type); |