diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-11 12:24:44 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-11 12:24:44 +0200 |
| commit | c0754a35755cdd4e25386abc6378e07605845948 (patch) | |
| tree | 556107b4e0267c6985f1dc8c7960502b88733983 /nx-X11/programs/Xserver/hw/nxagent/Init.c | |
| parent | 58cd35745086567b5b1fa0fc7a295e849ac070ce (diff) | |
| parent | 848dee5c42bffdf19c4b9f01c38334bf53fefa49 (diff) | |
| download | nx-libs-c0754a35755cdd4e25386abc6378e07605845948.tar.gz nx-libs-c0754a35755cdd4e25386abc6378e07605845948.tar.bz2 nx-libs-c0754a35755cdd4e25386abc6378e07605845948.zip | |
Merge branch 'uli42-pr/use_selection_callback' into 3.6.x
Attributes GH PR #814: https://github.com/ArcticaProject/nx-libs/pull/814
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Init.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 9 |
1 files changed, 9 insertions, 0 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 |