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

Simplify and optimize by building a reverse lookup table the first time it is called.

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-14 07:21:44 +00:00
parent dd0e3ce082
commit 6e8d262f8f
1 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Darwin/KeyboardDevice.cpp
+15 -31
View File
@@ -184,24 +184,6 @@ void KeyboardDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevice
} }
static bool DeviceButtonToUsbKey( DeviceButton button, UInt8 &iUsbKeyOut )
{
for( int i=0; i<256; i++ )
{
UInt8 iUsbKey = (UInt8)i;
DeviceButton button2;
if( !UsbKeyToDeviceButton(iUsbKey,button2) )
continue;
if( button == button2 )
{
iUsbKeyOut = iUsbKey;
return true;
}
}
return false;
}
// http://lists.apple.com/archives/carbon-dev/2005/Feb/msg00071.html // http://lists.apple.com/archives/carbon-dev/2005/Feb/msg00071.html
// index represents USB keyboard usage value, content is Mac virtual keycode // index represents USB keyboard usage value, content is Mac virtual keycode
static UInt8 g_iUsbKeyToMacVirtualKey[256] = static UInt8 g_iUsbKeyToMacVirtualKey[256] =
@@ -480,23 +462,25 @@ static UInt8 g_iUsbKeyToMacVirtualKey[256] =
0xFF, /* FF no event */ 0xFF, /* FF no event */
}; };
static bool UsbKeyToMacVirtualKey( UInt8 iUsbKey, UInt8 &iMacVirtualKeyOut ) static UInt8 g_iDeviceButtonToMacVirtualKey[KEY_OTHER_0];
{
// iUsbKey is always < ARRAYSIZE(g_iUsbKeyToMacVirtualKey)
iMacVirtualKeyOut = g_iUsbKeyToMacVirtualKey[iUsbKey];
return iMacVirtualKeyOut != 0xFF;
}
bool KeyboardDevice::DeviceButtonToMacVirtualKey( DeviceButton button, UInt8 &iMacVKOut ) bool KeyboardDevice::DeviceButtonToMacVirtualKey( DeviceButton button, UInt8 &iMacVKOut )
{ {
UInt8 iUsbKey = 0; static bool bInited = false;
if( !DeviceButtonToUsbKey(button,iUsbKey) )
return false;
if( !UsbKeyToMacVirtualKey(iUsbKey, iMacVKOut) ) if( !bInited )
return false; {
memset( g_iDeviceButtonToMacVirtualKey, 0xFF, sizeof(g_iDeviceButtonToMacVirtualKey) );
return true; for( int iUsbKey = 0; iUsbKey < 256; ++iUsbKey )
{
DeviceButton button2;
if( UsbKeyToDeviceButton(iUsbKey, button2) && size_t(button2) < sizeof(g_iDeviceButtonToMacVirtualKey) )
g_iDeviceButtonToMacVirtualKey[button2] = g_iUsbKeyToMacVirtualKey[iUsbKey];
}
bInited = true;
}
iMacVKOut = g_iDeviceButtonToMacVirtualKey[button];
return iMacVKOut != 0xFF;
} }