removed all obsolete and breaking changes

Author: bmalrat

Assets/QA/Tests/KeyboardMouseBasic/Scripts/ButtonStateHex.cs

@@ -44,21 +44,20 @@ string GetStringForKBButtonState(Keyboard keyboard)
         int workingInt = 0;
         int offset = 0;
         string retVal = "";
-        int nbKeys = (int)Key.F24;
 
-        for (int j = nbKeys / 16; j >= 0; j--)
+        for (int j = ((int)(Keyboard.KeyCount)) / 16; j >= 0; j--)
         {
             workingInt = 0;
             offset = j * 16;
             for (int i = 15; i >= 0; i--)
             {
-                if (i + offset != 0 && i + offset < nbKeys)
+                if (i + offset != 0 && i + offset < ((int)(Keyboard.KeyCount)))
                 {
                     workingInt |= _BoolHelper(keyboard[(Key)(offset + i)].ReadValue() != 0f) << (i);
                 }
             }
 
-            if (j != nbKeys / 16) { retVal += "."; } // Don't put a trailing period because it looks dumb
+            if (j != ((int)(Keyboard.KeyCount)) / 16) { retVal += "."; } // Don't put a trailing period because it looks dumb
             retVal += workingInt.ToString("X4");
         }
 

Assets/Tests/InputSystem/CorePerformanceTests.cs

@@ -126,7 +126,7 @@ public void Performance_ReadEveryKey()
             int keyIndex = 0;
             foreach (var key in keyboard.allKeys)
             {
-                if (++keyIndex == (int)KeyEx.IMESelected)  // Skip IMESelected as it's not a real key.
+                if (++keyIndex == (int)Key.IMESelected)  // Skip IMESelected as it's not a real key.
                     continue;
                 key.ReadValue();
             }

Assets/Tests/InputSystem/CoreTests_Devices.cs

@@ -2683,7 +2683,6 @@ public void Devices_AnyKeyOnKeyboard_DoesNotReactToIMESelected()
 
     [Test]
     [Category("Devices")]
-    [Obsolete("Test obsolete IMESelected Key")]
     public void Devices_ImeSelectedKeyOnKeyboard_SupportObsoleteIMESelectedKey()
     {
         var keyboard = InputSystem.AddDevice<Keyboard>();

Packages/com.unity.inputsystem/InputSystem/Devices/Keyboard.cs

@@ -46,10 +46,10 @@ public unsafe struct KeyboardState : IInputStateTypeInfo
         /// <seealso cref="InputStateBlock.format"/>
         public static FourCC Format => new FourCC('K', 'E', 'Y', 'S');
 
-        private const int kSizeInBits = Keyboard.ExtendedKeyCount; // +1 for IMESelected.
+        private const int kSizeInBits = Keyboard.ExtendedKeyCount;
         internal const int kSizeInBytes = (kSizeInBits + 7) / 8;
 
-        [InputControl(name = "anyKey", displayName = "Any Key", layout = "AnyKey", bit = 1, sizeInBits = (int)Key.F24, synthetic = true)]
+        [InputControl(name = "anyKey", displayName = "Any Key", layout = "AnyKey", bit = 1, sizeInBits = kSizeInBits, 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)]
@@ -195,7 +195,7 @@ public KeyboardState(bool IMESelected, params Key[] pressedKeys)
 
                 if (IMESelected)
                 {
-                    MemoryHelpers.WriteSingleBit(keysPtr, (uint)KeyEx.IMESelected, true);
+                    MemoryHelpers.WriteSingleBit(keysPtr, (uint)Key.IMESelected, true);
                 }
 
                 for (var i = 0; i < pressedKeys.Length; ++i)
@@ -894,7 +894,6 @@ public enum Key
         /// 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.
         /// </summary>
-        //[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.", false)]
         IMESelected,
 
         /// <summary>
@@ -968,7 +967,6 @@ public enum Key
 
     internal static class KeyEx
     {
-        internal const Key IMESelected = (Key)111; //IMESelected value
         internal const Key RemappedIMESelected = (Key)127; //IMESelected value
     }
 
@@ -2661,9 +2659,9 @@ public unsafe bool PreProcessEvent(InputEventPtr currentEventPtr)
                 if (stateEvent->stateFormat == KeyboardState.Format)
                 {
                     var keyboardState = ((KeyboardState*)(stateEvent->stateData));
-                    if (keyboardState->Get(KeyEx.IMESelected))
+                    if (keyboardState->Get(Key.IMESelected))
                     {
-                        keyboardState->Set(KeyEx.IMESelected, false);
+                        keyboardState->Set(Key.IMESelected, false);
                         keyboardState->Set(KeyEx.RemappedIMESelected, true);
                     }
                 }

Packages/com.unity.inputsystem/InputSystem/InputExtensions.cs

@@ -145,6 +145,7 @@ public static bool IsTextInputKey(this Key key)
                 case Key.OEM3:
                 case Key.OEM4:
                 case Key.OEM5:
+                case Key.IMESelected:
                     return false;
             }
             return true;