ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved WinMMJoystickDriver hotplugging behavior

Browse source
This commit is contained in:
Stefanos A. 2013-12-24 15:51:25 +01:00
parent 97b8710339
commit 3c1404f0ac
1 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Source/OpenTK/Platform/Windows/WinMMJoystick.cs
View file

@ -133,6 +133,16 @@ namespace OpenTK.Platform.Windows
return stick; return stick;
} }
void UnplugJoystick(int index)
{
// Reset the system configuration. Without this,
// joysticks that are reconnected on different
// ports are given different ids, making it
// impossible to reconnect a disconnected user.
UnsafeNativeMethods.joyConfigChanged(0);
Debug.Print("[Win] WinMM joystick {0} unplugged", index);
}
bool IsValid(int index) bool IsValid(int index)
{ {
return index >= 0 && index < UnsafeNativeMethods.joyGetNumDevs(); return index >= 0 && index < UnsafeNativeMethods.joyGetNumDevs();
@ -258,6 +268,10 @@ namespace OpenTK.Platform.Windows
// gpcaps.DPadCount++; // gpcaps.DPadCount++;
return caps; return caps;
} }
else if (result == JoystickError.Unplugged)
{
UnplugJoystick(index);
}
} }
else else
{ {
@ -276,18 +290,32 @@ namespace OpenTK.Platform.Windows
JoyInfoEx info = new JoyInfoEx(); JoyInfoEx info = new JoyInfoEx();
info.Size = JoyInfoEx.SizeInBytes; info.Size = JoyInfoEx.SizeInBytes;
info.Flags = JoystickFlags.All; info.Flags = JoystickFlags.All;
UnsafeNativeMethods.joyGetPosEx(index, ref info);
state.SetAxis(JoystickAxis.Axis0, (short)info.XPos); JoystickError result = UnsafeNativeMethods.joyGetPosEx(index, ref info);
state.SetAxis(JoystickAxis.Axis1, (short)info.YPos); if (result == JoystickError.NoError)
state.SetAxis(JoystickAxis.Axis2, (short)info.ZPos);
state.SetAxis(JoystickAxis.Axis3, (short)info.RPos);
state.SetAxis(JoystickAxis.Axis4, (short)info.ZPos);
state.SetAxis(JoystickAxis.Axis5, (short)info.RPos);
for (int i = 0; i < 16; i++)
{ {
state.SetButton(JoystickButton.Button0 + i, (info.Buttons & 1 << i) != 0); state.SetAxis(JoystickAxis.Axis0, (short)info.XPos);
state.SetAxis(JoystickAxis.Axis1, (short)info.YPos);
state.SetAxis(JoystickAxis.Axis2, (short)info.ZPos);
state.SetAxis(JoystickAxis.Axis3, (short)info.RPos);
state.SetAxis(JoystickAxis.Axis4, (short)info.ZPos);
state.SetAxis(JoystickAxis.Axis5, (short)info.RPos);
for (int i = 0; i < 16; i++)
{
state.SetButton(JoystickButton.Button0 + i, (info.Buttons & 1 << i) != 0);
}
state.SetIsConnected(true);
}
else if (result == JoystickError.Unplugged)
{
UnplugJoystick(index);
}
else
{
// Joystick not existent or other error. No need to spam the log
//Debug.Print("[Win] WinMM joyGetPosEx failed. Error: {0}", result);
} }
} }
else else
@ -441,9 +469,11 @@ namespace OpenTK.Platform.Windows
[DllImport("Winmm.dll"), SuppressUnmanagedCodeSecurity] [DllImport("Winmm.dll"), SuppressUnmanagedCodeSecurity]
public static extern JoystickError joyGetDevCaps(int uJoyID, out JoyCaps pjc, int cbjc); public static extern JoystickError joyGetDevCaps(int uJoyID, out JoyCaps pjc, int cbjc);
[DllImport("Winmm.dll"), SuppressUnmanagedCodeSecurity] [DllImport("Winmm.dll"), SuppressUnmanagedCodeSecurity]
public static extern uint joyGetPosEx(int uJoyID, ref JoyInfoEx pji); public static extern JoystickError joyGetPosEx(int uJoyID, ref JoyInfoEx pji);
[DllImport("Winmm.dll"), SuppressUnmanagedCodeSecurity] [DllImport("Winmm.dll"), SuppressUnmanagedCodeSecurity]
public static extern int joyGetNumDevs(); public static extern int joyGetNumDevs();
[DllImport("Winmm.dll"), SuppressUnmanagedCodeSecurity]
public static extern JoystickError joyConfigChanged(int flags);
} }
#endregion #endregion