From 1f976a0f25d55e49e0c34cf47b89e28e693081d5 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 21 Nov 2017 09:25:05 -0500 Subject: [PATCH] xwm: xfixes selection notify --- xwayland/selection.c | 48 +++++++++++++++++++++++++++++++++++++++----- xwayland/xwm.c | 1 + xwayland/xwm.h | 3 +++ 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/xwayland/selection.c b/xwayland/selection.c index c80e1db2..08091fe1 100644 --- a/xwayland/selection.c +++ b/xwayland/selection.c @@ -2,11 +2,6 @@ #include "wlr/util/log.h" #include "xwm.h" -static void xwm_handle_selection_notify(struct wlr_xwm *xwm, xcb_generic_event_t - *event) { - wlr_log(L_DEBUG, "TODO: SELECTION NOTIFY"); -} - static int xwm_handle_selection_property_notify(struct wlr_xwm *xwm, xcb_generic_event_t *event) { xcb_property_notify_event_t *property_notify = @@ -29,6 +24,11 @@ static int xwm_handle_selection_property_notify(struct wlr_xwm *xwm, return 0; } +static void xwm_handle_selection_notify(struct wlr_xwm *xwm, + xcb_generic_event_t *event) { + wlr_log(L_DEBUG, "TODO: SELECTION NOTIFY"); +} + static void xwm_handle_selection_request(struct wlr_xwm *xwm, xcb_generic_event_t *event) { wlr_log(L_DEBUG, "TODO: SELECTION REQUEST"); @@ -38,6 +38,43 @@ static void xwm_handle_selection_request(struct wlr_xwm *xwm, static int weston_wm_handle_xfixes_selection_notify(struct wlr_xwm *xwm, xcb_generic_event_t *event) { wlr_log(L_DEBUG, "TODO: XFIXES SELECTION NOTIFY"); + + xcb_xfixes_selection_notify_event_t *xfixes_selection_notify = + (xcb_xfixes_selection_notify_event_t *) event; + + + if (xfixes_selection_notify->owner == XCB_WINDOW_NONE) { + if (xwm->selection_owner != xwm->selection_window) { + // A real X client selection went away, not our + // proxy selection + // TODO: Clear the wayland selection (or not)? + } + + xwm->selection_owner = XCB_WINDOW_NONE; + + return 1; + } + + // We have to use XCB_TIME_CURRENT_TIME when we claim the + // selection, so grab the actual timestamp here so we can + // answer TIMESTAMP conversion requests correctly. + if (xfixes_selection_notify->owner == xwm->selection_window) { + xwm->selection_timestamp = xfixes_selection_notify->timestamp; + return 1; + } + + xwm->selection_owner = xfixes_selection_notify->owner; + + xwm->incr = 0; + // doing this will give a selection notify where we actually handle the sync + xcb_convert_selection(xwm->xcb_conn, xwm->selection_window, + xwm->atoms[CLIPBOARD], + xwm->atoms[TARGETS], + xwm->atoms[WL_SELECTION], + xfixes_selection_notify->timestamp); + + xcb_flush(xwm->xcb_conn); + return 1; } @@ -57,6 +94,7 @@ int xwm_handle_selection_event(struct wlr_xwm *xwm, switch (event->response_type - xwm->xfixes->first_event) { case XCB_XFIXES_SELECTION_NOTIFY: + // an X11 window has copied something to the clipboard return weston_wm_handle_xfixes_selection_notify(xwm, event); } diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 39cd6362..5ce30f7b 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -45,6 +45,7 @@ const char *atom_map[ATOM_LAST] = { "WM_STATE", "CLIPBOARD", "_WL_SELECTION", + "TARGETS", "CLIPBOARD_MANAGER", }; diff --git a/xwayland/xwm.h b/xwayland/xwm.h index 2daa4eeb..59a26725 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -34,6 +34,7 @@ enum atom_name { CLIPBOARD, CLIPBOARD_MANAGER, WL_SELECTION, + TARGETS, ATOM_LAST, }; @@ -61,6 +62,8 @@ struct wlr_xwm { // selection properties xcb_window_t selection_window; xcb_selection_request_event_t selection_request; + xcb_window_t selection_owner; + xcb_timestamp_t selection_timestamp; int incr; struct wlr_xwayland_surface *focus_surface;