pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement Linux ANSI colors

Browse Source
This commit is contained in:
Akkadius 2015-01-20 02:53:10 -06:00
parent 32437a21eb
commit 39626159a5
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
common/eqemu_logsys.cpp
View File

@ -39,17 +39,19 @@ std::ofstream process_log;
#include <windows.h> #include <windows.h>
#else #else
#include <sys/stat.h> #include <sys/stat.h>
#define RESET "\033[0m"
#define BLACK "\033[30m" /* Black */
#define RED "\033[31m" /* Red */
#define GREEN "\033[32m" /* Green */
#define YELLOW "\033[33m" /* Yellow */
#define BLUE "\033[34m" /* Blue */
#define MAGENTA "\033[35m" /* Magenta */
#define CYAN "\033[36m" /* Cyan */
#define WHITE "\033[37m" /* White */
#endif #endif
/* Linux ANSI console color defines */
#define LC_RESET "\033[0m"
#define LC_BLACK "\033[30m" /* Black */
#define LC_RED "\033[31m" /* Red */
#define LC_GREEN "\033[32m" /* Green */
#define LC_YELLOW "\033[33m" /* Yellow */
#define LC_BLUE "\033[34m" /* Blue */
#define LC_MAGENTA "\033[35m" /* Magenta */
#define LC_CYAN "\033[36m" /* Cyan */
#define LC_WHITE "\033[37m" /* White */
namespace Console { namespace Console {
enum Color { enum Color {
Black = 0, Black = 0,
@ -127,7 +129,7 @@ void EQEmuLogSys::ProcessLogWrite(uint16 log_category, std::string message)
} }
} }
uint16 EQEmuLogSys::GetConsoleColorFromCategory(uint16 log_category){ uint16 EQEmuLogSys::GetWindowsConsoleColorFromCategory(uint16 log_category){
switch (log_category) { switch (log_category) {
case Logs::Status: case Logs::Status:
case Logs::Normal: case Logs::Normal:
@ -149,6 +151,28 @@ uint16 EQEmuLogSys::GetConsoleColorFromCategory(uint16 log_category){
} }
} }
std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category){
switch (log_category) {
case Logs::Status:
case Logs::Normal:
return LC_YELLOW;
case Logs::MySQLError:
case Logs::Error:
return LC_RED;
case Logs::MySQLQuery:
case Logs::Debug:
return LC_GREEN;
case Logs::Quests:
return LC_CYAN;
case Logs::Commands:
return LC_MAGENTA;
case Logs::Crash:
return LC_RED;
default:
return LC_YELLOW;
}
}
uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category){ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category){
switch (log_category) { switch (log_category) {
case Logs::Status: case Logs::Status:
@ -186,14 +210,11 @@ void EQEmuLogSys::ProcessConsoleMessage(uint16 log_category, const std::string m
info.FontWeight = FW_NORMAL; info.FontWeight = FW_NORMAL;
wcscpy(info.FaceName, L"Lucida Console"); wcscpy(info.FaceName, L"Lucida Console");
SetCurrentConsoleFontEx(console_handle, NULL, &info); SetCurrentConsoleFontEx(console_handle, NULL, &info);
SetConsoleTextAttribute(console_handle, EQEmuLogSys::GetConsoleColorFromCategory(log_category)); SetConsoleTextAttribute(console_handle, EQEmuLogSys::GetWindowsConsoleColorFromCategory(log_category));
#endif std::cout << message << "\n";
std::cout << message << "\n";
#ifdef _WINDOWS
/* Always set back to white*/
SetConsoleTextAttribute(console_handle, Console::Color::White); SetConsoleTextAttribute(console_handle, Console::Color::White);
#else
std::cout << EQEmuLogSys::GetLinuxConsoleColorFromCategory(log_category) << message << LC_RESET << std::endl;
#endif #endif
} }

3
common/eqemu_logsys.h
View File

@ -153,7 +153,8 @@ private:
std::function<void(uint16 log_category, std::string&)> on_log_gmsay_hook; std::function<void(uint16 log_category, std::string&)> on_log_gmsay_hook;
std::string FormatOutMessageString(uint16 log_category, std::string in_message); std::string FormatOutMessageString(uint16 log_category, std::string in_message);
uint16 GetConsoleColorFromCategory(uint16 log_category); uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
void ProcessConsoleMessage(uint16 log_category, const std::string message); void ProcessConsoleMessage(uint16 log_category, const std::string message);
void ProcessGMSay(uint16 log_category, std::string message); void ProcessGMSay(uint16 log_category, std::string message);