From 4c8e311627bda4f5100d18250097152a26652e91 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 8 Jun 2011 17:21:48 +0000 Subject: [PATCH] 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 --- vncviewer/CConn.cxx | 3 --- vncviewer/OptionsDialog.cxx | 8 -------- vncviewer/OptionsDialog.h | 1 - vncviewer/parameters.cxx | 3 +++ vncviewer/parameters.h | 1 + 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx index a4392a35..81453dc3 100644 --- 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 31064ba9..abe6a89d 100644 --- 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::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 9968331f..dfe2b656 100644 --- 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 b6926f58..c50d1e9e 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 37ca52b7..d07d4eaa 100644 --- a/vncviewer/parameters.h +++ b/vncviewer/parameters.h @@ -21,6 +21,7 @@ #include +extern rfb::IntParameter pointerEventInterval; extern rfb::BoolParameter dotWhenNoCursor; extern rfb::StringParameter passwordFile; -- 2.39.5