From 85d881d57bb42fe363df28c3074b9c067143c7bb Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 16 Aug 2013 09:46:27 +0100 Subject: [PATCH] On ping timeout, get grab coordinates from compositor, not from surface. Signed-off-by: Chris Michael --- src/modules/wl_desktop_shell/e_mod_main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index 19e6a22d7..4406aa77e 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -1100,14 +1100,12 @@ _e_wl_shell_shell_surface_cb_ping_timeout(void *data) if (!(grab = E_NEW(E_Wayland_Shell_Grab, 1))) return 1; /* set grab properties */ - grab->x = ewss->surface->input->wl.seat.pointer->grab_x; - grab->y = ewss->surface->input->wl.seat.pointer->grab_y; + grab->x = _e_wl_comp->input->wl.seat.pointer->grab_x; + grab->y = _e_wl_comp->input->wl.seat.pointer->grab_y; /* set busy cursor */ - _e_wl_shell_grab_start(grab, ewss, - ewss->surface->input->wl.seat.pointer, - &_e_busy_grab_interface, - E_DESKTOP_SHELL_CURSOR_BUSY); + _e_wl_shell_grab_start(grab, ewss, _e_wl_comp->input->wl.seat.pointer, + &_e_busy_grab_interface, E_DESKTOP_SHELL_CURSOR_BUSY); return 1; }