ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-21 14:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented KeyDown & KeyUp events on OpenTK/Carbon

Browse source
This commit is contained in:
thefiddler 2013-12-23 19:32:16 +01:00
parent 2d7734c915
commit c6a21a2239
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Source/OpenTK/Platform/MacOS/CarbonGLNative.cs
View file

@ -74,6 +74,8 @@ namespace OpenTK.Platform.MacOS
new Dictionary<IntPtr, WeakReference>(new IntPtrEqualityComparer()); new Dictionary<IntPtr, WeakReference>(new IntPtrEqualityComparer());
KeyPressEventArgs mKeyPressArgs = new KeyPressEventArgs((char)0); KeyPressEventArgs mKeyPressArgs = new KeyPressEventArgs((char)0);
OpenTK.Input.KeyboardKeyEventArgs mKeyDownArgs = new OpenTK.Input.KeyboardKeyEventArgs();
OpenTK.Input.KeyboardKeyEventArgs mKeyUpArgs = new OpenTK.Input.KeyboardKeyEventArgs();
bool mMouseIn = false; bool mMouseIn = false;
bool mIsActive = false; bool mIsActive = false;
@ -377,12 +379,25 @@ namespace OpenTK.Platform.MacOS
{ {
case KeyboardEventKind.RawKeyRepeat: case KeyboardEventKind.RawKeyRepeat:
if (InputDriver.Keyboard[0].KeyRepeat) if (InputDriver.Keyboard[0].KeyRepeat)
goto case KeyboardEventKind.RawKeyDown; {
// Repeat KeyPress events until KeyUp
if (!Char.IsControl(mKeyPressArgs.KeyChar))
{
OnKeyPress(mKeyPressArgs);
}
}
break; break;
case KeyboardEventKind.RawKeyDown: case KeyboardEventKind.RawKeyDown:
Keymap.TryGetValue(code, out key); Keymap.TryGetValue(code, out key);
// Legacy keyboard API
InputDriver.Keyboard[0].SetKey(key, (uint)code, true); InputDriver.Keyboard[0].SetKey(key, (uint)code, true);
// Raise KeyDown for new keyboard API
mKeyDownArgs.Key = key;
KeyDown(this, mKeyDownArgs);
// Raise KeyPress for new keyboard API
if (!Char.IsControl(mKeyPressArgs.KeyChar)) if (!Char.IsControl(mKeyPressArgs.KeyChar))
{ {
OnKeyPress(mKeyPressArgs); OnKeyPress(mKeyPressArgs);
@ -391,7 +406,12 @@ namespace OpenTK.Platform.MacOS
case KeyboardEventKind.RawKeyUp: case KeyboardEventKind.RawKeyUp:
Keymap.TryGetValue(code, out key); Keymap.TryGetValue(code, out key);
// Legacy keyboard API
InputDriver.Keyboard[0].SetKey(key, (uint)code, false); InputDriver.Keyboard[0].SetKey(key, (uint)code, false);
// Raise KeyUp for new keyboard API
mKeyUpArgs.Key = key;
KeyUp(this, mKeyUpArgs);
return OSStatus.NoError; return OSStatus.NoError;
case KeyboardEventKind.RawKeyModifiersChanged: case KeyboardEventKind.RawKeyModifiersChanged: