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

alright, this may help out some, but there's still no path to INPUTFILTER yet... need to get x and y coordinates

Browse Source
This commit is contained in:
AJ Kelly
2011-02-23 20:01:14 -06:00
parent 38706cc50e
commit 3ed8b14c47
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/archutils/Darwin/MouseDevice.cpp
+20 -1
View File
@@ -90,7 +90,10 @@ void MouseDevice::AddElement( int usagePage, int usage, IOHIDElementCookie cooki
void MouseDevice::Open() void MouseDevice::Open()
{ {
//const Mouse& m = m_Mouse; const Mouse& m = m_Mouse;
#define ADD(x) if( m.x ) AddElementToQueue( m.x )
ADD( x_axis ); ADD( y_axis ); ADD( z_axis );
#undef ADD
for( hash_map<IOHIDElementCookie,DeviceButton>::const_iterator i = m_Mapping.begin(); i != m_Mapping.end(); ++i ) for( hash_map<IOHIDElementCookie,DeviceButton>::const_iterator i = m_Mapping.begin(); i != m_Mapping.end(); ++i )
AddElementToQueue( i->first ); AddElementToQueue( i->first );
} }
@@ -98,9 +101,25 @@ void MouseDevice::Open()
void MouseDevice::GetButtonPresses( vector<DeviceInput>& vPresses, IOHIDElementCookie cookie, int value, const RageTimer& now ) const void MouseDevice::GetButtonPresses( vector<DeviceInput>& vPresses, IOHIDElementCookie cookie, int value, const RageTimer& now ) const
{ {
// todo: add mouse axis stuff -aj // todo: add mouse axis stuff -aj
const Mouse& m = m_Mouse;
if( m.x_axis == cookie )
{
float level = SCALE( value, m.x_min, m.x_max, -1.0f, 1.0f );
}
else if( m.y_axis == cookie )
{
float level = SCALE( value, m.x_min, m.x_max, -1.0f, 1.0f );
}
else if( m.z_axis == cookie )
{
float level = SCALE( value, m.z_min, m.z_max, -1.0f, 1.0f );
}
else
{
hash_map<IOHIDElementCookie, DeviceButton>::const_iterator iter = m_Mapping.find( cookie ); hash_map<IOHIDElementCookie, DeviceButton>::const_iterator iter = m_Mapping.find( cookie );
if( iter != m_Mapping.end() ) if( iter != m_Mapping.end() )
vPresses.push_back( DeviceInput(DEVICE_MOUSE, iter->second, value, now) ); vPresses.push_back( DeviceInput(DEVICE_MOUSE, iter->second, value, now) );
}
} }
void MouseDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const void MouseDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const