VideoArea parameter is fully respected. The server treats the specified rectangle as video unless the client selected some different rectangle via the VideoRectangleSelection protocol message. When the client discards selection, the server will use VideoArea setting again.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2693 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index e954478..6d21c7b 100644
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -570,11 +570,14 @@
if (isVideoSelectionEnabled()) {
// FIXME: Duplication between m_videoRect and comparer->video_area.
m_videoRect.clear();
- set_video_area(m_videoRect);
+ set_video_area(m_defaultVideoRect);
}
}
void VNCServerST::setDefaultVideoRect(const Rect& r)
{
m_defaultVideoRect = r;
+ if (m_videoRect.is_empty()) {
+ set_video_area(m_defaultVideoRect);
+ }
}