Eliminated two GCC warnings:
* The return statement in needRenderedCursor was way too complicated,
separated into intermediate variable.
* Using parenthesis in setStatus bit masks.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3971 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index e286cf3..c19b879 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -321,10 +321,9 @@
bool VNCSConnectionST::needRenderedCursor()
{
+ bool pointerpos = (!server->cursorPos.equals(pointerEventPos) && (time(0) - pointerEventTime) > 0);
return (state() == RFBSTATE_NORMAL
- && (!cp.supportsLocalCursor && !cp.supportsLocalXCursor
- || (!server->cursorPos.equals(pointerEventPos) &&
- (time(0) - pointerEventTime) > 0)));
+ && ((!cp.supportsLocalCursor && !cp.supportsLocalXCursor) || pointerpos));
}
@@ -805,7 +804,7 @@
accessRights = accessRights | AccessPtrEvents | AccessKeyEvents | AccessView;
break;
case 1:
- accessRights = accessRights & !(AccessPtrEvents | AccessKeyEvents) | AccessView;
+ accessRights = accessRights & (!(AccessPtrEvents | AccessKeyEvents) | AccessView);
break;
case 2:
accessRights = accessRights & !(AccessPtrEvents | AccessKeyEvents | AccessView);