mirror of
https://github.com/Ryujinx/Opentk.git
synced 2025-02-24 12:57:00 +00:00
[X11] Optimized XKey translation
This commit is contained in:
thefiddler
parent
6257858d54
commit
9605940661
|
|
@ -29,7 +29,6 @@ namespace OpenTK.Platform.X11
|
|||
List<KeyboardDevice> dummy_keyboard_list = new List<KeyboardDevice>(1);
|
||||
List<MouseDevice> dummy_mice_list = new List<MouseDevice>(1);
|
||||
|
||||
X11KeyMap keymap = new X11KeyMap();
|
||||
int firstKeyCode, lastKeyCode; // The smallest and largest KeyCode supported by the X server.
|
||||
int keysyms_per_keycode; // The number of KeySyms for each KeyCode.
|
||||
IntPtr[] keysyms;
|
||||
|
|
@ -100,17 +99,12 @@ namespace OpenTK.Platform.X11
|
|||
{
|
||||
XKey keysym = (XKey)API.LookupKeysym(ref e, 0);
|
||||
XKey keysym2 = (XKey)API.LookupKeysym(ref e, 1);
|
||||
key = Key.Unknown;
|
||||
|
||||
if (keymap.ContainsKey(keysym))
|
||||
key = X11KeyMap.GetKey(keysym);
|
||||
if (key == Key.Unknown)
|
||||
{
|
||||
key = keymap[keysym];
|
||||
key = X11KeyMap.GetKey(keysym2);
|
||||
}
|
||||
else if (keymap.ContainsKey(keysym2))
|
||||
{
|
||||
key = keymap[keysym2];
|
||||
}
|
||||
else
|
||||
if (key == Key.Unknown)
|
||||
{
|
||||
Debug.Print("KeyCode {0} (Keysym: {1}, {2}) not mapped.", e.keycode, (XKey)keysym, (XKey)keysym2);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,129 +10,364 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Diagnostics;
|
||||
|
||||
using OpenTK.Input;
|
||||
|
||||
namespace OpenTK.Platform.X11
|
||||
{
|
||||
internal class X11KeyMap : Dictionary<XKey, Key>
|
||||
static class X11KeyMap
|
||||
{
|
||||
internal X11KeyMap()
|
||||
public static Key GetKey(XKey key)
|
||||
{
|
||||
try
|
||||
switch (key)
|
||||
{
|
||||
this.Add(XKey.Escape, Key.Escape);
|
||||
this.Add(XKey.Return, Key.Enter);
|
||||
this.Add(XKey.space, Key.Space);
|
||||
this.Add(XKey.BackSpace, Key.BackSpace);
|
||||
case XKey.Escape:
|
||||
return Key.Escape;
|
||||
case XKey.Return:
|
||||
return Key.Enter;
|
||||
case XKey.space:
|
||||
return Key.Space;
|
||||
case XKey.BackSpace:
|
||||
return Key.BackSpace;
|
||||
|
||||
this.Add(XKey.Shift_L, Key.ShiftLeft);
|
||||
this.Add(XKey.Shift_R, Key.ShiftRight);
|
||||
this.Add(XKey.Alt_L, Key.AltLeft);
|
||||
this.Add(XKey.Alt_R, Key.AltRight);
|
||||
this.Add(XKey.Control_L, Key.ControlLeft);
|
||||
this.Add(XKey.Control_R, Key.ControlRight);
|
||||
this.Add(XKey.Super_L, Key.WinLeft);
|
||||
this.Add(XKey.Super_R, Key.WinRight);
|
||||
this.Add(XKey.Meta_L, Key.WinLeft);
|
||||
this.Add(XKey.Meta_R, Key.WinRight);
|
||||
this.Add(XKey.ISO_Level3_Shift, Key.AltRight); // Normally AltGr
|
||||
case XKey.Shift_L:
|
||||
return Key.ShiftLeft;
|
||||
case XKey.Shift_R:
|
||||
return Key.ShiftRight;
|
||||
case XKey.Alt_L:
|
||||
return Key.AltLeft;
|
||||
case XKey.Alt_R:
|
||||
return Key.AltRight;
|
||||
case XKey.Control_L:
|
||||
return Key.ControlLeft;
|
||||
case XKey.Control_R:
|
||||
return Key.ControlRight;
|
||||
case XKey.Super_L:
|
||||
return Key.WinLeft;
|
||||
case XKey.Super_R:
|
||||
return Key.WinRight;
|
||||
case XKey.Meta_L:
|
||||
return Key.WinLeft;
|
||||
case XKey.Meta_R:
|
||||
return Key.WinRight;
|
||||
case XKey.ISO_Level3_Shift:
|
||||
return Key.AltRight; // Normally AltGr
|
||||
|
||||
this.Add(XKey.Menu, Key.Menu);
|
||||
this.Add(XKey.Tab, Key.Tab);
|
||||
this.Add(XKey.minus, Key.Minus);
|
||||
this.Add(XKey.plus, Key.Plus);
|
||||
this.Add(XKey.equal, Key.Plus);
|
||||
case XKey.Menu:
|
||||
return Key.Menu;
|
||||
case XKey.Tab:
|
||||
return Key.Tab;
|
||||
case XKey.minus:
|
||||
return Key.Minus;
|
||||
case XKey.plus:
|
||||
return Key.Plus;
|
||||
case XKey.equal:
|
||||
return Key.Plus;
|
||||
|
||||
this.Add(XKey.Caps_Lock, Key.CapsLock);
|
||||
this.Add(XKey.Num_Lock, Key.NumLock);
|
||||
case XKey.Caps_Lock:
|
||||
return Key.CapsLock;
|
||||
case XKey.Num_Lock:
|
||||
return Key.NumLock;
|
||||
|
||||
for (int i = (int)XKey.F1; i <= (int)XKey.F35; i++)
|
||||
{
|
||||
this.Add((XKey)i, (Key)((int)Key.F1 + (i - (int)XKey.F1)));
|
||||
}
|
||||
case XKey.F1:
|
||||
return Key.F1;
|
||||
case XKey.F2:
|
||||
return Key.F2;
|
||||
case XKey.F3:
|
||||
return Key.F3;
|
||||
case XKey.F4:
|
||||
return Key.F4;
|
||||
case XKey.F5:
|
||||
return Key.F5;
|
||||
case XKey.F6:
|
||||
return Key.F6;
|
||||
case XKey.F7:
|
||||
return Key.F7;
|
||||
case XKey.F8:
|
||||
return Key.F8;
|
||||
case XKey.F9:
|
||||
return Key.F9;
|
||||
case XKey.F10:
|
||||
return Key.F10;
|
||||
case XKey.F11:
|
||||
return Key.F11;
|
||||
case XKey.F12:
|
||||
return Key.F12;
|
||||
case XKey.F13:
|
||||
return Key.F13;
|
||||
case XKey.F14:
|
||||
return Key.F14;
|
||||
case XKey.F15:
|
||||
return Key.F15;
|
||||
case XKey.F16:
|
||||
return Key.F16;
|
||||
case XKey.F17:
|
||||
return Key.F17;
|
||||
case XKey.F18:
|
||||
return Key.F18;
|
||||
case XKey.F19:
|
||||
return Key.F19;
|
||||
case XKey.F20:
|
||||
return Key.F20;
|
||||
case XKey.F21:
|
||||
return Key.F21;
|
||||
case XKey.F22:
|
||||
return Key.F22;
|
||||
case XKey.F23:
|
||||
return Key.F23;
|
||||
case XKey.F24:
|
||||
return Key.F24;
|
||||
case XKey.F25:
|
||||
return Key.F25;
|
||||
case XKey.F26:
|
||||
return Key.F26;
|
||||
case XKey.F27:
|
||||
return Key.F27;
|
||||
case XKey.F28:
|
||||
return Key.F28;
|
||||
case XKey.F29:
|
||||
return Key.F29;
|
||||
case XKey.F30:
|
||||
return Key.F30;
|
||||
case XKey.F31:
|
||||
return Key.F31;
|
||||
case XKey.F32:
|
||||
return Key.F32;
|
||||
case XKey.F33:
|
||||
return Key.F33;
|
||||
case XKey.F34:
|
||||
return Key.F34;
|
||||
case XKey.F35:
|
||||
return Key.F35;
|
||||
|
||||
for (int i = (int)XKey.a; i <= (int)XKey.z; i++)
|
||||
{
|
||||
this.Add((XKey)i, (Key)((int)Key.A + (i - (int)XKey.a)));
|
||||
}
|
||||
case XKey.a:
|
||||
case XKey.A:
|
||||
return Key.A;
|
||||
case XKey.b:
|
||||
case XKey.B:
|
||||
return Key.B;
|
||||
case XKey.c:
|
||||
case XKey.C:
|
||||
return Key.C;
|
||||
case XKey.d:
|
||||
case XKey.D:
|
||||
return Key.D;
|
||||
case XKey.e:
|
||||
case XKey.E:
|
||||
return Key.E;
|
||||
case XKey.f:
|
||||
case XKey.F:
|
||||
return Key.F;
|
||||
case XKey.g:
|
||||
case XKey.G:
|
||||
return Key.G;
|
||||
case XKey.h:
|
||||
case XKey.H:
|
||||
return Key.H;
|
||||
case XKey.i:
|
||||
case XKey.I:
|
||||
return Key.I;
|
||||
case XKey.j:
|
||||
case XKey.J:
|
||||
return Key.J;
|
||||
case XKey.k:
|
||||
case XKey.K:
|
||||
return Key.K;
|
||||
case XKey.l:
|
||||
case XKey.L:
|
||||
return Key.L;
|
||||
case XKey.m:
|
||||
case XKey.M:
|
||||
return Key.M;
|
||||
case XKey.n:
|
||||
case XKey.N:
|
||||
return Key.N;
|
||||
case XKey.o:
|
||||
case XKey.O:
|
||||
return Key.O;
|
||||
case XKey.p:
|
||||
case XKey.P:
|
||||
return Key.P;
|
||||
case XKey.q:
|
||||
case XKey.Q:
|
||||
return Key.Q;
|
||||
case XKey.r:
|
||||
case XKey.R:
|
||||
return Key.R;
|
||||
case XKey.s:
|
||||
case XKey.S:
|
||||
return Key.S;
|
||||
case XKey.t:
|
||||
case XKey.T:
|
||||
return Key.T;
|
||||
case XKey.u:
|
||||
case XKey.U:
|
||||
return Key.U;
|
||||
case XKey.v:
|
||||
case XKey.V:
|
||||
return Key.V;
|
||||
case XKey.w:
|
||||
case XKey.W:
|
||||
return Key.W;
|
||||
case XKey.x:
|
||||
case XKey.X:
|
||||
return Key.X;
|
||||
case XKey.y:
|
||||
case XKey.Y:
|
||||
return Key.Y;
|
||||
case XKey.z:
|
||||
case XKey.Z:
|
||||
return Key.Z;
|
||||
|
||||
for (int i = (int)XKey.A; i <= (int)XKey.Z; i++)
|
||||
{
|
||||
this.Add((XKey)i, (Key)((int)Key.A + (i - (int)XKey.A)));
|
||||
}
|
||||
case XKey.Number0:
|
||||
return Key.Number0;
|
||||
case XKey.Number1:
|
||||
return Key.Number1;
|
||||
case XKey.Number2:
|
||||
return Key.Number2;
|
||||
case XKey.Number3:
|
||||
return Key.Number3;
|
||||
case XKey.Number4:
|
||||
return Key.Number4;
|
||||
case XKey.Number5:
|
||||
return Key.Number5;
|
||||
case XKey.Number6:
|
||||
return Key.Number6;
|
||||
case XKey.Number7:
|
||||
return Key.Number7;
|
||||
case XKey.Number8:
|
||||
return Key.Number8;
|
||||
case XKey.Number9:
|
||||
return Key.Number9;
|
||||
|
||||
for (int i = (int)XKey.Number0; i <= (int)XKey.Number9; i++)
|
||||
{
|
||||
this.Add((XKey)i, (Key)((int)Key.Number0 + (i - (int)XKey.Number0)));
|
||||
}
|
||||
case XKey.KP_0:
|
||||
return Key.Keypad0;
|
||||
case XKey.KP_1:
|
||||
return Key.Keypad1;
|
||||
case XKey.KP_2:
|
||||
return Key.Keypad2;
|
||||
case XKey.KP_3:
|
||||
return Key.Keypad3;
|
||||
case XKey.KP_4:
|
||||
return Key.Keypad4;
|
||||
case XKey.KP_5:
|
||||
return Key.Keypad5;
|
||||
case XKey.KP_6:
|
||||
return Key.Keypad6;
|
||||
case XKey.KP_7:
|
||||
return Key.Keypad7;
|
||||
case XKey.KP_8:
|
||||
return Key.Keypad8;
|
||||
case XKey.KP_9:
|
||||
return Key.Keypad9;
|
||||
|
||||
for (int i = (int)XKey.KP_0; i <= (int)XKey.KP_9; i++)
|
||||
{
|
||||
this.Add((XKey)i, (Key)((int)Key.Keypad0 + (i - (int)XKey.KP_0)));
|
||||
}
|
||||
case XKey.Pause:
|
||||
return Key.Pause;
|
||||
case XKey.Break:
|
||||
return Key.Pause;
|
||||
case XKey.Scroll_Lock:
|
||||
return Key.Pause;
|
||||
case XKey.Insert:
|
||||
return Key.PrintScreen;
|
||||
case XKey.Print:
|
||||
return Key.PrintScreen;
|
||||
case XKey.Sys_Req:
|
||||
return Key.PrintScreen;
|
||||
|
||||
this.Add(XKey.Pause, Key.Pause);
|
||||
this.Add(XKey.Break, Key.Pause);
|
||||
this.Add(XKey.Scroll_Lock, Key.Pause);
|
||||
this.Add(XKey.Insert, Key.PrintScreen);
|
||||
this.Add(XKey.Print, Key.PrintScreen);
|
||||
this.Add(XKey.Sys_Req, Key.PrintScreen);
|
||||
case XKey.backslash:
|
||||
return Key.BackSlash;
|
||||
case XKey.bar:
|
||||
return Key.BackSlash;
|
||||
case XKey.braceleft:
|
||||
return Key.BracketLeft;
|
||||
case XKey.bracketleft:
|
||||
return Key.BracketLeft;
|
||||
case XKey.braceright:
|
||||
return Key.BracketRight;
|
||||
case XKey.bracketright:
|
||||
return Key.BracketRight;
|
||||
case XKey.colon:
|
||||
return Key.Semicolon;
|
||||
case XKey.semicolon:
|
||||
return Key.Semicolon;
|
||||
case XKey.quoteright:
|
||||
return Key.Quote;
|
||||
case XKey.quotedbl:
|
||||
return Key.Quote;
|
||||
case XKey.quoteleft:
|
||||
return Key.Tilde;
|
||||
case XKey.asciitilde:
|
||||
return Key.Tilde;
|
||||
|
||||
this.Add(XKey.backslash, Key.BackSlash);
|
||||
this.Add(XKey.bar, Key.BackSlash);
|
||||
this.Add(XKey.braceleft, Key.BracketLeft);
|
||||
this.Add(XKey.bracketleft, Key.BracketLeft);
|
||||
this.Add(XKey.braceright, Key.BracketRight);
|
||||
this.Add(XKey.bracketright, Key.BracketRight);
|
||||
this.Add(XKey.colon, Key.Semicolon);
|
||||
this.Add(XKey.semicolon, Key.Semicolon);
|
||||
this.Add(XKey.quoteright, Key.Quote);
|
||||
this.Add(XKey.quotedbl, Key.Quote);
|
||||
this.Add(XKey.quoteleft, Key.Tilde);
|
||||
this.Add(XKey.asciitilde, Key.Tilde);
|
||||
case XKey.comma:
|
||||
return Key.Comma;
|
||||
case XKey.less:
|
||||
return Key.Comma;
|
||||
case XKey.period:
|
||||
return Key.Period;
|
||||
case XKey.greater:
|
||||
return Key.Period;
|
||||
case XKey.slash:
|
||||
return Key.Slash;
|
||||
case XKey.question:
|
||||
return Key.Slash;
|
||||
|
||||
this.Add(XKey.comma, Key.Comma);
|
||||
this.Add(XKey.less, Key.Comma);
|
||||
this.Add(XKey.period, Key.Period);
|
||||
this.Add(XKey.greater, Key.Period);
|
||||
this.Add(XKey.slash, Key.Slash);
|
||||
this.Add(XKey.question, Key.Slash);
|
||||
case XKey.Left:
|
||||
return Key.Left;
|
||||
case XKey.Down:
|
||||
return Key.Down;
|
||||
case XKey.Right:
|
||||
return Key.Right;
|
||||
case XKey.Up:
|
||||
return Key.Up;
|
||||
|
||||
this.Add(XKey.Left, Key.Left);
|
||||
this.Add(XKey.Down, Key.Down);
|
||||
this.Add(XKey.Right, Key.Right);
|
||||
this.Add(XKey.Up, Key.Up);
|
||||
case XKey.Delete:
|
||||
return Key.Delete;
|
||||
case XKey.Home:
|
||||
return Key.Home;
|
||||
case XKey.End:
|
||||
return Key.End;
|
||||
//case XKey.Prior: return Key.PageUp; // XKey.Prior == XKey.Page_Up
|
||||
case XKey.Page_Up:
|
||||
return Key.PageUp;
|
||||
case XKey.Page_Down:
|
||||
return Key.PageDown;
|
||||
//case XKey.Next: return Key.PageDown; // XKey.Next == XKey.Page_Down
|
||||
|
||||
this.Add(XKey.Delete, Key.Delete);
|
||||
this.Add(XKey.Home, Key.Home);
|
||||
this.Add(XKey.End, Key.End);
|
||||
//this.Add(XKey.Prior, Key.PageUp); // XKey.Prior == XKey.Page_Up
|
||||
this.Add(XKey.Page_Up, Key.PageUp);
|
||||
this.Add(XKey.Page_Down, Key.PageDown);
|
||||
//this.Add(XKey.Next, Key.PageDown); // XKey.Next == XKey.Page_Down
|
||||
case XKey.KP_Add:
|
||||
return Key.KeypadAdd;
|
||||
case XKey.KP_Subtract:
|
||||
return Key.KeypadSubtract;
|
||||
case XKey.KP_Multiply:
|
||||
return Key.KeypadMultiply;
|
||||
case XKey.KP_Divide:
|
||||
return Key.KeypadDivide;
|
||||
case XKey.KP_Decimal:
|
||||
return Key.KeypadDecimal;
|
||||
case XKey.KP_Insert:
|
||||
return Key.Keypad0;
|
||||
case XKey.KP_End:
|
||||
return Key.Keypad1;
|
||||
case XKey.KP_Down:
|
||||
return Key.Keypad2;
|
||||
case XKey.KP_Page_Down:
|
||||
return Key.Keypad3;
|
||||
case XKey.KP_Left:
|
||||
return Key.Keypad4;
|
||||
case XKey.KP_Right:
|
||||
return Key.Keypad6;
|
||||
case XKey.KP_Home:
|
||||
return Key.Keypad7;
|
||||
case XKey.KP_Up:
|
||||
return Key.Keypad8;
|
||||
case XKey.KP_Page_Up:
|
||||
return Key.Keypad9;
|
||||
case XKey.KP_Delete:
|
||||
return Key.KeypadDecimal;
|
||||
case XKey.KP_Enter:
|
||||
return Key.KeypadEnter;
|
||||
|
||||
this.Add(XKey.KP_Add, Key.KeypadAdd);
|
||||
this.Add(XKey.KP_Subtract, Key.KeypadSubtract);
|
||||
this.Add(XKey.KP_Multiply, Key.KeypadMultiply);
|
||||
this.Add(XKey.KP_Divide, Key.KeypadDivide);
|
||||
this.Add(XKey.KP_Decimal, Key.KeypadDecimal);
|
||||
this.Add(XKey.KP_Insert, Key.Keypad0);
|
||||
this.Add(XKey.KP_End, Key.Keypad1);
|
||||
this.Add(XKey.KP_Down, Key.Keypad2);
|
||||
this.Add(XKey.KP_Page_Down, Key.Keypad3);
|
||||
this.Add(XKey.KP_Left, Key.Keypad4);
|
||||
this.Add(XKey.KP_Right, Key.Keypad6);
|
||||
this.Add(XKey.KP_Home, Key.Keypad7);
|
||||
this.Add(XKey.KP_Up, Key.Keypad8);
|
||||
this.Add(XKey.KP_Page_Up, Key.Keypad9);
|
||||
this.Add(XKey.KP_Delete, Key.KeypadDecimal);
|
||||
this.Add(XKey.KP_Enter, Key.KeypadEnter);
|
||||
|
||||
}
|
||||
catch (ArgumentException e)
|
||||
{
|
||||
Debug.Print("Exception while creating keymap: '{0}'.", e.ToString());
|
||||
default:
|
||||
return Key.Unknown;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,29 @@
|
|||
#region License
|
||||
//
|
||||
// The Open Toolkit Library License
|
||||
//
|
||||
// Copyright (c) 2006 - 2010 the Open Toolkit library.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights to
|
||||
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
// the Software, and to permit persons to whom the Software is furnished to do
|
||||
// so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all
|
||||
// copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
#endregion
|
||||
#region License
|
||||
//
|
||||
// The Open Toolkit Library License
|
||||
//
|
||||
// Copyright (c) 2006 - 2010 the Open Toolkit library.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights to
|
||||
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
// the Software, and to permit persons to whom the Software is furnished to do
|
||||
// so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all
|
||||
// copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -36,7 +36,6 @@ namespace OpenTK.Platform.X11
|
|||
// Only one keyboard supported.
|
||||
sealed class X11Keyboard : IKeyboardDriver2
|
||||
{
|
||||
readonly static X11KeyMap keymap = new X11KeyMap();
|
||||
readonly static string name = "Core X11 keyboard";
|
||||
readonly byte[] keys = new byte[32];
|
||||
readonly int KeysymsPerKeycode;
|
||||
|
|
@ -53,8 +52,11 @@ namespace OpenTK.Platform.X11
|
|||
// Find the number of keysyms per keycode.
|
||||
int first = 0, last = 0;
|
||||
API.DisplayKeycodes(display, ref first, ref last);
|
||||
IntPtr keysym_ptr = API.GetKeyboardMapping(display, (byte)first, last - first + 1,
|
||||
ref KeysymsPerKeycode);
|
||||
IntPtr keysym_ptr =
|
||||
API.GetKeyboardMapping(display,
|
||||
(byte)first,
|
||||
last - first + 1,
|
||||
ref KeysymsPerKeycode);
|
||||
Functions.XFree(keysym_ptr);
|
||||
|
||||
try
|
||||
|
|
@ -66,7 +68,9 @@ namespace OpenTK.Platform.X11
|
|||
bool supported;
|
||||
Functions.XkbSetDetectableAutoRepeat(display, true, out supported);
|
||||
}
|
||||
catch { }
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -108,8 +112,9 @@ namespace OpenTK.Platform.X11
|
|||
for (int mod = 0; mod < KeysymsPerKeycode; mod++)
|
||||
{
|
||||
IntPtr keysym = Functions.XKeycodeToKeysym(display, (byte)keycode, mod);
|
||||
if (keysym != IntPtr.Zero && keymap.TryGetValue((XKey)keysym, out key))
|
||||
if (keysym != IntPtr.Zero)
|
||||
{
|
||||
key = X11KeyMap.GetKey((XKey)keysym);
|
||||
if (pressed)
|
||||
state.EnableBit((int)key);
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue