aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Kaplinsky <const@tightvnc.com>2008-08-21 04:10:58 +0000
committerConstantin Kaplinsky <const@tightvnc.com>2008-08-21 04:10:58 +0000
commit53bdd3f593e92e3b679c2120208e2d368e3a1ecd (patch)
tree858a9e355d1de84468f8b9b557c9658c5da20ee2
parentc341ac6973de3ccdc500cc63d7593b9c1631c6c5 (diff)
downloadtigervnc-53bdd3f593e92e3b679c2120208e2d368e3a1ecd.tar.gz
tigervnc-53bdd3f593e92e3b679c2120208e2d368e3a1ecd.zip
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
-rw-r--r--common/rfb/VNCServerST.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index e9544780..6d21c7b2 100644
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -570,11 +570,14 @@ void VNCServerST::unsetVideoRectangle()
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);
+ }
}