devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ad54caeedae629919cc05571f13efcf7e34e2e77
commit ad54caeedae629919cc05571f13efcf7e34e2e77 Author: Chris Michael <[email protected]> Date: Fri Sep 25 10:30:06 2015 -0400 ecore-wl2: Add structure and event type for dnd enter Signed-off-by: Chris Michael <[email protected]> --- src/lib/ecore_wl2/Ecore_Wl2.h | 30 ++++++++++++++++++++---------- src/lib/ecore_wl2/ecore_wl2.c | 2 ++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 16ad100..90e65c2 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -36,6 +36,18 @@ typedef struct _Ecore_Wl2_Display Ecore_Wl2_Display; typedef struct _Ecore_Wl2_Output Ecore_Wl2_Output; typedef struct _Ecore_Wl2_Input Ecore_Wl2_Input; +typedef struct _Ecore_Wl2_Global +{ + Eina_Stringshare *interface; + unsigned int id, version; +} Ecore_Wl2_Global; + +typedef struct _Ecore_Wl2_Event_Global +{ + Eina_Stringshare *interface; + unsigned int id, version; +} Ecore_Wl2_Event_Global; + typedef struct _Ecore_Wl2_Event_Focus_In { unsigned int window; @@ -48,17 +60,13 @@ typedef struct _Ecore_Wl2_Event_Focus_Out unsigned int timestamp; } Ecore_Wl2_Event_Focus_Out; -typedef struct _Ecore_Wl2_Global +typedef struct _Ecore_Wl2_Event_Dnd_Enter { - Eina_Stringshare *interface; - unsigned int id, version; -} Ecore_Wl2_Global; - -typedef struct _Ecore_Wl2_Event_Global -{ - Eina_Stringshare *interface; - unsigned int id, version; -} Ecore_Wl2_Event_Global; + unsigned int win, source, serial; + char **types; + int num_types, x, y; + struct wl_data_offer *offer; +} Ecore_Wl2_Event_Dnd_Enter; typedef enum _Ecore_Wl2_Window_Type { @@ -76,6 +84,8 @@ EAPI extern int ECORE_WL2_EVENT_GLOBAL_ADDED; EAPI extern int ECORE_WL2_EVENT_GLOBAL_REMOVED; EAPI extern int ECORE_WL2_EVENT_FOCUS_IN; EAPI extern int ECORE_WL2_EVENT_FOCUS_OUT; +EAPI extern int ECORE_WL2_EVENT_DND_ENTER; + /** * @file * @brief Ecore functions for dealing with the Wayland display protocol diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c index 74218cb..dd8cdef 100644 --- a/src/lib/ecore_wl2/ecore_wl2.c +++ b/src/lib/ecore_wl2/ecore_wl2.c @@ -15,6 +15,7 @@ EAPI int ECORE_WL2_EVENT_GLOBAL_ADDED = 0; EAPI int ECORE_WL2_EVENT_GLOBAL_REMOVED = 0; EAPI int ECORE_WL2_EVENT_FOCUS_IN = 0; EAPI int ECORE_WL2_EVENT_FOCUS_OUT = 0; +EAPI int ECORE_WL2_EVENT_DND_ENTER = 0; static void _cb_wl_log_print(const char *format, va_list args) @@ -61,6 +62,7 @@ ecore_wl2_init(void) ECORE_WL2_EVENT_GLOBAL_REMOVED = ecore_event_type_new(); ECORE_WL2_EVENT_FOCUS_IN = ecore_event_type_new(); ECORE_WL2_EVENT_FOCUS_OUT = ecore_event_type_new(); + ECORE_WL2_EVENT_DND_ENTER = ecore_event_type_new(); } wl_log_set_handler_server(_cb_wl_log_print); --
