enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

move wl data device focus-change handling to data device leave() fn 

leave() is always called before enter(), meaning that this will handle
window1 -> window2 as well as window1 -> null
This commit is contained in:
Mike Blumenkrantz 2017-02-10 17:23:43 -05:00
parent 0acea1a2b1
commit 1f7bd4b83d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/e_comp_wl_data.c
View File

@ -967,17 +967,6 @@ e_comp_wl_data_device_send_enter(E_Client *ec)
if (!e_client_has_xwindow(ec))
{
E_Comp_Wl_Data_Source *drag_source = e_comp_wl->drag_source;
if (drag_source &&
drag_source->offer)
{
E_Comp_Wl_Data_Offer *offer;
/* Unlink the offer from the source */
offer = drag_source->offer;
offer->source = NULL;
drag_source->offer = NULL;
drag_source->accepted = 0;
wl_list_remove(&offer->source_destroy_listener.link);
}
data_device_res =
e_comp_wl_data_find_for_client(wl_resource_get_client(ec->comp_data->surface));
if (!data_device_res) return;
@ -1065,6 +1054,20 @@ e_comp_wl_data_device_send_leave(E_Client *ec)
return;
}
#endif
{
E_Comp_Wl_Data_Source *drag_source = e_comp_wl->drag_source;
if (drag_source &&
drag_source->offer)
{
E_Comp_Wl_Data_Offer *offer;
/* Unlink the offer from the source */
offer = drag_source->offer;
offer->source = NULL;
drag_source->offer = NULL;
drag_source->accepted = 0;
wl_list_remove(&offer->source_destroy_listener.link);
}
}
res = e_comp_wl_data_find_for_client(wl_resource_get_client(ec->comp_data->surface));
if (res)
wl_data_device_send_leave(res);