ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-10 15:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Mac] Construct JoystickDevice when joysticks are connected

Browse source
This commit is contained in:
thefiddler 2014-01-05 00:47:40 +01:00
parent 3757db9978
commit 32653d2c64
1 changed files with 57 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,19 @@ namespace OpenTK.Platform.MacOS
{ {
#region Fields #region Fields
class JoystickDetails
{
public JoystickState State;
public JoystickCapabilities Capabilities;
}
class MacJoystick : JoystickDevice<JoystickDetails>
{
internal MacJoystick(int id, int axes, int buttons)
: base(id, axes, buttons)
{ }
}
readonly IOHIDManagerRef hidmanager; readonly IOHIDManagerRef hidmanager;
readonly Dictionary<IntPtr, MouseState> MouseDevices = readonly Dictionary<IntPtr, MouseState> MouseDevices =
@ -66,8 +79,8 @@ namespace OpenTK.Platform.MacOS
readonly Dictionary<int, IntPtr> KeyboardIndexToDevice = readonly Dictionary<int, IntPtr> KeyboardIndexToDevice =
new Dictionary<int, IntPtr>(); new Dictionary<int, IntPtr>();
readonly Dictionary<IntPtr, JoystickState> JoystickDevices = readonly Dictionary<IntPtr, MacJoystick> JoystickDevices =
new Dictionary<IntPtr, JoystickState>(new IntPtrEqualityComparer()); new Dictionary<IntPtr, MacJoystick>(new IntPtrEqualityComparer());
readonly Dictionary<int, IntPtr> JoystickIndexToDevice = readonly Dictionary<int, IntPtr> JoystickIndexToDevice =
new Dictionary<int, IntPtr>(); new Dictionary<int, IntPtr>();
@ -208,6 +221,7 @@ namespace OpenTK.Platform.MacOS
MouseState mouse; MouseState mouse;
KeyboardState keyboard; KeyboardState keyboard;
MacJoystick joystick;
if (MouseDevices.TryGetValue(context, out mouse)) if (MouseDevices.TryGetValue(context, out mouse))
{ {
MouseDevices[context] = UpdateMouse(mouse, val); MouseDevices[context] = UpdateMouse(mouse, val);
@ -215,7 +229,13 @@ namespace OpenTK.Platform.MacOS
else if (KeyboardDevices.TryGetValue(context, out keyboard)) else if (KeyboardDevices.TryGetValue(context, out keyboard))
{ {
KeyboardDevices[context] = UpdateKeyboard(keyboard, val); KeyboardDevices[context] = UpdateKeyboard(keyboard, val);
}else{ }
else if (JoystickDevices.TryGetValue(context, out joystick))
{
JoystickDevices[context] = UpdateJoystick(joystick, val);
}
else
{
//Debug.Print ("Device {0:x} not found in list of keyboards or mice", sender); //Debug.Print ("Device {0:x} not found in list of keyboards or mice", sender);
} }
} }
@ -349,22 +369,31 @@ namespace OpenTK.Platform.MacOS
#region Joystick #region Joystick
MacJoystick CreateJoystick(CFAllocatorRef sender, CFAllocatorRef device)
{
MacJoystick joy = new MacJoystick(-1, 0, 0);
joy.Details.State.SetIsConnected(true);
// Todo: discover joystick capabilities
joy.Details.Capabilities = new JoystickCapabilities(0, 0, true);
return joy;
}
void AddJoystick(CFAllocatorRef sender, CFAllocatorRef device) void AddJoystick(CFAllocatorRef sender, CFAllocatorRef device)
{ {
if (!JoystickDevices.ContainsKey(device)) if (!JoystickDevices.ContainsKey(device))
{ {
Debug.Print("Joystick device {0:x} discovered, sender is {1:x}", device, sender); Debug.Print("Joystick device {0:x} discovered, sender is {1:x}", device, sender);
JoystickState state = new JoystickState(); MacJoystick joy = CreateJoystick(sender, device);
state.SetIsConnected(true); JoystickIndexToDevice.Add(JoystickDevices.Count, device);
JoystickIndexToDevice.Add(KeyboardDevices.Count, device); JoystickDevices.Add(device, joy);
JoystickDevices.Add(device, state);
} }
else else
{ {
Debug.Print("Joystick device {0:x} reconnected, sender is {1:x}", device, sender); Debug.Print("Joystick device {0:x} reconnected, sender is {1:x}", device, sender);
JoystickState state = JoystickDevices[device]; JoystickDevices[device].Details.State.SetIsConnected(true);
state.SetIsConnected(true); //JoystickDevices[device].Details.Capabilities.SetIsConnected(true);
JoystickDevices[device] = state;
} }
} }
@ -372,9 +401,24 @@ 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
JoystickState state = JoystickDevices[device]; JoystickDevices[device].Details.State.SetIsConnected(false);
state.SetIsConnected(false); //JoystickDevices[device].Details.Capabilities.SetIsConnected(false);
JoystickDevices[device] = state; }
static MacJoystick UpdateJoystick(MacJoystick state, IOHIDValueRef val)
{
//IOHIDElementRef elem = NativeMethods.IOHIDValueGetElement(val);
//int v_int = NativeMethods.IOHIDValueGetIntegerValue(val).ToInt32();
//HIDPage page = NativeMethods.IOHIDElementGetUsagePage(elem);
//int usage = NativeMethods.IOHIDElementGetUsage(elem);
//switch (page)
//{
// case HIDPage.GenericDesktop:
// break;
//}
return state;
} }
#endregion #endregion