Move basic data types to core library

Make it clearer what is protocol handling and what is just general
plumbing.

This is one step of several.

1 files changed, 10 insertions, 8 deletions

diff --git a/common/rfb/VNCServerST.h b/common/rfb/VNCServerST.h
index 6c19e5be..3d6fbeee 100644
--- a/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@ -95,11 +95,12 @@ namespace rfb {
     void closeClients(const char* reason) override {closeClients(reason, nullptr);}
     SConnection* getConnection(network::Socket* sock) override;
 
-    void add_changed(const Region &region) override;
-    void add_copied(const Region &dest, const Point &delta) override;
-    void setCursor(int width, int height, const Point& hotspot,
+    void add_changed(const core::Region& region) override;
+    void add_copied(const core::Region& dest,
+                    const core::Point& delta) override;
+    void setCursor(int width, int height, const core::Point& hotspot,
                    const uint8_t* data) override;
-    void setCursorPos(const Point& p, bool warped) override;
+    void setCursorPos(const core::Point& p, bool warped) override;
     void setName(const char* name_) override;
     void setLEDState(unsigned state) override;
 
@@ -111,13 +112,14 @@ namespace rfb {
 
     const ScreenSet& getScreenLayout() const { return screenLayout; }
     const Cursor* getCursor() const { return cursor; }
-    const Point& getCursorPos() const { return cursorPos; }
+    const core::Point& getCursorPos() const { return cursorPos; }
     const char* getName() const { return name.c_str(); }
     unsigned getLEDState() const { return ledState; }
 
     // Event handlers
     void keyEvent(uint32_t keysym, uint32_t keycode, bool down);
-    void pointerEvent(VNCSConnectionST* client, const Point& pos, uint16_t buttonMask);
+    void pointerEvent(VNCSConnectionST* client,
+                      const core::Point& pos, uint16_t buttonMask);
 
     void handleClipboardRequest(VNCSConnectionST* client);
     void handleClipboardAnnounce(VNCSConnectionST* client, bool available);
@@ -146,7 +148,7 @@ namespace rfb {
 
     // Part of the framebuffer that has been modified but is not yet
     // ready to be sent to clients
-    Region getPendingRegion();
+    core::Region getPendingRegion();
 
     // getRenderedCursor() returns an up to date version of the server
     // side rendered cursor buffer
@@ -195,7 +197,7 @@ namespace rfb {
 
     ComparingUpdateTracker* comparer;
 
-    Point cursorPos;
+    core::Point cursorPos;
     Cursor* cursor;
     RenderedCursor renderedCursor;
     bool renderedCursorInvalid;