From 74a7a4ef91441d8e0fe3de617470394f08f9ad50 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 2 Jul 2013 13:55:26 +0100 Subject: [PATCH] Check for valid pointer focus resource. Use wl_resource_get_user_data to get the focused surface. Signed-off-by: Chris Michael --- src/bin/e_comp_wl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 7dbf2b126..2c8fef274 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2172,7 +2172,10 @@ _e_comp_wl_pointer_configure(E_Wayland_Surface *ews, Evas_Coord x, Evas_Coord y, pixman_region32_init(&ews->pending.input); /* do we have a focused surface ? */ - if ((focus = (E_Wayland_Surface *)input->wl.seat.pointer->focus)) + if (!input->wl.seat.pointer->focus) return; + + if ((focus = wl_resource_get_user_data(input->wl.seat.pointer->focus))) +// if ((focus = (E_Wayland_Surface *)input->wl.seat.pointer->focus)) { /* NB: Ideally, I wanted to use the e_pointer methods here so that * the cursor would match the E theme, however Wayland currently