diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-09-16 19:10:27 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-09-16 19:10:27 +0000 |
| commit | 4f2941d7bdfb60a6b2ca49d7e2ee50dd5eb11ddd (patch) | |
| tree | 5f7f0cf3d5aeb655a950fae516224a3d61a820cf /xserver/Xi | |
| parent | c84734bf28ef1ec0ce3cc7d1c45dfb920484e68e (diff) | |
Update to xserver 1.17.2. tested by dcoppa@, jsg@, jasper@ & naddy@
Diffstat (limited to 'xserver/Xi')
| -rw-r--r-- | xserver/Xi/Makefile.in | 1 | ||||
| -rw-r--r-- | xserver/Xi/exevents.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xserver/Xi/Makefile.in b/xserver/Xi/Makefile.in index 4f78a59ff..21e4d9d46 100644 --- a/xserver/Xi/Makefile.in +++ b/xserver/Xi/Makefile.in @@ -246,6 +246,7 @@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ KDRIVE_INCS = @KDRIVE_INCS@ KDRIVE_LIBS = @KDRIVE_LIBS@ KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@ +KDRIVE_MAIN_LIB = @KDRIVE_MAIN_LIB@ KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@ KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@ KHRONOS_OPENGL_REGISTRY_CFLAGS = @KHRONOS_OPENGL_REGISTRY_CFLAGS@ diff --git a/xserver/Xi/exevents.c b/xserver/Xi/exevents.c index b0bc47e6d..0857bcee6 100644 --- a/xserver/Xi/exevents.c +++ b/xserver/Xi/exevents.c @@ -1403,7 +1403,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, if (grab->ownerEvents) { WindowPtr focus = NullWindow; - WindowPtr sprite_win = dev->spriteInfo->sprite->win; + WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); deliveries = DeliverDeviceEvents(sprite_win, ptrev, grab, focus, dev); } @@ -1429,8 +1429,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, } else { GrabPtr devgrab = dev->deviceGrab.grab; + WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); - DeliverDeviceEvents(win, ptrev, grab, win, dev); + DeliverDeviceEvents(sprite_win, ptrev, grab, win, dev); /* FIXME: bad hack * Implicit passive grab activated in response to this event. Store * the event. |