From 7aca89cbdf75cd1e5e754a5257c02a335e276436 Mon Sep 17 00:00:00 2001
From: rti <rti@localhost>
Date: Sun, 12 Dec 2010 03:58:14 +0100
Subject: [PATCH] Fixed: #1174 Mac - Alpha Build - Mouse Behavior

---
 .../driver/opengl/mac/cocoa_event_emitter.cpp | 33 +++++++++++++++++++
 .../driver/opengl/mac/cocoa_event_emitter.h   |  2 ++
 2 files changed, 35 insertions(+)

diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
index c6e826d04..4cf2ea2ad 100644
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
@@ -246,6 +246,25 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	mousePos.x /= (float)viewRect.size.width;
 	mousePos.y /= (float)viewRect.size.height;
 
+	// if the mouse event was placed outside the view, don't tell NeL :)
+	if((mousePos.x < 0.0 || mousePos.x > 1.0 || 
+		mousePos.y < 0.0 || mousePos.y > 1.0) && 
+		event.type != NSKeyDown && event.type != NSKeyUp)
+	{
+		return false;
+	}
+
+	// first event about mouse movement after setting to emulateRawMode
+	if(_setToEmulateRawMode &&
+		(event.type == NSMouseMoved || 
+		event.type == NSLeftMouseDragged || 
+		event.type == NSRightMouseDragged))
+	{
+		// do not report because it reflects wrapping pointer to 0.5/0.5 
+		_setToEmulateRawMode = false;
+		return false;
+	}
+
 	// convert the modifiers for nel to pass them with the events
 	NLMISC::TKeyButton modifiers =
 		modifierFlagsToNelKeyButton([event modifierFlags]);
@@ -399,6 +418,12 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	}
 	}
 
+	if(_emulateRawMode && _driver && (event.type == NSMouseMoved || 
+		event.type == NSLeftMouseDragged || event.type == NSRightMouseDragged)) 
+	{
+		_driver->setMousePos(0.5, 0.5);
+	}
+
 	return true;
 }
 
@@ -453,6 +478,14 @@ void CCocoaEventEmitter::submitEvents(CEventServer& server, bool /* allWins */)
 void CCocoaEventEmitter::emulateMouseRawMode(bool enable)
 {
 	_emulateRawMode = enable;
+	
+	if(_emulateRawMode)
+	{
+		_setToEmulateRawMode = true;
+		
+		if(_driver)
+			_driver->setMousePos(0.5, 0.5);
+	}
 }
 
 }
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
index f96cfea11..1fedc009d 100644
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
+++ b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
@@ -33,6 +33,7 @@ namespace NLMISC
 class CCocoaEventEmitter : public IEventEmitter
 {
 	bool             _emulateRawMode;
+	bool             _setToEmulateRawMode;
 	NL3D::IDriver*   _driver;
 	CocoaOpenGLView* _glView;
 
@@ -42,6 +43,7 @@ class CCocoaEventEmitter : public IEventEmitter
 public:
 	CCocoaEventEmitter() : 
 		_emulateRawMode(false), 
+		_setToEmulateRawMode(false),
 		_driver(NULL),
 		_glView(nil),
 		_server(NULL) { }