From: Constantin Kaplinsky <const@tightvnc.com>
Date: Thu, 21 Aug 2008 04:10:58 +0000 (+0000)
Subject: VideoArea parameter is fully respected. The server treats the specified rectangle... 
X-Git-Tag: v0.0.90~403
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=53bdd3f593e92e3b679c2120208e2d368e3a1ecd;p=tigervnc.git

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 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);
+  }
 }