aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-06-14 23:59:05 +0200
committerUlrich Sibiller <uli42@gmx.de>2021-06-20 20:12:51 +0200
commite65e715129ddbefaf2ebb4b14a803b312632705e (patch)
tree03bf0c8bb7ce27049940a3fb6b54aa50524f3e94 /nx-X11/programs/Xserver/hw/nxagent
parentad69d4a0ec5bd1a26942a938d0d902d643b70b4e (diff)
downloadnx-libs-e65e715129ddbefaf2ebb4b14a803b312632705e.tar.gz
nx-libs-e65e715129ddbefaf2ebb4b14a803b312632705e.tar.bz2
nx-libs-e65e715129ddbefaf2ebb4b14a803b312632705e.zip
Clipboard.c: Fix: forward the correct type and format
now stuff like xclip -o -t LENGTH works (if the owner offers that)
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index bb1656d7f..ba26f0915 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1774,7 +1774,7 @@ Bool nxagentCollectPropertyEventFromXServer(int resource)
{
ChangeWindowProperty(lastClients[index].windowPtr,
lastClients[index].property,
- lastClients[index].target,
+ nxagentRemoteToLocalAtom(atomReturnType),
resultFormat, PropModeReplace,
ulReturnItems, pszReturnData, 1);
@@ -2043,12 +2043,11 @@ void handlePropertyTransferFromAgentToXserver(int index, XlibAtom property)
/* Fill the property on the requestor with the requested data. */
/* The XChangeProperty source code reveals it will always
return 1, no matter what, so no need to check the result */
- /* FIXME: better use the format returned by above request. */
XChangeProperty(nxagentDisplay,
lastServers[index].requestor,
lastServers[index].property,
- lastServers[index].target,
- 8,
+ nxagentLocalToRemoteAtom(atomReturnType),
+ resultFormat,
PropModeReplace,
pszReturnData,
ulReturnItems);