Merge pull request #239 from dtinth/MacOSX10.9.sdk

Update to Mac OS X 10.10 SDK

Here's to hoping this doesn't cause too many problems.

src/arch/ArchHooks/ArchHooks_MacOSX.cpp

@@ -223,15 +223,13 @@ void ArchHooks_MacOSX::DumpDebugInfo()
 	// Get system version
 	RString sSystemVersion;
 	{
-		long major = 0, minor = 0, bugFix = 0;
-
-		Gestalt( gestaltSystemVersionMajor, &major );
-		Gestalt( gestaltSystemVersionMinor, &minor );
-		Gestalt( gestaltSystemVersionBugFix, &bugFix );
-		if( bugFix )
-			sSystemVersion = ssprintf( "Mac OS X %ld.%ld.%ld", major, minor, bugFix );
+		char osrelease[256];
+		size_t size = sizeof(osrelease);
+		
+		if( sysctlbyname( "kern.osrelease", osrelease, &size, NULL, 0 ) )
+			sSystemVersion = ssprintf( "Mac OS X %s", osrelease );
 		else
-			sSystemVersion = ssprintf( "Mac OS X %ld.%ld", major, minor );
+			sSystemVersion = ssprintf( "Mac OS X Unknown" );
 	}
 
 	size_t size;

src/arch/InputHandler/InputHandler_MacOSX_HID.cpp

@@ -25,7 +25,7 @@ void InputHandler_MacOSX_HID::QueueCallback( void *target, int result, void *ref
 	IOHIDQueueInterface **queue = (IOHIDQueueInterface **)sender;
 	IOHIDEventStruct event;
 	AbsoluteTime zeroTime = { 0, 0 };
-	HIDDevice *dev = This->m_vDevices[int( refcon )];
+	HIDDevice *dev = This->m_vDevices[size_t( refcon )];
 	vector<DeviceInput> vPresses;
 
 	while( (result = CALL(queue, getNextEvent, &event, zeroTime, 0)) == kIOReturnSuccess )
@@ -373,6 +373,50 @@ RString InputHandler_MacOSX_HID::GetDeviceSpecificInputString( const DeviceInput
 	return InputHandler::GetDeviceSpecificInputString( di );
 }
 
+// Modified from NESControllerInterface of Macifom project,
+// used under MIT license from http://macifom.googlecode.com/svn-history/r89/Macifom/trunk/NESControllerInterface.m
+// Used under MIT license from http://inquisitivecocoa.com/2009/04/05/key-code-translator/
+static wchar_t KeyCodeToChar(CGKeyCode keyCode, unsigned int modifierFlags)
+{
+	TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
+	CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
+	const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr);
+	
+	if( keyboardLayout )
+	{
+		UInt32 deadKeyState = 0;
+		UniCharCount maxStringLength = 255;
+		UniCharCount actualStringLength = 0;
+		UniChar unicodeString[maxStringLength];
+		
+		OSStatus status = UCKeyTranslate(keyboardLayout,
+						 keyCode, kUCKeyActionDown, modifierFlags,
+						 LMGetKbdType(), 0,
+						 &deadKeyState,
+						 maxStringLength,
+						 &actualStringLength, unicodeString);
+		
+		if( status != noErr )
+		{
+			fprintf(stderr, "There was an %s error translating from the '%d' key code to a human readable string: %s\n",
+				GetMacOSStatusErrorString(status), (int)status, GetMacOSStatusCommentString(status));
+		}
+		else if( actualStringLength == 0 )
+		{
+			fprintf(stderr, "Couldn't find a translation for the '%d' key code\n", keyCode);
+		}
+		else
+		{
+			return unicodeString[0];
+		}
+	}
+	else
+	{
+		fprintf(stderr, "Couldn't find a translation for the '%d' key code\n", keyCode);
+	}
+	return 0;
+}
+
 wchar_t InputHandler_MacOSX_HID::DeviceButtonToChar( DeviceButton button, bool bUseCurrentKeyModifiers )
 {
 	// KeyTranslate maps these keys to a character.  They shouldn't be mapped to any character.
@@ -402,71 +446,15 @@ wchar_t InputHandler_MacOSX_HID::DeviceButtonToChar( DeviceButton button, bool b
 			return L'\0';
 	}
 
-	// Find the USB key code for this DeviceButton
+	// Use Text Input Source services to convert the key code to character code.
 	UInt8 iMacVirtualKey;
 	if( KeyboardDevice::DeviceButtonToMacVirtualKey( button, iMacVirtualKey ) )
 	{
-		UInt32 modifiers = 0;
-		if( bUseCurrentKeyModifiers )
-			modifiers = GetCurrentKeyModifiers();
-
-		// todo: handle Caps Lock -freem
-
-		SInt16 iCurrentKeyScript = GetScriptManagerVariable( smKeyScript );
-		SInt16 iCurrentKeyLayoutID = GetScriptVariable( iCurrentKeyScript, smScriptKeys );
-		static SInt16 iLastKeyLayoutID = !iCurrentKeyLayoutID; // Just be different.
-		static UInt32 iDeadKeyState;
-		static UCKeyboardLayout **KeyLayout;
-
-		if( iCurrentKeyLayoutID != iLastKeyLayoutID )
+		UInt32 nModifiers = bUseCurrentKeyModifiers ? GetCurrentKeyModifiers() : 0;
+		wchar_t sCharCode = KeyCodeToChar( iMacVirtualKey, nModifiers );
+		if( sCharCode != 0 )
 		{
-			iDeadKeyState = 0;
-			KeyLayout = (UCKeyboardLayout **)GetResource( 'uchr', iCurrentKeyLayoutID );
-			iLastKeyLayoutID = iCurrentKeyLayoutID;
-		}
-		if( KeyLayout )
-		{
-			UInt32 keyboardType = LMGetKbdType();
-			UInt32 nModifiers = bUseCurrentKeyModifiers ? GetCurrentKeyModifiers() : 0;
-			UniChar unicodeInputString[4];
-			UniCharCount length;
-			OSStatus status = UCKeyTranslate( *KeyLayout, iMacVirtualKey, kUCKeyActionDown, nModifiers,
-							  keyboardType, 0, &iDeadKeyState, ARRAYLEN(unicodeInputString),
-							  &length, unicodeInputString );
-
-			if( status )
-				return L'\0';
-
-			CFStringRef inputString = CFStringCreateWithCharacters( NULL, unicodeInputString, length );
-			char utf8InputString[7]; // Max size is 6 (although really only 4 are used) + null.
-
-			if( !CFStringGetCString(inputString, utf8InputString, 7, kCFStringEncodingUTF8) )
-			{
-				CFRelease( inputString );
-				return L'\0';
-			}
-
-			wchar_t ch = utf8_get_char( utf8InputString );
-
-			CFRelease( inputString );
-			return ch == INVALID_CHAR ? L'\0' : ch;
-
-		}
-		else
-		{
-			// Fall back on the 'KCHR' resource.
-			static unsigned long state = 0;
-			static Ptr keymap = NULL;
-			Ptr new_keymap;
-
-			new_keymap = (Ptr)GetScriptManagerVariable(smKCHRCache);
-			if( new_keymap != keymap )
-			{
-				keymap = new_keymap;
-				state = 0;
-			}
-			// XXX: Only returns ascii. é will be returned as e.
-			return KeyTranslate( keymap, UInt16(iMacVirtualKey)|modifiers, &state ) & 0xFF;
+			return sCharCode;
 		}
 	}
 

src/arch/MemoryCard/MemoryCardDriverThreaded_MacOSX.cpp

@@ -59,18 +59,8 @@ MemoryCardDriverThreaded_MacOSX::~MemoryCardDriverThreaded_MacOSX()
 }
 
 void MemoryCardDriverThreaded_MacOSX::Unmount( UsbStorageDevice *pDevice )
-{	
-	ParamBlockRec pb;
-	Str255 name; // A pascal string.
-	const RString& base = Basename( pDevice->sOsMountDir );
-	
-	memset( &pb, 0, sizeof(pb) );
-	name[0] = min( base.length(), size_t(255) );
-	strncpy( (char *)&name[1], base, name[0] );
-	pb.volumeParam.ioNamePtr = name;
-	pb.volumeParam.ioVolIndex = -1; // Use ioNamePtr to find the volume.
-	
-	if( PBFlushVolSync(&pb) != noErr )
+{
+	if( sync_volume_np( pDevice->sOsMountDir.c_str(), SYNC_VOLUME_FULLSYNC | SYNC_VOLUME_WAIT ) != 0 )
 		LOG->Warn( "Failed to flush the memory card." );
 }
 

src/archutils/Darwin/HIDDevice.h

@@ -45,6 +45,7 @@ inline Boolean LongValue( CFTypeRef o, long &n )
 
 namespace __gnu_cxx
 {
+#ifndef __LP64__
 	template<>
 	struct hash<IOHIDElementCookie> : private hash<uintptr_t>
 	{
@@ -53,6 +54,7 @@ namespace __gnu_cxx
 			return hash<unsigned long>::operator()( uintptr_t(cookie) );
 		}
 	};
+#endif
 }
 
 /* This is just awful, these aren't objects, treating them as such