summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2018-12-21 13:46:06 -0800
committerCedric BAIL <cedric.bail@free.fr>2019-01-02 11:03:49 -0800
commit327593e9b443cf62c0cd9b3b73327b031fa52ea2 (patch)
tree66ebf4ff7f18921161d2f30510a768c9d4c79a5e
parent28c4380eaac8d05b9cf93577bc0a118951713b7a (diff)
elementary: rename Efl.Selection -> Efl.Ui.Selection as it is only usable with User Interface related element.
Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D7505
-rw-r--r--src/Makefile_Elementary.am12
-rw-r--r--src/lib/elementary/Efl_Ui.h2
-rw-r--r--src/lib/elementary/Elementary.h4
-rw-r--r--src/lib/elementary/efl_ui_dnd.c66
-rw-r--r--src/lib/elementary/efl_ui_dnd.eo12
-rw-r--r--src/lib/elementary/efl_ui_dnd_container.eo2
-rw-r--r--src/lib/elementary/efl_ui_dnd_types.eot12
-rw-r--r--src/lib/elementary/efl_ui_selection.c (renamed from src/lib/elementary/efl_selection.c)46
-rw-r--r--src/lib/elementary/efl_ui_selection.eo (renamed from src/lib/elementary/efl_selection.eo)22
-rw-r--r--src/lib/elementary/efl_ui_selection_manager.c (renamed from src/lib/elementary/efl_selection_manager.c)630
-rw-r--r--src/lib/elementary/efl_ui_selection_manager.eo (renamed from src/lib/elementary/efl_selection_manager.eo)28
-rw-r--r--src/lib/elementary/efl_ui_selection_manager_private.h (renamed from src/lib/elementary/efl_selection_manager_private.h)70
-rw-r--r--src/lib/elementary/efl_ui_selection_types.eot (renamed from src/lib/elementary/efl_selection_types.eot)20
-rw-r--r--src/lib/elementary/efl_ui_tags.c2
-rw-r--r--src/lib/elementary/efl_ui_text.c70
-rw-r--r--src/lib/elementary/efl_ui_text.eo4
-rw-r--r--src/lib/elementary/efl_ui_widget.eo2
-rw-r--r--src/lib/elementary/elm_cnp.h46
-rw-r--r--src/lib/elementary/elm_priv.h2
-rw-r--r--src/lib/elementary/meson.build12
20 files changed, 532 insertions, 532 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index af5d06abfe..57a5af2a17 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -119,7 +119,7 @@ elm_public_eolian_files = \
119 lib/elementary/efl_ui_theme.eo \ 119 lib/elementary/efl_ui_theme.eo \
120 lib/elementary/efl_config_global.eo \ 120 lib/elementary/efl_config_global.eo \
121 lib/elementary/elm_code_widget.eo \ 121 lib/elementary/elm_code_widget.eo \
122 lib/elementary/efl_selection.eo \ 122 lib/elementary/efl_ui_selection.eo \
123 lib/elementary/efl_ui_dnd.eo \ 123 lib/elementary/efl_ui_dnd.eo \
124 lib/elementary/efl_ui_dnd_container.eo \ 124 lib/elementary/efl_ui_dnd_container.eo \
125 lib/elementary/efl_ui_focus_manager_window_root.eo \ 125 lib/elementary/efl_ui_focus_manager_window_root.eo \
@@ -172,7 +172,7 @@ elm_private_eolian_files = \
172 lib/elementary/efl_ui_model_state.eo \ 172 lib/elementary/efl_ui_model_state.eo \
173 tests/elementary/focus_test.eo \ 173 tests/elementary/focus_test.eo \
174 tests/elementary/focus_test_sub_main.eo \ 174 tests/elementary/focus_test_sub_main.eo \
175 lib/elementary/efl_selection_manager.eo \ 175 lib/elementary/efl_ui_selection_manager.eo \
176 lib/elementary/efl_datetime_manager.eo \ 176 lib/elementary/efl_datetime_manager.eo \
177 $(NULL) 177 $(NULL)
178 178
@@ -291,7 +291,7 @@ elm_eolian_type_files = \
291 lib/elementary/elm_general.eot \ 291 lib/elementary/elm_general.eot \
292 lib/elementary/efl_ui.eot \ 292 lib/elementary/efl_ui.eot \
293 lib/elementary/efl_ui_list_view_types.eot \ 293 lib/elementary/efl_ui_list_view_types.eot \
294 lib/elementary/efl_selection_types.eot \ 294 lib/elementary/efl_ui_selection_types.eot \
295 lib/elementary/efl_ui_dnd_types.eot 295 lib/elementary/efl_ui_dnd_types.eot
296 296
297elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c) 297elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c)
@@ -865,9 +865,9 @@ lib_elementary_libelementary_la_SOURCES = \
865 lib/elementary/efl_ui_scroller.c \ 865 lib/elementary/efl_ui_scroller.c \
866 lib/elementary/efl_ui_scroll_manager.c \ 866 lib/elementary/efl_ui_scroll_manager.c \
867 lib/elementary/efl_ui_pan.c \ 867 lib/elementary/efl_ui_pan.c \
868 lib/elementary/efl_selection_manager.c \ 868 lib/elementary/efl_ui_selection_manager.c \
869 lib/elementary/efl_selection_manager_private.h \ 869 lib/elementary/efl_ui_selection_manager_private.h \
870 lib/elementary/efl_selection.c \ 870 lib/elementary/efl_ui_selection.c \
871 lib/elementary/efl_datetime_manager.c \ 871 lib/elementary/efl_datetime_manager.c \
872 lib/elementary/efl_ui_dnd.c \ 872 lib/elementary/efl_ui_dnd.c \
873 lib/elementary/elm_focus_legacy.c \ 873 lib/elementary/elm_focus_legacy.c \
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 57b9494e7a..cba63e2f79 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -145,7 +145,7 @@ extern EAPI double _efl_startup_time;
145 145
146// EO types. Defined for legacy-only builds as legacy uses typedef of EO types. 146// EO types. Defined for legacy-only builds as legacy uses typedef of EO types.
147#include "efl_ui.eot.h" 147#include "efl_ui.eot.h"
148#include "efl_selection_types.eot.h" 148#include "efl_ui_selection_types.eot.h"
149 149
150//define focus manager earlier since focus object and manager is circular 150//define focus manager earlier since focus object and manager is circular
151typedef Eo Efl_Ui_Focus_Manager; 151typedef Eo Efl_Ui_Focus_Manager;
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 99798e77cd..936e078d28 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -280,7 +280,7 @@ typedef Eo Efl_Ui_Focus_Manager;
280#include <elm_win.h> 280#include <elm_win.h>
281 281
282#ifdef EFL_EO_API_SUPPORT 282#ifdef EFL_EO_API_SUPPORT
283# include <efl_selection_types.eot.h> 283# include <efl_ui_selection_types.eot.h>
284# include <efl_ui_theme.eo.h> 284# include <efl_ui_theme.eo.h>
285# include <efl_config_global.eo.h> 285# include <efl_config_global.eo.h>
286# include <efl_ui_widget.eo.h> 286# include <efl_ui_widget.eo.h>
@@ -351,7 +351,7 @@ typedef Eo Efl_Ui_Focus_Manager;
351# include <efl_ui_scroll_manager.eo.h> 351# include <efl_ui_scroll_manager.eo.h>
352# include <efl_ui_scroller.eo.h> 352# include <efl_ui_scroller.eo.h>
353# include <efl_ui_dnd_types.eot.h> 353# include <efl_ui_dnd_types.eot.h>
354# include <efl_selection.eo.h> 354# include <efl_ui_selection.eo.h>
355# include <efl_ui_dnd.eo.h> 355# include <efl_ui_dnd.eo.h>
356# include <efl_ui_dnd_container.eo.h> 356# include <efl_ui_dnd_container.eo.h>
357# include <efl_ui_navigation_bar.eo.h> 357# include <efl_ui_navigation_bar.eo.h>
diff --git a/src/lib/elementary/efl_ui_dnd.c b/src/lib/elementary/efl_ui_dnd.c
index 8cf29d27ed..4f491cea39 100644
--- a/src/lib/elementary/efl_ui_dnd.c
+++ b/src/lib/elementary/efl_ui_dnd.c
@@ -7,7 +7,7 @@
7#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED 7#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
9 9
10#define EFL_SELECTION_MANAGER_BETA 10#define EFL_UI_SELECTION_MANAGER_BETA
11 11
12#include <Elementary.h> 12#include <Elementary.h>
13#include <Elementary_Cursor.h> 13#include <Elementary_Cursor.h>
@@ -29,7 +29,7 @@ _efl_ui_selection_manager_get(Eo *obj)
29 Eo *sel_man = efl_key_data_get(app, "__selection_manager"); 29 Eo *sel_man = efl_key_data_get(app, "__selection_manager");
30 if (!sel_man) 30 if (!sel_man)
31 { 31 {
32 sel_man = efl_add(EFL_SELECTION_MANAGER_CLASS, app); 32 sel_man = efl_add(EFL_UI_SELECTION_MANAGER_CLASS, app);
33 efl_key_data_set(app, "__selection_manager", sel_man); 33 efl_key_data_set(app, "__selection_manager", sel_man);
34 } 34 }
35 return sel_man; 35 return sel_man;
@@ -45,12 +45,12 @@ _efl_ui_dnd_shutdown(void)
45} 45}
46 46
47EOLIAN static void 47EOLIAN static void
48_efl_ui_dnd_drag_start(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Format format, Eina_Slice data, 48_efl_ui_dnd_drag_start(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Format format, Eina_Slice data,
49 Efl_Selection_Action action, void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb, 49 Efl_Ui_Selection_Action action, void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb,
50 unsigned int seat) 50 unsigned int seat)
51{ 51{
52 Eo *sel_man = _efl_ui_selection_manager_get(obj); 52 Eo *sel_man = _efl_ui_selection_manager_get(obj);
53 efl_selection_manager_drag_start(sel_man, obj, format, data, action, 53 efl_ui_selection_manager_drag_start(sel_man, obj, format, data, action,
54 icon_func_data, icon_func, icon_func_free_cb, 54 icon_func_data, icon_func, icon_func_free_cb,
55 seat); 55 seat);
56} 56}
@@ -59,29 +59,29 @@ EOLIAN static void
59_efl_ui_dnd_drag_cancel(Eo *obj, void *pd EINA_UNUSED, unsigned int seat) 59_efl_ui_dnd_drag_cancel(Eo *obj, void *pd EINA_UNUSED, unsigned int seat)
60{ 60{
61 Eo *sel_man = _efl_ui_selection_manager_get(obj); 61 Eo *sel_man = _efl_ui_selection_manager_get(obj);
62 efl_selection_manager_drag_cancel(sel_man, obj, seat); 62 efl_ui_selection_manager_drag_cancel(sel_man, obj, seat);
63} 63}
64 64
65EOLIAN static void 65EOLIAN static void
66_efl_ui_dnd_drag_action_set(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Action action, unsigned int seat) 66_efl_ui_dnd_drag_action_set(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Action action, unsigned int seat)
67{ 67{
68 Eo *sel_man = _efl_ui_selection_manager_get(obj); 68 Eo *sel_man = _efl_ui_selection_manager_get(obj);
69 efl_selection_manager_drag_action_set(sel_man, obj, action, seat); 69 efl_ui_selection_manager_drag_action_set(sel_man, obj, action, seat);
70} 70}
71 71
72 72
73EOLIAN static void 73EOLIAN static void
74_efl_ui_dnd_drop_target_add(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Format format, unsigned int seat) 74_efl_ui_dnd_drop_target_add(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Format format, unsigned int seat)
75{ 75{
76 Eo *sel_man = _efl_ui_selection_manager_get(obj); 76 Eo *sel_man = _efl_ui_selection_manager_get(obj);
77 efl_selection_manager_drop_target_add(sel_man, obj, format, seat); 77 efl_ui_selection_manager_drop_target_add(sel_man, obj, format, seat);
78} 78}
79 79
80EOLIAN static void 80EOLIAN static void
81_efl_ui_dnd_drop_target_del(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Format format, unsigned int seat) 81_efl_ui_dnd_drop_target_del(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Format format, unsigned int seat)
82{ 82{
83 Eo *sel_man = _efl_ui_selection_manager_get(obj); 83 Eo *sel_man = _efl_ui_selection_manager_get(obj);
84 efl_selection_manager_drop_target_del(sel_man, obj, format, seat); 84 efl_ui_selection_manager_drop_target_del(sel_man, obj, format, seat);
85} 85}
86 86
87EOLIAN static double 87EOLIAN static double
@@ -107,7 +107,7 @@ _efl_ui_dnd_container_drag_item_add(Eo *obj, Efl_Ui_Dnd_Container_Data *pd,
107 double drag_delay_time = pd->drag_delay_time; 107 double drag_delay_time = pd->drag_delay_time;
108 double anim_time = elm_config_drag_anim_duration_get(); 108 double anim_time = elm_config_drag_anim_duration_get();
109 Eo *sel_man = _efl_ui_selection_manager_get(obj); 109 Eo *sel_man = _efl_ui_selection_manager_get(obj);
110 efl_selection_manager_container_drag_item_add(sel_man, obj, drag_delay_time, anim_time, 110 efl_ui_selection_manager_container_drag_item_add(sel_man, obj, drag_delay_time, anim_time,
111 data_func_data, data_func, data_func_free_cb, 111 data_func_data, data_func, data_func_free_cb,
112 item_func_data, item_func, item_func_free_cb, 112 item_func_data, item_func, item_func_free_cb,
113 icon_func_data, icon_func, icon_func_free_cb, 113 icon_func_data, icon_func, icon_func_free_cb,
@@ -119,23 +119,23 @@ static void
119_efl_ui_dnd_container_drag_item_del(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED, unsigned int seat) 119_efl_ui_dnd_container_drag_item_del(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED, unsigned int seat)
120{ 120{
121 Eo *sel_man = _efl_ui_selection_manager_get(obj); 121 Eo *sel_man = _efl_ui_selection_manager_get(obj);
122 efl_selection_manager_container_drag_item_del(sel_man, obj, seat); 122 efl_ui_selection_manager_container_drag_item_del(sel_man, obj, seat);
123} 123}
124EOLIAN static void 124EOLIAN static void
125_efl_ui_dnd_container_drop_item_add(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED, 125_efl_ui_dnd_container_drop_item_add(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED,
126 Efl_Selection_Format format, 126 Efl_Ui_Selection_Format format,
127 void *item_func_data, Efl_Dnd_Item_Get item_func, Eina_Free_Cb item_func_free_cb, 127 void *item_func_data, Efl_Dnd_Item_Get item_func, Eina_Free_Cb item_func_free_cb,
128 unsigned int seat) 128 unsigned int seat)
129{ 129{
130 Eo *sel_man = _efl_ui_selection_manager_get(obj); 130 Eo *sel_man = _efl_ui_selection_manager_get(obj);
131 efl_selection_manager_container_drop_item_add(sel_man, obj, format, item_func_data, item_func, item_func_free_cb, seat); 131 efl_ui_selection_manager_container_drop_item_add(sel_man, obj, format, item_func_data, item_func, item_func_free_cb, seat);
132} 132}
133 133
134EOLIAN static void 134EOLIAN static void
135_efl_ui_dnd_container_drop_item_del(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED, unsigned int seat) 135_efl_ui_dnd_container_drop_item_del(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED, unsigned int seat)
136{ 136{
137 Eo *sel_man = _efl_ui_selection_manager_get(obj); 137 Eo *sel_man = _efl_ui_selection_manager_get(obj);
138 efl_selection_manager_container_drop_item_del(sel_man, obj, seat); 138 efl_ui_selection_manager_container_drop_item_del(sel_man, obj, seat);
139} 139}
140 140
141 141
@@ -288,7 +288,7 @@ static void
288_dnd_drop_cb(void *data, const Efl_Event *event) 288_dnd_drop_cb(void *data, const Efl_Event *event)
289{ 289{
290 Dnd_Drop *drop = data; 290 Dnd_Drop *drop = data;
291 Efl_Selection_Data *org_ddata = event->info; 291 Efl_Ui_Selection_Data *org_ddata = event->info;
292 Elm_Selection_Data ddata; 292 Elm_Selection_Data ddata;
293 293
294 ddata.x = org_ddata->pos.x; 294 ddata.x = org_ddata->pos.x;
@@ -344,8 +344,8 @@ elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
344 344
345 ic->icon_data = icon_create_data; 345 ic->icon_data = icon_create_data;
346 ic->icon_cb = icon_create_cb; 346 ic->icon_cb = icon_create_cb;
347 efl_selection_manager_drag_start(sel_man, obj, (Efl_Selection_Format)format, sl, 347 efl_ui_selection_manager_drag_start(sel_man, obj, (Efl_Ui_Selection_Format)format, sl,
348 (Efl_Selection_Action)action, 348 (Efl_Ui_Selection_Action)action,
349 ic, _dnd_icon_create_cb, NULL, seatid); 349 ic, _dnd_icon_create_cb, NULL, seatid);
350 350
351 return EINA_TRUE; 351 return EINA_TRUE;
@@ -368,7 +368,7 @@ elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action)
368#ifdef HAVE_ELEMENTARY_WL2 368#ifdef HAVE_ELEMENTARY_WL2
369 seatid = _wl_default_seat_id_get(obj); 369 seatid = _wl_default_seat_id_get(obj);
370#endif 370#endif
371 efl_selection_manager_drag_action_set(sel_man, obj, (Efl_Selection_Action)action, seatid); 371 efl_ui_selection_manager_drag_action_set(sel_man, obj, (Efl_Ui_Selection_Action)action, seatid);
372 372
373 return EINA_TRUE; 373 return EINA_TRUE;
374} 374}
@@ -383,7 +383,7 @@ elm_drag_cancel(Evas_Object *obj)
383 seatid = _wl_default_seat_id_get(obj); 383 seatid = _wl_default_seat_id_get(obj);
384#endif 384#endif
385 385
386 efl_selection_manager_drag_cancel(sel_man, obj, seatid); 386 efl_ui_selection_manager_drag_cancel(sel_man, obj, seatid);
387 387
388 return EINA_TRUE; 388 return EINA_TRUE;
389} 389}
@@ -462,7 +462,7 @@ elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
462 _dnd_drag_pos_cb, pos); 462 _dnd_drag_pos_cb, pos);
463 efl_event_callback_add(obj, EFL_UI_DND_EVENT_DRAG_DROP, 463 efl_event_callback_add(obj, EFL_UI_DND_EVENT_DRAG_DROP,
464 _dnd_drop_cb, drop); 464 _dnd_drop_cb, drop);
465 efl_selection_manager_drop_target_add(sel_man, obj, (Efl_Selection_Format)format, seatid); 465 efl_ui_selection_manager_drop_target_add(sel_man, obj, (Efl_Ui_Selection_Format)format, seatid);
466 466
467 return EINA_TRUE; 467 return EINA_TRUE;
468 468
@@ -521,7 +521,7 @@ elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
521 free(drop->pos); 521 free(drop->pos);
522 free(drop); 522 free(drop);
523 } 523 }
524 efl_selection_manager_drop_target_del(sel_man, obj, (Efl_Selection_Format)format, seatid); 524 efl_ui_selection_manager_drop_target_del(sel_man, obj, (Efl_Ui_Selection_Format)format, seatid);
525 525
526 return EINA_TRUE; 526 return EINA_TRUE;
527} 527}
@@ -568,7 +568,7 @@ static void
568_dnd_cont_drop_cb(void *data, const Efl_Event *event) 568_dnd_cont_drop_cb(void *data, const Efl_Event *event)
569{ 569{
570 Dnd_Cont_Drop *drop = data; 570 Dnd_Cont_Drop *drop = data;
571 Efl_Selection_Data *org_ddata = event->info; 571 Efl_Ui_Selection_Data *org_ddata = event->info;
572 Elm_Selection_Data ddata; 572 Elm_Selection_Data ddata;
573 Evas_Coord xret = 0, yret = 0; 573 Evas_Coord xret = 0, yret = 0;
574 574
@@ -681,7 +681,7 @@ elm_drop_item_container_add(Evas_Object *obj,
681 _dnd_cont_drag_pos_cb, pos); 681 _dnd_cont_drag_pos_cb, pos);
682 efl_event_callback_add(obj, EFL_UI_DND_EVENT_DRAG_DROP, 682 efl_event_callback_add(obj, EFL_UI_DND_EVENT_DRAG_DROP,
683 _dnd_cont_drop_cb, drop); 683 _dnd_cont_drop_cb, drop);
684 efl_selection_manager_container_drop_item_add(sel_man, obj, (Efl_Selection_Format)format, 684 efl_ui_selection_manager_container_drop_item_add(sel_man, obj, (Efl_Ui_Selection_Format)format,
685 item_get_cb, _dnd_item_func, NULL, 685 item_get_cb, _dnd_item_func, NULL,
686 seatid); 686 seatid);
687 687
@@ -708,21 +708,21 @@ elm_drop_item_container_del(Evas_Object *obj)
708 708
709 _cont_drop_free_data(obj); 709 _cont_drop_free_data(obj);
710 evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _cont_drop_obj_del_cb); 710 evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _cont_drop_obj_del_cb);
711 efl_selection_manager_container_drop_item_del(sel_man, obj, seatid); 711 efl_ui_selection_manager_container_drop_item_del(sel_man, obj, seatid);
712 712
713 return EINA_TRUE; 713 return EINA_TRUE;
714} 714}
715 715
716static void 716static void
717_cont_drag_data_func(void *data, Efl_Object *obj, Efl_Selection_Format *format, 717_cont_drag_data_func(void *data, Efl_Object *obj, Efl_Ui_Selection_Format *format,
718 Eina_Rw_Slice *drag_data, Efl_Selection_Action *action) 718 Eina_Rw_Slice *drag_data, Efl_Ui_Selection_Action *action)
719{ 719{
720 Item_Container_Drag_Info *di; 720 Item_Container_Drag_Info *di;
721 721
722 di = data; 722 di = data;
723 if (!di) return; 723 if (!di) return;
724 di->data_get_cb(obj, di->it, &di->user_info); 724 di->data_get_cb(obj, di->it, &di->user_info);
725 if (format) *format = (Efl_Selection_Format)di->user_info.format; 725 if (format) *format = (Efl_Ui_Selection_Format)di->user_info.format;
726 if (drag_data) 726 if (drag_data)
727 { 727 {
728 if (di->user_info.data) 728 if (di->user_info.data)
@@ -731,7 +731,7 @@ _cont_drag_data_func(void *data, Efl_Object *obj, Efl_Selection_Format *format,
731 drag_data->len = strlen(di->user_info.data); 731 drag_data->len = strlen(di->user_info.data);
732 } 732 }
733 } 733 }
734 if (action) *action = (Efl_Selection_Action)di->user_info.action; 734 if (action) *action = (Efl_Ui_Selection_Action)di->user_info.action;
735} 735}
736 736
737static Eina_List * 737static Eina_List *
@@ -817,7 +817,7 @@ elm_drag_item_container_add(Evas_Object *obj, double anim_tm, double tm_to_drag,
817 di_list = eina_list_append(di_list, di); 817 di_list = eina_list_append(di_list, di);
818 efl_key_data_set(obj, "__cont_drag_item", di_list); 818 efl_key_data_set(obj, "__cont_drag_item", di_list);
819 evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _cont_drag_obj_del_cb, NULL); 819 evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _cont_drag_obj_del_cb, NULL);
820 efl_selection_manager_container_drag_item_add(sel_man, obj, anim_tm, tm_to_drag, 820 efl_ui_selection_manager_container_drag_item_add(sel_man, obj, anim_tm, tm_to_drag,
821 di, _cont_drag_data_func, NULL, 821 di, _cont_drag_data_func, NULL,
822 di, _cont_drag_item_func, NULL, 822 di, _cont_drag_item_func, NULL,
823 di, _cont_drag_icon_create, NULL, 823 di, _cont_drag_icon_create, NULL,
@@ -838,7 +838,7 @@ elm_drag_item_container_del(Evas_Object *obj)
838 838
839 _cont_drag_free_data(obj); 839 _cont_drag_free_data(obj);
840 evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _cont_drag_obj_del_cb); 840 evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _cont_drag_obj_del_cb);
841 efl_selection_manager_container_drag_item_del(sel_man, obj, seatid); 841 efl_ui_selection_manager_container_drag_item_del(sel_man, obj, seatid);
842 842
843 return EINA_TRUE; 843 return EINA_TRUE;
844} 844}
diff --git a/src/lib/elementary/efl_ui_dnd.eo b/src/lib/elementary/efl_ui_dnd.eo
index 413cbc8539..a4ea5e9b78 100644
--- a/src/lib/elementary/efl_ui_dnd.eo
+++ b/src/lib/elementary/efl_ui_dnd.eo
@@ -11,9 +11,9 @@ mixin Efl.Ui.Dnd {
11 - EFL_UI_DND_EVENT_DRAG_DONE 11 - EFL_UI_DND_EVENT_DRAG_DONE
12 ]] 12 ]]
13 params { 13 params {
14 @in format: Efl.Selection_Format; [[The data format]] 14 @in format: Efl.Ui.Selection_Format; [[The data format]]
15 @in data: Eina.Slice; [[The drag data]] 15 @in data: Eina.Slice; [[The drag data]]
16 @in action: Efl.Selection_Action; [[Action when data is transferred]] 16 @in action: Efl.Ui.Selection_Action; [[Action when data is transferred]]
17 @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]] 17 @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
18 @in seat: uint; [[Specified seat for multiple seats case.]] 18 @in seat: uint; [[Specified seat for multiple seats case.]]
19 } 19 }
@@ -21,7 +21,7 @@ mixin Efl.Ui.Dnd {
21 drag_action_set { 21 drag_action_set {
22 [[Set the action for the drag]] 22 [[Set the action for the drag]]
23 params { 23 params {
24 @in action: Efl.Selection_Action; [[Drag action]] 24 @in action: Efl.Ui.Selection_Action; [[Drag action]]
25 @in seat: uint; [[Specified seat for multiple seats case.]] 25 @in seat: uint; [[Specified seat for multiple seats case.]]
26 } 26 }
27 } 27 }
@@ -39,14 +39,14 @@ mixin Efl.Ui.Dnd {
39 - EFL_UI_DND_EVENT_DRAG_POS 39 - EFL_UI_DND_EVENT_DRAG_POS
40 - EFL_UI_DND_EVENT_DRAG_DROP.]] 40 - EFL_UI_DND_EVENT_DRAG_DROP.]]
41 params { 41 params {
42 @in format: Efl.Selection_Format; [[Accepted data format]] 42 @in format: Efl.Ui.Selection_Format; [[Accepted data format]]
43 @in seat: uint; [[Specified seat for multiple seats case.]] 43 @in seat: uint; [[Specified seat for multiple seats case.]]
44 } 44 }
45 } 45 }
46 drop_target_del { 46 drop_target_del {
47 [[Delete the dropable status from object]] 47 [[Delete the dropable status from object]]
48 params { 48 params {
49 @in format: Efl.Selection_Format; [[Accepted data format]] 49 @in format: Efl.Ui.Selection_Format; [[Accepted data format]]
50 @in seat: uint; [[Specified seat for multiple seats case.]] 50 @in seat: uint; [[Specified seat for multiple seats case.]]
51 } 51 }
52 } 52 }
@@ -58,6 +58,6 @@ mixin Efl.Ui.Dnd {
58 drag,enter: void; [[called when the drag object enters this object]] 58 drag,enter: void; [[called when the drag object enters this object]]
59 drag,leave: void; [[called when the drag object leaves this object]] 59 drag,leave: void; [[called when the drag object leaves this object]]
60 drag,pos: Efl.Dnd.Drag_Pos; [[called when the drag object changes drag position]] 60 drag,pos: Efl.Dnd.Drag_Pos; [[called when the drag object changes drag position]]
61 drag,drop: Efl.Selection_Data; [[called when the drag object dropped on this object]] 61 drag,drop: Efl.Ui.Selection_Data; [[called when the drag object dropped on this object]]
62 } 62 }
63} 63}
diff --git a/src/lib/elementary/efl_ui_dnd_container.eo b/src/lib/elementary/efl_ui_dnd_container.eo
index 6334ea5ff5..ee1e727a4a 100644
--- a/src/lib/elementary/efl_ui_dnd_container.eo
+++ b/src/lib/elementary/efl_ui_dnd_container.eo
@@ -34,7 +34,7 @@ mixin Efl.Ui.Dnd_Container {
34 } 34 }
35 drop_item_add { 35 drop_item_add {
36 params { 36 params {
37 @in format: Efl.Selection_Format; [[Accepted data formats]] 37 @in format: Efl.Ui.Selection_Format; [[Accepted data formats]]
38 @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]] 38 @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
39 @in seat: uint; [[Specified seat for multiple seats case.]] 39 @in seat: uint; [[Specified seat for multiple seats case.]]
40 } 40 }
diff --git a/src/lib/elementary/efl_ui_dnd_types.eot b/src/lib/elementary/efl_ui_dnd_types.eot
index 4e125c417a..f07de0bc33 100644
--- a/src/lib/elementary/efl_ui_dnd_types.eot
+++ b/src/lib/elementary/efl_ui_dnd_types.eot
@@ -1,4 +1,4 @@
1import efl_selection_types; 1import efl_ui_selection_types;
2 2
3function Efl.Dnd.Drag_Icon_Create { 3function Efl.Dnd.Drag_Icon_Create {
4 [[Function pointer for creating icon at the drag side.]] 4 [[Function pointer for creating icon at the drag side.]]
@@ -14,9 +14,9 @@ function Efl.Dnd.Drag_Data_Get {
14 [[Function pointer for getting data and format at the drag side.]] 14 [[Function pointer for getting data and format at the drag side.]]
15 params { 15 params {
16 @in obj: Efl.Canvas.Object; [[The container object]] 16 @in obj: Efl.Canvas.Object; [[The container object]]
17 @out format: Efl.Selection_Format; [[Data format]] 17 @out format: Efl.Ui.Selection_Format; [[Data format]]
18 @out drag_data: Eina.Rw_Slice; [[Data]] 18 @out drag_data: Eina.Rw_Slice; [[Data]]
19 @out action: Efl.Selection_Action; [[The drag action]] 19 @out action: Efl.Ui.Selection_Action; [[The drag action]]
20 } 20 }
21}; 21};
22 22
@@ -46,13 +46,13 @@ struct Efl.Dnd.Drag_Accept {
46 46
47struct Efl.Dnd.Drag_Pos { 47struct Efl.Dnd.Drag_Pos {
48 pos: Eina.Position2D; [[Evas Coordinate]] 48 pos: Eina.Position2D; [[Evas Coordinate]]
49 action: Efl.Selection_Action; [[The drag action]] 49 action: Efl.Ui.Selection_Action; [[The drag action]]
50 format: Efl.Selection_Format; [[The drag format]] 50 format: Efl.Ui.Selection_Format; [[The drag format]]
51 item: Efl.Canvas.Object; [[The item object. It is only available for container object.]] 51 item: Efl.Canvas.Object; [[The item object. It is only available for container object.]]
52} 52}
53 53
54struct Efl.Dnd.Drag_Item_Container_Drop { 54struct Efl.Dnd.Drag_Item_Container_Drop {
55 item: Efl.Canvas.Object; [[The item object]] 55 item: Efl.Canvas.Object; [[The item object]]
56 data: Efl.Selection_Data; [[The selection data]] 56 data: Efl.Ui.Selection_Data; [[The selection data]]
57 pos: Eina.Position2D; [[Position relative to item (left (-1), middle (0), right (1)]] 57 pos: Eina.Position2D; [[Position relative to item (left (-1), middle (0), right (1)]]
58} 58}
diff --git a/src/lib/elementary/efl_selection.c b/src/lib/elementary/efl_ui_selection.c
index a138d7e6c4..cb5f0a5c32 100644
--- a/src/lib/elementary/efl_selection.c
+++ b/src/lib/elementary/efl_ui_selection.c
@@ -2,43 +2,43 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_SELECTION_MANAGER_BETA 5#define EFL_UI_SELECTION_MANAGER_BETA
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_priv.h" 8#include "elm_priv.h"
9 9
10#define MY_CLASS EFL_SELECTION_MIXIN 10#define MY_CLASS EFL_UI_SELECTION_MIXIN
11#define MY_CLASS_NAME "Efl.Selection" 11#define MY_CLASS_NAME "Efl.Ui.Selection"
12 12
13EOLIAN static void 13EOLIAN static void
14_efl_selection_selection_get(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Type type, Efl_Selection_Format format, 14_efl_ui_selection_selection_get(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Type type, Efl_Ui_Selection_Format format,
15 void *data_func_data, Efl_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb, unsigned int seat) 15 void *data_func_data, Efl_Ui_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb, unsigned int seat)
16{ 16{
17 Eo *sel_man = _efl_ui_selection_manager_get(obj); 17 Eo *sel_man = _efl_ui_selection_manager_get(obj);
18 efl_selection_manager_selection_get(sel_man, obj, type, format, 18 efl_ui_selection_manager_selection_get(sel_man, obj, type, format,
19 data_func_data, data_func, 19 data_func_data, data_func,
20 data_func_free_cb, seat); 20 data_func_free_cb, seat);
21} 21}
22 22
23EOLIAN static Eina_Future * 23EOLIAN static Eina_Future *
24_efl_selection_selection_set(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Type type, Efl_Selection_Format format, Eina_Slice data, unsigned int seat) 24_efl_ui_selection_selection_set(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Type type, Efl_Ui_Selection_Format format, Eina_Slice data, unsigned int seat)
25{ 25{
26 Eo *sel_man = _efl_ui_selection_manager_get(obj); 26 Eo *sel_man = _efl_ui_selection_manager_get(obj);
27 return efl_selection_manager_selection_set(sel_man, obj, type, format, data, seat); 27 return efl_ui_selection_manager_selection_set(sel_man, obj, type, format, data, seat);
28} 28}
29 29
30EOLIAN static void 30EOLIAN static void
31_efl_selection_selection_clear(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Type type, unsigned int seat) 31_efl_ui_selection_selection_clear(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Type type, unsigned int seat)
32{ 32{
33 Eo *sel_man = _efl_ui_selection_manager_get(obj); 33 Eo *sel_man = _efl_ui_selection_manager_get(obj);
34 efl_selection_manager_selection_clear(sel_man, obj, type, seat); 34 efl_ui_selection_manager_selection_clear(sel_man, obj, type, seat);
35} 35}
36 36
37EOLIAN static Eina_Bool 37EOLIAN static Eina_Bool
38_efl_selection_has_owner(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Type type, unsigned int seat) 38_efl_ui_selection_has_owner(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Type type, unsigned int seat)
39{ 39{
40 Eo *sel_man = _efl_ui_selection_manager_get(obj); 40 Eo *sel_man = _efl_ui_selection_manager_get(obj);
41 return efl_selection_manager_selection_has_owner(sel_man, obj, type, seat); 41 return efl_ui_selection_manager_selection_has_owner(sel_man, obj, type, seat);
42} 42}
43 43
44 44
@@ -153,7 +153,7 @@ struct _Cnp_Data_Cb_Wrapper
153}; 153};
154 154
155static void 155static void
156_selection_data_ready_cb(void *data, Efl_Object *obj, Efl_Selection_Data *seldata) 156_selection_data_ready_cb(void *data, Efl_Object *obj, Efl_Ui_Selection_Data *seldata)
157{ 157{
158 Cnp_Data_Cb_Wrapper *wdata = data; 158 Cnp_Data_Cb_Wrapper *wdata = data;
159 if (!wdata) return; 159 if (!wdata) return;
@@ -217,8 +217,8 @@ elm_cnp_selection_get(const Evas_Object *obj, Elm_Sel_Type type,
217#endif 217#endif
218 wdata->udata = udata; 218 wdata->udata = udata;
219 wdata->datacb = datacb; 219 wdata->datacb = datacb;
220 efl_selection_manager_selection_get(sel_man, (Evas_Object *)obj, (Efl_Selection_Type)type, 220 efl_ui_selection_manager_selection_get(sel_man, (Evas_Object *)obj, (Efl_Ui_Selection_Type)type,
221 (Efl_Selection_Format)format, 221 (Efl_Ui_Selection_Format)format,
222 wdata, _selection_data_ready_cb, NULL, seatid); 222 wdata, _selection_data_ready_cb, NULL, seatid);
223 return EINA_TRUE; 223 return EINA_TRUE;
224} 224}
@@ -240,8 +240,8 @@ elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type type,
240#ifdef HAVE_ELEMENTARY_WL2 240#ifdef HAVE_ELEMENTARY_WL2
241 seatid = _wl_default_seat_id_get(obj); 241 seatid = _wl_default_seat_id_get(obj);
242#endif 242#endif
243 f = efl_selection_manager_selection_set(sel_man, obj, (Efl_Selection_Type)type, 243 f = efl_ui_selection_manager_selection_set(sel_man, obj, (Efl_Ui_Selection_Type)type,
244 (Efl_Selection_Format)format, data, seatid); 244 (Efl_Ui_Selection_Format)format, data, seatid);
245 245
246 ldata->obj = obj; 246 ldata->obj = obj;
247 ldata->type = type; 247 ldata->type = type;
@@ -259,7 +259,7 @@ elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type type)
259#ifdef HAVE_ELEMENTARY_WL2 259#ifdef HAVE_ELEMENTARY_WL2
260 seatid = _wl_default_seat_id_get(obj); 260 seatid = _wl_default_seat_id_get(obj);
261#endif 261#endif
262 efl_selection_manager_selection_clear(sel_man, obj, (Efl_Selection_Type)type, seatid); 262 efl_ui_selection_manager_selection_clear(sel_man, obj, (Efl_Ui_Selection_Type)type, seatid);
263 263
264 return EINA_TRUE; 264 return EINA_TRUE;
265} 265}
@@ -292,8 +292,8 @@ elm_selection_selection_has_owner(Evas_Object *obj)
292 seatid = _wl_default_seat_id_get(obj); 292 seatid = _wl_default_seat_id_get(obj);
293#endif 293#endif
294 294
295 return efl_selection_manager_selection_has_owner(sel_man, obj, 295 return efl_ui_selection_manager_selection_has_owner(sel_man, obj,
296 EFL_SELECTION_TYPE_CLIPBOARD, seatid); 296 EFL_UI_SELECTION_TYPE_CLIPBOARD, seatid);
297} 297}
298 298
299EAPI Eina_Bool 299EAPI Eina_Bool
@@ -305,8 +305,8 @@ elm_cnp_clipboard_selection_has_owner(Evas_Object *obj)
305#ifdef HAVE_ELEMENTARY_WL2 305#ifdef HAVE_ELEMENTARY_WL2
306 seatid = _wl_default_seat_id_get(obj); 306 seatid = _wl_default_seat_id_get(obj);
307#endif 307#endif
308 return efl_selection_manager_selection_has_owner(sel_man, obj, 308 return efl_ui_selection_manager_selection_has_owner(sel_man, obj,
309 EFL_SELECTION_TYPE_CLIPBOARD, seatid); 309 EFL_UI_SELECTION_TYPE_CLIPBOARD, seatid);
310} 310}
311 311
312#include "efl_selection.eo.c" 312#include "efl_ui_selection.eo.c"
diff --git a/src/lib/elementary/efl_selection.eo b/src/lib/elementary/efl_ui_selection.eo
index 9db0de597b..89714ceb8b 100644
--- a/src/lib/elementary/efl_selection.eo
+++ b/src/lib/elementary/efl_ui_selection.eo
@@ -1,14 +1,14 @@
1import efl_selection_types; 1import efl_ui_selection_types;
2 2
3mixin Efl.Selection { 3mixin Efl.Ui.Selection {
4 [[Efl Selection class]] 4 [[Efl Ui Selection class]]
5 data: null; 5 data: null;
6 methods { 6 methods {
7 selection_set { 7 selection_set {
8 [[Set the selection data to the object]] 8 [[Set the selection data to the object]]
9 params { 9 params {
10 @in type: Efl.Selection_Type; [[Selection Type]] 10 @in type: Efl.Ui.Selection_Type; [[Selection Type]]
11 @in format: Efl.Selection_Format; [[Selection Format]] 11 @in format: Efl.Ui.Selection_Format; [[Selection Format]]
12 @in data: Eina.Slice; 12 @in data: Eina.Slice;
13 @in seat: uint;[[Specified seat for multiple seats case.]] 13 @in seat: uint;[[Specified seat for multiple seats case.]]
14 } 14 }
@@ -17,29 +17,29 @@ mixin Efl.Selection {
17 selection_get { 17 selection_get {
18 [[Get the data from the object that has selection]] 18 [[Get the data from the object that has selection]]
19 params { 19 params {
20 @in type: Efl.Selection_Type; [[Selection Type]] 20 @in type: Efl.Ui.Selection_Type; [[Selection Type]]
21 @in format: Efl.Selection_Format; [[Selection Format]] 21 @in format: Efl.Ui.Selection_Format; [[Selection Format]]
22 @in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]] 22 @in data_func: Efl.Ui.Selection_Data_Ready; [[Data ready function pointer]]
23 @in seat: uint;[[Specified seat for multiple seats case.]] 23 @in seat: uint;[[Specified seat for multiple seats case.]]
24 } 24 }
25 } 25 }
26 selection_clear { 26 selection_clear {
27 [[Clear the selection data from the object]] 27 [[Clear the selection data from the object]]
28 params { 28 params {
29 @in type: Efl.Selection_Type; [[Selection Type]] 29 @in type: Efl.Ui.Selection_Type; [[Selection Type]]
30 @in seat: uint; [[Specified seat for multiple seats case.]] 30 @in seat: uint; [[Specified seat for multiple seats case.]]
31 } 31 }
32 } 32 }
33 has_owner { 33 has_owner {
34 [[Determine whether the selection data has owner]] 34 [[Determine whether the selection data has owner]]
35 params { 35 params {
36 @in type: Efl.Selection_Type; [[Selection type]] 36 @in type: Efl.Ui.Selection_Type; [[Selection type]]
37 @in seat: uint; [[Specified seat for multiple seats case.]] 37 @in seat: uint; [[Specified seat for multiple seats case.]]
38 } 38 }
39 return: bool; [[EINA_TRUE if there is object owns selection, otherwise EINA_FALSE]] 39 return: bool; [[EINA_TRUE if there is object owns selection, otherwise EINA_FALSE]]
40 } 40 }
41 } 41 }
42 events { 42 events {
43 selection,changed: Efl.Selection_Changed; [[Called when display server's selection has changed]] 43 selection,changed: Efl.Ui.Selection_Changed; [[Called when display server's selection has changed]]
44 } 44 }
45} 45}
diff --git a/src/lib/elementary/efl_selection_manager.c b/src/lib/elementary/efl_ui_selection_manager.c
index d0c4463a18..9fc0689a91 100644
--- a/src/lib/elementary/efl_selection_manager.c
+++ b/src/lib/elementary/efl_ui_selection_manager.c
@@ -8,9 +8,9 @@
8# include <sys/mman.h> 8# include <sys/mman.h>
9#endif 9#endif
10 10
11#include "efl_selection_manager_private.h" 11#include "efl_ui_selection_manager_private.h"
12 12
13#define MY_CLASS EFL_SELECTION_MANAGER_CLASS 13#define MY_CLASS EFL_UI_SELECTION_MANAGER_CLASS
14 14
15//#define DEBUGON 1 15//#define DEBUGON 1
16#ifdef DEBUGON 16#ifdef DEBUGON
@@ -24,15 +24,15 @@ static void _cont_obj_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void
24static void _cont_obj_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); 24static void _cont_obj_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
25static void _item_container_del_internal(Sel_Manager_Drag_Container *dc, Eina_Bool full); 25static void _item_container_del_internal(Sel_Manager_Drag_Container *dc, Eina_Bool full);
26 26
27void efl_selection_manager_drop_target_del(Eo *obj, Efl_Object *target_obj, Efl_Selection_Format format, unsigned int seat); 27void efl_ui_selection_manager_drop_target_del(Eo *obj, Efl_Object *target_obj, Efl_Ui_Selection_Format format, unsigned int seat);
28void efl_selection_manager_selection_clear(Eo *obj, Efl_Object *owner, Efl_Selection_Type type, unsigned int seat); 28void efl_ui_selection_manager_selection_clear(Eo *obj, Efl_Object *owner, Efl_Ui_Selection_Type type, unsigned int seat);
29void efl_selection_manager_drag_start(Eo *obj, Efl_Object *drag_obj, Efl_Selection_Format format, Eina_Slice data, Efl_Selection_Action action, void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb, unsigned int seat); 29void efl_ui_selection_manager_drag_start(Eo *obj, Efl_Object *drag_obj, Efl_Ui_Selection_Format format, Eina_Slice data, Efl_Ui_Selection_Action action, void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb, unsigned int seat);
30 30
31static Eina_List *managers; 31static Eina_List *managers;
32 32
33#ifdef HAVE_ELEMENTARY_X 33#ifdef HAVE_ELEMENTARY_X
34static void _set_selection_list(Sel_Manager_Selection *sel_list, Sel_Manager_Seat_Selection *seat_sel); 34static void _set_selection_list(Sel_Manager_Selection *sel_list, Sel_Manager_Seat_Selection *seat_sel);
35static Ecore_X_Atom _x11_dnd_action_rev_map(Efl_Selection_Action action); 35static Ecore_X_Atom _x11_dnd_action_rev_map(Efl_Ui_Selection_Action action);
36static Ecore_X_Window _x11_xwin_get(const Evas_Object *obj); 36static Ecore_X_Window _x11_xwin_get(const Evas_Object *obj);
37#endif 37#endif
38 38
@@ -48,7 +48,7 @@ static void _set_selection_list(Sel_Manager_Selection *sel_list, Sel_Manager_Sea
48EAPI int ELM_CNP_EVENT_SELECTION_CHANGED = -1; 48EAPI int ELM_CNP_EVENT_SELECTION_CHANGED = -1;
49 49
50static Sel_Manager_Seat_Selection * 50static Sel_Manager_Seat_Selection *
51_sel_manager_seat_selection_get(Efl_Selection_Manager_Data *pd, unsigned int seat) 51_sel_manager_seat_selection_get(Efl_Ui_Selection_Manager_Data *pd, unsigned int seat)
52{ 52{
53 Eina_List *l = NULL; 53 Eina_List *l = NULL;
54 Sel_Manager_Seat_Selection *seat_sel = NULL; 54 Sel_Manager_Seat_Selection *seat_sel = NULL;
@@ -65,10 +65,10 @@ _sel_manager_seat_selection_get(Efl_Selection_Manager_Data *pd, unsigned int sea
65} 65}
66 66
67static inline void 67static inline void
68_owner_change_check(Efl_Selection_Manager *manager, Efl_Object *owner, 68_owner_change_check(Efl_Ui_Selection_Manager *manager, Efl_Object *owner,
69 Sel_Manager_Seat_Selection *seat_sel, 69 Sel_Manager_Seat_Selection *seat_sel,
70 Sel_Manager_Selection *sel, 70 Sel_Manager_Selection *sel,
71 Efl_Selection_Type type, Eina_Bool same_win) 71 Efl_Ui_Selection_Type type, Eina_Bool same_win)
72{ 72{
73 if (!same_win) 73 if (!same_win)
74 { 74 {
@@ -82,7 +82,7 @@ _owner_change_check(Efl_Selection_Manager *manager, Efl_Object *owner,
82 Eina_List *l2, *l2_next, *l3, *l3_next; 82 Eina_List *l2, *l2_next, *l3, *l3_next;
83 Sel_Manager_Selection_Lost *sel_lost; 83 Sel_Manager_Selection_Lost *sel_lost;
84 Sel_Manager_Seat_Selection *seat_sel2; 84 Sel_Manager_Seat_Selection *seat_sel2;
85 Efl_Selection_Manager_Data *pd = efl_data_scope_get(man, MY_CLASS); 85 Efl_Ui_Selection_Manager_Data *pd = efl_data_scope_get(man, MY_CLASS);
86 86
87 if (!pd) continue; 87 if (!pd) continue;
88 EINA_LIST_FOREACH_SAFE(pd->seat_list, l3, l3_next, seat_sel2) 88 EINA_LIST_FOREACH_SAFE(pd->seat_list, l3, l3_next, seat_sel2)
@@ -104,7 +104,7 @@ _owner_change_check(Efl_Selection_Manager *manager, Efl_Object *owner,
104 int i; 104 int i;
105 105
106 for (i = 0; 106 for (i = 0;
107 i < (EFL_SELECTION_TYPE_CLIPBOARD + 1) 107 i < (EFL_UI_SELECTION_TYPE_CLIPBOARD + 1)
108 ; i++) 108 ; i++)
109 { 109 {
110#ifdef HAVE_ELEMENTARY_X 110#ifdef HAVE_ELEMENTARY_X
@@ -146,7 +146,7 @@ _owner_change_check(Efl_Selection_Manager *manager, Efl_Object *owner,
146} 146}
147 147
148static Sel_Manager_Seat_Selection * 148static Sel_Manager_Seat_Selection *
149_sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned int seat) 149_sel_manager_seat_selection_init(Efl_Ui_Selection_Manager_Data *pd, unsigned int seat)
150{ 150{
151 Sel_Manager_Seat_Selection *seat_sel = NULL; 151 Sel_Manager_Seat_Selection *seat_sel = NULL;
152 Eina_List *l = NULL; 152 Eina_List *l = NULL;
@@ -172,7 +172,7 @@ _sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned int se
172#ifdef HAVE_ELEMENTARY_X 172#ifdef HAVE_ELEMENTARY_X
173 if (!seat_sel->sel_list) 173 if (!seat_sel->sel_list)
174 { 174 {
175 seat_sel->sel_list = calloc(1, (EFL_SELECTION_TYPE_CLIPBOARD + 1) * sizeof(Sel_Manager_Selection)); 175 seat_sel->sel_list = calloc(1, (EFL_UI_SELECTION_TYPE_CLIPBOARD + 1) * sizeof(Sel_Manager_Selection));
176 if (!seat_sel->sel_list) 176 if (!seat_sel->sel_list)
177 { 177 {
178 ERR("failed to allocate selection list"); 178 ERR("failed to allocate selection list");
@@ -210,7 +210,7 @@ _sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned int se
210#ifdef HAVE_ELEMENTARY_WIN32 210#ifdef HAVE_ELEMENTARY_WIN32
211 if (!seat_sel->sel_list) 211 if (!seat_sel->sel_list)
212 { 212 {
213 seat_sel->sel_list = calloc(1, (EFL_SELECTION_TYPE_CLIPBOARD + 1) * sizeof(Sel_Manager_Selection)); 213 seat_sel->sel_list = calloc(1, (EFL_UI_SELECTION_TYPE_CLIPBOARD + 1) * sizeof(Sel_Manager_Selection));
214 if (!seat_sel->sel_list) 214 if (!seat_sel->sel_list)
215 { 215 {
216 ERR("failed to allocate selection list"); 216 ERR("failed to allocate selection list");
@@ -233,7 +233,7 @@ _sel_manager_promise_cancel(void *data, Efl_Loop_Consumer *consumer, const Eina_
233} 233}
234 234
235static inline Eina_Future * 235static inline Eina_Future *
236_update_sel_lost_list(Efl_Object *obj, Efl_Selection_Type type, 236_update_sel_lost_list(Efl_Object *obj, Efl_Ui_Selection_Type type,
237 Sel_Manager_Seat_Selection *seat_sel) 237 Sel_Manager_Seat_Selection *seat_sel)
238{ 238{
239 Eina_Promise *p; 239 Eina_Promise *p;
@@ -346,7 +346,7 @@ _tmpinfo_free(Tmp_Info *info)
346} 346}
347 347
348static inline void 348static inline void
349_drop_target_cbs_del(Efl_Selection_Manager_Data *pd, Sel_Manager_Dropable *dropable, Efl_Object *obj) 349_drop_target_cbs_del(Efl_Ui_Selection_Manager_Data *pd, Sel_Manager_Dropable *dropable, Efl_Object *obj)
350{ 350{
351 if (dropable) 351 if (dropable)
352 { 352 {
@@ -354,7 +354,7 @@ _drop_target_cbs_del(Efl_Selection_Manager_Data *pd, Sel_Manager_Dropable *dropa
354 while (dropable->format_list) 354 while (dropable->format_list)
355 { 355 {
356 df = EINA_INLIST_CONTAINER_GET(dropable->format_list, Drop_Format); 356 df = EINA_INLIST_CONTAINER_GET(dropable->format_list, Drop_Format);
357 efl_selection_manager_drop_target_del(pd->sel_man, obj, 357 efl_ui_selection_manager_drop_target_del(pd->sel_man, obj,
358 df->format, dropable->seat); 358 df->format, dropable->seat);
359 // If drop_target_del() happened to delete dropabale, then 359 // If drop_target_del() happened to delete dropabale, then
360 // re-fetch it each loop to make sure it didn't 360 // re-fetch it each loop to make sure it didn't
@@ -367,7 +367,7 @@ _drop_target_cbs_del(Efl_Selection_Manager_Data *pd, Sel_Manager_Dropable *dropa
367static void 367static void
368_all_drop_targets_cbs_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED) 368_all_drop_targets_cbs_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
369{ 369{
370 Efl_Selection_Manager_Data *pd = data; 370 Efl_Ui_Selection_Manager_Data *pd = data;
371 Sel_Manager_Dropable *dropable = NULL; 371 Sel_Manager_Dropable *dropable = NULL;
372 372
373 if (!pd) return; 373 if (!pd) return;
@@ -456,10 +456,10 @@ _drag_cancel_animate(void *data, double pos)
456 return ECORE_CALLBACK_RENEW; 456 return ECORE_CALLBACK_RENEW;
457} 457}
458 458
459static Efl_Selection_Format 459static Efl_Ui_Selection_Format
460_dnd_types_to_format(Efl_Selection_Manager_Data *pd, const char **types, int ntypes) 460_dnd_types_to_format(Efl_Ui_Selection_Manager_Data *pd, const char **types, int ntypes)
461{ 461{
462 Efl_Selection_Format ret_type = 0; 462 Efl_Ui_Selection_Format ret_type = 0;
463 int i; 463 int i;
464 for (i = 0; i < ntypes; i++) 464 for (i = 0; i < ntypes; i++)
465 { 465 {
@@ -470,7 +470,7 @@ _dnd_types_to_format(Efl_Selection_Manager_Data *pd, const char **types, int nty
470} 470}
471 471
472static Eina_List * 472static Eina_List *
473_dropable_list_geom_find(Efl_Selection_Manager_Data *pd, Evas *evas, Evas_Coord px, Evas_Coord py) 473_dropable_list_geom_find(Efl_Ui_Selection_Manager_Data *pd, Evas *evas, Evas_Coord px, Evas_Coord py)
474{ 474{
475 Eina_List *itr, *top_objects_list = NULL, *dropable_list = NULL; 475 Eina_List *itr, *top_objects_list = NULL, *dropable_list = NULL;
476 Evas_Object *top_obj; 476 Evas_Object *top_obj;
@@ -592,7 +592,7 @@ _x11_is_uri_type_data(Sel_Manager_Selection *sel EINA_UNUSED, Ecore_X_Event_Sele
592} 592}
593 593
594static Sel_Manager_Seat_Selection * 594static Sel_Manager_Seat_Selection *
595_x11_sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned int seat) 595_x11_sel_manager_seat_selection_init(Efl_Ui_Selection_Manager_Data *pd, unsigned int seat)
596{ 596{
597 Sel_Manager_Seat_Selection *seat_sel = NULL; 597 Sel_Manager_Seat_Selection *seat_sel = NULL;
598 Eina_List *l = NULL; 598 Eina_List *l = NULL;
@@ -618,7 +618,7 @@ _x11_sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned in
618 if (!seat_sel->sel_list) 618 if (!seat_sel->sel_list)
619 { 619 {
620 //TODO: reduce memory (may be just need one common sel_list) 620 //TODO: reduce memory (may be just need one common sel_list)
621 seat_sel->sel_list = calloc(1, (EFL_SELECTION_TYPE_CLIPBOARD + 1) * sizeof(Sel_Manager_Selection)); 621 seat_sel->sel_list = calloc(1, (EFL_UI_SELECTION_TYPE_CLIPBOARD + 1) * sizeof(Sel_Manager_Selection));
622 if (!seat_sel->sel_list) 622 if (!seat_sel->sel_list)
623 { 623 {
624 ERR("failed to allocate selection list"); 624 ERR("failed to allocate selection list");
@@ -633,11 +633,11 @@ _x11_sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned in
633static Eina_Bool 633static Eina_Bool
634_x11_data_preparer_text(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED, 634_x11_data_preparer_text(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED,
635 Ecore_X_Event_Selection_Notify *notify, 635 Ecore_X_Event_Selection_Notify *notify,
636 Efl_Selection_Data *ddata, Tmp_Info **tmp_info EINA_UNUSED) 636 Efl_Ui_Selection_Data *ddata, Tmp_Info **tmp_info EINA_UNUSED)
637{ 637{
638 sel_debug("text data preparer"); 638 sel_debug("text data preparer");
639 Ecore_X_Selection_Data *data = notify->data; 639 Ecore_X_Selection_Data *data = notify->data;
640 ddata->format = EFL_SELECTION_FORMAT_TEXT; 640 ddata->format = EFL_UI_SELECTION_FORMAT_TEXT;
641 ddata->content.mem = eina_memdup(data->data, data->length, EINA_TRUE); 641 ddata->content.mem = eina_memdup(data->data, data->length, EINA_TRUE);
642 ddata->content.len = data->length; 642 ddata->content.len = data->length;
643 return EINA_TRUE; 643 return EINA_TRUE;
@@ -646,11 +646,11 @@ _x11_data_preparer_text(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED,
646static Eina_Bool 646static Eina_Bool
647_x11_data_preparer_markup(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED, 647_x11_data_preparer_markup(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED,
648 Ecore_X_Event_Selection_Notify *notify, 648 Ecore_X_Event_Selection_Notify *notify,
649 Efl_Selection_Data *ddata, Tmp_Info **tmp_info EINA_UNUSED) 649 Efl_Ui_Selection_Data *ddata, Tmp_Info **tmp_info EINA_UNUSED)
650{ 650{
651 sel_debug("markup data preparer"); 651 sel_debug("markup data preparer");
652 Ecore_X_Selection_Data *data = notify->data; 652 Ecore_X_Selection_Data *data = notify->data;
653 ddata->format = EFL_SELECTION_FORMAT_MARKUP; 653 ddata->format = EFL_UI_SELECTION_FORMAT_MARKUP;
654 ddata->content.mem = eina_memdup(data->data, data->length, EINA_TRUE); 654 ddata->content.mem = eina_memdup(data->data, data->length, EINA_TRUE);
655 ddata->content.len = data->length; 655 ddata->content.len = data->length;
656 return EINA_TRUE; 656 return EINA_TRUE;
@@ -661,7 +661,7 @@ _x11_data_preparer_markup(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED,
661 */ 661 */
662static Eina_Bool 662static Eina_Bool
663_x11_data_preparer_uri(Sel_Manager_Seat_Selection *seat_sel, Ecore_X_Event_Selection_Notify *notify, 663_x11_data_preparer_uri(Sel_Manager_Seat_Selection *seat_sel, Ecore_X_Event_Selection_Notify *notify,
664 Efl_Selection_Data *ddata, Tmp_Info **tmp_info EINA_UNUSED) 664 Efl_Ui_Selection_Data *ddata, Tmp_Info **tmp_info EINA_UNUSED)
665{ 665{
666 sel_debug("uri data preparer"); 666 sel_debug("uri data preparer");
667 Ecore_X_Selection_Data *data; 667 Ecore_X_Selection_Data *data;
@@ -744,7 +744,7 @@ _x11_data_preparer_uri(Sel_Manager_Seat_Selection *seat_sel, Ecore_X_Event_Selec
744 } 744 }
745 else 745 else
746 { 746 {
747 ddata->format = EFL_SELECTION_FORMAT_IMAGE; 747 ddata->format = EFL_UI_SELECTION_FORMAT_IMAGE;
748 ddata->content.mem = stripstr; 748 ddata->content.mem = stripstr;
749 ddata->content.len = strlen(stripstr); 749 ddata->content.len = strlen(stripstr);
750 seat_sel->saved_types->imgfile = NULL; 750 seat_sel->saved_types->imgfile = NULL;
@@ -758,11 +758,11 @@ _x11_data_preparer_uri(Sel_Manager_Seat_Selection *seat_sel, Ecore_X_Event_Selec
758static Eina_Bool 758static Eina_Bool
759_x11_data_preparer_vcard(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED, 759_x11_data_preparer_vcard(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED,
760 Ecore_X_Event_Selection_Notify *notify, 760 Ecore_X_Event_Selection_Notify *notify,
761 Efl_Selection_Data *ddata, Tmp_Info **tmp_info EINA_UNUSED) 761 Efl_Ui_Selection_Data *ddata, Tmp_Info **tmp_info EINA_UNUSED)
762{ 762{
763 sel_debug("vcard receive\n"); 763 sel_debug("vcard receive\n");
764 Ecore_X_Selection_Data *data = notify->data; 764 Ecore_X_Selection_Data *data = notify->data;
765 ddata->format = EFL_SELECTION_FORMAT_VCARD; 765 ddata->format = EFL_UI_SELECTION_FORMAT_VCARD;
766 ddata->content.mem = eina_memdup(data->data, data->length, EINA_TRUE); 766 ddata->content.mem = eina_memdup(data->data, data->length, EINA_TRUE);
767 ddata->content.len = data->length; 767 ddata->content.len = data->length;
768 return EINA_TRUE; 768 return EINA_TRUE;
@@ -771,13 +771,13 @@ _x11_data_preparer_vcard(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED,
771static Eina_Bool 771static Eina_Bool
772_x11_data_preparer_image(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED, 772_x11_data_preparer_image(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED,
773 Ecore_X_Event_Selection_Notify *notify, 773 Ecore_X_Event_Selection_Notify *notify,
774 Efl_Selection_Data *ddata, Tmp_Info **tmp_info) 774 Efl_Ui_Selection_Data *ddata, Tmp_Info **tmp_info)
775{ 775{
776 Ecore_X_Selection_Data *data = notify->data; 776 Ecore_X_Selection_Data *data = notify->data;
777 sel_debug("got a image file!\n"); 777 sel_debug("got a image file!\n");
778 sel_debug("Size if %d\n", data->length); 778 sel_debug("Size if %d\n", data->length);
779 779
780 ddata->format = EFL_SELECTION_FORMAT_IMAGE; 780 ddata->format = EFL_UI_SELECTION_FORMAT_IMAGE;
781 data = notify->data; 781 data = notify->data;
782 782
783 Tmp_Info *tmp = _tempfile_new(data->length); 783 Tmp_Info *tmp = _tempfile_new(data->length);
@@ -808,7 +808,7 @@ _x11_win_filter(Eo *manager EINA_UNUSED, Ecore_X_Window xwin)
808 * So pick the format we'd like; and then request it. 808 * So pick the format we'd like; and then request it.
809 */ 809 */
810static Eina_Bool 810static Eina_Bool
811_x11_notify_handler_targets(Efl_Selection_Manager_Data *pd, Sel_Manager_Selection *sel, Ecore_X_Event_Selection_Notify *notify) 811_x11_notify_handler_targets(Efl_Ui_Selection_Manager_Data *pd, Sel_Manager_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
812{ 812{
813 sel_debug("notify handler targets"); 813 sel_debug("notify handler targets");
814 Ecore_X_Selection_Data_Targets *targets; 814 Ecore_X_Selection_Data_Targets *targets;
@@ -846,12 +846,12 @@ done:
846static Eina_Bool 846static Eina_Bool
847_x11_fixes_selection_notify(void *data, int t EINA_UNUSED, void *event) 847_x11_fixes_selection_notify(void *data, int t EINA_UNUSED, void *event)
848{ 848{
849 Efl_Selection_Manager_Data *pd = data; 849 Efl_Ui_Selection_Manager_Data *pd = data;
850 Efl_Selection_Changed e; 850 Efl_Ui_Selection_Changed e;
851 Elm_Cnp_Event_Selection_Changed *_e; 851 Elm_Cnp_Event_Selection_Changed *_e;
852 Ecore_X_Event_Fixes_Selection_Notify *ev = event; 852 Ecore_X_Event_Fixes_Selection_Notify *ev = event;
853 Sel_Manager_Seat_Selection *seat_sel; 853 Sel_Manager_Seat_Selection *seat_sel;
854 Efl_Selection_Type type; 854 Efl_Ui_Selection_Type type;
855 Sel_Manager_Selection *sel; 855 Sel_Manager_Selection *sel;
856 856
857 if (_x11_win_filter(pd->sel_man, ev->win)) return ECORE_CALLBACK_PASS_ON; 857 if (_x11_win_filter(pd->sel_man, ev->win)) return ECORE_CALLBACK_PASS_ON;
@@ -859,10 +859,10 @@ _x11_fixes_selection_notify(void *data, int t EINA_UNUSED, void *event)
859 switch (ev->selection) 859 switch (ev->selection)
860 { 860 {
861 case ECORE_X_SELECTION_CLIPBOARD: 861 case ECORE_X_SELECTION_CLIPBOARD:
862 type = EFL_SELECTION_TYPE_CLIPBOARD; 862 type = EFL_UI_SELECTION_TYPE_CLIPBOARD;
863 break; 863 break;
864 case ECORE_X_SELECTION_PRIMARY: 864 case ECORE_X_SELECTION_PRIMARY:
865 type = EFL_SELECTION_TYPE_PRIMARY; 865 type = EFL_UI_SELECTION_TYPE_PRIMARY;
866 break; 866 break;
867 default: return ECORE_CALLBACK_RENEW; 867 default: return ECORE_CALLBACK_RENEW;
868 } 868 }
@@ -870,7 +870,7 @@ _x11_fixes_selection_notify(void *data, int t EINA_UNUSED, void *event)
870 if (!seat_sel) return ECORE_CALLBACK_RENEW; 870 if (!seat_sel) return ECORE_CALLBACK_RENEW;
871 sel = seat_sel->sel_list + type; 871 sel = seat_sel->sel_list + type;
872 if (sel->active && (sel->xwin != ev->owner)) 872 if (sel->active && (sel->xwin != ev->owner))
873 efl_selection_manager_selection_clear(pd->sel_man, sel->owner, type, seat_sel->seat); 873 efl_ui_selection_manager_selection_clear(pd->sel_man, sel->owner, type, seat_sel->seat);
874 e.type = type; 874 e.type = type;
875 e.seat = 1; /* under x11 this is always the default seat */ 875 e.seat = 1; /* under x11 this is always the default seat */
876 e.exist = !!ev->owner; 876 e.exist = !!ev->owner;
@@ -882,7 +882,7 @@ _x11_fixes_selection_notify(void *data, int t EINA_UNUSED, void *event)
882 _e->exists = e.exist; 882 _e->exists = e.exist;
883 883
884 ecore_event_add(ELM_CNP_EVENT_SELECTION_CHANGED, _e, NULL, NULL); 884 ecore_event_add(ELM_CNP_EVENT_SELECTION_CHANGED, _e, NULL, NULL);
885 efl_event_callback_call(sel->owner, EFL_SELECTION_EVENT_SELECTION_CHANGED, &e); 885 efl_event_callback_call(sel->owner, EFL_UI_SELECTION_EVENT_SELECTION_CHANGED, &e);
886 886
887 return ECORE_CALLBACK_RENEW; 887 return ECORE_CALLBACK_RENEW;
888} 888}
@@ -897,7 +897,7 @@ _x11_fixes_selection_notify(void *data, int t EINA_UNUSED, void *event)
897static Eina_Bool 897static Eina_Bool
898_efl_sel_manager_x11_selection_notify(void *udata, int type EINA_UNUSED, void *event) 898_efl_sel_manager_x11_selection_notify(void *udata, int type EINA_UNUSED, void *event)
899{ 899{
900 Efl_Selection_Manager_Data *pd = udata; 900 Efl_Ui_Selection_Manager_Data *pd = udata;
901 Ecore_X_Event_Selection_Notify *ev = event; 901 Ecore_X_Event_Selection_Notify *ev = event;
902 Sel_Manager_Selection *sel; 902 Sel_Manager_Selection *sel;
903 Sel_Manager_Seat_Selection *seat_sel = NULL; 903 Sel_Manager_Seat_Selection *seat_sel = NULL;
@@ -913,16 +913,16 @@ _efl_sel_manager_x11_selection_notify(void *udata, int type EINA_UNUSED, void *e
913 switch (ev->selection) 913 switch (ev->selection)
914 { 914 {
915 case ECORE_X_SELECTION_PRIMARY: 915 case ECORE_X_SELECTION_PRIMARY:
916 sel = seat_sel->sel_list + EFL_SELECTION_TYPE_PRIMARY; 916 sel = seat_sel->sel_list + EFL_UI_SELECTION_TYPE_PRIMARY;
917 break; 917 break;
918 case ECORE_X_SELECTION_SECONDARY: 918 case ECORE_X_SELECTION_SECONDARY:
919 sel = seat_sel->sel_list + EFL_SELECTION_TYPE_SECONDARY; 919 sel = seat_sel->sel_list + EFL_UI_SELECTION_TYPE_SECONDARY;
920 break; 920 break;
921 case ECORE_X_SELECTION_XDND: 921 case ECORE_X_SELECTION_XDND:
922 sel = seat_sel->sel_list + EFL_SELECTION_TYPE_DND; 922 sel = seat_sel->sel_list + EFL_UI_SELECTION_TYPE_DND;
923 break; 923 break;
924 case ECORE_X_SELECTION_CLIPBOARD: 924 case ECORE_X_SELECTION_CLIPBOARD:
925 sel = seat_sel->sel_list + EFL_SELECTION_TYPE_CLIPBOARD; 925 sel = seat_sel->sel_list + EFL_UI_SELECTION_TYPE_CLIPBOARD;
926 break; 926 break;
927 default: 927 default:
928 return ECORE_CALLBACK_PASS_ON; 928 return ECORE_CALLBACK_PASS_ON;
@@ -943,14 +943,14 @@ _efl_sel_manager_x11_selection_notify(void *udata, int type EINA_UNUSED, void *e
943 { 943 {
944 if (pd->atom_list[i].x_data_preparer) 944 if (pd->atom_list[i].x_data_preparer)
945 { 945 {
946 Efl_Selection_Data ddata; 946 Efl_Ui_Selection_Data ddata;
947 Tmp_Info *tmp_info = NULL; 947 Tmp_Info *tmp_info = NULL;
948 Eina_Bool success; 948 Eina_Bool success;
949 sel_debug("Found something: %s", pd->atom_list[i].name); 949 sel_debug("Found something: %s", pd->atom_list[i].name);
950 950
951 success = pd->atom_list[i].x_data_preparer(seat_sel, ev, &ddata, &tmp_info); 951 success = pd->atom_list[i].x_data_preparer(seat_sel, ev, &ddata, &tmp_info);
952 sel_debug("ddata: %s (%zd)", (const char *)ddata.content.mem, ddata.content.len); 952 sel_debug("ddata: %s (%zd)", (const char *)ddata.content.mem, ddata.content.len);
953 if ((pd->atom_list[i].format == EFL_SELECTION_FORMAT_IMAGE) && 953 if ((pd->atom_list[i].format == EFL_UI_SELECTION_FORMAT_IMAGE) &&
954 (seat_sel->saved_types->imgfile)) 954 (seat_sel->saved_types->imgfile))
955 break; 955 break;
956 if (ev->selection == ECORE_X_SELECTION_XDND) 956 if (ev->selection == ECORE_X_SELECTION_XDND)
@@ -1026,7 +1026,7 @@ _efl_sel_manager_x11_selection_notify(void *udata, int type EINA_UNUSED, void *e
1026static Eina_Bool 1026static Eina_Bool
1027_x11_selection_clear(void *data, int type EINA_UNUSED, void *event) 1027_x11_selection_clear(void *data, int type EINA_UNUSED, void *event)
1028{ 1028{
1029 Efl_Selection_Manager_Data *pd = data; 1029 Efl_Ui_Selection_Manager_Data *pd = data;
1030 Ecore_X_Event_Selection_Clear *ev = event; 1030 Ecore_X_Event_Selection_Clear *ev = event;
1031 Sel_Manager_Selection *sel; 1031 Sel_Manager_Selection *sel;
1032 Sel_Manager_Seat_Selection *seat_sel = NULL; 1032 Sel_Manager_Seat_Selection *seat_sel = NULL;
@@ -1040,13 +1040,13 @@ _x11_selection_clear(void *data, int type EINA_UNUSED, void *event)
1040 if (!seat_sel) 1040 if (!seat_sel)
1041 return EINA_FALSE; 1041 return EINA_FALSE;
1042 1042
1043 for (i = EFL_SELECTION_TYPE_PRIMARY; i <= EFL_SELECTION_TYPE_CLIPBOARD; i++) 1043 for (i = EFL_UI_SELECTION_TYPE_PRIMARY; i <= EFL_UI_SELECTION_TYPE_CLIPBOARD; i++)
1044 { 1044 {
1045 if (seat_sel->sel_list[i].ecore_sel == ev->selection) break; 1045 if (seat_sel->sel_list[i].ecore_sel == ev->selection) break;
1046 } 1046 }
1047 sel_debug("selection %d clear", i); 1047 sel_debug("selection %d clear", i);
1048 /* Not me... Don't care */ 1048 /* Not me... Don't care */
1049 if (i > EFL_SELECTION_TYPE_CLIPBOARD) return ECORE_CALLBACK_PASS_ON; 1049 if (i > EFL_UI_SELECTION_TYPE_CLIPBOARD) return ECORE_CALLBACK_PASS_ON;
1050 1050
1051 sel = seat_sel->sel_list + i; 1051 sel = seat_sel->sel_list + i;
1052 1052
@@ -1072,7 +1072,7 @@ _x11_general_converter(char *target EINA_UNUSED, void *data, int size EINA_UNUSE
1072{ 1072{
1073 sel_debug("general converter"); 1073 sel_debug("general converter");
1074 Sel_Manager_Selection *sel = *(Sel_Manager_Selection **)data; 1074 Sel_Manager_Selection *sel = *(Sel_Manager_Selection **)data;
1075 if (sel->format == EFL_SELECTION_FORMAT_NONE) 1075 if (sel->format == EFL_UI_SELECTION_FORMAT_NONE)
1076 { 1076 {
1077 if (data_ret) 1077 if (data_ret)
1078 { 1078 {
@@ -1106,7 +1106,7 @@ _x11_targets_converter(char *target EINA_UNUSED, void *data, int size EINA_UNUSE
1106 int i, count; 1106 int i, count;
1107 Ecore_X_Atom *aret; 1107 Ecore_X_Atom *aret;
1108 Sel_Manager_Selection *sel; 1108 Sel_Manager_Selection *sel;
1109 Efl_Selection_Format seltype; 1109 Efl_Ui_Selection_Format seltype;
1110 1110
1111 sel_debug("target converter"); 1111 sel_debug("target converter");
1112 if (!data_ret) return EINA_FALSE; 1112 if (!data_ret) return EINA_FALSE;
@@ -1114,7 +1114,7 @@ _x11_targets_converter(char *target EINA_UNUSED, void *data, int size EINA_UNUSE
1114 sel = *(Sel_Manager_Selection **)data; 1114 sel = *(Sel_Manager_Selection **)data;
1115 seltype = sel->format; 1115 seltype = sel->format;
1116 Sel_Manager_Seat_Selection *seat_sel = sel->seat_sel; 1116 Sel_Manager_Seat_Selection *seat_sel = sel->seat_sel;
1117 Efl_Selection_Manager_Data *pd = seat_sel->pd; 1117 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
1118 1118
1119 for (i = SELECTION_ATOM_LISTING_ATOMS + 1, count = 0; i < SELECTION_N_ATOMS ; i++) 1119 for (i = SELECTION_ATOM_LISTING_ATOMS + 1, count = 0; i < SELECTION_N_ATOMS ; i++)
1120 { 1120 {
@@ -1168,7 +1168,7 @@ _x11_text_converter(char *target, void *data, int size EINA_UNUSED, void **data_
1168 if (!sel) return EINA_FALSE; 1168 if (!sel) return EINA_FALSE;
1169 1169
1170 sel_debug("text converter"); 1170 sel_debug("text converter");
1171 if (sel->format == EFL_SELECTION_FORMAT_NONE) 1171 if (sel->format == EFL_UI_SELECTION_FORMAT_NONE)
1172 { 1172 {
1173 sel_debug("none"); 1173 sel_debug("none");
1174 if (data_ret) 1174 if (data_ret)
@@ -1184,8 +1184,8 @@ _x11_text_converter(char *target, void *data, int size EINA_UNUSED, void **data_
1184 1184
1185 if (!sel->active) return EINA_TRUE; 1185 if (!sel->active) return EINA_TRUE;
1186 1186
1187 if ((sel->format & EFL_SELECTION_FORMAT_MARKUP) || 1187 if ((sel->format & EFL_UI_SELECTION_FORMAT_MARKUP) ||
1188 (sel->format & EFL_SELECTION_FORMAT_HTML)) 1188 (sel->format & EFL_UI_SELECTION_FORMAT_HTML))
1189 { 1189 {
1190 char *tmp = malloc(sel->data.len + 1); 1190 char *tmp = malloc(sel->data.len + 1);
1191 if (tmp) 1191 if (tmp)
@@ -1199,7 +1199,7 @@ _x11_text_converter(char *target, void *data, int size EINA_UNUSED, void **data_
1199 } 1199 }
1200 else return EINA_FALSE; 1200 else return EINA_FALSE;
1201 } 1201 }
1202 else if (sel->format & EFL_SELECTION_FORMAT_TEXT) 1202 else if (sel->format & EFL_UI_SELECTION_FORMAT_TEXT)
1203 { 1203 {
1204 ecore_x_selection_converter_text(target, sel->data.mem, 1204 ecore_x_selection_converter_text(target, sel->data.mem,
1205 sel->data.len, 1205 sel->data.len,
@@ -1207,7 +1207,7 @@ _x11_text_converter(char *target, void *data, int size EINA_UNUSED, void **data_
1207 ttype, typesize); 1207 ttype, typesize);
1208 sel_debug("text"); 1208 sel_debug("text");
1209 } 1209 }
1210 else if (sel->format & EFL_SELECTION_FORMAT_IMAGE) 1210 else if (sel->format & EFL_UI_SELECTION_FORMAT_IMAGE)
1211 { 1211 {
1212 efl_file_get(sel->request_obj, (const char **)data_ret, NULL); 1212 efl_file_get(sel->request_obj, (const char **)data_ret, NULL);
1213 if (!*data_ret) *data_ret = strdup("No file"); 1213 if (!*data_ret) *data_ret = strdup("No file");
@@ -1226,8 +1226,8 @@ _x11_text_converter(char *target, void *data, int size EINA_UNUSED, void **data_
1226} 1226}
1227 1227
1228static Eina_Future * 1228static Eina_Future *
1229_x11_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd, Efl_Object *owner, 1229_x11_efl_sel_manager_selection_set(Efl_Ui_Selection_Manager_Data *pd, Efl_Object *owner,
1230 Efl_Selection_Type type, Efl_Selection_Format format, Eina_Slice data, 1230 Efl_Ui_Selection_Type type, Efl_Ui_Selection_Format format, Eina_Slice data,
1231 Ecore_X_Window xwin, unsigned int seat) 1231 Ecore_X_Window xwin, unsigned int seat)
1232{ 1232{
1233 Sel_Manager_Seat_Selection *seat_sel; 1233 Sel_Manager_Seat_Selection *seat_sel;
@@ -1257,9 +1257,9 @@ _x11_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd, Efl_Object *o
1257} 1257}
1258 1258
1259static void 1259static void
1260_x11_efl_sel_manager_selection_get(const Efl_Object *request, Efl_Selection_Manager_Data *pd, 1260_x11_efl_sel_manager_selection_get(const Efl_Object *request, Efl_Ui_Selection_Manager_Data *pd,
1261 Efl_Selection_Type type, Efl_Selection_Format format, 1261 Efl_Ui_Selection_Type type, Efl_Ui_Selection_Format format,
1262 void *data_func_data, Efl_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb, 1262 void *data_func_data, Efl_Ui_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb,
1263 Ecore_X_Window xwin, unsigned int seat) 1263 Ecore_X_Window xwin, unsigned int seat)
1264{ 1264{
1265 Sel_Manager_Seat_Selection *seat_sel; 1265 Sel_Manager_Seat_Selection *seat_sel;
@@ -1281,7 +1281,7 @@ _x11_efl_sel_manager_selection_get(const Efl_Object *request, Efl_Selection_Mana
1281 ((format == sel->format) || (xwin == 0))) 1281 ((format == sel->format) || (xwin == 0)))
1282 { 1282 {
1283 sel_debug("use local data"); 1283 sel_debug("use local data");
1284 Efl_Selection_Data seldata; 1284 Efl_Ui_Selection_Data seldata;
1285 1285
1286 seldata.content.mem = sel->data.mem; 1286 seldata.content.mem = sel->data.mem;
1287 seldata.content.len = sel->data.len; 1287 seldata.content.len = sel->data.len;
@@ -1308,7 +1308,7 @@ static Eina_Bool
1308_x11_drag_mouse_up(void *data, int etype EINA_UNUSED, void *event) 1308_x11_drag_mouse_up(void *data, int etype EINA_UNUSED, void *event)
1309{ 1309{
1310 Sel_Manager_Seat_Selection *seat_sel = data; 1310 Sel_Manager_Seat_Selection *seat_sel = data;
1311 Efl_Selection_Manager_Data *pd = seat_sel->pd; 1311 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
1312 Ecore_X_Window xwin = seat_sel->xwin; 1312 Ecore_X_Window xwin = seat_sel->xwin;
1313 Ecore_Event_Mouse_Button *ev = event; 1313 Ecore_Event_Mouse_Button *ev = event;
1314 1314
@@ -1430,9 +1430,9 @@ _x11_dnd_status(void *data, int etype EINA_UNUSED, void *ev)
1430} 1430}
1431 1431
1432static void 1432static void
1433_x11_efl_sel_manager_drag_start(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 1433_x11_efl_sel_manager_drag_start(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
1434 Efl_Object *drag_obj, Efl_Selection_Format format, 1434 Efl_Object *drag_obj, Efl_Ui_Selection_Format format,
1435 Eina_Slice data, Efl_Selection_Action action, 1435 Eina_Slice data, Efl_Ui_Selection_Action action,
1436 void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, 1436 void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func,
1437 Eina_Free_Cb icon_func_free_cb EINA_UNUSED, 1437 Eina_Free_Cb icon_func_free_cb EINA_UNUSED,
1438 Ecore_X_Window xwin, unsigned int seat) 1438 Ecore_X_Window xwin, unsigned int seat)
@@ -1451,13 +1451,13 @@ _x11_efl_sel_manager_drag_start(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data
1451 1451
1452 seat_sel = _x11_sel_manager_seat_selection_init(pd, seat); 1452 seat_sel = _x11_sel_manager_seat_selection_init(pd, seat);
1453 if (!seat_sel) return; 1453 if (!seat_sel) return;
1454 seat_sel->active_type = EFL_SELECTION_TYPE_DND; 1454 seat_sel->active_type = EFL_UI_SELECTION_TYPE_DND;
1455 1455
1456 sel = &seat_sel->sel_list[seat_sel->active_type]; 1456 sel = &seat_sel->sel_list[seat_sel->active_type];
1457 ecore_x_dnd_types_set(xwin, NULL, 0); 1457 ecore_x_dnd_types_set(xwin, NULL, 0);
1458 for (i = SELECTION_ATOM_LISTING_ATOMS + 1; i < SELECTION_N_ATOMS; i++) 1458 for (i = SELECTION_ATOM_LISTING_ATOMS + 1; i < SELECTION_N_ATOMS; i++)
1459 { 1459 {
1460 if (format == EFL_SELECTION_FORMAT_TARGETS || (pd->atom_list[i].format & format)) 1460 if (format == EFL_UI_SELECTION_FORMAT_TARGETS || (pd->atom_list[i].format & format))
1461 { 1461 {
1462 ecore_x_dnd_type_set(xwin, pd->atom_list[i].name, EINA_TRUE); 1462 ecore_x_dnd_type_set(xwin, pd->atom_list[i].name, EINA_TRUE);
1463 sel_debug("set dnd type: %s\n", pd->atom_list[i].name); 1463 sel_debug("set dnd type: %s\n", pd->atom_list[i].name);
@@ -1570,7 +1570,7 @@ _x11_efl_sel_manager_drag_start(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data
1570} 1570}
1571 1571
1572static void 1572static void
1573_x11_dnd_dropable_handle(Efl_Selection_Manager_Data *pd, Sel_Manager_Dropable *dropable, Eina_Position2D pos, Efl_Selection_Action action) 1573_x11_dnd_dropable_handle(Efl_Ui_Selection_Manager_Data *pd, Sel_Manager_Dropable *dropable, Eina_Position2D pos, Efl_Ui_Selection_Action action)
1574{ 1574{
1575 Sel_Manager_Dropable *d, *last_dropable = NULL; 1575 Sel_Manager_Dropable *d, *last_dropable = NULL;
1576 Eina_List *l; 1576 Eina_List *l;
@@ -1701,7 +1701,7 @@ _x11_dnd_dropable_handle(Efl_Selection_Manager_Data *pd, Sel_Manager_Dropable *d
1701} 1701}
1702 1702
1703static Sel_Manager_Dropable * 1703static Sel_Manager_Dropable *
1704_x11_dropable_find(Efl_Selection_Manager_Data *pd, Ecore_X_Window win) 1704_x11_dropable_find(Efl_Ui_Selection_Manager_Data *pd, Ecore_X_Window win)
1705{ 1705{
1706 Eina_List *l; 1706 Eina_List *l;
1707 Sel_Manager_Dropable *dropable; 1707 Sel_Manager_Dropable *dropable;
@@ -1715,53 +1715,53 @@ _x11_dropable_find(Efl_Selection_Manager_Data *pd, Ecore_X_Window win)
1715} 1715}
1716 1716
1717static Evas * 1717static Evas *
1718_x11_evas_get_from_xwin(Efl_Selection_Manager_Data *pd, Ecore_X_Window win) 1718_x11_evas_get_from_xwin(Efl_Ui_Selection_Manager_Data *pd, Ecore_X_Window win)
1719{ 1719{
1720 /* Find the Evas connected to the window */ 1720 /* Find the Evas connected to the window */
1721 Sel_Manager_Dropable *dropable = _x11_dropable_find(pd, win); 1721 Sel_Manager_Dropable *dropable = _x11_dropable_find(pd, win);
1722 return dropable ? evas_object_evas_get(dropable->obj) : NULL; 1722 return dropable ? evas_object_evas_get(dropable->obj) : NULL;
1723} 1723}
1724 1724
1725static Efl_Selection_Action 1725static Efl_Ui_Selection_Action
1726_x11_dnd_action_map(Ecore_X_Atom action) 1726_x11_dnd_action_map(Ecore_X_Atom action)
1727{ 1727{
1728 Efl_Selection_Action act = EFL_SELECTION_ACTION_UNKNOWN; 1728 Efl_Ui_Selection_Action act = EFL_UI_SELECTION_ACTION_UNKNOWN;
1729 1729
1730 if (action == ECORE_X_ATOM_XDND_ACTION_COPY) 1730 if (action == ECORE_X_ATOM_XDND_ACTION_COPY)
1731 act = EFL_SELECTION_ACTION_COPY; 1731 act = EFL_UI_SELECTION_ACTION_COPY;
1732 else if (action == ECORE_X_ATOM_XDND_ACTION_MOVE) 1732 else if (action == ECORE_X_ATOM_XDND_ACTION_MOVE)
1733 act = EFL_SELECTION_ACTION_MOVE; 1733 act = EFL_UI_SELECTION_ACTION_MOVE;
1734 else if (action == ECORE_X_ATOM_XDND_ACTION_PRIVATE) 1734 else if (action == ECORE_X_ATOM_XDND_ACTION_PRIVATE)
1735 act = EFL_SELECTION_ACTION_PRIVATE; 1735 act = EFL_UI_SELECTION_ACTION_PRIVATE;
1736 else if (action == ECORE_X_ATOM_XDND_ACTION_ASK) 1736 else if (action == ECORE_X_ATOM_XDND_ACTION_ASK)
1737 act = EFL_SELECTION_ACTION_ASK; 1737 act = EFL_UI_SELECTION_ACTION_ASK;
1738 else if (action == ECORE_X_ATOM_XDND_ACTION_LIST) 1738 else if (action == ECORE_X_ATOM_XDND_ACTION_LIST)
1739 act = EFL_SELECTION_ACTION_LIST; 1739 act = EFL_UI_SELECTION_ACTION_LIST;
1740 else if (action == ECORE_X_ATOM_XDND_ACTION_LINK) 1740 else if (action == ECORE_X_ATOM_XDND_ACTION_LINK)
1741 act = EFL_SELECTION_ACTION_LINK; 1741 act = EFL_UI_SELECTION_ACTION_LINK;
1742 else if (action == ECORE_X_ATOM_XDND_ACTION_DESCRIPTION) 1742 else if (action == ECORE_X_ATOM_XDND_ACTION_DESCRIPTION)
1743 act = EFL_SELECTION_ACTION_DESCRIPTION; 1743 act = EFL_UI_SELECTION_ACTION_DESCRIPTION;
1744 return act; 1744 return act;
1745} 1745}
1746 1746
1747static Ecore_X_Atom 1747static Ecore_X_Atom
1748_x11_dnd_action_rev_map(Efl_Selection_Action action) 1748_x11_dnd_action_rev_map(Efl_Ui_Selection_Action action)
1749{ 1749{
1750 Ecore_X_Atom act = ECORE_X_ATOM_XDND_ACTION_MOVE; 1750 Ecore_X_Atom act = ECORE_X_ATOM_XDND_ACTION_MOVE;
1751 1751
1752 if (action == EFL_SELECTION_ACTION_COPY) 1752 if (action == EFL_UI_SELECTION_ACTION_COPY)
1753 act = ECORE_X_ATOM_XDND_ACTION_COPY; 1753 act = ECORE_X_ATOM_XDND_ACTION_COPY;
1754 else if (action == EFL_SELECTION_ACTION_MOVE) 1754 else if (action == EFL_UI_SELECTION_ACTION_MOVE)
1755 act = ECORE_X_ATOM_XDND_ACTION_MOVE; 1755 act = ECORE_X_ATOM_XDND_ACTION_MOVE;
1756 else if (action == EFL_SELECTION_ACTION_PRIVATE) 1756 else if (action == EFL_UI_SELECTION_ACTION_PRIVATE)
1757 act = ECORE_X_ATOM_XDND_ACTION_PRIVATE; 1757 act = ECORE_X_ATOM_XDND_ACTION_PRIVATE;
1758 else if (action == EFL_SELECTION_ACTION_ASK) 1758 else if (action == EFL_UI_SELECTION_ACTION_ASK)
1759 act = ECORE_X_ATOM_XDND_ACTION_ASK; 1759 act = ECORE_X_ATOM_XDND_ACTION_ASK;
1760 else if (action == EFL_SELECTION_ACTION_LIST) 1760 else if (action == EFL_UI_SELECTION_ACTION_LIST)
1761 act = ECORE_X_ATOM_XDND_ACTION_LIST; 1761 act = ECORE_X_ATOM_XDND_ACTION_LIST;
1762 else if (action == EFL_SELECTION_ACTION_LINK) 1762 else if (action == EFL_UI_SELECTION_ACTION_LINK)
1763 act = ECORE_X_ATOM_XDND_ACTION_LINK; 1763 act = ECORE_X_ATOM_XDND_ACTION_LINK;
1764 else if (action == EFL_SELECTION_ACTION_DESCRIPTION) 1764 else if (action == EFL_UI_SELECTION_ACTION_DESCRIPTION)
1765 act = ECORE_X_ATOM_XDND_ACTION_DESCRIPTION; 1765 act = ECORE_X_ATOM_XDND_ACTION_DESCRIPTION;
1766 return act; 1766 return act;
1767} 1767}
@@ -1770,7 +1770,7 @@ static Eina_Bool
1770_x11_dnd_enter(void *data, int etype EINA_UNUSED, void *ev) 1770_x11_dnd_enter(void *data, int etype EINA_UNUSED, void *ev)
1771{ 1771{
1772 Sel_Manager_Seat_Selection *seat_sel = data; 1772 Sel_Manager_Seat_Selection *seat_sel = data;
1773 Efl_Selection_Manager_Data *pd = seat_sel->pd; 1773 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
1774 Ecore_X_Event_Xdnd_Enter *enter = ev; 1774 Ecore_X_Event_Xdnd_Enter *enter = ev;
1775 Sel_Manager_Dropable *dropable; 1775 Sel_Manager_Dropable *dropable;
1776 int i; 1776 int i;
@@ -1815,11 +1815,11 @@ static Eina_Bool
1815_x11_dnd_position(void *data, int etype EINA_UNUSED, void *ev) 1815_x11_dnd_position(void *data, int etype EINA_UNUSED, void *ev)
1816{ 1816{
1817 Sel_Manager_Seat_Selection *seat_sel = data; 1817 Sel_Manager_Seat_Selection *seat_sel = data;
1818 Efl_Selection_Manager_Data *pd = seat_sel->pd; 1818 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
1819 Ecore_X_Event_Xdnd_Position *xpos = ev; 1819 Ecore_X_Event_Xdnd_Position *xpos = ev;
1820 Ecore_X_Rectangle rect = { 0, 0, 0, 0 }; 1820 Ecore_X_Rectangle rect = { 0, 0, 0, 0 };
1821 Sel_Manager_Dropable *dropable; 1821 Sel_Manager_Dropable *dropable;
1822 Efl_Selection_Action act; 1822 Efl_Ui_Selection_Action act;
1823 1823
1824 sel_debug("In"); 1824 sel_debug("In");
1825 /* Need to send a status back */ 1825 /* Need to send a status back */
@@ -1840,7 +1840,7 @@ _x11_dnd_position(void *data, int etype EINA_UNUSED, void *ev)
1840 /* check if there is dropable (obj) can accept this drop */ 1840 /* check if there is dropable (obj) can accept this drop */
1841 if (dropable_list) 1841 if (dropable_list)
1842 { 1842 {
1843 Efl_Selection_Format saved_format = _dnd_types_to_format(pd, seat_sel->saved_types->types, seat_sel->saved_types->ntypes); 1843 Efl_Ui_Selection_Format saved_format = _dnd_types_to_format(pd, seat_sel->saved_types->types, seat_sel->saved_types->ntypes);
1844 Eina_List *l; 1844 Eina_List *l;
1845 Eina_Bool found = EINA_FALSE; 1845 Eina_Bool found = EINA_FALSE;
1846 1846
@@ -1850,7 +1850,7 @@ _x11_dnd_position(void *data, int etype EINA_UNUSED, void *ev)
1850 Eina_Inlist *itr; 1850 Eina_Inlist *itr;
1851 EINA_INLIST_FOREACH_SAFE(dropable->format_list, itr, df) 1851 EINA_INLIST_FOREACH_SAFE(dropable->format_list, itr, df)
1852 { 1852 {
1853 Efl_Selection_Format common_fmt = saved_format & df->format; 1853 Efl_Ui_Selection_Format common_fmt = saved_format & df->format;
1854 if (common_fmt) 1854 if (common_fmt)
1855 { 1855 {
1856 //We found a target that can accept this type of data 1856 //We found a target that can accept this type of data
@@ -1945,7 +1945,7 @@ _x11_dnd_leave(void *data, int etype EINA_UNUSED, void *ev)
1945#else 1945#else
1946 (void)ev; 1946 (void)ev;
1947#endif 1947#endif
1948 _x11_dnd_dropable_handle(seat_sel->pd, NULL, pos, EFL_SELECTION_ACTION_UNKNOWN); 1948 _x11_dnd_dropable_handle(seat_sel->pd, NULL, pos, EFL_UI_SELECTION_ACTION_UNKNOWN);
1949 // CCCCCCC: call dnd exit on last obj if there was one 1949 // CCCCCCC: call dnd exit on last obj if there was one
1950 // leave->win leave->source 1950 // leave->win leave->source
1951 return EINA_TRUE; 1951 return EINA_TRUE;
@@ -1956,12 +1956,12 @@ _x11_dnd_drop(void *data, int etype EINA_UNUSED, void *ev)
1956{ 1956{
1957 sel_debug("In"); 1957 sel_debug("In");
1958 Sel_Manager_Seat_Selection *seat_sel = data; 1958 Sel_Manager_Seat_Selection *seat_sel = data;
1959 Efl_Selection_Manager_Data *pd = seat_sel->pd; 1959 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
1960 Ecore_X_Event_Xdnd_Drop *drop; 1960 Ecore_X_Event_Xdnd_Drop *drop;
1961 Sel_Manager_Dropable *dropable = NULL; 1961 Sel_Manager_Dropable *dropable = NULL;
1962 Efl_Selection_Data ddata; 1962 Efl_Ui_Selection_Data ddata;
1963 Evas_Coord x = 0, y = 0; 1963 Evas_Coord x = 0, y = 0;
1964 Efl_Selection_Action act = EFL_SELECTION_ACTION_UNKNOWN; 1964 Efl_Ui_Selection_Action act = EFL_UI_SELECTION_ACTION_UNKNOWN;
1965 Eina_List *l; 1965 Eina_List *l;
1966 Eina_Inlist *itr; 1966 Eina_Inlist *itr;
1967 Sel_Manager_Selection *sel; 1967 Sel_Manager_Selection *sel;
@@ -2033,10 +2033,10 @@ found:
2033 2033
2034 EINA_INLIST_FOREACH_SAFE(dropable->format_list, itr, df) 2034 EINA_INLIST_FOREACH_SAFE(dropable->format_list, itr, df)
2035 { 2035 {
2036 if (df->format & EFL_SELECTION_FORMAT_IMAGE) 2036 if (df->format & EFL_UI_SELECTION_FORMAT_IMAGE)
2037 { 2037 {
2038 sel_debug("Doing image insert (%s)\n", seat_sel->saved_types->imgfile); 2038 sel_debug("Doing image insert (%s)\n", seat_sel->saved_types->imgfile);
2039 ddata.format = EFL_SELECTION_FORMAT_IMAGE; 2039 ddata.format = EFL_UI_SELECTION_FORMAT_IMAGE;
2040 ddata.content.mem = (char *)seat_sel->saved_types->imgfile; 2040 ddata.content.mem = (char *)seat_sel->saved_types->imgfile;
2041 ddata.content.len = strlen(ddata.content.mem); 2041 ddata.content.len = strlen(ddata.content.mem);
2042 if (df->format & dropable->last.format) 2042 if (df->format & dropable->last.format)
@@ -2061,7 +2061,7 @@ found:
2061 } 2061 }
2062 } 2062 }
2063 2063
2064 sel = seat_sel->sel_list + EFL_SELECTION_TYPE_DND; 2064 sel = seat_sel->sel_list + EFL_UI_SELECTION_TYPE_DND;
2065 sel_debug("doing a request then: %s\n", dropable->last.type); 2065 sel_debug("doing a request then: %s\n", dropable->last.type);
2066 sel->xwin = drop->win; 2066 sel->xwin = drop->win;
2067 sel->request_obj = dropable->obj; 2067 sel->request_obj = dropable->obj;
@@ -2074,8 +2074,8 @@ found:
2074} 2074}
2075 2075
2076static Eina_Bool 2076static Eina_Bool
2077_x11_sel_manager_drop_target_add(Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, 2077_x11_sel_manager_drop_target_add(Efl_Ui_Selection_Manager_Data *pd, Efl_Object *target_obj,
2078 Efl_Selection_Format format, Ecore_X_Window xwin, 2078 Efl_Ui_Selection_Format format, Ecore_X_Window xwin,
2079 unsigned int seat) 2079 unsigned int seat)
2080{ 2080{
2081 Sel_Manager_Dropable *dropable = NULL; 2081 Sel_Manager_Dropable *dropable = NULL;
@@ -2142,7 +2142,7 @@ error:
2142//Wayland 2142//Wayland
2143#ifdef HAVE_ELEMENTARY_WL2 2143#ifdef HAVE_ELEMENTARY_WL2
2144static Sel_Manager_Seat_Selection * 2144static Sel_Manager_Seat_Selection *
2145_wl_sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned int seat) 2145_wl_sel_manager_seat_selection_init(Efl_Ui_Selection_Manager_Data *pd, unsigned int seat)
2146{ 2146{
2147 Sel_Manager_Seat_Selection *seat_sel = NULL; 2147 Sel_Manager_Seat_Selection *seat_sel = NULL;
2148 Eina_List *l = NULL; 2148 Eina_List *l = NULL;
@@ -2189,9 +2189,9 @@ _wl_drag_source_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *
2189} 2189}
2190 2190
2191static void 2191static void
2192_wl_efl_sel_manager_drag_start(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, 2192_wl_efl_sel_manager_drag_start(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd, Efl_Object *drag_obj,
2193 Efl_Selection_Format format, Eina_Slice data, 2193 Efl_Ui_Selection_Format format, Eina_Slice data,
2194 Efl_Selection_Action action, void *icon_func_data, 2194 Efl_Ui_Selection_Action action, void *icon_func_data,
2195 Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb EINA_UNUSED, 2195 Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb EINA_UNUSED,
2196 Ecore_Wl2_Window *win, unsigned int seat) 2196 Ecore_Wl2_Window *win, unsigned int seat)
2197{ 2197{
@@ -2207,7 +2207,7 @@ _wl_efl_sel_manager_drag_start(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *
2207 sel_debug("In"); 2207 sel_debug("In");
2208 seat_sel = _wl_sel_manager_seat_selection_init(pd, seat); 2208 seat_sel = _wl_sel_manager_seat_selection_init(pd, seat);
2209 if (!seat_sel) return; 2209 if (!seat_sel) return;
2210 seat_sel->active_type = EFL_SELECTION_TYPE_DND; 2210 seat_sel->active_type = EFL_UI_SELECTION_TYPE_DND;
2211 sel = seat_sel->sel; 2211 sel = seat_sel->sel;
2212 2212
2213 sel_debug("checking drag_win: %p", seat_sel->drag_win); 2213 sel_debug("checking drag_win: %p", seat_sel->drag_win);
@@ -2216,7 +2216,7 @@ _wl_efl_sel_manager_drag_start(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *
2216 2216
2217 for (i = SELECTION_ATOM_LISTING_ATOMS + 1; i < SELECTION_N_ATOMS; i++) 2217 for (i = SELECTION_ATOM_LISTING_ATOMS + 1; i < SELECTION_N_ATOMS; i++)
2218 { 2218 {
2219 if (format == EFL_SELECTION_FORMAT_TARGETS || (pd->atom_list[i].format & format)) 2219 if (format == EFL_UI_SELECTION_FORMAT_TARGETS || (pd->atom_list[i].format & format))
2220 { 2220 {
2221 types[nb_types++] = pd->atom_list[i].name; 2221 types[nb_types++] = pd->atom_list[i].name;
2222 sel_debug("set dnd type: %s\n", pd->atom_list[i].name); 2222 sel_debug("set dnd type: %s\n", pd->atom_list[i].name);
@@ -2321,15 +2321,15 @@ _wl_is_uri_type_data(const char *data, int len)
2321 return EINA_TRUE; 2321 return EINA_TRUE;
2322} 2322}
2323 2323
2324static Efl_Selection_Action 2324static Efl_Ui_Selection_Action
2325_wl_to_elm(Ecore_Wl2_Drag_Action action) 2325_wl_to_elm(Ecore_Wl2_Drag_Action action)
2326{ 2326{
2327 #define CONV(wl, elm) if (action == wl) return elm; 2327 #define CONV(wl, elm) if (action == wl) return elm;
2328 CONV(ECORE_WL2_DRAG_ACTION_COPY, EFL_SELECTION_ACTION_COPY); 2328 CONV(ECORE_WL2_DRAG_ACTION_COPY, EFL_UI_SELECTION_ACTION_COPY);
2329 CONV(ECORE_WL2_DRAG_ACTION_MOVE, EFL_SELECTION_ACTION_MOVE); 2329 CONV(ECORE_WL2_DRAG_ACTION_MOVE, EFL_UI_SELECTION_ACTION_MOVE);
2330 CONV(ECORE_WL2_DRAG_ACTION_ASK, EFL_SELECTION_ACTION_ASK); 2330 CONV(ECORE_WL2_DRAG_ACTION_ASK, EFL_UI_SELECTION_ACTION_ASK);
2331 #undef CONV 2331 #undef CONV
2332 return EFL_SELECTION_ACTION_UNKNOWN; 2332 return EFL_UI_SELECTION_ACTION_UNKNOWN;
2333} 2333}
2334 2334
2335static Eina_Bool 2335static Eina_Bool
@@ -2343,8 +2343,8 @@ _wl_targets_converter(char *target, Sel_Manager_Selection *sel, void *data EINA_
2343 int len = 0; 2343 int len = 0;
2344 int i = 0; 2344 int i = 0;
2345 Sel_Manager_Seat_Selection *seat_sel = sel->seat_sel; 2345 Sel_Manager_Seat_Selection *seat_sel = sel->seat_sel;
2346 Efl_Selection_Manager_Data *pd = seat_sel->pd; 2346 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
2347 Efl_Selection_Format format = EFL_SELECTION_FORMAT_NONE; 2347 Efl_Ui_Selection_Format format = EFL_UI_SELECTION_FORMAT_NONE;
2348 Eina_Bool is_uri = EINA_FALSE; 2348 Eina_Bool is_uri = EINA_FALSE;
2349 2349
2350 if (sel->format) 2350 if (sel->format)
@@ -2391,17 +2391,17 @@ _wl_targets_converter(char *target, Sel_Manager_Selection *sel, void *data EINA_
2391static Eina_Bool 2391static Eina_Bool
2392_wl_general_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret) 2392_wl_general_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret)
2393{ 2393{
2394 Efl_Selection_Format format = EFL_SELECTION_FORMAT_NONE; 2394 Efl_Ui_Selection_Format format = EFL_UI_SELECTION_FORMAT_NONE;
2395 Sel_Manager_Atom *atom = NULL; 2395 Sel_Manager_Atom *atom = NULL;
2396 Sel_Manager_Seat_Selection *seat_sel = sel->seat_sel; 2396 Sel_Manager_Seat_Selection *seat_sel = sel->seat_sel;
2397 Efl_Selection_Manager_Data *pd = seat_sel->pd; 2397 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
2398 2398
2399 sel_debug("in\n"); 2399 sel_debug("in\n");
2400 2400
2401 atom = eina_hash_find(pd->type_hash, target); 2401 atom = eina_hash_find(pd->type_hash, target);
2402 if (atom) 2402 if (atom)
2403 format = atom->format; 2403 format = atom->format;
2404 if (format == EFL_SELECTION_FORMAT_NONE) 2404 if (format == EFL_UI_SELECTION_FORMAT_NONE)
2405 { 2405 {
2406 if (data_ret) 2406 if (data_ret)
2407 { 2407 {
@@ -2437,17 +2437,17 @@ _wl_general_converter(char *target, Sel_Manager_Selection *sel, void *data, int
2437static Eina_Bool 2437static Eina_Bool
2438_wl_text_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret) 2438_wl_text_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret)
2439{ 2439{
2440 Efl_Selection_Format format = EFL_SELECTION_FORMAT_NONE; 2440 Efl_Ui_Selection_Format format = EFL_UI_SELECTION_FORMAT_NONE;
2441 Sel_Manager_Atom *atom = NULL; 2441 Sel_Manager_Atom *atom = NULL;
2442 Sel_Manager_Seat_Selection *seat_sel = sel->seat_sel; 2442 Sel_Manager_Seat_Selection *seat_sel = sel->seat_sel;
2443 Efl_Selection_Manager_Data *pd = seat_sel->pd; 2443 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
2444 2444
2445 sel_debug("in\n"); 2445 sel_debug("in\n");
2446 2446
2447 atom = eina_hash_find(pd->type_hash, target); 2447 atom = eina_hash_find(pd->type_hash, target);
2448 if (atom) 2448 if (atom)
2449 format = atom->format; 2449 format = atom->format;
2450 if (format == EFL_SELECTION_FORMAT_NONE) 2450 if (format == EFL_UI_SELECTION_FORMAT_NONE)
2451 { 2451 {
2452 if (data_ret) 2452 if (data_ret)
2453 { 2453 {
@@ -2459,8 +2459,8 @@ _wl_text_converter(char *target, Sel_Manager_Selection *sel, void *data, int siz
2459 return EINA_TRUE; 2459 return EINA_TRUE;
2460 } 2460 }
2461 } 2461 }
2462 else if ((format & EFL_SELECTION_FORMAT_MARKUP) || 2462 else if ((format & EFL_UI_SELECTION_FORMAT_MARKUP) ||
2463 (format & EFL_SELECTION_FORMAT_HTML)) 2463 (format & EFL_UI_SELECTION_FORMAT_HTML))
2464 { 2464 {
2465 char *tmp = malloc(size + 1); 2465 char *tmp = malloc(size + 1);
2466 if (tmp) 2466 if (tmp)
@@ -2473,7 +2473,7 @@ _wl_text_converter(char *target, Sel_Manager_Selection *sel, void *data, int siz
2473 } 2473 }
2474 else return EINA_FALSE; 2474 else return EINA_FALSE;
2475 } 2475 }
2476 else if (format & EFL_SELECTION_FORMAT_TEXT) 2476 else if (format & EFL_UI_SELECTION_FORMAT_TEXT)
2477 { 2477 {
2478 char *tmp = malloc(size + 1); 2478 char *tmp = malloc(size + 1);
2479 if (tmp) 2479 if (tmp)
@@ -2485,7 +2485,7 @@ _wl_text_converter(char *target, Sel_Manager_Selection *sel, void *data, int siz
2485 } 2485 }
2486 else return EINA_FALSE; 2486 else return EINA_FALSE;
2487 } 2487 }
2488 else if (format & EFL_SELECTION_FORMAT_IMAGE) 2488 else if (format & EFL_UI_SELECTION_FORMAT_IMAGE)
2489 { 2489 {
2490 sel_debug("Image %s\n", evas_object_type_get(sel->request_obj)); 2490 sel_debug("Image %s\n", evas_object_type_get(sel->request_obj));
2491 efl_file_get(sel->request_obj, (const char **)data_ret, NULL); 2491 efl_file_get(sel->request_obj, (const char **)data_ret, NULL);
@@ -2516,9 +2516,9 @@ _wl_sel_obj_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_i
2516} 2516}
2517 2517
2518static Eina_Future * 2518static Eina_Future *
2519_wl_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd, 2519_wl_efl_sel_manager_selection_set(Efl_Ui_Selection_Manager_Data *pd,
2520 Efl_Object *owner, Efl_Selection_Type type, 2520 Efl_Object *owner, Efl_Ui_Selection_Type type,
2521 Efl_Selection_Format format, 2521 Efl_Ui_Selection_Format format,
2522 Eina_Slice data, 2522 Eina_Slice data,
2523 Ecore_Wl2_Window *win, 2523 Ecore_Wl2_Window *win,
2524 unsigned int seat) 2524 unsigned int seat)
@@ -2529,9 +2529,9 @@ _wl_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
2529 Eina_Bool is_uri = EINA_FALSE; 2529 Eina_Bool is_uri = EINA_FALSE;
2530 const char **types; 2530 const char **types;
2531 2531
2532 if ((!data.mem) && (format != EFL_SELECTION_FORMAT_IMAGE)) 2532 if ((!data.mem) && (format != EFL_UI_SELECTION_FORMAT_IMAGE))
2533 { 2533 {
2534 efl_selection_manager_selection_clear(pd->sel_man, owner, type, seat); 2534 efl_ui_selection_manager_selection_clear(pd->sel_man, owner, type, seat);
2535 return NULL; 2535 return NULL;
2536 } 2536 }
2537 2537
@@ -2574,7 +2574,7 @@ _wl_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
2574 sel->data = eina_slice_dup(data); 2574 sel->data = eina_slice_dup(data);
2575 if (!sel->data.mem) 2575 if (!sel->data.mem)
2576 { 2576 {
2577 efl_selection_manager_selection_clear(pd->sel_man, owner, type, seat_sel->seat); 2577 efl_ui_selection_manager_selection_clear(pd->sel_man, owner, type, seat_sel->seat);
2578 return NULL; 2578 return NULL;
2579 } 2579 }
2580 2580
@@ -2624,11 +2624,11 @@ _wl_selection_changed_free(void *data, void *ev)
2624static Eina_Bool 2624static Eina_Bool
2625_wl_selection_changed(void *data, int type EINA_UNUSED, void *event) 2625_wl_selection_changed(void *data, int type EINA_UNUSED, void *event)
2626{ 2626{
2627 Efl_Selection_Manager_Data *pd = data; 2627 Efl_Ui_Selection_Manager_Data *pd = data;
2628 Elm_Cnp_Event_Selection_Changed *_e; 2628 Elm_Cnp_Event_Selection_Changed *_e;
2629 Sel_Manager_Seat_Selection *seat_sel; 2629 Sel_Manager_Seat_Selection *seat_sel;
2630 Sel_Manager_Selection *sel; 2630 Sel_Manager_Selection *sel;
2631 Efl_Selection_Changed e; 2631 Efl_Ui_Selection_Changed e;
2632 Ecore_Wl2_Event_Seat_Selection *ev = event; 2632 Ecore_Wl2_Event_Seat_Selection *ev = event;
2633 Ecore_Wl2_Input *seat; 2633 Ecore_Wl2_Input *seat;
2634 2634
@@ -2639,7 +2639,7 @@ _wl_selection_changed(void *data, int type EINA_UNUSED, void *event)
2639 2639
2640 seat = ecore_wl2_display_input_find(ev->display, ev->seat); 2640 seat = ecore_wl2_display_input_find(ev->display, ev->seat);
2641 EINA_SAFETY_ON_NULL_RETURN_VAL(seat, ECORE_CALLBACK_RENEW); 2641 EINA_SAFETY_ON_NULL_RETURN_VAL(seat, ECORE_CALLBACK_RENEW);
2642 e.type = EFL_SELECTION_TYPE_CLIPBOARD; 2642 e.type = EFL_UI_SELECTION_TYPE_CLIPBOARD;
2643 e.seat = ev->seat; 2643 e.seat = ev->seat;
2644 /* connect again to add ref */ 2644 /* connect again to add ref */
2645 e.display = ecore_wl2_display_connect(ecore_wl2_display_name_get(ev->display)); 2645 e.display = ecore_wl2_display_connect(ecore_wl2_display_name_get(ev->display));
@@ -2653,7 +2653,7 @@ _wl_selection_changed(void *data, int type EINA_UNUSED, void *event)
2653 _e->exists = e.exist; 2653 _e->exists = e.exist;
2654 2654
2655 ecore_event_add(ELM_CNP_EVENT_SELECTION_CHANGED, _e, _wl_selection_changed_free, ev->display); 2655 ecore_event_add(ELM_CNP_EVENT_SELECTION_CHANGED, _e, _wl_selection_changed_free, ev->display);
2656 efl_event_callback_call(sel->request_obj, EFL_SELECTION_EVENT_SELECTION_CHANGED, &e); 2656 efl_event_callback_call(sel->request_obj, EFL_UI_SELECTION_EVENT_SELECTION_CHANGED, &e);
2657 2657
2658 return ECORE_CALLBACK_RENEW; 2658 return ECORE_CALLBACK_RENEW;
2659} 2659}
@@ -2661,7 +2661,7 @@ _wl_selection_changed(void *data, int type EINA_UNUSED, void *event)
2661static Eina_Bool 2661static Eina_Bool
2662_wl_selection_send(void *data, int type EINA_UNUSED, void *event) 2662_wl_selection_send(void *data, int type EINA_UNUSED, void *event)
2663{ 2663{
2664 Efl_Selection_Manager_Data *pd = data; 2664 Efl_Ui_Selection_Manager_Data *pd = data;
2665 char *buf; 2665 char *buf;
2666 int ret, len_remained; 2666 int ret, len_remained;
2667 int len_written = 0; 2667 int len_written = 0;
@@ -2728,7 +2728,7 @@ static Eina_Bool
2728_wl_dnd_end(void *data, int type EINA_UNUSED, void *event) 2728_wl_dnd_end(void *data, int type EINA_UNUSED, void *event)
2729{ 2729{
2730 sel_debug("In"); 2730 sel_debug("In");
2731 Efl_Selection_Manager_Data *pd = data; 2731 Efl_Ui_Selection_Manager_Data *pd = data;
2732 Ecore_Wl2_Event_Data_Source_End *ev; 2732 Ecore_Wl2_Event_Data_Source_End *ev;
2733 Sel_Manager_Seat_Selection *seat_sel; 2733 Sel_Manager_Seat_Selection *seat_sel;
2734 Sel_Manager_Selection *sel; 2734 Sel_Manager_Selection *sel;
@@ -2739,7 +2739,7 @@ _wl_dnd_end(void *data, int type EINA_UNUSED, void *event)
2739 if (ev->serial != sel->drag_serial) 2739 if (ev->serial != sel->drag_serial)
2740 return ECORE_CALLBACK_RENEW; 2740 return ECORE_CALLBACK_RENEW;
2741 2741
2742 if (seat_sel->active_type != EFL_SELECTION_TYPE_DND) 2742 if (seat_sel->active_type != EFL_UI_SELECTION_TYPE_DND)
2743 return ECORE_CALLBACK_RENEW; 2743 return ECORE_CALLBACK_RENEW;
2744 2744
2745 efl_event_callback_call(seat_sel->drag_obj, EFL_UI_DND_EVENT_DRAG_DONE, NULL); 2745 efl_event_callback_call(seat_sel->drag_obj, EFL_UI_DND_EVENT_DRAG_DONE, NULL);
@@ -2867,12 +2867,12 @@ _wl_selection_receive(void *data, int type EINA_UNUSED, void *event)
2867 2867
2868 if (sel->data_func) 2868 if (sel->data_func)
2869 { 2869 {
2870 Efl_Selection_Data sel_data; 2870 Efl_Ui_Selection_Data sel_data;
2871 2871
2872 sel_data.pos.x = sel_data.pos.y = 0; 2872 sel_data.pos.x = sel_data.pos.y = 0;
2873 if (((sel->format & EFL_SELECTION_FORMAT_MARKUP) || 2873 if (((sel->format & EFL_UI_SELECTION_FORMAT_MARKUP) ||
2874 (sel->format & EFL_SELECTION_FORMAT_HTML)) && 2874 (sel->format & EFL_UI_SELECTION_FORMAT_HTML)) &&
2875 (sel->want_format == EFL_SELECTION_FORMAT_TEXT)) 2875 (sel->want_format == EFL_UI_SELECTION_FORMAT_TEXT))
2876 { 2876 {
2877 char *tmp = malloc(ev->len + 1); 2877 char *tmp = malloc(ev->len + 1);
2878 sel_data.format = sel->format; 2878 sel_data.format = sel->format;
@@ -2924,9 +2924,9 @@ _wl_selection_receive(void *data, int type EINA_UNUSED, void *event)
2924} 2924}
2925 2925
2926static Eina_Bool 2926static Eina_Bool
2927_wl_efl_sel_manager_selection_get(const Efl_Object *request, Efl_Selection_Manager_Data *pd, 2927_wl_efl_sel_manager_selection_get(const Efl_Object *request, Efl_Ui_Selection_Manager_Data *pd,
2928 Efl_Selection_Type type, Efl_Selection_Format format, 2928 Efl_Ui_Selection_Type type, Efl_Ui_Selection_Format format,
2929 void *data_func_data, Efl_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb, 2929 void *data_func_data, Efl_Ui_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb,
2930 Ecore_Wl2_Window *win, unsigned int seat) 2930 Ecore_Wl2_Window *win, unsigned int seat)
2931{ 2931{
2932 sel_debug("In, format: %d", format); 2932 sel_debug("In, format: %d", format);
@@ -2936,7 +2936,7 @@ _wl_efl_sel_manager_selection_get(const Efl_Object *request, Efl_Selection_Manag
2936 Ecore_Wl2_Offer *offer; 2936 Ecore_Wl2_Offer *offer;
2937 int i = 0; 2937 int i = 0;
2938 2938
2939 if (type == EFL_SELECTION_TYPE_DND) return EINA_FALSE; 2939 if (type == EFL_UI_SELECTION_TYPE_DND) return EINA_FALSE;
2940 2940
2941 //if (sel->active) 2941 //if (sel->active)
2942 //return _local_elm_cnp_selection_get(obj, selection, format, datacb, udata); 2942 //return _local_elm_cnp_selection_get(obj, selection, format, datacb, udata);
@@ -2990,7 +2990,7 @@ _wl_sel_obj_del2(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_
2990} 2990}
2991 2991
2992static Sel_Manager_Dropable * 2992static Sel_Manager_Dropable *
2993_wl_dropable_find(Efl_Selection_Manager_Data *pd, Ecore_Wl2_Window *win) 2993_wl_dropable_find(Efl_Ui_Selection_Manager_Data *pd, Ecore_Wl2_Window *win)
2994{ 2994{
2995 Eina_List *l; 2995 Eina_List *l;
2996 Sel_Manager_Dropable *dropable; 2996 Sel_Manager_Dropable *dropable;
@@ -3007,7 +3007,7 @@ _wl_dropable_find(Efl_Selection_Manager_Data *pd, Ecore_Wl2_Window *win)
3007} 3007}
3008 3008
3009static Evas * 3009static Evas *
3010_wl_evas_get_from_win(Efl_Selection_Manager_Data *pd, Ecore_Wl2_Window *win) 3010_wl_evas_get_from_win(Efl_Ui_Selection_Manager_Data *pd, Ecore_Wl2_Window *win)
3011{ 3011{
3012 Sel_Manager_Dropable *dropable = _wl_dropable_find(pd, win); 3012 Sel_Manager_Dropable *dropable = _wl_dropable_find(pd, win);
3013 return dropable ? evas_object_evas_get(dropable->obj) : NULL; 3013 return dropable ? evas_object_evas_get(dropable->obj) : NULL;
@@ -3016,7 +3016,7 @@ _wl_evas_get_from_win(Efl_Selection_Manager_Data *pd, Ecore_Wl2_Window *win)
3016static Eina_Bool 3016static Eina_Bool
3017_wl_drops_accept(Sel_Manager_Seat_Selection *seat_sel, const char *type) 3017_wl_drops_accept(Sel_Manager_Seat_Selection *seat_sel, const char *type)
3018{ 3018{
3019 Efl_Selection_Manager_Data *pd; 3019 Efl_Ui_Selection_Manager_Data *pd;
3020 Sel_Manager_Selection *sel; 3020 Sel_Manager_Selection *sel;
3021 Eina_List *l; 3021 Eina_List *l;
3022 Sel_Manager_Dropable *drop; 3022 Sel_Manager_Dropable *drop;
@@ -3144,11 +3144,11 @@ done:
3144} 3144}
3145 3145
3146static Eina_Bool 3146static Eina_Bool
3147_wl_data_preparer_markup(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info EINA_UNUSED) 3147_wl_data_preparer_markup(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info EINA_UNUSED)
3148{ 3148{
3149 sel_debug("In\n"); 3149 sel_debug("In\n");
3150 3150
3151 ddata->format = EFL_SELECTION_FORMAT_MARKUP; 3151 ddata->format = EFL_UI_SELECTION_FORMAT_MARKUP;
3152 ddata->content.mem = eina_memdup((unsigned char *)ev->data, ev->len, EINA_TRUE); 3152 ddata->content.mem = eina_memdup((unsigned char *)ev->data, ev->len, EINA_TRUE);
3153 ddata->content.len = ev->len; 3153 ddata->content.len = ev->len;
3154 ddata->action = sel->action; 3154 ddata->action = sel->action;
@@ -3157,7 +3157,7 @@ _wl_data_preparer_markup(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata,
3157} 3157}
3158 3158
3159static Eina_Bool 3159static Eina_Bool
3160_wl_data_preparer_uri(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info EINA_UNUSED) 3160_wl_data_preparer_uri(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info EINA_UNUSED)
3161{ 3161{
3162 Sel_Manager_Seat_Selection *seat_sel; 3162 Sel_Manager_Seat_Selection *seat_sel;
3163 char *p, *stripstr = NULL; 3163 char *p, *stripstr = NULL;
@@ -3242,11 +3242,11 @@ _wl_data_preparer_uri(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Eco
3242} 3242}
3243 3243
3244static Eina_Bool 3244static Eina_Bool
3245_wl_data_preparer_vcard(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info EINA_UNUSED) 3245_wl_data_preparer_vcard(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info EINA_UNUSED)
3246{ 3246{
3247 sel_debug("In\n"); 3247 sel_debug("In\n");
3248 3248
3249 ddata->format = EFL_SELECTION_FORMAT_VCARD; 3249 ddata->format = EFL_UI_SELECTION_FORMAT_VCARD;
3250 ddata->content.mem = eina_memdup((unsigned char *)ev->data, ev->len, EINA_TRUE); 3250 ddata->content.mem = eina_memdup((unsigned char *)ev->data, ev->len, EINA_TRUE);
3251 ddata->content.len = ev->len; 3251 ddata->content.len = ev->len;
3252 ddata->action = sel->action; 3252 ddata->action = sel->action;
@@ -3255,7 +3255,7 @@ _wl_data_preparer_vcard(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, E
3255} 3255}
3256 3256
3257static Eina_Bool 3257static Eina_Bool
3258_wl_data_preparer_image(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info) 3258_wl_data_preparer_image(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info)
3259{ 3259{
3260 sel_debug("In\n"); 3260 sel_debug("In\n");
3261 Tmp_Info *tmp; 3261 Tmp_Info *tmp;
@@ -3268,7 +3268,7 @@ _wl_data_preparer_image(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, E
3268 munmap(tmp->map, ev->len); 3268 munmap(tmp->map, ev->len);
3269 3269
3270 len = strlen(tmp->filename); 3270 len = strlen(tmp->filename);
3271 ddata->format = EFL_SELECTION_FORMAT_IMAGE; 3271 ddata->format = EFL_UI_SELECTION_FORMAT_IMAGE;
3272 ddata->content.mem = eina_memdup((unsigned char*)tmp->filename, len, EINA_TRUE); 3272 ddata->content.mem = eina_memdup((unsigned char*)tmp->filename, len, EINA_TRUE);
3273 ddata->content.len = len; 3273 ddata->content.len = len;
3274 ddata->action = sel->action; 3274 ddata->action = sel->action;
@@ -3278,11 +3278,11 @@ _wl_data_preparer_image(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, E
3278} 3278}
3279 3279
3280static Eina_Bool 3280static Eina_Bool
3281_wl_data_preparer_text(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info EINA_UNUSED) 3281_wl_data_preparer_text(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info EINA_UNUSED)
3282{ 3282{
3283 sel_debug("In\n"); 3283 sel_debug("In\n");
3284 3284
3285 ddata->format = EFL_SELECTION_FORMAT_TEXT; 3285 ddata->format = EFL_UI_SELECTION_FORMAT_TEXT;
3286 ddata->content.mem = eina_memdup((unsigned char *)ev->data, ev->len, EINA_TRUE); 3286 ddata->content.mem = eina_memdup((unsigned char *)ev->data, ev->len, EINA_TRUE);
3287 ddata->content.len = ev->len; 3287 ddata->content.len = ev->len;
3288 ddata->action = sel->action; 3288 ddata->action = sel->action;
@@ -3295,7 +3295,7 @@ static void
3295_wl_dropable_handle(Sel_Manager_Seat_Selection *seat_sel, Sel_Manager_Dropable *dropable, Evas_Coord x, Evas_Coord y) 3295_wl_dropable_handle(Sel_Manager_Seat_Selection *seat_sel, Sel_Manager_Dropable *dropable, Evas_Coord x, Evas_Coord y)
3296{ 3296{
3297 Sel_Manager_Dropable *d, *last_dropable = NULL; 3297 Sel_Manager_Dropable *d, *last_dropable = NULL;
3298 Efl_Selection_Manager_Data *pd = seat_sel->pd; 3298 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
3299 Sel_Manager_Selection *sel; 3299 Sel_Manager_Selection *sel;
3300 Eina_Inlist *itr; 3300 Eina_Inlist *itr;
3301 Eina_List *l; 3301 Eina_List *l;
@@ -3418,7 +3418,7 @@ static void
3418_wl_dropable_data_handle(Sel_Manager_Selection *sel, Ecore_Wl2_Event_Offer_Data_Ready *ev) 3418_wl_dropable_data_handle(Sel_Manager_Selection *sel, Ecore_Wl2_Event_Offer_Data_Ready *ev)
3419{ 3419{
3420 Sel_Manager_Seat_Selection *seat_sel; 3420 Sel_Manager_Seat_Selection *seat_sel;
3421 Efl_Selection_Manager_Data *pd; 3421 Efl_Ui_Selection_Manager_Data *pd;
3422 Sel_Manager_Dropable *drop; 3422 Sel_Manager_Dropable *drop;
3423 Ecore_Wl2_Window *win; 3423 Ecore_Wl2_Window *win;
3424 3424
@@ -3433,7 +3433,7 @@ _wl_dropable_data_handle(Sel_Manager_Selection *sel, Ecore_Wl2_Event_Offer_Data_
3433 atom = eina_hash_find(pd->type_hash, drop->last.type); 3433 atom = eina_hash_find(pd->type_hash, drop->last.type);
3434 if (atom && atom->wl_data_preparer) 3434 if (atom && atom->wl_data_preparer)
3435 { 3435 {
3436 Efl_Selection_Data ddata; 3436 Efl_Ui_Selection_Data ddata;
3437 Tmp_Info *tmp_info = NULL; 3437 Tmp_Info *tmp_info = NULL;
3438 Eina_Bool success; 3438 Eina_Bool success;
3439 3439
@@ -3564,7 +3564,7 @@ _wl_dnd_position(void *data, int type EINA_UNUSED, void *event)
3564{ 3564{
3565 Ecore_Wl2_Event_Dnd_Motion *ev; 3565 Ecore_Wl2_Event_Dnd_Motion *ev;
3566 Sel_Manager_Seat_Selection *seat_sel = data; 3566 Sel_Manager_Seat_Selection *seat_sel = data;
3567 Efl_Selection_Manager_Data *pd = seat_sel->pd; 3567 Efl_Ui_Selection_Manager_Data *pd = seat_sel->pd;
3568 Sel_Manager_Dropable *drop; 3568 Sel_Manager_Dropable *drop;
3569 Eina_Bool will_accept = EINA_FALSE; 3569 Eina_Bool will_accept = EINA_FALSE;
3570 3570
@@ -3590,7 +3590,7 @@ _wl_dnd_position(void *data, int type EINA_UNUSED, void *event)
3590 /* check if there is dropable (obj) can accept this drop */ 3590 /* check if there is dropable (obj) can accept this drop */
3591 if (dropable_list) 3591 if (dropable_list)
3592 { 3592 {
3593 Efl_Selection_Format saved_format; 3593 Efl_Ui_Selection_Format saved_format;
3594 Eina_List *l; 3594 Eina_List *l;
3595 Eina_Bool found = EINA_FALSE; 3595 Eina_Bool found = EINA_FALSE;
3596 Sel_Manager_Dropable *dropable = NULL; 3596 Sel_Manager_Dropable *dropable = NULL;
@@ -3605,7 +3605,7 @@ _wl_dnd_position(void *data, int type EINA_UNUSED, void *event)
3605 3605
3606 EINA_INLIST_FOREACH_SAFE(dropable->format_list, itr, df) 3606 EINA_INLIST_FOREACH_SAFE(dropable->format_list, itr, df)
3607 { 3607 {
3608 Efl_Selection_Format common_fmt = saved_format & df->format; 3608 Efl_Ui_Selection_Format common_fmt = saved_format & df->format;
3609 3609
3610 if (common_fmt) 3610 if (common_fmt)
3611 { 3611 {
@@ -3713,7 +3713,7 @@ _wl_dnd_drop(void *data, int type EINA_UNUSED, void *event)
3713{ 3713{
3714 Ecore_Wl2_Event_Dnd_Drop *ev; 3714 Ecore_Wl2_Event_Dnd_Drop *ev;
3715 Sel_Manager_Seat_Selection *seat_sel = data; 3715 Sel_Manager_Seat_Selection *seat_sel = data;
3716 Efl_Selection_Manager_Data *pd; 3716 Efl_Ui_Selection_Manager_Data *pd;
3717 Sel_Manager_Selection *sel; 3717 Sel_Manager_Selection *sel;
3718 Sel_Manager_Dropable *drop; 3718 Sel_Manager_Dropable *drop;
3719 Eina_List *l; 3719 Eina_List *l;
@@ -3747,8 +3747,8 @@ _wl_dnd_drop(void *data, int type EINA_UNUSED, void *event)
3747} 3747}
3748 3748
3749static Eina_Bool 3749static Eina_Bool
3750_wl_sel_manager_drop_target_add(Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, 3750_wl_sel_manager_drop_target_add(Efl_Ui_Selection_Manager_Data *pd, Efl_Object *target_obj,
3751 Efl_Selection_Format format, unsigned int seat) 3751 Efl_Ui_Selection_Format format, unsigned int seat)
3752{ 3752{
3753 Sel_Manager_Dropable *dropable = NULL; 3753 Sel_Manager_Dropable *dropable = NULL;
3754 Sel_Manager_Seat_Selection *seat_sel = NULL; 3754 Sel_Manager_Seat_Selection *seat_sel = NULL;
@@ -3807,7 +3807,7 @@ _wl_sel_manager_drop_target_add(Efl_Selection_Manager_Data *pd, Efl_Object *targ
3807 3807
3808#ifdef HAVE_ELEMENTARY_COCOA 3808#ifdef HAVE_ELEMENTARY_COCOA
3809static Sel_Manager_Seat_Selection * 3809static Sel_Manager_Seat_Selection *
3810_cocoa_sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned int seat) 3810_cocoa_sel_manager_seat_selection_init(Efl_Ui_Selection_Manager_Data *pd, unsigned int seat)
3811{ 3811{
3812 Sel_Manager_Seat_Selection *seat_sel = NULL; 3812 Sel_Manager_Seat_Selection *seat_sel = NULL;
3813 Eina_List *l = NULL; 3813 Eina_List *l = NULL;
@@ -3866,16 +3866,16 @@ _cocoa_window_get(const Evas_Object *obj)
3866} 3866}
3867 3867
3868static Ecore_Cocoa_Cnp_Type 3868static Ecore_Cocoa_Cnp_Type
3869_sel_format_to_ecore_cocoa_cnp_type(Efl_Selection_Format fmt) 3869_sel_format_to_ecore_cocoa_cnp_type(Efl_Ui_Selection_Format fmt)
3870{ 3870{
3871 Ecore_Cocoa_Cnp_Type type = 0; 3871 Ecore_Cocoa_Cnp_Type type = 0;
3872 3872
3873 if ((fmt & EFL_SELECTION_FORMAT_TEXT) || 3873 if ((fmt & EFL_UI_SELECTION_FORMAT_TEXT) ||
3874 (fmt & EFL_SELECTION_FORMAT_VCARD)) 3874 (fmt & EFL_UI_SELECTION_FORMAT_VCARD))
3875 type |= ECORE_COCOA_CNP_TYPE_STRING; 3875 type |= ECORE_COCOA_CNP_TYPE_STRING;
3876 if (fmt & EFL_SELECTION_FORMAT_HTML) 3876 if (fmt & EFL_UI_SELECTION_FORMAT_HTML)
3877 type |= ECORE_COCOA_CNP_TYPE_HTML; 3877 type |= ECORE_COCOA_CNP_TYPE_HTML;
3878 if (fmt & EFL_SELECTION_FORMAT_IMAGE) 3878 if (fmt & EFL_UI_SELECTION_FORMAT_IMAGE)
3879 type |= ECORE_COCOA_CNP_TYPE_IMAGE; 3879 type |= ECORE_COCOA_CNP_TYPE_IMAGE;
3880 3880
3881 return type; 3881 return type;
@@ -3909,7 +3909,7 @@ static void
3909_job_pb_cb(void *data) 3909_job_pb_cb(void *data)
3910{ 3910{
3911 Sel_Manager_Selection *sel = data; 3911 Sel_Manager_Selection *sel = data;
3912 Efl_Selection_Data ddata; 3912 Efl_Ui_Selection_Data ddata;
3913 Ecore_Cocoa_Cnp_Type type, get_type; 3913 Ecore_Cocoa_Cnp_Type type, get_type;
3914 void *pbdata; 3914 void *pbdata;
3915 int pbdata_len; 3915 int pbdata_len;
@@ -3923,27 +3923,27 @@ _job_pb_cb(void *data)
3923 type = _sel_format_to_ecore_cocoa_cnp_type(sel->request_format); 3923 type = _sel_format_to_ecore_cocoa_cnp_type(sel->request_format);
3924 pbdata = ecore_cocoa_clipboard_get(&pbdata_len, type, &get_type); 3924 pbdata = ecore_cocoa_clipboard_get(&pbdata_len, type, &get_type);
3925 3925
3926 ddata.format = EFL_SELECTION_FORMAT_NONE; 3926 ddata.format = EFL_UI_SELECTION_FORMAT_NONE;
3927 if (get_type & ECORE_COCOA_CNP_TYPE_STRING) 3927 if (get_type & ECORE_COCOA_CNP_TYPE_STRING)
3928 ddata.format |= EFL_SELECTION_FORMAT_TEXT; 3928 ddata.format |= EFL_UI_SELECTION_FORMAT_TEXT;
3929 if (get_type & ECORE_COCOA_CNP_TYPE_IMAGE) 3929 if (get_type & ECORE_COCOA_CNP_TYPE_IMAGE)
3930 ddata.format |= EFL_SELECTION_FORMAT_IMAGE; 3930 ddata.format |= EFL_UI_SELECTION_FORMAT_IMAGE;
3931 if (get_type & ECORE_COCOA_CNP_TYPE_HTML) 3931 if (get_type & ECORE_COCOA_CNP_TYPE_HTML)
3932 ddata.format |= EFL_SELECTION_FORMAT_HTML; 3932 ddata.format |= EFL_UI_SELECTION_FORMAT_HTML;
3933 3933
3934 ddata.content.mem = pbdata; 3934 ddata.content.mem = pbdata;
3935 ddata.content.len = pbdata_len; 3935 ddata.content.len = pbdata_len;
3936 ddata.action = EFL_SELECTION_ACTION_UNKNOWN; 3936 ddata.action = EFL_UI_SELECTION_ACTION_UNKNOWN;
3937 sel->data_func(sel->data_func_data, sel->request_obj, &ddata); 3937 sel->data_func(sel->data_func_data, sel->request_obj, &ddata);
3938 free(pbdata); 3938 free(pbdata);
3939 } 3939 }
3940} 3940}
3941 3941
3942static Eina_Future * 3942static Eina_Future *
3943_cocoa_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd, 3943_cocoa_efl_sel_manager_selection_set(Efl_Ui_Selection_Manager_Data *pd,
3944 Evas_Object *owner, 3944 Evas_Object *owner,
3945 Efl_Selection_Type type, 3945 Efl_Ui_Selection_Type type,
3946 Efl_Selection_Format format, 3946 Efl_Ui_Selection_Format format,
3947 Eina_Slice data, 3947 Eina_Slice data,
3948 Ecore_Cocoa_Window *win, 3948 Ecore_Cocoa_Window *win,
3949 unsigned int seat) 3949 unsigned int seat)
@@ -3958,9 +3958,9 @@ _cocoa_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
3958 seat_sel->active_type = type; 3958 seat_sel->active_type = type;
3959 sel = seat_sel->sel; 3959 sel = seat_sel->sel;
3960 3960
3961 if ((!data.mem) && (format != EFL_SELECTION_FORMAT_IMAGE)) 3961 if ((!data.mem) && (format != EFL_UI_SELECTION_FORMAT_IMAGE))
3962 { 3962 {
3963 efl_selection_manager_selection_clear(pd->sel_man, owner, type, seat); 3963 efl_ui_selection_manager_selection_clear(pd->sel_man, owner, type, seat);
3964 return NULL; 3964 return NULL;
3965 } 3965 }
3966 if (data.len <= 0) return NULL; 3966 if (data.len <= 0) return NULL;
@@ -3987,13 +3987,13 @@ _cocoa_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
3987 _cocoa_sel_obj_del_cb, sel); 3987 _cocoa_sel_obj_del_cb, sel);
3988 ELM_SAFE_FREE(sel->data.mem, free); 3988 ELM_SAFE_FREE(sel->data.mem, free);
3989 3989
3990 if (format == EFL_SELECTION_FORMAT_MARKUP) 3990 if (format == EFL_UI_SELECTION_FORMAT_MARKUP)
3991 { 3991 {
3992 //FIXME this code assumes that sel->data.mem has a \0 at the end 3992 //FIXME this code assumes that sel->data.mem has a \0 at the end
3993 sel->data.mem = evas_textblock_text_markup_to_utf8(NULL, data.mem); 3993 sel->data.mem = evas_textblock_text_markup_to_utf8(NULL, data.mem);
3994 sel->data.len = strlen(sel->data.mem); 3994 sel->data.len = strlen(sel->data.mem);
3995 //set the new text 3995 //set the new text
3996 format = EFL_SELECTION_FORMAT_TEXT; 3996 format = EFL_UI_SELECTION_FORMAT_TEXT;
3997 } 3997 }
3998 else 3998 else
3999 { 3999 {
@@ -4008,7 +4008,7 @@ _cocoa_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
4008 else 4008 else
4009 { 4009 {
4010 CRI("Failed to allocate memory!"); 4010 CRI("Failed to allocate memory!");
4011 efl_selection_manager_selection_clear(pd->sel_man, owner, type, seat_sel->seat); 4011 efl_ui_selection_manager_selection_clear(pd->sel_man, owner, type, seat_sel->seat);
4012 return NULL; 4012 return NULL;
4013 } 4013 }
4014 4014
@@ -4017,10 +4017,10 @@ _cocoa_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
4017 4017
4018static void 4018static void
4019_cocoa_efl_sel_manager_selection_get(const Efl_Object *request, 4019_cocoa_efl_sel_manager_selection_get(const Efl_Object *request,
4020 Efl_Selection_Manager_Data *pd, 4020 Efl_Ui_Selection_Manager_Data *pd,
4021 Efl_Selection_Type type EINA_UNUSED, 4021 Efl_Ui_Selection_Type type EINA_UNUSED,
4022 Efl_Selection_Format format, 4022 Efl_Ui_Selection_Format format,
4023 void *data_func_data, Efl_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb, 4023 void *data_func_data, Efl_Ui_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb,
4024 Ecore_Cocoa_Window *win, unsigned int seat) 4024 Ecore_Cocoa_Window *win, unsigned int seat)
4025{ 4025{
4026 Sel_Manager_Seat_Selection *seat_sel; 4026 Sel_Manager_Seat_Selection *seat_sel;
@@ -4050,7 +4050,7 @@ _cocoa_efl_sel_manager_selection_get(const Efl_Object *request,
4050//////////////////////////////////////////////////////////////////////////// 4050////////////////////////////////////////////////////////////////////////////
4051#ifdef HAVE_ELEMENTARY_WIN32 4051#ifdef HAVE_ELEMENTARY_WIN32
4052static Sel_Manager_Seat_Selection * 4052static Sel_Manager_Seat_Selection *
4053_win32_sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned int seat) 4053_win32_sel_manager_seat_selection_init(Efl_Ui_Selection_Manager_Data *pd, unsigned int seat)
4054{ 4054{
4055 Sel_Manager_Seat_Selection *seat_sel = NULL; 4055 Sel_Manager_Seat_Selection *seat_sel = NULL;
4056 Eina_List *l = NULL; 4056 Eina_List *l = NULL;
@@ -4075,7 +4075,7 @@ _win32_sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned
4075 } 4075 }
4076 if (!seat_sel->sel_list) 4076 if (!seat_sel->sel_list)
4077 { 4077 {
4078 seat_sel->sel_list = calloc(1, (EFL_SELECTION_TYPE_CLIPBOARD + 1) * sizeof(Sel_Manager_Selection)); 4078 seat_sel->sel_list = calloc(1, (EFL_UI_SELECTION_TYPE_CLIPBOARD + 1) * sizeof(Sel_Manager_Selection));
4079 if (!seat_sel->sel_list) 4079 if (!seat_sel->sel_list)
4080 { 4080 {
4081 ERR("failed to allocate selection list"); 4081 ERR("failed to allocate selection list");
@@ -4179,10 +4179,10 @@ _win32_window_get(const Evas_Object *obj)
4179} 4179}
4180 4180
4181static Eina_Future * 4181static Eina_Future *
4182_win32_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd, 4182_win32_efl_sel_manager_selection_set(Efl_Ui_Selection_Manager_Data *pd,
4183 Evas_Object *owner, 4183 Evas_Object *owner,
4184 Efl_Selection_Type type, 4184 Efl_Ui_Selection_Type type,
4185 Efl_Selection_Format format, 4185 Efl_Ui_Selection_Format format,
4186 Eina_Slice data, 4186 Eina_Slice data,
4187 Ecore_Win32_Window *win, 4187 Ecore_Win32_Window *win,
4188 unsigned int seat) 4188 unsigned int seat)
@@ -4190,12 +4190,12 @@ _win32_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
4190 Sel_Manager_Seat_Selection *seat_sel; 4190 Sel_Manager_Seat_Selection *seat_sel;
4191 Sel_Manager_Selection *sel; 4191 Sel_Manager_Selection *sel;
4192 4192
4193 if (type != EFL_SELECTION_TYPE_CLIPBOARD) 4193 if (type != EFL_UI_SELECTION_TYPE_CLIPBOARD)
4194 return NULL; 4194 return NULL;
4195 4195
4196 if ((!data.mem) && (format != EFL_SELECTION_FORMAT_IMAGE)) 4196 if ((!data.mem) && (format != EFL_UI_SELECTION_FORMAT_IMAGE))
4197 { 4197 {
4198 efl_selection_manager_selection_clear(pd->sel_man, owner, type, seat); 4198 efl_ui_selection_manager_selection_clear(pd->sel_man, owner, type, seat);
4199 return NULL; 4199 return NULL;
4200 } 4200 }
4201 4201
@@ -4235,7 +4235,7 @@ _win32_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
4235 sel->data = eina_slice_dup(data); 4235 sel->data = eina_slice_dup(data);
4236 if (!sel->data.mem) 4236 if (!sel->data.mem)
4237 { 4237 {
4238 efl_selection_manager_selection_clear(pd->sel_man, owner, type, seat_sel->seat); 4238 efl_ui_selection_manager_selection_clear(pd->sel_man, owner, type, seat_sel->seat);
4239 return NULL; 4239 return NULL;
4240 } 4240 }
4241 4241
@@ -4243,15 +4243,15 @@ _win32_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd,
4243} 4243}
4244 4244
4245static void 4245static void
4246_win32_efl_sel_manager_selection_clear(Efl_Selection_Manager_Data *pd, 4246_win32_efl_sel_manager_selection_clear(Efl_Ui_Selection_Manager_Data *pd,
4247 Evas_Object *owner, 4247 Evas_Object *owner,
4248 Efl_Selection_Type type, 4248 Efl_Ui_Selection_Type type,
4249 Sel_Manager_Seat_Selection *seat_sel) 4249 Sel_Manager_Seat_Selection *seat_sel)
4250{ 4250{
4251 Sel_Manager_Selection *sel; 4251 Sel_Manager_Selection *sel;
4252 Ecore_Win32_Window *win; 4252 Ecore_Win32_Window *win;
4253 4253
4254 if (type != EFL_SELECTION_TYPE_CLIPBOARD) 4254 if (type != EFL_UI_SELECTION_TYPE_CLIPBOARD)
4255 return; 4255 return;
4256 4256
4257 sel = seat_sel->sel_list + type; 4257 sel = seat_sel->sel_list + type;
@@ -4275,9 +4275,9 @@ _win32_efl_sel_manager_selection_clear(Efl_Selection_Manager_Data *pd,
4275 4275
4276static Eina_Bool 4276static Eina_Bool
4277_win32_efl_sel_manager_selection_get(const Efl_Object *request, 4277_win32_efl_sel_manager_selection_get(const Efl_Object *request,
4278 Efl_Selection_Manager_Data *pd, 4278 Efl_Ui_Selection_Manager_Data *pd,
4279 Efl_Selection_Type type, Efl_Selection_Format format, 4279 Efl_Ui_Selection_Type type, Efl_Ui_Selection_Format format,
4280 void *data_func_data, Efl_Selection_Data_Ready data_func, 4280 void *data_func_data, Efl_Ui_Selection_Data_Ready data_func,
4281 Eina_Free_Cb data_func_free_cb, 4281 Eina_Free_Cb data_func_free_cb,
4282 Ecore_Win32_Window *win, unsigned int seat) 4282 Ecore_Win32_Window *win, unsigned int seat)
4283{ 4283{
@@ -4286,7 +4286,7 @@ _win32_efl_sel_manager_selection_get(const Efl_Object *request,
4286 void *data; 4286 void *data;
4287 int size; 4287 int size;
4288 4288
4289 if (type != EFL_SELECTION_TYPE_CLIPBOARD) 4289 if (type != EFL_UI_SELECTION_TYPE_CLIPBOARD)
4290 return EINA_FALSE; 4290 return EINA_FALSE;
4291 4291
4292 seat_sel = _sel_manager_seat_selection_init(pd, seat); 4292 seat_sel = _sel_manager_seat_selection_init(pd, seat);
@@ -4306,8 +4306,8 @@ _win32_efl_sel_manager_selection_get(const Efl_Object *request,
4306 if (!data || (size <= 0)) 4306 if (!data || (size <= 0))
4307 goto cb_add; 4307 goto cb_add;
4308 4308
4309 if ((sel->format & EFL_SELECTION_FORMAT_MARKUP) || 4309 if ((sel->format & EFL_UI_SELECTION_FORMAT_MARKUP) ||
4310 (sel->format & EFL_SELECTION_FORMAT_HTML)) 4310 (sel->format & EFL_UI_SELECTION_FORMAT_HTML))
4311 { 4311 {
4312 char *str; 4312 char *str;
4313 4313
@@ -4332,10 +4332,10 @@ _win32_efl_sel_manager_selection_get(const Efl_Object *request,
4332 4332
4333 if (sel->data_func && data && (size > 0)) 4333 if (sel->data_func && data && (size > 0))
4334 { 4334 {
4335 Efl_Selection_Data sdata; 4335 Efl_Ui_Selection_Data sdata;
4336 4336
4337 sdata.pos.x = sdata.pos.y = 0; 4337 sdata.pos.x = sdata.pos.y = 0;
4338 sdata.format = EFL_SELECTION_FORMAT_TEXT; 4338 sdata.format = EFL_UI_SELECTION_FORMAT_TEXT;
4339 sdata.content.mem = data; 4339 sdata.content.mem = data;
4340 sdata.content.len = size; 4340 sdata.content.len = size;
4341 sdata.action = sel->action; 4341 sdata.action = sel->action;
@@ -4363,7 +4363,7 @@ _drop_item_container_cmp(const void *d1, const void *d2)
4363} 4363}
4364 4364
4365static Eina_Bool 4365static Eina_Bool
4366_drop_item_container_del(Efl_Selection_Manager_Data *pd, Efl_Object *cont, Eina_Bool full) 4366_drop_item_container_del(Efl_Ui_Selection_Manager_Data *pd, Efl_Object *cont, Eina_Bool full)
4367{ 4367{
4368 Item_Container_Drop_Info *di; 4368 Item_Container_Drop_Info *di;
4369 4369
@@ -4433,7 +4433,7 @@ _cont_obj_drag_start(void *data)
4433 dc->timer = NULL; 4433 dc->timer = NULL;
4434 efl_event_callback_add(dc->cont, EFL_UI_DND_EVENT_DRAG_DONE, _cont_obj_drag_done_cb, dc); 4434 efl_event_callback_add(dc->cont, EFL_UI_DND_EVENT_DRAG_DONE, _cont_obj_drag_done_cb, dc);
4435 elm_widget_scroll_freeze_push(dc->cont); 4435 elm_widget_scroll_freeze_push(dc->cont);
4436 efl_selection_manager_drag_start(dc->pd->sel_man, dc->cont, dc->format, 4436 efl_ui_selection_manager_drag_start(dc->pd->sel_man, dc->cont, dc->format,
4437 eina_rw_slice_slice_get(dc->data), dc->action, 4437 eina_rw_slice_slice_get(dc->data), dc->action,
4438 dc->icon_func_data, dc->icon_func, dc->icon_func_free_cb, 4438 dc->icon_func_data, dc->icon_func, dc->icon_func_free_cb,
4439 dc->seat); 4439 dc->seat);
@@ -4507,9 +4507,9 @@ _cont_obj_anim_start(void *data)
4507 if (dc->item_get_func) 4507 if (dc->item_get_func)
4508 it = dc->item_get_func(dc->item_get_func_data, dc->cont, dc->down, &posret); 4508 it = dc->item_get_func(dc->item_get_func_data, dc->cont, dc->down, &posret);
4509 dc->timer = NULL; 4509 dc->timer = NULL;
4510 dc->format = EFL_SELECTION_FORMAT_TARGETS; //default 4510 dc->format = EFL_UI_SELECTION_FORMAT_TARGETS; //default
4511 dc->data.len = 0; 4511 dc->data.len = 0;
4512 dc->action = EFL_SELECTION_ACTION_COPY; //default 4512 dc->action = EFL_UI_SELECTION_ACTION_COPY; //default
4513 dc->icons = NULL; 4513 dc->icons = NULL;
4514 4514
4515 //failed to get mouse-down item, abort drag 4515 //failed to get mouse-down item, abort drag
@@ -4671,15 +4671,15 @@ _drag_item_container_cmp(const void *d1, const void *d2)
4671} 4671}
4672//exposed APIs 4672//exposed APIs
4673EOLIAN static Eina_Future * 4673EOLIAN static Eina_Future *
4674_efl_selection_manager_selection_set(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 4674_efl_ui_selection_manager_selection_set(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
4675 Efl_Object *owner, Efl_Selection_Type type, 4675 Efl_Object *owner, Efl_Ui_Selection_Type type,
4676 Efl_Selection_Format format, 4676 Efl_Ui_Selection_Format format,
4677 Eina_Slice data, unsigned int seat) 4677 Eina_Slice data, unsigned int seat)
4678{ 4678{
4679 Eina_Future *p = NULL; 4679 Eina_Future *p = NULL;
4680 4680
4681 sel_debug("owner: %p, seat: %d, type: %d, format: %d", owner, seat, type, format); 4681 sel_debug("owner: %p, seat: %d, type: %d, format: %d", owner, seat, type, format);
4682 if (type > EFL_SELECTION_TYPE_CLIPBOARD) 4682 if (type > EFL_UI_SELECTION_TYPE_CLIPBOARD)
4683 { 4683 {
4684 ERR("Not supported format: %d", type); 4684 ERR("Not supported format: %d", type);
4685 return NULL; 4685 return NULL;
@@ -4711,10 +4711,10 @@ _efl_selection_manager_selection_set(Eo *obj EINA_UNUSED, Efl_Selection_Manager_
4711 4711
4712//TODO: add support for local 4712//TODO: add support for local
4713EOLIAN static void 4713EOLIAN static void
4714_efl_selection_manager_selection_get(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 4714_efl_ui_selection_manager_selection_get(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
4715 const Efl_Object *request, Efl_Selection_Type type, 4715 const Efl_Object *request, Efl_Ui_Selection_Type type,
4716 Efl_Selection_Format format, 4716 Efl_Ui_Selection_Format format,
4717 void *data_func_data, Efl_Selection_Data_Ready data_func, 4717 void *data_func_data, Efl_Ui_Selection_Data_Ready data_func,
4718 Eina_Free_Cb data_func_free_cb, unsigned int seat) 4718 Eina_Free_Cb data_func_free_cb, unsigned int seat)
4719{ 4719{
4720 sel_debug("request: %p, seat: %d, type: %d, format: %d", request, seat, type, format); 4720 sel_debug("request: %p, seat: %d, type: %d, format: %d", request, seat, type, format);
@@ -4745,8 +4745,8 @@ _efl_selection_manager_selection_get(Eo *obj EINA_UNUSED, Efl_Selection_Manager_
4745} 4745}
4746 4746
4747EOLIAN static void 4747EOLIAN static void
4748_efl_selection_manager_selection_clear(Eo *obj, Efl_Selection_Manager_Data *pd, 4748_efl_ui_selection_manager_selection_clear(Eo *obj, Efl_Ui_Selection_Manager_Data *pd,
4749 Efl_Object *owner, Efl_Selection_Type type, unsigned int seat) 4749 Efl_Object *owner, Efl_Ui_Selection_Type type, unsigned int seat)
4750{ 4750{
4751 Eina_Bool local = EINA_FALSE; 4751 Eina_Bool local = EINA_FALSE;
4752 Sel_Manager_Seat_Selection *seat_sel; 4752 Sel_Manager_Seat_Selection *seat_sel;
@@ -4849,8 +4849,8 @@ _efl_selection_manager_selection_clear(Eo *obj, Efl_Selection_Manager_Data *pd,
4849} 4849}
4850 4850
4851EOLIAN static Eina_Bool 4851EOLIAN static Eina_Bool
4852_efl_selection_manager_selection_has_owner(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd EINA_UNUSED, 4852_efl_ui_selection_manager_selection_has_owner(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd EINA_UNUSED,
4853 Efl_Object *request, Efl_Selection_Type type, 4853 Efl_Object *request, Efl_Ui_Selection_Type type,
4854 unsigned int seat) 4854 unsigned int seat)
4855{ 4855{
4856#ifdef HAVE_ELEMENTARY_X 4856#ifdef HAVE_ELEMENTARY_X
@@ -4860,13 +4860,13 @@ _efl_selection_manager_selection_has_owner(Eo *obj EINA_UNUSED, Efl_Selection_Ma
4860 Ecore_X_Atom xtype; 4860 Ecore_X_Atom xtype;
4861 switch (type) 4861 switch (type)
4862 { 4862 {
4863 case EFL_SELECTION_TYPE_PRIMARY: 4863 case EFL_UI_SELECTION_TYPE_PRIMARY:
4864 xtype = ECORE_X_ATOM_SELECTION_PRIMARY; 4864 xtype = ECORE_X_ATOM_SELECTION_PRIMARY;
4865 break; 4865 break;
4866 case EFL_SELECTION_TYPE_SECONDARY: 4866 case EFL_UI_SELECTION_TYPE_SECONDARY:
4867 xtype = ECORE_X_ATOM_SELECTION_SECONDARY; 4867 xtype = ECORE_X_ATOM_SELECTION_SECONDARY;
4868 break; 4868 break;
4869 case EFL_SELECTION_TYPE_DND: 4869 case EFL_UI_SELECTION_TYPE_DND:
4870 xtype = ECORE_X_ATOM_SELECTION_XDND; 4870 xtype = ECORE_X_ATOM_SELECTION_XDND;
4871 break; 4871 break;
4872 default: 4872 default:
@@ -4890,9 +4890,9 @@ _efl_selection_manager_selection_has_owner(Eo *obj EINA_UNUSED, Efl_Selection_Ma
4890} 4890}
4891 4891
4892EOLIAN static void 4892EOLIAN static void
4893_efl_selection_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, 4893_efl_ui_selection_manager_drag_start(Eo *obj, Efl_Ui_Selection_Manager_Data *pd,
4894 Efl_Object *drag_obj, Efl_Selection_Format format, 4894 Efl_Object *drag_obj, Efl_Ui_Selection_Format format,
4895 Eina_Slice data, Efl_Selection_Action action, 4895 Eina_Slice data, Efl_Ui_Selection_Action action,
4896 void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, 4896 void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func,
4897 Eina_Free_Cb icon_func_free_cb, unsigned int seat) 4897 Eina_Free_Cb icon_func_free_cb, unsigned int seat)
4898{ 4898{
@@ -4917,7 +4917,7 @@ _efl_selection_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd,
4917} 4917}
4918 4918
4919EOLIAN static void 4919EOLIAN static void
4920_efl_selection_manager_drag_cancel(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 4920_efl_ui_selection_manager_drag_cancel(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
4921 Efl_Object *drag_obj, unsigned int seat) 4921 Efl_Object *drag_obj, unsigned int seat)
4922{ 4922{
4923 Sel_Manager_Seat_Selection *seat_sel = _sel_manager_seat_selection_init(pd, seat); 4923 Sel_Manager_Seat_Selection *seat_sel = _sel_manager_seat_selection_init(pd, seat);
@@ -4955,8 +4955,8 @@ _efl_selection_manager_drag_cancel(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Da
4955} 4955}
4956 4956
4957EOLIAN static void 4957EOLIAN static void
4958_efl_selection_manager_drag_action_set(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 4958_efl_ui_selection_manager_drag_action_set(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
4959 Efl_Object *drag_obj, Efl_Selection_Action action, 4959 Efl_Object *drag_obj, Efl_Ui_Selection_Action action,
4960 unsigned int seat) 4960 unsigned int seat)
4961{ 4961{
4962 Sel_Manager_Seat_Selection *seat_sel = _sel_manager_seat_selection_init(pd, seat); 4962 Sel_Manager_Seat_Selection *seat_sel = _sel_manager_seat_selection_init(pd, seat);
@@ -4975,8 +4975,8 @@ _efl_selection_manager_drag_action_set(Eo *obj EINA_UNUSED, Efl_Selection_Manage
4975 4975
4976//drop side 4976//drop side
4977EOLIAN static Eina_Bool 4977EOLIAN static Eina_Bool
4978_efl_selection_manager_drop_target_add(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 4978_efl_ui_selection_manager_drop_target_add(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
4979 Efl_Object *target_obj, Efl_Selection_Format format, 4979 Efl_Object *target_obj, Efl_Ui_Selection_Format format,
4980 unsigned int seat) 4980 unsigned int seat)
4981{ 4981{
4982 Eina_Bool ret = EINA_FALSE; 4982 Eina_Bool ret = EINA_FALSE;
@@ -4994,8 +4994,8 @@ _efl_selection_manager_drop_target_add(Eo *obj EINA_UNUSED, Efl_Selection_Manage
4994} 4994}
4995 4995
4996EOLIAN static void 4996EOLIAN static void
4997_efl_selection_manager_drop_target_del(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 4997_efl_ui_selection_manager_drop_target_del(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
4998 Efl_Object *target_obj, Efl_Selection_Format format, 4998 Efl_Object *target_obj, Efl_Ui_Selection_Format format,
4999 unsigned int seat) 4999 unsigned int seat)
5000{ 5000{
5001 Sel_Manager_Dropable *dropable = NULL; 5001 Sel_Manager_Dropable *dropable = NULL;
@@ -5052,8 +5052,8 @@ _efl_selection_manager_drop_target_del(Eo *obj EINA_UNUSED, Efl_Selection_Manage
5052} 5052}
5053 5053
5054EOLIAN static void 5054EOLIAN static void
5055_efl_selection_manager_container_drop_item_add(Eo *obj, Efl_Selection_Manager_Data *pd, 5055_efl_ui_selection_manager_container_drop_item_add(Eo *obj, Efl_Ui_Selection_Manager_Data *pd,
5056 Efl_Object *cont, Efl_Selection_Format format, 5056 Efl_Object *cont, Efl_Ui_Selection_Format format,
5057 void *item_func_data, Efl_Dnd_Item_Get item_func, 5057 void *item_func_data, Efl_Dnd_Item_Get item_func,
5058 Eina_Free_Cb item_func_free_cb EINA_UNUSED, 5058 Eina_Free_Cb item_func_free_cb EINA_UNUSED,
5059 unsigned int seat) 5059 unsigned int seat)
@@ -5091,18 +5091,18 @@ _efl_selection_manager_container_drop_item_add(Eo *obj, Efl_Selection_Manager_Da
5091 dropable->is_container = EINA_TRUE; 5091 dropable->is_container = EINA_TRUE;
5092 dropable->item_func = item_func; 5092 dropable->item_func = item_func;
5093 dropable->item_func_data = item_func_data; 5093 dropable->item_func_data = item_func_data;
5094 _efl_selection_manager_drop_target_add(obj, pd, cont, format, seat); 5094 _efl_ui_selection_manager_drop_target_add(obj, pd, cont, format, seat);
5095} 5095}
5096 5096
5097EOLIAN static void 5097EOLIAN static void
5098_efl_selection_manager_container_drop_item_del(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 5098_efl_ui_selection_manager_container_drop_item_del(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
5099 Efl_Object *cont, unsigned int seat EINA_UNUSED) 5099 Efl_Object *cont, unsigned int seat EINA_UNUSED)
5100{ 5100{
5101 _drop_item_container_del(pd, cont, EINA_TRUE); 5101 _drop_item_container_del(pd, cont, EINA_TRUE);
5102} 5102}
5103 5103
5104EOLIAN static void 5104EOLIAN static void
5105_efl_selection_manager_container_drag_item_add(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 5105_efl_ui_selection_manager_container_drag_item_add(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
5106 Efl_Object *cont, double time_to_drag, double anim_duration, 5106 Efl_Object *cont, double time_to_drag, double anim_duration,
5107 void *data_func_data, Efl_Dnd_Drag_Data_Get data_func, Eina_Free_Cb data_func_free_cb, 5107 void *data_func_data, Efl_Dnd_Drag_Data_Get data_func, Eina_Free_Cb data_func_free_cb,
5108 void *item_get_func_data, Efl_Dnd_Item_Get item_get_func, Eina_Free_Cb item_get_func_free_cb, 5108 void *item_get_func_data, Efl_Dnd_Item_Get item_get_func, Eina_Free_Cb item_get_func_free_cb,
@@ -5144,7 +5144,7 @@ _efl_selection_manager_container_drag_item_add(Eo *obj EINA_UNUSED, Efl_Selectio
5144} 5144}
5145 5145
5146EOLIAN static void 5146EOLIAN static void
5147_efl_selection_manager_container_drag_item_del(Eo *obj EINA_UNUSED, Efl_Selection_Manager_Data *pd, 5147_efl_ui_selection_manager_container_drag_item_del(Eo *obj EINA_UNUSED, Efl_Ui_Selection_Manager_Data *pd,
5148 Efl_Object *cont, unsigned int seat EINA_UNUSED) 5148 Efl_Object *cont, unsigned int seat EINA_UNUSED)
5149{ 5149{
5150 Sel_Manager_Drag_Container *dc = eina_list_search_unsorted(pd->drag_cont_list, 5150 Sel_Manager_Drag_Container *dc = eina_list_search_unsorted(pd->drag_cont_list,
@@ -5154,7 +5154,7 @@ _efl_selection_manager_container_drag_item_del(Eo *obj EINA_UNUSED, Efl_Selectio
5154} 5154}
5155 5155
5156static Eo * 5156static Eo *
5157_efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Data *pd) 5157_efl_ui_selection_manager_efl_object_constructor(Eo *obj, Efl_Ui_Selection_Manager_Data *pd)
5158{ 5158{
5159#if defined(HAVE_ELEMENTARY_X) || defined(HAVE_ELEMENTARY_WL2) 5159#if defined(HAVE_ELEMENTARY_X) || defined(HAVE_ELEMENTARY_WL2)
5160 const char *ev = getenv("ELM_DISPLAY"); 5160 const char *ev = getenv("ELM_DISPLAY");
@@ -5240,7 +5240,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5240 return NULL; 5240 return NULL;
5241 } 5241 }
5242 pd->atom_list[SELECTION_ATOM_TARGETS].name = "TARGETS"; 5242 pd->atom_list[SELECTION_ATOM_TARGETS].name = "TARGETS";
5243 pd->atom_list[SELECTION_ATOM_TARGETS].format = EFL_SELECTION_FORMAT_TARGETS; 5243 pd->atom_list[SELECTION_ATOM_TARGETS].format = EFL_UI_SELECTION_FORMAT_TARGETS;
5244#ifdef HAVE_ELEMENTARY_X 5244#ifdef HAVE_ELEMENTARY_X
5245 pd->atom_list[SELECTION_ATOM_TARGETS].x_converter = _x11_targets_converter; 5245 pd->atom_list[SELECTION_ATOM_TARGETS].x_converter = _x11_targets_converter;
5246#endif 5246#endif
@@ -5248,7 +5248,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5248 pd->atom_list[SELECTION_ATOM_TARGETS].wl_converter = _wl_targets_converter; 5248 pd->atom_list[SELECTION_ATOM_TARGETS].wl_converter = _wl_targets_converter;
5249#endif 5249#endif
5250 pd->atom_list[SELECTION_ATOM_ATOM].name = "ATOM"; // for opera browser 5250 pd->atom_list[SELECTION_ATOM_ATOM].name = "ATOM"; // for opera browser
5251 pd->atom_list[SELECTION_ATOM_ATOM].format = EFL_SELECTION_FORMAT_TARGETS; 5251 pd->atom_list[SELECTION_ATOM_ATOM].format = EFL_UI_SELECTION_FORMAT_TARGETS;
5252#ifdef HAVE_ELEMENTARY_X 5252#ifdef HAVE_ELEMENTARY_X
5253 pd->atom_list[SELECTION_ATOM_ATOM].x_converter = _x11_targets_converter; 5253 pd->atom_list[SELECTION_ATOM_ATOM].x_converter = _x11_targets_converter;
5254#endif 5254#endif
@@ -5257,7 +5257,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5257#endif 5257#endif
5258 5258
5259 pd->atom_list[SELECTION_ATOM_ELM].name = "application/x-elementary-markup"; 5259 pd->atom_list[SELECTION_ATOM_ELM].name = "application/x-elementary-markup";
5260 pd->atom_list[SELECTION_ATOM_ELM].format = EFL_SELECTION_FORMAT_MARKUP; 5260 pd->atom_list[SELECTION_ATOM_ELM].format = EFL_UI_SELECTION_FORMAT_MARKUP;
5261#ifdef HAVE_ELEMENTARY_X 5261#ifdef HAVE_ELEMENTARY_X
5262 pd->atom_list[SELECTION_ATOM_ELM].x_converter = _x11_general_converter; 5262 pd->atom_list[SELECTION_ATOM_ELM].x_converter = _x11_general_converter;
5263 pd->atom_list[SELECTION_ATOM_ELM].x_data_preparer = _x11_data_preparer_markup; 5263 pd->atom_list[SELECTION_ATOM_ELM].x_data_preparer = _x11_data_preparer_markup;
@@ -5268,7 +5268,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5268#endif 5268#endif
5269 5269
5270 pd->atom_list[SELECTION_ATOM_TEXT_URILIST].name = "text/uri-list"; 5270 pd->atom_list[SELECTION_ATOM_TEXT_URILIST].name = "text/uri-list";
5271 pd->atom_list[SELECTION_ATOM_TEXT_URILIST].format = EFL_SELECTION_FORMAT_IMAGE; 5271 pd->atom_list[SELECTION_ATOM_TEXT_URILIST].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5272#ifdef HAVE_ELEMENTARY_X 5272#ifdef HAVE_ELEMENTARY_X
5273 pd->atom_list[SELECTION_ATOM_TEXT_URILIST].x_converter = _x11_general_converter; 5273 pd->atom_list[SELECTION_ATOM_TEXT_URILIST].x_converter = _x11_general_converter;
5274 pd->atom_list[SELECTION_ATOM_TEXT_URILIST].x_data_preparer = _x11_data_preparer_uri; 5274 pd->atom_list[SELECTION_ATOM_TEXT_URILIST].x_data_preparer = _x11_data_preparer_uri;
@@ -5279,7 +5279,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5279#endif 5279#endif
5280 5280
5281 pd->atom_list[SELECTION_ATOM_TEXT_X_VCARD].name = "text/x-vcard"; 5281 pd->atom_list[SELECTION_ATOM_TEXT_X_VCARD].name = "text/x-vcard";
5282 pd->atom_list[SELECTION_ATOM_TEXT_X_VCARD].format = EFL_SELECTION_FORMAT_VCARD; 5282 pd->atom_list[SELECTION_ATOM_TEXT_X_VCARD].format = EFL_UI_SELECTION_FORMAT_VCARD;
5283#ifdef HAVE_ELEMENTARY_X 5283#ifdef HAVE_ELEMENTARY_X
5284 pd->atom_list[SELECTION_ATOM_TEXT_X_VCARD].x_converter = _x11_vcard_send; 5284 pd->atom_list[SELECTION_ATOM_TEXT_X_VCARD].x_converter = _x11_vcard_send;
5285 pd->atom_list[SELECTION_ATOM_TEXT_X_VCARD].x_data_preparer = _x11_data_preparer_vcard; 5285 pd->atom_list[SELECTION_ATOM_TEXT_X_VCARD].x_data_preparer = _x11_data_preparer_vcard;
@@ -5289,7 +5289,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5289#endif 5289#endif
5290 5290
5291 pd->atom_list[SELECTION_ATOM_IMAGE_PNG].name = "image/png"; 5291 pd->atom_list[SELECTION_ATOM_IMAGE_PNG].name = "image/png";
5292 pd->atom_list[SELECTION_ATOM_IMAGE_PNG].format = EFL_SELECTION_FORMAT_IMAGE; 5292 pd->atom_list[SELECTION_ATOM_IMAGE_PNG].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5293#ifdef HAVE_ELEMENTARY_X 5293#ifdef HAVE_ELEMENTARY_X
5294 pd->atom_list[SELECTION_ATOM_IMAGE_PNG].x_converter = _x11_image_converter; 5294 pd->atom_list[SELECTION_ATOM_IMAGE_PNG].x_converter = _x11_image_converter;
5295 pd->atom_list[SELECTION_ATOM_IMAGE_PNG].x_data_preparer = _x11_data_preparer_image; 5295 pd->atom_list[SELECTION_ATOM_IMAGE_PNG].x_data_preparer = _x11_data_preparer_image;
@@ -5299,7 +5299,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5299#endif 5299#endif
5300 5300
5301 pd->atom_list[SELECTION_ATOM_IMAGE_JPEG].name = "image/jpeg"; 5301 pd->atom_list[SELECTION_ATOM_IMAGE_JPEG].name = "image/jpeg";
5302 pd->atom_list[SELECTION_ATOM_IMAGE_JPEG].format = EFL_SELECTION_FORMAT_IMAGE; 5302 pd->atom_list[SELECTION_ATOM_IMAGE_JPEG].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5303#ifdef HAVE_ELEMENTARY_X 5303#ifdef HAVE_ELEMENTARY_X
5304 pd->atom_list[SELECTION_ATOM_IMAGE_JPEG].x_converter = _x11_image_converter; 5304 pd->atom_list[SELECTION_ATOM_IMAGE_JPEG].x_converter = _x11_image_converter;
5305 pd->atom_list[SELECTION_ATOM_IMAGE_JPEG].x_data_preparer = _x11_data_preparer_image; 5305 pd->atom_list[SELECTION_ATOM_IMAGE_JPEG].x_data_preparer = _x11_data_preparer_image;
@@ -5309,7 +5309,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5309#endif 5309#endif
5310 5310
5311 pd->atom_list[SELECTION_ATOM_IMAGE_BMP].name = "image/x-ms-bmp"; 5311 pd->atom_list[SELECTION_ATOM_IMAGE_BMP].name = "image/x-ms-bmp";
5312 pd->atom_list[SELECTION_ATOM_IMAGE_BMP].format = EFL_SELECTION_FORMAT_IMAGE; 5312 pd->atom_list[SELECTION_ATOM_IMAGE_BMP].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5313#ifdef HAVE_ELEMENTARY_X 5313#ifdef HAVE_ELEMENTARY_X
5314 pd->atom_list[SELECTION_ATOM_IMAGE_BMP].x_converter = _x11_image_converter; 5314 pd->atom_list[SELECTION_ATOM_IMAGE_BMP].x_converter = _x11_image_converter;
5315 pd->atom_list[SELECTION_ATOM_IMAGE_BMP].x_data_preparer = _x11_data_preparer_image; 5315 pd->atom_list[SELECTION_ATOM_IMAGE_BMP].x_data_preparer = _x11_data_preparer_image;
@@ -5319,7 +5319,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5319#endif 5319#endif
5320 5320
5321 pd->atom_list[SELECTION_ATOM_IMAGE_GIF].name = "image/gif"; 5321 pd->atom_list[SELECTION_ATOM_IMAGE_GIF].name = "image/gif";
5322 pd->atom_list[SELECTION_ATOM_IMAGE_GIF].format = EFL_SELECTION_FORMAT_IMAGE; 5322 pd->atom_list[SELECTION_ATOM_IMAGE_GIF].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5323#ifdef HAVE_ELEMENTARY_X 5323#ifdef HAVE_ELEMENTARY_X
5324 pd->atom_list[SELECTION_ATOM_IMAGE_GIF].x_converter = _x11_image_converter; 5324 pd->atom_list[SELECTION_ATOM_IMAGE_GIF].x_converter = _x11_image_converter;
5325 pd->atom_list[SELECTION_ATOM_IMAGE_GIF].x_data_preparer = _x11_data_preparer_image; 5325 pd->atom_list[SELECTION_ATOM_IMAGE_GIF].x_data_preparer = _x11_data_preparer_image;
@@ -5329,7 +5329,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5329#endif 5329#endif
5330 5330
5331 pd->atom_list[SELECTION_ATOM_IMAGE_TIFF].name = "image/tiff"; 5331 pd->atom_list[SELECTION_ATOM_IMAGE_TIFF].name = "image/tiff";
5332 pd->atom_list[SELECTION_ATOM_IMAGE_TIFF].format = EFL_SELECTION_FORMAT_IMAGE; 5332 pd->atom_list[SELECTION_ATOM_IMAGE_TIFF].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5333#ifdef HAVE_ELEMENTARY_X 5333#ifdef HAVE_ELEMENTARY_X
5334 pd->atom_list[SELECTION_ATOM_IMAGE_TIFF].x_converter = _x11_image_converter; 5334 pd->atom_list[SELECTION_ATOM_IMAGE_TIFF].x_converter = _x11_image_converter;
5335 pd->atom_list[SELECTION_ATOM_IMAGE_TIFF].x_data_preparer = _x11_data_preparer_image; 5335 pd->atom_list[SELECTION_ATOM_IMAGE_TIFF].x_data_preparer = _x11_data_preparer_image;
@@ -5339,7 +5339,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5339#endif 5339#endif
5340 5340
5341 pd->atom_list[SELECTION_ATOM_IMAGE_SVG].name = "image/svg+xml"; 5341 pd->atom_list[SELECTION_ATOM_IMAGE_SVG].name = "image/svg+xml";
5342 pd->atom_list[SELECTION_ATOM_IMAGE_SVG].format = EFL_SELECTION_FORMAT_IMAGE; 5342 pd->atom_list[SELECTION_ATOM_IMAGE_SVG].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5343#ifdef HAVE_ELEMENTARY_X 5343#ifdef HAVE_ELEMENTARY_X
5344 pd->atom_list[SELECTION_ATOM_IMAGE_SVG].x_converter = _x11_image_converter; 5344 pd->atom_list[SELECTION_ATOM_IMAGE_SVG].x_converter = _x11_image_converter;
5345 pd->atom_list[SELECTION_ATOM_IMAGE_SVG].x_data_preparer = _x11_data_preparer_image; 5345 pd->atom_list[SELECTION_ATOM_IMAGE_SVG].x_data_preparer = _x11_data_preparer_image;
@@ -5349,7 +5349,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5349#endif 5349#endif
5350 5350
5351 pd->atom_list[SELECTION_ATOM_IMAGE_XPM].name = "image/x-xpixmap"; 5351 pd->atom_list[SELECTION_ATOM_IMAGE_XPM].name = "image/x-xpixmap";
5352 pd->atom_list[SELECTION_ATOM_IMAGE_XPM].format = EFL_SELECTION_FORMAT_IMAGE; 5352 pd->atom_list[SELECTION_ATOM_IMAGE_XPM].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5353#ifdef HAVE_ELEMENTARY_X 5353#ifdef HAVE_ELEMENTARY_X
5354 pd->atom_list[SELECTION_ATOM_IMAGE_XPM].x_converter = _x11_image_converter; 5354 pd->atom_list[SELECTION_ATOM_IMAGE_XPM].x_converter = _x11_image_converter;
5355 pd->atom_list[SELECTION_ATOM_IMAGE_XPM].x_data_preparer = _x11_data_preparer_image; 5355 pd->atom_list[SELECTION_ATOM_IMAGE_XPM].x_data_preparer = _x11_data_preparer_image;
@@ -5359,7 +5359,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5359#endif 5359#endif
5360 5360
5361 pd->atom_list[SELECTION_ATOM_IMAGE_TGA].name = "image/x-tga"; 5361 pd->atom_list[SELECTION_ATOM_IMAGE_TGA].name = "image/x-tga";
5362 pd->atom_list[SELECTION_ATOM_IMAGE_TGA].format = EFL_SELECTION_FORMAT_IMAGE; 5362 pd->atom_list[SELECTION_ATOM_IMAGE_TGA].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5363#ifdef HAVE_ELEMENTARY_X 5363#ifdef HAVE_ELEMENTARY_X
5364 pd->atom_list[SELECTION_ATOM_IMAGE_TGA].x_converter = _x11_image_converter; 5364 pd->atom_list[SELECTION_ATOM_IMAGE_TGA].x_converter = _x11_image_converter;
5365 pd->atom_list[SELECTION_ATOM_IMAGE_TGA].x_data_preparer = _x11_data_preparer_image; 5365 pd->atom_list[SELECTION_ATOM_IMAGE_TGA].x_data_preparer = _x11_data_preparer_image;
@@ -5369,7 +5369,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5369#endif 5369#endif
5370 5370
5371 pd->atom_list[SELECTION_ATOM_IMAGE_PPM].name = "image/x-portable-pixmap"; 5371 pd->atom_list[SELECTION_ATOM_IMAGE_PPM].name = "image/x-portable-pixmap";
5372 pd->atom_list[SELECTION_ATOM_IMAGE_PPM].format = EFL_SELECTION_FORMAT_IMAGE; 5372 pd->atom_list[SELECTION_ATOM_IMAGE_PPM].format = EFL_UI_SELECTION_FORMAT_IMAGE;
5373#ifdef HAVE_ELEMENTARY_X 5373#ifdef HAVE_ELEMENTARY_X
5374 pd->atom_list[SELECTION_ATOM_IMAGE_PPM].x_converter = _x11_image_converter; 5374 pd->atom_list[SELECTION_ATOM_IMAGE_PPM].x_converter = _x11_image_converter;
5375 pd->atom_list[SELECTION_ATOM_IMAGE_PPM].x_data_preparer = _x11_data_preparer_image; 5375 pd->atom_list[SELECTION_ATOM_IMAGE_PPM].x_data_preparer = _x11_data_preparer_image;
@@ -5379,7 +5379,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5379#endif 5379#endif
5380 5380
5381 pd->atom_list[SELECTION_ATOM_UTF8STRING].name = "UTF8_STRING"; 5381 pd->atom_list[SELECTION_ATOM_UTF8STRING].name = "UTF8_STRING";
5382 pd->atom_list[SELECTION_ATOM_UTF8STRING].format = EFL_SELECTION_FORMAT_TEXT | EFL_SELECTION_FORMAT_MARKUP | EFL_SELECTION_FORMAT_HTML; 5382 pd->atom_list[SELECTION_ATOM_UTF8STRING].format = EFL_UI_SELECTION_FORMAT_TEXT | EFL_UI_SELECTION_FORMAT_MARKUP | EFL_UI_SELECTION_FORMAT_HTML;
5383#ifdef HAVE_ELEMENTARY_X 5383#ifdef HAVE_ELEMENTARY_X
5384 pd->atom_list[SELECTION_ATOM_UTF8STRING].x_converter = _x11_text_converter; 5384 pd->atom_list[SELECTION_ATOM_UTF8STRING].x_converter = _x11_text_converter;
5385 pd->atom_list[SELECTION_ATOM_UTF8STRING].x_data_preparer = _x11_data_preparer_text; 5385 pd->atom_list[SELECTION_ATOM_UTF8STRING].x_data_preparer = _x11_data_preparer_text;
@@ -5390,7 +5390,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5390#endif 5390#endif
5391 5391
5392 pd->atom_list[SELECTION_ATOM_STRING].name = "STRING"; 5392 pd->atom_list[SELECTION_ATOM_STRING].name = "STRING";
5393 pd->atom_list[SELECTION_ATOM_STRING].format = EFL_SELECTION_FORMAT_TEXT | EFL_SELECTION_FORMAT_MARKUP | EFL_SELECTION_FORMAT_HTML; 5393 pd->atom_list[SELECTION_ATOM_STRING].format = EFL_UI_SELECTION_FORMAT_TEXT | EFL_UI_SELECTION_FORMAT_MARKUP | EFL_UI_SELECTION_FORMAT_HTML;
5394#ifdef HAVE_ELEMENTARY_X 5394#ifdef HAVE_ELEMENTARY_X
5395 pd->atom_list[SELECTION_ATOM_STRING].x_converter = _x11_text_converter; 5395 pd->atom_list[SELECTION_ATOM_STRING].x_converter = _x11_text_converter;
5396 pd->atom_list[SELECTION_ATOM_STRING].x_data_preparer = _x11_data_preparer_text; 5396 pd->atom_list[SELECTION_ATOM_STRING].x_data_preparer = _x11_data_preparer_text;
@@ -5401,7 +5401,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5401#endif 5401#endif
5402 5402
5403 pd->atom_list[SELECTION_ATOM_COMPOUND_TEXT].name = "COMPOUND_TEXT"; 5403 pd->atom_list[SELECTION_ATOM_COMPOUND_TEXT].name = "COMPOUND_TEXT";
5404 pd->atom_list[SELECTION_ATOM_COMPOUND_TEXT].format = EFL_SELECTION_FORMAT_TEXT | EFL_SELECTION_FORMAT_MARKUP | EFL_SELECTION_FORMAT_HTML; 5404 pd->atom_list[SELECTION_ATOM_COMPOUND_TEXT].format = EFL_UI_SELECTION_FORMAT_TEXT | EFL_UI_SELECTION_FORMAT_MARKUP | EFL_UI_SELECTION_FORMAT_HTML;
5405#ifdef HAVE_ELEMENTARY_X 5405#ifdef HAVE_ELEMENTARY_X
5406 pd->atom_list[SELECTION_ATOM_COMPOUND_TEXT].x_converter = _x11_text_converter; 5406 pd->atom_list[SELECTION_ATOM_COMPOUND_TEXT].x_converter = _x11_text_converter;
5407 pd->atom_list[SELECTION_ATOM_COMPOUND_TEXT].x_data_preparer = _x11_data_preparer_text; 5407 pd->atom_list[SELECTION_ATOM_COMPOUND_TEXT].x_data_preparer = _x11_data_preparer_text;
@@ -5412,7 +5412,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5412#endif 5412#endif
5413 5413
5414 pd->atom_list[SELECTION_ATOM_TEXT].name = "TEXT"; 5414 pd->atom_list[SELECTION_ATOM_TEXT].name = "TEXT";
5415 pd->atom_list[SELECTION_ATOM_TEXT].format = EFL_SELECTION_FORMAT_TEXT | EFL_SELECTION_FORMAT_MARKUP | EFL_SELECTION_FORMAT_HTML; 5415 pd->atom_list[SELECTION_ATOM_TEXT].format = EFL_UI_SELECTION_FORMAT_TEXT | EFL_UI_SELECTION_FORMAT_MARKUP | EFL_UI_SELECTION_FORMAT_HTML;
5416#ifdef HAVE_ELEMENTARY_X 5416#ifdef HAVE_ELEMENTARY_X
5417 pd->atom_list[SELECTION_ATOM_TEXT].x_converter = _x11_text_converter; 5417 pd->atom_list[SELECTION_ATOM_TEXT].x_converter = _x11_text_converter;
5418 pd->atom_list[SELECTION_ATOM_TEXT].x_data_preparer = _x11_data_preparer_text; 5418 pd->atom_list[SELECTION_ATOM_TEXT].x_data_preparer = _x11_data_preparer_text;
@@ -5423,7 +5423,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5423#endif 5423#endif
5424 5424
5425 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN_UTF8].name = "text/plain;charset=utf-8"; 5425 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN_UTF8].name = "text/plain;charset=utf-8";
5426 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN_UTF8].format = EFL_SELECTION_FORMAT_TEXT; 5426 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN_UTF8].format = EFL_UI_SELECTION_FORMAT_TEXT;
5427#ifdef HAVE_ELEMENTARY_X 5427#ifdef HAVE_ELEMENTARY_X
5428 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN_UTF8].x_converter = _x11_text_converter; 5428 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN_UTF8].x_converter = _x11_text_converter;
5429 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN_UTF8].x_data_preparer = _x11_data_preparer_text; 5429 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN_UTF8].x_data_preparer = _x11_data_preparer_text;
@@ -5434,7 +5434,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5434#endif 5434#endif
5435 5435
5436 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN].name = "text/plain"; 5436 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN].name = "text/plain";
5437 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN].format = EFL_SELECTION_FORMAT_TEXT; 5437 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN].format = EFL_UI_SELECTION_FORMAT_TEXT;
5438#ifdef HAVE_ELEMENTARY_X 5438#ifdef HAVE_ELEMENTARY_X
5439 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN].x_converter = _x11_text_converter; 5439 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN].x_converter = _x11_text_converter;
5440 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN].x_data_preparer = _x11_data_preparer_text; 5440 pd->atom_list[SELECTION_ATOM_TEXT_PLAIN].x_data_preparer = _x11_data_preparer_text;
@@ -5484,7 +5484,7 @@ _efl_selection_manager_efl_object_constructor(Eo *obj, Efl_Selection_Manager_Dat
5484} 5484}
5485 5485
5486static void 5486static void
5487_efl_selection_manager_efl_object_destructor(Eo *obj, Efl_Selection_Manager_Data *pd) 5487_efl_ui_selection_manager_efl_object_destructor(Eo *obj, Efl_Ui_Selection_Manager_Data *pd)
5488{ 5488{
5489 Sel_Manager_Seat_Selection *seat_sel; 5489 Sel_Manager_Seat_Selection *seat_sel;
5490 Eina_List *l; 5490 Eina_List *l;
@@ -5601,58 +5601,58 @@ _efl_selection_manager_efl_object_destructor(Eo *obj, Efl_Selection_Manager_Data
5601static void 5601static void
5602_set_selection_list(Sel_Manager_Selection *sel_list, Sel_Manager_Seat_Selection *seat_sel) 5602_set_selection_list(Sel_Manager_Selection *sel_list, Sel_Manager_Seat_Selection *seat_sel)
5603{ 5603{
5604 sel_list[EFL_SELECTION_TYPE_PRIMARY].debug = "Primary"; 5604 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].debug = "Primary";
5605 sel_list[EFL_SELECTION_TYPE_PRIMARY].ecore_sel = ECORE_X_SELECTION_PRIMARY; 5605 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].ecore_sel = ECORE_X_SELECTION_PRIMARY;
5606 sel_list[EFL_SELECTION_TYPE_PRIMARY].set = ecore_x_selection_primary_set; 5606 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].set = ecore_x_selection_primary_set;
5607 sel_list[EFL_SELECTION_TYPE_PRIMARY].clear = ecore_x_selection_primary_clear; 5607 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].clear = ecore_x_selection_primary_clear;
5608 sel_list[EFL_SELECTION_TYPE_PRIMARY].request = ecore_x_selection_primary_request; 5608 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].request = ecore_x_selection_primary_request;
5609 sel_list[EFL_SELECTION_TYPE_PRIMARY].seat_sel = seat_sel; 5609 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].seat_sel = seat_sel;
5610 5610
5611 sel_list[EFL_SELECTION_TYPE_SECONDARY].debug = "Secondary"; 5611 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].debug = "Secondary";
5612 sel_list[EFL_SELECTION_TYPE_SECONDARY].ecore_sel = ECORE_X_SELECTION_SECONDARY; 5612 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].ecore_sel = ECORE_X_SELECTION_SECONDARY;
5613 sel_list[EFL_SELECTION_TYPE_SECONDARY].set = ecore_x_selection_secondary_set; 5613 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].set = ecore_x_selection_secondary_set;
5614 sel_list[EFL_SELECTION_TYPE_SECONDARY].clear = ecore_x_selection_secondary_clear; 5614 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].clear = ecore_x_selection_secondary_clear;
5615 sel_list[EFL_SELECTION_TYPE_SECONDARY].request = ecore_x_selection_secondary_request; 5615 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].request = ecore_x_selection_secondary_request;
5616 sel_list[EFL_SELECTION_TYPE_SECONDARY].seat_sel = seat_sel; 5616 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].seat_sel = seat_sel;
5617 5617
5618 sel_list[EFL_SELECTION_TYPE_DND].debug = "DnD"; 5618 sel_list[EFL_UI_SELECTION_TYPE_DND].debug = "DnD";
5619 sel_list[EFL_SELECTION_TYPE_DND].ecore_sel = ECORE_X_SELECTION_PRIMARY; 5619 sel_list[EFL_UI_SELECTION_TYPE_DND].ecore_sel = ECORE_X_SELECTION_PRIMARY;
5620 sel_list[EFL_SELECTION_TYPE_DND].request = ecore_x_selection_xdnd_request; 5620 sel_list[EFL_UI_SELECTION_TYPE_DND].request = ecore_x_selection_xdnd_request;
5621 sel_list[EFL_SELECTION_TYPE_DND].seat_sel = seat_sel; 5621 sel_list[EFL_UI_SELECTION_TYPE_DND].seat_sel = seat_sel;
5622 5622
5623 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].debug = "Clipboard"; 5623 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].debug = "Clipboard";
5624 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].ecore_sel = ECORE_X_SELECTION_CLIPBOARD; 5624 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].ecore_sel = ECORE_X_SELECTION_CLIPBOARD;
5625 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].set = ecore_x_selection_clipboard_set; 5625 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].set = ecore_x_selection_clipboard_set;
5626 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].clear = ecore_x_selection_clipboard_clear; 5626 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].clear = ecore_x_selection_clipboard_clear;
5627 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].request = ecore_x_selection_clipboard_request; 5627 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].request = ecore_x_selection_clipboard_request;
5628 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].seat_sel = seat_sel; 5628 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].seat_sel = seat_sel;
5629} 5629}
5630#endif 5630#endif
5631#ifdef HAVE_ELEMENTARY_WIN32 5631#ifdef HAVE_ELEMENTARY_WIN32
5632static void 5632static void
5633_set_selection_list(Sel_Manager_Selection *sel_list, Sel_Manager_Seat_Selection *seat_sel) 5633_set_selection_list(Sel_Manager_Selection *sel_list, Sel_Manager_Seat_Selection *seat_sel)
5634{ 5634{
5635 sel_list[EFL_SELECTION_TYPE_PRIMARY].debug = "Primary"; 5635 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].debug = "Primary";
5636 sel_list[EFL_SELECTION_TYPE_PRIMARY].ecore_sel = ECORE_WIN32_SELECTION_PRIMARY; 5636 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].ecore_sel = ECORE_WIN32_SELECTION_PRIMARY;
5637 sel_list[EFL_SELECTION_TYPE_PRIMARY].set = ecore_win32_clipboard_set; 5637 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].set = ecore_win32_clipboard_set;
5638 sel_list[EFL_SELECTION_TYPE_PRIMARY].clear = ecore_win32_clipboard_clear; 5638 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].clear = ecore_win32_clipboard_clear;
5639 sel_list[EFL_SELECTION_TYPE_PRIMARY].get = ecore_win32_clipboard_get; 5639 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].get = ecore_win32_clipboard_get;
5640 sel_list[EFL_SELECTION_TYPE_PRIMARY].seat_sel = seat_sel; 5640 sel_list[EFL_UI_SELECTION_TYPE_PRIMARY].seat_sel = seat_sel;
5641 5641
5642 sel_list[EFL_SELECTION_TYPE_SECONDARY].debug = "Secondary"; 5642 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].debug = "Secondary";
5643 sel_list[EFL_SELECTION_TYPE_SECONDARY].ecore_sel = ECORE_WIN32_SELECTION_OTHER; 5643 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].ecore_sel = ECORE_WIN32_SELECTION_OTHER;
5644 sel_list[EFL_SELECTION_TYPE_SECONDARY].seat_sel = seat_sel; 5644 sel_list[EFL_UI_SELECTION_TYPE_SECONDARY].seat_sel = seat_sel;
5645 5645
5646 sel_list[EFL_SELECTION_TYPE_DND].debug = "DnD"; 5646 sel_list[EFL_UI_SELECTION_TYPE_DND].debug = "DnD";
5647 sel_list[EFL_SELECTION_TYPE_DND].ecore_sel = ECORE_WIN32_SELECTION_OTHER; 5647 sel_list[EFL_UI_SELECTION_TYPE_DND].ecore_sel = ECORE_WIN32_SELECTION_OTHER;
5648 sel_list[EFL_SELECTION_TYPE_DND].seat_sel = seat_sel; 5648 sel_list[EFL_UI_SELECTION_TYPE_DND].seat_sel = seat_sel;
5649 5649
5650 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].debug = "Clipboard"; 5650 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].debug = "Clipboard";
5651 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].ecore_sel = ECORE_WIN32_SELECTION_CLIPBOARD; 5651 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].ecore_sel = ECORE_WIN32_SELECTION_CLIPBOARD;
5652 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].set = ecore_win32_clipboard_set; 5652 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].set = ecore_win32_clipboard_set;
5653 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].clear = ecore_win32_clipboard_clear; 5653 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].clear = ecore_win32_clipboard_clear;
5654 sel_list[EFL_SELECTION_TYPE_CLIPBOARD].seat_sel = seat_sel; 5654 sel_list[EFL_UI_SELECTION_TYPE_CLIPBOARD].seat_sel = seat_sel;
5655} 5655}
5656#endif 5656#endif
5657 5657
5658#include "efl_selection_manager.eo.c" 5658#include "efl_ui_selection_manager.eo.c"
diff --git a/src/lib/elementary/efl_selection_manager.eo b/src/lib/elementary/efl_ui_selection_manager.eo
index 00914e53ba..893630aa3a 100644
--- a/src/lib/elementary/efl_selection_manager.eo
+++ b/src/lib/elementary/efl_ui_selection_manager.eo
@@ -1,13 +1,13 @@
1import efl_ui_dnd_types; 1import efl_ui_dnd_types;
2 2
3class Efl.Selection_Manager (Efl.Object) { 3class Efl.Ui.Selection_Manager (Efl.Object) {
4 methods { 4 methods {
5 selection_set @beta { 5 selection_set @beta {
6 [[Set selection]] 6 [[Set selection]]
7 params { 7 params {
8 @in owner: Efl.Object; [[Seleciton owner]] 8 @in owner: Efl.Object; [[Seleciton owner]]
9 @in type: Efl.Selection_Type; [[Selection type]] 9 @in type: Efl.Ui.Selection_Type; [[Selection type]]
10 @in format: Efl.Selection_Format; [[Selection format]] 10 @in format: Efl.Ui.Selection_Format; [[Selection format]]
11 @in data: Eina.Slice; [[Selection data]] 11 @in data: Eina.Slice; [[Selection data]]
12 @in seat: uint @optional;[[Specified seat for multiple seats case.]] 12 @in seat: uint @optional;[[Specified seat for multiple seats case.]]
13 } 13 }
@@ -17,16 +17,16 @@ class Efl.Selection_Manager (Efl.Object) {
17 [[Get selection]] 17 [[Get selection]]
18 params { 18 params {
19 @in request: const(Efl.Object); [[Seleciton owner]] 19 @in request: const(Efl.Object); [[Seleciton owner]]
20 @in type: Efl.Selection_Type; [[Selection type]] 20 @in type: Efl.Ui.Selection_Type; [[Selection type]]
21 @in format: Efl.Selection_Format; [[Selection Format]] 21 @in format: Efl.Ui.Selection_Format; [[Selection Format]]
22 @in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]] 22 @in data_func: Efl.Ui.Selection_Data_Ready; [[Data ready function pointer]]
23 @in seat: uint @optional;[[Specified seat for multiple seats case.]] 23 @in seat: uint @optional;[[Specified seat for multiple seats case.]]
24 } 24 }
25 } 25 }
26 selection_clear @beta { 26 selection_clear @beta {
27 params { 27 params {
28 @in owner: Efl.Object; [[Seleciton owner]] 28 @in owner: Efl.Object; [[Seleciton owner]]
29 @in type: Efl.Selection_Type; [[Selection type]] 29 @in type: Efl.Ui.Selection_Type; [[Selection type]]
30 @in seat: uint @optional; [[Specified seat for multiple seats case.]] 30 @in seat: uint @optional; [[Specified seat for multiple seats case.]]
31 } 31 }
32 } 32 }
@@ -34,7 +34,7 @@ class Efl.Selection_Manager (Efl.Object) {
34 [[Check if the request object has selection or not]] 34 [[Check if the request object has selection or not]]
35 params { 35 params {
36 @in request: Efl.Object; [[Request object]] 36 @in request: Efl.Object; [[Request object]]
37 @in type: Efl.Selection_Type; [[Selection type]] 37 @in type: Efl.Ui.Selection_Type; [[Selection type]]
38 @in seat: uint @optional; [[Specified seat for multiple seats case.]] 38 @in seat: uint @optional; [[Specified seat for multiple seats case.]]
39 } 39 }
40 return: bool; [[EINA_TRUE if the request object has selection, otherwise, EINA_FALSE]] 40 return: bool; [[EINA_TRUE if the request object has selection, otherwise, EINA_FALSE]]
@@ -48,9 +48,9 @@ class Efl.Selection_Manager (Efl.Object) {
48 ]] 48 ]]
49 params { 49 params {
50 @in drag_obj: Efl.Object; [[Drag object]] 50 @in drag_obj: Efl.Object; [[Drag object]]
51 @in format: Efl.Selection_Format; [[Data format]] 51 @in format: Efl.Ui.Selection_Format; [[Data format]]
52 @in data: Eina.Slice; [[Data to transfer]] 52 @in data: Eina.Slice; [[Data to transfer]]
53 @in action: Efl.Selection_Action; [[Action when data is transferred]] 53 @in action: Efl.Ui.Selection_Action; [[Action when data is transferred]]
54 @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]] 54 @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
55 @in seat: uint; [[Specified seat for multiple seats case.]] 55 @in seat: uint; [[Specified seat for multiple seats case.]]
56 } 56 }
@@ -59,7 +59,7 @@ class Efl.Selection_Manager (Efl.Object) {
59 [[This sets the action for the drag]] 59 [[This sets the action for the drag]]
60 params { 60 params {
61 @in drag_obj: Efl.Object; [[Drag object]] 61 @in drag_obj: Efl.Object; [[Drag object]]
62 @in action: Efl.Selection_Action; [[Drag action]] 62 @in action: Efl.Ui.Selection_Action; [[Drag action]]
63 @in seat: uint; [[Specified seat for multiple seats case.]] 63 @in seat: uint; [[Specified seat for multiple seats case.]]
64 } 64 }
65 } 65 }
@@ -102,7 +102,7 @@ class Efl.Selection_Manager (Efl.Object) {
102 - EFL_UI_DND_DROP_DRAG_DROP.]] 102 - EFL_UI_DND_DROP_DRAG_DROP.]]
103 params { 103 params {
104 @in target_obj: Efl.Object; [[Drop target]] 104 @in target_obj: Efl.Object; [[Drop target]]
105 @in format: Efl.Selection_Format; [[Accepted data format]] 105 @in format: Efl.Ui.Selection_Format; [[Accepted data format]]
106 @in seat: uint; [[Specified seat for multiple seats case.]] 106 @in seat: uint; [[Specified seat for multiple seats case.]]
107 } 107 }
108 return: bool; [[$true on success, $false otherwise]] 108 return: bool; [[$true on success, $false otherwise]]
@@ -111,7 +111,7 @@ class Efl.Selection_Manager (Efl.Object) {
111 [[Remove a dropable target]] 111 [[Remove a dropable target]]
112 params { 112 params {
113 @in target_obj: Efl.Object; [[Drop target]] 113 @in target_obj: Efl.Object; [[Drop target]]
114 @in format: Efl.Selection_Format; [[Accepted data format]] 114 @in format: Efl.Ui.Selection_Format; [[Accepted data format]]
115 @in seat: uint; [[Specified seat for multiple seats case.]] 115 @in seat: uint; [[Specified seat for multiple seats case.]]
116 } 116 }
117 } 117 }
@@ -119,7 +119,7 @@ class Efl.Selection_Manager (Efl.Object) {
119 [[Add dropable target for a container in which items can drop to it]] 119 [[Add dropable target for a container in which items can drop to it]]
120 params { 120 params {
121 @in cont: Efl.Object; [[Container object]] 121 @in cont: Efl.Object; [[Container object]]
122 @in format: Efl.Selection_Format; [[Accepted data formats]] 122 @in format: Efl.Ui.Selection_Format; [[Accepted data formats]]
123 @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]] 123 @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
124 @in seat: uint; [[Specified seat for multiple seats case.]] 124 @in seat: uint; [[Specified seat for multiple seats case.]]
125 } 125 }
diff --git a/src/lib/elementary/efl_selection_manager_private.h b/src/lib/elementary/efl_ui_selection_manager_private.h
index f6cec6dd3f..02ea7c1b8c 100644
--- a/src/lib/elementary/efl_selection_manager_private.h
+++ b/src/lib/elementary/efl_ui_selection_manager_private.h
@@ -1,5 +1,5 @@
1#ifndef EFL_SELECTION_MANAGER_PRIVATE_H 1#ifndef EFL_UI_SELECTION_MANAGER_PRIVATE_H
2#define EFL_SELECTION_MANAGER_PRIVATE_H 2#define EFL_UI_SELECTION_MANAGER_PRIVATE_H
3 3
4#ifdef HAVE_CONFIG_H 4#ifdef HAVE_CONFIG_H
5# include "elementary_config.h" 5# include "elementary_config.h"
@@ -35,7 +35,7 @@ enum
35 SELECTION_N_ATOMS, 35 SELECTION_N_ATOMS,
36}; 36};
37 37
38typedef struct _Efl_Selection_Manager_Data Efl_Selection_Manager_Data; 38typedef struct _Efl_Ui_Selection_Manager_Data Efl_Ui_Selection_Manager_Data;
39typedef struct _Sel_Manager_Seat_Selection Sel_Manager_Seat_Selection; 39typedef struct _Sel_Manager_Seat_Selection Sel_Manager_Seat_Selection;
40typedef struct _Sel_Manager_Atom Sel_Manager_Atom; 40typedef struct _Sel_Manager_Atom Sel_Manager_Atom;
41typedef struct _Sel_Manager_Dropable Sel_Manager_Dropable; 41typedef struct _Sel_Manager_Dropable Sel_Manager_Dropable;
@@ -51,7 +51,7 @@ typedef struct _Saved_Type Saved_Type;
51#ifdef HAVE_ELEMENTARY_X 51#ifdef HAVE_ELEMENTARY_X
52typedef Eina_Bool (*X11_Converter_Fn_Cb) (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); 52typedef Eina_Bool (*X11_Converter_Fn_Cb) (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
53typedef int (*X11_Response_Handler_Cb) (Sel_Manager_Selection *sel, Ecore_X_Event_Selection_Notify *); 53typedef int (*X11_Response_Handler_Cb) (Sel_Manager_Selection *sel, Ecore_X_Event_Selection_Notify *);
54typedef Eina_Bool (*X11_Data_Preparer_Cb) (Sel_Manager_Seat_Selection *seat_sel, Ecore_X_Event_Selection_Notify *, Efl_Selection_Data *, Tmp_Info **); 54typedef Eina_Bool (*X11_Data_Preparer_Cb) (Sel_Manager_Seat_Selection *seat_sel, Ecore_X_Event_Selection_Notify *, Efl_Ui_Selection_Data *, Tmp_Info **);
55#endif 55#endif
56#ifdef HAVE_ELEMENTARY_WL2 56#ifdef HAVE_ELEMENTARY_WL2
57typedef Eina_Bool (*Wl_Converter_Fn_Cb) (char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret); 57typedef Eina_Bool (*Wl_Converter_Fn_Cb) (char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret);
@@ -59,12 +59,12 @@ static Eina_Bool _wl_targets_converter(char *target, Sel_Manager_Selection *sel,
59static Eina_Bool _wl_general_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret); 59static Eina_Bool _wl_general_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret);
60static Eina_Bool _wl_text_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret); 60static Eina_Bool _wl_text_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret);
61 61
62typedef Eina_Bool (*Wl_Data_Preparer_Cb) (Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info); 62typedef Eina_Bool (*Wl_Data_Preparer_Cb) (Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info);
63static Eina_Bool _wl_data_preparer_markup(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info); 63static Eina_Bool _wl_data_preparer_markup(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info);
64static Eina_Bool _wl_data_preparer_uri(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info); 64static Eina_Bool _wl_data_preparer_uri(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info);
65static Eina_Bool _wl_data_preparer_vcard(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info); 65static Eina_Bool _wl_data_preparer_vcard(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info);
66static Eina_Bool _wl_data_preparer_image(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info); 66static Eina_Bool _wl_data_preparer_image(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info);
67static Eina_Bool _wl_data_preparer_text(Sel_Manager_Selection *sel, Efl_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info); 67static Eina_Bool _wl_data_preparer_text(Sel_Manager_Selection *sel, Efl_Ui_Selection_Data *ddata, Ecore_Wl2_Event_Offer_Data_Ready *ev, Tmp_Info **tmp_info);
68#endif 68#endif
69 69
70 70
@@ -89,7 +89,7 @@ struct _Sel_Manager_Selection
89{ 89{
90 const char *debug; 90 const char *debug;
91 Eina_Rw_Slice data; 91 Eina_Rw_Slice data;
92 Efl_Selection_Format request_format; 92 Efl_Ui_Selection_Format request_format;
93#ifdef HAVE_ELEMENTARY_X 93#ifdef HAVE_ELEMENTARY_X
94 Eina_Bool (*set) (Ecore_X_Window, const void *data, int size); 94 Eina_Bool (*set) (Ecore_X_Window, const void *data, int size);
95 Eina_Bool (*clear) (void); 95 Eina_Bool (*clear) (void);
@@ -118,9 +118,9 @@ struct _Sel_Manager_Selection
118 Ecore_Win32_Window *win; 118 Ecore_Win32_Window *win;
119#endif 119#endif
120 120
121 Efl_Selection_Format want_format; 121 Efl_Ui_Selection_Format want_format;
122 Efl_Selection_Format format; 122 Efl_Ui_Selection_Format format;
123 Efl_Selection_Action action; 123 Efl_Ui_Selection_Action action;
124 Eina_Bool active : 1; 124 Eina_Bool active : 1;
125 125
126 unsigned char asked : 2; 126 unsigned char asked : 2;
@@ -128,7 +128,7 @@ struct _Sel_Manager_Selection
128 Efl_Object *owner; 128 Efl_Object *owner;
129 Efl_Object *request_obj; 129 Efl_Object *request_obj;
130 void *data_func_data; 130 void *data_func_data;
131 Efl_Selection_Data_Ready data_func; 131 Efl_Ui_Selection_Data_Ready data_func;
132 Eina_Free_Cb data_func_free_cb; 132 Eina_Free_Cb data_func_free_cb;
133 133
134 Sel_Manager_Seat_Selection *seat_sel; 134 Sel_Manager_Seat_Selection *seat_sel;
@@ -140,7 +140,7 @@ struct _Sel_Manager_Selection_Lost
140{ 140{
141 Efl_Object *request; 141 Efl_Object *request;
142 Eina_Promise *promise; 142 Eina_Promise *promise;
143 Efl_Selection_Type type; 143 Efl_Ui_Selection_Type type;
144 Sel_Manager_Seat_Selection *seat_sel; 144 Sel_Manager_Seat_Selection *seat_sel;
145}; 145};
146 146
@@ -163,7 +163,7 @@ struct _Sel_Manager_Seat_Selection
163 Eina_List *sel_lost_list; 163 Eina_List *sel_lost_list;
164 //drag 164 //drag
165 Eo *drag_obj; 165 Eo *drag_obj;
166 Efl_Selection_Action drag_action; 166 Efl_Ui_Selection_Action drag_action;
167 Eo *drag_win; 167 Eo *drag_win;
168 Ecore_Event_Handler *mouse_up_handler, *dnd_status_handler; 168 Ecore_Event_Handler *mouse_up_handler, *dnd_status_handler;
169 Eina_Bool accept; 169 Eina_Bool accept;
@@ -171,7 +171,7 @@ struct _Sel_Manager_Seat_Selection
171 Eina_Position2D drag_pos; 171 Eina_Position2D drag_pos;
172 Eina_Position2D drag_win_start; 172 Eina_Position2D drag_win_start;
173 Eina_Position2D drag_win_end; 173 Eina_Position2D drag_win_end;
174 Efl_Selection_Type active_type; 174 Efl_Ui_Selection_Type active_type;
175 175
176 Saved_Type *saved_types; 176 Saved_Type *saved_types;
177 Ecore_Event_Handler *enter_handler; 177 Ecore_Event_Handler *enter_handler;
@@ -179,7 +179,7 @@ struct _Sel_Manager_Seat_Selection
179 Ecore_Event_Handler *pos_handler; 179 Ecore_Event_Handler *pos_handler;
180 Ecore_Event_Handler *drop_handler; 180 Ecore_Event_Handler *drop_handler;
181 181
182 Efl_Selection_Manager_Data *pd; 182 Efl_Ui_Selection_Manager_Data *pd;
183}; 183};
184 184
185struct _Anim_Icon 185struct _Anim_Icon
@@ -192,9 +192,9 @@ struct _Sel_Manager_Drag_Container
192{ 192{
193 Evas *e; 193 Evas *e;
194 Efl_Object *cont; 194 Efl_Object *cont;
195 Efl_Selection_Format format; 195 Efl_Ui_Selection_Format format;
196 Eina_Rw_Slice data; 196 Eina_Rw_Slice data;
197 Efl_Selection_Action action; 197 Efl_Ui_Selection_Action action;
198 Eina_List *icons; 198 Eina_List *icons;
199 Eina_Size2D final_icon; 199 Eina_Size2D final_icon;
200 Eina_Position2D down; 200 Eina_Position2D down;
@@ -216,13 +216,13 @@ struct _Sel_Manager_Drag_Container
216 Eina_Free_Cb icon_list_func_free_cb; 216 Eina_Free_Cb icon_list_func_free_cb;
217 unsigned int seat; 217 unsigned int seat;
218 218
219 Efl_Selection_Manager_Data *pd; 219 Efl_Ui_Selection_Manager_Data *pd;
220}; 220};
221 221
222struct _Sel_Manager_Atom 222struct _Sel_Manager_Atom
223{ 223{
224 const char *name; 224 const char *name;
225 Efl_Selection_Format format; 225 Efl_Ui_Selection_Format format;
226#ifdef HAVE_ELEMENTARY_X 226#ifdef HAVE_ELEMENTARY_X
227 // Called by ecore to do conversion 227 // Called by ecore to do conversion
228 X11_Converter_Fn_Cb x_converter; 228 X11_Converter_Fn_Cb x_converter;
@@ -241,7 +241,7 @@ struct _Sel_Manager_Atom
241struct _Drop_Format 241struct _Drop_Format
242{ 242{
243 EINA_INLIST; 243 EINA_INLIST;
244 Efl_Selection_Format format; 244 Efl_Ui_Selection_Format format;
245}; 245};
246 246
247struct _Sel_Manager_Dropable 247struct _Sel_Manager_Dropable
@@ -253,7 +253,7 @@ struct _Sel_Manager_Dropable
253 Eina_Position2D pos; 253 Eina_Position2D pos;
254 Eina_Bool in : 1; 254 Eina_Bool in : 1;
255 const char *type; 255 const char *type;
256 Efl_Selection_Format format; 256 Efl_Ui_Selection_Format format;
257 } last; 257 } last;
258 258
259 //for container 259 //for container
@@ -272,7 +272,7 @@ struct _Item_Container_Drop_Info
272#ifdef HAVE_ELEMENTARY_WL2 272#ifdef HAVE_ELEMENTARY_WL2
273typedef struct _Wl_Format_Translation 273typedef struct _Wl_Format_Translation
274{ 274{
275 Efl_Selection_Format format; 275 Efl_Ui_Selection_Format format;
276 char **translates; 276 char **translates;
277} Sel_Manager_Wl_Format_Translation; 277} Sel_Manager_Wl_Format_Translation;
278 278
@@ -283,16 +283,16 @@ char *sm_wl_vcard[] = {"text/x-vcard", NULL};
283char *sm_wl_image[] = {"image/", "text/uri-list", NULL}; 283char *sm_wl_image[] = {"image/", "text/uri-list", NULL};
284 284
285Sel_Manager_Wl_Format_Translation sm_wl_convertion[] = { 285Sel_Manager_Wl_Format_Translation sm_wl_convertion[] = {
286 {EFL_SELECTION_FORMAT_MARKUP | EFL_SELECTION_FORMAT_TEXT, sm_wl_markup}, 286 {EFL_UI_SELECTION_FORMAT_MARKUP | EFL_UI_SELECTION_FORMAT_TEXT, sm_wl_markup},
287 {EFL_SELECTION_FORMAT_TEXT, sm_wl_text}, 287 {EFL_UI_SELECTION_FORMAT_TEXT, sm_wl_text},
288 {EFL_SELECTION_FORMAT_HTML, sm_wl_html}, 288 {EFL_UI_SELECTION_FORMAT_HTML, sm_wl_html},
289 {EFL_SELECTION_FORMAT_VCARD, sm_wl_vcard}, 289 {EFL_UI_SELECTION_FORMAT_VCARD, sm_wl_vcard},
290 {EFL_SELECTION_FORMAT_IMAGE, sm_wl_image}, 290 {EFL_UI_SELECTION_FORMAT_IMAGE, sm_wl_image},
291 {EFL_SELECTION_FORMAT_NONE, NULL}, 291 {EFL_UI_SELECTION_FORMAT_NONE, NULL},
292}; 292};
293</