ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enahnaced X11 keymap. Renamed some OpenTK keys.

Browse source
This commit is contained in:
the_fiddler 2007-08-06 00:08:51 +00:00
parent 87e85a13c2
commit 94e738bb9a
3 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/OpenTK/Input/Keyboard.cs
View file

@ -228,8 +228,8 @@ namespace OpenTK.Input
Minus,
//Equal,
Plus,
LeftBracket,
RightBracket,
BracketLeft,
BracketRight,
Semicolon,
Quote,
Comma,

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

@ -76,9 +76,9 @@ namespace OpenTK.Platform.Windows
KeyMap.Add(API.VirtualKeys.OEM_1, Input.Key.Semicolon); // Varies by keyboard, ;: on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_2, Input.Key.Slash); // Varies by keyboard, /? on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_3, Input.Key.Tilde); // Varies by keyboard, `~ on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_4, Input.Key.LeftBracket); // Varies by keyboard, [{ on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_4, Input.Key.BracketLeft); // Varies by keyboard, [{ on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_5, Input.Key.BackSlash); // Varies by keyboard, \| on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_6, Input.Key.RightBracket); // Varies by keyboard, ]} on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_6, Input.Key.BracketRight); // Varies by keyboard, ]} on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_7, Input.Key.Quote); // Varies by keyboard, '" on Win2K/US
KeyMap.Add(API.VirtualKeys.OEM_PLUS, Input.Key.Plus); // Invariant: +
KeyMap.Add(API.VirtualKeys.OEM_COMMA, Input.Key.Comma); // Invariant: ,

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

@ -53,13 +53,12 @@ namespace OpenTK.Platform.X11
keymap.Add(XKey.Meta_R, Key.WinRight);
keymap.Add(XKey.Menu, Key.Menu);
keymap.Add(XKey.Print, Key.PrintScreen);
keymap.Add(XKey.Tab, Key.Tab);
keymap.Add(XKey.minus, Key.Minus);
keymap.Add(XKey.plus, Key.Plus);
keymap.Add(XKey.equal, Key.Plus);
//keymap.Add
//keymap.Add(XKey.Scroll_Lock, Key.Scr);
keymap.Add(XKey.Caps_Lock, Key.CapsLock);
keymap.Add(XKey.Num_Lock, Key.NumLock);
@ -68,28 +67,49 @@ namespace OpenTK.Platform.X11
keymap.Add((XKey)i, (Key)((int)Key.F1 + (i - (int)XKey.F1)));
}
for (int i = (int)XKey.a; i < 26; i++)
for (int i = (int)XKey.a; i < (int)XKey.z; i++)
{
keymap.Add((XKey)i, (Key)((int)Key.A + i));
keymap.Add((XKey)i, (Key)((int)Key.A + (i - (int)XKey.a)));
}
for (int i = (int)XKey.A; i < 26; i++)
for (int i = (int)XKey.A; i < (int)XKey.Z; i++)
{
keymap.Add((XKey)i, (Key)((int)Key.A + i));
keymap.Add((XKey)i, (Key)((int)Key.A + (i - (int)XKey.A)));
}
for (int i = (int)XKey.Number0; i <= 9; i++)
for (int i = (int)XKey.Number0; i <= (int)XKey.Number9; i++)
{
keymap.Add((XKey)i, (Key)((int)Key.Number0 + i));
keymap.Add((XKey)i, (Key)((int)Key.Number0 + (i - (int)XKey.Number0)));
}
for (int i = (int)XKey.KP_0; i <= 9; i++)
for (int i = (int)XKey.KP_0; i <= (int)XKey.KP_9; i++)
{
keymap.Add((XKey)i, (Key)((int)Key.Keypad0 + i));
keymap.Add((XKey)i, (Key)((int)Key.Keypad0 + (i - (int)XKey.KP_0)));
}
keymap.Add(XKey.Pause, Key.Pause);
keymap.Add(XKey.Break, Key.Pause);
keymap.Add(XKey.Scroll_Lock, Key.Pause);
keymap.Add(XKey.Insert, Key.PrintScreen);
keymap.Add(XKey.Print, Key.PrintScreen);
keymap.Add(XKey.Sys_Req, Key.PrintScreen);
keymap.Add(XKey.braceleft, Key.BracketLeft);
keymap.Add(XKey.bracketleft, Key.BracketLeft);
keymap.Add(XKey.braceright, Key.BracketRight);
keymap.Add(XKey.bracketright, Key.BracketRight);
keymap.Add(XKey.colon, Key.Semicolon);
keymap.Add(XKey.semicolon, Key.Semicolon);
keymap.Add(XKey.quoteright, Key.Quote);
keymap.Add(XKey.quotedbl, Key.Quote);
keymap.Add(XKey.comma, Key.Comma);
keymap.Add(XKey.less, Key.Comma);
keymap.Add(XKey.period, Key.Period);
keymap.Add(XKey.greater, Key.Period);
keymap.Add(XKey.slash, Key.Slash);
keymap.Add(XKey.question, Key.Slash);
keymapExists = true;
}
@ -135,6 +155,7 @@ namespace OpenTK.Platform.X11
bool pressed = e.type == XEventName.KeyPress;
IntPtr keysym = API.LookupKeysym(ref e, 0);
IntPtr keysym2 = API.LookupKeysym(ref e, 1);
switch (keysym.ToInt64())
{
@ -143,10 +164,13 @@ namespace OpenTK.Platform.X11
{
keyboards[0][keymap[(XKey)keysym]] = pressed;
}
else if (keymap.ContainsKey((XKey)keysym2))
{
keyboards[0][keymap[(XKey)keysym2]] = pressed;
}
else
{
//Debug.Print("Virtual key {0} not mapped. (keysym: {1},{2})", e.keycode, keysym, keysym2);
Debug.Print("Virtual key {0} not mapped. (keysym: {1})", e.keycode, keysym);
Debug.Print("KeyCode {0} (Keysym: {1}, {2}) not mapped.", e.keycode, (XKey)keysym, (XKey)keysym2);
}
return true;