ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-06-20 12:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Mac] Calculate joystick Guid for USB devices

Browse source
This commit is contained in:
thefiddler 2014-01-05 22:06:19 +01:00
parent b458b40683
commit 5c5afb3ea3
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Source/OpenTK/Platform/MacOS/HIDInput.cs
View file

@ -58,6 +58,7 @@ namespace OpenTK.Platform.MacOS
class JoystickDetails class JoystickDetails
{ {
public string Name; public string Name;
public Guid Guid;
public JoystickState State; public JoystickState State;
public JoystickCapabilities Capabilities; public JoystickCapabilities Capabilities;
readonly public Dictionary<int, JoystickButton> ElementUsageToButton = readonly public Dictionary<int, JoystickButton> ElementUsageToButton =
@ -394,7 +395,30 @@ namespace OpenTK.Platform.MacOS
#region Joystick #region Joystick
MacJoystick CreateJoystick(CFAllocatorRef sender, CFAllocatorRef device) Guid CreateJoystickGuid(IntPtr device)
{
// Create a device guid from the product and vendor id keys
List<byte> guid_bytes = new List<byte>();
long vendor_id = 0;
long product_id = 0;
IntPtr vendor_id_ref = NativeMethods.IOHIDDeviceGetProperty(device, NativeMethods.IOHIDVendorIDKey);
IntPtr product_id_ref = NativeMethods.IOHIDDeviceGetProperty(device, NativeMethods.IOHIDProductIDKey);
if (vendor_id_ref != IntPtr.Zero)
{
CF.CFNumberGetValue(vendor_id_ref, CF.CFNumberType.kCFNumberLongType, out vendor_id);
}
if (product_id_ref != IntPtr.Zero)
{
CF.CFNumberGetValue(product_id_ref, CF.CFNumberType.kCFNumberLongType, out product_id);
}
guid_bytes.AddRange(BitConverter.GetBytes(vendor_id));
guid_bytes.AddRange(BitConverter.GetBytes(product_id));
return new Guid(guid_bytes.ToArray());
}
MacJoystick CreateJoystick(IntPtr sender, IntPtr device)
{ {
MacJoystick joy = null; MacJoystick joy = null;
@ -406,6 +430,8 @@ namespace OpenTK.Platform.MacOS
int buttons = 0; int buttons = 0;
int dpads = 0; int dpads = 0;
Guid guid = CreateJoystickGuid(device);
CFStringRef name_ref = NativeMethods.IOHIDDeviceGetProperty(device, NativeMethods.IOHIDProductKey); CFStringRef name_ref = NativeMethods.IOHIDDeviceGetProperty(device, NativeMethods.IOHIDProductKey);
string name = CF.CFStringGetCString(name_ref); string name = CF.CFStringGetCString(name_ref);
@ -459,6 +485,7 @@ namespace OpenTK.Platform.MacOS
joy = new MacJoystick(-1, axes, buttons); joy = new MacJoystick(-1, axes, buttons);
joy.Details.Name = name; joy.Details.Name = name;
joy.Details.Guid = guid;
joy.Details.State.SetIsConnected(true); joy.Details.State.SetIsConnected(true);
joy.Details.Capabilities = new JoystickCapabilities(axes, buttons, true); joy.Details.Capabilities = new JoystickCapabilities(axes, buttons, true);
@ -783,7 +810,7 @@ namespace OpenTK.Platform.MacOS
MacJoystick joystick = GetJoystick(index); MacJoystick joystick = GetJoystick(index);
if (joystick != null) if (joystick != null)
{ {
//return joystick.Details.Capabilities; return joystick.Details.Guid;
} }
return new Guid(); return new Guid();
} }