add keyboard support

Author: lucasteles

assets/img/config.png

@@ -25,7 +25,6 @@ public record SelectedTheme(
     );
 
     public SelectedTheme CurrentTheme { get; set; } = new();
-
     public bool Borderless { get; set; }
     public bool ShadowHolding { get; set; } = true;
     public bool HideHolding { get; set; }
@@ -35,6 +34,7 @@ public record SelectedTheme(
     public bool InvertHistory { get; set; }
     public bool FramesAfter { get; set; }
     public bool HideButtonRelease { get; set; }
+    public bool AutoSelectSinglePad { get; set; } = true;
     public SOCDMode SOCD { get; set; } = SOCDMode.Neutral;
     public bool ShortcutsEnabled { get; set; } = true;
     public int IconSize { get; set; } = 40;
@@ -48,8 +48,8 @@ public record SelectedTheme(
     public int Left { get; set; }
 
     public InputMap InputMap { get; set; } = new();
-
-    public InputMacro Macros { get; set; } = new();
+    public InputMacro Macros { get; set; } = [];
+    public KeyboardToPadMap KeyboardMap { get; set; } = new();
 
     public string BackgroundColor
     {
@@ -109,6 +109,8 @@ public void CopyFrom(Settings config)
         EnabledDirections = config.EnabledDirections;
         Borderless = config.Borderless;
         HideButtonRelease = config.HideButtonRelease;
+        AutoSelectSinglePad = config.AutoSelectSinglePad;
+        KeyboardMap = config.KeyboardMap;
         Width = config.Width;
         Height = config.Height;
         Top = config.Top;

src/InputDisplay/Config/Settings.cs

@@ -15,9 +15,10 @@ public sealed class SettingsControls(Desktop desktop, SettingsManager configMana
 {
     public ButtonName? MappingButton { get; private set; }
     public ButtonName? MappingMacro { get; private set; }
+    public Direction? MappingDirection { get; private set; }
     public Button ResetMapButton { get; private set; }
     Label SelectedJoystick { get; set; }
-    Image[] Directions { get; } = new Image[9];
+    Button[] Directions { get; } = new Button[9];
     Dictionary<ButtonName, Button> Buttons { get; } = [];
     Dictionary<ButtonName, Button> Macros { get; } = [];
 
@@ -26,6 +27,7 @@ public sealed class SettingsControls(Desktop desktop, SettingsManager configMana
     Theme defaultTheme;
 
     static readonly Color darkGray = new(50, 50, 50);
+    static readonly Color slateGray = Color.SlateGray;
 
     Settings Config => configManager.CurrentConfig;
 
@@ -75,15 +77,29 @@ public Widget BuildUI()
         ButtonName.KK,
     ];
 
-    PlayerPad player;
+    PlayerInputDevice player;
 
-    public void SetPlayer(PlayerPad pad)
+    public void SetPlayer(PlayerInputDevice pad)
     {
         SelectedJoystick.Text = pad.Name;
 
         var currentType = Config.InputMap.GetPadKind(pad);
         controllerTypeCombo.SelectedIndex = ThemeConfig.ControllerTypes.Keys.ToArray().IndexOf(currentType);
         player = pad;
+
+        foreach (var button in Directions)
+            if (!player.IsKeyboard ||
+                button.Tag is Direction
+                    and not (Direction.Up or Direction.Down or Direction.Backward or Direction.Forward))
+            {
+                button.Enabled = false;
+                button.OverBackground = null;
+            }
+            else
+            {
+                button.Enabled = true;
+                button.OverBackground = new SolidBrush(Color.DarkSlateGray);
+            }
     }
 
     void RebuildMacroButtons()
@@ -486,7 +502,9 @@ Grid BuildSettings()
         AddCheck(1, 1, "Frames after", Config.FramesAfter, check => Config.FramesAfter = check);
         AddCheck(1, 2, "Hide button release", Config.HideButtonRelease, check => Config.HideButtonRelease = check);
         AddCheck(1, 3, "Use Shortcuts", Config.ShortcutsEnabled, check => Config.ShortcutsEnabled = check);
-        CreateDirectionsSourceBox(1, 4, "Dir.Sources");
+        AddCheck(1, 4, "Auto select when single pad", Config.AutoSelectSinglePad,
+            check => Config.AutoSelectSinglePad = check);
+        CreateDirectionsSourceBox(1, 5, "Dir.Sources");
 
         AddEnumCombo(2, 0, "SOCD", Config.SOCD, item => Config.SOCD = item);
         AddNumeric(2, 1, "Input space", Config.SpaceBetweenInputs, v => Config.SpaceBetweenInputs = v);
@@ -860,7 +878,7 @@ void InitButton(ButtonName buttonName, (int Row, int Collumn) pos, Grid grid)
                     HorizontalAlignment = HorizontalAlignment.Center,
                     TextColor = Color.White,
                     Text = buttonName.ToString(),
-                }
+                },
         };
 
         button.Click += OnButtonMapClick;
@@ -875,17 +893,27 @@ void InitButton(ButtonName buttonName, (int Row, int Collumn) pos, Grid grid)
     void OnButtonMapClick(object sender, EventArgs e)
     {
         var button = (Button)sender;
-        var name = (ButtonName)button.Tag;
 
-        MappingButton = name;
-        currentModal = BuildButtonMapModal($"Mapping {name}");
+        if (button.Tag is ButtonName name)
+            MappingButton = name;
+
+        if (button.Tag is Direction dir)
+        {
+            if (player?.IsKeyboard is not true)
+                return;
+
+            MappingDirection = dir;
+        }
+
+        currentModal = BuildButtonMapModal($"Mapping {button.Tag}");
         currentModal.ShowModal(desktop);
     }
 
     public void ButtonMapped()
     {
         currentModal?.Close();
         MappingButton = null;
+        MappingDirection = null;
         currentModal = null;
     }
 
@@ -895,16 +923,29 @@ void InitNumpadDirection(int numpad, (int Row, int Collumn) pos, Grid grid)
         var texture = defaultTheme.GetTexture(dir);
         var index = numpad - 1;
 
-        Directions[index] = new()
+        Image image = new()
         {
             Renderable = new TextureRegion(texture),
+            Color = darkGray,
             Width = 30,
             Height = 30,
             VerticalAlignment = VerticalAlignment.Center,
             HorizontalAlignment = HorizontalAlignment.Center,
-            Color = darkGray,
         };
 
+        Button button = new()
+        {
+            Tag = dir,
+            Background = null,
+            FocusedBackground = null,
+            DisabledBackground = null,
+            Content = image,
+        };
+
+        button.Click += OnButtonMapClick;
+
+        Directions[index] = button;
+
         Grid.SetColumn(Directions[index], pos.Collumn - 1);
         Grid.SetRow(Directions[index], pos.Row - 1);
         grid.Widgets.Add(Directions[index]);
@@ -950,7 +991,6 @@ Panel BuildSelectedController()
         left.Widgets.Add(labelJoyStick);
         left.Widgets.Add(SelectedJoystick);
 
-
         HorizontalStackPanel right = new()
         {
             VerticalAlignment = VerticalAlignment.Center,
@@ -987,7 +1027,7 @@ Panel BuildSelectedController()
 
     void OnChangeControllerType(object sender, EventArgs e)
     {
-        if (sender is not ListView { SelectedItem: Label { Tag: PlayerPad.Kind kind } }
+        if (sender is not ListView { SelectedItem: Label { Tag: PlayerInputDevice.Kind kind } }
             || player is null || Config.InputMap.GetMapping(player) is not { } mapping)
             return;
 
@@ -998,10 +1038,23 @@ void OnChangeControllerType(object sender, EventArgs e)
     public void HighLightDirection(Direction dir)
     {
         var index = NumpadNotation.From(dir) - 1;
+
         for (var i = 0; i < Directions.Length; i++)
-            Directions[i].Color = index == i && Config.EnabledDirections is not Settings.DirectionSources.None
-                ? Color.White
+        {
+            ref var btn = ref Directions[i];
+
+            var backcolor = player?.IsKeyboard is true &&
+                            btn.Tag is Direction.Up or Direction.Down or Direction.Backward or Direction.Forward
+                ? slateGray
                 : darkGray;
+
+            var color = index == i && Config.EnabledDirections is not Settings.DirectionSources.None
+                ? Color.White
+                : backcolor;
+
+            if (btn is { Content: Image img })
+                img.Color = color;
+        }
     }
 
     public void HighLightButtons(ButtonName buttons)

src/InputDisplay/Config/Window/SettingsControls.cs

@@ -23,11 +23,12 @@ public class SettingsGame : Game
 #pragma warning restore S1450
 
     readonly SettingsManager configManager = new();
-    PlayerPad? player;
+    PlayerInputDevice? player;
 
     Settings Config => configManager.CurrentConfig;
 
     PlayerIndex? playerIndexArg;
+    readonly bool fromPlayerUsingKeyboard;
 
     static readonly Point windowSize = new(1080, 720);
 
@@ -40,7 +41,12 @@ public SettingsGame(string? playerIndex = null)
         Window.AllowUserResizing = false;
         graphics.ApplyChanges();
 
-        if (playerIndex.IsNonEmpty() && Enum.TryParse(playerIndex, out PlayerIndex index))
+        if (playerIndex is "keyboard")
+        {
+            fromPlayerUsingKeyboard = true;
+            playerIndexArg = PlayerIndex.One;
+        }
+        else if (playerIndex.IsNonEmpty() && Enum.TryParse(playerIndex, out PlayerIndex index))
             playerIndexArg = index;
     }
 
@@ -77,12 +83,21 @@ protected override void Update(GameTime gameTime)
     {
         KeyboardManager.Update();
 
-        if (controls.MappingButton is null && controls.MappingMacro is null &&
-            KeyboardManager.IsKeyPressed(Keys.Escape))
-            if (player is null || PlayerPad.GetConnected().Count() <= 1 || playerIndexArg is not null)
+        if (KeyboardManager.IsKeyPressed(Keys.Escape))
+        {
+            if (controls.MappingButton is not null || controls.MappingMacro is not null)
+            {
+                controls.ButtonMapped();
+                return;
+            }
+
+            if (player is null
+                || (!PlayerInputDevice.HasMultiplePads() && Config.AutoSelectSinglePad)
+                || playerIndexArg is not null)
                 Exit();
             else
                 player = null;
+        }
 
         if (player is null)
         {
@@ -93,18 +108,43 @@ protected override void Update(GameTime gameTime)
         player.Update();
         gameInput.Update(player, Config);
 
-        if (controls.MappingButton is null)
+        if (controls.MappingButton is null && controls.MappingDirection is null)
         {
             var input = gameInput.CurrentState;
             controls.HighLightDirection(input.Stick.Direction);
             controls.HighLightButtons(input.GetActiveButtons());
         }
-        else if (player.GetAnyButton() is { } padButton && Config.InputMap.GetMapping(player.Identifier) is { } map)
+        else if (controls.MappingButton is not null && Config.InputMap.GetMapping(player.Identifier) is { } map)
+        {
+            var found = false;
+            if (!player.IsKeyboard && player.GetAnyButton() is { } padButton)
+            {
+                map.Set(controls.MappingButton.Value, padButton);
+                found = true;
+            }
+
+            if (player.IsKeyboard &&
+                player.TryRemapKeyboardFor(InputMap.ButtonMap.Default.Get(controls.MappingButton.Value))
+               )
+                found = true;
+
+            if (found)
+            {
+                controls.ButtonMapped();
+                configManager.SaveFile();
+            }
+        }
+        else if (controls.MappingDirection is not null &&
+                 player.IsKeyboard &&
+                 player.TryRemapKeyboardFor(InputMap.DirectionToPadButton(controls.MappingDirection.Value)))
         {
-            map.Set(controls.MappingButton.Value, padButton);
             controls.ButtonMapped();
             configManager.SaveFile();
         }
+        else if (controls.MappingDirection is not null && !player.IsKeyboard)
+        {
+            controls.ButtonMapped();
+        }
 
         base.Update(gameTime);
     }
@@ -113,8 +153,14 @@ void DetectController()
     {
         if (playerIndexArg is not null && player is null)
         {
-            PlayerPad argPlayer = new(playerIndexArg.Value);
-            if (argPlayer.Capabilities.IsConnected)
+            PlayerInputDevice argPlayer =
+                fromPlayerUsingKeyboard
+                    ? new(Config.KeyboardMap)
+                    : new(playerIndexArg.Value);
+
+            argPlayer.Update();
+
+            if (argPlayer.IsConnected)
             {
                 SetPlayerPad(argPlayer);
                 return;
@@ -124,20 +170,21 @@ void DetectController()
             playerIndexArg = null;
         }
 
-        if (PlayerPad.DetectPress() is not { } playerPad) return;
+        if (PlayerInputDevice.DetectPress(Config.AutoSelectSinglePad, Config.KeyboardMap) is not { } playerPad) return;
         SetPlayerPad(playerPad);
     }
 
-    public void SetPlayerPad(PlayerPad playerPad)
+    public void SetPlayerPad(PlayerInputDevice playerPad)
     {
         player = playerPad;
         controls.SetPlayer(playerPad);
-        if (Config.InputMap.TryAddGamePad(player.Capabilities))
+        if (Config.InputMap.TryAddGamePad(player))
             configManager.SaveFile();
     }
 
     void OnResetMap(object? sender, EventArgs e)
     {
+        Config.KeyboardMap.Reset();
         if (player is null || Config.InputMap.GetMapping(player.Identifier) is not { } map) return;
         map.Reset();
         configManager.SaveFile();

src/InputDisplay/Config/Window/SettingsGame.cs

@@ -12,7 +12,7 @@ public enum WindowState { Closed, Starting, Started }
 
     public bool IsOpen() => state is not WindowState.Closed && process is { Responding: true, HasExited: false };
 
-    public void Open(PlayerPad? player = null)
+    public void Open(PlayerInputDevice? player = null)
     {
         if (state is WindowState.Starting) return;
 
@@ -22,8 +22,15 @@ public void Open(PlayerPad? player = null)
         si.FileName = Process.GetCurrentProcess().MainModule?.FileName;
         si.Arguments = "config";
 
-        if (player is not null)
-            si.Arguments += $" {player.Index}";
+        switch (player)
+        {
+            case { IsKeyboard: true }:
+                si.Arguments += " keyboard";
+                break;
+            case { Index: var index }:
+                si.Arguments += $" {index}";
+                break;
+        }
 
         if (IsOpen())
         {