e_dnd: remove unused codes 54/295554/1
authorJunseok Kim <juns.kim@samsung.com>
Thu, 6 Jul 2023 01:20:53 +0000 (10:20 +0900)
committerTizen Window System <tizen.windowsystem@gmail.com>
Tue, 11 Jul 2023 00:28:25 +0000 (09:28 +0900)
Change-Id: I4111df617b86b6774ba14e0723ccc31457e0fa55

src/bin/e_comp_wl_data.c
src/bin/e_dnd.c
src/bin/e_dnd.h

index 57eb5cb..6ab844d 100644 (file)
@@ -638,7 +638,7 @@ _e_comp_wl_data_device_selection_set(void *data EINA_UNUSED, E_Comp_Wl_Data_Sour
 }
 
 static void
-_e_comp_wl_data_device_drag_finished(E_Drag *drag, int dropped)
+_e_comp_wl_data_device_drag_finished(E_Drag *drag)
 {
    Evas_Object *o;
 
@@ -661,7 +661,7 @@ _e_comp_wl_data_device_drag_finished(E_Drag *drag, int dropped)
    e_comp_wl->drag_client = NULL;
 
    e_comp_override_del();
-   if (e_comp_wl->selection.target && (!dropped))
+   if (e_comp_wl->selection.target)
      {
         struct wl_resource *res;
         E_Comp_Wl_Data_Source *drag_source;
@@ -754,7 +754,7 @@ _e_comp_wl_data_device_cb_drag_start(struct wl_client *client, struct wl_resourc
      }
 
    evas_pointer_canvas_xy_get(e_comp->evas, &x, &y);
-   e_comp_wl->drag = e_drag_new(x, y, NULL, 0, NULL, 0, NULL, _e_comp_wl_data_device_drag_finished);
+   e_comp_wl->drag = e_drag_new(x, y, _e_comp_wl_data_device_drag_finished);
    e_comp_wl->drag->button_mask = evas_pointer_button_down_mask_get(e_comp->evas);
    if (drag_icon_ec)
      {
index 26b9234..dd02f16 100644 (file)
@@ -2,10 +2,7 @@
 
 /* local subsystem functions */
 
-static void           _e_drag_coords_update(const E_Drop_Handler *h, int *dx, int *dy);
-static Ecore_Window _e_drag_win_get(const E_Drop_Handler *h, int xdnd);
-static int            _e_drag_win_matches(E_Drop_Handler *h, Ecore_Window win);
-static void           _e_drag_end(int x, int y);
+static void           _e_drag_end(void);
 static void           _e_drag_free(E_Drag *drag);
 
 static Eina_Bool      _e_dnd_cb_mouse_up(void *data, int type, void *event);
@@ -14,74 +11,22 @@ static Eina_Bool      _e_dnd_cb_mouse_move(void *data, int type, void *event);
 static Eina_Bool      _e_dnd_cb_zone_display_rotation_change_end(void *data, int type, void *event);
 #endif
 
-/* local subsystem globals */
-typedef struct _XDnd XDnd;
-
-struct _XDnd
-{
-   int         x, y;
-   const char *type;
-   void       *data;
-};
-
 static Eina_List *_event_handlers = NULL;
 static Eina_List *_zone_event_handlers = NULL;
-static Eina_List *_drop_handlers = NULL;
-static Eina_List *_active_handlers = NULL;
-static Eina_Hash *_drop_win_hash = NULL;
 
 static Ecore_Window _drag_win = 0;
-static Ecore_Window _drag_win_root = 0;
 
-static Eina_List *_drag_list = NULL;
 static E_Drag *_drag_current = NULL;
 
-static Eina_Stringshare *_type_text_uri_list = NULL;
-
-static Eina_Hash *_drop_handlers_responsives;
-
-static void
-_e_drop_handler_active_check(E_Drop_Handler *h, const E_Drag *drag, Eina_Stringshare *type)
-{
-   unsigned int i, j;
-
-   if (h->hidden) return;
-   for (i = 0; i < h->num_types; i++)
-     {
-        if (drag)
-          {
-             for (j = 0; j < drag->num_types; j++)
-               {
-                  if (h->types[i] != drag->types[j]) continue;
-                  h->active = 1;
-                  h->active_type = eina_stringshare_ref(h->types[i]);
-                  return;
-               }
-          }
-        else
-          {
-             if (h->types[i] != type) continue;
-             h->active = 1;
-             h->active_type = eina_stringshare_ref(h->types[i]);
-             return;
-          }
-     }
-}
-
 static int
-_e_drag_finalize(E_Drag *drag, E_Drag_Type type, int x, int y)
+_e_drag_finalize(E_Drag *drag, int x, int y)
 {
-   const Eina_List *l;
-   E_Drop_Handler *h;
-
    if (_drag_win) return 0;
+   _drag_win = e_comp->ee_win;
+   if (!e_comp_grab_input(1, 1))
      {
-        _drag_win = _drag_win_root = e_comp->ee_win;
-        if (!e_comp_grab_input(1, 1))
-          {
-             _drag_win = _drag_win_root = 0;
-             return 0;
-          }
+        _drag_win = 0;
+        return 0;
      }
 
    if (!drag->object)
@@ -89,31 +34,12 @@ _e_drag_finalize(E_Drag *drag, E_Drag_Type type, int x, int y)
         e_drag_object_set(drag, evas_object_rectangle_add(drag->evas));
         evas_object_color_set(drag->object, 0, 0, 0, 0);
      }
+
    e_drag_move(drag, x, y);
    evas_object_resize(drag->comp_object, drag->w, drag->h);
    drag->visible = 1;
    evas_object_show(drag->comp_object);
    evas_object_show(drag->object);
-   drag->type = type;
-
-
-   _active_handlers = eina_list_free(_active_handlers);
-   EINA_LIST_FOREACH(_drop_handlers, l, h)
-     {
-        Eina_Bool active = h->active;
-
-        h->active = 0;
-        eina_stringshare_replace(&h->active_type, NULL);
-        _e_drop_handler_active_check(h, drag, NULL);
-        if (h->active != active)
-          {
-             if (h->active)
-               _active_handlers = eina_list_append(_active_handlers, h);
-             else
-               _active_handlers = eina_list_remove(_active_handlers, h);
-          }
-        h->entered = 0;
-     }
 
    _drag_current = drag;
    return 1;
@@ -126,10 +52,6 @@ e_dnd_init(void)
 {
    if (!_event_handlers)
      {
-        _type_text_uri_list = eina_stringshare_add("text/uri-list");
-
-        _drop_win_hash = eina_hash_int32_new(NULL);
-        _drop_handlers_responsives = eina_hash_pointer_new(NULL);
 
         E_LIST_HANDLER_APPEND(_event_handlers, ECORE_EVENT_MOUSE_BUTTON_UP, _e_dnd_cb_mouse_up, NULL);
         E_LIST_HANDLER_APPEND(_event_handlers, ECORE_EVENT_MOUSE_MOVE, _e_dnd_cb_mouse_move, NULL);
@@ -138,7 +60,7 @@ e_dnd_init(void)
    if (!_zone_event_handlers)
      {
 #if _F_ZONE_WINDOW_ROTATION_
-       E_LIST_HANDLER_APPEND(_zone_event_handlers, E_EVENT_ZONE_ROTATION_CHANGE_END, _e_dnd_cb_zone_display_rotation_change_end, NULL);
+        E_LIST_HANDLER_APPEND(_zone_event_handlers, E_EVENT_ZONE_ROTATION_CHANGE_END, _e_dnd_cb_zone_display_rotation_change_end, NULL);
 #endif
      }
 
@@ -148,21 +70,9 @@ e_dnd_init(void)
 EINTERN int
 e_dnd_shutdown(void)
 {
-   E_FREE_LIST(_drag_list, e_object_del);
-
-   _active_handlers = eina_list_free(_active_handlers);
-   E_FREE_LIST(_drop_handlers, e_drop_handler_del);
-
    E_FREE_LIST(_event_handlers, ecore_event_handler_del);
    E_FREE_LIST(_zone_event_handlers, ecore_event_handler_del);
 
-   eina_hash_free(_drop_win_hash);
-
-   eina_hash_free(_drop_handlers_responsives);
-
-   eina_stringshare_del(_type_text_uri_list);
-   _type_text_uri_list = NULL;
-
    return 1;
 }
 
@@ -174,48 +84,25 @@ e_drag_current_get(void)
 
 EINTERN E_Drag *
 e_drag_new(int x, int y,
-           const char **types, unsigned int num_types,
-           void *data, int size,
-           void *(*convert_cb)(E_Drag * drag, const char *type),
-           void (*finished_cb)(E_Drag *drag, int dropped))
+           void (*finished_cb)(E_Drag *drag))
 {
    E_Drag *drag;
-   unsigned int i;
 
-   drag = e_object_alloc(sizeof(E_Drag) + num_types * sizeof(char *),
+   drag = e_object_alloc(sizeof(E_Drag),
                          E_DRAG_TYPE, E_OBJECT_CLEANUP_FUNC(_e_drag_free));
    if (!drag) return NULL;
    drag->x = x;
    drag->y = y;
    drag->w = 24;
    drag->h = 24;
-   drag->layer = E_LAYER_CLIENT_DRAG;
 
    drag->evas = e_comp->evas;
 
-   drag->type = E_DRAG_NONE;
-
-   for (i = 0; i < num_types; i++)
-     drag->types[i] = eina_stringshare_add(types[i]);
-   drag->num_types = num_types;
-   drag->data = data;
-   drag->data_size = size;
-   drag->cb.convert = convert_cb;
    drag->cb.finished = finished_cb;
 
-   _drag_list = eina_list_append(_drag_list, drag);
-
-   _drag_win_root = e_comp->root;
-
    return drag;
 }
 
-EINTERN Evas *
-e_drag_evas_get(const E_Drag *drag)
-{
-   return drag->evas;
-}
-
 EINTERN void
 e_drag_object_set(E_Drag *drag, Evas_Object *object)
 {
@@ -227,7 +114,7 @@ e_drag_object_set(E_Drag *drag, Evas_Object *object)
      evas_object_hide(object);
    drag->object = object;
    drag->comp_object = e_comp_object_util_add(object);
-   evas_object_layer_set(drag->comp_object, drag->layer);
+   evas_object_layer_set(drag->comp_object, E_LAYER_CLIENT_DRAG);
    evas_object_name_set(drag->comp_object, "E Drag");
    evas_object_pass_events_set(drag->comp_object, 1);
 }
@@ -266,323 +153,21 @@ e_drag_resize(E_Drag *drag, int w, int h)
 }
 
 EINTERN int
-e_dnd_active(void)
-{
-   return _drag_win != 0;
-}
-
-EINTERN int
 e_drag_start(E_Drag *drag, int x, int y)
 {
-   return _e_drag_finalize(drag, E_DRAG_INTERNAL, x, y);
-}
-
-EINTERN void
-e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type))
-{
-   handler->cb.xds = cb;
-}
-
-/* should only be used for windows */
-EINTERN E_Drop_Handler *
-e_drop_handler_add(E_Object *obj, Evas_Object *win,
-                   void *data,
-                   void (*enter_cb)(void *data, const char *type, void *event),
-                   void (*move_cb)(void *data, const char *type, void *event),
-                   void (*leave_cb)(void *data, const char *type, void *event),
-                   void (*drop_cb)(void *data, const char *type, void *event),
-                   const char **types, unsigned int num_types, int x, int y, int w, int h)
-{
-   E_Drop_Handler *handler;
-   unsigned int i;
-
-   handler = calloc(1, sizeof(E_Drop_Handler) + num_types * sizeof(char *));
-   if (!handler) return NULL;
-
-   handler->cb.data = data;
-   handler->cb.enter = enter_cb;
-   handler->cb.move = move_cb;
-   handler->cb.leave = leave_cb;
-   handler->cb.drop = drop_cb;
-   handler->num_types = num_types;
-   for (i = 0; i < num_types; i++)
-     handler->types[i] = eina_stringshare_add(types[i]);
-   handler->x = x;
-   handler->y = y;
-   handler->w = w;
-   handler->h = h;
-
-   handler->obj = obj;
-   handler->win = win;
-   handler->entered = 0;
-
-   _drop_handlers = eina_list_append(_drop_handlers, handler);
-
-   return handler;
-}
-
-EINTERN void
-e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h)
-{
-   handler->x = x;
-   handler->y = y;
-   handler->w = w;
-   handler->h = h;
-}
-
-EINTERN int
-e_drop_inside(const E_Drop_Handler *handler, int x, int y)
-{
-   int dx, dy;
-
-   _e_drag_coords_update(handler, &dx, &dy);
-   x -= dx;
-   y -= dy;
-   return E_INSIDE(x, y, handler->x, handler->y, handler->w, handler->h);
-}
-
-EINTERN void
-e_drop_handler_del(E_Drop_Handler *handler)
-{
-   unsigned int i;
-   Eina_List *l;
-   Ecore_Window hwin;
-
-   if (!handler)
-     return;
-
-   hwin = _e_drag_win_get(handler, 1);
-   if (hwin)
-     {
-        l = eina_hash_find(_drop_handlers_responsives, &hwin);
-        if (l)
-          eina_hash_set(_drop_handlers_responsives, &hwin, eina_list_remove(l, handler));
-     }
-   _drop_handlers = eina_list_remove(_drop_handlers, handler);
-   if (handler->active)
-     _active_handlers = eina_list_remove(_active_handlers, handler);
-   for (i = 0; i < handler->num_types; i++)
-     eina_stringshare_del(handler->types[i]);
-   eina_stringshare_del(handler->active_type);
-   free(handler);
-}
-
-EINTERN void
-e_drop_handler_responsive_set(E_Drop_Handler *handler)
-{
-   Ecore_Window hwin = _e_drag_win_get(handler, 1);
-   Eina_List *l;
-
-   l = eina_hash_find(_drop_handlers_responsives, &hwin);
-   eina_hash_set(_drop_handlers_responsives, &hwin, eina_list_append(l, handler));
-}
-
-EINTERN int
-e_drop_handler_responsive_get(const E_Drop_Handler *handler)
-{
-   Ecore_Window hwin = _e_drag_win_get(handler, 1);
-   Eina_List *l;
-
-   l = eina_hash_find(_drop_handlers_responsives, &hwin);
-   return l && eina_list_data_find(l, handler);
-}
-
-/* from ecore_x_selection.c */
-EINTERN Eina_List *
-e_dnd_util_text_uri_list_convert(char *data, int size)
-{
-   char *tmp;
-   int i, is;
-   Eina_List *ret = NULL;
-
-   if ((!data) || (!size)) return NULL;
-   tmp = malloc(size);
-   if (!tmp) return NULL;
-
-   is = i = 0;
-   while ((is < size) && (data[is]))
-     {
-        if ((i == 0) && (data[is] == '#'))
-          for (; ((data[is]) && (data[is] != '\n')); is++) ;
-        else
-          {
-             if ((data[is] != '\r') &&
-                 (data[is] != '\n'))
-               tmp[i++] = data[is++];
-             else
-               {
-                  while ((data[is] == '\r') || (data[is] == '\n'))
-                    is++;
-                  tmp[i] = 0;
-                  ret = eina_list_append(ret, strdup(tmp));
-                  tmp[0] = 0;
-                  i = 0;
-               }
-          }
-     }
-   if (i > 0)
-     {
-        tmp[i] = 0;
-        ret = eina_list_append(ret, strdup(tmp));
-     }
-
-   free(tmp);
-
-   return ret;
+   return _e_drag_finalize(drag, x, y);
 }
 
 /* local subsystem functions */
 static void
-_e_drag_coords_update(const E_Drop_Handler *h, int *dx, int *dy)
+_e_drag_end(void)
 {
-   int px = 0, py = 0;
-
-   *dx = 0;
-   *dy = 0;
-   if (h->obj)
-     {
-        switch (h->obj->type)
-          {
-           case E_ZONE_TYPE:
-// zone based drag targets are in a comp thus their coords should be
-// screen-relative as containers just cover the screen
-//          px = ((E_Zone *)(h->obj))->x;
-//          py = ((E_Zone *)(h->obj))->y;
-             break;
-
-           case E_CLIENT_TYPE:
-             px = ((E_Client *)(h->obj))->x;
-             py = ((E_Client *)(h->obj))->y;
-             break;
-
-           /* FIXME: add more types as needed */
-           default:
-             break;
-          }
-     }
-   *dx += px;
-   *dy += py;
-}
-
-static Ecore_Window
-_e_drag_win_get(const E_Drop_Handler *h, int xdnd)
-{
-   Ecore_Window hwin = 0;
-
-   if (h->obj)
-     {
-        switch (h->obj->type)
-          {
-           case E_CLIENT_TYPE:
-           case E_ZONE_TYPE:
-             hwin = e_comp->ee_win;
-             break;
-
-           /* FIXME: add more types as needed */
-           default:
-             break;
-          }
-     }
-
-   return hwin;
-}
-
-static int
-_e_drag_win_matches(E_Drop_Handler *h, Ecore_Window win)
-{
-   Ecore_Window hwin = _e_drag_win_get(h, 0);
-
-   if (win == hwin) return 1;
-   return 0;
-}
-
-static void
-_e_drag_end(int x, int y)
-{
-   const Eina_List *l;
-   E_Event_Dnd_Drop ev;
-   int dx, dy;
-   Ecore_Window win;
-   E_Drop_Handler *h;
-   int dropped = 0;
-
    if (!_drag_current) return;
-   win = e_comp_top_window_at_xy_get(x, y);
 
    evas_object_hide(_drag_current->comp_object);
 
-   dropped = 0;
-   if (!_drag_current->data)
-     {
-        /* Just leave */
-        E_Event_Dnd_Leave leave_ev;
-
-        leave_ev.x = x;
-        leave_ev.y = y;
-
-        EINA_LIST_FOREACH(_active_handlers, l, h)
-          {
-             if (h->entered)
-               {
-                  if (h->cb.leave)
-                    h->cb.leave(h->cb.data, h->active_type, &leave_ev);
-                  h->entered = 0;
-               }
-          }
-     }
-
-   EINA_LIST_FOREACH(_active_handlers, l, h)
-     {
-        if (!h->entered) continue;
-        _e_drag_coords_update(h, &dx, &dy);
-        ev.x = x - dx;
-        ev.y = y - dy;
-        if ((_e_drag_win_matches(h, win)) &&
-            ((h->cb.drop) && (E_INSIDE(ev.x, ev.y, h->x, h->y, h->w, h->h))))
-          {
-             Eina_Bool need_free = EINA_FALSE;
-
-             if (_drag_current->cb.convert)
-               {
-                  ev.data = _drag_current->cb.convert(_drag_current,
-                                                      h->active_type);
-               }
-             else
-               {
-                  unsigned int i;
-
-                  for (i = 0; i < _drag_current->num_types; i++)
-                    if (_drag_current->types[i] == _type_text_uri_list)
-                      {
-                         char *data = _drag_current->data;
-                         int size = _drag_current->data_size;
-
-                         if (data && data[size - 1])
-                           {
-                              /* Isn't nul terminated */
-                              size++;
-                              data = realloc(data, size);
-                              if (!data) break;
-                              data[size - 1] = 0;
-                           }
-                         _drag_current->data = data;
-                         _drag_current->data_size = size;
-                         ev.data = e_dnd_util_text_uri_list_convert(_drag_current->data, _drag_current->data_size);
-                         need_free = EINA_TRUE;
-                         break;
-                      }
-                  if (!need_free)
-                    ev.data = _drag_current->data;
-               }
-             h->cb.drop(h->cb.data, h->active_type, &ev);
-             if (need_free) E_FREE_LIST(ev.data, free);
-             dropped = 1;
-          }
-        h->entered = 0;
-        if (dropped) break;
-     }
    if (_drag_current->cb.finished)
-     _drag_current->cb.finished(_drag_current, dropped);
+     _drag_current->cb.finished(_drag_current);
    _drag_current->cb.finished = NULL;
 
    e_object_del(E_OBJECT(_drag_current));
@@ -593,40 +178,19 @@ _e_drag_end(int x, int y)
 static void
 _e_drag_free(E_Drag *drag)
 {
-   unsigned int i;
-
    if (drag == _drag_current)
      {
-        E_Event_Dnd_Leave leave_ev;
-        E_Drop_Handler *h;
-
         e_grabinput_release(_drag_win, _drag_win);
-        _drag_win_root = 0;
-
-        leave_ev.x = 0;
-        leave_ev.y = 0;
-        EINA_LIST_FREE(_active_handlers, h)
-          {
-             if (h->entered)
-               {
-                  if (h->cb.leave)
-                    h->cb.leave(h->cb.data, h->active_type, &leave_ev);
-               }
-             h->active = 0;
-          }
+
         if (drag->cb.finished)
-          drag->cb.finished(drag, 0);
+          drag->cb.finished(drag);
         drag->cb.finished = NULL;
-     }
 
-   _drag_current = NULL;
-
-   _drag_list = eina_list_remove(_drag_list, drag);
+        _drag_current = NULL;
+     }
 
    evas_object_hide(drag->comp_object);
    E_FREE_FUNC(drag->comp_object, evas_object_del);
-   for (i = 0; i < drag->num_types; i++)
-     eina_stringshare_del(drag->types[i]);
    free(drag);
    e_comp_ungrab_input(1, 1);
    _drag_win = 0;
@@ -648,7 +212,8 @@ _e_dnd_cb_mouse_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
         _drag_current->button_mask &= ~(1 << (ev->buttons - 1));
         if (_drag_current->button_mask) return ECORE_CALLBACK_RENEW;
      }
-   _e_drag_end(ev->x, ev->y);
+
+   _e_drag_end();
 
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -674,7 +239,7 @@ _e_dnd_cb_zone_display_rotation_change_end(void *data EINA_UNUSED, int type EINA
 
    source = e_comp_wl->drag_source;
    source->accepted = EINA_FALSE;
-   _e_drag_end(-1, -1);
+   _e_drag_end();
    E_FREE(e_comp_wl->drag);
 
    return ECORE_CALLBACK_PASS_ON;
index 894434e..c47bfd5 100644 (file)
@@ -1,19 +1,6 @@
 #ifdef E_TYPEDEFS
 
-typedef enum _E_Drag_Type
-{
-   E_DRAG_NONE,
-   E_DRAG_INTERNAL,
-   E_DRAG_XDND
-} E_Drag_Type;
-
 typedef struct _E_Drag            E_Drag;
-typedef struct _E_Drop_Handler    E_Drop_Handler;
-typedef struct _E_Event_Dnd_Enter E_Event_Dnd_Enter;
-typedef struct _E_Event_Dnd_Move  E_Event_Dnd_Move;
-typedef struct _E_Event_Dnd_Leave E_Event_Dnd_Leave;
-typedef struct _E_Event_Dnd_Drop  E_Event_Dnd_Drop;
-typedef struct E_Dnd_X_Moz_Url    E_Dnd_X_Moz_Url;
 
 #else
 #ifndef E_DND_H
@@ -24,17 +11,10 @@ typedef struct E_Dnd_X_Moz_Url    E_Dnd_X_Moz_Url;
 struct _E_Drag
 {
    E_Object           e_obj_inherit;
-
-   void              *data;
-   int                data_size;
-
-   E_Drag_Type        type;
-
    struct
-   {
-      void *(*convert)(E_Drag * drag, const char *type);
-      void  (*finished)(E_Drag *drag, int dropped);
-   } cb;
+     {
+        void  (*finished)(E_Drag *drag);
+     } cb;
 
    Evas              *evas;
    Evas_Object       *comp_object;
@@ -44,81 +24,16 @@ struct _E_Drag
    int                dx, dy;
    unsigned int       button_mask;
 
-   E_Layer            layer;
    unsigned char      visible : 1;
-   Eina_Bool          ended : 1;
-
-   unsigned int       num_types;
-   const char        *types[];
-};
-
-struct _E_Drop_Handler
-{
-   struct
-   {
-      void  (*enter)(void *data, const char *type, void *event);
-      void  (*move)(void *data, const char *type, void *event);
-      void  (*leave)(void *data, const char *type, void *event);
-      void  (*drop)(void *data, const char *type, void *event);
-      Eina_Bool (*xds)(void *data, const char *type);
-      void *data;
-   } cb;
-
-   E_Object     *obj;
-   Evas_Object *win;
-   Evas_Object *base;
-   int           x, y, w, h;
-
-   const char   *active_type;
-   Eina_Bool active : 1;
-   Eina_Bool entered : 1;
-   Eina_Bool hidden : 1;
-   unsigned int  num_types;
-   Eina_Stringshare *types[];
-};
-
-struct _E_Event_Dnd_Enter
-{
-   void        *data;
-   int          x, y;
-   unsigned int action;
-};
-
-struct _E_Event_Dnd_Move
-{
-   int          x, y;
-   unsigned int action;
-};
-
-struct _E_Event_Dnd_Leave
-{
-   int x, y;
-};
-
-struct _E_Event_Dnd_Drop
-{
-   void *data;
-   int   x, y;
-};
-
-struct E_Dnd_X_Moz_Url
-{
-   Eina_Inarray *links;
-   Eina_Inarray *link_names;
 };
 
 EINTERN int          e_dnd_init(void);
 EINTERN int          e_dnd_shutdown(void);
 
-EINTERN int             e_dnd_active(void);
-
 EINTERN E_Drag         *e_drag_current_get(void);
 /* x and y are the top left coords of the object that is to be dragged */
 EINTERN E_Drag         *e_drag_new(int x, int y,
-                                const char **types, unsigned int num_types,
-                                void *data, int size,
-                                void *(*convert_cb)(E_Drag * drag, const char *type),
-                                void (*finished_cb)(E_Drag *drag, int dropped));
+                                   void (*finished_cb)(E_Drag *drag));
 EINTERN Evas           *e_drag_evas_get(const E_Drag *drag);
 EINTERN void            e_drag_object_set(E_Drag *drag, Evas_Object *object);
 EINTERN void            e_drag_reference_point_set(E_Drag *drag, int x, int y);
@@ -128,34 +43,5 @@ EINTERN void            e_drag_resize(E_Drag *drag, int w, int h);
 /* x and y are the coords where the mouse is when dragging starts */
 EINTERN int             e_drag_start(E_Drag *drag, int x, int y);
 
-EINTERN void e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type));
-EINTERN E_Drop_Handler *e_drop_handler_add(E_Object *obj, Evas_Object *win,
-                                        void *data,
-                                        void (*enter_cb)(void *data, const char *type, void *event),
-                                        void (*move_cb)(void *data, const char *type, void *event),
-                                        void (*leave_cb)(void *data, const char *type, void *event),
-                                        void (*drop_cb)(void *data, const char *type, void *event),
-                                        const char **types, unsigned int num_types,
-                                        int x, int y, int w, int h);
-EINTERN void         e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h);
-EINTERN int          e_drop_inside(const E_Drop_Handler *handler, int x, int y);
-EINTERN void         e_drop_handler_del(E_Drop_Handler *handler);
-EINTERN void         e_drop_handler_responsive_set(E_Drop_Handler *handler);
-EINTERN int          e_drop_handler_responsive_get(const E_Drop_Handler *handler);
-EINTERN Eina_List *e_dnd_util_text_uri_list_convert(char *data, int size);
-
-
-static inline void
-e_drag_show(E_Drag *drag)
-{
-   drag->visible = 1;
-}
-
-static inline void
-e_drag_hide(E_Drag *drag)
-{
-   drag->visible = 0;
-}
-
 #endif
 #endif