enhancement: Restore focus when exiting debugger

BlitterStudio · Feb 16, 2025 · 50195da · 50195da
1 parent 995b1de
commit 50195da
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/debug.cpp b/src/debug.cpp
@@ -113,6 +113,7 @@ void deactivate_debugger (void)
 	debugmem_enable();
 	debug_pc = 0xffffffff;
 	keybuf_ignore_next_release();
+	deactivate_console();
 }
 
 void activate_debugger (void)

diff --git a/src/include/sysdeps.h b/src/include/sysdeps.h
@@ -358,6 +358,7 @@ extern void close_console (void);
 extern void open_console(void);
 extern void reopen_console(void);
 extern void activate_console (void);
+extern void deactivate_console(void);
 extern void console_out (const TCHAR *);
 extern void console_out_f (const TCHAR *, ...);
 extern void console_flush (void);

diff --git a/src/osdep/writelog.cpp b/src/osdep/writelog.cpp
@@ -38,6 +38,7 @@ extern int lof_store;
 static int console_input_linemode = -1;
 int always_flush_log = 1;
 TCHAR* conlogfile = nullptr;
+static HWND previousactivewindow;
 
 #define WRITE_LOG_BUF_SIZE 4096
 
@@ -74,10 +75,20 @@ static void getconsole()
 	}
 }
 
+void deactivate_console(void)
+{
+	if (previousactivewindow) {
+		SDL_RaiseWindow(previousactivewindow);
+		previousactivewindow = NULL;
+	}
+}
+
 void activate_console()
 {
+	previousactivewindow = NULL;
 	if (!consoleopen)
 		return;
+	previousactivewindow = SDL_GetWindowFromID(SDL_GetWindowID(SDL_GetKeyboardFocus()));
 	//SetForegroundWindow(GetConsoleWindow());
 }