Only update rendered cursor when requested
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 64adda1..ea50f83 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -997,8 +997,7 @@
Region req;
UpdateInfo ui;
bool needNewUpdateInfo;
- bool drawRenderedCursor;
- RenderedCursor *cursor;
+ const RenderedCursor *cursor;
updates.enable_copyrect(cp.useCopyRect);
@@ -1064,21 +1063,21 @@
// with the update region, we need to draw the rendered cursor regardless of
// whether it has changed.
- drawRenderedCursor = false;
+ cursor = NULL;
if (needRenderedCursor()) {
Rect renderedCursorRect;
+ cursor = server->getRenderedCursor();
+
renderedCursorRect
- = server->renderedCursor.getEffectiveRect()
- .intersect(req.get_bounding_rect());
+ = cursor->getEffectiveRect().intersect(req.get_bounding_rect());
if (renderedCursorRect.is_empty()) {
- drawRenderedCursor = false;
- } else if (updateRenderedCursor) {
- drawRenderedCursor = true;
- } else if (!ui.changed.union_(ui.copied)
+ cursor = NULL;
+ } else if (!updateRenderedCursor &&
+ ui.changed.union_(ui.copied)
.intersect(renderedCursorRect).is_empty()) {
- drawRenderedCursor = true;
+ cursor = NULL;
}
// We could remove the new cursor rect from updates here. It's not clear
@@ -1086,7 +1085,7 @@
// the same bit of screen twice, but we have the overhead of a more complex
// region.
- //if (drawRenderedCursor) {
+ //if (cursor) {
// updates.subtract(renderedCursorRect);
// updates.getUpdateInfo(&ui, req);
//}
@@ -1095,13 +1094,9 @@
updateRenderedCursor = false;
}
- if (ui.is_empty() && !writer()->needFakeUpdate() && !drawRenderedCursor)
+ if (ui.is_empty() && !writer()->needFakeUpdate() && !cursor)
return;
- cursor = NULL;
- if (drawRenderedCursor)
- cursor = &server->renderedCursor;
-
writeRTTPing();
encodeManager.writeUpdate(ui, server->getPixelBuffer(), cursor);
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index e15cd70..80c79fc 100644
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -1,5 +1,5 @@
/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
- * Copyright 2009-2014 Pierre Ossman for Cendio AB
+ * Copyright 2009-2016 Pierre Ossman for Cendio AB
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -621,12 +621,8 @@
Rect clippedCursorRect
= cursor.getRect(cursorPos.subtract(cursor.hotspot)).intersect(pb->getRect());
- if (!renderedCursorInvalid && (toCheck.intersect(clippedCursorRect)
- .is_empty())) {
- renderCursor = false;
- } else {
- toCheck.assign_union(clippedCursorRect);
- }
+ if (!toCheck.intersect(clippedCursorRect).is_empty())
+ renderedCursorInvalid = true;
}
pb->grabRegion(toCheck);
@@ -639,11 +635,6 @@
if (comparer->compare())
comparer->getUpdateInfo(&ui, pb->getRect());
- if (renderCursor) {
- renderedCursor.update(pb, &cursor, cursorPos);
- renderedCursorInvalid = false;
- }
-
std::list<VNCSConnectionST*>::iterator ci, ci_next;
for (ci = clients.begin(); ci != clients.end(); ci = ci_next) {
ci_next = ci; ci_next++;
@@ -656,6 +647,16 @@
return true;
}
+const RenderedCursor* VNCServerST::getRenderedCursor()
+{
+ if (renderedCursorInvalid) {
+ renderedCursor.update(pb, &cursor, cursorPos);
+ renderedCursorInvalid = false;
+ }
+
+ return &renderedCursor;
+}
+
void VNCServerST::getConnInfo(ListConnInfo * listConn)
{
listConn->Clear();
diff --git a/common/rfb/VNCServerST.h b/common/rfb/VNCServerST.h
index 0ced12a..1caea4e 100644
--- a/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@ -1,4 +1,5 @@
/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ * Copyright 2009-2016 Pierre Ossman for Cendio AB
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -230,6 +231,7 @@
bool checkDefer();
void tryUpdate();
bool checkUpdate();
+ const RenderedCursor* getRenderedCursor();
void notifyScreenLayoutChange(VNCSConnectionST *requester);