Let CConnection intercept more callbacks

We need more callbacks for correct operation of multi-threaded
rect decoding.

diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index 49b8a82c88bb04552c110333370367b9e994593a..2ddfc3304f6468da82969608bd5d7b450eea005d 100644 (file)
--- a/common/rfb/CConnection.cxx
+++ b/common/rfb/CConnection.cxx
@@ -301,6 +301,29 @@ void CConnection::securityCompleted()
   writer_->writeClientInit(shared);
 }
 
+void CConnection::setDesktopSize(int w, int h)
+{
+  CMsgHandler::setDesktopSize(w,h);
+}
+
+void CConnection::setExtendedDesktopSize(unsigned reason,
+                                         unsigned result,
+                                         int w, int h,
+                                         const ScreenSet& layout)
+{
+  CMsgHandler::setExtendedDesktopSize(reason, result, w, h, layout);
+}
+
+void CConnection::framebufferUpdateStart()
+{
+  CMsgHandler::framebufferUpdateStart();
+}
+
+void CConnection::framebufferUpdateEnd()
+{
+  CMsgHandler::framebufferUpdateEnd();
+}
+
 void CConnection::dataRect(const Rect& r, int encoding)
 {
   decoder.decodeRect(r, encoding, framebuffer);

diff --git a/common/rfb/CConnection.h b/common/rfb/CConnection.h
index 7f8dbea0b8c3ef6c5511cf5a93f5db502803a8d1..6bc7a389083e4979dafc6c852acb22a410336437 100644 (file)
--- a/common/rfb/CConnection.h
+++ b/common/rfb/CConnection.h
@@ -92,6 +92,15 @@ namespace rfb {
 
     // Methods overridden from CMsgHandler
 
+    // Note: These must be called by any deriving classes
+
+    virtual void setDesktopSize(int w, int h);
+    virtual void setExtendedDesktopSize(unsigned reason, unsigned result,
+                                        int w, int h,
+                                        const ScreenSet& layout);
+
+    virtual void framebufferUpdateStart();
+    virtual void framebufferUpdateEnd();
     virtual void dataRect(const Rect& r, int encoding);
 
 

diff --git a/tests/decperf.cxx b/tests/decperf.cxx
index dfd8a907ae6a27389d8ebc91797b7fa255549110..a200e5b4ce2762edf5855ba6f29cec9f44185d64 100644 (file)
--- a/tests/decperf.cxx
+++ b/tests/decperf.cxx
@@ -99,11 +99,15 @@ void CConn::setCursor(int, int, const rfb::Point&, void*, void*)
 
 void CConn::framebufferUpdateStart()
 {
+  CConnection::framebufferUpdateStart();
+
   startCpuCounter();
 }
 
 void CConn::framebufferUpdateEnd()
 {
+  CConnection::framebufferUpdateEnd();
+
   endCpuCounter();
 
   cpuTime += getCpuCounter();

diff --git a/tests/encperf.cxx b/tests/encperf.cxx
index 06c878d4da74411b77f3e1812f3346241670a1a6..211160896670a3047e0c2b903bd84d82069bbff7 100644 (file)
--- a/tests/encperf.cxx
+++ b/tests/encperf.cxx
@@ -208,6 +208,8 @@ void CConn::setCursor(int, int, const rfb::Point&, void*, void*)
 
 void CConn::framebufferUpdateStart()
 {
+  CConnection::framebufferUpdateStart();
+
   updates.clear();
   startCpuCounter();
 }
@@ -218,6 +220,8 @@ void CConn::framebufferUpdateEnd()
   rfb::PixelBuffer* pb = getFramebuffer();
   rfb::Region clip(pb->getRect());
 
+  CConnection::framebufferUpdateEnd();
+
   endCpuCounter();
 
   decodeTime += getCpuCounter();

diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index 54716d3eb04c60114c980f16391fcbd5f85b0177..78eadb545e8f60232e5de9050def0f37b493b3ae 100644 (file)
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -342,6 +342,8 @@ void CConn::setName(const char* name)
 // one.
 void CConn::framebufferUpdateStart()
 {
+  CConnection::framebufferUpdateStart();
+
   // Note: This might not be true if sync fences are supported
   pendingUpdate = false;
 
@@ -357,6 +359,8 @@ void CConn::framebufferUpdateStart()
 // appropriately, and then request another incremental update.
 void CConn::framebufferUpdateEnd()
 {
+  CConnection::framebufferUpdateEnd();
+
   Fl::remove_timeout(handleUpdateTimeout, this);
   desktop->updateWindow();