add Quartz key input handler
unused of course since no macOS support, but there when we need it
This commit is contained in:
parent
b6d4b0dc81
commit
d4602cf831
|
@ -13,7 +13,8 @@ namespace BizHawk.Bizware.Input
|
|||
/// Abstract class which only handles keyboard input
|
||||
/// Uses OS specific functionality, as there is no good cross platform way to do this
|
||||
/// (mostly as all the available cross-platform options require a focused window, arg!)
|
||||
/// TODO: Doesn't work for Wayland or macOS yet (maybe Linux should just use evdev here)
|
||||
/// TODO: Doesn't work for Wayland yet (maybe Linux should just use evdev here)
|
||||
/// TODO: Stop using a ton of static classes here, checking CurrentOS constantly is annoying...
|
||||
/// </summary>
|
||||
public abstract class OSTailoredKeyInputAdapter : IHostInputAdapter
|
||||
{
|
||||
|
@ -29,9 +30,8 @@ namespace BizHawk.Bizware.Input
|
|||
X11KeyInput.Deinitialize();
|
||||
break;
|
||||
case OSTailoredCode.DistinctOS.macOS:
|
||||
//QuartzKeyInput.Deinitialize();
|
||||
//break;
|
||||
throw new NotSupportedException("TODO QUARTZ");
|
||||
QuartzKeyInput.Deinitialize();
|
||||
break;
|
||||
case OSTailoredCode.DistinctOS.Windows:
|
||||
RAWKeyInput.Deinitialize();
|
||||
break;
|
||||
|
@ -50,9 +50,8 @@ namespace BizHawk.Bizware.Input
|
|||
X11KeyInput.Initialize();
|
||||
break;
|
||||
case OSTailoredCode.DistinctOS.macOS:
|
||||
//QuartzKeyInput.Initialize();
|
||||
//break;
|
||||
throw new NotSupportedException("TODO QUARTZ");
|
||||
QuartzKeyInput.Initialize();
|
||||
break;
|
||||
case OSTailoredCode.DistinctOS.Windows:
|
||||
RAWKeyInput.Initialize();
|
||||
break;
|
||||
|
@ -76,7 +75,7 @@ namespace BizHawk.Bizware.Input
|
|||
var ret = OSTailoredCode.CurrentOS switch
|
||||
{
|
||||
OSTailoredCode.DistinctOS.Linux => X11KeyInput.Update(),
|
||||
OSTailoredCode.DistinctOS.macOS => throw new NotSupportedException("TODO QUARTZ"),
|
||||
OSTailoredCode.DistinctOS.macOS => QuartzKeyInput.Update(),
|
||||
OSTailoredCode.DistinctOS.Windows => RAWKeyInput.Update(_config ?? throw new(nameof(ProcessHostKeyboards) + " called before the global config was passed")),
|
||||
_ => throw new InvalidOperationException()
|
||||
};
|
||||
|
|
|
@ -0,0 +1,175 @@
|
|||
#nullable enable
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using BizHawk.Client.Common;
|
||||
|
||||
using static BizHawk.Common.QuartzImports;
|
||||
|
||||
namespace BizHawk.Bizware.Input
|
||||
{
|
||||
internal static class QuartzKeyInput
|
||||
{
|
||||
private static readonly bool[] LastKeyState = new bool[0x7F];
|
||||
private static readonly object _syncObject = new();
|
||||
|
||||
public static void Initialize()
|
||||
{
|
||||
lock (_syncObject)
|
||||
{
|
||||
Deinitialize();
|
||||
}
|
||||
}
|
||||
|
||||
public static void Deinitialize()
|
||||
{
|
||||
lock (_syncObject)
|
||||
{
|
||||
Array.Clear(LastKeyState, 0, LastKeyState.Length);
|
||||
}
|
||||
}
|
||||
|
||||
public static IEnumerable<KeyEvent> Update()
|
||||
{
|
||||
lock (_syncObject)
|
||||
{
|
||||
var eventList = new List<KeyEvent>();
|
||||
for (var keycode = 0; keycode < 0x7F; keycode++)
|
||||
{
|
||||
var keystate = CGEventSourceKeyState(
|
||||
CGEventSourceStateID.kCGEventSourceStateHIDSystemState, (CGKeyCode)keycode);
|
||||
|
||||
if (LastKeyState[keycode] != keystate)
|
||||
{
|
||||
if (KeyEnumMap.TryGetValue((CGKeyCode)keycode, out var key))
|
||||
{
|
||||
eventList.Add(new(key, pressed: keystate));
|
||||
LastKeyState[keycode] = keystate;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return eventList;
|
||||
}
|
||||
}
|
||||
|
||||
private static readonly IReadOnlyDictionary<CGKeyCode, DistinctKey> KeyEnumMap = new Dictionary<CGKeyCode, DistinctKey>
|
||||
{
|
||||
[CGKeyCode.kVK_ANSI_A] = DistinctKey.A,
|
||||
[CGKeyCode.kVK_ANSI_S] = DistinctKey.S,
|
||||
[CGKeyCode.kVK_ANSI_D] = DistinctKey.D,
|
||||
[CGKeyCode.kVK_ANSI_F] = DistinctKey.F,
|
||||
[CGKeyCode.kVK_ANSI_H] = DistinctKey.H,
|
||||
[CGKeyCode.kVK_ANSI_G] = DistinctKey.G,
|
||||
[CGKeyCode.kVK_ANSI_Z] = DistinctKey.Z,
|
||||
[CGKeyCode.kVK_ANSI_X] = DistinctKey.X,
|
||||
[CGKeyCode.kVK_ANSI_C] = DistinctKey.C,
|
||||
[CGKeyCode.kVK_ANSI_V] = DistinctKey.V,
|
||||
[CGKeyCode.kVK_ANSI_B] = DistinctKey.B,
|
||||
[CGKeyCode.kVK_ANSI_Q] = DistinctKey.Q,
|
||||
[CGKeyCode.kVK_ANSI_W] = DistinctKey.W,
|
||||
[CGKeyCode.kVK_ANSI_E] = DistinctKey.E,
|
||||
[CGKeyCode.kVK_ANSI_R] = DistinctKey.R,
|
||||
[CGKeyCode.kVK_ANSI_Y] = DistinctKey.Y,
|
||||
[CGKeyCode.kVK_ANSI_T] = DistinctKey.T,
|
||||
[CGKeyCode.kVK_ANSI_1] = DistinctKey.D1,
|
||||
[CGKeyCode.kVK_ANSI_2] = DistinctKey.D2,
|
||||
[CGKeyCode.kVK_ANSI_3] = DistinctKey.D3,
|
||||
[CGKeyCode.kVK_ANSI_4] = DistinctKey.D4,
|
||||
[CGKeyCode.kVK_ANSI_6] = DistinctKey.D6,
|
||||
[CGKeyCode.kVK_ANSI_5] = DistinctKey.D5,
|
||||
[CGKeyCode.kVK_ANSI_Equal] = DistinctKey.OemPlus,
|
||||
[CGKeyCode.kVK_ANSI_9] = DistinctKey.D9,
|
||||
[CGKeyCode.kVK_ANSI_7] = DistinctKey.D7,
|
||||
[CGKeyCode.kVK_ANSI_Minus] = DistinctKey.OemMinus,
|
||||
[CGKeyCode.kVK_ANSI_8] = DistinctKey.D8,
|
||||
[CGKeyCode.kVK_ANSI_0] = DistinctKey.D0,
|
||||
[CGKeyCode.kVK_ANSI_RightBracket] = DistinctKey.OemCloseBrackets,
|
||||
[CGKeyCode.kVK_ANSI_O] = DistinctKey.O,
|
||||
[CGKeyCode.kVK_ANSI_U] = DistinctKey.U,
|
||||
[CGKeyCode.kVK_ANSI_LeftBracket] = DistinctKey.OemOpenBrackets,
|
||||
[CGKeyCode.kVK_ANSI_I] = DistinctKey.I,
|
||||
[CGKeyCode.kVK_ANSI_P] = DistinctKey.P,
|
||||
[CGKeyCode.kVK_Return] = DistinctKey.Return,
|
||||
[CGKeyCode.kVK_ANSI_L] = DistinctKey.L,
|
||||
[CGKeyCode.kVK_ANSI_J] = DistinctKey.J,
|
||||
[CGKeyCode.kVK_ANSI_Quote] = DistinctKey.OemQuotes,
|
||||
[CGKeyCode.kVK_ANSI_K] = DistinctKey.K,
|
||||
[CGKeyCode.kVK_ANSI_Semicolon] = DistinctKey.OemSemicolon,
|
||||
[CGKeyCode.kVK_ANSI_Backslash] = DistinctKey.OemBackslash,
|
||||
[CGKeyCode.kVK_ANSI_Comma] = DistinctKey.OemComma,
|
||||
[CGKeyCode.kVK_ANSI_Slash] = DistinctKey.OemQuestion,
|
||||
[CGKeyCode.kVK_ANSI_N] = DistinctKey.N,
|
||||
[CGKeyCode.kVK_ANSI_M] = DistinctKey.M,
|
||||
[CGKeyCode.kVK_ANSI_Period] = DistinctKey.OemPeriod,
|
||||
[CGKeyCode.kVK_Tab] = DistinctKey.Tab,
|
||||
[CGKeyCode.kVK_Space] = DistinctKey.Space,
|
||||
[CGKeyCode.kVK_ANSI_Grave] = DistinctKey.OemTilde,
|
||||
[CGKeyCode.kVK_Delete] = DistinctKey.Delete,
|
||||
[CGKeyCode.kVK_Escape] = DistinctKey.Escape,
|
||||
[CGKeyCode.kVK_RightCommand] = DistinctKey.RWin,
|
||||
[CGKeyCode.kVK_Command] = DistinctKey.LWin,
|
||||
[CGKeyCode.kVK_Shift] = DistinctKey.LeftShift,
|
||||
[CGKeyCode.kVK_CapsLock] = DistinctKey.CapsLock,
|
||||
[CGKeyCode.kVK_Option] = DistinctKey.LeftAlt,
|
||||
[CGKeyCode.kVK_Control] = DistinctKey.LeftCtrl,
|
||||
[CGKeyCode.kVK_RightShift] = DistinctKey.RightShift,
|
||||
[CGKeyCode.kVK_RightOption] = DistinctKey.RightAlt,
|
||||
[CGKeyCode.kVK_RightControl] = DistinctKey.RightCtrl,
|
||||
// [CGKeyCode.kVK_Function] = DistinctKey.,
|
||||
[CGKeyCode.kVK_F17] = DistinctKey.F17,
|
||||
[CGKeyCode.kVK_ANSI_KeypadDecimal] = DistinctKey.Decimal,
|
||||
[CGKeyCode.kVK_ANSI_KeypadMultiply] = DistinctKey.Multiply,
|
||||
[CGKeyCode.kVK_ANSI_KeypadPlus] = DistinctKey.Add,
|
||||
[CGKeyCode.kVK_ANSI_KeypadClear] = DistinctKey.Clear,
|
||||
[CGKeyCode.kVK_VolumeUp] = DistinctKey.VolumeUp,
|
||||
[CGKeyCode.kVK_VolumeDown] = DistinctKey.VolumeDown,
|
||||
[CGKeyCode.kVK_Mute] = DistinctKey.VolumeMute,
|
||||
[CGKeyCode.kVK_ANSI_KeypadDivide] = DistinctKey.Divide,
|
||||
[CGKeyCode.kVK_ANSI_KeypadEnter] = DistinctKey.NumPadEnter,
|
||||
[CGKeyCode.kVK_ANSI_KeypadMinus] = DistinctKey.Subtract,
|
||||
[CGKeyCode.kVK_F18] = DistinctKey.F18,
|
||||
[CGKeyCode.kVK_F19] = DistinctKey.F19,
|
||||
[CGKeyCode.kVK_ANSI_KeypadEquals] = DistinctKey.OemPlus,
|
||||
[CGKeyCode.kVK_ANSI_Keypad0] = DistinctKey.NumPad0,
|
||||
[CGKeyCode.kVK_ANSI_Keypad1] = DistinctKey.NumPad1,
|
||||
[CGKeyCode.kVK_ANSI_Keypad2] = DistinctKey.NumPad2,
|
||||
[CGKeyCode.kVK_ANSI_Keypad3] = DistinctKey.NumPad3,
|
||||
[CGKeyCode.kVK_ANSI_Keypad4] = DistinctKey.NumPad4,
|
||||
[CGKeyCode.kVK_ANSI_Keypad5] = DistinctKey.NumPad5,
|
||||
[CGKeyCode.kVK_ANSI_Keypad6] = DistinctKey.NumPad6,
|
||||
[CGKeyCode.kVK_ANSI_Keypad7] = DistinctKey.NumPad7,
|
||||
[CGKeyCode.kVK_F20] = DistinctKey.F20,
|
||||
[CGKeyCode.kVK_ANSI_Keypad8] = DistinctKey.NumPad8,
|
||||
[CGKeyCode.kVK_ANSI_Keypad9] = DistinctKey.NumPad9,
|
||||
[CGKeyCode.kVK_F5] = DistinctKey.F5,
|
||||
[CGKeyCode.kVK_F6] = DistinctKey.F6,
|
||||
[CGKeyCode.kVK_F7] = DistinctKey.F7,
|
||||
[CGKeyCode.kVK_F3] = DistinctKey.F3,
|
||||
[CGKeyCode.kVK_F8] = DistinctKey.F8,
|
||||
[CGKeyCode.kVK_F9] = DistinctKey.F9,
|
||||
[CGKeyCode.kVK_F11] = DistinctKey.F11,
|
||||
[CGKeyCode.kVK_F13] = DistinctKey.F13,
|
||||
[CGKeyCode.kVK_F16] = DistinctKey.F16,
|
||||
[CGKeyCode.kVK_F14] = DistinctKey.F14,
|
||||
[CGKeyCode.kVK_F10] = DistinctKey.F10,
|
||||
[CGKeyCode.kVK_ContextMenu] = DistinctKey.Apps,
|
||||
[CGKeyCode.kVK_F12] = DistinctKey.F12,
|
||||
[CGKeyCode.kVK_F15] = DistinctKey.F15,
|
||||
[CGKeyCode.kVK_Help] = DistinctKey.Help,
|
||||
[CGKeyCode.kVK_Home] = DistinctKey.Home,
|
||||
[CGKeyCode.kVK_PageUp] = DistinctKey.PageUp,
|
||||
[CGKeyCode.kVK_ForwardDelete] = DistinctKey.Delete,
|
||||
[CGKeyCode.kVK_F4] = DistinctKey.F4,
|
||||
[CGKeyCode.kVK_End] = DistinctKey.End,
|
||||
[CGKeyCode.kVK_F2] = DistinctKey.F2,
|
||||
[CGKeyCode.kVK_PageDown] = DistinctKey.PageDown,
|
||||
[CGKeyCode.kVK_F1] = DistinctKey.F1,
|
||||
[CGKeyCode.kVK_LeftArrow] = DistinctKey.Left,
|
||||
[CGKeyCode.kVK_RightArrow] = DistinctKey.Right,
|
||||
[CGKeyCode.kVK_DownArrow] = DistinctKey.Down,
|
||||
[CGKeyCode.kVK_UpArrow] = DistinctKey.Up,
|
||||
};
|
||||
}
|
||||
}
|
|
@ -0,0 +1,137 @@
|
|||
#nullable enable
|
||||
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace BizHawk.Common
|
||||
{
|
||||
public static class QuartzImports
|
||||
{
|
||||
public enum CGEventSourceStateID : int
|
||||
{
|
||||
kCGEventSourceStateHIDSystemState = 1,
|
||||
}
|
||||
|
||||
public enum CGKeyCode : ushort
|
||||
{
|
||||
kVK_ANSI_A = 0x00,
|
||||
kVK_ANSI_S = 0x01,
|
||||
kVK_ANSI_D = 0x02,
|
||||
kVK_ANSI_F = 0x03,
|
||||
kVK_ANSI_H = 0x04,
|
||||
kVK_ANSI_G = 0x05,
|
||||
kVK_ANSI_Z = 0x06,
|
||||
kVK_ANSI_X = 0x07,
|
||||
kVK_ANSI_C = 0x08,
|
||||
kVK_ANSI_V = 0x09,
|
||||
kVK_ANSI_B = 0x0B,
|
||||
kVK_ANSI_Q = 0x0C,
|
||||
kVK_ANSI_W = 0x0D,
|
||||
kVK_ANSI_E = 0x0E,
|
||||
kVK_ANSI_R = 0x0F,
|
||||
kVK_ANSI_Y = 0x10,
|
||||
kVK_ANSI_T = 0x11,
|
||||
kVK_ANSI_1 = 0x12,
|
||||
kVK_ANSI_2 = 0x13,
|
||||
kVK_ANSI_3 = 0x14,
|
||||
kVK_ANSI_4 = 0x15,
|
||||
kVK_ANSI_6 = 0x16,
|
||||
kVK_ANSI_5 = 0x17,
|
||||
kVK_ANSI_Equal = 0x18,
|
||||
kVK_ANSI_9 = 0x19,
|
||||
kVK_ANSI_7 = 0x1A,
|
||||
kVK_ANSI_Minus = 0x1B,
|
||||
kVK_ANSI_8 = 0x1C,
|
||||
kVK_ANSI_0 = 0x1D,
|
||||
kVK_ANSI_RightBracket = 0x1E,
|
||||
kVK_ANSI_O = 0x1F,
|
||||
kVK_ANSI_U = 0x20,
|
||||
kVK_ANSI_LeftBracket = 0x21,
|
||||
kVK_ANSI_I = 0x22,
|
||||
kVK_ANSI_P = 0x23,
|
||||
kVK_Return = 0x24,
|
||||
kVK_ANSI_L = 0x25,
|
||||
kVK_ANSI_J = 0x26,
|
||||
kVK_ANSI_Quote = 0x27,
|
||||
kVK_ANSI_K = 0x28,
|
||||
kVK_ANSI_Semicolon = 0x29,
|
||||
kVK_ANSI_Backslash = 0x2A,
|
||||
kVK_ANSI_Comma = 0x2B,
|
||||
kVK_ANSI_Slash = 0x2C,
|
||||
kVK_ANSI_N = 0x2D,
|
||||
kVK_ANSI_M = 0x2E,
|
||||
kVK_ANSI_Period = 0x2F,
|
||||
kVK_Tab = 0x30,
|
||||
kVK_Space = 0x31,
|
||||
kVK_ANSI_Grave = 0x32,
|
||||
kVK_Delete = 0x33,
|
||||
kVK_Escape = 0x35,
|
||||
kVK_RightCommand = 0x36,
|
||||
kVK_Command = 0x37,
|
||||
kVK_Shift = 0x38,
|
||||
kVK_CapsLock = 0x39,
|
||||
kVK_Option = 0x3A,
|
||||
kVK_Control = 0x3B,
|
||||
kVK_RightShift = 0x3C,
|
||||
kVK_RightOption = 0x3D,
|
||||
kVK_RightControl = 0x3E,
|
||||
kVK_Function = 0x3F,
|
||||
kVK_F17 = 0x40,
|
||||
kVK_ANSI_KeypadDecimal = 0x41,
|
||||
kVK_ANSI_KeypadMultiply = 0x43,
|
||||
kVK_ANSI_KeypadPlus = 0x45,
|
||||
kVK_ANSI_KeypadClear = 0x47,
|
||||
kVK_VolumeUp = 0x48,
|
||||
kVK_VolumeDown = 0x49,
|
||||
kVK_Mute = 0x4A,
|
||||
kVK_ANSI_KeypadDivide = 0x4B,
|
||||
kVK_ANSI_KeypadEnter = 0x4C,
|
||||
kVK_ANSI_KeypadMinus = 0x4E,
|
||||
kVK_F18 = 0x4F,
|
||||
kVK_F19 = 0x50,
|
||||
kVK_ANSI_KeypadEquals = 0x51,
|
||||
kVK_ANSI_Keypad0 = 0x52,
|
||||
kVK_ANSI_Keypad1 = 0x53,
|
||||
kVK_ANSI_Keypad2 = 0x54,
|
||||
kVK_ANSI_Keypad3 = 0x55,
|
||||
kVK_ANSI_Keypad4 = 0x56,
|
||||
kVK_ANSI_Keypad5 = 0x57,
|
||||
kVK_ANSI_Keypad6 = 0x58,
|
||||
kVK_ANSI_Keypad7 = 0x59,
|
||||
kVK_F20 = 0x5A,
|
||||
kVK_ANSI_Keypad8 = 0x5B,
|
||||
kVK_ANSI_Keypad9 = 0x5C,
|
||||
kVK_F5 = 0x60,
|
||||
kVK_F6 = 0x61,
|
||||
kVK_F7 = 0x62,
|
||||
kVK_F3 = 0x63,
|
||||
kVK_F8 = 0x64,
|
||||
kVK_F9 = 0x65,
|
||||
kVK_F11 = 0x67,
|
||||
kVK_F13 = 0x69,
|
||||
kVK_F16 = 0x6A,
|
||||
kVK_F14 = 0x6B,
|
||||
kVK_F10 = 0x6D,
|
||||
kVK_ContextMenu = 0x6E,
|
||||
kVK_F12 = 0x6F,
|
||||
kVK_F15 = 0x71,
|
||||
kVK_Help = 0x72,
|
||||
kVK_Home = 0x73,
|
||||
kVK_PageUp = 0x74,
|
||||
kVK_ForwardDelete = 0x75,
|
||||
kVK_F4 = 0x76,
|
||||
kVK_End = 0x77,
|
||||
kVK_F2 = 0x78,
|
||||
kVK_PageDown = 0x79,
|
||||
kVK_F1 = 0x7A,
|
||||
kVK_LeftArrow = 0x7B,
|
||||
kVK_RightArrow = 0x7C,
|
||||
kVK_DownArrow = 0x7D,
|
||||
kVK_UpArrow = 0x7E,
|
||||
}
|
||||
|
||||
[DllImport("/System/Library/Frameworks/CoreGraphics.framework/CoreGraphics")]
|
||||
[return: MarshalAs(UnmanagedType.U1)]
|
||||
public static extern bool CGEventSourceKeyState(CGEventSourceStateID stateID, CGKeyCode key);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue