ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-24 18:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Device discovery now works correctly. Added support for input value callbacks.

Browse source
This commit is contained in:
the_fiddler 2010-11-24 12:50:08 +00:00
parent 7a83b5decb
commit 6a4b41d975
2 changed files with 75 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Source/OpenTK/Platform/MacOS/CarbonBindings/CoreFoundation.cs
View file

@ -115,7 +115,21 @@ namespace OpenTK.Platform.MacOS.Carbon
kCFNumberMaxType = 16
};
public enum CFRunLoopExitReason
{
Finished = 1,
Stopped = 2,
TimedOut = 3,
HandledSource = 4
}
public static readonly IntPtr RunLoopModeDefault = CF.CFSTR("kCFRunLoopDefaultMode");
[DllImport(appServices)]
internal static extern CFRunLoop CFRunLoopGetCurrent();
[DllImport(appServices)]
internal static extern CFRunLoopExitReason CFRunLoopRunInMode(
IntPtr cfstrMode, double interval, bool returnAfterSourceHandled);
}
}

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

@ -40,6 +40,7 @@ namespace OpenTK.Platform.MacOS
using CFString = System.IntPtr;
using IOHIDDeviceRef = System.IntPtr;
using IOHIDManagerRef = System.IntPtr;
using IOHIDValueRef = System.IntPtr;
using IOOptionBits = System.IntPtr;
using IOReturn = System.IntPtr;
@ -48,17 +49,36 @@ namespace OpenTK.Platform.MacOS
#region Fields
readonly IOHIDManagerRef hidmanager;
readonly static NativeMethods.IOHIDDeviceCallback HandleDeviceAdded = delegate
{
Debug.WriteLine("Device added");
};
readonly static NativeMethods.IOHIDDeviceCallback HandleDeviceRemoved = delegate
{
Debug.WriteLine("Device Removed");
};
readonly static CFString RunLoopMode = CF.CFSTR("OPENTK_INPUT");
readonly static CFString InputLoopMode = CF.CFSTR("opentkRunLoopCheckDevicesMode");
readonly static CFDictionary DeviceTypes = new CFDictionary();
readonly static NativeMethods.IOHIDDeviceCallback HandleDeviceAdded = delegate(
IntPtr context, IOReturn res, IntPtr sender, IOHIDDeviceRef device)
{
Debug.Print("Device {0} discovered", device);
// IOReturn.Zero is kIOReturnSuccess
if (NativeMethods.IOHIDDeviceOpen(device, IOOptionBits.Zero) == IOReturn.Zero)
{
Debug.Print("Device {0} connected", device);
NativeMethods.IOHIDDeviceRegisterInputValueCallback(device, HandleValue, IntPtr.Zero);
NativeMethods.IOHIDDeviceScheduleWithRunLoop(device, CF.CFRunLoopGetCurrent(), InputLoopMode);
}
};
readonly static NativeMethods.IOHIDDeviceCallback HandleDeviceRemoved = delegate(
IntPtr context, IOReturn res, IntPtr sender, IOHIDDeviceRef device)
{
Debug.Print("Device {0} disconnected", device);
NativeMethods.IOHIDDeviceRegisterInputValueCallback(device, null, IntPtr.Zero);
NativeMethods.IOHIDDeviceScheduleWithRunLoop(device, IntPtr.Zero, IntPtr.Zero);
};
readonly static NativeMethods.IOHIDValueCallback HandleValue = delegate(
IntPtr context, IOReturn res, IntPtr sender, IOHIDValueRef device)
{
};
#endregion
#region Constructors
@ -80,19 +100,27 @@ namespace OpenTK.Platform.MacOS
return NativeMethods.IOHIDManagerCreate(IntPtr.Zero, IntPtr.Zero);
}
// Registers callbacks for device addition and removal. These callbacks
// are called when we run the loop in CheckDevicesMode
static void RegisterHIDCallbacks(IOHIDManagerRef hidmanager)
{
CFRunLoop runloop = Carbon.CF.CFRunLoopGetCurrent();
CFRunLoop runloop = CF.CFRunLoopGetCurrent();
NativeMethods.IOHIDManagerRegisterDeviceMatchingCallback(
hidmanager, HandleDeviceAdded, IntPtr.Zero);
NativeMethods.IOHIDManagerRegisterDeviceRemovalCallback(
hidmanager, HandleDeviceRemoved, IntPtr.Zero);
NativeMethods.IOHIDManagerScheduleWithRunLoop(hidmanager,
runloop, RunLoopMode);
runloop, InputLoopMode);
NativeMethods.IOHIDManagerSetDeviceMatching(hidmanager, DeviceTypes.Ref);
NativeMethods.IOHIDManagerOpen(hidmanager, IOOptionBits.Zero);
while (CF.CFRunLoopRunInMode(InputLoopMode, 0, true) ==
CF.CFRunLoopExitReason.HandledSource)
{
// Do nothing. The real work is done in the Handle* callbacks above.
}
}
#endregion
@ -109,6 +137,10 @@ namespace OpenTK.Platform.MacOS
return new MouseState();
}
public void SetPosition(double x, double y)
{
}
#endregion
#region NativeMethods
@ -151,8 +183,26 @@ namespace OpenTK.Platform.MacOS
IOHIDManagerRef manager,
IOOptionBits options) ;
[DllImport(hid)]
public static extern IOReturn IOHIDDeviceOpen(
IOHIDDeviceRef manager,
IOOptionBits opts);
[DllImport(hid)]
public static extern void IOHIDDeviceRegisterInputValueCallback(
IOHIDDeviceRef device,
IOHIDValueCallback callback,
IntPtr context);
[DllImport(hid)]
public static extern void IOHIDDeviceScheduleWithRunLoop(
IOHIDDeviceRef device,
CFRunLoop inCFRunLoop,
CFString inCFRunLoopMode);
public delegate void IOHIDDeviceCallback(IntPtr ctx, IOReturn res, IntPtr sender, IOHIDDeviceRef device);
public delegate void IOHIDValueCallback(IntPtr ctx, IOReturn res, IntPtr sender, IOHIDValueRef val);
}
#endregion