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

Added preliminary key handling to X11Keyboard.

Browse source 
Removed stupid hack in WinRawKeyboard.
This commit is contained in:
the_fiddler 2007-08-05 18:10:08 +00:00
parent 22c3eb187f
commit 69730a274e
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/OpenTK/Platform/Windows/WinRawKeyboard.cs
View file

@ -297,12 +297,10 @@ namespace OpenTK.Platform.Windows
if (!WinRawKeyboard.KeyMap.ContainsKey(rin.Data.Keyboard.VKey)) if (!WinRawKeyboard.KeyMap.ContainsKey(rin.Data.Keyboard.VKey))
{ {
Debug.Print("Virtual key {0} not mapped.", rin.Data.Keyboard.VKey); Debug.Print("Virtual key {0} not mapped.", rin.Data.Keyboard.VKey);
OpenTK.OpenGL.GL.ClearColor(1.0f, 0.3f, 0.3f, 0.0f);
} }
else else
{ {
keyboards[0][WinRawKeyboard.KeyMap[rin.Data.Keyboard.VKey]] = pressed; keyboards[0][WinRawKeyboard.KeyMap[rin.Data.Keyboard.VKey]] = pressed;
OpenTK.OpenGL.GL.ClearColor(0.0f, 0.0f, 0.0f, 0.0f);
} }
break; break;
} }

22
Source/OpenTK/Platform/X11/X11Keyboard.cs
View file

@ -4,6 +4,7 @@ using System.Text;
using OpenTK.Input; using OpenTK.Input;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Diagnostics;
namespace OpenTK.Platform.X11 namespace OpenTK.Platform.X11
{ {
@ -117,7 +118,7 @@ namespace OpenTK.Platform.X11
keyboards.Add(kb); keyboards.Add(kb);
} }
#region internal bool ProcessKeyboardEvent(API.RawInput rin) #region internal bool ProcessKeyboardEvent(X11.KeyEvent e)
/// <summary> /// <summary>
/// Processes X11 KeyEvents. /// Processes X11 KeyEvents.
@ -126,6 +127,25 @@ namespace OpenTK.Platform.X11
/// <returns>True if the event was processed, false otherwise.</returns> /// <returns>True if the event was processed, false otherwise.</returns>
internal bool ProcessKeyboardEvent(X11.KeyEvent e) internal bool ProcessKeyboardEvent(X11.KeyEvent e)
{ {
int keysym = keysyms[(e.keycode - firstKeyCode) * keysyms_per_keycode].ToInt32();
int keysym2 = keysyms[(e.keycode - firstKeyCode) * keysyms_per_keycode].ToInt32();
bool pressed = e.type == EventType.KeyPress;
switch (keysym)
{
default:
if (keymap.ContainsKey((XKey)keysym))
{
keyboards[0][keymap[(XKey)keysym]] = pressed;
}
else
{
Debug.Print("Virtual key {0} not mapped. (keysym: {1},{2})", e.keycode, keysym, keysym2);
}
return true;
}
return false; return false;
/*API.e.keycode /*API.e.keycode
switch (rin.Header.Type) switch (rin.Header.Type)