SendSysKeys setting removed as it almost duplicates new DisableWinKeys setting by...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/merge-with-vnc-4.1.1@553 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/CConnOptions.cxx b/vncviewer/CConnOptions.cxx
index 0c35accd4232e3cc9e8c64fcc47789ccf5a16898..4ea0ada166776c26c91bc740ac38f28af7b824c2 100644 (file)
--- a/vncviewer/CConnOptions.cxx
+++ b/vncviewer/CConnOptions.cxx
@@ -68,8 +68,6 @@ static BoolParameter sendPtrEvents("SendPointerEvents",
                          "Send pointer (mouse) events to the server.", true);
 static BoolParameter sendKeyEvents("SendKeyEvents",
                          "Send key presses (and releases) to the server.", true);
-static BoolParameter sendSysKeys("SendSysKeys",
-                         "Send system keys (Alt combinations) to the server.", true);
 
 static BoolParameter clientCutText("ClientCutText",
                          "Send clipboard changes to the server.", true);
@@ -121,7 +119,7 @@ static IntParameter qualityLevel("QualityLevel",
 CConnOptions::CConnOptions()
 : useLocalCursor(::useLocalCursor), useDesktopResize(::useDesktopResize),
 autoSelect(::autoSelect), fullColour(::fullColour), fullScreen(::fullScreen),
-shared(::sharedConnection), sendPtrEvents(::sendPtrEvents), sendKeyEvents(::sendKeyEvents), sendSysKeys(::sendSysKeys),
+shared(::sharedConnection), sendPtrEvents(::sendPtrEvents), sendKeyEvents(::sendKeyEvents),
 preferredEncoding(encodingZRLE), clientCutText(::clientCutText), serverCutText(::serverCutText),
 disableWinKeys(::disableWinKeys), protocol3_3(::protocol3_3), acceptBell(::acceptBell),
 lowColourLevel(::lowColourLevel), pointerEventInterval(ptrEventInterval),
@@ -226,8 +224,6 @@ void CConnOptions::readFromFile(const char* filename) {
             sendPtrEvents = atoi(value.buf);
           } else if (stricmp(name.buf, "SendKeyEvents") == 0) {
             sendKeyEvents = atoi(value.buf);
-          } else if (stricmp(name.buf, "SendSysKeys") == 0) {
-            sendSysKeys = atoi(value.buf);
           } else if (stricmp(name.buf, "SendCutText") == 0) {
             clientCutText = atoi(value.buf);
           } else if (stricmp(name.buf, "AcceptCutText") == 0) {
@@ -334,7 +330,6 @@ void CConnOptions::writeToFile(const char* filename) {
     fprintf(f, "Shared=%d\n", (int)shared);
     fprintf(f, "SendPtrEvents=%d\n", (int)sendPtrEvents);
     fprintf(f, "SendKeyEvents=%d\n", (int)sendKeyEvents);
-    fprintf(f, "SendSysKeys=%d\n", (int)sendSysKeys);
     fprintf(f, "SendCutText=%d\n", (int)clientCutText);
     fprintf(f, "AcceptCutText=%d\n", (int)serverCutText);
     fprintf(f, "DisableWinKeys=%d\n", (int)disableWinKeys);
@@ -373,7 +368,6 @@ void CConnOptions::writeDefaults() {
   key.setBool(_T("Shared"), shared);
   key.setBool(_T("SendPointerEvents"), sendPtrEvents);
   key.setBool(_T("SendKeyEvents"), sendKeyEvents);
-  key.setBool(_T("SendSysKeys"), sendSysKeys);
   key.setBool(_T("ClientCutText"), clientCutText);
   key.setBool(_T("ServerCutText"), serverCutText);
   key.setBool(_T("DisableWinKeys"), disableWinKeys);
@@ -432,7 +426,6 @@ CConnOptions& CConnOptions::operator=(const CConnOptions& o) {
   shared = o.shared;
   sendPtrEvents = o.sendPtrEvents;
   sendKeyEvents = o.sendKeyEvents;
-  sendSysKeys = o.sendSysKeys;
   clientCutText = o.clientCutText;
   serverCutText = o.serverCutText;
   disableWinKeys = o.disableWinKeys;

diff --git a/vncviewer/CConnOptions.h b/vncviewer/CConnOptions.h
index 52c3996eed66ea8eb1542d3d50fe47b1c9fc0c29..59fd0a3c8c1a70344376aa4e401d641d0129697c 100644 (file)
--- a/vncviewer/CConnOptions.h
+++ b/vncviewer/CConnOptions.h
@@ -58,7 +58,6 @@ namespace rfb {
       bool shared;
       bool sendPtrEvents;
       bool sendKeyEvents;
-      bool sendSysKeys;
       bool showToolbar;
       bool clientCutText;
       bool serverCutText;

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index 93e033aa82d1d7edc09e823f28790e826413a694..2e43b38f372594db9d663821569b72e0eb690578 100644 (file)
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -188,7 +188,6 @@ public:
   virtual void initDialog() {
     setItemChecked(IDC_SEND_POINTER, dlg->options.sendPtrEvents);
     setItemChecked(IDC_SEND_KEYS, dlg->options.sendKeyEvents);
-    setItemChecked(IDC_SEND_SYSKEYS, dlg->options.sendSysKeys);
     setItemChecked(IDC_CLIENT_CUTTEXT, dlg->options.clientCutText);
     setItemChecked(IDC_SERVER_CUTTEXT, dlg->options.serverCutText);
     setItemChecked(IDC_DISABLE_WINKEYS, dlg->options.disableWinKeys && !osVersion.isPlatformWindows);
@@ -213,7 +212,6 @@ public:
   virtual bool onOk() {
     dlg->options.sendPtrEvents = isItemChecked(IDC_SEND_POINTER);
     dlg->options.sendKeyEvents = isItemChecked(IDC_SEND_KEYS);
-    dlg->options.sendSysKeys = isItemChecked(IDC_SEND_SYSKEYS);
     dlg->options.clientCutText = isItemChecked(IDC_CLIENT_CUTTEXT);
     dlg->options.serverCutText = isItemChecked(IDC_SERVER_CUTTEXT);
     dlg->options.disableWinKeys = isItemChecked(IDC_DISABLE_WINKEYS);