From 98ef92008cfe796b0fa2dcbef4c9e674a0fd2a4b Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 9 Jan 2020 10:12:51 -0500 Subject: [PATCH] ecore-wl2: Move ecore_wl2_dnd functions to be internal These functions are not used inside Enlightenment and are only used internally in EFL, so no need to be public ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 95 ---------------------------------- src/lib/ecore_wl2/ecore_wl2_internal.h | 93 +++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 95 deletions(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index ca4a8f4..cbaf03b 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -658,7 +658,6 @@ typedef struct _Ecore_Wl2_Surface_Interface * @li @ref Ecore_Wl2_Display_Group * @li @ref Ecore_Wl2_Window_Group * @li @ref Ecore_Wl2_Output_Group - * @li @ref Ecore_Wl2_Dnd_Group * @li @ref Ecore_Wl2_Input_Group * @li @ref Ecore_Wl2_Subsurface_Group */ @@ -1906,100 +1905,6 @@ EAPI void ecore_wl2_window_cursor_from_name_set(Ecore_Wl2_Window *win, const cha EAPI void ecore_wl2_window_cursor_default_restore(Ecore_Wl2_Window *win); // - -/** - * @defgroup Ecore_Wl2_Dnd_Group Wayland Library Drag-n-Drop Functions - * @ingroup Ecore_Wl2_Group - * - * Functions that deal with creating, destroying, or interacting with - * Wayland Drag-n-Drop - */ - -/** - * Set the types which are supported by a possible drag and drop operation. - * This call initializes a data source and offeres the given mimetypes - * - * @param input the input where to add on the data source - * @param types a null-terminated array of mimetypes - * - * @ingroup Ecore_Wl2_Dnd_Group - * @since 1.17 - */ -EAPI void ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **types); - -/** - * Start a drag on the given input - * - * @param input the input to use - * @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 - * - * @ingroup Ecore_Wl2_Dnd_Group - * @since 1.17 - */ -EAPI uint32_t ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window); - -/** - * Call wl_data_source.set_actions on an existing source - * - * @param input the input to use - * - * @see ecore_wl2_dnd_drag_start for a more useful function. - * - * @ingroup Ecore_Wl2_Dnd_Group - * @since 1.20 - */ -EAPI void ecore_wl2_dnd_set_actions(Ecore_Wl2_Input *input); - -/** - * End a drag started by a call to ecore_wl2_dnd_drag_start - * - * @param input the input object on which the drag was started - * - * @ingroup Ecore_Wl2_Dnd_Group - * @since 1.17 - */ -EAPI void ecore_wl2_dnd_drag_end(Ecore_Wl2_Input *input); - -/** - * Get the offer which is currently resposible for the clipboard - * - * @param input the input object to use - * - * @ingroup Ecore_Wl2_Dnd_Group - * @since 1.19 - */ -EAPI Ecore_Wl2_Offer* ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input); - -/** - * Set the types which are available from this client - * Later the event ECORE_WL2_EVENT_DATA_SOURCE_SEND is emitted, - * where the caller of this api must write the data (encoded in the given mimetype) to the fd - * - * @param input the input to provice this types on - * @param types a null-terminated array of mimetypes supported by the client - * - * @return serial of request on success, 0 on failure - * - * @ingroup Ecore_Wl2_Dnd_Group - * @since 1.17 - */ -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 serial of request on success, 0 on failure - * - * @ingroup Ecore_Wl2_Dnd_Group - * @since 1.17 - */ -EAPI uint32_t ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input); - // TIZEN_ONLY(20150703) : support conformant EAPI void ecore_wl2_window_conformant_set(Ecore_Wl2_Window *win, unsigned int is_conformant); EAPI Eina_Bool ecore_wl2_window_conformant_get(Ecore_Wl2_Window *win); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index c8d187e..a7d0f8a 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -90,6 +90,99 @@ EAPI void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, in */ EAPI void ecore_wl2_window_buffer_transform_set(Ecore_Wl2_Window *window, int transform); +/** + * @defgroup Ecore_Wl2_Dnd_Group Wayland Library Drag-n-Drop Functions + * @ingroup Ecore_Wl2_Group + * + * Functions that deal with creating, destroying, or interacting with + * Wayland Drag-n-Drop + */ + +/** + * Set the types which are supported by a possible drag and drop operation. + * This call initializes a data source and offeres the given mimetypes + * + * @param input the input where to add on the data source + * @param types a null-terminated array of mimetypes + * + * @ingroup Ecore_Wl2_Dnd_Group + * @since 1.17 + */ +EAPI void ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **types); + +/** + * Start a drag on the given input + * + * @param input the input to use + * @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 + * + * @ingroup Ecore_Wl2_Dnd_Group + * @since 1.17 + */ +EAPI uint32_t ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window); + +/** + * Call wl_data_source.set_actions on an existing source + * + * @param input the input to use + * + * @see ecore_wl2_dnd_drag_start for a more useful function. + * + * @ingroup Ecore_Wl2_Dnd_Group + * @since 1.20 + */ +EAPI void ecore_wl2_dnd_set_actions(Ecore_Wl2_Input *input); + +/** + * End a drag started by a call to ecore_wl2_dnd_drag_start + * + * @param input the input object on which the drag was started + * + * @ingroup Ecore_Wl2_Dnd_Group + * @since 1.17 + */ +EAPI void ecore_wl2_dnd_drag_end(Ecore_Wl2_Input *input); + +/** + * Get the offer which is currently resposible for the clipboard + * + * @param input the input object to use + * + * @ingroup Ecore_Wl2_Dnd_Group + * @since 1.19 + */ +EAPI Ecore_Wl2_Offer* ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input); + +/** + * Set the types which are available from this client + * Later the event ECORE_WL2_EVENT_DATA_SOURCE_SEND is emitted, + * where the caller of this api must write the data (encoded in the given mimetype) to the fd + * + * @param input the input to provice this types on + * @param types a null-terminated array of mimetypes supported by the client + * + * @return serial of request on success, 0 on failure + * + * @ingroup Ecore_Wl2_Dnd_Group + * @since 1.17 + */ +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 serial of request on success, 0 on failure + * + * @ingroup Ecore_Wl2_Dnd_Group + * @since 1.17 + */ +EAPI uint32_t ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input); + # undef EAPI # define EAPI -- 2.7.4