summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorOlivier Fourdan <fourdan@xfce.org>2015-01-02 18:50:17 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2015-01-07 09:22:12 +1000
commit24b943132f90bc72ce8b5dc954fe9ee8484edfc2 (patch)
tree8eef5b8a192561de2863adddddcfbd156a0df912 /Xi
parentb058dec281568d6a9c5b5e230c20eed096cbdc6d (diff)
Fix subwindow in Xi emulated events
Bug: 70790 Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
Diffstat (limited to 'Xi')
-rw-r--r--Xi/exevents.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c
index b0bc47e6d..0857bcee6 100644
--- a/Xi/exevents.c
+++ b/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.