dave/multiboxer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(Program.cs): improve window activation logic and use Task.Delay for asynchronous operations

Browse Source
This commit is contained in:
PhatPhuckDave
2025-08-31 22:18:09 +02:00
parent 88005c2125
commit 62f92708c2
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
DD2Switcher/Program.cs
View File

@@ -217,17 +217,19 @@ namespace DD2Switcher {
Console.WriteLine($"Event detected in state: {CurrentState}, transitioning to WAITING_TO_ADVANCE"); Console.WriteLine($"Event detected in state: {CurrentState}, transitioning to WAITING_TO_ADVANCE");
CurrentState = SequenceState.WAITING_TO_ADVANCE; CurrentState = SequenceState.WAITING_TO_ADVANCE;
Console.WriteLine($"State changed to: {CurrentState}"); Console.WriteLine($"State changed to: {CurrentState}");
HandleWaitingToAdvance();
} }
private static void HandleWaitingToAdvance() { private static void HandleWaitingToAdvance() {
// Start timer to advance after N milliseconds // Start timer to advance after N milliseconds
Console.WriteLine($"Starting 500ms timer in WAITING_TO_ADVANCE state"); Console.WriteLine($"Starting 500ms timer in WAITING_TO_ADVANCE state");
System.Threading.Thread.Sleep(500); Task.Delay(500).ContinueWith(_ => {
if (CurrentState == SequenceState.WAITING_TO_ADVANCE) { if (CurrentState == SequenceState.WAITING_TO_ADVANCE) {
CurrentState = SequenceState.ADVANCE; CurrentState = SequenceState.ADVANCE;
Console.WriteLine($"Timer expired, transitioning to ADVANCE state"); Console.WriteLine($"Timer expired, transitioning to ADVANCE state");
HandleSequenceEvent(); HandleSequenceEvent();
} }
});
} }
private static void HandleAdvance() { private static void HandleAdvance() {
@@ -270,9 +272,20 @@ namespace DD2Switcher {
[DllImport("user32.dll")] [DllImport("user32.dll")]
public static extern bool SetForegroundWindow(IntPtr hWnd); public static extern bool SetForegroundWindow(IntPtr hWnd);
[DllImport("user32.dll")]
private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
[DllImport("user32.dll")]
private static extern bool BringWindowToTop(IntPtr hWnd);
[DllImport("user32.dll")]
private static extern IntPtr SetActiveWindow(IntPtr hWnd);
[DllImport("user32.dll")] [DllImport("user32.dll")]
private static extern short GetKeyState(int nVirtKey); private static extern short GetKeyState(int nVirtKey);
private const int SW_RESTORE = 9;
[DllImport("kernel32.dll", SetLastError = true)] [DllImport("kernel32.dll", SetLastError = true)]
[return:MarshalAs(UnmanagedType.Bool)] [return:MarshalAs(UnmanagedType.Bool)]
static extern bool AllocConsole(); static extern bool AllocConsole();
@@ -541,21 +554,10 @@ namespace DD2Switcher {
PushHistory(ActiveIndex); PushHistory(ActiveIndex);
Console.WriteLine($"Setting foreground window to: {window.ProcessName} PID:{window.Id}"); Console.WriteLine($"Setting foreground window to: {window.ProcessName} PID:{window.Id}");
bool result = SetForegroundWindow(window.MainWindowHandle); SetForegroundWindow(window.MainWindowHandle);
Console.WriteLine($"SetForegroundWindow result: {result}"); ShowWindow(window.MainWindowHandle, SW_RESTORE);
BringWindowToTop(window.MainWindowHandle);
// Force window to front with additional methods SetActiveWindow(window.MainWindowHandle);
if (result) {
// Bring window to front and activate it
SetForegroundWindow(window.MainWindowHandle);
System.Threading.Thread.Sleep(50); // Small delay
// Check if it actually worked
var currentForeground = GetForegroundWindow();
bool actuallySwitched = (currentForeground == window.MainWindowHandle);
Console.WriteLine(
$"Actually switched: {actuallySwitched} (Current: {currentForeground}, Target: {window.MainWindowHandle})");
}
ActiveIndex = index; ActiveIndex = index;
AdjustAffinities(); AdjustAffinities();