commit 4fd33e9de9fb4eeb74ddf1d9055705900babf316
author David Reveman <reveman@chromium.org> Fri Mar 30 04:18:56 2018
committer David Reveman <reveman@chromium.org> Sat Mar 31 09:02:20 2018
tree c6346c6329eddd2036b831ce3d9d701c79e6b48c
parent 47b4177fb83a47b72d02c3b51e763d8257a0916d

Add missing data source implementation.

This is needed for clients to be able to share data with the
compositor.

Change-Id: I6b554bebe469ac2ac2c76d70cfb8ff93524826d4
Reviewed-on: https://chromium-review.googlesource.com/989492
Reviewed-by: David Reveman <reveman@chromium.org>
Tested-by: David Reveman <reveman@chromium.org>

sommelier.c

diff --git a/sommelier.c b/sommelier.c
index 875b7e3..e085d6d 100644
--- a/sommelier.c
+++ b/sommelier.c
@@ -3608,6 +3608,32 @@
     xwl_data_source_offer, xwl_data_source_destroy,
     xwl_data_source_set_actions};
 
+static void xwl_data_source_target(void *data,
+                                   struct wl_data_source *data_source,
+                                   const char *mime_type) {
+  struct xwl_host_data_source *host = wl_data_source_get_user_data(data_source);
+
+  wl_data_source_send_target(host->resource, mime_type);
+}
+
+static void xwl_data_source_send(void *data, struct wl_data_source *data_source,
+                                 const char *mime_type, int32_t fd) {
+  struct xwl_host_data_source *host = wl_data_source_get_user_data(data_source);
+
+  wl_data_source_send_send(host->resource, mime_type, fd);
+  close(fd);
+}
+
+static void xwl_data_source_cancelled(void *data,
+                                      struct wl_data_source *data_source) {
+  struct xwl_host_data_source *host = wl_data_source_get_user_data(data_source);
+
+  wl_data_source_send_cancelled(host->resource);
+}
+
+static const struct wl_data_source_listener xwl_data_source_listener = {
+    xwl_data_source_target, xwl_data_source_send, xwl_data_source_cancelled};
+
 static void xwl_destroy_host_data_source(struct wl_resource *resource) {
   struct xwl_host_data_source *host = wl_resource_get_user_data(resource);
 
@@ -3767,6 +3793,8 @@
   host_data_source->proxy =
       wl_data_device_manager_create_data_source(host->proxy);
   wl_data_source_set_user_data(host_data_source->proxy, host_data_source);
+  wl_data_source_add_listener(host_data_source->proxy,
+                              &xwl_data_source_listener, host_data_source);
 }
 
 static void xwl_data_device_manager_get_data_device(
@@ -5141,12 +5169,13 @@
   }
 }
 
-static void xwl_data_source_target(void *data,
-                                   struct wl_data_source *data_source,
-                                   const char *mime_type) {}
+static void xwl_internal_data_source_target(void *data,
+                                            struct wl_data_source *data_source,
+                                            const char *mime_type) {}
 
-static void xwl_data_source_send(void *data, struct wl_data_source *data_source,
-                                 const char *mime_type, int32_t fd) {
+static void xwl_internal_data_source_send(void *data,
+                                          struct wl_data_source *data_source,
+                                          const char *mime_type, int32_t fd) {
   struct xwl_data_source *host = data;
   struct xwl *xwl = host->xwl;
 
@@ -5162,8 +5191,9 @@
   }
 }
 
-static void xwl_data_source_cancelled(void *data,
-                                      struct wl_data_source *data_source) {
+static void
+xwl_internal_data_source_cancelled(void *data,
+                                   struct wl_data_source *data_source) {
   struct xwl_data_source *host = data;
 
   if (host->xwl->selection_data_source == host)
@@ -5172,8 +5202,9 @@
   wl_data_source_destroy(data_source);
 }
 
-static const struct wl_data_source_listener xwl_data_source_listener = {
-    xwl_data_source_target, xwl_data_source_send, xwl_data_source_cancelled};
+static const struct wl_data_source_listener xwl_internal_data_source_listener =
+    {xwl_internal_data_source_target, xwl_internal_data_source_send,
+     xwl_internal_data_source_cancelled};
 
 static void xwl_get_selection_targets(struct xwl *xwl) {
   struct xwl_data_source *data_source = NULL;
@@ -5202,8 +5233,8 @@
     data_source->xwl = xwl;
     data_source->internal = wl_data_device_manager_create_data_source(
         xwl->data_device_manager->internal);
-    wl_data_source_add_listener(data_source->internal,
-                                &xwl_data_source_listener, data_source);
+    wl_data_source_add_listener(
+        data_source->internal, &xwl_internal_data_source_listener, data_source);
 
     value = xcb_get_property_value(reply);
     for (i = 0; i < reply->value_len; i++) {