diff --git a/src/spice2x/launcher/logger.cpp b/src/spice2x/launcher/logger.cpp index d0628d9..8c5ad67 100644 --- a/src/spice2x/launcher/logger.cpp +++ b/src/spice2x/launcher/logger.cpp @@ -12,9 +12,11 @@ #include "launcher/launcher.h" #include "util/utils.h" -#define FOREGROUND_GREY (8) -#define FOREGROUND_WHITE (FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN) -#define FOREGROUND_YELLOW (FOREGROUND_RED | FOREGROUND_GREEN) +#define FOREGROUND_GREY (8) +#define FOREGROUND_WHITE (FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN) +#define FOREGROUND_YELLOW (FOREGROUND_RED | FOREGROUND_GREEN) +#define FOREGROUND_CYAN (FOREGROUND_GREEN | FOREGROUND_BLUE) +#define FOREGROUND_MAGENTA (FOREGROUND_RED | FOREGROUND_BLUE) namespace logger { @@ -103,9 +105,6 @@ namespace logger { last_style = content.second; switch (content.second) { - case Style::DEFAULT: - set_console_color(hTerminal, FOREGROUND_WHITE); - break; case Style::GREY: set_console_color(hTerminal, FOREGROUND_GREY); break; @@ -115,6 +114,13 @@ namespace logger { case Style::RED: set_console_color(hTerminal, FOREGROUND_RED); break; + case Style::SPECIAL: + set_console_color(hTerminal, FOREGROUND_CYAN); + break; + case Style::DEFAULT: + default: + set_console_color(hTerminal, FOREGROUND_WHITE); + break; } } diff --git a/src/spice2x/launcher/logger.h b/src/spice2x/launcher/logger.h index 3214ba7..665a0af 100644 --- a/src/spice2x/launcher/logger.h +++ b/src/spice2x/launcher/logger.h @@ -12,7 +12,8 @@ namespace logger { DEFAULT = 0, GREY = 1, YELLOW = 2, - RED = 3 + RED = 3, + SPECIAL = 4, }; void start(); diff --git a/src/spice2x/util/deferlog.cpp b/src/spice2x/util/deferlog.cpp index 3723d5a..4a2d295 100644 --- a/src/spice2x/util/deferlog.cpp +++ b/src/spice2x/util/deferlog.cpp @@ -76,8 +76,8 @@ namespace deferredlogs { msg += "\n"; } - for (auto messages : errors) { - for (auto message : messages) { + for (const auto &messages : errors) { + for (const auto &message : messages) { msg += " " + message + "\n"; } msg += "\n"; @@ -91,7 +91,7 @@ namespace deferredlogs { msg += "\n"; msg += "\\------------------------- spice2x auto-troubleshooter ------------------------/\n"; - log_warning("troubleshooter", "{}", msg); + log_special("troubleshooter", "{}", msg); }); } } diff --git a/src/spice2x/util/logging.h b/src/spice2x/util/logging.h index 1bb6cde..098538d 100644 --- a/src/spice2x/util/logging.h +++ b/src/spice2x/util/logging.h @@ -87,6 +87,9 @@ void show_popup_for_fatal_error(std::string message); #define log_warning(module, format_str, ...) logger::push( \ LOG_FORMAT("W", module, format_str, ## __VA_ARGS__), logger::Style::YELLOW) +#define log_special(module, format_str, ...) logger::push( \ + LOG_FORMAT("W", module, format_str, ## __VA_ARGS__), logger::Style::SPECIAL) + #define log_fatal(module, format_str, ...) { \ logger::push(LOG_FORMAT("F", module, format_str, ## __VA_ARGS__), logger::Style::RED); \ show_popup_for_fatal_error(LOG_FORMAT_POPUP(module, format_str, ## __VA_ARGS__)); \