aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-06-10 14:21:43 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-06-11 12:22:17 +0200
commit09ba97b2d0ff3e2f8203679480fe5a54020637b2 (patch)
tree50428679147695ec80c2bc2e562d3549038ddc97 /nx-X11/programs/Xserver/hw
parent2972f6af1b63f4e98aa4504a83f756b8486c7df0 (diff)
downloadnx-libs-09ba97b2d0ff3e2f8203679480fe5a54020637b2.tar.gz
nx-libs-09ba97b2d0ff3e2f8203679480fe5a54020637b2.tar.bz2
nx-libs-09ba97b2d0ff3e2f8203679480fe5a54020637b2.zip
NXdispatch.c: Use Callback instead of a modified function
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c9
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c9
2 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 80ca5fac1..1e24a618e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -143,6 +143,11 @@ void OsVendorEndRedirectErrorFFunction();
static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data,
void *args);
+#ifdef NXAGENT_CLIPBOARD
+extern void nxagentSetSelectionCallback(CallbackListPtr *callbacks, void *data,
+ void *args);
+#endif
+
void ddxInitGlobals(void)
{
/*
@@ -411,6 +416,10 @@ FIXME: These variables, if not removed at all because have probably
blackRoot = TRUE;
nxagentInitKeystrokes(False);
+
+#ifdef NXAGENT_CLIPBOARD
+ AddCallback(&SelectionCallback, nxagentSetSelectionCallback, NULL);
+#endif
}
void
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index db055f0cd..44194ff3b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -764,15 +764,6 @@ ProcSetSelectionOwner(register ClientPtr client)
CallCallbacks(&SelectionCallback, &info);
}
-#ifdef NXAGENT_CLIPBOARD
- if ((CurrentSelections[i].pWin != NULL) &&
- (nxagentOption(Clipboard) != ClipboardNone) &&
- ((CurrentSelections[i].selection == XA_PRIMARY) ||
- (CurrentSelections[i].selection == MakeAtom("CLIPBOARD", 9, 0))))
- {
- nxagentSetSelectionOwner(&CurrentSelections[i]);
- }
-#endif
return (client->noClientException);
}
else