Remove the utils in emu and merge it into the main utils

Author: acheron2302

crates/libmwemu/src/emu/mod.rs

@@ -49,8 +49,6 @@ mod threading;
 mod tls;
 mod trace;
 mod winapi;
-#[macro_use]
-mod utils;
 
 pub struct Emu {
     // Global/shared state

crates/libmwemu/src/emu/utils.rs

@@ -1,67 +0,0 @@
-#[macro_export]
-macro_rules! color {
-    ("Black") => {
-        "\x1b[0;30m"
-    };
-    ("Red") => {
-        "\x1b[0;31m"
-    };
-    ("Green") => {
-        "\x1b[0;32m"
-    };
-    ("Orange") => {
-        "\x1b[0;33m"
-    };
-    ("Blue") => {
-        "\x1b[0;34m"
-    };
-    ("Purple") => {
-        "\x1b[0;35m"
-    };
-    ("Cyan") => {
-        "\x1b[0;36m"
-    };
-    ("LightGray") => {
-        "\x1b[0;37m"
-    };
-    ("DarkGray") => {
-        "\x1b[1;30m"
-    };
-    ("LightRed") => {
-        "\x1b[1;31m"
-    };
-    ("LightGreen") => {
-        "\x1b[1;32m"
-    };
-    ("Yellow") => {
-        "\x1b[1;33m"
-    };
-    ("LightBlue") => {
-        "\x1b[1;34m"
-    };
-    ("LightPurple") => {
-        "\x1b[1;35m"
-    };
-    ("LightCyan") => {
-        "\x1b[1;36m"
-    };
-    ("White") => {
-        "\x1b[1;37m"
-    };
-    ("nc") => {
-        "\x1b[0m"
-    };
-    ("ClearScreen") => {
-        "\x1bc"
-    };
-    ($unknown:tt) => {
-        compile_error!(concat!(
-            "Unknown color name: '",
-            $unknown,
-            "'. Valid options are: \
-            Black, Red, Green, Orange, Blue, Purple, Cyan, LightGray, \
-            DarkGray, LightRed, LightGreen, Yellow, LightBlue, \
-            LightPurple, LightCyan, White, nc, ClearScreen"
-        ))
-    };
-}

crates/libmwemu/src/emu/utils/mod.rs

@@ -42,10 +42,12 @@ pub mod threading;
 pub mod tracing;
 pub mod winapi;
 
+// re-export the helper so the macro can reach it
+pub use utils::color_enabled;
+
 #[cfg(test)]
 mod tests;
 mod utils;
-
 use config::Config;
 use emu::Emu;
 

crates/libmwemu/src/lib.rs

@@ -1,3 +1,7 @@
+use std::sync::atomic::{AtomicBool, Ordering};
+
+static COLOR_ENABLED: AtomicBool = AtomicBool::new(true);
+
 // TODO: remove the code when 'likely' and 'unlikely' are stable
 #[inline(always)]
 #[cold]
@@ -21,4 +25,85 @@ pub(crate) fn unlikely(b: bool) -> bool {
     } else {
         false
     }
+}
+
+pub fn disable_color() {
+    COLOR_ENABLED.store(false, Ordering::Relaxed);
+}
+
+pub fn enable_color() {
+    COLOR_ENABLED.store(true, Ordering::Relaxed);
+}
+
+#[inline]
+pub fn color_enabled() -> bool {
+    COLOR_ENABLED.load(Ordering::Relaxed)
+}
+
+#[macro_export]
+macro_rules! color {
+    ("Black") => {
+        if $crate::color_enabled() { "\x1b[0;30m" } else { "" }
+    };
+    ("Red") => {
+        if $crate::color_enabled() { "\x1b[0;31m" } else { "" }
+    };
+    ("Green") => {
+        if $crate::color_enabled() { "\x1b[0;32m" } else { "" }
+    };
+    ("Orange") => {
+        if $crate::color_enabled() { "\x1b[0;33m" } else { "" }
+    };
+    ("Blue") => {
+        if $crate::color_enabled() { "\x1b[0;34m" } else { "" }
+    };
+    ("Purple") => {
+        if $crate::color_enabled() { "\x1b[0;35m" } else { "" }
+    };
+    ("Cyan") => {
+        if $crate::color_enabled() { "\x1b[0;36m" } else { "" }
+    };
+    ("LightGray") => {
+        if $crate::color_enabled() { "\x1b[0;37m" } else { "" }
+    };
+    ("DarkGray") => {
+        if $crate::color_enabled() { "\x1b[1;30m" } else { "" }
+    };
+    ("LightRed") => {
+        if $crate::color_enabled() { "\x1b[1;31m" } else { "" }
+    };
+    ("LightGreen") => {
+        if $crate::color_enabled() { "\x1b[1;32m" } else { "" }
+    };
+    ("Yellow") => {
+        if $crate::color_enabled() { "\x1b[1;33m" } else { "" }
+    };
+    ("LightBlue") => {
+        if $crate::color_enabled() { "\x1b[1;34m" } else { "" }
+    };
+    ("LightPurple") => {
+        if $crate::color_enabled() { "\x1b[1;35m" } else { "" }
+    };
+    ("LightCyan") => {
+        if $crate::color_enabled() { "\x1b[1;36m" } else { "" }
+    };
+    ("White") => {
+        if $crate::color_enabled() { "\x1b[1;37m" } else { "" }
+    };
+    ("nc") => {
+        if $crate::color_enabled() { "\x1b[0m" } else { "" }
+    };
+    ("ClearScreen") => {
+        if $crate::color_enabled() { "\x1bc" } else { "" }
+    };
+    ($unknown:tt) => {
+        compile_error!(concat!(
+            "Unknown color name: '",
+            $unknown,
+            "'. Valid options are: \
+            Black, Red, Green, Orange, Blue, Purple, Cyan, LightGray, \
+            DarkGray, LightRed, LightGreen, Yellow, LightBlue, \
+            LightPurple, LightCyan, White, nc, ClearScreen"
+        ))
+    };
 }