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 066feb9..e954478 100644
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -574,3 +574,7 @@
}
}
+void VNCServerST::setDefaultVideoRect(const Rect& r)
+{
+ m_defaultVideoRect = r;
+}
diff --git a/common/rfb/VNCServerST.h b/common/rfb/VNCServerST.h
index 5277f55..1dd7afd 100644
--- a/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@ -205,6 +205,8 @@
void setVideoRectangle(const Rect& r);
void unsetVideoRectangle();
+ void setDefaultVideoRect(const Rect& r);
+
protected:
friend class VNCSConnectionST;
@@ -256,6 +258,7 @@
bool m_videoSelectionEnabled;
Rect m_videoRect;
+ Rect m_defaultVideoRect;
};
};
diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index a6bae95..d21e71b 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -186,8 +186,9 @@
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 @@
Display* dpy;
Geometry* geometry;
XPixelBuffer* pb;
- VNCServer* server;
+ VNCServerST* server;
int oldButtonMask;
bool haveXtest;
int maxButtons;