summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2012-10-19 19:56:02 +0200
committerKristian Høgsberg <krh@bitplanet.net>2012-10-19 16:56:08 -0400
commitf461eee2b0bc99e2d444544f9cb3d9e21200595d (patch)
treeb23f86d8eea2f76a0e435c5895fba56dd13e3892
parentf82eda524753498cc29a087381ca1f01d10ab117 (diff)
downloadweston-f461eee2b0bc99e2d444544f9cb3d9e21200595d.tar.gz
weston-f461eee2b0bc99e2d444544f9cb3d9e21200595d.tar.bz2
weston-f461eee2b0bc99e2d444544f9cb3d9e21200595d.zip
window: Always pass focused widget to widget motion handlers
Grabbed widgets should always receive motion events as if it was the widget that would receive it if no grab was active. This means that the focused widget should always be passed as the widget argument to widget motion handlers. This reverts commit 8c9c8fcf6e294f0446446d8e9bdfeb37294743c3. Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
-rw-r--r--clients/window.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/clients/window.c b/clients/window.c
index 36901d5c..380962cb 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -2095,7 +2095,7 @@ pointer_handle_motion(void *data, struct wl_pointer *pointer,
else
widget = input->focus_widget;
if (widget && widget->motion_handler)
- cursor = widget->motion_handler(widget,
+ cursor = widget->motion_handler(input->focus_widget,
input, time, sx, sy,
widget->user_data);