feat: subsystem toggling via feature, release mode console allocation with ANSI, desktop file subscriber

.gitignore

@@ -20,3 +20,6 @@ coverage.html
 # Profiling output
 flamegraph.svg
 /profile.*
+
+# Logs
+*.log

Cargo.toml

@@ -100,5 +100,10 @@ x86_64-unknown-linux-gnu = { triplet = "x64-linux" }
 x86_64-apple-darwin = { triplet = "x64-osx" }
 aarch64-apple-darwin = { triplet = "arm64-osx" }
 
+[features]
+# Windows-specific features
+force-console = []
+default = []
+
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage,coverage_nightly)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage,coverage_nightly)', 'cfg(use_console)'] }

build.rs

@@ -51,4 +51,11 @@ fn main() {
 
     writeln!(&mut file, "}};").unwrap();
     println!("cargo:rerun-if-changed=assets/game/atlas.json");
+
+    #[cfg(target_os = "windows")]
+    {
+        if cfg!(any(feature = "force-console", debug_assertions)) {
+            println!("cargo:rustc-cfg=use_console");
+        }
+    }
 }

src/main.rs

@@ -1,8 +1,10 @@
-// Note: This disables the console window on Windows. We manually re-attach to the parent terminal or process later on.
+#![cfg_attr(all(not(use_console), target_os = "windows"), windows_subsystem = "windows")]
-#![windows_subsystem = "windows"]
+#![cfg_attr(all(use_console, target_os = "windows"), windows_subsystem = "console")]
 #![cfg_attr(coverage_nightly, feature(coverage_attribute))]
 #![cfg_attr(coverage_nightly, coverage(off))]
 
+use std::env;
+
 use crate::{app::App, constants::LOOP_TIME};
 use tracing::info;
 
@@ -32,9 +34,12 @@ mod texture;
 /// This function initializes SDL, the window, the game state, and then enters
 /// the main game loop.
 pub fn main() {
-    // On Windows, this connects output streams to the console dynamically
+    // Parse command line arguments
+    let args: Vec<String> = env::args().collect();
+    let force_console = args.iter().any(|arg| arg == "--console" || arg == "-c");
+
     // On Emscripten, this connects the subscriber to the browser console
-    platform::init_console().expect("Could not initialize console");
+    platform::init_console(force_console).expect("Could not initialize console");
 
     let mut app = App::new().expect("Could not create app");
 

src/platform/desktop.rs

@@ -20,41 +20,83 @@ pub fn sleep(duration: Duration, focused: bool) {
     }
 }
 
-pub fn init_console() -> Result<(), PlatformError> {
+pub fn init_console(force_console: bool) -> Result<(), PlatformError> {
+    use crate::formatter::CustomFormatter;
+    use tracing::Level;
+    use tracing_error::ErrorLayer;
+    use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, Layer};
+
+    // Create a file layer
+    let log_file = std::fs::File::create("pacman.log")
+        .map_err(|e| PlatformError::ConsoleInit(format!("Failed to create log file: {}", e)))?;
+    let file_layer = fmt::layer()
+        .with_ansi(false)
+        .with_writer(log_file)
+        .event_format(CustomFormatter)
+        .with_filter(tracing_subscriber::filter::LevelFilter::from_level(Level::DEBUG))
+        .boxed();
+
     #[cfg(windows)]
     {
-        use crate::platform::tracing_buffer::setup_switchable_subscriber;
+        // If using windows subsystem, and force_console is true, allocate a new console window
-        use tracing::{debug, info, trace};
+        if force_console && cfg!(not(use_console)) {
-        use windows::Win32::System::Console::GetConsoleWindow;
+            use crate::platform::tracing_buffer::{SwitchableMakeWriter, SwitchableWriter};
 
-        // Setup buffered tracing subscriber that will buffer logs until console is ready
+            // Setup deferred tracing subscriber that will buffer logs until console is ready
-        let switchable_writer = setup_switchable_subscriber();
+            let switchable_writer = SwitchableWriter::default();
+            let make_writer = SwitchableMakeWriter::new(switchable_writer.clone());
+            let console_layer = fmt::layer()
+                .with_ansi(true)
+                .with_writer(make_writer)
+                .event_format(CustomFormatter)
+                .with_filter(tracing_subscriber::filter::LevelFilter::from_level(Level::DEBUG))
+                .boxed();
 
-        // Check if we already have a console window
+            tracing_subscriber::registry()
-        if unsafe { !GetConsoleWindow().0.is_null() } {
+                .with(console_layer)
-            debug!("Already have a console window");
+                .with(file_layer)
-            return Ok(());
+                .with(ErrorLayer::default())
+                .init();
+
+            // Enable virtual terminal processing for ANSI colors
+            allocate_console()?;
+            enable_ansi_support()?;
+
+            switchable_writer
+                .switch_to_direct_mode()
+                .map_err(|e| PlatformError::ConsoleInit(format!("Failed to switch to direct mode: {}", e)))?;
         } else {
-            trace!("No existing console window found");
+            // Set up tracing subscriber with ANSI colors enabled
+            let console_layer = fmt::layer()
+                .with_ansi(true)
+                .with_writer(std::io::stdout)
+                .event_format(CustomFormatter)
+                .with_filter(tracing_subscriber::filter::LevelFilter::from_level(Level::DEBUG))
+                .boxed();
+
+            tracing_subscriber::registry()
+                .with(console_layer)
+                .with(file_layer)
+                .with(ErrorLayer::default())
+                .init();
         }
+    }
 
-        if let Some(file_type) = is_output_setup()? {
+    #[cfg(not(windows))]
-            trace!(r#type = file_type, "Existing output detected");
+    {
-        } else {
+        // Set up tracing subscriber with ANSI colors enabled
-            trace!("No existing output detected");
+        let console_layer = fmt::layer()
+            .with_ansi(true)
+            .with_writer(std::io::stdout)
+            .event_format(CustomFormatter)
+            .with_filter(tracing_subscriber::filter::LevelFilter::from_level(Level::DEBUG))
+            .boxed();
 
-            // Try to attach to parent console for direct cargo run
+        tracing_subscriber::registry()
-            attach_to_parent_console()?;
+            .with(console_layer)
-            info!("Successfully attached to parent console");
+            .with(file_layer)
-        }
+            .with(ErrorLayer::default())
-
+            .init();
-        // Now that console is initialized, flush buffered logs and switch to direct output
-        trace!("Switching to direct logging mode and flushing buffer...");
-        if let Err(error) = switchable_writer.switch_to_direct_mode() {
-            use tracing::warn;
-
-            warn!("Failed to flush buffered logs to console: {error:?}");
-        }
     }
 
     Ok(())
@@ -64,73 +106,66 @@ pub fn rng() -> ThreadRng {
     rand::rng()
 }
 
-/* Internal functions */
+/// Enable ANSI escape sequence support in the Windows console
-
-/// Check if the output stream has been setup by a parent process
 /// Windows-only
 #[cfg(windows)]
-fn is_output_setup() -> Result<Option<&'static str>, PlatformError> {
+fn enable_ansi_support() -> Result<(), PlatformError> {
-    use tracing::{trace, warn};
+    use windows::Win32::System::Console::{
-
+        GetConsoleMode, GetStdHandle, SetConsoleMode, CONSOLE_MODE, ENABLE_VIRTUAL_TERMINAL_PROCESSING, STD_ERROR_HANDLE,
-    use windows::Win32::Storage::FileSystem::{
+        STD_OUTPUT_HANDLE,
-        GetFileType, FILE_TYPE_CHAR, FILE_TYPE_DISK, FILE_TYPE_PIPE, FILE_TYPE_REMOTE, FILE_TYPE_UNKNOWN,
     };
 
-    use windows_sys::Win32::{
+    // Enable ANSI processing for stdout
-        Foundation::INVALID_HANDLE_VALUE,
+    unsafe {
-        System::Console::{GetStdHandle, STD_OUTPUT_HANDLE},
+        let stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE)
-    };
+            .map_err(|e| PlatformError::ConsoleInit(format!("Failed to get stdout handle: {:?}", e)))?;
 
-    // Get the process's standard output handle, check if it's invalid
+        let mut console_mode = CONSOLE_MODE(0);
-    let handle = match unsafe { GetStdHandle(STD_OUTPUT_HANDLE) } {
+        GetConsoleMode(stdout_handle, &mut console_mode)
-        INVALID_HANDLE_VALUE => {
+            .map_err(|e| PlatformError::ConsoleInit(format!("Failed to get console mode: {:?}", e)))?;
-            return Err(PlatformError::ConsoleInit("Invalid handle".to_string()));
-        }
-        handle => handle,
-    };
 
-    // Identify the file type of the handle and whether it's 'well known' (i.e. we trust it to be a reasonable output destination)
+        console_mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-    let (well_known, file_type) = match unsafe {
+        SetConsoleMode(stdout_handle, console_mode)
-        use windows::Win32::Foundation::HANDLE;
+            .map_err(|e| PlatformError::ConsoleInit(format!("Failed to enable ANSI for stdout: {:?}", e)))?;
-        GetFileType(HANDLE(handle))
+    }
-    } {
-        FILE_TYPE_PIPE => (true, "pipe"),
-        FILE_TYPE_CHAR => (true, "char"),
-        FILE_TYPE_DISK => (true, "disk"),
-        FILE_TYPE_UNKNOWN => (false, "unknown"),
-        FILE_TYPE_REMOTE => (false, "remote"),
-        unexpected => {
-            warn!("Unexpected file type: {unexpected:?}");
-            (false, "unknown")
-        }
-    };
 
-    trace!("File type: {file_type:?}, well known: {well_known}");
+    // Enable ANSI processing for stderr
+    unsafe {
+        let stderr_handle = GetStdHandle(STD_ERROR_HANDLE)
+            .map_err(|e| PlatformError::ConsoleInit(format!("Failed to get stderr handle: {:?}", e)))?;
 
-    // If it's anything recognizable and valid, assume that a parent process has setup an output stream
+        let mut console_mode = CONSOLE_MODE(0);
-    Ok(well_known.then_some(file_type))
+        GetConsoleMode(stderr_handle, &mut console_mode)
+            .map_err(|e| PlatformError::ConsoleInit(format!("Failed to get console mode: {:?}", e)))?;
+
+        console_mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+        SetConsoleMode(stderr_handle, console_mode)
+            .map_err(|e| PlatformError::ConsoleInit(format!("Failed to enable ANSI for stderr: {:?}", e)))?;
+    }
+
+    Ok(())
 }
 
-/// Try to attach to parent console
+/// Allocate a new console window for the process
 /// Windows-only
 #[cfg(windows)]
-fn attach_to_parent_console() -> Result<(), PlatformError> {
+fn allocate_console() -> Result<(), PlatformError> {
     use windows::{
         core::PCSTR,
         Win32::{
             Foundation::{GENERIC_READ, GENERIC_WRITE},
             Storage::FileSystem::{CreateFileA, FILE_FLAGS_AND_ATTRIBUTES, FILE_SHARE_READ, FILE_SHARE_WRITE, OPEN_EXISTING},
-            System::Console::{
+            System::Console::{AllocConsole, SetStdHandle, STD_ERROR_HANDLE, STD_INPUT_HANDLE, STD_OUTPUT_HANDLE},
-                AttachConsole, FreeConsole, SetStdHandle, ATTACH_PARENT_PROCESS, STD_ERROR_HANDLE, STD_OUTPUT_HANDLE,
-            },
         },
     };
 
-    // Attach the process to the parent's console
+    // Allocate a new console for this process
-    unsafe { AttachConsole(ATTACH_PARENT_PROCESS) }
+    unsafe { AllocConsole() }.map_err(|e| PlatformError::ConsoleInit(format!("Failed to allocate console: {:?}", e)))?;
-        .map_err(|e| PlatformError::ConsoleInit(format!("Failed to attach to parent console: {:?}", e)))?;
 
-    let handle = unsafe {
+    // Note: SetConsoleTitle is not available in the imported modules, skipping title setting
+
+    // Redirect stdout
+    let stdout_handle = unsafe {
         let pcstr = PCSTR::from_raw(c"CONOUT$".as_ptr() as *const u8);
         CreateFileA::<PCSTR>(
             pcstr,
@@ -142,28 +177,32 @@ fn attach_to_parent_console() -> Result<(), PlatformError> {
             None,
         )
     }
-    .map_err(|e| PlatformError::ConsoleInit(format!("Failed to create console handle: {:?}", e)))?;
+    .map_err(|e| PlatformError::ConsoleInit(format!("Failed to create stdout handle: {:?}", e)))?;
 
-    // Set the console's output and then error handles
+    // Redirect stdin
-    if let Some(handle_error) = unsafe { SetStdHandle(STD_OUTPUT_HANDLE, handle) }
+    let stdin_handle = unsafe {
-        .map_err(|e| PlatformError::ConsoleInit(format!("Failed to set console output handle: {:?}", e)))
+        let pcstr = PCSTR::from_raw(c"CONIN$".as_ptr() as *const u8);
-        .and_then(|_| {
+        CreateFileA::<PCSTR>(
-            unsafe { SetStdHandle(STD_ERROR_HANDLE, handle) }
+            pcstr,
-                .map_err(|e| PlatformError::ConsoleInit(format!("Failed to set console error handle: {:?}", e)))
+            (GENERIC_READ | GENERIC_WRITE).0,
-        })
+            FILE_SHARE_READ | FILE_SHARE_WRITE,
-        .err()
+            None,
-    {
+            OPEN_EXISTING,
-        // If either set handle call fails, free the console
+            FILE_FLAGS_AND_ATTRIBUTES(0),
-        unsafe { FreeConsole() }
+            None,
-            // Free the console if the SetStdHandle calls fail
+        )
-            .map_err(|free_error| {
-                PlatformError::ConsoleInit(format!(
-                    "Failed to free console after SetStdHandle failed: {free_error:?} ({handle_error:?})"
-                ))
-            })
-            // And then return the original error if the FreeConsole call succeeds
-            .and(Err(handle_error))?;
     }
+    .map_err(|e| PlatformError::ConsoleInit(format!("Failed to create stdin handle: {:?}", e)))?;
+
+    // Set the standard handles
+    unsafe { SetStdHandle(STD_OUTPUT_HANDLE, stdout_handle) }
+        .map_err(|e| PlatformError::ConsoleInit(format!("Failed to set stdout handle: {:?}", e)))?;
+
+    unsafe { SetStdHandle(STD_ERROR_HANDLE, stdout_handle) }
+        .map_err(|e| PlatformError::ConsoleInit(format!("Failed to set stderr handle: {:?}", e)))?;
+
+    unsafe { SetStdHandle(STD_INPUT_HANDLE, stdin_handle) }
+        .map_err(|e| PlatformError::ConsoleInit(format!("Failed to set stdin handle: {:?}", e)))?;
 
     Ok(())
 }

src/platform/emscripten.rs

@@ -19,7 +19,7 @@ pub fn sleep(duration: Duration, _focused: bool) {
     }
 }
 
-pub fn init_console() -> Result<(), PlatformError> {
+pub fn init_console(_force_console: bool) -> Result<(), PlatformError> {
     use tracing_subscriber::{fmt, layer::SubscriberExt, EnvFilter};
 
     // Set up a custom tracing subscriber that writes directly to emscripten console

src/platform/tracing_buffer.rs

@@ -1,14 +1,11 @@
 //! Buffered tracing setup for handling logs before console attachment.
 
-use crate::formatter::CustomFormatter;
 use parking_lot::Mutex;
 use std::io;
 use std::io::Write;
 use std::sync::Arc;
-use tracing::{debug, Level};
+use tracing::debug;
-use tracing_error::ErrorLayer;
 use tracing_subscriber::fmt::MakeWriter;
-use tracing_subscriber::layer::SubscriberExt;
 
 /// A thread-safe buffered writer that stores logs in memory until flushed.
 #[derive(Clone)]
@@ -76,7 +73,7 @@ impl SwitchableWriter {
             // Get buffer size before flushing for debug logging
             let buffer_size = self.buffered_writer.buffer_size();
 
-            // Flush any buffered content
+            // Flush any buffered content to stdout only
             self.buffered_writer.flush_to(io::stdout())?;
 
             // Switch to direct mode (and drop the lock)
@@ -130,23 +127,3 @@ impl<'a> MakeWriter<'a> for SwitchableMakeWriter {
         self.writer.clone()
     }
 }
-
-/// Sets up a switchable tracing subscriber that can transition from buffered to direct output.
-///
-/// Returns the switchable writer that can be used to control the behavior.
-pub fn setup_switchable_subscriber() -> SwitchableWriter {
-    let switchable_writer = SwitchableWriter::default();
-    let make_writer = SwitchableMakeWriter::new(switchable_writer.clone());
-
-    let _subscriber = tracing_subscriber::fmt()
-        .with_ansi(cfg!(not(target_os = "emscripten")))
-        .with_max_level(Level::DEBUG)
-        .event_format(CustomFormatter)
-        .with_writer(make_writer)
-        .finish()
-        .with(ErrorLayer::default());
-
-    tracing::subscriber::set_global_default(_subscriber).expect("Could not set global default switchable subscriber");
-
-    switchable_writer
-}