1 files changed, 86 insertions, 71 deletions

diff --git a/common/rfb/SConnection.h b/common/rfb/SConnection.h
index f030ae05..a90b37ca 100644
--- a/common/rfb/SConnection.h
+++ b/common/rfb/SConnection.h
@@ -26,13 +26,16 @@
 
 #include <string>
 
-#include <rdr/InStream.h>
-#include <rdr/OutStream.h>
+#include <core/Timer.h>
 
 #include <rfb/AccessRights.h>
 #include <rfb/SMsgHandler.h>
 #include <rfb/SecurityServer.h>
-#include <rfb/Timer.h>
+
+namespace rdr {
+  class InStream;
+  class OutStream;
+}
 
 namespace rfb {
 
@@ -84,6 +87,59 @@ namespace rfb {
     // cleanup of the SConnection object by the server
     virtual void close(const char* reason);
 
+    // requestClipboard() will result in a request to the client to
+    // transfer its clipboard data. A call to handleClipboardData()
+    // will be made once the data is available.
+    virtual void requestClipboard();
+
+    // announceClipboard() informs the client of changes to the
+    // clipboard on the server. The client may later request the
+    // clipboard data via handleClipboardRequest().
+    virtual void announceClipboard(bool available);
+
+    // sendClipboardData() transfers the clipboard data to the client
+    // and should be called whenever the client has requested the
+    // clipboard via handleClipboardRequest().
+    virtual void sendClipboardData(const char* data);
+
+    // getAccessRights() returns the access rights of a SConnection to the server.
+    AccessRights getAccessRights() { return accessRights; }
+
+    // setAccessRights() allows a security package to limit the access rights
+    // of a SConnection to the server.  How the access rights are treated
+    // is up to the derived class.
+    virtual void setAccessRights(AccessRights ar);
+    virtual bool accessCheck(AccessRights ar) const;
+
+    // authenticated() returns true if the client has authenticated
+    // successfully.
+    bool authenticated() { return (state_ == RFBSTATE_INITIALISATION ||
+                                   state_ == RFBSTATE_NORMAL); }
+
+    SMsgReader* reader() { return reader_; }
+    SMsgWriter* writer() { return writer_; }
+
+    rdr::InStream* getInStream() { return is; }
+    rdr::OutStream* getOutStream() { return os; }
+
+    enum stateEnum {
+      RFBSTATE_UNINITIALISED,
+      RFBSTATE_PROTOCOL_VERSION,
+      RFBSTATE_SECURITY_TYPE,
+      RFBSTATE_SECURITY,
+      RFBSTATE_SECURITY_FAILURE,
+      RFBSTATE_QUERYING,
+      RFBSTATE_INITIALISATION,
+      RFBSTATE_NORMAL,
+      RFBSTATE_CLOSING,
+      RFBSTATE_INVALID
+    };
+
+    stateEnum state() { return state_; }
+
+    int32_t getPreferredEncoding() { return preferredEncoding; }
+
+  protected:
 
     // Overridden from SMsgHandler
 
@@ -91,23 +147,38 @@ namespace rfb {
 
     void clientCutText(const char* str) override;
 
+    void handleClipboardCaps(uint32_t flags,
+                             const uint32_t* lengths) override;
     void handleClipboardRequest(uint32_t flags) override;
     void handleClipboardPeek() override;
     void handleClipboardNotify(uint32_t flags) override;
     void handleClipboardProvide(uint32_t flags, const size_t* lengths,
                                 const uint8_t* const* data) override;
 
-    void supportsQEMUKeyEvent() override;
-
-    virtual void supportsExtendedMouseButtons() override;
-
-
     // Methods to be overridden in a derived class
 
-    // versionReceived() indicates that the version number has just been read
-    // from the client.  The version will already have been "cooked"
-    // to deal with unknown/bogus viewer protocol numbers.
-    virtual void versionReceived();
+    // supportsLocalCursor() is called whenever the status of
+    // cp.supportsLocalCursor has changed.  At the moment this happens on a
+    // setEncodings message, but in the future this may be due to a message
+    // specially for this purpose.
+    virtual void supportsLocalCursor();
+
+    // supportsFence() is called the first time we detect support for fences
+    // in the client. A fence message should be sent at this point to notify
+    // the client of server support.
+    virtual void supportsFence();
+
+    // supportsContinuousUpdates() is called the first time we detect that
+    // the client wants the continuous updates extension. A
+    // EndOfContinuousUpdates message should be sent back to the client at
+    // this point if it is supported.
+    virtual void supportsContinuousUpdates();
+
+    // supportsLEDState() is called the first time we detect that the
+    // client supports the LED state extension. A LEDState message
+    // should be sent back to the client to inform it of the current
+    // server state.
+    virtual void supportsLEDState();
 
     // authSuccess() is called when authentication has succeeded.
     virtual void authSuccess();
@@ -132,7 +203,7 @@ namespace rfb {
     // framebufferUpdateRequest() is called when a FramebufferUpdateRequest
     // message is received.  The derived class must call on to
     // SConnection::framebufferUpdateRequest().
-    void framebufferUpdateRequest(const Rect& r, bool incremental) override;
+    void framebufferUpdateRequest(const core::Rect& r, bool incremental) override;
 
     // fence() is called when we get a fence request or response. By default
     // it responds directly to requests (stating it doesn't support any
@@ -163,62 +234,6 @@ namespace rfb {
     // client received the request.
     virtual void handleClipboardData(const char* data);
 
-
-    // Other methods
-
-    // requestClipboard() will result in a request to the client to
-    // transfer its clipboard data. A call to handleClipboardData()
-    // will be made once the data is available.
-    virtual void requestClipboard();
-
-    // announceClipboard() informs the client of changes to the
-    // clipboard on the server. The client may later request the
-    // clipboard data via handleClipboardRequest().
-    virtual void announceClipboard(bool available);
-
-    // sendClipboardData() transfers the clipboard data to the client
-    // and should be called whenever the client has requested the
-    // clipboard via handleClipboardRequest().
-    virtual void sendClipboardData(const char* data);
-
-    // getAccessRights() returns the access rights of a SConnection to the server.
-    AccessRights getAccessRights() { return accessRights; }
-
-    // setAccessRights() allows a security package to limit the access rights
-    // of a SConnection to the server.  How the access rights are treated
-    // is up to the derived class.
-    virtual void setAccessRights(AccessRights ar);
-    virtual bool accessCheck(AccessRights ar) const;
-
-    // authenticated() returns true if the client has authenticated
-    // successfully.
-    bool authenticated() { return (state_ == RFBSTATE_INITIALISATION ||
-                                   state_ == RFBSTATE_NORMAL); }
-
-    SMsgReader* reader() { return reader_; }
-    SMsgWriter* writer() { return writer_; }
-
-    rdr::InStream* getInStream() { return is; }
-    rdr::OutStream* getOutStream() { return os; }
-
-    enum stateEnum {
-      RFBSTATE_UNINITIALISED,
-      RFBSTATE_PROTOCOL_VERSION,
-      RFBSTATE_SECURITY_TYPE,
-      RFBSTATE_SECURITY,
-      RFBSTATE_SECURITY_FAILURE,
-      RFBSTATE_QUERYING,
-      RFBSTATE_INITIALISATION,
-      RFBSTATE_NORMAL,
-      RFBSTATE_CLOSING,
-      RFBSTATE_INVALID
-    };
-
-    stateEnum state() { return state_; }
-
-    int32_t getPreferredEncoding() { return preferredEncoding; }
-
-  protected:
     // failConnection() prints a message to the log, sends a connection
     // failed message to the client (if possible) and throws an
     // Exception.
@@ -243,7 +258,7 @@ namespace rfb {
     bool processSecurityFailure();
     bool processInitMsg();
 
-    void handleAuthFailureTimeout(Timer* t);
+    void handleAuthFailureTimeout(core::Timer* t);
 
     int defaultMajorVersion, defaultMinorVersion;
 
@@ -256,7 +271,7 @@ namespace rfb {
     SecurityServer security;
     SSecurity* ssecurity;
 
-    MethodTimer<SConnection> authFailureTimer;
+    core::MethodTimer<SConnection> authFailureTimer;
     std::string authFailureMsg;
 
     stateEnum state_;