Move the SetDesktopName parser into CMsgReaderV3 to keep with the separation
of old and new features.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3696 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/CMsgReader.cxx b/common/rfb/CMsgReader.cxx
index 488f549..a78a1a0 100644
--- a/common/rfb/CMsgReader.cxx
+++ b/common/rfb/CMsgReader.cxx
@@ -138,19 +138,6 @@
handler->setCursor(width, height, hotspot, data.buf, mask.buf);
}
-void CMsgReader::readSetDesktopName(int x, int y, int w, int h)
-{
- char* name = is->readString();
-
- if (x || y || w || h) {
- fprintf(stderr, "Ignoring DesktopName rect with non-zero position/size\n");
- } else {
- handler->setName(name);
- }
-
- delete [] name;
-}
-
rdr::U8* CMsgReader::getImageBuf(int required, int requested, int* nPixels)
{
int requiredBytes = required * (handler->cp.pf().bpp / 8);
diff --git a/common/rfb/CMsgReader.h b/common/rfb/CMsgReader.h
index ebf69da..7a611fc 100644
--- a/common/rfb/CMsgReader.h
+++ b/common/rfb/CMsgReader.h
@@ -60,7 +60,6 @@
virtual void readCopyRect(const Rect& r);
virtual void readSetCursor(int width, int height, const Point& hotspot);
- virtual void readSetDesktopName(int x, int y, int w, int h);
CMsgReader(CMsgHandler* handler, rdr::InStream* is);
diff --git a/common/rfb/CMsgReaderV3.cxx b/common/rfb/CMsgReaderV3.cxx
index 2b5196f..83f758e 100644
--- a/common/rfb/CMsgReaderV3.cxx
+++ b/common/rfb/CMsgReaderV3.cxx
@@ -101,3 +101,17 @@
nUpdateRectsLeft = is->readU16();
handler->framebufferUpdateStart();
}
+
+void CMsgReaderV3::readSetDesktopName(int x, int y, int w, int h)
+{
+ char* name = is->readString();
+
+ if (x || y || w || h) {
+ fprintf(stderr, "Ignoring DesktopName rect with non-zero position/size\n");
+ } else {
+ handler->setName(name);
+ }
+
+ delete [] name;
+}
+
diff --git a/common/rfb/CMsgReaderV3.h b/common/rfb/CMsgReaderV3.h
index 689bb65..a3b604e 100644
--- a/common/rfb/CMsgReaderV3.h
+++ b/common/rfb/CMsgReaderV3.h
@@ -28,7 +28,8 @@
virtual void readServerInit();
virtual void readMsg();
private:
- void readFramebufferUpdate();
+ virtual void readFramebufferUpdate();
+ virtual void readSetDesktopName(int x, int y, int w, int h);
int nUpdateRectsLeft;
};
}