ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 07:45:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Mac] Connect devices to first available index

Browse source
This commit is contained in:
thefiddler 2014-01-05 21:53:28 +01:00
parent fc81f30251
commit fa386dc991
1 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -489,21 +489,46 @@ namespace OpenTK.Platform.MacOS
void AddJoystick(CFAllocatorRef sender, CFAllocatorRef device) void AddJoystick(CFAllocatorRef sender, CFAllocatorRef device)
{ {
if (!JoystickDevices.ContainsKey(device)) Debug.Print("Joystick device {0:x} discovered, sender is {1:x}", device, sender);
MacJoystick joy = CreateJoystick(sender, device);
if (joy != null)
{ {
Debug.Print("Joystick device {0:x} discovered, sender is {1:x}", device, sender); // Add a device->joy lookup entry for this device.
MacJoystick joy = CreateJoystick(sender, device); if (!JoystickDevices.ContainsKey(device))
if (joy != null)
{ {
JoystickIndexToDevice.Add(JoystickDevices.Count, device); // First time we've seen this device.
JoystickDevices.Add(device, joy); JoystickDevices.Add(device, joy);
} }
} else
else {
{ // This is an old device that is replugged.
Debug.Print("Joystick device {0:x} reconnected, sender is {1:x}", device, sender); // This branch does not appear to be executed, ever.
JoystickDevices[device].Details.State.SetIsConnected(true); JoystickDevices[device] = joy;
//JoystickDevices[device].Details.Capabilities.SetIsConnected(true); }
// Add an index->device lookup entry for this device.
// Use the first free (i.e. disconnected) index.
// If all indices are connected, append a new one.
int i;
for (i = 0; i < JoystickIndexToDevice.Count; i++)
{
IntPtr candidate = JoystickIndexToDevice[i];
if (!JoystickDevices[candidate].Details.State.IsConnected)
{
break;
}
}
if (i == JoystickDevices.Count)
{
// All indices connected, append a new one.
JoystickIndexToDevice.Add(JoystickDevices.Count, device);
}
else
{
// Replace joystick at that index
JoystickIndexToDevice[i] = device;
}
} }
} }
@ -511,8 +536,8 @@ namespace OpenTK.Platform.MacOS
{ {
Debug.Print("Joystick device {0:x} disconnected, sender is {1:x}", device, sender); Debug.Print("Joystick device {0:x} disconnected, sender is {1:x}", device, sender);
// Keep the device in case it comes back later on // Keep the device in case it comes back later on
JoystickDevices[device].Details.State.SetIsConnected(false); JoystickDevices[device].Details.State = new JoystickState();
//JoystickDevices[device].Details.Capabilities.SetIsConnected(false); JoystickDevices[device].Details.Capabilities = new JoystickCapabilities();
} }
static MacJoystick UpdateJoystick(MacJoystick joy, IOHIDValueRef val) static MacJoystick UpdateJoystick(MacJoystick joy, IOHIDValueRef val)