commit 77ede0a01faa06d9d241da0c62a41d6b388a521c
author Pierre Ossman <ossman@cendio.se> Mon Dec 05 16:57:30 2016 +0100
committer Pierre Ossman <ossman@cendio.se> Fri Feb 24 13:15:40 2017 +0100
tree e0cec47f3f11f010329f1f8e3d4076976e4898b5
parent cef3cf793d1daa6bbb12ec1065b3e510a8baf203

Clean up VNCSConnectionST::needRenderedCursor()

Make it a bit more readable.

common/rfb/VNCSConnectionST.cxx

diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 6012d74..64adda1 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -377,9 +377,16 @@
 
 bool VNCSConnectionST::needRenderedCursor()
 {
-  bool pointerpos = (!server->cursorPos.equals(pointerEventPos) && (time(0) - pointerEventTime) > 0);
-  return (state() == RFBSTATE_NORMAL
-          && ((!cp.supportsLocalCursor && !cp.supportsLocalXCursor) || pointerpos));
+  if (state() != RFBSTATE_NORMAL)
+    return false;
+
+  if (!cp.supportsLocalCursor && !cp.supportsLocalXCursor)
+    return true;
+  if (!server->cursorPos.equals(pointerEventPos) &&
+      (time(0) - pointerEventTime) > 0)
+    return true;
+
+  return false;
 }