mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-08 13:29:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: fix xdg->xwayland drag-and-drop

Browse source 
As struct wlr_drag is destroyed on drop and in the process resets
the focus, a xwayland dnd listener would also reset xwm->drag_focus.

This prevents the xcb replies from being processed and also prevents
the transfer if a compositor would not additionally request new focus
in its wlr_drag destroy handler (which is something usually only done
when in a focus-follows-mouse setting).

This patch creates a new xwm->drop_focus pointer which is a copy of
xwm->drag_focus at drop time. The xcb reply handler and transfer
logic now use the new xwm->drop_focus for their authorization checks.

(cherry picked from commit 546c5d000d)
This commit is contained in:
Consolatis 2024-11-28 04:46:33 +01:00 • committed by Simon Zeni
parent 35ab453360
commit 0c437f6e98
4 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xwayland/selection/outgoing.c
View file

@ -410,8 +410,11 @@ void xwm_handle_selection_request(struct wlr_xwm *xwm,
return;
}
bool dnd_allowed = selection == &xwm->dnd_selection
&& (xwm->drag_focus != NULL || xwm->drop_focus != NULL);
// No xwayland surface focused, deny access to clipboard
if (xwm->focus_surface == NULL && xwm->drag_focus == NULL) {
if (xwm->focus_surface == NULL && !dnd_allowed) {
if (wlr_log_get_verbosity() >= WLR_DEBUG) {
char *selection_name = xwm_get_atom_name(xwm, selection->atom);
wlr_log(WLR_DEBUG, "denying read access to selection %u (%s): "