summaryrefslogtreecommitdiffstats
path: root/common/rfb
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2011-11-08 10:32:05 +0000
committerPierre Ossman <ossman@cendio.se>2011-11-08 10:32:05 +0000
commit5c9e1e51c10a9e037f99496b0996317e29b428c3 (patch)
tree736ea827ca5d6cb6d855d26dceb214314ea48bff /common/rfb
parentbfd47f17db65d188b03d932ffba20b298bf6bad7 (diff)
downloadtigervnc-5c9e1e51c10a9e037f99496b0996317e29b428c3.tar.gz
tigervnc-5c9e1e51c10a9e037f99496b0996317e29b428c3.zip
Avoid some unnecessary processing when server side cursor isn't used (which
is the common case). git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4780 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/rfb')
-rw-r--r--common/rfb/VNCSConnectionST.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 84fc2ca1..d73d753e 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -285,7 +285,8 @@ int VNCSConnectionST::checkIdleTimeout()
void VNCSConnectionST::renderedCursorChange()
{
if (state() != RFBSTATE_NORMAL) return;
- removeRenderedCursor = true;
+ if (!renderedCursorRect.is_empty())
+ removeRenderedCursor = true;
if (needRenderedCursor())
drawRenderedCursor = true;
}
@@ -565,7 +566,8 @@ void VNCSConnectionST::setInitialColourMap()
void VNCSConnectionST::supportsLocalCursor()
{
if (cp.supportsLocalCursor || cp.supportsLocalXCursor) {
- removeRenderedCursor = true;
+ if (!renderedCursorRect.is_empty())
+ removeRenderedCursor = true;
drawRenderedCursor = false;
setCursor();
}