From a18fd2942a408a956dd3fe0d6b9cefc4ba45faab Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 4 Jan 2023 16:24:54 +0100 Subject: [PATCH] Stop supplying flags to clipboard peek handler The flags should always be empty anyway. --- common/rfb/CConnection.cxx | 2 +- common/rfb/CConnection.h | 2 +- common/rfb/CMsgHandler.cxx | 2 +- common/rfb/CMsgHandler.h | 2 +- common/rfb/CMsgReader.cxx | 2 +- common/rfb/SConnection.cxx | 2 +- common/rfb/SConnection.h | 2 +- common/rfb/SMsgHandler.cxx | 2 +- common/rfb/SMsgHandler.h | 2 +- common/rfb/SMsgReader.cxx | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx index 396b48b3..43cd0165 100644 --- a/common/rfb/CConnection.cxx +++ b/common/rfb/CConnection.cxx @@ -581,7 +581,7 @@ void CConnection::handleClipboardRequest(rdr::U32 flags) handleClipboardRequest(); } -void CConnection::handleClipboardPeek(rdr::U32 flags) +void CConnection::handleClipboardPeek() { if (server.clipboardFlags() & rfb::clipboardNotify) writer()->writeClipboardNotify(hasLocalClipboard ? rfb::clipboardUTF8 : 0); diff --git a/common/rfb/CConnection.h b/common/rfb/CConnection.h index 68554b59..f6818628 100644 --- a/common/rfb/CConnection.h +++ b/common/rfb/CConnection.h @@ -119,7 +119,7 @@ namespace rfb { virtual void handleClipboardCaps(rdr::U32 flags, const rdr::U32* lengths); virtual void handleClipboardRequest(rdr::U32 flags); - virtual void handleClipboardPeek(rdr::U32 flags); + virtual void handleClipboardPeek(); virtual void handleClipboardNotify(rdr::U32 flags); virtual void handleClipboardProvide(rdr::U32 flags, const size_t* lengths, diff --git a/common/rfb/CMsgHandler.cxx b/common/rfb/CMsgHandler.cxx index 8cdfc451..9200e82b 100644 --- a/common/rfb/CMsgHandler.cxx +++ b/common/rfb/CMsgHandler.cxx @@ -154,7 +154,7 @@ void CMsgHandler::handleClipboardRequest(rdr::U32 flags) { } -void CMsgHandler::handleClipboardPeek(rdr::U32 flags) +void CMsgHandler::handleClipboardPeek() { } diff --git a/common/rfb/CMsgHandler.h b/common/rfb/CMsgHandler.h index 43d8df24..e358a4f4 100644 --- a/common/rfb/CMsgHandler.h +++ b/common/rfb/CMsgHandler.h @@ -79,7 +79,7 @@ namespace rfb { virtual void handleClipboardCaps(rdr::U32 flags, const rdr::U32* lengths); virtual void handleClipboardRequest(rdr::U32 flags); - virtual void handleClipboardPeek(rdr::U32 flags); + virtual void handleClipboardPeek(); virtual void handleClipboardNotify(rdr::U32 flags); virtual void handleClipboardProvide(rdr::U32 flags, const size_t* lengths, diff --git a/common/rfb/CMsgReader.cxx b/common/rfb/CMsgReader.cxx index 1ca993aa..1c175584 100644 --- a/common/rfb/CMsgReader.cxx +++ b/common/rfb/CMsgReader.cxx @@ -390,7 +390,7 @@ bool CMsgReader::readExtendedClipboard(rdr::S32 len) handler->handleClipboardRequest(flags); break; case clipboardPeek: - handler->handleClipboardPeek(flags); + handler->handleClipboardPeek(); break; case clipboardNotify: handler->handleClipboardNotify(flags); diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx index f70d21dc..00116414 100644 --- a/common/rfb/SConnection.cxx +++ b/common/rfb/SConnection.cxx @@ -402,7 +402,7 @@ void SConnection::handleClipboardRequest(rdr::U32 flags) handleClipboardRequest(); } -void SConnection::handleClipboardPeek(rdr::U32 flags) +void SConnection::handleClipboardPeek() { if (client.clipboardFlags() & rfb::clipboardNotify) writer()->writeClipboardNotify(hasLocalClipboard ? rfb::clipboardUTF8 : 0); diff --git a/common/rfb/SConnection.h b/common/rfb/SConnection.h index 38969c22..2c382513 100644 --- a/common/rfb/SConnection.h +++ b/common/rfb/SConnection.h @@ -85,7 +85,7 @@ namespace rfb { virtual void clientCutText(const char* str); virtual void handleClipboardRequest(rdr::U32 flags); - virtual void handleClipboardPeek(rdr::U32 flags); + virtual void handleClipboardPeek(); virtual void handleClipboardNotify(rdr::U32 flags); virtual void handleClipboardProvide(rdr::U32 flags, const size_t* lengths, diff --git a/common/rfb/SMsgHandler.cxx b/common/rfb/SMsgHandler.cxx index 0f813178..f00b570b 100644 --- a/common/rfb/SMsgHandler.cxx +++ b/common/rfb/SMsgHandler.cxx @@ -122,7 +122,7 @@ void SMsgHandler::handleClipboardRequest(rdr::U32 flags) { } -void SMsgHandler::handleClipboardPeek(rdr::U32 flags) +void SMsgHandler::handleClipboardPeek() { } diff --git a/common/rfb/SMsgHandler.h b/common/rfb/SMsgHandler.h index b290f194..274a1c3c 100644 --- a/common/rfb/SMsgHandler.h +++ b/common/rfb/SMsgHandler.h @@ -57,7 +57,7 @@ namespace rfb { virtual void handleClipboardCaps(rdr::U32 flags, const rdr::U32* lengths); virtual void handleClipboardRequest(rdr::U32 flags); - virtual void handleClipboardPeek(rdr::U32 flags); + virtual void handleClipboardPeek(); virtual void handleClipboardNotify(rdr::U32 flags); virtual void handleClipboardProvide(rdr::U32 flags, const size_t* lengths, diff --git a/common/rfb/SMsgReader.cxx b/common/rfb/SMsgReader.cxx index e5582630..e7c78c4e 100644 --- a/common/rfb/SMsgReader.cxx +++ b/common/rfb/SMsgReader.cxx @@ -429,7 +429,7 @@ bool SMsgReader::readExtendedClipboard(rdr::S32 len) handler->handleClipboardRequest(flags); break; case clipboardPeek: - handler->handleClipboardPeek(flags); + handler->handleClipboardPeek(); break; case clipboardNotify: handler->handleClipboardNotify(flags); -- 2.39.5