[no-issue]

revert to r2421

CMakeLists.txt

@@ -164,14 +164,14 @@ if (UNIX)
 		exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
 		string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
 		message(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
-		# patch by Jake Petroules for issue 575
 		if (DARWIN_VERSION LESS 9)
-			# 10.4: Universal (32-bit and 64-bit Intel and PowerPC)
+			# 10.4: universal (32-bit intel and power pc) 
-		set(CMAKE_OSX_ARCHITECTURES "ppc;ppc64;i386:x86_64"
+			set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
 				CACHE STRING "" FORCE)
 		else()
-			# 10.5+: Intel only
+			# 10.5+: 32-bit only -- missing funcs in 64-bit os libs
-			set(CMAKE_OSX_ARCHITECTURES "i386;x86_64"
+			# such as GetGlobalMouse.
+			set(CMAKE_OSX_ARCHITECTURES "i386"
 				CACHE STRING "" FORCE)
 		endif()
 		

ext/toolchain/commands1.py

@@ -554,25 +554,7 @@ class InternalCommands:
  		return (major, minor, rev)
 
 	def getMacSdkDir(self):
-		# patch by Jake Petroules for issue 575
+		return "/Developer/SDKs/MacOSX" + self.macSdk + ".sdk"
-		sdkName = "macosx" + self.macSdk
-
-		# Ideally we'll use xcrun (which is influenced by $DEVELOPER_DIR), then try a couple
-		# fallbacks to known paths if xcrun is not available
-		sdkPath = commands.getoutput("xcrun --show-sdk-path --sdk " + sdkName)
-		if sdkPath:
-			return sdkPath
-
-		developerDir = os.getenv("DEVELOPER_DIR")
-		if not developerDir:
-			developerDir = "/Applications/Xcode.app/Contents/Developer"
-
-		sdkDirName = sdkName.replace("macosx", "MacOSX")
-		sdkPath = developerDir + "/Platforms/MacOSX.platform/Developer/SDKs/" + sdkDirName + ".sdk"
-		if os.path.exists(sdkPath):
-			return sdkPath
-
-		return "/Developer/SDKs/" + sdkDirName + ".sdk"
 	
 	# http://tinyurl.com/cs2rxxb
 	def fixCmakeEclipseBug(self):

src/lib/common/basic_types.h

@@ -72,9 +72,6 @@
 
 // Added this because it doesn't compile on OS X 10.6 because they are already defined in Carbon
 #if !defined(__MACTYPES__)
-#if defined(__APPLE__)
-#include <MacTypes.h>
-#else
 typedef signed TYPE_OF_SIZE_1	SInt8;
 typedef signed TYPE_OF_SIZE_2	SInt16;
 typedef signed TYPE_OF_SIZE_4	SInt32;
@@ -82,7 +79,6 @@ typedef unsigned TYPE_OF_SIZE_1	UInt8;
 typedef unsigned TYPE_OF_SIZE_2	UInt16;
 typedef unsigned TYPE_OF_SIZE_4	UInt32;
 #endif
-#endif
 //
 // clean up
 //

src/lib/platform/OSXScreen.cpp

@@ -292,15 +292,13 @@ COSXScreen::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const
 void
 COSXScreen::getCursorPos(SInt32& x, SInt32& y) const
 {
-	// patch by Jake Petroules for issue 575
+	Point mouse;
-	CGEventRef event = CGEventCreate(NULL);
+	GetGlobalMouse(&mouse);
-	CGPoint mouse = CGEventGetLocation(event);
+	x                = mouse.h;
-	x = mouse.x;
+	y                = mouse.v;
-	y = mouse.y;
 	m_cursorPosValid = true;
 	m_xCursor        = x;
 	m_yCursor        = y;
-	CFRelease(event);
 }
 
 void
@@ -692,24 +690,21 @@ COSXScreen::fakeMouseMove(SInt32 x, SInt32 y)
 void
 COSXScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const
 {
-	// patch by Jake Petroules for issue 575
-
 	// OS X does not appear to have a fake relative mouse move function.
 	// simulate it by getting the current mouse position and adding to
 	// that.  this can yield the wrong answer but there's not much else
 	// we can do.
 
 	// get current position
-	CGEventRef event = CGEventCreate(NULL);
+	Point oldPos;
-	CGPoint oldPos = CGEventGetLocation(event);
+	GetGlobalMouse(&oldPos);
-	CFRelease(event);
 
 	// synthesize event
 	CGPoint pos;
-	m_xCursor = static_cast<SInt32>(oldPos.x);
+	m_xCursor = static_cast<SInt32>(oldPos.h);
-	m_yCursor = static_cast<SInt32>(oldPos.y);
+	m_yCursor = static_cast<SInt32>(oldPos.v);
-	pos.x = oldPos.x + dx;
+	pos.x     = oldPos.h + dx;
-	pos.y = oldPos.y + dy;
+	pos.y     = oldPos.v + dy;
 	postMouseEvent(pos);
 
 	// we now assume we don't know the current cursor position
@@ -1057,7 +1052,7 @@ COSXScreen::handleSystemEvent(const CEvent& event, void*)
 			// get scroll amount
 			r = GetEventParameter(*carbonEvent,
 					kSynergyMouseScrollAxisX,
-					typeSInt32,
+					typeLongInteger,
 					NULL,
 					sizeof(xScroll),
 					NULL,
@@ -1067,7 +1062,7 @@ COSXScreen::handleSystemEvent(const CEvent& event, void*)
 			}
 			r = GetEventParameter(*carbonEvent,
 					kSynergyMouseScrollAxisY,
-					typeSInt32,
+					typeLongInteger,
 					NULL,
 					sizeof(yScroll),
 					NULL,
@@ -1095,11 +1090,7 @@ COSXScreen::handleSystemEvent(const CEvent& event, void*)
 			break;
 			
 	case kEventClassWindow:
-		// patch by Jake Petroules for issue 575
+		SendEventToWindow(*carbonEvent, m_userInputWindow);
-		// 2nd param was formerly GetWindowEventTarget(m_userInputWindow) which is 32-bit only,
-		// however as m_userInputWindow is never initialized to anything we can take advantage of
-		// the fact that GetWindowEventTarget(NULL) == NULL
-		SendEventToEventTarget(*carbonEvent, NULL);
 		switch (GetEventKind(*carbonEvent)) {
 		case kEventWindowActivated:
 			LOG((CLOG_DEBUG1 "window activated"));
@@ -1523,17 +1514,15 @@ COSXScreen::getScrollSpeedFactor() const
 void
 COSXScreen::enableDragTimer(bool enable)
 {
+	UInt32 modifiers;
+	MouseTrackingResult res;
+
 	if (enable && m_dragTimer == NULL) {
 		m_dragTimer = m_events->newTimer(0.01, NULL);
 		m_events->adoptHandler(CEvent::kTimer, m_dragTimer,
 							new TMethodEventJob<COSXScreen>(this,
 								&COSXScreen::handleDrag));
-		// patch by Jake Petroules for issue 575
+		TrackMouseLocationWithOptions(NULL, 0, 0, &m_dragLastPoint, &modifiers, &res);
-		CGEventRef event = CGEventCreate(NULL);
-		CGPoint mouse = CGEventGetLocation(event);
-		m_dragLastPoint.h = (short)mouse.x;
-		m_dragLastPoint.v = (short)mouse.y;
-		CFRelease(event);
 	}
 	else if (!enable && m_dragTimer != NULL) {
 		m_events->removeHandler(CEvent::kTimer, m_dragTimer);
@@ -1545,15 +1534,15 @@ COSXScreen::enableDragTimer(bool enable)
 void
 COSXScreen::handleDrag(const CEvent&, void*)
 {
-	// patch by Jake Petroules for issue 575
+	Point p;
-	CGEventRef event = CGEventCreate(NULL);
+	UInt32 modifiers;
-	CGPoint p = CGEventGetLocation(event);
+	MouseTrackingResult res; 
-	CFRelease(event);
 
-	if ((short)p.x != m_dragLastPoint.h || (short)p.y != m_dragLastPoint.v) {
+	TrackMouseLocationWithOptions(NULL, 0, 0, &p, &modifiers, &res);
-		m_dragLastPoint.h = (short)p.x;
+
-		m_dragLastPoint.v = (short)p.y;
+	if (res != kMouseTrackingTimedOut && (p.h != m_dragLastPoint.h || p.v != m_dragLastPoint.v)) {
-		onMouseMove((SInt32)p.x, (SInt32)p.y);
+		m_dragLastPoint = p;
+		onMouseMove((SInt32)p.h, (SInt32)p.v);
 	}
 }
 

src/lib/platform/OSXScreenSaver.cpp

@@ -142,7 +142,7 @@ COSXScreenSaver::launchTerminationCallback(
 	OSStatus		result;
     ProcessSerialNumber psn; 
     EventParamType	actualType;
-	ByteCount		actualSize;
+    UInt32			actualSize;
 
     result = GetEventParameter(theEvent, kEventParamProcessID,
 							   typeProcessSerialNumber, &actualType,

src/lib/synergy/DaemonApp.cpp

@@ -302,9 +302,9 @@ CDaemonApp::handleIpcMessage(const CEvent& e, void*)
 				LOG((CLOG_DEBUG "new command, elevate=%d command=%s", cm->elevate(), command.c_str()));
 
 				CString debugArg("--debug");
-				size_t debugArgPos = command.find(debugArg);
+				UInt32 debugArgPos = static_cast<UInt32>(command.find(debugArg));
 				if (debugArgPos != CString::npos) {
-					UInt32 from = static_cast<UInt32>(debugArgPos) + static_cast<UInt32>(debugArg.size()) + 1;
+					UInt32 from = debugArgPos + static_cast<UInt32>(debugArg.size()) + 1;
 					UInt32 nextSpace = static_cast<UInt32>(command.find(" ", from));
 					CString logLevel(command.substr(from, nextSpace - from));