Bah, not enough coffee today. I had already implemented the pointer rate

control, so it can be allowed to stay for now. And there were a bunch of
references to the local cursor option.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4475 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index a4392a35a8470efed1544171e557e0cc8e38f80a..81453dc37a846e3bc4e5326a21df435a38717c10 100644 (file)
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -65,7 +65,6 @@ CConn::CConn(const char* vncServerName)
   cp.supportsDesktopResize = true;
   cp.supportsExtendedDesktopSize = true;
   cp.supportsDesktopRename = true;
-  cp.supportsLocalCursor = useLocalCursor;
 
   cp.customCompressLevel = customCompressLevel;
   cp.compressLevel = compressLevel;
@@ -541,8 +540,6 @@ void CConn::handleOptions(void *data)
     self->cp.qualityLevel = qualityLevel;
   }
 
-  self->cp.supportsLocalCursor = useLocalCursor;
-
   self->cp.customCompressLevel = customCompressLevel;
   self->cp.compressLevel = compressLevel;
 

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index 31064ba9735c966598a8693cb8b1b32801b0030c..abe6a89dece8239a499a685507c95c6f5032d023 100644 (file)
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -273,7 +273,6 @@ void OptionsDialog::loadOptions(void)
   /* Misc. */
   sharedCheckbox->value(shared);
   fullScreenCheckbox->value(fullScreen);
-  localCursorCheckbox->value(useLocalCursor);
   dotCursorCheckbox->value(dotWhenNoCursor);
 }
 
@@ -366,7 +365,6 @@ void OptionsDialog::storeOptions(void)
   /* Misc. */
   shared.setParam(sharedCheckbox->value());
   fullScreen.setParam(fullScreenCheckbox->value());
-  useLocalCursor.setParam(localCursorCheckbox->value());
   dotWhenNoCursor.setParam(dotCursorCheckbox->value());
 
   std::map<OptionsCallback*, void*>::const_iterator iter;
@@ -725,12 +723,6 @@ void OptionsDialog::createMiscPage(int tx, int ty, int tw, int th)
                                                   _("Full-screen mode")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
-  localCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
-                                                  CHECK_MIN_WIDTH,
-                                                  CHECK_HEIGHT,
-                                                  _("Render cursor locally")));
-  ty += CHECK_HEIGHT + TIGHT_MARGIN;
-
   dotCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
                                                   CHECK_MIN_WIDTH,
                                                   CHECK_HEIGHT,

diff --git a/vncviewer/OptionsDialog.h b/vncviewer/OptionsDialog.h
index 9968331f62105d3d7cc5192e724ba1a341b32a09..dfe2b656159c9cf924e143e51c1ccc6f5ce3ec8a 100644 (file)
--- a/vncviewer/OptionsDialog.h
+++ b/vncviewer/OptionsDialog.h
@@ -111,7 +111,6 @@ protected:
   /* Misc. */
   Fl_Check_Button *sharedCheckbox;
   Fl_Check_Button *fullScreenCheckbox;
-  Fl_Check_Button *localCursorCheckbox;
   Fl_Check_Button *dotCursorCheckbox;
 };
 

diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index b6926f5850641a4fe818608cb2c6734deadd09a5..c50d1e9e68e5e11704f6c854f151ed15d56bad81 100644 (file)
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -21,6 +21,9 @@
 
 using namespace rfb;
 
+IntParameter pointerEventInterval("PointerEventInterval",
+                                  "Time in milliseconds to rate-limit"
+                                  " successive pointer events", 0);
 BoolParameter dotWhenNoCursor("DotWhenNoCursor",
                               "Show the dot cursor when the server sends an "
                               "invisible cursor", true);

diff --git a/vncviewer/parameters.h b/vncviewer/parameters.h
index 37ca52b7a06d810b2567e84f4316591fb68539f6..d07d4eaac2f1a490b55d8b7d2b6cc06e00984765 100644 (file)
--- a/vncviewer/parameters.h
+++ b/vncviewer/parameters.h
@@ -21,6 +21,7 @@
 
 #include <rfb/Configuration.h>
 
+extern rfb::IntParameter pointerEventInterval;
 extern rfb::BoolParameter dotWhenNoCursor;
 
 extern rfb::StringParameter passwordFile;