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

use kbd focus resource's client instead of "focused" client in data device

This commit is contained in:
Mike Blumenkrantz 2017-07-07 16:26:32 -04:00
parent 9fc9fce9a7
commit 4d92808e65
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_comp_wl_data.c
View File

@ -1087,6 +1087,7 @@ e_comp_wl_data_device_keyboard_focus_set(void)
{
struct wl_resource *data_device_res, *offer_res = NULL, *focus;
E_Comp_Wl_Data_Source *source;
E_Client *focused;
if (!e_comp_wl->kbd.enabled)
{
@ -1099,6 +1100,7 @@ e_comp_wl_data_device_keyboard_focus_set(void)
ERR("No focused resource");
return;
}
focused = wl_resource_get_user_data(focus);
source = (E_Comp_Wl_Data_Source *)e_comp_wl->selection.data_source;
#ifndef HAVE_WAYLAND_ONLY
@ -1107,10 +1109,10 @@ e_comp_wl_data_device_keyboard_focus_set(void)
if (!e_comp_util_has_xwayland()) break;
if (e_comp_wl->clipboard.xwl_owner)
{
if (e_client_has_xwindow(e_client_focused_get())) return;
if (e_client_has_xwindow(focused)) return;
break;
}
else if (source && e_client_has_xwindow(e_client_focused_get()))
else if (source && e_client_has_xwindow(focused))
{
/* wl -> x11 */
ecore_x_selection_owner_set(e_comp->cm_selection,