summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiep Ha <thiepha@gmail.com>2017-12-01 08:04:01 +0900
committerThiep Ha <thiepha@gmail.com>2017-12-08 11:17:23 +0900
commite35b80cc7c85a0db4018923f065151ce51b8e353 (patch)
tree30b90c957ea5ab4908fc7dab13d71595857d8b63
parent4614caa9d82a5817875bad4bc8f9fff3a0e2bc16 (diff)
downloadefl-e35b80cc7c85a0db4018923f065151ce51b8e353.tar.gz
change seat to uint, remove unused vars, warnings
-rw-r--r--src/lib/efl/interfaces/efl_selection.eo6
-rw-r--r--src/lib/elementary/efl_cnp.c6
-rw-r--r--src/lib/elementary/efl_dnd.c18
-rw-r--r--src/lib/elementary/efl_selection_manager.c52
-rw-r--r--src/lib/elementary/efl_selection_manager.eo24
-rw-r--r--src/lib/elementary/efl_selection_manager_private.h7
6 files changed, 51 insertions, 62 deletions
diff --git a/src/lib/efl/interfaces/efl_selection.eo b/src/lib/efl/interfaces/efl_selection.eo
index c43c8ff79a..a5805c3bbd 100644
--- a/src/lib/efl/interfaces/efl_selection.eo
+++ b/src/lib/efl/interfaces/efl_selection.eo
@@ -12,7 +12,7 @@ interface Efl.Selection {
@in buf: const(void_ptr);
@in len: int; [[The buffer's length.]]
//@in seat: Efl.Input.Device @optional;[[Specified seat for multiple seats case.]]
- @in seat: int @optional;[[Specified seat for multiple seats case.]]
+ @in seat: uint @optional;[[Specified seat for multiple seats case.]]
}
}
selection_get {
@@ -21,14 +21,14 @@ interface Efl.Selection {
@in format: Efl.Selection.Format; [[Selection Format]]
@in data_func: Efl.Selection.Data_Ready; [[Data ready function pointer]]
//@in seat: Efl.Input.Device @optional;[[Specified seat for multiple seats case.]]
- @in seat: int @optional;[[Specified seat for multiple seats case.]]
+ @in seat: uint @optional;[[Specified seat for multiple seats case.]]
}
}
selection_clear {
params {
@in type: Efl.Selection.Type; [[Selection Type]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
/*selection_loss_feedback { //name!!!
diff --git a/src/lib/elementary/efl_cnp.c b/src/lib/elementary/efl_cnp.c
index b6e0c88870..8ee97e55eb 100644
--- a/src/lib/elementary/efl_cnp.c
+++ b/src/lib/elementary/efl_cnp.c
@@ -34,7 +34,7 @@ _selection_manager_get(Eo *obj)
EOLIAN static void
_efl_cnp_efl_selection_selection_get(Eo *obj, Efl_Cnp_Data *pd, 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, int seat)
+ void *data_func_data, Efl_Selection_Data_Ready data_func, Eina_Free_Cb data_func_free_cb, unsigned int seat)
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
@@ -45,7 +45,7 @@ _efl_cnp_efl_selection_selection_get(Eo *obj, Efl_Cnp_Data *pd, Efl_Selection_Ty
}
EOLIAN static void
-_efl_cnp_efl_selection_selection_set(Eo *obj, Efl_Cnp_Data *pd, Efl_Selection_Type type, Efl_Selection_Format format, const void *buf, int len, int seat)
+_efl_cnp_efl_selection_selection_set(Eo *obj, Efl_Cnp_Data *pd, Efl_Selection_Type type, Efl_Selection_Format format, const void *buf, int len, unsigned int seat)
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
@@ -54,7 +54,7 @@ _efl_cnp_efl_selection_selection_set(Eo *obj, Efl_Cnp_Data *pd, Efl_Selection_Ty
}
EOLIAN static void
-_efl_cnp_efl_selection_selection_clear(Eo *obj, Efl_Cnp_Data *pd, Efl_Selection_Type type, int seat)
+_efl_cnp_efl_selection_selection_clear(Eo *obj, Efl_Cnp_Data *pd, Efl_Selection_Type type, unsigned int seat)
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
diff --git a/src/lib/elementary/efl_dnd.c b/src/lib/elementary/efl_dnd.c
index 92e97cccd1..d8216322c4 100644
--- a/src/lib/elementary/efl_dnd.c
+++ b/src/lib/elementary/efl_dnd.c
@@ -45,7 +45,7 @@ _efl_ui_dnd_efl_dnd_drag_start(Eo *obj, Efl_Ui_Dnd_Data *pd, Efl_Selection_Forma
//TODO: check seat
Eo *sel_man = _selection_manager_get(obj);
- efl_selection_manager_drag_start(sel_man, obj, format, buf, len, action, icon_func_data, icon_func, icon_func_free_cb, NULL);
+ efl_selection_manager_drag_start(sel_man, obj, format, buf, len, action, icon_func_data, icon_func, icon_func_free_cb, 1);
}
EOLIAN static void
@@ -53,7 +53,7 @@ _efl_ui_dnd_efl_dnd_drag_cancel(Eo *obj, Efl_Ui_Dnd_Data *pd)
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
- efl_selection_manager_drag_cancel(sel_man, obj, NULL);
+ efl_selection_manager_drag_cancel(sel_man, obj, 1);
}
EOLIAN static void
@@ -61,7 +61,7 @@ _efl_ui_dnd_efl_dnd_drag_action_set(Eo *obj, Efl_Ui_Dnd_Data *pd , Efl_Selection
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
- efl_selection_manager_drag_action_set(sel_man, action, NULL);
+ efl_selection_manager_drag_action_set(sel_man, action, 1);
}
EOLIAN static void
@@ -78,7 +78,7 @@ _efl_ui_dnd_efl_dnd_drag_item_container_add(Eo *obj, Efl_Ui_Dnd_Data *pd, double
item_func_data, item_func, item_func_free_cb,
icon_func_data, icon_func, icon_func_free_cb,
icon_list_func_data, icon_list_func, icon_list_func_free_cb,
- NULL);
+ 1);
}
static void
@@ -86,7 +86,7 @@ _efl_ui_dnd_efl_dnd_drag_item_container_del(Eo *obj, Efl_Ui_Dnd_Data *pd)
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
- efl_selection_manager_drag_item_container_del(sel_man, obj, NULL);
+ efl_selection_manager_drag_item_container_del(sel_man, obj, 1);
}
EOLIAN static void
@@ -96,7 +96,7 @@ _efl_ui_dnd_efl_dnd_drop_target_add(Eo *obj, Efl_Ui_Dnd_Data *pd, Efl_Selection_
pd->format = format;
Eo *sel_man = _selection_manager_get(obj);
- efl_selection_manager_drop_target_add(sel_man, obj, format, NULL);
+ efl_selection_manager_drop_target_add(sel_man, obj, format, 1);
}
EOLIAN static void
@@ -104,7 +104,7 @@ _efl_ui_dnd_efl_dnd_drop_target_del(Eo *obj, Efl_Ui_Dnd_Data *pd, Efl_Selection_
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
- efl_selection_manager_drop_target_del(sel_man, obj, format, NULL);
+ efl_selection_manager_drop_target_del(sel_man, obj, format, 1);
}
EOLIAN static void
@@ -112,7 +112,7 @@ _efl_ui_dnd_efl_dnd_drop_item_container_add(Eo *obj, Efl_Ui_Dnd_Data *pd, Efl_Se
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
- efl_selection_manager_drop_item_container_add(sel_man, obj, format, item_func_data, item_func, item_func_free_cb, NULL);
+ efl_selection_manager_drop_item_container_add(sel_man, obj, format, item_func_data, item_func, item_func_free_cb, 1);
}
EOLIAN static void
@@ -120,7 +120,7 @@ _efl_ui_dnd_efl_dnd_drop_item_container_del(Eo *obj, Efl_Ui_Dnd_Data *pd)
{
ERR("In");
Eo *sel_man = _selection_manager_get(obj);
- efl_selection_manager_drop_item_container_del(sel_man, obj, NULL);
+ efl_selection_manager_drop_item_container_del(sel_man, obj, 1);
}
diff --git a/src/lib/elementary/efl_selection_manager.c b/src/lib/elementary/efl_selection_manager.c
index eb9359b3b2..b2d8cfbcbc 100644
--- a/src/lib/elementary/efl_selection_manager.c
+++ b/src/lib/elementary/efl_selection_manager.c
@@ -23,7 +23,7 @@
static void _set_selection_list(Sel_Manager_Selection *sel_list, Sel_Manager_Seat_Selection *seat_sel);
-static Sel_Manager_Seat_Selection * _Sel_Manager_Seat_Selection_init(Efl_Selection_Manager_Data *pd, int seat);
+static Sel_Manager_Seat_Selection * _Sel_Manager_Seat_Selection_init(Efl_Selection_Manager_Data *pd, unsigned int seat);
static Ecore_X_Atom _x11_dnd_action_rev_map(Efl_Selection_Action action);
@@ -40,8 +40,7 @@ _get_Sel_Manager_Seat_Selection(Efl_Selection_Manager_Data *pd, unsigned int sea
Sel_Manager_Seat_Selection *seat_sel = NULL;
EINA_LIST_FOREACH(pd->seat_list, l, seat_sel)
{
- //FIXME: use pd->seat: multi-seat selection request???
- if (seat_sel->seat == pd->seat)
+ if (seat_sel->seat == seat)
{
ERR("Request seat: %d", seat_sel->seat);
break;
@@ -781,7 +780,7 @@ _x11_text_converter(char *target, void *data, int size EINA_UNUSED, void **data_
static void
_x11_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd, Efl_Object *owner,
Efl_Selection_Type type, Efl_Selection_Format format,
- //const void *buf, int len, int seat)
+ //const void *buf, int len, unsigned int seat)
const void *buf, int len, Sel_Manager_Seat_Selection *seat_sel)
{
Ecore_X_Window xwin = _x11_xwin_get(owner);
@@ -814,7 +813,7 @@ _x11_efl_sel_manager_selection_set(Efl_Selection_Manager_Data *pd, Efl_Object *o
#ifdef HAVE_ELEMENTARY_X
static void
_x11_efl_sel_manager_selection_get(Eo *obj, Efl_Selection_Manager_Data *pd,
- //Efl_Selection_Type type, Efl_Selection_Format format, int seat)
+ //Efl_Selection_Type type, Efl_Selection_Format format, unsigned int seat)
Efl_Selection_Type type, Efl_Selection_Format format, Sel_Manager_Seat_Selection *seat_sel)
{
Ecore_X_Window xwin = _x11_xwin_get(obj);
@@ -1446,7 +1445,7 @@ EOLIAN static void
_efl_selection_manager_selection_set(Eo *obj, Efl_Selection_Manager_Data *pd,
Efl_Object *owner, Efl_Selection_Type type,
Efl_Selection_Format format,
- const void *buf, int len, int seat)
+ const void *buf, int len, unsigned int seat)
{
ERR("In");
Sel_Manager_Seat_Selection *seat_sel;
@@ -1459,12 +1458,6 @@ _efl_selection_manager_selection_set(Eo *obj, Efl_Selection_Manager_Data *pd,
return;
}
- /*if (seat)
- {
- seat = efl_input_device_seat_get(seat);
- }
- pd->seat = seat;*/
- pd->seat = seat;
pd->has_sel = EINA_TRUE;
seat_sel = _Sel_Manager_Seat_Selection_init(pd, seat);
@@ -1510,10 +1503,9 @@ _efl_selection_manager_selection_get(Eo *obj, Efl_Selection_Manager_Data *pd,
Efl_Object *owner, 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,
- int seat)
+ unsigned int seat)
{
ERR("In");
- pd->seat = seat;
Sel_Manager_Seat_Selection *seat_sel = _Sel_Manager_Seat_Selection_init(pd, seat);
@@ -1536,7 +1528,7 @@ _efl_selection_manager_selection_get(Eo *obj, Efl_Selection_Manager_Data *pd,
EOLIAN static void
_efl_selection_manager_selection_clear(Eo *obj, Efl_Selection_Manager_Data *pd,
- Efl_Object *owner, Efl_Selection_Type type, int seat)
+ Efl_Object *owner, Efl_Selection_Type type, unsigned int seat)
{
ERR("In");
Eina_Bool local = EINA_FALSE;
@@ -1750,7 +1742,7 @@ _x11_dnd_status(void *data, int etype EINA_UNUSED, void *ev)
}
static Sel_Manager_Seat_Selection *
-_Sel_Manager_Seat_Selection_init(Efl_Selection_Manager_Data *pd, int seat)
+_Sel_Manager_Seat_Selection_init(Efl_Selection_Manager_Data *pd, unsigned int seat)
{
Sel_Manager_Seat_Selection *seat_sel = NULL;
Eina_List *l = NULL;
@@ -1792,7 +1784,7 @@ _Sel_Manager_Seat_Selection_init(Efl_Selection_Manager_Data *pd, int seat)
#ifdef HAVE_ELEMENTARY_X
static void
-_x11_efl_sel_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, Efl_Selection_Format format, const void *buf, int len, Efl_Selection_Action action, void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb, int seat)
+_x11_efl_sel_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, Efl_Selection_Format format, const void *buf, int len, 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)
{
Ecore_X_Window xwin = _x11_xwin_get(drag_obj);
Ecore_X_Window xdragwin;
@@ -1808,7 +1800,6 @@ _x11_efl_sel_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Obj
int i;
int xr, yr, rot;
- pd->seat = seat;
pd->has_sel = EINA_TRUE;
seat_sel = _Sel_Manager_Seat_Selection_init(pd, seat);
@@ -1945,7 +1936,7 @@ _wl_drag_source_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *
}
static void
-_wl_efl_sel_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, Efl_Selection_Format format, const void *buf, int len, Efl_Selection_Action action, void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb, int seat)
+_wl_efl_sel_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, Efl_Selection_Format format, const void *buf, int len, 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)
{
Ecore_Evas *ee;
Evas_Object *icon = NULL;
@@ -2067,7 +2058,7 @@ _wl_efl_sel_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Obje
//TODO: Should we add DRAG_START event???
EOLIAN static void
-_efl_selection_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, Efl_Selection_Format format, const void *buf, int len, Efl_Selection_Action action, void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb, int seat)
+_efl_selection_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, Efl_Selection_Format format, const void *buf, int len, 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)
{
#ifdef HAVE_ELEMENTARY_X
_x11_efl_sel_manager_drag_start(obj, pd, drag_obj, format, buf, len, action, icon_func_data, icon_func, icon_func_free_cb, seat);
@@ -2082,7 +2073,7 @@ _efl_selection_manager_drag_start(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_O
}
EOLIAN static void
-_efl_selection_manager_drag_cancel(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, int seat)
+_efl_selection_manager_drag_cancel(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *drag_obj, unsigned int seat)
{
ERR("In");
Sel_Manager_Seat_Selection *seat_sel = _Sel_Manager_Seat_Selection_init(pd, seat);
@@ -2120,7 +2111,7 @@ _efl_selection_manager_drag_cancel(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_
}
EOLIAN static void
-_efl_selection_manager_drag_action_set(Eo *obj, Efl_Selection_Manager_Data *pd , Efl_Selection_Action action, int seat)
+_efl_selection_manager_drag_action_set(Eo *obj, Efl_Selection_Manager_Data *pd , Efl_Selection_Action action, unsigned int seat)
{
ERR("In");
Sel_Manager_Seat_Selection *seat_sel = _Sel_Manager_Seat_Selection_init(pd, seat);
@@ -2846,7 +2837,7 @@ found:
}
static Eina_Bool
-_x11_sel_manager_drop_target_add(Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, Efl_Selection_Format format, int seat)
+_x11_sel_manager_drop_target_add(Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, Efl_Selection_Format format, unsigned int seat)
{
ERR("In");
Sel_Manager_Dropable *dropable = NULL;
@@ -2893,7 +2884,6 @@ _x11_sel_manager_drop_target_add(Efl_Selection_Manager_Data *pd, Efl_Object *tar
_all_drop_targets_cbs_del, target_obj);
if (!have_drop_list) ecore_x_dnd_aware_set(xwin, EINA_TRUE);
- pd->seat = seat;
seat_sel = _Sel_Manager_Seat_Selection_init(pd, seat);
if (seat_sel->enter_handler) return EINA_TRUE;
@@ -3694,7 +3684,7 @@ _wl_dnd_drop(void *data, int type, void *event)
static Eina_Bool
-_wl_sel_manager_drop_target_add(Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, Efl_Selection_Format format, int seat)
+_wl_sel_manager_drop_target_add(Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, Efl_Selection_Format format, unsigned int seat)
{
Sel_Manager_Dropable *dropable = NULL;
//Sel_Manager_Dropable_Cbs *cbs = NULL;
@@ -3751,7 +3741,7 @@ error:
//drop side
EOLIAN static Eina_Bool
-_efl_selection_manager_drop_target_add(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, Efl_Selection_Format format, int seat)
+_efl_selection_manager_drop_target_add(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, Efl_Selection_Format format, unsigned int seat)
{
#ifdef HAVE_ELEMENTARY_X
return _x11_sel_manager_drop_target_add(pd, target_obj, format, seat);
@@ -3762,7 +3752,7 @@ _efl_selection_manager_drop_target_add(Eo *obj, Efl_Selection_Manager_Data *pd,
}
EOLIAN static void
-_efl_selection_manager_drop_target_del(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, Efl_Selection_Format format, int seat)
+_efl_selection_manager_drop_target_del(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *target_obj, Efl_Selection_Format format, unsigned int seat)
{
ERR("In");
Eina_List *l;
@@ -3844,7 +3834,7 @@ _drop_item_container_del(Efl_Selection_Manager_Data *pd, Efl_Object *cont, Eina_
}
EOLIAN static void
-_efl_selection_manager_drop_item_container_add(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *cont, Efl_Selection_Format format, void *item_func_data, Efl_Dnd_Item_Get item_func, Eina_Free_Cb item_func_free_cb, int seat)
+_efl_selection_manager_drop_item_container_add(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *cont, Efl_Selection_Format format, void *item_func_data, Efl_Dnd_Item_Get item_func, Eina_Free_Cb item_func_free_cb, unsigned int seat)
{
ERR("In");
Item_Container_Drop_Info *di;
@@ -3884,7 +3874,7 @@ _efl_selection_manager_drop_item_container_add(Eo *obj, Efl_Selection_Manager_Da
}
EOLIAN static void
-_efl_selection_manager_drop_item_container_del(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *cont, int seat)
+_efl_selection_manager_drop_item_container_del(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *cont, unsigned int seat)
{
ERR("In");
_drop_item_container_del(pd, cont, EINA_TRUE);
@@ -4185,7 +4175,7 @@ _efl_selection_manager_drag_item_container_add(Eo *obj, Efl_Selection_Manager_Da
void *item_get_func_data, Efl_Dnd_Item_Get item_get_func, Eina_Free_Cb item_get_func_free_cb,
void *icon_func_data, Efl_Dnd_Drag_Icon_Create icon_func, Eina_Free_Cb icon_func_free_cb,
void *icon_list_func_data, Efl_Dnd_Drag_Icon_List_Create icon_list_func, Eina_Free_Cb icon_list_func_free_cb,
- int seat)
+ unsigned int seat)
{
ERR("In");
//TODO: remove previous drag one
@@ -4229,7 +4219,7 @@ _drag_item_container_cmp(const void *d1, const void *d2)
}
EOLIAN static void
-_efl_selection_manager_drag_item_container_del(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *cont, int seat)
+_efl_selection_manager_drag_item_container_del(Eo *obj, Efl_Selection_Manager_Data *pd, Efl_Object *cont, unsigned int seat)
{
Sel_Manager_Drag_Container *dc = eina_list_search_unsorted(pd->drag_cont_list,
_drag_item_container_cmp, cont);
diff --git a/src/lib/elementary/efl_selection_manager.eo b/src/lib/elementary/efl_selection_manager.eo
index 6fa14f25cb..d0ae884020 100644
--- a/src/lib/elementary/efl_selection_manager.eo
+++ b/src/lib/elementary/efl_selection_manager.eo
@@ -8,7 +8,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
@in buf: const(void_ptr);
@in len: int; [[The buffer's length.]]
//@in seat: Efl.Input.Device @optional;[[Specified seat for multiple seats case.]]
- @in seat: int @optional;[[Specified seat for multiple seats case.]]
+ @in seat: uint @optional;[[Specified seat for multiple seats case.]]
}
}
selection_get {
@@ -18,7 +18,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
@in format: Efl.Selection.Format; [[Selection Format]]
@in data_func: Efl.Selection.Data_Ready; [[Data ready function pointer]]
//@in seat: Efl.Input.Device @optional;[[Specified seat for multiple seats case.]]
- @in seat: int @optional;[[Specified seat for multiple seats case.]]
+ @in seat: uint @optional;[[Specified seat for multiple seats case.]]
}
}
selection_clear {
@@ -26,7 +26,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
@in owner: Efl.Object; [[Seleciton owner]]
@in type: Efl.Selection.Type; [[Selection Type]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
/*selection_loss_feedback { //name!!!: xxx_set
@@ -51,7 +51,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
@in action: Efl.Selection.Action; [[Action when data is transferred]]
@in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
drag_action_set {
@@ -59,7 +59,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
params {
@in action: Efl.Selection.Action; [[Drag action]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
drag_cancel {
@@ -67,7 +67,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
params {
@in drag_obj: Efl.Object; [[The drag object]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
drag_item_container_add {
@@ -86,7 +86,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
@in icon_func: Efl.Dnd.Drag_Icon_Create; [[Icon used during drag]]
@in icon_list_func: Efl.Dnd.Drag_Icon_List_Create; [[Icons used for animations]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case]]
- @in seat: int @optional; [[Specified seat for multiple seats case]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case]]
}
}
drag_item_container_del {
@@ -94,7 +94,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
params {
@in cont: Efl.Object; [[Container object]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case]]
- @in seat: int @optional; [[Specified seat for multiple seats case]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case]]
}
}
drop_target_add {
@@ -104,7 +104,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
@in target_obj: Efl.Object; [[The drop target]]
@in format: Efl.Selection.Format; [[Accepted data format]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
return: bool; [[$true on success, $false otherwise]]
}
@@ -113,7 +113,7 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
@in target_obj: Efl.Object; [[The drop target]]
@in format: Efl.Selection.Format; [[Accepted data format]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
drop_item_container_add {
@@ -122,14 +122,14 @@ class Efl.Selection.Manager (Efl.Object, Efl.Selection, Efl.Dnd) {
@in format: Efl.Selection.Format; [[Accepted data formats]]
@in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
drop_item_container_del {
params {
@in cont: Efl.Object; [[Container object]]
//@in seat: Efl.Input.Device @optional; [[Specified seat for multiple seats case.]]
- @in seat: int @optional; [[Specified seat for multiple seats case.]]
+ @in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
}
diff --git a/src/lib/elementary/efl_selection_manager_private.h b/src/lib/elementary/efl_selection_manager_private.h
index 27f18909e9..f6065a970e 100644
--- a/src/lib/elementary/efl_selection_manager_private.h
+++ b/src/lib/elementary/efl_selection_manager_private.h
@@ -128,7 +128,7 @@ struct _Sel_Manager_Selection
struct _Sel_Manager_Seat_Selection
{
- int seat;
+ unsigned int seat;
Sel_Manager_Selection *sel_list;
//Sel_Manager_Drag_Container *drag_cont;
//Eina_List *drag_cont_list;
@@ -192,7 +192,7 @@ struct _Sel_Manager_Drag_Container
void *icon_list_func_data;
Efl_Dnd_Drag_Icon_List_Create icon_list_func;
Eina_Free_Cb icon_list_func_free_cb;
- int seat;
+ unsigned int seat;
Efl_Selection_Manager_Data *pd;
};
@@ -227,7 +227,7 @@ struct _Sel_Manager_Dropable
Evas_Object *obj;
//Eina_Inlist *cbs_list; /* List of Sel_Manager_Dropable_Cbs * */
Eina_Inlist *format_list;
- int seat;
+ unsigned int seat;
struct {
Evas_Coord x, y;
Eina_Bool in : 1;
@@ -290,7 +290,6 @@ struct _Efl_Selection_Manager_Data
#endif
Eina_Bool has_sel;
- int seat;
Sel_Manager_Atom *atom_list;
//Efl_Sel_Manager_Selection *sel_list;