diff --git a/Assets/Tests/InputSystem/CorePerformanceTests.cs b/Assets/Tests/InputSystem/CorePerformanceTests.cs index 86026ed313..446dc9bacf 100644 --- a/Assets/Tests/InputSystem/CorePerformanceTests.cs +++ b/Assets/Tests/InputSystem/CorePerformanceTests.cs @@ -123,8 +123,13 @@ public void Performance_ReadEveryKey() Measure.Method(() => { + int keyIndex = 0; foreach (var key in keyboard.allKeys) + { + if (++keyIndex == (int)KeyEx.IMESelected) // Skip IMESelected as it's not a real key. + continue; key.ReadValue(); + } }) .MeasurementCount(100) .WarmupCount(5) diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index bc4ec5a82b..86efc4c124 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -2674,7 +2674,7 @@ public void Devices_AnyKeyOnKeyboard_DoesNotReactToIMESelected() { var keyboard = InputSystem.AddDevice(); - InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.IMESelected)); + InputSystem.QueueStateEvent(keyboard, new KeyboardState(IMESelected: true)); InputSystem.Update(); Assert.That(keyboard.anyKey.isPressed, Is.False); diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 2a36143974..3e84f28502 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -44,6 +44,7 @@ however, it has to be formatted properly to pass verification tests. ### Added - Added new API `InputSystem.settings.useIMGUIEditorForAssets` that should be used in custom `InputParameterEditor` that use both IMGUI and UI Toolkit. - Added ProfilerMakers to `InputAction.Enable()` and `InputActionMap.ResolveBindings()` to enable gathering of profiling data. +- Added support of F13-F24 keys. [UUM-44328](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-44328) ## [1.11.2] - 2024-10-16 diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Keyboard.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Keyboard.cs index 319e3cc4c0..a9d0ff6ec1 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Keyboard.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Keyboard.cs @@ -46,10 +46,10 @@ public unsafe struct KeyboardState : IInputStateTypeInfo /// public static FourCC Format => new FourCC('K', 'E', 'Y', 'S'); - private const int kSizeInBits = Keyboard.KeyCount; + private const int kSizeInBits = Keyboard.KeyCount + 1; // +1 for IMESelected. internal const int kSizeInBytes = (kSizeInBits + 7) / 8; - [InputControl(name = "anyKey", displayName = "Any Key", layout = "AnyKey", sizeInBits = kSizeInBits - 1, synthetic = true)] // Exclude IMESelected. + [InputControl(name = "anyKey", displayName = "Any Key", layout = "AnyKey", offset = 1, sizeInBits = (int)Key.F24, synthetic = true)] [InputControl(name = "escape", displayName = "Escape", layout = "Key", usages = new[] {"Back", "Cancel"}, bit = (int)Key.Escape)] [InputControl(name = "space", displayName = "Space", layout = "Key", bit = (int)Key.Space)] [InputControl(name = "enter", displayName = "Enter", layout = "Key", usage = "Submit", bit = (int)Key.Enter)] @@ -163,17 +163,41 @@ public unsafe struct KeyboardState : IInputStateTypeInfo [InputControl(name = "OEM3", layout = "Key", bit = (int)Key.OEM3)] [InputControl(name = "OEM4", layout = "Key", bit = (int)Key.OEM4)] [InputControl(name = "OEM5", layout = "Key", bit = (int)Key.OEM5)] - [InputControl(name = "IMESelected", layout = "Button", bit = (int)Key.IMESelected, synthetic = true)] + [InputControl(name = "f13", displayName = "F13", layout = "Key", bit = (int)Key.F13)] + [InputControl(name = "f14", displayName = "F14", layout = "Key", bit = (int)Key.F14)] + [InputControl(name = "f15", displayName = "F15", layout = "Key", bit = (int)Key.F15)] + [InputControl(name = "f16", displayName = "F16", layout = "Key", bit = (int)Key.F16)] + [InputControl(name = "f17", displayName = "F17", layout = "Key", bit = (int)Key.F17)] + [InputControl(name = "f18", displayName = "F18", layout = "Key", bit = (int)Key.F18)] + [InputControl(name = "f19", displayName = "F19", layout = "Key", bit = (int)Key.F19)] + [InputControl(name = "f20", displayName = "F20", layout = "Key", bit = (int)Key.F20)] + [InputControl(name = "f21", displayName = "F21", layout = "Key", bit = (int)Key.F21)] + [InputControl(name = "f22", displayName = "F22", layout = "Key", bit = (int)Key.F22)] + [InputControl(name = "f23", displayName = "F23", layout = "Key", bit = (int)Key.F23)] + [InputControl(name = "f24", displayName = "F24", layout = "Key", bit = (int)Key.F24)] + [InputControl(name = "IMESelected", layout = "Button", bit = (int)KeyEx.RemappedIMESelected, synthetic = true)] // Use the last bit to hold IME selected state. public fixed byte keys[kSizeInBytes]; - public KeyboardState(params Key[] pressedKeys) + // will be the default in new editor [InputControl(name = "IMESelected", layout = "Button", bit = 0, sizeInBits = 1, synthetic = true)] + //public byte modifiers; + + public KeyboardState(params Key[] pressedKeys) : this(false, pressedKeys) + { + } + + public KeyboardState(bool IMESelected, params Key[] pressedKeys) { if (pressedKeys == null) throw new ArgumentNullException(nameof(pressedKeys)); - fixed(byte* keysPtr = keys) { UnsafeUtility.MemClear(keysPtr, kSizeInBytes); + + if (IMESelected) + { + MemoryHelpers.WriteSingleBit(keysPtr, (uint)KeyEx.IMESelected, true); + } + for (var i = 0; i < pressedKeys.Length; ++i) MemoryHelpers.WriteSingleBit(keysPtr, (uint)pressedKeys[i], true); } @@ -185,6 +209,14 @@ public void Set(Key key, bool state) MemoryHelpers.WriteSingleBit(keysPtr, (uint)key, state); } + internal bool Get(Key key) + { + fixed(byte* keysPtr = keys) + { + return MemoryHelpers.ReadSingleBit(keysPtr, (uint)key); + } + } + public void Press(Key key) { Set(key, true); @@ -858,9 +890,86 @@ public enum Key /// OEM5, - ////FIXME: This should never have been a Key but rather just an extra button or state on keyboard - // Not exactly a key, but binary data sent by the Keyboard to say if IME is being used. - IMESelected + /// + /// Don't use this. This is a dummy key that is only used internally to represent the IME selected state. + /// Will be removed in the future. + /// + [Obsolete("Don't use this. This is a dummy key that is only used internally to represent the IME selected state. Will be removed in the future.", true)] + IMESelected, + + /// + /// The . + /// + F13, + + /// + /// The . + /// + F14, + + /// + /// The . + /// + F15, + + /// + /// The . + /// + F16, + + /// + /// The . + /// + F17, + + /// + /// The . + /// + F18, + + /// + /// The . + /// + F19, + + /// + /// The . + /// + F20, + + /// + /// The . + /// + F21, + + /// + /// The . + /// + F22, + + /// + /// The . + /// + F23, + + /// + /// The . + /// + F24, + + /// + /// Don't use this. This is a dummy key that is only used internally to represent the IME selected state. + /// Will be removed in the future. + /// FIXME: This should never have been a Key but rather just an extra button or state on keyboard + /// Not exactly a key, but binary data sent by the Keyboard to say if IME is being used. + /// + //InternalForIMESelected = 127, + } + + internal static class KeyEx + { + internal const Key IMESelected = (Key)111; //IMESelected value + internal const Key RemappedIMESelected = (Key)127; //IMESelected value } /// @@ -919,13 +1028,14 @@ public enum Key /// /// [InputControlLayout(stateType = typeof(KeyboardState), isGenericTypeOfDevice = true)] - public class Keyboard : InputDevice, ITextInputReceiver + public class Keyboard : InputDevice, ITextInputReceiver, IEventPreProcessor { /// /// Total number of key controls on a keyboard, i.e. the number of controls /// in . /// - public const int KeyCount = (int)Key.OEM5; + /// Total number of key controls. + public const int KeyCount = (int)Key.F24 - 1; // without IMESelected /// /// Event that is fired for every single character entered on the keyboard. @@ -2051,6 +2161,102 @@ public string keyboardLayout /// public KeyControl oem5Key => this[Key.OEM5]; + /// + /// The F13 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f13Key => this[Key.F13]; + + /// + /// The F14 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f14Key => this[Key.F14]; + + /// + /// The F15 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f15Key => this[Key.F15]; + + /// + /// The F16 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f16Key => this[Key.F16]; + + /// + /// The F17 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f17Key => this[Key.F17]; + + /// + /// The F18 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f18Key => this[Key.F18]; + + /// + /// The F19 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f19Key => this[Key.F19]; + + /// + /// The F20 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f20Key => this[Key.F20]; + + /// + /// The F21 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f21Key => this[Key.F21]; + + /// + /// The F22 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f22Key => this[Key.F22]; + + /// + /// The F23 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f23Key => this[Key.F23]; + + /// + /// The F24 key on the keyboard + /// + /// representing . + /// Keyboards may have additional Functions keys that are not part of the standardized 104-key keyboard layout + /// + public KeyControl f24Key => this[Key.F24]; + /// /// An artificial combination of and into one control. /// @@ -2299,17 +2505,32 @@ protected override void FinishSetup() "oem3", "oem4", "oem5", + null, // IMESelected + "f13", + "f14", + "f15", + "f16", + "f17", + "f18", + "f19", + "f20", + "f21", + "f22", + "f23", + "f24", }; m_Keys = new KeyControl[keyStrings.Length]; for (var i = 0; i < keyStrings.Length; ++i) { + if (string.IsNullOrEmpty(keyStrings[i])) + continue; m_Keys[i] = GetChildControl(keyStrings[i]); ////REVIEW: Ideally, we'd have a way to do this through layouts; this way nested key controls could work, too, //// and it just seems somewhat dirty to jam the data into the control here m_Keys[i].keyCode = (Key)(i + 1); } - Debug.Assert(keyStrings[(int)Key.OEM5 - 1] == "oem5", + Debug.Assert(keyStrings[(int)Key.F24 - 1] == "f24", "keyString array layout doe not match Key enum layout"); anyKey = GetChildControl("anyKey"); shiftKey = GetChildControl("shift"); @@ -2431,6 +2652,25 @@ public void OnIMECompositionChanged(IMECompositionString compositionString) } } + public unsafe bool PreProcessEvent(InputEventPtr currentEventPtr) + { + if (currentEventPtr.type == StateEvent.Type) + { + var stateEvent = StateEvent.FromUnchecked(currentEventPtr); + if (stateEvent->stateFormat == KeyboardState.Format) + { + var keyboardState = ((KeyboardState*)(stateEvent->stateData)); + if (keyboardState->Get(KeyEx.IMESelected)) + { + keyboardState->Set(KeyEx.IMESelected, false); + keyboardState->Set(KeyEx.RemappedIMESelected, true); + } + } + } + + return true; + } + private InlinedArray> m_TextInputListeners; private string m_KeyboardLayoutName; private KeyControl[] m_Keys; diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs index 8f7b888534..91a754e5ff 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs @@ -24,12 +24,12 @@ internal partial class FastKeyboard : UnityEngine.InputSystem.Keyboard public const string metadata = ";AnyKey;Button;Axis;Key;DiscreteButton;Keyboard"; public FastKeyboard() { - var builder = this.Setup(115, 15, 7) + var builder = this.Setup(127, 15, 7) .WithName("Keyboard") .WithDisplayName("Keyboard") - .WithChildren(0, 115) + .WithChildren(0, 127) .WithLayout(new InternedString("Keyboard")) - .WithStateBlock(new InputStateBlock { format = new FourCC(1262836051), sizeInBits = 112 }); + .WithStateBlock(new InputStateBlock { format = new FourCC(1262836051), sizeInBits = 136 }); var kAnyKeyLayout = new InternedString("AnyKey"); var kKeyLayout = new InternedString("Key"); @@ -378,6 +378,42 @@ public FastKeyboard() // /Keyboard/OEM5 var ctrlKeyboardOEM5 = Initialize_ctrlKeyboardOEM5(kKeyLayout, this); + // /Keyboard/f13 + var ctrlKeyboardf13 = Initialize_ctrlKeyboardf13(kKeyLayout, this); + + // /Keyboard/f14 + var ctrlKeyboardf14 = Initialize_ctrlKeyboardf14(kKeyLayout, this); + + // /Keyboard/f15 + var ctrlKeyboardf15 = Initialize_ctrlKeyboardf15(kKeyLayout, this); + + // /Keyboard/f16 + var ctrlKeyboardf16 = Initialize_ctrlKeyboardf16(kKeyLayout, this); + + // /Keyboard/f17 + var ctrlKeyboardf17 = Initialize_ctrlKeyboardf17(kKeyLayout, this); + + // /Keyboard/f18 + var ctrlKeyboardf18 = Initialize_ctrlKeyboardf18(kKeyLayout, this); + + // /Keyboard/f19 + var ctrlKeyboardf19 = Initialize_ctrlKeyboardf19(kKeyLayout, this); + + // /Keyboard/f20 + var ctrlKeyboardf20 = Initialize_ctrlKeyboardf20(kKeyLayout, this); + + // /Keyboard/f21 + var ctrlKeyboardf21 = Initialize_ctrlKeyboardf21(kKeyLayout, this); + + // /Keyboard/f22 + var ctrlKeyboardf22 = Initialize_ctrlKeyboardf22(kKeyLayout, this); + + // /Keyboard/f23 + var ctrlKeyboardf23 = Initialize_ctrlKeyboardf23(kKeyLayout, this); + + // /Keyboard/f24 + var ctrlKeyboardf24 = Initialize_ctrlKeyboardf24(kKeyLayout, this); + // /Keyboard/IMESelected var ctrlKeyboardIMESelected = Initialize_ctrlKeyboardIMESelected(kButtonLayout, this); @@ -408,7 +444,7 @@ public FastKeyboard() builder.WithControlAlias(6, new InternedString("RightCommand")); // Control getters/arrays. - this.keys = new UnityEngine.InputSystem.Controls.KeyControl[110]; + this.keys = new UnityEngine.InputSystem.Controls.KeyControl[123]; this.keys[0] = ctrlKeyboardspace; this.keys[1] = ctrlKeyboardenter; this.keys[2] = ctrlKeyboardtab; @@ -519,6 +555,18 @@ public FastKeyboard() this.keys[107] = ctrlKeyboardOEM3; this.keys[108] = ctrlKeyboardOEM4; this.keys[109] = ctrlKeyboardOEM5; + this.keys[111] = ctrlKeyboardf13; + this.keys[112] = ctrlKeyboardf14; + this.keys[113] = ctrlKeyboardf15; + this.keys[114] = ctrlKeyboardf16; + this.keys[115] = ctrlKeyboardf17; + this.keys[116] = ctrlKeyboardf18; + this.keys[117] = ctrlKeyboardf19; + this.keys[118] = ctrlKeyboardf20; + this.keys[119] = ctrlKeyboardf21; + this.keys[120] = ctrlKeyboardf22; + this.keys[121] = ctrlKeyboardf23; + this.keys[122] = ctrlKeyboardf24; this.anyKey = ctrlKeyboardanyKey; this.shiftKey = ctrlKeyboardshift; this.ctrlKey = ctrlKeyboardctrl; @@ -528,7 +576,7 @@ public FastKeyboard() // State offset to control index map. builder.WithStateOffsetToControlIndexMap(new uint[] { - 111616u, 525314u, 1049603u, 1573892u, 2098181u, 2622470u, 3146759u, 3671048u, 4195337u, 4719626u + 525314u, 1049603u, 1573892u, 2098181u, 2622470u, 3146759u, 3671048u, 4195337u, 4320256u, 4719626u , 5243915u, 5768204u, 6292493u, 6816782u, 7341071u, 7865364u, 8389653u, 8913942u, 9438231u, 9962520u , 10486809u, 11011098u, 11535387u, 12059676u, 12583965u, 13108254u, 13632543u, 14156832u, 14681121u, 15205410u , 15729699u, 16253988u, 16778277u, 17302566u, 17826855u, 18351144u, 18875433u, 19399722u, 19924011u, 20448300u @@ -539,73 +587,82 @@ public FastKeyboard() , 40371280u, 40895569u, 41419858u, 41944147u, 42468436u, 42992725u, 43517014u, 44041312u, 44565591u, 45089880u , 45614169u, 46138458u, 46662747u, 47187036u, 47711325u, 48235614u, 48759903u, 49284193u, 49808482u, 50332771u , 50857060u, 51381349u, 51905638u, 52429927u, 52954216u, 53478505u, 54002794u, 54527083u, 55051372u, 55575661u - , 56099950u, 56624239u, 57148528u, 57672817u, 58197106u + , 56099950u, 56624239u, 57148528u, 57672817u, 58721394u, 59245683u, 59769972u, 60294261u, 60818550u, 61342839u + , 61867128u, 62391417u, 62915706u, 63439995u, 63964284u, 64488573u, 66585726u }); builder.WithControlTree(new byte[] { // Control tree nodes as bytes - 111, 0, 1, 0, 0, 0, 0, 56, 0, 15, 0, 0, 0, 2, 111, 0, 3, 0, 2, 0, 2, 84, 0, 5, 0, 0, 0, 0, 111, 0 - , 169, 0, 0, 0, 0, 70, 0, 7, 0, 0, 0, 0, 84, 0, 143, 0, 0, 0, 0, 63, 0, 9, 0, 0, 0, 0, 70, 0, 53, 0 - , 0, 0, 0, 60, 0, 131, 0, 0, 0, 0, 63, 0, 11, 0, 0, 0, 0, 62, 0, 13, 0, 0, 0, 0, 63, 0, 255, 255, 22, 0 - , 1, 61, 0, 255, 255, 4, 0, 1, 62, 0, 255, 255, 21, 0, 1, 28, 0, 17, 0, 0, 0, 0, 56, 0, 77, 0, 0, 0, 0, 14 - , 0, 19, 0, 0, 0, 0, 28, 0, 45, 0, 0, 0, 0, 7, 0, 21, 0, 0, 0, 0, 14, 0, 33, 0, 0, 0, 0, 4, 0, 23 - , 0, 0, 0, 0, 7, 0, 29, 0, 0, 0, 0, 2, 0, 25, 0, 0, 0, 0, 4, 0, 27, 0, 0, 0, 0, 1, 0, 255, 255, 0 - , 0, 0, 2, 0, 255, 255, 5, 0, 1, 3, 0, 255, 255, 6, 0, 1, 4, 0, 255, 255, 7, 0, 1, 6, 0, 31, 0, 0, 0, 0 - , 7, 0, 255, 255, 10, 0, 1, 5, 0, 255, 255, 8, 0, 1, 6, 0, 255, 255, 9, 0, 1, 11, 0, 35, 0, 0, 0, 0, 14, 0 - , 41, 0, 0, 0, 0, 9, 0, 37, 0, 0, 0, 0, 11, 0, 39, 0, 0, 0, 0, 8, 0, 255, 255, 11, 0, 1, 9, 0, 255, 255 - , 12, 0, 1, 10, 0, 255, 255, 13, 0, 1, 11, 0, 255, 255, 14, 0, 1, 13, 0, 43, 0, 0, 0, 0, 14, 0, 255, 255, 17, 0 - , 1, 12, 0, 255, 255, 15, 0, 1, 13, 0, 255, 255, 16, 0, 1, 21, 0, 47, 0, 0, 0, 0, 28, 0, 65, 0, 0, 0, 0, 18 - , 0, 49, 0, 0, 0, 0, 21, 0, 61, 0, 0, 0, 0, 16, 0, 51, 0, 0, 0, 0, 18, 0, 59, 0, 0, 0, 0, 15, 0, 255 - , 255, 18, 0, 1, 16, 0, 255, 255, 23, 0, 1, 67, 0, 55, 0, 0, 0, 0, 70, 0, 139, 0, 0, 0, 0, 65, 0, 57, 0, 0 - , 0, 0, 67, 0, 137, 0, 0, 0, 0, 64, 0, 255, 255, 19, 0, 1, 65, 0, 255, 255, 20, 0, 1, 17, 0, 255, 255, 24, 0, 1 - , 18, 0, 255, 255, 25, 0, 1, 20, 0, 63, 0, 0, 0, 0, 21, 0, 255, 255, 28, 0, 1, 19, 0, 255, 255, 26, 0, 1, 20, 0 - , 255, 255, 27, 0, 1, 25, 0, 67, 0, 0, 0, 0, 28, 0, 73, 0, 0, 0, 0, 23, 0, 69, 0, 0, 0, 0, 25, 0, 71, 0 - , 0, 0, 0, 22, 0, 255, 255, 29, 0, 1, 23, 0, 255, 255, 30, 0, 1, 24, 0, 255, 255, 31, 0, 1, 25, 0, 255, 255, 32, 0 - , 1, 27, 0, 75, 0, 0, 0, 0, 28, 0, 255, 255, 35, 0, 1, 26, 0, 255, 255, 33, 0, 1, 27, 0, 255, 255, 34, 0, 1, 42 - , 0, 79, 0, 0, 0, 0, 56, 0, 105, 0, 0, 0, 0, 35, 0, 81, 0, 0, 0, 0, 42, 0, 93, 0, 0, 0, 0, 32, 0, 83 - , 0, 0, 0, 0, 35, 0, 89, 0, 0, 0, 0, 30, 0, 85, 0, 0, 0, 0, 32, 0, 87, 0, 0, 0, 0, 29, 0, 255, 255, 36 - , 0, 1, 30, 0, 255, 255, 37, 0, 1, 31, 0, 255, 255, 38, 0, 1, 32, 0, 255, 255, 39, 0, 1, 34, 0, 91, 0, 0, 0, 0 - , 35, 0, 255, 255, 42, 0, 1, 33, 0, 255, 255, 40, 0, 1, 34, 0, 255, 255, 41, 0, 1, 39, 0, 95, 0, 0, 0, 0, 42, 0 - , 101, 0, 0, 0, 0, 37, 0, 97, 0, 0, 0, 0, 39, 0, 99, 0, 0, 0, 0, 36, 0, 255, 255, 43, 0, 1, 37, 0, 255, 255 - , 44, 0, 1, 38, 0, 255, 255, 45, 0, 1, 39, 0, 255, 255, 46, 0, 1, 41, 0, 103, 0, 0, 0, 0, 42, 0, 255, 255, 49, 0 - , 1, 40, 0, 255, 255, 47, 0, 1, 41, 0, 255, 255, 48, 0, 1, 49, 0, 107, 0, 0, 0, 0, 56, 0, 119, 0, 0, 0, 0, 46 - , 0, 109, 0, 0, 0, 0, 49, 0, 115, 0, 0, 0, 0, 44, 0, 111, 0, 0, 0, 0, 46, 0, 113, 0, 0, 0, 0, 43, 0, 255 - , 255, 50, 0, 1, 44, 0, 255, 255, 51, 0, 1, 45, 0, 255, 255, 52, 0, 1, 46, 0, 255, 255, 53, 0, 1, 48, 0, 117, 0, 0 - , 0, 0, 49, 0, 255, 255, 56, 0, 1, 47, 0, 255, 255, 54, 0, 1, 48, 0, 255, 255, 55, 0, 1, 53, 0, 121, 0, 0, 0, 0 - , 56, 0, 127, 0, 0, 0, 0, 51, 0, 123, 0, 0, 0, 0, 53, 0, 125, 0, 61, 0, 1, 50, 0, 255, 255, 57, 0, 1, 51, 0 - , 255, 255, 58, 0, 1, 52, 0, 255, 255, 59, 0, 1, 53, 0, 255, 255, 60, 0, 1, 55, 0, 129, 0, 64, 0, 1, 56, 0, 255, 255 - , 65, 0, 1, 54, 0, 255, 255, 62, 0, 1, 55, 0, 255, 255, 63, 0, 1, 58, 0, 133, 0, 0, 0, 0, 60, 0, 135, 0, 0, 0 - , 0, 57, 0, 255, 255, 66, 0, 1, 58, 0, 255, 255, 67, 0, 1, 59, 0, 255, 255, 68, 0, 1, 60, 0, 255, 255, 69, 0, 1, 66 - , 0, 255, 255, 70, 0, 1, 67, 0, 255, 255, 71, 0, 1, 69, 0, 141, 0, 0, 0, 0, 70, 0, 255, 255, 74, 0, 1, 68, 0, 255 - , 255, 72, 0, 1, 69, 0, 255, 255, 73, 0, 1, 77, 0, 145, 0, 0, 0, 0, 84, 0, 157, 0, 0, 0, 0, 74, 0, 147, 0, 0 - , 0, 0, 77, 0, 153, 0, 0, 0, 0, 72, 0, 149, 0, 0, 0, 0, 74, 0, 151, 0, 0, 0, 0, 71, 0, 255, 255, 75, 0, 1 - , 72, 0, 255, 255, 76, 0, 1, 73, 0, 255, 255, 77, 0, 1, 74, 0, 255, 255, 78, 0, 1, 76, 0, 155, 0, 0, 0, 0, 77, 0 - , 255, 255, 81, 0, 1, 75, 0, 255, 255, 79, 0, 1, 76, 0, 255, 255, 80, 0, 1, 81, 0, 159, 0, 0, 0, 0, 84, 0, 165, 0 - , 0, 0, 0, 79, 0, 161, 0, 0, 0, 0, 81, 0, 163, 0, 0, 0, 0, 78, 0, 255, 255, 82, 0, 1, 79, 0, 255, 255, 83, 0 - , 1, 80, 0, 255, 255, 84, 0, 1, 81, 0, 255, 255, 85, 0, 1, 83, 0, 167, 0, 0, 0, 0, 84, 0, 255, 255, 88, 0, 1, 82 - , 0, 255, 255, 86, 0, 1, 83, 0, 255, 255, 87, 0, 1, 98, 0, 171, 0, 0, 0, 0, 111, 0, 197, 0, 0, 0, 0, 91, 0, 173 - , 0, 0, 0, 0, 98, 0, 185, 0, 0, 0, 0, 88, 0, 175, 0, 0, 0, 0, 91, 0, 181, 0, 0, 0, 0, 86, 0, 177, 0, 0 - , 0, 0, 88, 0, 179, 0, 0, 0, 0, 85, 0, 255, 255, 98, 0, 1, 86, 0, 255, 255, 89, 0, 1, 87, 0, 255, 255, 90, 0, 1 - , 88, 0, 255, 255, 91, 0, 1, 90, 0, 183, 0, 0, 0, 0, 91, 0, 255, 255, 94, 0, 1, 89, 0, 255, 255, 92, 0, 1, 90, 0 - , 255, 255, 93, 0, 1, 95, 0, 187, 0, 0, 0, 0, 98, 0, 193, 0, 0, 0, 0, 93, 0, 189, 0, 0, 0, 0, 95, 0, 191, 0 - , 0, 0, 0, 92, 0, 255, 255, 95, 0, 1, 93, 0, 255, 255, 96, 0, 1, 94, 0, 255, 255, 97, 0, 1, 95, 0, 255, 255, 99, 0 - , 1, 97, 0, 195, 0, 0, 0, 0, 98, 0, 255, 255, 102, 0, 1, 96, 0, 255, 255, 100, 0, 1, 97, 0, 255, 255, 101, 0, 1, 105 - , 0, 199, 0, 0, 0, 0, 111, 0, 211, 0, 0, 0, 0, 102, 0, 201, 0, 0, 0, 0, 105, 0, 207, 0, 0, 0, 0, 100, 0, 203 - , 0, 0, 0, 0, 102, 0, 205, 0, 0, 0, 0, 99, 0, 255, 255, 103, 0, 1, 100, 0, 255, 255, 104, 0, 1, 101, 0, 255, 255, 105 - , 0, 1, 102, 0, 255, 255, 106, 0, 1, 104, 0, 209, 0, 0, 0, 0, 105, 0, 255, 255, 109, 0, 1, 103, 0, 255, 255, 107, 0, 1 - , 104, 0, 255, 255, 108, 0, 1, 108, 0, 213, 0, 0, 0, 0, 111, 0, 217, 0, 0, 0, 0, 107, 0, 215, 0, 0, 0, 0, 108, 0 - , 255, 255, 112, 0, 1, 106, 0, 255, 255, 110, 0, 1, 107, 0, 255, 255, 111, 0, 1, 110, 0, 219, 0, 0, 0, 0, 111, 0, 221, 0 - , 115, 0, 1, 109, 0, 255, 255, 113, 0, 1, 110, 0, 255, 255, 114, 0, 1, 111, 0, 255, 255, 0, 0, 0, 111, 0, 223, 0, 0, 0 - , 0, 112, 0, 255, 255, 116, 0, 1, 111, 0, 255, 255, 0, 0, 0 + 135, 0, 1, 0, 0, 0, 0, 68, 0, 3, 0, 0, 0, 1, 135, 0, 137, 0, 1, 0, 1, 34, 0, 15, 0, 0, 0, 0, 68, 0 + , 5, 0, 0, 0, 0, 51, 0, 87, 0, 0, 0, 0, 68, 0, 7, 0, 0, 0, 0, 60, 0, 119, 0, 0, 0, 0, 68, 0, 9, 0 + , 0, 0, 0, 64, 0, 11, 0, 0, 0, 0, 68, 0, 49, 0, 0, 0, 0, 62, 0, 13, 0, 0, 0, 0, 64, 0, 47, 0, 0, 0 + , 0, 61, 0, 255, 255, 2, 0, 1, 62, 0, 255, 255, 19, 0, 1, 17, 0, 17, 0, 0, 0, 0, 34, 0, 55, 0, 0, 0, 0, 9 + , 0, 19, 0, 0, 0, 0, 17, 0, 35, 0, 0, 0, 0, 5, 0, 21, 0, 0, 0, 0, 9, 0, 29, 0, 0, 0, 0, 3, 0, 23 + , 0, 0, 0, 0, 5, 0, 27, 0, 0, 0, 0, 2, 0, 25, 0, 0, 0, 0, 3, 0, 255, 255, 4, 0, 1, 1, 0, 255, 255, 0 + , 0, 0, 2, 0, 255, 255, 3, 0, 1, 4, 0, 255, 255, 5, 0, 1, 5, 0, 255, 255, 6, 0, 1, 7, 0, 31, 0, 0, 0, 0 + , 9, 0, 33, 0, 0, 0, 0, 6, 0, 255, 255, 7, 0, 1, 7, 0, 255, 255, 8, 0, 1, 8, 0, 255, 255, 9, 0, 1, 9, 0 + , 255, 255, 10, 0, 1, 13, 0, 37, 0, 0, 0, 0, 17, 0, 43, 0, 0, 0, 0, 11, 0, 39, 0, 0, 0, 0, 13, 0, 41, 0 + , 0, 0, 0, 10, 0, 255, 255, 11, 0, 1, 11, 0, 255, 255, 12, 0, 1, 12, 0, 255, 255, 13, 0, 1, 13, 0, 255, 255, 14, 0 + , 1, 15, 0, 45, 0, 0, 0, 0, 17, 0, 53, 0, 0, 0, 0, 14, 0, 255, 255, 15, 0, 1, 15, 0, 255, 255, 16, 0, 1, 63 + , 0, 255, 255, 20, 0, 1, 64, 0, 255, 255, 17, 0, 1, 66, 0, 51, 0, 0, 0, 0, 68, 0, 135, 0, 0, 0, 0, 65, 0, 255 + , 255, 18, 0, 1, 66, 0, 255, 255, 71, 0, 1, 16, 0, 255, 255, 21, 0, 1, 17, 0, 255, 255, 22, 0, 1, 26, 0, 57, 0, 0 + , 0, 0, 34, 0, 73, 0, 0, 0, 0, 22, 0, 59, 0, 0, 0, 0, 26, 0, 67, 0, 0, 0, 0, 20, 0, 61, 0, 0, 0, 0 + , 22, 0, 65, 0, 0, 0, 0, 19, 0, 63, 0, 0, 0, 0, 20, 0, 255, 255, 25, 0, 1, 18, 0, 255, 255, 23, 0, 1, 19, 0 + , 255, 255, 24, 0, 1, 21, 0, 255, 255, 26, 0, 1, 22, 0, 255, 255, 27, 0, 1, 24, 0, 69, 0, 0, 0, 0, 26, 0, 71, 0 + , 0, 0, 0, 23, 0, 255, 255, 28, 0, 1, 24, 0, 255, 255, 29, 0, 1, 25, 0, 255, 255, 30, 0, 1, 26, 0, 255, 255, 31, 0 + , 1, 30, 0, 75, 0, 0, 0, 0, 34, 0, 81, 0, 0, 0, 0, 28, 0, 77, 0, 0, 0, 0, 30, 0, 79, 0, 0, 0, 0, 27 + , 0, 255, 255, 32, 0, 1, 28, 0, 255, 255, 33, 0, 1, 29, 0, 255, 255, 34, 0, 1, 30, 0, 255, 255, 35, 0, 1, 32, 0, 83 + , 0, 0, 0, 0, 34, 0, 85, 0, 0, 0, 0, 31, 0, 255, 255, 36, 0, 1, 32, 0, 255, 255, 37, 0, 1, 33, 0, 255, 255, 38 + , 0, 1, 34, 0, 255, 255, 39, 0, 1, 43, 0, 89, 0, 0, 0, 0, 51, 0, 105, 0, 0, 0, 0, 39, 0, 91, 0, 0, 0, 0 + , 43, 0, 99, 0, 0, 0, 0, 37, 0, 93, 0, 0, 0, 0, 39, 0, 97, 0, 0, 0, 0, 36, 0, 95, 0, 0, 0, 0, 37, 0 + , 255, 255, 42, 0, 1, 35, 0, 255, 255, 40, 0, 1, 36, 0, 255, 255, 41, 0, 1, 38, 0, 255, 255, 43, 0, 1, 39, 0, 255, 255 + , 44, 0, 1, 41, 0, 101, 0, 0, 0, 0, 43, 0, 103, 0, 0, 0, 0, 40, 0, 255, 255, 45, 0, 1, 41, 0, 255, 255, 46, 0 + , 1, 42, 0, 255, 255, 47, 0, 1, 43, 0, 255, 255, 48, 0, 1, 47, 0, 107, 0, 0, 0, 0, 51, 0, 113, 0, 0, 0, 0, 45 + , 0, 109, 0, 0, 0, 0, 47, 0, 111, 0, 0, 0, 0, 44, 0, 255, 255, 49, 0, 1, 45, 0, 255, 255, 50, 0, 1, 46, 0, 255 + , 255, 51, 0, 1, 47, 0, 255, 255, 52, 0, 1, 49, 0, 115, 0, 0, 0, 0, 51, 0, 117, 0, 0, 0, 0, 48, 0, 255, 255, 53 + , 0, 1, 49, 0, 255, 255, 54, 0, 1, 50, 0, 255, 255, 55, 0, 1, 51, 0, 255, 255, 56, 0, 1, 56, 0, 121, 0, 66, 0, 1 + , 60, 0, 129, 0, 67, 0, 1, 54, 0, 123, 0, 62, 0, 1, 56, 0, 127, 0, 63, 0, 1, 53, 0, 125, 0, 59, 0, 1, 54, 0 + , 255, 255, 60, 0, 1, 52, 0, 255, 255, 57, 0, 1, 53, 0, 255, 255, 58, 0, 1, 55, 0, 255, 255, 61, 0, 1, 56, 0, 255, 255 + , 64, 0, 1, 58, 0, 131, 0, 0, 0, 0, 60, 0, 133, 0, 0, 0, 0, 57, 0, 255, 255, 65, 0, 1, 58, 0, 255, 255, 68, 0 + , 1, 59, 0, 255, 255, 69, 0, 1, 60, 0, 255, 255, 70, 0, 1, 67, 0, 255, 255, 72, 0, 1, 68, 0, 255, 255, 73, 0, 1, 102 + , 0, 139, 0, 0, 0, 0, 135, 0, 205, 0, 0, 0, 0, 85, 0, 141, 0, 0, 0, 0, 102, 0, 173, 0, 0, 0, 0, 77, 0, 143 + , 0, 0, 0, 0, 85, 0, 159, 0, 0, 0, 0, 73, 0, 145, 0, 0, 0, 0, 77, 0, 153, 0, 0, 0, 0, 71, 0, 147, 0, 0 + , 0, 0, 73, 0, 151, 0, 0, 0, 0, 70, 0, 149, 0, 0, 0, 0, 71, 0, 255, 255, 76, 0, 1, 69, 0, 255, 255, 74, 0, 1 + , 70, 0, 255, 255, 75, 0, 1, 72, 0, 255, 255, 77, 0, 1, 73, 0, 255, 255, 78, 0, 1, 75, 0, 155, 0, 0, 0, 0, 77, 0 + , 157, 0, 0, 0, 0, 74, 0, 255, 255, 79, 0, 1, 75, 0, 255, 255, 80, 0, 1, 76, 0, 255, 255, 81, 0, 1, 77, 0, 255, 255 + , 82, 0, 1, 81, 0, 161, 0, 0, 0, 0, 85, 0, 167, 0, 0, 0, 0, 79, 0, 163, 0, 0, 0, 0, 81, 0, 165, 0, 0, 0 + , 0, 78, 0, 255, 255, 83, 0, 1, 79, 0, 255, 255, 84, 0, 1, 80, 0, 255, 255, 85, 0, 1, 81, 0, 255, 255, 86, 0, 1, 83 + , 0, 169, 0, 0, 0, 0, 85, 0, 171, 0, 0, 0, 0, 82, 0, 255, 255, 87, 0, 1, 83, 0, 255, 255, 88, 0, 1, 84, 0, 255 + , 255, 89, 0, 1, 85, 0, 255, 255, 99, 0, 1, 94, 0, 175, 0, 0, 0, 0, 102, 0, 191, 0, 0, 0, 0, 90, 0, 177, 0, 0 + , 0, 0, 94, 0, 185, 0, 0, 0, 0, 88, 0, 179, 0, 0, 0, 0, 90, 0, 183, 0, 0, 0, 0, 87, 0, 181, 0, 0, 0, 0 + , 88, 0, 255, 255, 92, 0, 1, 86, 0, 255, 255, 90, 0, 1, 87, 0, 255, 255, 91, 0, 1, 89, 0, 255, 255, 93, 0, 1, 90, 0 + , 255, 255, 94, 0, 1, 92, 0, 187, 0, 0, 0, 0, 94, 0, 189, 0, 0, 0, 0, 91, 0, 255, 255, 95, 0, 1, 92, 0, 255, 255 + , 96, 0, 1, 93, 0, 255, 255, 97, 0, 1, 94, 0, 255, 255, 98, 0, 1, 98, 0, 193, 0, 0, 0, 0, 102, 0, 199, 0, 0, 0 + , 0, 96, 0, 195, 0, 0, 0, 0, 98, 0, 197, 0, 0, 0, 0, 95, 0, 255, 255, 100, 0, 1, 96, 0, 255, 255, 101, 0, 1, 97 + , 0, 255, 255, 102, 0, 1, 98, 0, 255, 255, 103, 0, 1, 100, 0, 201, 0, 0, 0, 0, 102, 0, 203, 0, 0, 0, 0, 99, 0, 255 + , 255, 104, 0, 1, 100, 0, 255, 255, 105, 0, 1, 101, 0, 255, 255, 106, 0, 1, 102, 0, 255, 255, 107, 0, 1, 119, 0, 207, 0, 0 + , 0, 0, 135, 0, 239, 0, 0, 0, 0, 111, 0, 209, 0, 0, 0, 0, 119, 0, 225, 0, 0, 0, 0, 107, 0, 211, 0, 0, 0, 0 + , 111, 0, 219, 0, 0, 0, 0, 105, 0, 213, 0, 0, 0, 0, 107, 0, 217, 0, 0, 0, 0, 104, 0, 215, 0, 0, 0, 0, 105, 0 + , 255, 255, 110, 0, 1, 103, 0, 255, 255, 108, 0, 1, 104, 0, 255, 255, 109, 0, 1, 106, 0, 255, 255, 111, 0, 1, 107, 0, 255, 255 + , 112, 0, 1, 109, 0, 221, 0, 0, 0, 0, 111, 0, 223, 0, 0, 0, 0, 108, 0, 255, 255, 113, 0, 1, 109, 0, 255, 255, 114, 0 + , 1, 110, 0, 255, 255, 115, 0, 1, 111, 0, 255, 255, 116, 0, 1, 115, 0, 227, 0, 0, 0, 0, 119, 0, 233, 0, 0, 0, 0, 113 + , 0, 229, 0, 0, 0, 0, 115, 0, 231, 0, 0, 0, 0, 112, 0, 255, 255, 0, 0, 0, 113, 0, 255, 255, 117, 0, 1, 114, 0, 255 + , 255, 118, 0, 1, 115, 0, 255, 255, 119, 0, 1, 117, 0, 235, 0, 0, 0, 0, 119, 0, 237, 0, 0, 0, 0, 116, 0, 255, 255, 120 + , 0, 1, 117, 0, 255, 255, 121, 0, 1, 118, 0, 255, 255, 122, 0, 1, 119, 0, 255, 255, 123, 0, 1, 128, 0, 241, 0, 0, 0, 0 + , 135, 0, 255, 255, 0, 0, 0, 124, 0, 243, 0, 0, 0, 0, 128, 0, 251, 0, 0, 0, 0, 122, 0, 245, 0, 0, 0, 0, 124, 0 + , 249, 0, 0, 0, 0, 121, 0, 247, 0, 0, 0, 0, 122, 0, 255, 255, 126, 0, 1, 120, 0, 255, 255, 124, 0, 1, 121, 0, 255, 255 + , 125, 0, 1, 123, 0, 255, 255, 127, 0, 1, 124, 0, 255, 255, 128, 0, 1, 126, 0, 255, 255, 0, 0, 0, 128, 0, 253, 0, 0, 0 + , 0, 127, 0, 255, 255, 0, 0, 0, 128, 0, 255, 255, 129, 0, 1 }, new ushort[] { // Control tree node indicies - 0, 64, 0, 64, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 - , 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56 - , 57, 58, 59, 60, 61, 62, 63, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87 - , 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114 + 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + , 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 + , 59, 60, 61, 61, 62, 63, 64, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86 + , 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116 + , 117, 118, 119, 120, 121, 122, 123, 124, 125, 126 }); builder.Finish(); @@ -625,9 +682,9 @@ private UnityEngine.InputSystem.Controls.AnyKeyControl Initialize_ctrlKeyboardan .WithStateBlock(new InputStateBlock { format = new FourCC(1112101920), - byteOffset = 0, + byteOffset = 1, bitOffset = 0, - sizeInBits = 109 + sizeInBits = 123 }) .WithMinAndMax(0, 1) .Finish(); @@ -2018,7 +2075,7 @@ private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardright }) .WithMinAndMax(0, 1) .Finish(); - ctrlKeyboardrightAlt.keyCode = UnityEngine.InputSystem.Key.AltGr; + ctrlKeyboardrightAlt.keyCode = UnityEngine.InputSystem.Key.RightAlt; return ctrlKeyboardrightAlt; } @@ -2164,7 +2221,7 @@ private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardright }) .WithMinAndMax(0, 1) .Finish(); - ctrlKeyboardrightMeta.keyCode = UnityEngine.InputSystem.Key.RightCommand; + ctrlKeyboardrightMeta.keyCode = UnityEngine.InputSystem.Key.RightWindows; return ctrlKeyboardrightMeta; } @@ -3250,11 +3307,287 @@ private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardOEM5( return ctrlKeyboardOEM5; } + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf13(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf13 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf13.Setup() + .At(this, 114) + .WithParent(parent) + .WithName("f13") + .WithDisplayName("F13") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 112, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf13.keyCode = UnityEngine.InputSystem.Key.F13; + return ctrlKeyboardf13; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf14(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf14 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf14.Setup() + .At(this, 115) + .WithParent(parent) + .WithName("f14") + .WithDisplayName("F14") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 113, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf14.keyCode = UnityEngine.InputSystem.Key.F14; + return ctrlKeyboardf14; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf15(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf15 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf15.Setup() + .At(this, 116) + .WithParent(parent) + .WithName("f15") + .WithDisplayName("F15") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 114, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf15.keyCode = UnityEngine.InputSystem.Key.F15; + return ctrlKeyboardf15; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf16(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf16 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf16.Setup() + .At(this, 117) + .WithParent(parent) + .WithName("f16") + .WithDisplayName("F16") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 115, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf16.keyCode = UnityEngine.InputSystem.Key.F16; + return ctrlKeyboardf16; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf17(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf17 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf17.Setup() + .At(this, 118) + .WithParent(parent) + .WithName("f17") + .WithDisplayName("F17") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 116, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf17.keyCode = UnityEngine.InputSystem.Key.F17; + return ctrlKeyboardf17; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf18(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf18 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf18.Setup() + .At(this, 119) + .WithParent(parent) + .WithName("f18") + .WithDisplayName("F18") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 117, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf18.keyCode = UnityEngine.InputSystem.Key.F18; + return ctrlKeyboardf18; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf19(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf19 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf19.Setup() + .At(this, 120) + .WithParent(parent) + .WithName("f19") + .WithDisplayName("F19") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 118, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf19.keyCode = UnityEngine.InputSystem.Key.F19; + return ctrlKeyboardf19; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf20(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf20 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf20.Setup() + .At(this, 121) + .WithParent(parent) + .WithName("f20") + .WithDisplayName("F20") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 119, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf20.keyCode = UnityEngine.InputSystem.Key.F20; + return ctrlKeyboardf20; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf21(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf21 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf21.Setup() + .At(this, 122) + .WithParent(parent) + .WithName("f21") + .WithDisplayName("F21") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 120, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf21.keyCode = UnityEngine.InputSystem.Key.F21; + return ctrlKeyboardf21; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf22(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf22 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf22.Setup() + .At(this, 123) + .WithParent(parent) + .WithName("f22") + .WithDisplayName("F22") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 121, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf22.keyCode = UnityEngine.InputSystem.Key.F22; + return ctrlKeyboardf22; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf23(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf23 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf23.Setup() + .At(this, 124) + .WithParent(parent) + .WithName("f23") + .WithDisplayName("F23") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 122, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf23.keyCode = UnityEngine.InputSystem.Key.F23; + return ctrlKeyboardf23; + } + + private UnityEngine.InputSystem.Controls.KeyControl Initialize_ctrlKeyboardf24(InternedString kKeyLayout, InputControl parent) + { + var ctrlKeyboardf24 = new UnityEngine.InputSystem.Controls.KeyControl(); + ctrlKeyboardf24.Setup() + .At(this, 125) + .WithParent(parent) + .WithName("f24") + .WithDisplayName("F24") + .WithLayout(kKeyLayout) + .IsButton(true) + .WithStateBlock(new InputStateBlock + { + format = new FourCC(1112101920), + byteOffset = 0, + bitOffset = 123, + sizeInBits = 1 + }) + .WithMinAndMax(0, 1) + .Finish(); + ctrlKeyboardf24.keyCode = UnityEngine.InputSystem.Key.F24; + return ctrlKeyboardf24; + } + private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlKeyboardIMESelected(InternedString kButtonLayout, InputControl parent) { var ctrlKeyboardIMESelected = new UnityEngine.InputSystem.Controls.ButtonControl(); ctrlKeyboardIMESelected.Setup() - .At(this, 114) + .At(this, 126) .WithParent(parent) .WithName("IMESelected") .WithDisplayName("IMESelected") @@ -3265,7 +3598,7 @@ private UnityEngine.InputSystem.Controls.ButtonControl Initialize_ctrlKeyboardIM { format = new FourCC(1112101920), byteOffset = 0, - bitOffset = 111, + bitOffset = 127, sizeInBits = 1 }) .WithMinAndMax(0, 1) diff --git a/Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs index d0765b5db4..d0be0c1657 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs @@ -128,12 +128,23 @@ public static bool IsTextInputKey(this Key key) case Key.F10: case Key.F11: case Key.F12: + case Key.F13: + case Key.F14: + case Key.F15: + case Key.F16: + case Key.F17: + case Key.F18: + case Key.F19: + case Key.F20: + case Key.F21: + case Key.F22: + case Key.F23: + case Key.F24: case Key.OEM1: case Key.OEM2: case Key.OEM3: case Key.OEM4: case Key.OEM5: - case Key.IMESelected: return false; } return true;