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

save xwindow of x11 selection owner, not client 

gtk uses non-application xwindows for managing selections, so this would always
fail when bridging selections from gtk apps
This commit is contained in:
Mike Blumenkrantz 2017-07-28 13:49:30 -04:00
parent d33351e653
commit def1b28174
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_comp_wl.h
View File

@ -236,7 +236,7 @@ struct _E_Comp_Wl_Data
{
void *source;
struct wl_listener listener;
E_Client *xwl_owner;
Ecore_Window xwl_owner;
} clipboard;
struct

2
src/bin/e_comp_wl_data.c
View File

@ -508,7 +508,7 @@ _e_comp_wl_data_device_selection_set(void *data EINA_UNUSED, E_Comp_Wl_Data_Sour
}
e_comp_wl->selection.data_source = sel_source = source;
e_comp_wl->clipboard.xwl_owner = NULL;
e_comp_wl->clipboard.xwl_owner = 0;
source->serial = e_comp_wl->selection.serial = serial;
if (e_comp_wl->kbd.enabled)

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

@ -155,7 +155,7 @@ _xwl_fixes_selection_notify(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_X_Even
{
if (ev->owner == e_comp->cm_selection)
{
e_comp_wl->clipboard.xwl_owner = NULL;
e_comp_wl->clipboard.xwl_owner = 0;
return ECORE_CALLBACK_RENEW;
}
if (ev->atom == ECORE_X_ATOM_SELECTION_XDND)
@ -237,12 +237,12 @@ _xwl_fixes_selection_notify(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_X_Even
if (e_comp_wl->clipboard.source)
e_comp_wl_clipboard_source_unref(e_comp_wl->clipboard.source);
e_comp_wl->clipboard.source = NULL;
e_comp_wl->clipboard.xwl_owner = ev->owner ? e_pixmap_find_client(E_PIXMAP_TYPE_X, ev->owner) : 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);
}
else
e_comp_wl->clipboard.xwl_owner = NULL;
e_comp_wl->clipboard.xwl_owner = 0;
}
return ECORE_CALLBACK_RENEW;
}