瀏覽代碼

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.
Rémi Verschelde 10 年之前
父節點
當前提交
9ab7de243f
共有 3 個文件被更改,包括 18 次插入18 次删除
  1. 6 6
      drivers/unix/os_unix.cpp
  2. 6 6
      platform/windows/os_windows.cpp
  3. 6 6
      platform/winrt/os_winrt.cpp

+ 6 - 6
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;
 	}
 }

+ 6 - 6
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 {

+ 6 - 6
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;
 	}
 }