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
This commit is contained in:
Cedric BAIL 2018-12-21 13:46:06 -08:00
parent 28c4380eaa
commit 327593e9b4
20 changed files with 529 additions and 529 deletions

View File

@ -119,7 +119,7 @@ elm_public_eolian_files = \
lib/elementary/efl_ui_theme.eo \
lib/elementary/efl_config_global.eo \
lib/elementary/elm_code_widget.eo \
lib/elementary/efl_selection.eo \
lib/elementary/efl_ui_selection.eo \
lib/elementary/efl_ui_dnd.eo \
lib/elementary/efl_ui_dnd_container.eo \
lib/elementary/efl_ui_focus_manager_window_root.eo \
@ -172,7 +172,7 @@ elm_private_eolian_files = \
lib/elementary/efl_ui_model_state.eo \
tests/elementary/focus_test.eo \
tests/elementary/focus_test_sub_main.eo \
lib/elementary/efl_selection_manager.eo \
lib/elementary/efl_ui_selection_manager.eo \
lib/elementary/efl_datetime_manager.eo \
$(NULL)
@ -291,7 +291,7 @@ elm_eolian_type_files = \
lib/elementary/elm_general.eot \
lib/elementary/efl_ui.eot \
lib/elementary/efl_ui_list_view_types.eot \
lib/elementary/efl_selection_types.eot \
lib/elementary/efl_ui_selection_types.eot \
lib/elementary/efl_ui_dnd_types.eot
elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c)
@ -865,9 +865,9 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/efl_ui_scroller.c \
lib/elementary/efl_ui_scroll_manager.c \
lib/elementary/efl_ui_pan.c \
lib/elementary/efl_selection_manager.c \
lib/elementary/efl_selection_manager_private.h \
lib/elementary/efl_selection.c \
lib/elementary/efl_ui_selection_manager.c \
lib/elementary/efl_ui_selection_manager_private.h \
lib/elementary/efl_ui_selection.c \
lib/elementary/efl_datetime_manager.c \
lib/elementary/efl_ui_dnd.c \
lib/elementary/elm_focus_legacy.c \

View File

@ -145,7 +145,7 @@ extern EAPI double _efl_startup_time;
// EO types. Defined for legacy-only builds as legacy uses typedef of EO types.
#include "efl_ui.eot.h"
#include "efl_selection_types.eot.h"
#include "efl_ui_selection_types.eot.h"
//define focus manager earlier since focus object and manager is circular
typedef Eo Efl_Ui_Focus_Manager;

View File

@ -280,7 +280,7 @@ typedef Eo Efl_Ui_Focus_Manager;
#include <elm_win.h>
#ifdef EFL_EO_API_SUPPORT
# include <efl_selection_types.eot.h>
# include <efl_ui_selection_types.eot.h>
# include <efl_ui_theme.eo.h>
# include <efl_config_global.eo.h>
# include <efl_ui_widget.eo.h>
@ -351,7 +351,7 @@ typedef Eo Efl_Ui_Focus_Manager;
# include <efl_ui_scroll_manager.eo.h>
# include <efl_ui_scroller.eo.h>
# include <efl_ui_dnd_types.eot.h>
# include <efl_selection.eo.h>
# include <efl_ui_selection.eo.h>
# include <efl_ui_dnd.eo.h>
# include <efl_ui_dnd_container.eo.h>
# include <efl_ui_navigation_bar.eo.h>

View File

@ -7,7 +7,7 @@
#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
#define ELM_LAYOUT_PROTECTED
#define EFL_SELECTION_MANAGER_BETA
#define EFL_UI_SELECTION_MANAGER_BETA
#include <Elementary.h>
#include <Elementary_Cursor.h>
@ -29,7 +29,7 @@ _efl_ui_selection_manager_get(Eo *obj)
Eo *sel_man = efl_key_data_get(app, "__selection_manager");
if (!sel_man)
{
sel_man = efl_add(EFL_SELECTION_MANAGER_CLASS, app);
sel_man = efl_add(EFL_UI_SELECTION_MANAGER_CLASS, app);
efl_key_data_set(app, "__selection_manager", sel_man);
}
return sel_man;
@ -45,12 +45,12 @@ _efl_ui_dnd_shutdown(void)
}
EOLIAN static void
_efl_ui_dnd_drag_start(Eo *obj, void *pd EINA_UNUSED, 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,
_efl_ui_dnd_drag_start(Eo *obj, void *pd EINA_UNUSED, 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)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_drag_start(sel_man, obj, format, data, action,
efl_ui_selection_manager_drag_start(sel_man, obj, format, data, action,
icon_func_data, icon_func, icon_func_free_cb,
seat);
}
@ -59,29 +59,29 @@ EOLIAN static void
_efl_ui_dnd_drag_cancel(Eo *obj, void *pd EINA_UNUSED, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_drag_cancel(sel_man, obj, seat);
efl_ui_selection_manager_drag_cancel(sel_man, obj, seat);
}
EOLIAN static void
_efl_ui_dnd_drag_action_set(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Action action, unsigned int seat)
_efl_ui_dnd_drag_action_set(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Action action, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_drag_action_set(sel_man, obj, action, seat);
efl_ui_selection_manager_drag_action_set(sel_man, obj, action, seat);
}
EOLIAN static void
_efl_ui_dnd_drop_target_add(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Format format, unsigned int seat)
_efl_ui_dnd_drop_target_add(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Format format, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_drop_target_add(sel_man, obj, format, seat);
efl_ui_selection_manager_drop_target_add(sel_man, obj, format, seat);
}
EOLIAN static void
_efl_ui_dnd_drop_target_del(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Format format, unsigned int seat)
_efl_ui_dnd_drop_target_del(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Format format, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_drop_target_del(sel_man, obj, format, seat);
efl_ui_selection_manager_drop_target_del(sel_man, obj, format, seat);
}
EOLIAN static double
@ -107,7 +107,7 @@ _efl_ui_dnd_container_drag_item_add(Eo *obj, Efl_Ui_Dnd_Container_Data *pd,
double drag_delay_time = pd->drag_delay_time;
double anim_time = elm_config_drag_anim_duration_get();
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_container_drag_item_add(sel_man, obj, drag_delay_time, anim_time,
efl_ui_selection_manager_container_drag_item_add(sel_man, obj, drag_delay_time, anim_time,
data_func_data, data_func, data_func_free_cb,
item_func_data, item_func, item_func_free_cb,
icon_func_data, icon_func, icon_func_free_cb,
@ -119,23 +119,23 @@ static void
_efl_ui_dnd_container_drag_item_del(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_container_drag_item_del(sel_man, obj, seat);
efl_ui_selection_manager_container_drag_item_del(sel_man, obj, seat);
}
EOLIAN static void
_efl_ui_dnd_container_drop_item_add(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED,
Efl_Selection_Format format,
Efl_Ui_Selection_Format format,
void *item_func_data, Efl_Dnd_Item_Get item_func, Eina_Free_Cb item_func_free_cb,
unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_container_drop_item_add(sel_man, obj, format, item_func_data, item_func, item_func_free_cb, seat);
efl_ui_selection_manager_container_drop_item_add(sel_man, obj, format, item_func_data, item_func, item_func_free_cb, seat);
}
EOLIAN static void
_efl_ui_dnd_container_drop_item_del(Eo *obj, Efl_Ui_Dnd_Container_Data *pd EINA_UNUSED, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_container_drop_item_del(sel_man, obj, seat);
efl_ui_selection_manager_container_drop_item_del(sel_man, obj, seat);
}
@ -288,7 +288,7 @@ static void
_dnd_drop_cb(void *data, const Efl_Event *event)
{
Dnd_Drop *drop = data;
Efl_Selection_Data *org_ddata = event->info;
Efl_Ui_Selection_Data *org_ddata = event->info;
Elm_Selection_Data ddata;
ddata.x = org_ddata->pos.x;
@ -344,8 +344,8 @@ elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
ic->icon_data = icon_create_data;
ic->icon_cb = icon_create_cb;
efl_selection_manager_drag_start(sel_man, obj, (Efl_Selection_Format)format, sl,
(Efl_Selection_Action)action,
efl_ui_selection_manager_drag_start(sel_man, obj, (Efl_Ui_Selection_Format)format, sl,
(Efl_Ui_Selection_Action)action,
ic, _dnd_icon_create_cb, NULL, seatid);
return EINA_TRUE;
@ -368,7 +368,7 @@ elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action)
#ifdef HAVE_ELEMENTARY_WL2
seatid = _wl_default_seat_id_get(obj);
#endif
efl_selection_manager_drag_action_set(sel_man, obj, (Efl_Selection_Action)action, seatid);
efl_ui_selection_manager_drag_action_set(sel_man, obj, (Efl_Ui_Selection_Action)action, seatid);
return EINA_TRUE;
}
@ -383,7 +383,7 @@ elm_drag_cancel(Evas_Object *obj)
seatid = _wl_default_seat_id_get(obj);
#endif
efl_selection_manager_drag_cancel(sel_man, obj, seatid);
efl_ui_selection_manager_drag_cancel(sel_man, obj, seatid);
return EINA_TRUE;
}
@ -462,7 +462,7 @@ elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
_dnd_drag_pos_cb, pos);
efl_event_callback_add(obj, EFL_UI_DND_EVENT_DRAG_DROP,
_dnd_drop_cb, drop);
efl_selection_manager_drop_target_add(sel_man, obj, (Efl_Selection_Format)format, seatid);
efl_ui_selection_manager_drop_target_add(sel_man, obj, (Efl_Ui_Selection_Format)format, seatid);
return EINA_TRUE;
@ -521,7 +521,7 @@ elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
free(drop->pos);
free(drop);
}
efl_selection_manager_drop_target_del(sel_man, obj, (Efl_Selection_Format)format, seatid);
efl_ui_selection_manager_drop_target_del(sel_man, obj, (Efl_Ui_Selection_Format)format, seatid);
return EINA_TRUE;
}
@ -568,7 +568,7 @@ static void
_dnd_cont_drop_cb(void *data, const Efl_Event *event)
{
Dnd_Cont_Drop *drop = data;
Efl_Selection_Data *org_ddata = event->info;
Efl_Ui_Selection_Data *org_ddata = event->info;
Elm_Selection_Data ddata;
Evas_Coord xret = 0, yret = 0;
@ -681,7 +681,7 @@ elm_drop_item_container_add(Evas_Object *obj,
_dnd_cont_drag_pos_cb, pos);
efl_event_callback_add(obj, EFL_UI_DND_EVENT_DRAG_DROP,
_dnd_cont_drop_cb, drop);
efl_selection_manager_container_drop_item_add(sel_man, obj, (Efl_Selection_Format)format,
efl_ui_selection_manager_container_drop_item_add(sel_man, obj, (Efl_Ui_Selection_Format)format,
item_get_cb, _dnd_item_func, NULL,
seatid);
@ -708,21 +708,21 @@ elm_drop_item_container_del(Evas_Object *obj)
_cont_drop_free_data(obj);
evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _cont_drop_obj_del_cb);
efl_selection_manager_container_drop_item_del(sel_man, obj, seatid);
efl_ui_selection_manager_container_drop_item_del(sel_man, obj, seatid);
return EINA_TRUE;
}
static void
_cont_drag_data_func(void *data, Efl_Object *obj, Efl_Selection_Format *format,
Eina_Rw_Slice *drag_data, Efl_Selection_Action *action)
_cont_drag_data_func(void *data, Efl_Object *obj, Efl_Ui_Selection_Format *format,
Eina_Rw_Slice *drag_data, Efl_Ui_Selection_Action *action)
{
Item_Container_Drag_Info *di;
di = data;
if (!di) return;
di->data_get_cb(obj, di->it, &di->user_info);
if (format) *format = (Efl_Selection_Format)di->user_info.format;
if (format) *format = (Efl_Ui_Selection_Format)di->user_info.format;
if (drag_data)
{
if (di->user_info.data)
@ -731,7 +731,7 @@ _cont_drag_data_func(void *data, Efl_Object *obj, Efl_Selection_Format *format,
drag_data->len = strlen(di->user_info.data);
}
}
if (action) *action = (Efl_Selection_Action)di->user_info.action;
if (action) *action = (Efl_Ui_Selection_Action)di->user_info.action;
}
static Eina_List *
@ -817,7 +817,7 @@ elm_drag_item_container_add(Evas_Object *obj, double anim_tm, double tm_to_drag,
di_list = eina_list_append(di_list, di);
efl_key_data_set(obj, "__cont_drag_item", di_list);
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _cont_drag_obj_del_cb, NULL);
efl_selection_manager_container_drag_item_add(sel_man, obj, anim_tm, tm_to_drag,
efl_ui_selection_manager_container_drag_item_add(sel_man, obj, anim_tm, tm_to_drag,
di, _cont_drag_data_func, NULL,
di, _cont_drag_item_func, NULL,
di, _cont_drag_icon_create, NULL,
@ -838,7 +838,7 @@ elm_drag_item_container_del(Evas_Object *obj)
_cont_drag_free_data(obj);
evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _cont_drag_obj_del_cb);
efl_selection_manager_container_drag_item_del(sel_man, obj, seatid);
efl_ui_selection_manager_container_drag_item_del(sel_man, obj, seatid);
return EINA_TRUE;
}

View File

@ -11,9 +11,9 @@ mixin Efl.Ui.Dnd {
- EFL_UI_DND_EVENT_DRAG_DONE
]]
params {
@in format: Efl.Selection_Format; [[The data format]]
@in format: Efl.Ui.Selection_Format; [[The data format]]
@in data: Eina.Slice; [[The drag data]]
@in action: Efl.Selection_Action; [[Action when data is transferred]]
@in action: Efl.Ui.Selection_Action; [[Action when data is transferred]]
@in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
@ -21,7 +21,7 @@ mixin Efl.Ui.Dnd {
drag_action_set {
[[Set the action for the drag]]
params {
@in action: Efl.Selection_Action; [[Drag action]]
@in action: Efl.Ui.Selection_Action; [[Drag action]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
@ -39,14 +39,14 @@ mixin Efl.Ui.Dnd {
- EFL_UI_DND_EVENT_DRAG_POS
- EFL_UI_DND_EVENT_DRAG_DROP.]]
params {
@in format: Efl.Selection_Format; [[Accepted data format]]
@in format: Efl.Ui.Selection_Format; [[Accepted data format]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
drop_target_del {
[[Delete the dropable status from object]]
params {
@in format: Efl.Selection_Format; [[Accepted data format]]
@in format: Efl.Ui.Selection_Format; [[Accepted data format]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
@ -58,6 +58,6 @@ mixin Efl.Ui.Dnd {
drag,enter: void; [[called when the drag object enters this object]]
drag,leave: void; [[called when the drag object leaves this object]]
drag,pos: Efl.Dnd.Drag_Pos; [[called when the drag object changes drag position]]
drag,drop: Efl.Selection_Data; [[called when the drag object dropped on this object]]
drag,drop: Efl.Ui.Selection_Data; [[called when the drag object dropped on this object]]
}
}

View File

@ -34,7 +34,7 @@ mixin Efl.Ui.Dnd_Container {
}
drop_item_add {
params {
@in format: Efl.Selection_Format; [[Accepted data formats]]
@in format: Efl.Ui.Selection_Format; [[Accepted data formats]]
@in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}

View File

@ -1,4 +1,4 @@
import efl_selection_types;
import efl_ui_selection_types;
function Efl.Dnd.Drag_Icon_Create {
[[Function pointer for creating icon at the drag side.]]
@ -14,9 +14,9 @@ function Efl.Dnd.Drag_Data_Get {
[[Function pointer for getting data and format at the drag side.]]
params {
@in obj: Efl.Canvas.Object; [[The container object]]
@out format: Efl.Selection_Format; [[Data format]]
@out format: Efl.Ui.Selection_Format; [[Data format]]
@out drag_data: Eina.Rw_Slice; [[Data]]
@out action: Efl.Selection_Action; [[The drag action]]
@out action: Efl.Ui.Selection_Action; [[The drag action]]
}
};
@ -46,13 +46,13 @@ struct Efl.Dnd.Drag_Accept {
struct Efl.Dnd.Drag_Pos {
pos: Eina.Position2D; [[Evas Coordinate]]
action: Efl.Selection_Action; [[The drag action]]
format: Efl.Selection_Format; [[The drag format]]
action: Efl.Ui.Selection_Action; [[The drag action]]
format: Efl.Ui.Selection_Format; [[The drag format]]
item: Efl.Canvas.Object; [[The item object. It is only available for container object.]]
}
struct Efl.Dnd.Drag_Item_Container_Drop {
item: Efl.Canvas.Object; [[The item object]]
data: Efl.Selection_Data; [[The selection data]]
data: Efl.Ui.Selection_Data; [[The selection data]]
pos: Eina.Position2D; [[Position relative to item (left (-1), middle (0), right (1)]]
}

View File

@ -2,43 +2,43 @@
# include "elementary_config.h"
#endif
#define EFL_SELECTION_MANAGER_BETA
#define EFL_UI_SELECTION_MANAGER_BETA
#include <Elementary.h>
#include "elm_priv.h"
#define MY_CLASS EFL_SELECTION_MIXIN
#define MY_CLASS_NAME "Efl.Selection"
#define MY_CLASS EFL_UI_SELECTION_MIXIN
#define MY_CLASS_NAME "Efl.Ui.Selection"
EOLIAN static void
_efl_selection_selection_get(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Type type, Efl_Selection_Format format,
void *data_func_data, Efl_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb, unsigned int seat)
_efl_ui_selection_selection_get(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Type type, Efl_Ui_Selection_Format format,
void *data_func_data, Efl_Ui_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_selection_get(sel_man, obj, type, format,
efl_ui_selection_manager_selection_get(sel_man, obj, type, format,
data_func_data, data_func,
data_func_free_cb, seat);
}
EOLIAN static Eina_Future *
_efl_selection_selection_set(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Type type, Efl_Selection_Format format, Eina_Slice data, unsigned int seat)
_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)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
return efl_selection_manager_selection_set(sel_man, obj, type, format, data, seat);
return efl_ui_selection_manager_selection_set(sel_man, obj, type, format, data, seat);
}
EOLIAN static void
_efl_selection_selection_clear(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Type type, unsigned int seat)
_efl_ui_selection_selection_clear(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Type type, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
efl_selection_manager_selection_clear(sel_man, obj, type, seat);
efl_ui_selection_manager_selection_clear(sel_man, obj, type, seat);
}
EOLIAN static Eina_Bool
_efl_selection_has_owner(Eo *obj, void *pd EINA_UNUSED, Efl_Selection_Type type, unsigned int seat)
_efl_ui_selection_has_owner(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Selection_Type type, unsigned int seat)
{
Eo *sel_man = _efl_ui_selection_manager_get(obj);
return efl_selection_manager_selection_has_owner(sel_man, obj, type, seat);
return efl_ui_selection_manager_selection_has_owner(sel_man, obj, type, seat);
}
@ -153,7 +153,7 @@ struct _Cnp_Data_Cb_Wrapper
};
static void
_selection_data_ready_cb(void *data, Efl_Object *obj, Efl_Selection_Data *seldata)
_selection_data_ready_cb(void *data, Efl_Object *obj, Efl_Ui_Selection_Data *seldata)
{
Cnp_Data_Cb_Wrapper *wdata = data;
if (!wdata) return;
@ -217,8 +217,8 @@ elm_cnp_selection_get(const Evas_Object *obj, Elm_Sel_Type type,
#endif
wdata->udata = udata;
wdata->datacb = datacb;
efl_selection_manager_selection_get(sel_man, (Evas_Object *)obj, (Efl_Selection_Type)type,
(Efl_Selection_Format)format,
efl_ui_selection_manager_selection_get(sel_man, (Evas_Object *)obj, (Efl_Ui_Selection_Type)type,
(Efl_Ui_Selection_Format)format,
wdata, _selection_data_ready_cb, NULL, seatid);
return EINA_TRUE;
}
@ -240,8 +240,8 @@ elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type type,
#ifdef HAVE_ELEMENTARY_WL2
seatid = _wl_default_seat_id_get(obj);
#endif
f = efl_selection_manager_selection_set(sel_man, obj, (Efl_Selection_Type)type,
(Efl_Selection_Format)format, data, seatid);
f = efl_ui_selection_manager_selection_set(sel_man, obj, (Efl_Ui_Selection_Type)type,
(Efl_Ui_Selection_Format)format, data, seatid);
ldata->obj = obj;
ldata->type = type;
@ -259,7 +259,7 @@ elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type type)
#ifdef HAVE_ELEMENTARY_WL2
seatid = _wl_default_seat_id_get(obj);
#endif
efl_selection_manager_selection_clear(sel_man, obj, (Efl_Selection_Type)type, seatid);
efl_ui_selection_manager_selection_clear(sel_man, obj, (Efl_Ui_Selection_Type)type, seatid);
return EINA_TRUE;
}
@ -292,8 +292,8 @@ elm_selection_selection_has_owner(Evas_Object *obj)
seatid = _wl_default_seat_id_get(obj);
#endif
return efl_selection_manager_selection_has_owner(sel_man, obj,
EFL_SELECTION_TYPE_CLIPBOARD, seatid);
return efl_ui_selection_manager_selection_has_owner(sel_man, obj,
EFL_UI_SELECTION_TYPE_CLIPBOARD, seatid);
}
EAPI Eina_Bool
@ -305,8 +305,8 @@ elm_cnp_clipboard_selection_has_owner(Evas_Object *obj)
#ifdef HAVE_ELEMENTARY_WL2
seatid = _wl_default_seat_id_get(obj);
#endif
return efl_selection_manager_selection_has_owner(sel_man, obj,
EFL_SELECTION_TYPE_CLIPBOARD, seatid);
return efl_ui_selection_manager_selection_has_owner(sel_man, obj,
EFL_UI_SELECTION_TYPE_CLIPBOARD, seatid);
}
#include "efl_selection.eo.c"
#include "efl_ui_selection.eo.c"

View File

@ -1,14 +1,14 @@
import efl_selection_types;
import efl_ui_selection_types;
mixin Efl.Selection {
[[Efl Selection class]]
mixin Efl.Ui.Selection {
[[Efl Ui Selection class]]
data: null;
methods {
selection_set {
[[Set the selection data to the object]]
params {
@in type: Efl.Selection_Type; [[Selection Type]]
@in format: Efl.Selection_Format; [[Selection Format]]
@in type: Efl.Ui.Selection_Type; [[Selection Type]]
@in format: Efl.Ui.Selection_Format; [[Selection Format]]
@in data: Eina.Slice;
@in seat: uint;[[Specified seat for multiple seats case.]]
}
@ -17,29 +17,29 @@ mixin Efl.Selection {
selection_get {
[[Get the data from the object that has selection]]
params {
@in type: Efl.Selection_Type; [[Selection Type]]
@in format: Efl.Selection_Format; [[Selection Format]]
@in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]]
@in type: Efl.Ui.Selection_Type; [[Selection Type]]
@in format: Efl.Ui.Selection_Format; [[Selection Format]]
@in data_func: Efl.Ui.Selection_Data_Ready; [[Data ready function pointer]]
@in seat: uint;[[Specified seat for multiple seats case.]]
}
}
selection_clear {
[[Clear the selection data from the object]]
params {
@in type: Efl.Selection_Type; [[Selection Type]]
@in type: Efl.Ui.Selection_Type; [[Selection Type]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
has_owner {
[[Determine whether the selection data has owner]]
params {
@in type: Efl.Selection_Type; [[Selection type]]
@in type: Efl.Ui.Selection_Type; [[Selection type]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
return: bool; [[EINA_TRUE if there is object owns selection, otherwise EINA_FALSE]]
}
}
events {
selection,changed: Efl.Selection_Changed; [[Called when display server's selection has changed]]
selection,changed: Efl.Ui.Selection_Changed; [[Called when display server's selection has changed]]
}
}

View File

@ -1,13 +1,13 @@
import efl_ui_dnd_types;
class Efl.Selection_Manager (Efl.Object) {
class Efl.Ui.Selection_Manager (Efl.Object) {
methods {
selection_set @beta {
[[Set selection]]
params {
@in owner: Efl.Object; [[Seleciton owner]]
@in type: Efl.Selection_Type; [[Selection type]]
@in format: Efl.Selection_Format; [[Selection format]]
@in type: Efl.Ui.Selection_Type; [[Selection type]]
@in format: Efl.Ui.Selection_Format; [[Selection format]]
@in data: Eina.Slice; [[Selection data]]
@in seat: uint @optional;[[Specified seat for multiple seats case.]]
}
@ -17,16 +17,16 @@ class Efl.Selection_Manager (Efl.Object) {
[[Get selection]]
params {
@in request: const(Efl.Object); [[Seleciton owner]]
@in type: Efl.Selection_Type; [[Selection type]]
@in format: Efl.Selection_Format; [[Selection Format]]
@in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]]
@in type: Efl.Ui.Selection_Type; [[Selection type]]
@in format: Efl.Ui.Selection_Format; [[Selection Format]]
@in data_func: Efl.Ui.Selection_Data_Ready; [[Data ready function pointer]]
@in seat: uint @optional;[[Specified seat for multiple seats case.]]
}
}
selection_clear @beta {
params {
@in owner: Efl.Object; [[Seleciton owner]]
@in type: Efl.Selection_Type; [[Selection type]]
@in type: Efl.Ui.Selection_Type; [[Selection type]]
@in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
@ -34,7 +34,7 @@ class Efl.Selection_Manager (Efl.Object) {
[[Check if the request object has selection or not]]
params {
@in request: Efl.Object; [[Request object]]
@in type: Efl.Selection_Type; [[Selection type]]
@in type: Efl.Ui.Selection_Type; [[Selection type]]
@in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
return: bool; [[EINA_TRUE if the request object has selection, otherwise, EINA_FALSE]]
@ -48,9 +48,9 @@ class Efl.Selection_Manager (Efl.Object) {
]]
params {
@in drag_obj: Efl.Object; [[Drag object]]
@in format: Efl.Selection_Format; [[Data format]]
@in format: Efl.Ui.Selection_Format; [[Data format]]
@in data: Eina.Slice; [[Data to transfer]]
@in action: Efl.Selection_Action; [[Action when data is transferred]]
@in action: Efl.Ui.Selection_Action; [[Action when data is transferred]]
@in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
@ -59,7 +59,7 @@ class Efl.Selection_Manager (Efl.Object) {
[[This sets the action for the drag]]
params {
@in drag_obj: Efl.Object; [[Drag object]]
@in action: Efl.Selection_Action; [[Drag action]]
@in action: Efl.Ui.Selection_Action; [[Drag action]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
@ -102,7 +102,7 @@ class Efl.Selection_Manager (Efl.Object) {
- EFL_UI_DND_DROP_DRAG_DROP.]]
params {
@in target_obj: Efl.Object; [[Drop target]]
@in format: Efl.Selection_Format; [[Accepted data format]]
@in format: Efl.Ui.Selection_Format; [[Accepted data format]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
return: bool; [[$true on success, $false otherwise]]
@ -111,7 +111,7 @@ class Efl.Selection_Manager (Efl.Object) {
[[Remove a dropable target]]
params {
@in target_obj: Efl.Object; [[Drop target]]
@in format: Efl.Selection_Format; [[Accepted data format]]
@in format: Efl.Ui.Selection_Format; [[Accepted data format]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
@ -119,7 +119,7 @@ class Efl.Selection_Manager (Efl.Object) {
[[Add dropable target for a container in which items can drop to it]]
params {
@in cont: Efl.Object; [[Container object]]
@in format: Efl.Selection_Format; [[Accepted data formats]]
@in format: Efl.Ui.Selection_Format; [[Accepted data formats]]
@in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}

View File

@ -1,5 +1,5 @@
#ifndef EFL_SELECTION_MANAGER_PRIVATE_H
#define EFL_SELECTION_MANAGER_PRIVATE_H
#ifndef EFL_UI_SELECTION_MANAGER_PRIVATE_H
#define EFL_UI_SELECTION_MANAGER_PRIVATE_H
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
@ -35,7 +35,7 @@ enum
SELECTION_N_ATOMS,
};
typedef struct _Efl_Selection_Manager_Data Efl_Selection_Manager_Data;
typedef struct _Efl_Ui_Selection_Manager_Data Efl_Ui_Selection_Manager_Data;
typedef struct _Sel_Manager_Seat_Selection Sel_Manager_Seat_Selection;
typedef struct _Sel_Manager_Atom Sel_Manager_Atom;
typedef struct _Sel_Manager_Dropable Sel_Manager_Dropable;
@ -51,7 +51,7 @@ typedef struct _Saved_Type Saved_Type;
#ifdef HAVE_ELEMENTARY_X
typedef Eina_Bool (*X11_Converter_Fn_Cb) (char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
typedef int (*X11_Response_Handler_Cb) (Sel_Manager_Selection *sel, Ecore_X_Event_Selection_Notify *);
typedef Eina_Bool (*X11_Data_Preparer_Cb) (Sel_Manager_Seat_Selection *seat_sel, Ecore_X_Event_Selection_Notify *, Efl_Selection_Data *, Tmp_Info **);
typedef Eina_Bool (*X11_Data_Preparer_Cb) (Sel_Manager_Seat_Selection *seat_sel, Ecore_X_Event_Selection_Notify *, Efl_Ui_Selection_Data *, Tmp_Info **);
#endif
#ifdef HAVE_ELEMENTARY_WL2
typedef 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,
static Eina_Bool _wl_general_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret);
static Eina_Bool _wl_text_converter(char *target, Sel_Manager_Selection *sel, void *data, int size, void **data_ret, int *size_ret);
typedef 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);
static 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);
static 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);
static 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);
static 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);
static 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);
typedef 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);
static 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);
static 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);
static 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);
static 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);
static 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);
#endif
@ -89,7 +89,7 @@ struct _Sel_Manager_Selection
{
const char *debug;
Eina_Rw_Slice data;
Efl_Selection_Format request_format;
Efl_Ui_Selection_Format request_format;
#ifdef HAVE_ELEMENTARY_X
Eina_Bool (*set) (Ecore_X_Window, const void *data, int size);
Eina_Bool (*clear) (void);
@ -118,9 +118,9 @@ struct _Sel_Manager_Selection
Ecore_Win32_Window *win;
#endif
Efl_Selection_Format want_format;
Efl_Selection_Format format;
Efl_Selection_Action action;
Efl_Ui_Selection_Format want_format;
Efl_Ui_Selection_Format format;
Efl_Ui_Selection_Action action;
Eina_Bool active : 1;
unsigned char asked : 2;
@ -128,7 +128,7 @@ struct _Sel_Manager_Selection
Efl_Object *owner;
Efl_Object *request_obj;
void *data_func_data;
Efl_Selection_Data_Ready data_func;
Efl_Ui_Selection_Data_Ready data_func;
Eina_Free_Cb data_func_free_cb;
Sel_Manager_Seat_Selection *seat_sel;
@ -140,7 +140,7 @@ struct _Sel_Manager_Selection_Lost
{
Efl_Object *request;
Eina_Promise *promise;
Efl_Selection_Type type;
Efl_Ui_Selection_Type type;
Sel_Manager_Seat_Selection *seat_sel;
};
@ -163,7 +163,7 @@ struct _Sel_Manager_Seat_Selection
Eina_List *sel_lost_list;
//drag
Eo *drag_obj;
Efl_Selection_Action drag_action;
Efl_Ui_Selection_Action drag_action;
Eo *drag_win;
Ecore_Event_Handler *mouse_up_handler, *dnd_status_handler;
Eina_Bool accept;
@ -171,7 +171,7 @@ struct _Sel_Manager_Seat_Selection
Eina_Position2D drag_pos;
Eina_Position2D drag_win_start;
Eina_Position2D drag_win_end;
Efl_Selection_Type active_type;
Efl_Ui_Selection_Type active_type;
Saved_Type *saved_types;
Ecore_Event_Handler *enter_handler;
@ -179,7 +179,7 @@ struct _Sel_Manager_Seat_Selection
Ecore_Event_Handler *pos_handler;
Ecore_Event_Handler *drop_handler;
Efl_Selection_Manager_Data *pd;
Efl_Ui_Selection_Manager_Data *pd;
};
struct _Anim_Icon
@ -192,9 +192,9 @@ struct _Sel_Manager_Drag_Container
{
Evas *e;
Efl_Object *cont;
Efl_Selection_Format format;
Eina_Rw_Slice data;
Efl_Selection_Action action;
Efl_Ui_Selection_Format format;
Eina_Rw_Slice data;
Efl_Ui_Selection_Action action;
Eina_List *icons;
Eina_Size2D final_icon;
Eina_Position2D down;
@ -216,13 +216,13 @@ struct _Sel_Manager_Drag_Container
Eina_Free_Cb icon_list_func_free_cb;
unsigned int seat;
Efl_Selection_Manager_Data *pd;
Efl_Ui_Selection_Manager_Data *pd;
};
struct _Sel_Manager_Atom
{
const char *name;
Efl_Selection_Format format;
Efl_Ui_Selection_Format format;
#ifdef HAVE_ELEMENTARY_X
// Called by ecore to do conversion
X11_Converter_Fn_Cb x_converter;
@ -241,7 +241,7 @@ struct _Sel_Manager_Atom
struct _Drop_Format
{
EINA_INLIST;
Efl_Selection_Format format;
Efl_Ui_Selection_Format format;
};
struct _Sel_Manager_Dropable
@ -253,7 +253,7 @@ struct _Sel_Manager_Dropable
Eina_Position2D pos;
Eina_Bool in : 1;
const char *type;
Efl_Selection_Format format;
Efl_Ui_Selection_Format format;
} last;
//for container
@ -272,7 +272,7 @@ struct _Item_Container_Drop_Info
#ifdef HAVE_ELEMENTARY_WL2
typedef struct _Wl_Format_Translation
{
Efl_Selection_Format format;
Efl_Ui_Selection_Format format;
char **translates;
} Sel_Manager_Wl_Format_Translation;
@ -283,16 +283,16 @@ char *sm_wl_vcard[] = {"text/x-vcard", NULL};
char *sm_wl_image[] = {"image/", "text/uri-list", NULL};
Sel_Manager_Wl_Format_Translation sm_wl_convertion[] = {
{EFL_SELECTION_FORMAT_MARKUP | EFL_SELECTION_FORMAT_TEXT, sm_wl_markup},
{EFL_SELECTION_FORMAT_TEXT, sm_wl_text},
{EFL_SELECTION_FORMAT_HTML, sm_wl_html},
{EFL_SELECTION_FORMAT_VCARD, sm_wl_vcard},
{EFL_SELECTION_FORMAT_IMAGE, sm_wl_image},
{EFL_SELECTION_FORMAT_NONE, NULL},
{EFL_UI_SELECTION_FORMAT_MARKUP | EFL_UI_SELECTION_FORMAT_TEXT, sm_wl_markup},
{EFL_UI_SELECTION_FORMAT_TEXT, sm_wl_text},
{EFL_UI_SELECTION_FORMAT_HTML, sm_wl_html},
{EFL_UI_SELECTION_FORMAT_VCARD, sm_wl_vcard},
{EFL_UI_SELECTION_FORMAT_IMAGE, sm_wl_image},
{EFL_UI_SELECTION_FORMAT_NONE, NULL},
};
#endif
struct _Efl_Selection_Manager_Data
struct _Efl_Ui_Selection_Manager_Data
{
Eo *sel_man;
#ifdef HAVE_ELEMENTARY_X
@ -306,7 +306,7 @@ struct _Efl_Selection_Manager_Data
Ecore_Event_Handler *end_handler;
Ecore_Wl2_Display *wl_display;
#endif
Efl_Selection_Type loss_type;
Efl_Ui_Selection_Type loss_type;
Sel_Manager_Atom *atom_list;
Eina_List *seat_list;

View File

@ -1,4 +1,4 @@
enum Efl.Selection_Type
enum Efl.Ui.Selection_Type
{
[[Selection type]]
primary, [[Primary text selection (highlighted or selected text)]]
@ -7,7 +7,7 @@ enum Efl.Selection_Type
clipboard [[Clipboard selection (ctrl+C)]]
}
enum Efl.Selection_Format
enum Efl.Ui.Selection_Format
{
[[Selection format]]
targets = -1, [[For matching every possible atom]]
@ -19,7 +19,7 @@ enum Efl.Selection_Format
html = 0x10 [[Raw HTML-like data (eg. webkit)]]
}
enum Efl.Selection_Action
enum Efl.Ui.Selection_Action
{
[[Defines the kind of action associated with the drop data]]
unknown, [[Action type is unknown]]
@ -32,27 +32,27 @@ enum Efl.Selection_Action
description [[Describe the data]]
}
struct Efl.Selection_Data
struct Efl.Ui.Selection_Data
{
[[Structure holding the info about selected data]]
pos: Eina.Position2D; [[Coordinates of the drop (DND operations only)]]
format: Efl.Selection_Format; [[Format of the selection]]
format: Efl.Ui.Selection_Format; [[Format of the selection]]
content: Eina.Slice; [[Selection data]]
action: Efl.Selection_Action; [[Action to perform with the data]]
action: Efl.Ui.Selection_Action; [[Action to perform with the data]]
item: Efl.Object; [[Item under the drag position. It is only available for container]]
}
function Efl.Selection_Data_Ready {
function Efl.Ui.Selection_Data_Ready {
[[Function pointer for getting selection]]
params {
@in obj: Efl.Object; [[Object which requested for the selection]]
@in seldata: ptr(Efl.Selection_Data); [[Selection data]]
@in seldata: ptr(Efl.Ui.Selection_Data); [[Selection data]]
}
};
struct Efl.Selection_Changed
struct Efl.Ui.Selection_Changed
{
type: Efl.Selection_Type; [[Selection type]]
type: Efl.Ui.Selection_Type; [[Selection type]]
seat: int; [[The seat on which the selection changed, or NULL for "default"]]
display: void_ptr; [[The display connection object, NULL under X11]]
exist: bool; [[EINA_TRUE if the selection has an owner]]

View File

@ -933,7 +933,7 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd)
sd->entry = efl_add(EFL_UI_TEXT_CLASS, sd->box,
efl_text_multiline_set(efl_added, EINA_FALSE),
efl_text_set(efl_added, ""),
efl_ui_text_cnp_mode_set(efl_added, EFL_SELECTION_FORMAT_MARKUP),
efl_ui_text_cnp_mode_set(efl_added, EFL_UI_SELECTION_FORMAT_MARKUP),
efl_ui_text_input_panel_enabled_set(efl_added, EINA_FALSE),
efl_text_interactive_editable_set(efl_added, EINA_TRUE),
efl_composite_attach(obj, efl_added));

View File

@ -193,7 +193,7 @@ struct _Efl_Ui_Text_Rectangle
struct _Selection_Loss_Data
{
Eo *obj;
Efl_Selection_Type stype;
Efl_Ui_Selection_Type stype;
};
#define MY_CLASS EFL_UI_TEXT_CLASS
@ -596,7 +596,7 @@ _update_selection_handler(Eo *obj)
static void
_selection_data_cb(void *data EINA_UNUSED, Eo *obj,
Efl_Selection_Data *sel_data)
Efl_Ui_Selection_Data *sel_data)
{
Efl_Text_Cursor_Cursor *cur, *start, *end;
@ -608,7 +608,7 @@ _selection_data_cb(void *data EINA_UNUSED, Eo *obj,
efl_canvas_text_range_delete(obj, start, end);
}
cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
if (sel_data->format == EFL_SELECTION_FORMAT_MARKUP)
if (sel_data->format == EFL_UI_SELECTION_FORMAT_MARKUP)
{
efl_text_markup_cursor_markup_insert(obj, cur, buf);
}
@ -684,8 +684,8 @@ _get_drop_format(Evas_Object *obj)
EFL_UI_TEXT_DATA_GET(obj, sd);
if ((sd->editable) && (!sd->single_line) && (!sd->password) && (!sd->disabled))
return EFL_SELECTION_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE;
return EFL_SELECTION_FORMAT_MARKUP;
return EFL_UI_SELECTION_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE;
return EFL_UI_SELECTION_FORMAT_MARKUP;
}
/* we can't reuse layout's here, because it's on entry_edje only */
@ -1094,10 +1094,10 @@ _hover_selected_cb(void *data,
static void
_paste_cb(Eo *obj)
{
Efl_Selection_Format formats = EFL_SELECTION_FORMAT_TEXT |
EFL_SELECTION_FORMAT_MARKUP;
Efl_Ui_Selection_Format formats = EFL_UI_SELECTION_FORMAT_TEXT |
EFL_UI_SELECTION_FORMAT_MARKUP;
efl_selection_get(obj, EFL_SELECTION_TYPE_CLIPBOARD, formats,
efl_ui_selection_get(obj, EFL_UI_SELECTION_TYPE_CLIPBOARD, formats,
NULL, _selection_data_cb, NULL, 1);
}
@ -1116,8 +1116,8 @@ _selection_clear(void *data, Elm_Sel_Type selection)
EFL_UI_TEXT_DATA_GET(data, sd);
if (!sd->have_selection) return;
if ((selection == EFL_SELECTION_TYPE_CLIPBOARD) ||
(selection == EFL_SELECTION_TYPE_PRIMARY))
if ((selection == EFL_UI_SELECTION_TYPE_CLIPBOARD) ||
(selection == EFL_UI_SELECTION_TYPE_PRIMARY))
{
_efl_ui_text_select_none(data, sd);
}
@ -1132,10 +1132,10 @@ _selection_lost_cb(void *data, const Eina_Value value)
EFL_UI_TEXT_DATA_GET(sdata->obj, sd);
switch (sdata->stype)
{
case EFL_SELECTION_TYPE_CLIPBOARD:
case EFL_UI_SELECTION_TYPE_CLIPBOARD:
sd->sel_future.clipboard = NULL;
break;
case EFL_SELECTION_TYPE_PRIMARY:
case EFL_UI_SELECTION_TYPE_PRIMARY:
default:
sd->sel_future.primary = NULL;
break;
@ -1145,12 +1145,12 @@ _selection_lost_cb(void *data, const Eina_Value value)
}
static void
_selection_store(Efl_Selection_Type seltype,
_selection_store(Efl_Ui_Selection_Type seltype,
Evas_Object *obj)
{
char *sel;
Efl_Text_Cursor_Cursor *start, *end;
Efl_Selection_Format selformat = EFL_SELECTION_FORMAT_MARKUP;
Efl_Ui_Selection_Format selformat = EFL_UI_SELECTION_FORMAT_MARKUP;
Eina_Slice slice;
Selection_Loss_Data *ldata;
Eina_Future *f;
@ -1171,24 +1171,24 @@ _selection_store(Efl_Selection_Type seltype,
switch (seltype)
{
case EFL_SELECTION_TYPE_CLIPBOARD:
case EFL_UI_SELECTION_TYPE_CLIPBOARD:
if (sd->sel_future.clipboard)
{
eina_future_cancel(sd->sel_future.clipboard);
}
f = sd->sel_future.clipboard = efl_selection_set(obj, seltype,
f = sd->sel_future.clipboard = efl_ui_selection_set(obj, seltype,
selformat, slice, 1);
break;
case EFL_SELECTION_TYPE_PRIMARY:
case EFL_UI_SELECTION_TYPE_PRIMARY:
default:
if (sd->sel_future.primary)
{
eina_future_cancel(sd->sel_future.primary);
}
f = sd->sel_future.primary = efl_selection_set(obj, seltype,
f = sd->sel_future.primary = efl_ui_selection_set(obj, seltype,
selformat, slice, 1);
break;
}
@ -1196,7 +1196,7 @@ _selection_store(Efl_Selection_Type seltype,
ldata->obj = obj;
eina_future_then_easy(f, _selection_lost_cb, NULL, NULL, EINA_VALUE_TYPE_UINT, ldata);
//if (seltype == EFL_SELECTION_TYPE_CLIPBOARD)
//if (seltype == EFL_UI_SELECTION_TYPE_CLIPBOARD)
// eina_stringshare_replace(&sd->cut_sel, sel);
free(sel);
@ -1219,7 +1219,7 @@ _cut_cb(Eo *obj)
if (!_elm_config->desktop_entry)
elm_widget_scroll_hold_pop(obj);
_selection_store(EFL_SELECTION_TYPE_CLIPBOARD, obj);
_selection_store(EFL_UI_SELECTION_TYPE_CLIPBOARD, obj);
efl_text_interactive_selection_cursors_get(obj, &start, &end);
efl_canvas_text_range_delete(obj, start, end);
}
@ -1246,7 +1246,7 @@ _copy_cb(Eo *obj)
edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
elm_widget_scroll_hold_pop(obj);
}
_selection_store(EFL_SELECTION_TYPE_CLIPBOARD, obj);
_selection_store(EFL_UI_SELECTION_TYPE_CLIPBOARD, obj);
}
static void
@ -2126,13 +2126,13 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
efl_composite_attach(obj, text_obj);
sd->entry_edje = wd->resize_obj;
sd->cnp_mode = EFL_SELECTION_FORMAT_TEXT;
sd->cnp_mode = EFL_UI_SELECTION_FORMAT_TEXT;
sd->line_wrap = ELM_WRAP_WORD;
sd->context_menu = EINA_TRUE;
sd->auto_save = EINA_TRUE;
sd->editable = EINA_TRUE;
sd->sel_allow = EINA_TRUE;
sd->drop_format = EFL_SELECTION_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE;
sd->drop_format = EFL_UI_SELECTION_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE;
sd->last.scroll = EINA_SIZE2D(0, 0);
sd->sel_handler_disabled = EINA_TRUE;
@ -2537,25 +2537,25 @@ _efl_ui_text_efl_file_file_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd,
}
EOLIAN static void
_efl_ui_text_cnp_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Efl_Selection_Format cnp_mode)
_efl_ui_text_cnp_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Efl_Ui_Selection_Format cnp_mode)
{
Elm_Sel_Format dnd_format = EFL_SELECTION_FORMAT_MARKUP;
Elm_Sel_Format dnd_format = EFL_UI_SELECTION_FORMAT_MARKUP;
if (cnp_mode != EFL_SELECTION_FORMAT_TARGETS)
if (cnp_mode != EFL_UI_SELECTION_FORMAT_TARGETS)
{
if (cnp_mode & EFL_SELECTION_FORMAT_VCARD)
if (cnp_mode & EFL_UI_SELECTION_FORMAT_VCARD)
ERR("VCARD format not supported for copy & paste!");
else if (cnp_mode & EFL_SELECTION_FORMAT_HTML)
else if (cnp_mode & EFL_UI_SELECTION_FORMAT_HTML)
ERR("HTML format not supported for copy & paste!");
cnp_mode &= ~EFL_SELECTION_FORMAT_VCARD;
cnp_mode &= ~EFL_SELECTION_FORMAT_HTML;
cnp_mode &= ~EFL_UI_SELECTION_FORMAT_VCARD;
cnp_mode &= ~EFL_UI_SELECTION_FORMAT_HTML;
}
if (sd->cnp_mode == cnp_mode) return;
sd->cnp_mode = cnp_mode;
if (sd->cnp_mode == EFL_SELECTION_FORMAT_TEXT)
dnd_format = EFL_SELECTION_FORMAT_TEXT;
else if (cnp_mode == EFL_SELECTION_FORMAT_IMAGE)
if (sd->cnp_mode == EFL_UI_SELECTION_FORMAT_TEXT)
dnd_format = EFL_UI_SELECTION_FORMAT_TEXT;
else if (cnp_mode == EFL_UI_SELECTION_FORMAT_IMAGE)
dnd_format |= ELM_SEL_FORMAT_IMAGE;
elm_drop_target_del(obj, sd->drop_format,
@ -2571,7 +2571,7 @@ _efl_ui_text_cnp_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Efl_Selection_Format cn
_dnd_drop_cb, NULL);
}
EOLIAN static Efl_Selection_Format
EOLIAN static Efl_Ui_Selection_Format
_efl_ui_text_cnp_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
{
return sd->cnp_mode;
@ -3978,7 +3978,7 @@ _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED
}
_edje_signal_emit(sd, "selection,changed", "efl.text");
sd->have_selection = EINA_TRUE;
_selection_store(EFL_SELECTION_TYPE_PRIMARY, obj);
_selection_store(EFL_UI_SELECTION_TYPE_PRIMARY, obj);
}
if (text) free(text);
_selection_defer(obj, sd);

View File

@ -59,7 +59,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Efl.Ui.Clickable,
}
}
@property cnp_mode {
/* FIXME: Efl.Selection_Format does not allow markup without images! */
/* FIXME: Efl.Ui.Selection_Format does not allow markup without images! */
set {
[[Control pasting of text and images for the widget.
@ -78,7 +78,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Efl.Ui.Clickable,
]]
}
values {
format: Efl.Selection_Format; [[Format for copy & paste.]]
format: Efl.Ui.Selection_Format; [[Format for copy & paste.]]
}
}
@property input_panel_language {

View File

@ -16,7 +16,7 @@ struct Efl.Ui.Widget_Focus_State {
abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
Efl.Ui.Cursor, Efl.Ui.Translatable,
Efl.Selection, Efl.Ui.Dnd)
Efl.Ui.Selection, Efl.Ui.Dnd)
{
[[Efl UI widget abstract class]]
legacy_prefix: elm_widget;

View File

@ -43,7 +43,7 @@
* @{
*/
# include <efl_selection_types.eot.h>
# include <efl_ui_selection_types.eot.h>
/**
* Event notifying that the selection has changed
@ -57,40 +57,40 @@ EAPI extern int ELM_CNP_EVENT_SELECTION_CHANGED;
* @see http://www.x.org/docs/X11/xlib.pdf
* for more details.
*/
typedef Efl_Selection_Type Elm_Sel_Type;
typedef Efl_Ui_Selection_Type Elm_Sel_Type;
#define ELM_SEL_TYPE_PRIMARY EFL_SELECTION_TYPE_PRIMARY
#define ELM_SEL_TYPE_SECONDARY EFL_SELECTION_TYPE_SECONDARY
#define ELM_SEL_TYPE_XDND EFL_SELECTION_TYPE_DND
#define ELM_SEL_TYPE_CLIPBOARD EFL_SELECTION_TYPE_CLIPBOARD
#define ELM_SEL_TYPE_PRIMARY EFL_UI_SELECTION_TYPE_PRIMARY
#define ELM_SEL_TYPE_SECONDARY EFL_UI_SELECTION_TYPE_SECONDARY
#define ELM_SEL_TYPE_XDND EFL_UI_SELECTION_TYPE_DND
#define ELM_SEL_TYPE_CLIPBOARD EFL_UI_SELECTION_TYPE_CLIPBOARD
/**
* Defines the types of content.
*/
typedef Efl_Selection_Format Elm_Sel_Format;
typedef Efl_Ui_Selection_Format Elm_Sel_Format;
#define ELM_SEL_FORMAT_TARGETS EFL_SELECTION_FORMAT_TARGETS
#define ELM_SEL_FORMAT_NONE EFL_SELECTION_FORMAT_NONE
#define ELM_SEL_FORMAT_TEXT EFL_SELECTION_FORMAT_TEXT
#define ELM_SEL_FORMAT_MARKUP EFL_SELECTION_FORMAT_MARKUP
#define ELM_SEL_FORMAT_IMAGE EFL_SELECTION_FORMAT_IMAGE
#define ELM_SEL_FORMAT_VCARD EFL_SELECTION_FORMAT_VCARD
#define ELM_SEL_FORMAT_HTML EFL_SELECTION_FORMAT_HTML
#define ELM_SEL_FORMAT_TARGETS EFL_UI_SELECTION_FORMAT_TARGETS
#define ELM_SEL_FORMAT_NONE EFL_UI_SELECTION_FORMAT_NONE
#define ELM_SEL_FORMAT_TEXT EFL_UI_SELECTION_FORMAT_TEXT
#define ELM_SEL_FORMAT_MARKUP EFL_UI_SELECTION_FORMAT_MARKUP
#define ELM_SEL_FORMAT_IMAGE EFL_UI_SELECTION_FORMAT_IMAGE
#define ELM_SEL_FORMAT_VCARD EFL_UI_SELECTION_FORMAT_VCARD
#define ELM_SEL_FORMAT_HTML EFL_UI_SELECTION_FORMAT_HTML
/**
* Defines the kind of action associated with the drop data if for XDND
* @since 1.8
*/
typedef Efl_Selection_Action Elm_Xdnd_Action;
typedef Efl_Ui_Selection_Action Elm_Xdnd_Action;
#define ELM_XDND_ACTION_UNKNOWN EFL_SELECTION_ACTION_UNKNOWN
#define ELM_XDND_ACTION_COPY EFL_SELECTION_ACTION_COPY
#define ELM_XDND_ACTION_MOVE EFL_SELECTION_ACTION_MOVE
#define ELM_XDND_ACTION_PRIVATE EFL_SELECTION_ACTION_PRIVATE
#define ELM_XDND_ACTION_ASK EFL_SELECTION_ACTION_ASK
#define ELM_XDND_ACTION_LIST EFL_SELECTION_ACTION_LIST
#define ELM_XDND_ACTION_LINK EFL_SELECTION_ACTION_LINK
#define ELM_XDND_ACTION_DESCRIPTION EFL_SELECTION_ACTION_DESCRIPTION
#define ELM_XDND_ACTION_UNKNOWN EFL_UI_SELECTION_ACTION_UNKNOWN
#define ELM_XDND_ACTION_COPY EFL_UI_SELECTION_ACTION_COPY
#define ELM_XDND_ACTION_MOVE EFL_UI_SELECTION_ACTION_MOVE
#define ELM_XDND_ACTION_PRIVATE EFL_UI_SELECTION_ACTION_PRIVATE
#define ELM_XDND_ACTION_ASK EFL_UI_SELECTION_ACTION_ASK
#define ELM_XDND_ACTION_LIST EFL_UI_SELECTION_ACTION_LIST
#define ELM_XDND_ACTION_LINK EFL_UI_SELECTION_ACTION_LINK
#define ELM_XDND_ACTION_DESCRIPTION EFL_UI_SELECTION_ACTION_DESCRIPTION
/**
* Structure holding the info about selected data.

View File

@ -67,7 +67,7 @@
# include "efl_ui_widget_focus_manager.eo.h"
# include "efl_ui_focus_parent_provider_standard.eo.h"
# include "elm_widget_item_static_focus.eo.h"
#include "efl_selection_manager.eo.h"
#include "efl_ui_selection_manager.eo.h"
# include "efl_datetime_manager.eo.h"
# ifdef HAVE_LANGINFO_H

View File

@ -246,7 +246,7 @@ pub_eo_files = [
'efl_ui_theme.eo',
'efl_config_global.eo',
'elm_code_widget.eo',
'efl_selection.eo',
'efl_ui_selection.eo',
'efl_ui_dnd.eo',
'efl_ui_dnd_container.eo',
'efl_ui_focus_manager_window_root.eo',
@ -312,7 +312,7 @@ pub_eo_types_files = [
'elm_general.eot',
'efl_ui.eot',
'efl_ui_list_view_types.eot',
'efl_selection_types.eot',
'efl_ui_selection_types.eot',
'efl_ui_dnd_types.eot'
]
@ -337,7 +337,7 @@ priv_eo_files = [
'efl_ui_focus_parent_provider_standard.eo',
'efl_ui_focus_parent_provider_gen.eo',
'efl_ui_model_state.eo',
'efl_selection_manager.eo',
'efl_ui_selection_manager.eo',
'efl_datetime_manager.eo',
]
@ -887,9 +887,9 @@ elementary_src = [
'efl_ui_scroller.c',
'efl_ui_scroll_manager.c',
'efl_ui_pan.c',
'efl_selection_manager.c',
'efl_selection_manager_private.h',
'efl_selection.c',
'efl_ui_selection_manager.c',
'efl_ui_selection_manager_private.h',
'efl_ui_selection.c',
'efl_datetime_manager.c',
'efl_ui_dnd.c',
'elm_focus_legacy.c',