From 9ab7de243fe0348c46a87c03b1fce15b8e1afeb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 10 Nov 2015 08:04:48 +0100 Subject: [PATCH] Fix error messages forcing a white font for subsequent messages This is achieved using the "no specific formatting" \E[0m tag. Fixes #2566. Also remove the hardcoded black background colour and use default bolded terminal font for error message. Error logs should now look good both on terminals with a dark and light background colour. --- drivers/unix/os_unix.cpp | 12 ++++++------ platform/windows/os_windows.cpp | 12 ++++++------ platform/winrt/os_winrt.cpp | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 194802fcb89..fd8c26f6d9a 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -73,16 +73,16 @@ void OS_Unix::print_error(const char* p_function,const char* p_file,int p_line,c switch(p_type) { case ERR_ERROR: - print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;31;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;31mERROR: %s: \E[0m\E[1m%s\n",p_function,err_details); + print("\E[0;31m At: %s:%i.\E[0m\n",p_file,p_line); break; case ERR_WARNING: - print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;33;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n",p_function,err_details); + print("\E[0;33m At: %s:%i.\E[0m\n",p_file,p_line); break; case ERR_SCRIPT: - print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;35;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m%s\n",p_function,err_details); + print("\E[0;35m At: %s:%i.\E[0m\n",p_file,p_line); break; } } diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 01a82615637..964b9e76f36 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1777,16 +1777,16 @@ void OS_Windows::print_error(const char* p_function,const char* p_file,int p_lin switch(p_type) { case ERR_ERROR: - print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;31;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;31mERROR: %s: \E[0m\E[1m%s\n",p_function,err_details); + print("\E[0;31m At: %s:%i.\E[0m\n",p_file,p_line); break; case ERR_WARNING: - print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;33;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n",p_function,err_details); + print("\E[0;33m At: %s:%i.\E[0m\n",p_file,p_line); break; case ERR_SCRIPT: - print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;35;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m",p_function,err_details); + print("\E[0;35m At: %s:%i.\E[0m\n",p_file,p_line); break; } } else { diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp index 1e060a36679..51f60a03624 100644 --- a/platform/winrt/os_winrt.cpp +++ b/platform/winrt/os_winrt.cpp @@ -432,16 +432,16 @@ void OSWinrt::print_error(const char* p_function,const char* p_file,int p_line,c switch(p_type) { case ERR_ERROR: - print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;31;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;31mERROR: %s: \E[0m\E[1m%s\n",p_function,err_details); + print("\E[0;31m At: %s:%i.\E[0m\n",p_file,p_line); break; case ERR_WARNING: - print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;33;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n",p_function,err_details); + print("\E[0;33m At: %s:%i.\E[0m\n",p_file,p_line); break; case ERR_SCRIPT: - print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details); - print("\E[0;35;40m At: %s:%i.\E[0;0;37m\n",p_file,p_line); + print("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m",p_function,err_details); + print("\E[0;35m At: %s:%i.\E[0m\n",p_file,p_line); break; } }