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

cnp: only nul terminate wayland drops for text type drops 

also move data allocation into block where dropping is guaranteed

@fix
This commit is contained in:
Mike Blumenkrantz 2015-08-13 15:27:14 -04:00
parent a598a75444
commit 8478b6b84a
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
legacy/elementary/src/lib/elm_cnp.c
View File

@ -3208,28 +3208,22 @@ _wl_dnd_end(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSE
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_wl_dropable_match(Dropable_Cbs *cbs, Dropable *drop, Elm_Sel_Format fmt)
{
return (cbs->types & fmt) && (drop->last.format & fmt);
}
static void
_wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data, size_t size)
{
cnp_debug("In\n");
Dropable *drop;
Elm_Selection_Data sdata;
char *s = NULL;
char *s;
s = (char*)eina_memdup((unsigned char*)data, size, 0);
if (!s)
{
ecore_wl_dnd_drag_end(ecore_wl_input_get());
return;
}
sdata.action = ELM_XDND_ACTION_COPY;
if (savedtypes.textreq)
{
savedtypes.textreq = 0;
savedtypes.imgfile = s;
}
sdata.len = size;
sdata.x = savedtypes.x;
sdata.y = savedtypes.y;
@ -3243,10 +3237,23 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data, size_t size)
{
if (cbs->types & drop->last.format)
{
if ((cbs->types & ELM_SEL_FORMAT_IMAGE) && (drop->last.format & ELM_SEL_FORMAT_IMAGE))
s = (char*)eina_memdup((unsigned char*)data, size,
_wl_dropable_match(cbs, drop, ELM_SEL_FORMAT_TEXT));
if (!s)
{
ecore_wl_dnd_drag_end(ecore_wl_input_get());
return;
}
if (savedtypes.textreq)
{
savedtypes.textreq = 0;
savedtypes.imgfile = s;
}
if (_wl_dropable_match(cbs, drop, ELM_SEL_FORMAT_IMAGE))
{
/* If it's markup that also supports images */
if ((cbs->types & ELM_SEL_FORMAT_MARKUP) && (drop->last.format & ELM_SEL_FORMAT_MARKUP))
if (_wl_dropable_match(cbs, drop, ELM_SEL_FORMAT_MARKUP))
sdata.format = ELM_SEL_FORMAT_MARKUP;
else
sdata.format = ELM_SEL_FORMAT_IMAGE;