|
|
|
@ -116,21 +116,15 @@ void CWindowDisplayer::create (string windowNameEx, bool iconified, sint x, sint
|
|
|
|
|
_Thread->start ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CWindowDisplayer::doDisplay (const NLMISC::CLog::TDisplayInfo &args, const char *message)
|
|
|
|
|
std::string CWindowDisplayer::stringifyMessage(const NLMISC::CLog::TDisplayInfo &args, const char *message, bool needSlashR)
|
|
|
|
|
{
|
|
|
|
|
bool needSpace = false;
|
|
|
|
|
//stringstream ss;
|
|
|
|
|
string str;
|
|
|
|
|
|
|
|
|
|
uint32 color = 0xFF000000;
|
|
|
|
|
|
|
|
|
|
if (args.LogType != CLog::LOG_NO)
|
|
|
|
|
{
|
|
|
|
|
str += logTypeToString(args.LogType);
|
|
|
|
|
if (args.LogType == CLog::LOG_ERROR || args.LogType == CLog::LOG_ASSERT) color = 0x00FF0000;
|
|
|
|
|
else if (args.LogType == CLog::LOG_WARNING) color = 0x00800000;
|
|
|
|
|
else if (args.LogType == CLog::LOG_DEBUG) color = 0x00808080;
|
|
|
|
|
else color = 0;
|
|
|
|
|
str += CWindowDisplayer::logTypeToString(args.LogType);
|
|
|
|
|
needSpace = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -200,6 +194,23 @@ void CWindowDisplayer::doDisplay (const NLMISC::CLog::TDisplayInfo &args, const
|
|
|
|
|
}
|
|
|
|
|
str += pos;
|
|
|
|
|
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CWindowDisplayer::doDisplay (const NLMISC::CLog::TDisplayInfo &args, const char *message)
|
|
|
|
|
{
|
|
|
|
|
uint32 color = 0xFF000000;
|
|
|
|
|
|
|
|
|
|
if (args.LogType != CLog::LOG_NO)
|
|
|
|
|
{
|
|
|
|
|
if (args.LogType == CLog::LOG_ERROR || args.LogType == CLog::LOG_ASSERT) color = 0x00FF0000;
|
|
|
|
|
else if (args.LogType == CLog::LOG_WARNING) color = 0x00800000;
|
|
|
|
|
else if (args.LogType == CLog::LOG_DEBUG) color = 0x00808080;
|
|
|
|
|
else color = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string str = stringifyMessage(args, message, needSlashR);
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
CSynchronized<std::list<std::pair<uint32, std::string> > >::CAccessor access (&_Buffer);
|
|
|
|
|
if (_HistorySize > 0 && access.value().size() >= (uint)_HistorySize)
|
|
|
|
|