DAMAGE is mandatory

gschwind · Sep 3, 2019 · 14b810a · 14b810a
1 parent a87aab0
commit 14b810a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/unix/spawnvncserver/XDesktop.cxx b/unix/spawnvncserver/XDesktop.cxx
@@ -273,13 +273,13 @@ XDesktop::XDesktop(char const * displayName)
     auto r = xcb_damage_query_version_reply(xcb, c, &e);
     if (r != nullptr and e == nullptr) {
       vlog.info("DAMAGE extension present - version %d.%d",r->major_version,r->minor_version);
-      haveDamage = true;
     }
     free(r);
   } else {
 #endif
     vlog.info("DAMAGE extension not present");
     vlog.info("Will have to poll screen for changes");
+    throw Exception("DAMAGE extension is mandatory");
 #ifdef HAVE_XDAMAGE
   }
 #endif
@@ -344,8 +344,6 @@ XDesktop::~XDesktop() {
 
 
 void XDesktop::poll() {
-  if (pb and not haveDamage)
-    pb->poll(server);
   if (running) {
     int x, y;
     xcb_generic_error_t * e;
@@ -395,7 +393,7 @@ void XDesktop::start(VNCServer* vs) {
   server->setPixelBuffer(pb, computeScreenLayout());
 
 #ifdef HAVE_XDAMAGE
-  if (haveDamage) {
+  {
     damage = xcb_generate_id(xcb);
     auto c = xcb_damage_create_checked(xcb, damage, default_root, XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES);
     auto e = xcb_request_check(xcb, c);
@@ -418,7 +416,7 @@ void XDesktop::stop() {
   running = false;
 
 #ifdef HAVE_XDAMAGE
-  if (haveDamage) {
+  {
     xcb_damage_destroy(xcb, damage);
     vlog.debug("destroy damage %d", damage);
   }

diff --git a/unix/spawnvncserver/XDesktop.h b/unix/spawnvncserver/XDesktop.h
@@ -92,7 +92,6 @@ class XDesktop : public rfb::SDesktop,
   network::Socket* queryConnectSock;
   int oldButtonMask;
   bool haveXtest;
-  bool haveDamage;
   int maxButtons;
   std::map<KeySym, KeyCode> pressedKeys;
   bool running;