From 0f45face2155f788085bc890b1466d5b07791775 Mon Sep 17 00:00:00 2001
From: crs <cschoeneman@gmail.com>
Date: Sun, 2 May 2004 08:03:49 +0000
Subject: [PATCH] Forgot to change the client to handle relative moves.

---
 lib/client/CServerProxy.cpp | 61 ++++++++++++++++++++++++++++++++++---
 lib/client/CServerProxy.h   |  3 ++
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/lib/client/CServerProxy.cpp b/lib/client/CServerProxy.cpp
index 37c44f10..79e6698e 100644
--- a/lib/client/CServerProxy.cpp
+++ b/lib/client/CServerProxy.cpp
@@ -35,6 +35,11 @@ CServerProxy::CServerProxy(CClient* client, IStream* stream) :
 	m_timer(NULL),
 	m_seqNum(0),
 	m_compressMouse(false),
+	m_compressMouseRelative(false),
+	m_xMouse(0),
+	m_yMouse(0),
+	m_dxMouse(0),
+	m_dyMouse(0),
 	m_ignoreMouse(false),
 	m_heartRate(0.0),
 	m_parser(&CServerProxy::parseHandshakeMessage)
@@ -189,6 +194,10 @@ CServerProxy::parseMessage(const UInt8* code)
 		mouseMove();
 	}
 
+	else if (memcmp(code, kMsgDMouseRelMove, 4) == 0) {
+		mouseRelativeMove();
+	}
+
 	else if (memcmp(code, kMsgDMouseWheel, 4) == 0) {
 		mouseWheel();
 	}
@@ -311,6 +320,12 @@ CServerProxy::flushCompressedMouse()
 		m_compressMouse = false;
 		m_client->mouseMove(m_xMouse, m_yMouse);
 	}
+	if (m_compressMouseRelative) {
+		m_compressMouseRelative = false;
+		m_client->mouseRelativeMove(m_dxMouse, m_dyMouse);
+		m_dxMouse = 0;
+		m_dyMouse = 0;
+	}
 }
 
 void
@@ -442,8 +457,11 @@ CServerProxy::enter()
 	LOG((CLOG_DEBUG1 "recv enter, %d,%d %d %04x", x, y, seqNum, mask));
 
 	// discard old compressed mouse motion, if any
-	m_compressMouse = false;
-	m_seqNum        = seqNum;
+	m_compressMouse         = false;
+	m_compressMouseRelative = false;
+	m_dxMouse               = 0;
+	m_dyMouse               = 0;
+	m_seqNum                = seqNum;
 
 	// forward
 	m_client->enter(x, y, seqNum, static_cast<KeyModifierMask>(mask), false);
@@ -619,9 +637,12 @@ CServerProxy::mouseMove()
 
 	// if compressing then ignore the motion but record it
 	if (m_compressMouse) {
-		ignore   = true;
-		m_xMouse = x;
-		m_yMouse = y;
+		m_compressMouseRelative = false;
+		ignore    = true;
+		m_xMouse  = x;
+		m_yMouse  = y;
+		m_dxMouse = 0;
+		m_dyMouse = 0;
 	}
 	LOG((CLOG_DEBUG2 "recv mouse move %d,%d", x, y));
 
@@ -631,6 +652,36 @@ CServerProxy::mouseMove()
 	}
 }
 
+void
+CServerProxy::mouseRelativeMove()
+{
+	// parse
+	bool ignore;
+	SInt16 dx, dy;
+	CProtocolUtil::readf(m_stream, kMsgDMouseRelMove + 4, &dx, &dy);
+
+	// note if we should ignore the move
+	ignore = m_ignoreMouse;
+
+	// compress mouse motion events if more input follows
+	if (!ignore && !m_compressMouseRelative && m_stream->isReady()) {
+		m_compressMouseRelative = true;
+	}
+
+	// if compressing then ignore the motion but record it
+	if (m_compressMouseRelative) {
+		ignore     = true;
+		m_dxMouse += dx;
+		m_dyMouse += dy;
+	}
+	LOG((CLOG_DEBUG2 "recv mouse relative move %d,%d", dx, dy));
+
+	// forward
+	if (!ignore) {
+		m_client->mouseRelativeMove(dx, dy);
+	}
+}
+
 void
 CServerProxy::mouseWheel()
 {
diff --git a/lib/client/CServerProxy.h b/lib/client/CServerProxy.h
index 61e5474b..51263792 100644
--- a/lib/client/CServerProxy.h
+++ b/lib/client/CServerProxy.h
@@ -80,6 +80,7 @@ private:
 	void				mouseDown();
 	void				mouseUp();
 	void				mouseMove();
+	void				mouseRelativeMove();
 	void				mouseWheel();
 	void				screensaver();
 	void				resetOptions();
@@ -97,7 +98,9 @@ private:
 	UInt32				m_seqNum;
 
 	bool				m_compressMouse;
+	bool				m_compressMouseRelative;
 	SInt32				m_xMouse, m_yMouse;
+	SInt32				m_dxMouse, m_dyMouse;
 
 	bool				m_ignoreMouse;