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

ecore-wl2: isolate regular selection requests from dnd-specific code 

fix T3455
This commit is contained in:
Mike Blumenkrantz 2016-04-22 11:28:52 -04:00
parent 262ac55287
commit 7da4d8a4ae
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/ecore_wl2/ecore_wl2_dnd.c
View File

@ -151,7 +151,8 @@ data_source_event_emit(Ecore_Wl2_Input *input, int event)
ev->source = input->focus.keyboard->id;
if (!ev->win) ev->win = ev->source;
ev->action = input->drag.source->dnd_action;
if (input->drag.source)
ev->action = input->drag.source->dnd_action;
ecore_event_add(event, ev, NULL, NULL);
}
@ -161,9 +162,10 @@ data_source_cancelled(void *data, struct wl_data_source *source)
{
Ecore_Wl2_Input *input = data;
if (input->drag.source)
input->drag.source->dnd_action = 0;
if (input->data.source == source) input->data.source = NULL;
wl_data_source_destroy(source);
input->drag.source->dnd_action = 0;
data_source_event_emit(input, ECORE_WL2_EVENT_DATA_SOURCE_END);
}
@ -189,7 +191,8 @@ data_source_action(void *data, struct wl_data_source *source EINA_UNUSED, uint32
{
Ecore_Wl2_Input *input = data;
input->drag.source->dnd_action = dnd_action;
if (input->drag.source)
input->drag.source->dnd_action = dnd_action;
data_source_event_emit(input, ECORE_WL2_EVENT_DATA_SOURCE_ACTION);
}
@ -231,9 +234,12 @@ _selection_data_read(void *data, Ecore_Fd_Handler *fdh)
if (len <= 0)
{
if (source->input->display->wl.data_device_manager_version >=
WL_DATA_OFFER_FINISH_SINCE_VERSION)
wl_data_offer_finish(source->offer);
if (source->input->drag.source)
{
if (source->input->display->wl.data_device_manager_version >=
WL_DATA_OFFER_FINISH_SINCE_VERSION)
wl_data_offer_finish(source->offer);
}
if (source->input->selection.source == source)
source->input->selection.source = NULL;
_ecore_wl2_dnd_del(source);