From ccf2aa8d1512a4089fc8830718a4db0028568b76 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 24 Sep 2013 15:19:02 +0100 Subject: [PATCH] Update pointer, keyboard, and touch structures for recent upstream wayland/weston changes. - Remove focus_resource and focus_listener - Use a list of resources instead of singular resource NB: Fixes zmike wayland client crash issue ;) Signed-off-by: Chris Michael --- src/bin/e_comp_wl.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h index 44c6225ed..912f9bf05 100644 --- a/src/bin/e_comp_wl.h +++ b/src/bin/e_comp_wl.h @@ -111,9 +111,8 @@ struct wl_pointer struct wl_seat *seat; struct wl_list resource_list; + struct wl_list focus_resource_list; struct wl_resource *focus; - struct wl_resource *focus_resource; - struct wl_listener focus_listener; unsigned int focus_serial; struct wl_signal focus_signal; @@ -137,9 +136,8 @@ struct wl_keyboard struct wl_seat *seat; struct wl_list resource_list; + struct wl_list focus_resource_list; struct wl_resource *focus; - struct wl_resource *focus_resource; - struct wl_listener focus_listener; unsigned int focus_serial; struct wl_signal focus_signal; @@ -165,9 +163,8 @@ struct wl_touch struct wl_seat *seat; struct wl_list resource_list; + struct wl_list focus_resource_list; struct wl_resource *focus; - struct wl_resource *focus_resource; - struct wl_listener focus_listener; unsigned int focus_serial; struct wl_signal focus_signal;