Update pointer, keyboard, and touch structures for recent upstream
authorChris Michael <cp.michael@samsung.com>
Tue, 24 Sep 2013 14:19:02 +0000 (15:19 +0100)
committerChris Michael <cp.michael@samsung.com>
Tue, 24 Sep 2013 14:20:39 +0000 (15:20 +0100)
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 <cp.michael@samsung.com>
src/bin/e_comp_wl.h

index 44c6225edb40e85f9354cd3df3d9ba0117c7fea5..912f9bf05f610db88189e4dd53f621e1356707d5 100644 (file)
@@ -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;