From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 8 Jul 2016 12:23:21 +0000 (+0200)
Subject: Allow control of PRIMARY behaviour by default
X-Git-Tag: v1.7.90~101
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fee22107dbbd57df2602bebcd577c88ba01f62e9;p=tigervnc.git

Allow control of PRIMARY behaviour by default

It was previously controlled by vncconfig which had no restrictions,
so at least include the relevant settings in the default list of
overrides.
---

diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man
index f0f90f8f..04e8f94b 100644
--- a/unix/xserver/hw/vnc/Xvnc.man
+++ b/unix/xserver/hw/vnc/Xvnc.man
@@ -317,7 +317,7 @@ programs allowed to override the parameters.
 When \fBNoClipboard\fP parameter is set, allowing override of \fBSendCutText\fP
 and \fBAcceptCutText\fP has no effect.
 
-Default is \fBdesktop,AcceptPointerEvents,SendCutText,AcceptCutText\fP.
+Default is \fBdesktop,AcceptPointerEvents,SendCutText,AcceptCutText,SendPrimary,SetPrimary\fP.
 
 .SH USAGE WITH INETD
 By configuring the \fBinetd\fP(1) service appropriately, Xvnc can be launched
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 0ad34a27..36d3742b 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -84,7 +84,7 @@ rfb::BoolParameter avoidShiftNumLock("AvoidShiftNumLock",
                                      true);
 rfb::StringParameter allowOverride("AllowOverride",
                                    "Comma separated list of parameters that can be modified using VNC extension.",
-                                   "desktop,AcceptPointerEvents,SendCutText,AcceptCutText");
+                                   "desktop,AcceptPointerEvents,SendCutText,AcceptCutText,SendPrimary,SetPrimary");
 rfb::BoolParameter setPrimary("SetPrimary", "Set the PRIMARY as well "
                               "as the CLIPBOARD selection", true);
 rfb::BoolParameter sendPrimary("SendPrimary",