From 6e84fc2043bd6b4ce2076a870ddd7f88e5a77909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Sun, 4 Dec 2022 20:43:57 +0100 Subject: [PATCH] Add additional debug information --- SteamController/Context.cs | 11 +++++++- SteamController/Managers/SteamManager.cs | 32 ++++++++++++++++-------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/SteamController/Context.cs b/SteamController/Context.cs index 5b075a0..80c08b8 100644 --- a/SteamController/Context.cs +++ b/SteamController/Context.cs @@ -29,6 +29,15 @@ namespace SteamController { get { return GameProcessRunning || SteamUsesSteamInput || SteamUsesSteamInput; } } + + public override string ToString() + { + string reason = "state"; + if (GameProcessRunning) reason += " game"; + if (SteamUsesX360Controller) reason += " steamX360"; + if (SteamUsesSteamInput) reason += " steamInput"; + return reason; + } } public bool RequestEnable { get; set; } = true; @@ -151,7 +160,7 @@ namespace SteamController if (current.IsDesktop) { - TraceLine("Context: SelectController"); + TraceLine("Context: SelectController. State={0}", State); SelectNext(); } } diff --git a/SteamController/Managers/SteamManager.cs b/SteamController/Managers/SteamManager.cs index 7464f2e..9c8d597 100644 --- a/SteamController/Managers/SteamManager.cs +++ b/SteamController/Managers/SteamManager.cs @@ -5,7 +5,7 @@ namespace SteamController.Managers { public sealed class SteamManager : Manager { - private bool lastState; + private string? lastState; public override void Tick(Context context) { @@ -13,15 +13,15 @@ namespace SteamController.Managers { context.State.SteamUsesSteamInput = false; context.State.SteamUsesX360Controller = false; - lastState = false; + lastState = null; return; } - var usesController = UsesController() ?? false; + var usesController = UsesController(); if (lastState == usesController) return; - if (usesController) + if (usesController is not null) { context.State.SteamUsesSteamInput = Helpers.SteamConfiguration.IsControllerBlacklisted( Devices.SteamController.VendorID, @@ -40,17 +40,29 @@ namespace SteamController.Managers } lastState = usesController; + +#if DEBUG + CommonHelpers.Log.TraceLine( + "SteamManager: uses={0}, isRunning={1}, usesSteamInput={2}, usesX360={3}", + usesController, + SteamConfiguration.IsRunning, + context.State.SteamUsesSteamInput, + context.State.SteamUsesX360Controller + ); +#endif } - private bool? UsesController() + private string? UsesController() { if (!SteamConfiguration.IsRunning) return null; - - return - SteamConfiguration.IsBigPictureMode.GetValueOrDefault(false) || - SteamConfiguration.IsRunningGame.GetValueOrDefault(false) || - SteamConfiguration.IsGamePadUI; + if (SteamConfiguration.IsBigPictureMode.GetValueOrDefault(false)) + return "bigpicture"; + if (SteamConfiguration.IsRunningGame.GetValueOrDefault(false)) + return "game"; + if (SteamConfiguration.IsGamePadUI) + return "gamepadui"; + return null; } } }