瀏覽代碼

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 年之前
父節點
當前提交
5cd3ff6608
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 4
    0
      vncviewer/Viewport.cxx
  2. 3
    3
      vncviewer/parameters.cxx

+ 4
- 0
vncviewer/Viewport.cxx 查看文件

@@ -262,8 +262,10 @@ void Viewport::serverCutText(const char* str, rdr::U32 len)

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

delete [] buffer;
@@ -752,8 +754,10 @@ void Viewport::flushPendingClipboard()
{
if (pendingServerCutText) {
size_t len = strlen(pendingServerCutText);
#if !defined(WIN32) && !defined(__APPLE__)
if (setPrimary)
Fl::copy(pendingServerCutText, len, 0);
#endif
Fl::copy(pendingServerCutText, len, 1);
}
if (pendingClientCutText) {

+ 3
- 3
vncviewer/parameters.cxx 查看文件

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

Loading…
取消
儲存