ecore-wl2: change selection setting apis to return the serial of the request

in the case where multiple places in an app may be handling selections, this
is necessary in order to manage the selections accurately

@feature

diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index a1cde06..e7e5913 100644 (file)
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -1026,10 +1026,11 @@ EAPI void ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **type
  * @param window the window which is the origin of the drag operation
  *
  * @param drag_window the window which is used as window of the visible hint.
+ * @return The serial for the start_drag request
  *
  * @since 1.17
  */
-EAPI void ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window);
+EAPI uint32_t ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window);
 
 /**
  * End a drag started by a call to ecore_wl2_dnd_drag_start
@@ -1058,22 +1059,22 @@ EAPI Ecore_Wl2_Offer* ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input);
  *
  * @param types a null-terminated array of mimetypes supported by the client
  *
- * @return 1 on success 0 on failure
+ * @return serial of request on sucess, 0 on failure
  *
  * @since 1.17
  */
-EAPI Eina_Bool ecore_wl2_dnd_selection_set(Ecore_Wl2_Input *input, const char **types);
+EAPI uint32_t ecore_wl2_dnd_selection_set(Ecore_Wl2_Input *input, const char **types);
 
 /**
  * Clear the selection currently setted on this input.
  *
  * @param input the input to clear
  *
- * @return 1 on sucess 0 on failure
+ * @return serial of request on sucess, 0 on failure
  *
  * @since 1.17
  */
-EAPI Eina_Bool ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input);
+EAPI uint32_t ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input);
 
 /**
  * @defgroup Ecore_Wl2_Subsurface_Group Functions to manipulate subsurfaces.

diff --git a/src/lib/ecore_wl2/ecore_wl2_dnd.c b/src/lib/ecore_wl2/ecore_wl2_dnd.c
index 45e79d3..8a4f5df 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_dnd.c
+++ b/src/lib/ecore_wl2/ecore_wl2_dnd.c
@@ -412,14 +412,14 @@ ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **types)
      }
 }
 
-EAPI void
+EAPI uint32_t
 ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window)
 {
    struct wl_surface *dsurface, *osurface;
 
-   EINA_SAFETY_ON_NULL_RETURN(input);
-   EINA_SAFETY_ON_NULL_RETURN(input->data.drag.source);
-   EINA_SAFETY_ON_NULL_RETURN(drag_window);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(input, 0);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(input->data.drag.source, 0);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(drag_window, 0);
 
    dsurface = ecore_wl2_window_surface_get(drag_window);
 
@@ -436,9 +436,11 @@ ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore
 
         wl_data_device_start_drag(input->data.device, input->data.drag.source,
                                   osurface, dsurface, input->display->serial);
+        input->data.drag.serial = input->display->serial;
 
         ecore_wl2_window_cursor_from_name_set(window, "move");
      }
+   return input->data.drag.serial;
 }
 
 EAPI void
@@ -481,67 +483,67 @@ ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input)
    return input->selection;
 }
 
-EAPI Eina_Bool
+EAPI uint32_t
 ecore_wl2_dnd_selection_set(Ecore_Wl2_Input *input, const char **types)
 {
    struct wl_data_device_manager *manager;
    const char **type;
    char **t;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(input, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(input->display, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(input, 0);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(input->display, 0);
 
    manager = input->display->wl.data_device_manager;
-   if (!manager) return EINA_FALSE;
+   if (!manager) return 0;
 
-   if (input->data.types.data)
+   if (input->data.selection.types.data)
      {
-        wl_array_for_each(t, &input->data.types)
+        wl_array_for_each(t, &input->data.selection.types)
           free(*t);
-        wl_array_release(&input->data.types);
-        wl_array_init(&input->data.types);
+        wl_array_release(&input->data.selection.types);
+        wl_array_init(&input->data.selection.types);
      }
 
-   input->data.source = NULL;
+   input->data.selection.source = NULL;
 
-   if (!types[0]) return EINA_FALSE;
+   if (!types[0]) return 0;
 
-   input->data.source = wl_data_device_manager_create_data_source(manager);
-   if (!input->data.source)
+   input->data.selection.source = wl_data_device_manager_create_data_source(manager);
+   if (!input->data.selection.source)
      {
         ERR("Could not create data source");
-        return EINA_FALSE;
+        return 0;
      }
 
    for (type = types; *type; type++)
      {
         if (!*type) continue;
-        t = wl_array_add(&input->data.types, sizeof(*t));
+        t = wl_array_add(&input->data.selection.types, sizeof(*t));
         if (t)
           {
              *t = strdup(*type);
-             wl_data_source_offer(input->data.source, *t);
+             wl_data_source_offer(input->data.selection.source, *t);
           }
      }
 
-   wl_data_source_add_listener(input->data.source, &_source_listener, input);
+   wl_data_source_add_listener(input->data.selection.source, &_source_listener, input);
 
-   wl_data_device_set_selection(input->data.device, input->data.source,
+   wl_data_device_set_selection(input->data.device, input->data.selection.source,
                                 input->display->serial);
-
-   return EINA_TRUE;
+   input->data.selection.serial = input->display->serial;
+   return input->display->serial;
 }
 
-EAPI Eina_Bool
+EAPI uint32_t
 ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(input, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(input->data.device, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(input, 0);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(input->data.device, 0);
 
    wl_data_device_set_selection(input->data.device,
                                 NULL, input->display->serial);
-
-   return EINA_TRUE;
+   input->data.selection.serial = 0;
+   return input->display->serial;
 }
 
 static Ecore_Wl2_Drag_Action