From e7a41d5862440d8729a1ef142baf04af713e96b2 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 23 Mar 2009 16:48:35 +0000 Subject: [PATCH] Add client method to send SetDesktopSize. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3711 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- common/rfb/CMsgWriter.h | 4 ++++ common/rfb/CMsgWriterV3.cxx | 28 ++++++++++++++++++++++++++++ common/rfb/CMsgWriterV3.h | 2 ++ 3 files changed, 34 insertions(+) diff --git a/common/rfb/CMsgWriter.h b/common/rfb/CMsgWriter.h index 5794f91d..37755e77 100644 --- a/common/rfb/CMsgWriter.h +++ b/common/rfb/CMsgWriter.h @@ -23,6 +23,7 @@ #define __RFB_CMSGWRITER_H__ #include +#include namespace rdr { class OutStream; } @@ -41,6 +42,9 @@ namespace rfb { virtual void startMsg(int type)=0; virtual void endMsg()=0; + virtual void writeSetDesktopSize(int width, int height, + const ScreenSet& layout)=0; + // CMsgWriter implemented methods virtual void writeSetPixelFormat(const PixelFormat& pf); virtual void writeSetEncodings(int nEncodings, rdr::U32* encodings); diff --git a/common/rfb/CMsgWriterV3.cxx b/common/rfb/CMsgWriterV3.cxx index a9807952..0a44fc65 100644 --- a/common/rfb/CMsgWriterV3.cxx +++ b/common/rfb/CMsgWriterV3.cxx @@ -47,3 +47,31 @@ void CMsgWriterV3::endMsg() { os->flush(); } + +void CMsgWriterV3::writeSetDesktopSize(int width, int height, + const ScreenSet& layout) +{ + if (!cp->supportsSetDesktopSize) + throw Exception("Server does not support SetDesktopSize"); + + startMsg(msgTypeSetDesktopSize); + os->pad(1); + + os->writeU16(width); + os->writeU16(height); + + os->writeU8(layout.num_screens()); + os->pad(1); + + ScreenSet::const_iterator iter; + for (iter = layout.begin();iter != layout.end();++iter) { + os->writeU32(iter->id); + os->writeU16(iter->dimensions.tl.x); + os->writeU16(iter->dimensions.tl.y); + os->writeU16(iter->dimensions.width()); + os->writeU16(iter->dimensions.height()); + os->writeU32(iter->flags); + } + + endMsg(); +} diff --git a/common/rfb/CMsgWriterV3.h b/common/rfb/CMsgWriterV3.h index 0b2f9afe..15c6d6df 100644 --- a/common/rfb/CMsgWriterV3.h +++ b/common/rfb/CMsgWriterV3.h @@ -30,6 +30,8 @@ namespace rfb { virtual void startMsg(int type); virtual void endMsg(); + virtual void writeSetDesktopSize(int width, int height, + const ScreenSet& layout); }; } #endif -- 2.39.5