Browse Source

Hide setPrimary parameter on non-X11 platforms

It is already hidden in the UI, so make sure it also is gone as a
command line parameter. This follows the behaviour of the similar
sendPrimary parameter.
tags/v1.9.90
Pierre Ossman 5 years ago
parent
commit
5cd3ff6608
2 changed files with 7 additions and 3 deletions
  1. 4
    0
      vncviewer/Viewport.cxx
  2. 3
    3
      vncviewer/parameters.cxx

+ 4
- 0
vncviewer/Viewport.cxx View File



// RFB doesn't have separate selection and clipboard concepts, so we // RFB doesn't have separate selection and clipboard concepts, so we
// dump the data into both variants. // dump the data into both variants.
#if !defined(WIN32) && !defined(__APPLE__)
if (setPrimary) if (setPrimary)
Fl::copy(buffer, ret, 0); Fl::copy(buffer, ret, 0);
#endif
Fl::copy(buffer, ret, 1); Fl::copy(buffer, ret, 1);


delete [] buffer; delete [] buffer;
{ {
if (pendingServerCutText) { if (pendingServerCutText) {
size_t len = strlen(pendingServerCutText); size_t len = strlen(pendingServerCutText);
#if !defined(WIN32) && !defined(__APPLE__)
if (setPrimary) if (setPrimary)
Fl::copy(pendingServerCutText, len, 0); Fl::copy(pendingServerCutText, len, 0);
#endif
Fl::copy(pendingServerCutText, len, 1); Fl::copy(pendingServerCutText, len, 1);
} }
if (pendingClientCutText) { if (pendingClientCutText) {

+ 3
- 3
vncviewer/parameters.cxx View File

BoolParameter acceptClipboard("AcceptClipboard", BoolParameter acceptClipboard("AcceptClipboard",
"Accept clipboard changes from the server", "Accept clipboard changes from the server",
true); true);
BoolParameter setPrimary("SetPrimary",
"Set the primary selection as well as the "
"clipboard selection", true);
BoolParameter sendClipboard("SendClipboard", BoolParameter sendClipboard("SendClipboard",
"Send clipboard changes to the server", true); "Send clipboard changes to the server", true);
#if !defined(WIN32) && !defined(__APPLE__) #if !defined(WIN32) && !defined(__APPLE__)
BoolParameter setPrimary("SetPrimary",
"Set the primary selection as well as the "
"clipboard selection", true);
BoolParameter sendPrimary("SendPrimary", BoolParameter sendPrimary("SendPrimary",
"Send the primary selection to the " "Send the primary selection to the "
"server as well as the clipboard selection", "server as well as the clipboard selection",

Loading…
Cancel
Save