kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm cnp/Wl: Remove duplicated data send callback 

If we do drag & drop and then do copy & paste, both _wl_selection_send
and _wl_dnd_send are called for one action (dnd or cnp). It is reduntdant.
We only need one callback to handle two cases dnd and cnp.
This commit is contained in:
Thiep Ha 2016-05-03 09:44:16 +00:00
parent 8a46f78c7d
commit 8796e938a3
1 changed files with 38 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/lib/elementary/elm_cnp.c
View File

@ -2458,7 +2458,6 @@ static Eina_Bool _wl_dnd_position(void *data EINA_UNUSED, int type EINA_UNUSED,
static Eina_Bool _wl_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
/* static Eina_Bool _wl_dnd_offer(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); */
static Eina_Bool _wl_dnd_send(void *data, int type EINA_UNUSED, void *event);
static Eina_Bool _wl_dnd_receive(void *data, int type EINA_UNUSED, void *event);
static Eina_Bool _wl_dnd_end(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED);
static void _wl_dropable_data_handle(Wl_Cnp_Selection *sel, Ecore_Wl2_Event_Selection_Data_Ready *ev);
@ -3063,20 +3062,50 @@ _wl_elm_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection EINA_UNUSED
}
static Eina_Bool
_wl_selection_send(void *udata, int type EINA_UNUSED, void *event)
_wl_selection_send(void *data, int type EINA_UNUSED, void *event)
{
char *buf;
int ret, len_remained;
int len_written = 0;
Wl_Cnp_Selection *sel = udata;
Ecore_Wl2_Event_Data_Source_Send *ev = event;
Wl_Cnp_Selection *sel;
Ecore_Wl2_Event_Data_Source_Send *ev;
void *data_ret = NULL;
int len_ret = 0;
int i = 0;
_wl_elm_cnp_init();
cnp_debug("In\n");
ev = event;
sel = data;
len_remained = sel->buflen;
buf = sel->selbuf;
for (i = 0; i < CNP_N_ATOMS; i++)
{
if (!strcmp(_atoms[i].name, ev->type))
{
cnp_debug("Found a type: %s\n", _atoms[i].name);
Dropable *drop;
drop = eo_key_data_get(sel->requestwidget, "__elm_dropable");
if (drop)
drop->last.type = _atoms[i].name;
if (_atoms[i].wl_converter)
{
_atoms[i].wl_converter(ev->type, sel, sel->selbuf,
sel->buflen, &data_ret, &len_ret);
}
else
{
data_ret = strdup(sel->selbuf);
len_ret = sel->buflen;
}
break;
}
}
while (len_written < sel->buflen)
len_remained = len_ret;
buf = data_ret;
cnp_debug("write: %s", buf);
while (len_written < len_ret)
{
ret = write(ev->fd, buf, len_remained);
if (ret == -1) break;
@ -3084,6 +3113,7 @@ _wl_selection_send(void *udata, int type EINA_UNUSED, void *event)
len_written += ret;
len_remained -= ret;
}
free(data_ret);
close(ev->fd);
return ECORE_CALLBACK_PASS_ON;
@ -3204,8 +3234,7 @@ _wl_elm_dnd_init(void)
text_uri = eina_stringshare_add("text/uri-list");
ecore_event_handler_add(ECORE_WL2_EVENT_DATA_SOURCE_SEND,
_wl_dnd_send, &wl_cnp_selection);
_wl_elm_cnp_init();
ecore_event_handler_add(ECORE_WL2_EVENT_SELECTION_DATA_READY,
_wl_dnd_receive, &wl_cnp_selection);
@ -3634,63 +3663,6 @@ _wl_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_wl_dnd_send(void *data, int type EINA_UNUSED, void *event)
{
char *buf;
int ret, len_remained;
int len_written = 0;
Wl_Cnp_Selection *sel;
Ecore_Wl2_Event_Data_Source_Send *ev;
void *data_ret = NULL;
int len_ret = 0;
int i = 0;
cnp_debug("In\n");
ev = event;
sel = data;
for (i = 0; i < CNP_N_ATOMS; i++)
{
if (!strcmp(_atoms[i].name, ev->type))
{
cnp_debug("Found a type: %s\n", _atoms[i].name);
Dropable *drop;
drop = eo_key_data_get(sel->requestwidget, "__elm_dropable");
if (drop)
drop->last.type = _atoms[i].name;
if (_atoms[i].wl_converter)
{
_atoms[i].wl_converter(ev->type, sel, sel->selbuf,
sel->buflen, &data_ret, &len_ret);
}
else
{
data_ret = strdup(sel->selbuf);
len_ret = sel->buflen;
}
break;
}
}
len_remained = len_ret;
buf = data_ret;
cnp_debug("write: %s\n", buf);
while (len_written < len_ret)
{
ret = write(ev->fd, buf, len_remained);
if (ret == -1) break;
buf += ret;
len_written += ret;
len_remained -= ret;
}
free(data_ret);
close(ev->fd);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_wl_dnd_receive(void *data, int type EINA_UNUSED, void *event)
{