Passing VideoArea parameter to VNCServerST object. VNCServerST saves the

rectangle but does not use it yet.
does not do anything more.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2692 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index 066feb904b94e5a282004a1a1cef5d0b643936d2..e9544780e74c40e4b64e3195e7872324cf4d7ada 100644 (file)
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -574,3 +574,7 @@ void VNCServerST::unsetVideoRectangle()
   }
 }
 
+void VNCServerST::setDefaultVideoRect(const Rect& r)
+{
+  m_defaultVideoRect = r;
+}

diff --git a/common/rfb/VNCServerST.h b/common/rfb/VNCServerST.h
index 5277f550fb80d06f7f1e3a2cf4398cc011c2521b..1dd7afd1373ec450d1ee3bb358ecdacf8a6b3e89 100644 (file)
--- a/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@ -205,6 +205,8 @@ namespace rfb {
     void setVideoRectangle(const Rect& r);
     void unsetVideoRectangle();
 
+    void setDefaultVideoRect(const Rect& r);
+
   protected:
 
     friend class VNCSConnectionST;
@@ -256,6 +258,7 @@ namespace rfb {
 
     bool m_videoSelectionEnabled;
     Rect m_videoRect;
+    Rect m_defaultVideoRect;
   };
 
 };

diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index a6bae95b6da58ca402ffd7fed959b59451e108eb..d21e71b14cbd8deae07aa40346b3122d6af285ad 100644 (file)
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -186,8 +186,9 @@ public:
     pb = new XPixelBuffer(dpy, factory, geometry->getRect(), this);
     vlog.info("Allocated %s", pb->getImage()->classDesc());
 
-    server = vs;
+    server = (VNCServerST *)vs;
     server->setPixelBuffer(pb);
+    server->setDefaultVideoRect(geometry->getVideoRect());
 
     running = true;
   }
@@ -259,7 +260,7 @@ protected:
   Display* dpy;
   Geometry* geometry;
   XPixelBuffer* pb;
-  VNCServer* server;
+  VNCServerST* server;
   int oldButtonMask;
   bool haveXtest;
   int maxButtons;