Merge branch 'mouse-button-support' of https://github.com/CendioHalim/tigervnc

diff --cc common/rfb/CConnection.cxx
Simple merge

diff --cc common/rfb/CMsgReader.cxx
Simple merge

diff --cc common/rfb/CMsgWriter.cxx
Simple merge

diff --cc common/rfb/ClientParams.cxx
Simple merge

diff --cc common/rfb/SConnection.cxx
Simple merge

diff --cc common/rfb/SConnection.h
Simple merge

diff --cc common/rfb/SMsgReader.cxx
Simple merge

diff --cc common/rfb/SMsgWriter.cxx
index f525d25a2495353aaf3fb782c0f9d16ece51a80c,d1218c1157d2b46f88f8e4b4e220429857895f19..5ee0905b3dfe54967ad61bab18d433cbb9e4a762
--- 1/common/rfb/SMsgWriter.cxx
--- 2/common/rfb/SMsgWriter.cxx
+++ b/common/rfb/SMsgWriter.cxx
@@@ -302,6 -303,14 +302,14 @@@ void SMsgWriter::writeQEMUKeyEvent(
    needQEMUKeyEvent = true;
  }
  
 -    throw Exception("Client does not support Extended Mouse Buttons");
+ void SMsgWriter::writeExtendedMouseButtonsSupport()
+ {
+   if (!client->supportsEncoding(pseudoEncodingExtendedMouseButtons))
++    throw std::logic_error("Client does not support Extended Mouse Buttons");
+ 
+   needExtMouseButtonsEvent = true;
+ }
+ 
  bool SMsgWriter::needFakeUpdate()
  {
    if (needSetDesktopName)
@@@ -733,3 -751,17 +750,17 @@@ void SMsgWriter::writeQEMUKeyEventRect(
    os->writeU16(0);
    os->writeU32(pseudoEncodingQEMUKeyEvent);
  }
 -    throw Exception("Client does not support extended mouse button events");
+ 
+ void SMsgWriter::writeExtendedMouseButtonsRect()
+ {
+   if (!client->supportsEncoding(pseudoEncodingExtendedMouseButtons))
 -    throw Exception("SMsgWriter::writeExtendedMouseButtonsRect: nRects out of sync");
++    throw std::logic_error("Client does not support extended mouse button events");
+   if (++nRectsInUpdate > nRectsInHeader && nRectsInHeader)
++    throw std::logic_error("SMsgWriter::writeExtendedMouseButtonsRect: nRects out of sync");
+ 
+   os->writeS16(0);
+   os->writeS16(0);
+   os->writeU16(0);
+   os->writeU16(0);
+   os->writeU32(pseudoEncodingExtendedMouseButtons);
+ }

diff --cc common/rfb/ServerParams.cxx
Simple merge

diff --cc common/rfb/VNCSConnectionST.cxx
Simple merge

diff --cc common/rfb/VNCServerST.cxx
Simple merge

diff --cc unix/x0vncserver/XDesktop.cxx
Simple merge

diff --cc unix/x0vncserver/XDesktop.h
index cadc695f47421dd192f3bdfe2dd756891b2d69eb,711d6893d52e960de3f112688ecd6d45a0aad919..a27a1eae404756dcda384c3f6feebf8714da6791
--- 1/unix/x0vncserver/XDesktop.h
--- 2/unix/x0vncserver/XDesktop.h
+++ b/unix/x0vncserver/XDesktop.h
@@@ -89,8 -79,7 +89,8 @@@ protected
    rfb::VNCServer* server;
    QueryConnectDialog* queryConnectDialog;
    network::Socket* queryConnectSock;
-   uint8_t oldButtonMask;
 +  XSelection selection;
+   uint16_t oldButtonMask;
    bool haveXtest;
    bool haveDamage;
    int maxButtons;

diff --cc unix/xserver/hw/vnc/XserverDesktop.cc
Simple merge

diff --cc vncviewer/EmulateMB.cxx
Simple merge

diff --cc vncviewer/Viewport.cxx
Simple merge

diff --cc win/rfb_win32/SDisplay.cxx
Simple merge

diff --cc win/rfb_win32/SInput.cxx
Simple merge