aboutsummaryrefslogtreecommitdiffstats
path: root/common/rfb/CMsgReader.cxx
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2018-10-31 17:08:59 +0100
committerPierre Ossman <ossman@cendio.se>2018-11-01 16:11:42 +0100
commitdd45b4490100f70e21000c5181540c224e0f3c41 (patch)
tree440df3c66f396e20c1dc40989d1ee40211252d26 /common/rfb/CMsgReader.cxx
parent2affd7753274ddf3b93505f0ae26af3c45aa3fec (diff)
downloadtigervnc-dd45b4490100f70e21000c5181540c224e0f3c41.tar.gz
tigervnc-dd45b4490100f70e21000c5181540c224e0f3c41.zip
Let CMsgHandler::serverInit() handle initial set up
Avoid using the callbacks used for runtime changes for the initial setup. They weren't really useful anyway as you could not allocate a framebuffer without also knowing the pixel format. So make things more clear by letting serverInit() get the initial settings.
Diffstat (limited to 'common/rfb/CMsgReader.cxx')
-rw-r--r--common/rfb/CMsgReader.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/common/rfb/CMsgReader.cxx b/common/rfb/CMsgReader.cxx
index 3ce74731..17152ab7 100644
--- a/common/rfb/CMsgReader.cxx
+++ b/common/rfb/CMsgReader.cxx
@@ -43,13 +43,10 @@ void CMsgReader::readServerInit()
{
int width = is->readU16();
int height = is->readU16();
- handler->setDesktopSize(width, height);
PixelFormat pf;
pf.read(is);
- handler->setPixelFormat(pf);
CharArray name(is->readString());
- handler->setName(name.buf);
- handler->serverInit();
+ handler->serverInit(width, height, pf, name.buf);
}
void CMsgReader::readMsg()