devilhorns pushed a commit to branch master.
commit 85d881d57bb42fe363df28c3074b9c067143c7bb
Author: Chris Michael <[email protected]>
Date: Fri Aug 16 09:46:27 2013 +0100
On ping timeout, get grab coordinates from compositor, not from surface.
Signed-off-by: Chris Michael <[email protected]>
---
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 19e6a22..4406aa7 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;
}
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
