actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fallback to the fallback when KeyCodeToChar does not work

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2014-10-11 21:10:23 +07:00
parent 85f6f2e5d4
commit 36aa012f03
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/InputHandler/InputHandler_MacOSX_HID.cpp
+6 -2
View File
@@ -446,12 +446,16 @@ wchar_t InputHandler_MacOSX_HID::DeviceButtonToChar( DeviceButton button, bool b
return L'\0'; return L'\0';
} }
// Use Quartz to translate device button to char // Use Text Input Source services to convert the key code to character code.
UInt8 iMacVirtualKey; UInt8 iMacVirtualKey;
if( KeyboardDevice::DeviceButtonToMacVirtualKey( button, iMacVirtualKey ) ) if( KeyboardDevice::DeviceButtonToMacVirtualKey( button, iMacVirtualKey ) )
{ {
UInt32 nModifiers = bUseCurrentKeyModifiers ? GetCurrentKeyModifiers() : 0; UInt32 nModifiers = bUseCurrentKeyModifiers ? GetCurrentKeyModifiers() : 0;
return KeyCodeToChar( iMacVirtualKey, nModifiers ); wchar_t sCharCode = KeyCodeToChar( iMacVirtualKey, nModifiers );
if( sCharCode != 0 )
{
return sCharCode;
}
} }
return InputHandler::DeviceButtonToChar( button, bUseCurrentKeyModifiers ); return InputHandler::DeviceButtonToChar( button, bUseCurrentKeyModifiers );