From a6343c65c2810b27befea41c1166f0eadb38612f Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 28 May 2013 11:41:46 +0100 Subject: [PATCH] Deprecate/remove some internal functions that were just not needed. Add a wl_data_offer to Ecore_Wl_Dnd_Source Signed-off-by: Chris Michael --- src/lib/ecore_wayland/ecore_wl_private.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h index f07c047..8ad7c64 100644 --- a/src/lib/ecore_wayland/ecore_wl_private.h +++ b/src/lib/ecore_wayland/ecore_wl_private.h @@ -54,25 +54,18 @@ struct _Ecore_Wl_Dnd { Ecore_Wl_Display *ewd; Ecore_Wl_Input *input; - - /* As provider */ - struct wl_data_source *data_source; - struct wl_array types_offered; - - /* TODO: dnd specific fields */ }; struct _Ecore_Wl_Dnd_Source { - struct wl_data_offer *offer; Ecore_Wl_Input *input; + + struct wl_data_offer *data_offer; struct wl_array types; + int refcount; int fd; int x, y; - - /* TODO: task & data_func */ - void *data; }; struct _Ecore_Wl_Dnd_Target @@ -89,7 +82,6 @@ void _ecore_wl_output_del(Ecore_Wl_Output *output); void _ecore_wl_input_add(Ecore_Wl_Display *ewd, unsigned int id); void _ecore_wl_input_del(Ecore_Wl_Input *input); void _ecore_wl_input_pointer_xy_get(int *x, int *y); -void _ecore_wl_input_set_selection(Ecore_Wl_Input *input, struct wl_data_source *source); void _ecore_wl_dnd_add(Ecore_Wl_Input *input, struct wl_data_device *data_device, struct wl_data_offer *offer); void _ecore_wl_dnd_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, int x, int y, struct wl_data_offer *offer); @@ -102,5 +94,4 @@ void _ecore_wl_dnd_del(Ecore_Wl_Dnd_Source *source); void _ecore_wl_events_init(void); void _ecore_wl_events_shutdown(void); -struct wl_data_source *_ecore_wl_create_data_source(Ecore_Wl_Display *ewd); #endif -- 2.7.4