spicec-x11: Work around a bug in xsel

Although ICCCM 2.2. Responsibilities of the Selection Owner:
http://tronche.com/gui/x/icccm/sec-2.html#s-2.2

Clearly states (about selection notify events):
The owner should set the specified selection, target, time, and property
arguments to the values received in the SelectionRequest event.

xsel sets the selection notify event target member to the incr atom when it
is going to send the clipboard data incremental, rather then setting it to
the UTF8_STRING atom (which was the target of the SelectionRequest).

Work around this (esp as it is likely other programs may get this wrong too)
and accept the incr atom as a valid target in a selection notify event.

This fixes Alon's test with running:
python -c "print list(range(1000))" | xsel -i -b
on the client.
This commit is contained in:
Hans de Goede 2011-03-23 17:16:21 +01:00
parent 4020e24345
commit 66dde82fee

View File

@ -2676,7 +2676,9 @@ static void handle_selection_notify(XEvent& event, bool incr)
if (clipboard_request_target == None)
LOG_INFO("SelectionNotify received without a target");
else if (!incr && event.xselection.target != clipboard_request_target)
else if (!incr &&
event.xselection.target != clipboard_request_target &&
event.xselection.target != incr_atom)
LOG_WARN("Requested %s target got %s",
atom_name(clipboard_request_target),
atom_name(event.xselection.target));