ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump LangVersion, move key name overrides to separate file

This commit is contained in:
YoshiRulz 2022-02-14 01:21:24 +10:00
parent 49423d59a1
commit 1655c191e0
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 60 additions and 52 deletions
Common.props
src
BizHawk.Client.Common/input
DistinctKeyNameOverrides.cs
BizHawk.Client.EmuHawk/Input
Input.cs

2
Common.props
View File

@ -5,7 +5,7 @@
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<ErrorReport>prompt</ErrorReport>
<IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework>
<LangVersion>9.0</LangVersion>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
<PlatformTarget>AnyCPU</PlatformTarget>
<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>

56
src/BizHawk.Client.Common/input/DistinctKeyNameOverrides.cs Normal file
View File

@ -0,0 +1,56 @@
namespace BizHawk.Client.Common;
public static class DistinctKeyNameOverrides
{
public static string GetName(in DistinctKey k)
=> k switch
{
DistinctKey.Back => "Backspace",
DistinctKey.Enter => "Enter",
DistinctKey.CapsLock => "CapsLock",
DistinctKey.PageDown => "PageDown",
DistinctKey.D0 => "Number0",
DistinctKey.D1 => "Number1",
DistinctKey.D2 => "Number2",
DistinctKey.D3 => "Number3",
DistinctKey.D4 => "Number4",
DistinctKey.D5 => "Number5",
DistinctKey.D6 => "Number6",
DistinctKey.D7 => "Number7",
DistinctKey.D8 => "Number8",
DistinctKey.D9 => "Number9",
DistinctKey.LWin => "LeftWin",
DistinctKey.RWin => "RightWin",
DistinctKey.NumPad0 => "Keypad0",
DistinctKey.NumPad1 => "Keypad1",
DistinctKey.NumPad2 => "Keypad2",
DistinctKey.NumPad3 => "Keypad3",
DistinctKey.NumPad4 => "Keypad4",
DistinctKey.NumPad5 => "Keypad5",
DistinctKey.NumPad6 => "Keypad6",
DistinctKey.NumPad7 => "Keypad7",
DistinctKey.NumPad8 => "Keypad8",
DistinctKey.NumPad9 => "Keypad9",
DistinctKey.Multiply => "KeypadMultiply",
DistinctKey.Add => "KeypadAdd",
DistinctKey.Separator => "KeypadComma",
DistinctKey.Subtract => "KeypadSubtract",
DistinctKey.Decimal => "KeypadDecimal",
DistinctKey.Divide => "KeypadDivide",
DistinctKey.Scroll => "ScrollLock",
DistinctKey.OemSemicolon => "Semicolon",
DistinctKey.OemPlus => "Equals",
DistinctKey.OemComma => "Comma",
DistinctKey.OemMinus => "Minus",
DistinctKey.OemPeriod => "Period",
DistinctKey.OemQuestion => "Slash",
DistinctKey.OemTilde => "Backtick",
DistinctKey.OemOpenBrackets => "LeftBracket",
DistinctKey.OemPipe => "Backslash",
DistinctKey.OemCloseBrackets => "RightBracket",
DistinctKey.OemQuotes => "Apostrophe",
DistinctKey.OemBackslash => "OEM102",
DistinctKey.NumPadEnter => "KeypadEnter",
_ => k.ToString()
};
}

54
src/BizHawk.Client.EmuHawk/Input/Input.cs
View File

@ -209,56 +209,6 @@ namespace BizHawk.Client.EmuHawk
private void UpdateThreadProc()
{
static string KeyName(DistinctKey k) => k switch
{
DistinctKey.Back => "Backspace",
DistinctKey.Enter => "Enter",
DistinctKey.CapsLock => "CapsLock",
DistinctKey.PageDown => "PageDown",
DistinctKey.D0 => "Number0",
DistinctKey.D1 => "Number1",
DistinctKey.D2 => "Number2",
DistinctKey.D3 => "Number3",
DistinctKey.D4 => "Number4",
DistinctKey.D5 => "Number5",
DistinctKey.D6 => "Number6",
DistinctKey.D7 => "Number7",
DistinctKey.D8 => "Number8",
DistinctKey.D9 => "Number9",
DistinctKey.LWin => "LeftWin",
DistinctKey.RWin => "RightWin",
DistinctKey.NumPad0 => "Keypad0",
DistinctKey.NumPad1 => "Keypad1",
DistinctKey.NumPad2 => "Keypad2",
DistinctKey.NumPad3 => "Keypad3",
DistinctKey.NumPad4 => "Keypad4",
DistinctKey.NumPad5 => "Keypad5",
DistinctKey.NumPad6 => "Keypad6",
DistinctKey.NumPad7 => "Keypad7",
DistinctKey.NumPad8 => "Keypad8",
DistinctKey.NumPad9 => "Keypad9",
DistinctKey.Multiply => "KeypadMultiply",
DistinctKey.Add => "KeypadAdd",
DistinctKey.Separator => "KeypadComma",
DistinctKey.Subtract => "KeypadSubtract",
DistinctKey.Decimal => "KeypadDecimal",
DistinctKey.Divide => "KeypadDivide",
DistinctKey.Scroll => "ScrollLock",
DistinctKey.OemSemicolon => "Semicolon",
DistinctKey.OemPlus => "Equals",
DistinctKey.OemComma => "Comma",
DistinctKey.OemMinus => "Minus",
DistinctKey.OemPeriod => "Period",
DistinctKey.OemQuestion => "Slash",
DistinctKey.OemTilde => "Backtick",
DistinctKey.OemOpenBrackets => "LeftBracket",
DistinctKey.OemPipe => "Backslash",
DistinctKey.OemCloseBrackets => "RightBracket",
DistinctKey.OemQuotes => "Apostrophe",
DistinctKey.OemBackslash => "OEM102",
DistinctKey.NumPadEnter => "KeypadEnter",
_ => k.ToString()
};
while (true)
{
_currentConfig = _getConfigCallback();
@ -275,7 +225,9 @@ namespace BizHawk.Client.EmuHawk
//analyze keys
foreach (var ke in keyEvents)
HandleButton(KeyName(ke.Key), ke.Pressed, ClientInputFocus.Keyboard);
{
HandleButton(DistinctKeyNameOverrides.GetName(in ke.Key), ke.Pressed, ClientInputFocus.Keyboard);
}
lock (_axisValues)
{