Remove indirect capability attributes
Better to check the actual list of supported encodings directly.
Makes parts more readable, and no risk of getting out of sync.
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 34bb1e8..15b2f9a 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -385,8 +385,7 @@
if (state() != RFBSTATE_NORMAL)
return false;
- if (!client.supportsLocalCursorWithAlpha &&
- !client.supportsLocalCursor && !client.supportsLocalXCursor)
+ if (!client.supportsLocalCursor())
return true;
if (!server->cursorPos.equals(pointerEventPos) &&
(time(0) - pointerEventTime) > 0)
@@ -572,7 +571,7 @@
// Lock key heuristics
// (only for clients that do not support the LED state extension)
- if (!client.supportsLEDState) {
+ if (!client.supportsLEDState()) {
// Always ignore ScrollLock as we don't have a heuristic
// for that
if (keysym == XK_Scroll_Lock) {
@@ -787,7 +786,7 @@
{
Rect rect;
- if (!client.supportsFence || !client.supportsContinuousUpdates)
+ if (!client.supportsFence() || !client.supportsContinuousUpdates())
throw Exception("Client tried to enable continuous updates when not allowed");
continuousUpdates = enable;
@@ -803,7 +802,7 @@
}
// supportsLocalCursor() is called whenever the status of
-// client.supportsLocalCursor has changed. If the client does now support local
+// client.supportsLocalCursor() has changed. If the client does now support local
// cursor, we make sure that the old server-side rendered cursor is cleaned up
// and the cursor is sent to the client.
@@ -825,7 +824,7 @@
{
// We refuse to use continuous updates if we cannot monitor the buffer
// usage using fences.
- if (!client.supportsFence)
+ if (!client.supportsFence())
return;
writer()->writeEndOfContinuousUpdates();
@@ -868,7 +867,7 @@
{
char type;
- if (!client.supportsFence)
+ if (!client.supportsFence())
return;
congestion.updatePosition(sock->outStream().length());
@@ -895,7 +894,7 @@
if (sock->outStream().bufferUsage() > 0)
return true;
- if (!client.supportsFence)
+ if (!client.supportsFence())
return false;
congestion.updatePosition(sock->outStream().length());