From 65877a19995504bc9c2a8cdb17c0ae9f6770534a Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 16 Dec 2019 18:32:39 +0100 Subject: Clipboard.c: fix handling of clipboard=none/client/server/both option --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 715895cf0..8d55c74d7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -911,10 +911,11 @@ void nxagentRequestSelection(XEvent *X) /* * if one of our clients owns the selection we ask it to copy * the selection to the clientCutProperty on nxagent's root - * window + * window on the real X server. */ if (IS_INTERNAL_OWNER(i) && - nxagentOption(Clipboard) != ClipboardClient) + (nxagentOption(Clipboard) == ClipboardServer || + nxagentOption(Clipboard) == ClipboardBoth)) { /* * store who on the real X server requested the data and how @@ -1563,7 +1564,7 @@ void nxagentSetSelectionCallback(CallbackListPtr *callbacks, void *data, #endif if ((pCurSel->pWin != NULL) && - (nxagentOption(Clipboard) != ClipboardNone) && + (nxagentOption(Clipboard) != ClipboardNone) && /* FIXME: shouldn't we also check for != ClipboardClient? */ ((pCurSel->selection == XA_PRIMARY) || (pCurSel->selection == MakeAtom("CLIPBOARD", 9, 0)))) { -- cgit v1.2.3