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 a4392a3..81453dc 100644
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -65,7 +65,6 @@
cp.supportsDesktopResize = true;
cp.supportsExtendedDesktopSize = true;
cp.supportsDesktopRename = true;
- cp.supportsLocalCursor = useLocalCursor;
cp.customCompressLevel = customCompressLevel;
cp.compressLevel = compressLevel;
@@ -541,8 +540,6 @@
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 31064ba..abe6a89 100644
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -273,7 +273,6 @@
/* Misc. */
sharedCheckbox->value(shared);
fullScreenCheckbox->value(fullScreen);
- localCursorCheckbox->value(useLocalCursor);
dotCursorCheckbox->value(dotWhenNoCursor);
}
@@ -366,7 +365,6 @@
/* 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 @@
_("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 9968331..dfe2b65 100644
--- a/vncviewer/OptionsDialog.h
+++ b/vncviewer/OptionsDialog.h
@@ -111,7 +111,6 @@
/* 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 b6926f5..c50d1e9 100644
--- 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 37ca52b..d07d4ea 100644
--- 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;