From 79586879f6ac02c9841dec3275275853b802e542 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Wed, 24 May 2023 15:48:45 +0900 Subject: [PATCH] e_dnd: remove ECORE_EVENT_KEY_DOWN/UP code Change-Id: I6f0269df9a71e4d5e370b7f42074a6b751f06cba --- src/bin/e_dnd.c | 49 ------------------------------------------------- src/bin/e_dnd.h | 4 ---- 2 files changed, 53 deletions(-) diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c index 360c368..eedf602 100644 --- a/src/bin/e_dnd.c +++ b/src/bin/e_dnd.c @@ -8,8 +8,6 @@ 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_free(E_Drag *drag); -static Eina_Bool _e_dnd_cb_key_down(void *data, int type, void *event); -static Eina_Bool _e_dnd_cb_key_up(void *data, int type, void *event); static Eina_Bool _e_dnd_cb_mouse_up(void *data, int type, void *event); static Eina_Bool _e_dnd_cb_mouse_move(void *data, int type, void *event); @@ -132,8 +130,6 @@ e_dnd_init(void) 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); - E_LIST_HANDLER_APPEND(_event_handlers, ECORE_EVENT_KEY_DOWN, _e_dnd_cb_key_down, NULL); - E_LIST_HANDLER_APPEND(_event_handlers, ECORE_EVENT_KEY_UP, _e_dnd_cb_key_up, NULL); } return 1; @@ -201,9 +197,6 @@ e_drag_new(int x, int y, _drag_win_root = e_comp->root; - drag->cb.key_down = NULL; - drag->cb.key_up = NULL; - return drag; } @@ -372,18 +365,6 @@ e_drop_handler_responsive_get(const E_Drop_Handler *handler) return l && eina_list_data_find(l, handler); } -E_API void -e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)) -{ - drag->cb.key_down = func; -} - -E_API void -e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)) -{ - drag->cb.key_up = func; -} - /* from ecore_x_selection.c */ E_API Eina_List * e_dnd_util_text_uri_list_convert(char *data, int size) @@ -642,36 +623,6 @@ _e_drag_free(E_Drag *drag) } static Eina_Bool -_e_dnd_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - Ecore_Event_Key *ev = event; - - if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON; - - if (!_drag_current) return ECORE_CALLBACK_PASS_ON; - - if (_drag_current->cb.key_down) - _drag_current->cb.key_down(_drag_current, ev); - - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_e_dnd_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - Ecore_Event_Key *ev = event; - - if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON; - - if (!_drag_current) return ECORE_CALLBACK_PASS_ON; - - if (_drag_current->cb.key_up) - _drag_current->cb.key_up(_drag_current, ev); - - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool _e_dnd_cb_mouse_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev = event; diff --git a/src/bin/e_dnd.h b/src/bin/e_dnd.h index 152c85d..92dd103 100644 --- a/src/bin/e_dnd.h +++ b/src/bin/e_dnd.h @@ -34,8 +34,6 @@ struct _E_Drag { void *(*convert)(E_Drag * drag, const char *type); void (*finished)(E_Drag *drag, int dropped); - void (*key_down)(E_Drag *drag, Ecore_Event_Key *e); - void (*key_up)(E_Drag *drag, Ecore_Event_Key *e); } cb; Evas *evas; @@ -125,8 +123,6 @@ E_API Evas *e_drag_evas_get(const E_Drag *drag); E_API void e_drag_object_set(E_Drag *drag, Evas_Object *object); E_API void e_drag_move(E_Drag *drag, int x, int y); E_API void e_drag_resize(E_Drag *drag, int w, int h); -E_API void e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)); -E_API void e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)); /* x and y are the coords where the mouse is when dragging starts */ E_API int e_drag_start(E_Drag *drag, int x, int y); -- 2.7.4