blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only reply to clipboard selection events

This commit is contained in:
emersion 2017-12-14 16:44:30 +01:00
parent a4094c82c7
commit 343efd0c20
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xwayland/selection.c
View File

@ -237,6 +237,10 @@ static void xwm_handle_selection_request(struct wlr_xwm *xwm,
xcb_selection_request_event_t *selection_request = xcb_selection_request_event_t *selection_request =
(xcb_selection_request_event_t *) event; (xcb_selection_request_event_t *) event;
if (selection_request->selection != xwm->atoms[CLIPBOARD]) {
return;
}
xwm->selection_request = *selection_request; xwm->selection_request = *selection_request;
xwm->incr = 0; xwm->incr = 0;
xwm->flush_property_on_delete = 0; xwm->flush_property_on_delete = 0;
@ -523,6 +527,10 @@ static void xwm_handle_selection_notify(struct wlr_xwm *xwm,
xcb_selection_notify_event_t *selection_notify = xcb_selection_notify_event_t *selection_notify =
(xcb_selection_notify_event_t *) event; (xcb_selection_notify_event_t *) event;
if (selection_notify->selection != xwm->atoms[CLIPBOARD]) {
return;
}
if (selection_notify->property == XCB_ATOM_NONE) { if (selection_notify->property == XCB_ATOM_NONE) {
wlr_log(L_ERROR, "convert selection failed"); wlr_log(L_ERROR, "convert selection failed");
} else if (selection_notify->target == xwm->atoms[TARGETS]) { } else if (selection_notify->target == xwm->atoms[TARGETS]) {
@ -537,6 +545,10 @@ static int xwm_handle_xfixes_selection_notify(struct wlr_xwm *xwm,
xcb_xfixes_selection_notify_event_t *xfixes_selection_notify = xcb_xfixes_selection_notify_event_t *xfixes_selection_notify =
(xcb_xfixes_selection_notify_event_t *) event; (xcb_xfixes_selection_notify_event_t *) event;
if (xfixes_selection_notify->selection != xwm->atoms[CLIPBOARD]) {
return 0;
}
if (xfixes_selection_notify->owner == XCB_WINDOW_NONE) { if (xfixes_selection_notify->owner == XCB_WINDOW_NONE) {
if (xwm->selection_owner != xwm->selection_window) { if (xwm->selection_owner != xwm->selection_window) {
// A real X client selection went away, not our // A real X client selection went away, not our
@ -563,7 +575,7 @@ static int xwm_handle_xfixes_selection_notify(struct wlr_xwm *xwm,
xwm->incr = 0; xwm->incr = 0;
// doing this will give a selection notify where we actually handle the sync // doing this will give a selection notify where we actually handle the sync
xcb_convert_selection(xwm->xcb_conn, xwm->selection_window, xcb_convert_selection(xwm->xcb_conn, xwm->selection_window,
xwm->atoms[CLIPBOARD], xfixes_selection_notify->selection,
xwm->atoms[TARGETS], xwm->atoms[TARGETS],
xwm->atoms[WL_SELECTION], xwm->atoms[WL_SELECTION],
xfixes_selection_notify->timestamp); xfixes_selection_notify->timestamp);