Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Separate window displayer message stringify

Browse source
This commit is contained in:
kaetemi 2016-01-15 17:10:39 +01:00
parent fe6cc6656b
commit 8f61c6dfa9
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/window_displayer.h
View file

@ -64,6 +64,8 @@ public:
virtual void getWindowPos (uint32 &x, uint32 &y, uint32 &w, uint32 &h) { x=y=w=h=0; } virtual void getWindowPos (uint32 &x, uint32 &y, uint32 &w, uint32 &h) { x=y=w=h=0; }
static std::string stringifyMessage(const NLMISC::CLog::TDisplayInfo &args, const char *message, bool needSlashR = false);
protected: protected:
// display a string (MT) // display a string (MT)

27
code/nel/src/misc/window_displayer.cpp
View file

@ -116,21 +116,15 @@ void CWindowDisplayer::create (string windowNameEx, bool iconified, sint x, sint
_Thread->start (); _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; bool needSpace = false;
//stringstream ss; //stringstream ss;
string str; string str;
uint32 color = 0xFF000000;
if (args.LogType != CLog::LOG_NO) if (args.LogType != CLog::LOG_NO)
{ {
str += logTypeToString(args.LogType); str += CWindowDisplayer::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;
needSpace = true; needSpace = true;
} }
@ -200,6 +194,23 @@ void CWindowDisplayer::doDisplay (const NLMISC::CLog::TDisplayInfo &args, const
} }
str += pos; 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); CSynchronized<std::list<std::pair<uint32, std::string> > >::CAccessor access (&_Buffer);
if (_HistorySize > 0 && access.value().size() >= (uint)_HistorySize) if (_HistorySize > 0 && access.value().size() >= (uint)_HistorySize)