Gracefully handle errors in socket creation (#662)

In all other calls, exceptions are handled within the ManagedSocket
class, this can't easily be done here as the exception is thrown from
the constructor, so the exception is handled in ISocket and the correct
error is passed to the application.

This should fix #660

src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Ryujinx.Common.Configuration.Hid
 {
     public class KeyboardHotkeys
@@ -15,6 +13,5 @@ namespace Ryujinx.Common.Configuration.Hid
         public Key VolumeDown { get; set; }
         public Key CustomVSyncIntervalIncrement { get; set; }
         public Key CustomVSyncIntervalDecrement { get; set; }
-        public List<Key> CycleControllers { get; set; }
     }
 }

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs

@@ -34,6 +34,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
         {
             if (errorCode != LinuxError.SUCCESS)
             {
+                if (errorCode != LinuxError.EWOULDBLOCK)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Operation failed with error {errorCode}.");
+                }
                 result = -1;
             }
 
@@ -66,6 +70,8 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             BsdSocketType type = (BsdSocketType)context.RequestData.ReadInt32();
             ProtocolType protocol = (ProtocolType)context.RequestData.ReadInt32();
 
+            Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Creating socket with domain={domain}, type={type}, protocol={protocol}");
+
             BsdSocketCreationFlags creationFlags = (BsdSocketCreationFlags)((int)type >> (int)BsdSocketCreationFlags.FlagsShift);
             type &= BsdSocketType.TypeMask;
 
@@ -95,12 +101,21 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
                 }
             }
 
-            ISocket newBsdSocket = new ManagedSocket(netDomain, (SocketType)type, protocol, context.Device.Configuration.MultiplayerLanInterfaceId)
-            {
-                Blocking = !creationFlags.HasFlag(BsdSocketCreationFlags.NonBlocking),
-            };
-
             LinuxError errno = LinuxError.SUCCESS;
+            ISocket newBsdSocket;
+
+            try
+            {
+                newBsdSocket = new ManagedSocket(netDomain, (SocketType)type, protocol, context.Device.Configuration.MultiplayerLanInterfaceId)
+                {
+                    Blocking = !creationFlags.HasFlag(BsdSocketCreationFlags.NonBlocking),
+                };
+            }
+            catch (SocketException exception)
+            {
+                LinuxError errNo = WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
+                return WriteBsdResult(context, 0, errNo);
+            }
 
             int newSockFd = _context.RegisterFileDescriptor(newBsdSocket);
 
@@ -111,6 +126,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
 
             if (exempt)
             {
+                Logger.Info?.Print(LogClass.ServiceBsd, "Disconnecting exempt socket.");
                 newBsdSocket.Disconnect();
             }
 
@@ -797,7 +813,11 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             {
                 errno = socket.Listen(backlog);
             }
-
+            else
+            {
+                Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"Invalid socket fd '{socketFd}'.");
+            }
+            
             return WriteBsdResult(context, 0, errno);
         }
 

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs

@@ -92,18 +92,30 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 newSocket = new ManagedSocket(Socket.Accept());
 
+                IPEndPoint remoteEndPoint = newSocket.RemoteEndPoint;
+                bool isPrivateIp = remoteEndPoint.Address.ToString().StartsWith("192.168.");
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd,
+                    isPrivateIp
+                        ? $"Accepted connection from {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}"
+                        : $"Accepted connection from {ProtocolType}/***:{remoteEndPoint.Port}");
+
                 return LinuxError.SUCCESS;
             }
             catch (SocketException exception)
             {
                 newSocket = null;
 
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
 
         public LinuxError Bind(IPEndPoint localEndPoint)
         {
+            Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket binding to: {ProtocolType}/{localEndPoint.Port}");
             try
             {
                 Socket.Bind(localEndPoint);
@@ -112,6 +124,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -123,6 +139,15 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
 
         public LinuxError Connect(IPEndPoint remoteEndPoint)
         {
+            bool isLDNPrivateIP = remoteEndPoint.Address.ToString().StartsWith("192.168.");
+            if (isLDNPrivateIP)
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Connecting to: {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}");
+            }
+            else
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Connecting to: {ProtocolType}/***:{remoteEndPoint.Port}");
+            }
             try
             {
                 Socket.Connect(remoteEndPoint);
@@ -137,6 +162,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                 }
                 else
                 {
+                    if (exception.SocketErrorCode != SocketError.WouldBlock)
+                    {
+                        Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    }
                     return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
                 }
             }
@@ -144,11 +173,13 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
 
         public void Disconnect()
         {
+            Logger.Info?.Print(LogClass.ServiceBsd, "Socket disconnecting");
             Socket.Disconnect(true);
         }
 
         public void Dispose()
         {
+            Logger.Info?.Print(LogClass.ServiceBsd, "Socket closed");
             Socket.Close();
             Socket.Dispose();
         }
@@ -159,10 +190,16 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 Socket.Listen(backlog);
 
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket listening: {ProtocolType}/{(Socket.LocalEndPoint as IPEndPoint).Port}");
+
                 return LinuxError.SUCCESS;
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -182,11 +219,15 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
 
-        bool hasEmittedBlockingWarning = false;
+        private bool _hasEmittedBlockingWarning;
 
         public LinuxError Receive(out int receiveSize, Span<byte> buffer, BsdSocketFlags flags)
         {
@@ -202,10 +243,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                     shouldBlockAfterOperation = true;
                 }
 
-                if (Blocking && !hasEmittedBlockingWarning)
+                if (Blocking && !_hasEmittedBlockingWarning)
                 {
                     Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors.");
-                    hasEmittedBlockingWarning = true;
+                    _hasEmittedBlockingWarning = true;
                 }
 
                 receiveSize = Socket.Receive(buffer, ConvertBsdSocketFlags(flags));
@@ -214,6 +255,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 receiveSize = -1;
 
                 result = WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -245,10 +290,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                     shouldBlockAfterOperation = true;
                 }
 
-                if (Blocking && !hasEmittedBlockingWarning)
+                if (Blocking && !_hasEmittedBlockingWarning)
                 {
                     Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors.");
-                    hasEmittedBlockingWarning = true;
+                    _hasEmittedBlockingWarning = true;
                 }
 
                 if (!Socket.IsBound)
@@ -265,6 +310,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 receiveSize = -1;
 
                 result = WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -288,6 +337,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 sendSize = -1;
 
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -304,6 +357,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 sendSize = -1;
 
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -341,6 +398,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -387,6 +448,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -519,6 +584,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -557,6 +626,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs

@@ -1,4 +1,6 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy;
+using Ryujinx.HLE.HOS.Services.Sockets.Bsd.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -64,10 +66,18 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Proxy
             {
                 if (_proxy.Supported(domain, type, protocol))
                 {
+                    Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket is using LDN proxy");
                     return new LdnProxySocket(domain, type, protocol, _proxy);
                 }
+                else
+                {
+                    Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"LDN proxy does not support socket {domain}, {type}, {protocol}");
+                }
+            }
+            else
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Opening socket using host networking stack");
             }
-
             return new DefaultSocket(domain, type, protocol, lanInterfaceId);
         }
     }

src/Ryujinx/AppHost.cs

@@ -40,7 +40,6 @@ using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.HLE.HOS.Services.Hid;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
@@ -50,7 +49,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -1311,18 +1309,6 @@ namespace Ryujinx.Ava
 
                             _viewModel.Volume = Device.GetVolume();
                             break;
-                        case KeyboardHotkeyState.CycleControllersPlayer1:
-                        case KeyboardHotkeyState.CycleControllersPlayer2:
-                        case KeyboardHotkeyState.CycleControllersPlayer3:
-                        case KeyboardHotkeyState.CycleControllersPlayer4:
-                        case KeyboardHotkeyState.CycleControllersPlayer5:
-                        case KeyboardHotkeyState.CycleControllersPlayer6:
-                        case KeyboardHotkeyState.CycleControllersPlayer7:
-                        case KeyboardHotkeyState.CycleControllersPlayer8:
-                            var player = currentHotkeyState - KeyboardHotkeyState.CycleControllersPlayer1;
-                            var ivm = new UI.ViewModels.Input.InputViewModel();
-                            Dispatcher.UIThread.Invoke(() => ivm.CyclePlayerDevice(player));
-                            break;
                         case KeyboardHotkeyState.None:
                             (_keyboardInterface as AvaloniaKeyboard).Clear();
                             break;
@@ -1405,15 +1391,6 @@ namespace Ryujinx.Ava
                 state = KeyboardHotkeyState.CustomVSyncIntervalDecrement;
             }
 
-            foreach (var cycle in ConfigurationState.Instance.Hid.Hotkeys.Value.CycleControllers?.Select((value, index) => (value, index)) ?? [])
-            {
-                if (_keyboardInterface.IsPressed((Key)cycle.value))
-                {
-                    state = KeyboardHotkeyState.CycleControllersPlayer1 + cycle.index;
-                    break;
-                }
-            }
-
             return state;
         }
     }

src/Ryujinx/Assets/locales.json

@@ -5947,31 +5947,6 @@
         "zh_TW": "啟用警告日誌"
       }
     },
-    {
-      "ID": "SettingsTabHotkeysCycleControllers",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Cycle Controllers",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "SettingsTabLoggingEnableErrorLogs",
       "Translations": {

src/Ryujinx/Common/KeyboardHotkeyState.cs

@@ -14,13 +14,5 @@ namespace Ryujinx.Ava.Common
         VolumeDown,
         CustomVSyncIntervalIncrement,
         CustomVSyncIntervalDecrement,
-        CycleControllersPlayer1,
-        CycleControllersPlayer2,
-        CycleControllersPlayer3,
-        CycleControllersPlayer4,
-        CycleControllersPlayer5,
-        CycleControllersPlayer6,
-        CycleControllersPlayer7,
-        CycleControllersPlayer8
     }
 }

src/Ryujinx/DiscordIntegrationModule.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.Ava
 
         private static readonly string _description =
             ReleaseInformation.IsValid
-                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}@{ReleaseInformation.BuildGitHash}"
+                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}"
                 : "dev build";
 
         private const string ApplicationId = "1293250299716173864";

src/Ryujinx/UI/Models/Input/HotkeyConfig.cs

@@ -1,11 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using DynamicData;
-using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows.Input;
 
 namespace Ryujinx.Ava.UI.Models.Input
 {
@@ -33,15 +28,8 @@ namespace Ryujinx.Ava.UI.Models.Input
 
         [ObservableProperty] private Key _customVSyncIntervalDecrement;
 
-        public ObservableCollection<CycleController> CycleControllers { get; set; } = new ObservableCollection<CycleController>();
-        public ICommand AddCycleController { get; set; }
-        public ICommand RemoveCycleController { get; set; }
-        public bool CanRemoveCycleController => CycleControllers.Count > 0 && CycleControllers.Count < 8;
-
         public HotkeyConfig(KeyboardHotkeys config)
         {
-            AddCycleController = MiniCommand.Create(() => CycleControllers.Add(new CycleController(CycleControllers.Count + 1, Key.Unbound)));
-            RemoveCycleController = MiniCommand.Create(() => CycleControllers.Remove(CycleControllers.Last()));
             if (config == null)
                 return;
 
@@ -56,7 +44,6 @@ namespace Ryujinx.Ava.UI.Models.Input
             VolumeDown = config.VolumeDown;
             CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
             CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
-            CycleControllers.AddRange((config.CycleControllers ?? []).Select((x, i) => new CycleController(i + 1, x)));
         }
 
         public KeyboardHotkeys GetConfig() =>
@@ -73,7 +60,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                 VolumeDown = VolumeDown,
                 CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                 CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
-                CycleControllers = CycleControllers.Select(x => x.Hotkey).ToList()
             };
     }
 }

src/Ryujinx/UI/ViewModels/CycleController.cs

@@ -1,48 +0,0 @@
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Common.Configuration.Hid;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public class CycleController : BaseModel
-    {
-        private string _player;
-        private Key _hotkey;
-
-        public string Player
-        {
-            get => _player;
-            set
-            {
-                _player = value;
-                OnPropertyChanged(nameof(Player));
-            }
-        }
-
-        public Key Hotkey
-        {
-            get => _hotkey;
-            set
-            {
-                _hotkey = value;
-                OnPropertyChanged(nameof(Hotkey));
-            }
-        }
-
-        public CycleController(int v, Key x)
-        {
-            Player = v switch
-            {
-                1 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer1],
-                2 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer2],
-                3 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer3],
-                4 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer4],
-                5 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer5],
-                6 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer6],
-                7 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer7],
-                8 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer8],
-                _ => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer] + " " + v
-            };
-            Hotkey = x;
-        }
-    }
-}

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -897,13 +897,5 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             AvaloniaKeyboardDriver.Dispose();
         }
-
-        public void CyclePlayerDevice(int player)
-        {
-            LoadDevices();
-            PlayerId = (PlayerIndex)player;
-            Device = (Device + 1) % Devices.Count;
-            Save();
-        }
     }
 }

src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsHotkeysView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -15,18 +15,17 @@
         <viewModels:SettingsViewModel />
     </Design.DataContext>
     <UserControl.Styles>
-        <Style Selector="StackPanel StackPanel">
+        <Style Selector="StackPanel > StackPanel">
             <Setter Property="Margin" Value="10, 0, 0, 0" />
             <Setter Property="Orientation" Value="Horizontal" />
         </Style>
-        <Style Selector="StackPanel StackPanel > TextBlock">
+        <Style Selector="StackPanel > StackPanel > TextBlock">
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="Width" Value="230" />
         </Style>
-        <Style Selector="ToggleButton, Button">
+        <Style Selector="ToggleButton">
             <Setter Property="Width" Value="90" />
             <Setter Property="Height" Value="27" />
-            <Setter Property="Padding" Value="0,5,0,5" /> <!-- Added vertical padding -->
         </Style>
         <Style Selector="ToggleButton > TextBlock">
             <Setter Property="TextAlignment" Value="Center" />
@@ -40,123 +39,79 @@
         VerticalScrollBarVisibility="Auto">
         <Border Classes="settings">
             <StackPanel
+                Name="SettingButtons"
                 Margin="10"
-                HorizontalAlignment="Stretch"
                 Orientation="Vertical"
-                Spacing="10"
-                Name="SettingButtons">
+                Spacing="10">
                 <TextBlock
                     Classes="h1"
                     Text="{ext:Locale SettingsTabHotkeysHotkeys}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    Spacing="10"
-                    Orientation="Vertical">
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" />
-                        <ToggleButton Name="ToggleVSyncMode">
-                            <TextBlock Text="{Binding KeyboardHotkey.ToggleVSyncMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
-                        <ToggleButton Name="Screenshot">
-                            <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
-                        <ToggleButton Name="ShowUI">
-                            <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
-                        <ToggleButton Name="Pause">
-                            <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
-                        <ToggleButton Name="ToggleMute">
-                            <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
-                        <ToggleButton Name="ResScaleUp">
-                            <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
-                        <ToggleButton Name="ResScaleDown">
-                            <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
-                        <ToggleButton Name="VolumeUp">
-                            <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
-                        <ToggleButton Name="VolumeDown">
-                            <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" />
-                        <ToggleButton Name="CustomVSyncIntervalIncrement">
-                            <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalIncrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" />
-                        <ToggleButton Name="CustomVSyncIntervalDecrement">
-                            <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalDecrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                        </ToggleButton>
-                    </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" />
+                    <ToggleButton Name="ToggleVSyncMode">
+                        <TextBlock Text="{Binding KeyboardHotkey.ToggleVSyncMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
                 </StackPanel>
-                <Separator Height="1" />
-                <StackPanel Margin="0">
-                    <TextBlock
-                        Classes="h1"
-                        Text="{ext:Locale SettingsTabHotkeysCycleControllers}" />
-                    <StackPanel Orientation="Horizontal" Spacing="10">
-                        <Button
-                            Content="{ext:Locale SettingsTabGeneralAdd}"
-                            Margin="10,0,0,0"
-                            Command="{Binding KeyboardHotkey.AddCycleController}" />
-                        <Button
-                            Content="{ext:Locale SettingsTabGeneralRemove}"
-                            IsEnabled="{Binding KeyboardHotkey.CanRemoveCycleController}"
-                            Command="{Binding KeyboardHotkey.RemoveCycleController}" />
-                    </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
+                    <ToggleButton Name="Screenshot">
+                        <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
+                    <ToggleButton Name="ShowUI">
+                        <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
+                    <ToggleButton Name="Pause">
+                        <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
+                    <ToggleButton Name="ToggleMute">
+                        <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
+                    <ToggleButton Name="ResScaleUp">
+                        <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
+                    <ToggleButton Name="ResScaleDown">
+                        <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
+                    <ToggleButton Name="VolumeUp">
+                        <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
+                    <ToggleButton Name="VolumeDown">
+                        <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" />
+                    <ToggleButton Name="CustomVSyncIntervalIncrement">
+                        <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalIncrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" />
+                    <ToggleButton Name="CustomVSyncIntervalDecrement">
+                        <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalDecrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
+                    </ToggleButton>
                 </StackPanel>
-                <ItemsControl ItemsSource="{Binding KeyboardHotkey.CycleControllers}"
-                    Name="CycleControllers">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel
-                                Margin="10,0,0,0"
-                                Orientation="Vertical"
-                                Spacing="10" />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel>
-                                <TextBlock Text="{Binding Player}" />
-                                <ToggleButton>
-                                    <TextBlock
-                                        Text="{Binding Hotkey, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                                </ToggleButton>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
             </StackPanel>
         </Border>
    </ScrollViewer>

src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs

@@ -3,14 +3,11 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
-using DynamicData;
 using Ryujinx.Ava.Input;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Linq;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
@@ -24,21 +21,16 @@ namespace Ryujinx.Ava.UI.Views.Settings
         public SettingsHotkeysView()
         {
             InitializeComponent();
-            RegisterEvents();
-            _avaloniaKeyboardDriver = new AvaloniaKeyboardDriver(this);
-            CycleControllers.LayoutUpdated += (_, _1) => RegisterEvents();
-        }
 
-        private void RegisterEvents()
-        {
             foreach (ILogical visual in SettingButtons.GetLogicalDescendants())
             {
                 if (visual is ToggleButton button and not CheckBox)
                 {
-                    button.IsCheckedChanged -= Button_IsCheckedChanged;
                     button.IsCheckedChanged += Button_IsCheckedChanged;
                 }
             }
+
+            _avaloniaKeyboardDriver = new AvaloniaKeyboardDriver(this);
         }
 
         protected override void OnPointerReleased(PointerReleasedEventArgs e)
@@ -124,13 +116,6 @@ namespace Ryujinx.Ava.UI.Views.Settings
                                     case "CustomVSyncIntervalDecrement":
                                         viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = buttonValue.AsHidType<Key>();
                                         break;
-                                    default:
-                                        var index = button.FindAncestorOfType<ItemsControl>().GetLogicalDescendants().OfType<ToggleButton>().IndexOf(button);
-                                        if (index >= 0 && viewModel.KeyboardHotkey.CycleControllers != null)
-                                        {
-                                            viewModel.KeyboardHotkey.CycleControllers[index].Hotkey = buttonValue.AsHidType<Key>();
-                                        }
-                                        break;
                                 }
                             }
                         };