seat: export functions for getting seat/seat_client

This patch allows the compositor to be able to get
ds_seat/ds_seat_client from wl_resource.

Change-Id: I696a288fd5e99940cb2c918bb6c88d13a077adf3

diff --git a/include/libds/seat.h b/include/libds/seat.h
index d618ff5..42626b6 100644 (file)
--- a/include/libds/seat.h
+++ b/include/libds/seat.h
@@ -209,6 +209,11 @@ void ds_seat_touch_add_grab_start_listener(struct ds_seat *seat,
 void ds_seat_set_selection(struct ds_seat *seat, struct ds_data_source *source,
         uint32_t serial);
 
+struct ds_seat_client *ds_seat_client_from_resource(
+        struct wl_resource *resource);
+
+struct ds_seat *ds_seat_client_get_seat(struct ds_seat_client *seat_client);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/seat.h b/src/seat.h
index a5b3e59..cf8dec9 100644 (file)
--- a/src/seat.h
+++ b/src/seat.h
@@ -40,11 +40,6 @@ struct ds_data_source *ds_seat_get_selection(struct ds_seat *seat);
 void ds_seat_start_drag(struct ds_seat *seat,
         struct ds_data_source *drag_source, uint32_t serial);
 
-struct ds_seat_client *ds_seat_client_from_resource(
-        struct wl_resource *resource);
-
-struct ds_seat *ds_seat_client_get_seat(struct ds_seat_client *seat_client);
-
 struct wl_client *ds_seat_client_get_wl_client(
         struct ds_seat_client *seat_client);
 

diff --git a/src/seat/seat.c b/src/seat/seat.c
index 174f672..7fd884a 100644 (file)
--- a/src/seat/seat.c
+++ b/src/seat/seat.c
@@ -166,6 +166,12 @@ ds_seat_client_from_resource(struct wl_resource *resource)
     return wl_resource_get_user_data(resource);
 }
 
+WL_EXPORT struct ds_seat *
+ds_seat_client_get_seat(struct ds_seat_client *seat_client)
+{
+    return seat_client->seat;
+}
+
 WL_EXPORT void
 ds_seat_client_add_destroy_listener(struct ds_seat_client *seat_client,
         struct wl_listener *listener)
@@ -232,12 +238,6 @@ ds_seat_start_drag(struct ds_seat *seat, struct ds_data_source *drag_source,
     wl_signal_emit(&seat->events.start_drag, seat);
 }
 
-struct ds_seat *
-ds_seat_client_get_seat(struct ds_seat_client *seat_client)
-{
-    return seat_client->seat;
-}
-
 void
 ds_seat_add_set_selection_listener(struct ds_seat *seat,
         struct wl_listener *listener)