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

handle xwl data source cleanup more effectively 

ensure source is freed and references to it are unset when changing selection
This commit is contained in:
Mike Blumenkrantz 2017-07-28 13:49:30 -04:00
parent 5ddb8779e2
commit 5a13ab0385
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/xwayland/dnd.c
View File

@ -143,6 +143,12 @@ _xwayland_send_send(E_Comp_Wl_Data_Source *source EINA_UNUSED, const char* mime_
xconvertselection(ecore_x_display_get(), sel, type, xwl_dnd_atom, e_comp->cm_selection, 0);
}
static void
_xwayland_send_cancelled(E_Comp_Wl_Data_Source *source)
{
e_comp_wl_clipboard_source_unref((void*)source);
}
static void
_xwayland_cancelled_send(E_Comp_Wl_Data_Source *source EINA_UNUSED)
{
@ -234,9 +240,14 @@ _xwl_fixes_selection_notify(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_X_Even
{
if (ev->owner)
{
if (e_comp_wl->clipboard.source)
e_comp_wl_clipboard_source_unref(e_comp_wl->clipboard.source);
if (e_comp_wl->selection.data_source)
{
E_Comp_Wl_Data_Source *psource = e_comp_wl->selection.data_source;
if (psource->cancelled)
psource->cancelled(psource);
}
e_comp_wl->clipboard.source = NULL;
e_comp_wl->selection.data_source = NULL;
e_comp_wl->clipboard.xwl_owner = ev->owner;
xconvertselection(ecore_x_display_get(), ECORE_X_ATOM_SELECTION_CLIPBOARD,
ECORE_X_ATOM_SELECTION_TARGETS, xwl_dnd_atom, e_comp->cm_selection, 0);
@ -279,6 +290,7 @@ _xwl_selection_notify(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_X_Event_Sele
e_comp_wl->selection.data_source = &source->data_source;
source->data_source.resource = dsource->resource;
source->data_source.send = _xwayland_send_send;
source->data_source.cancelled = _xwayland_send_cancelled;
if (e_client_has_xwindow(e_client_focused_get()))
e_comp_wl_data_device_keyboard_focus_set();
return ECORE_CALLBACK_RENEW;