mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 19:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ConLog unicode support improved

Browse source
This commit is contained in:
Nekotekina 2014-03-21 19:06:08 +04:00
parent 39d1e21802
commit 5ea58d9451
3 changed files with 76 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
rpcs3/Gui/ConLog.cpp
View file

@ -14,18 +14,18 @@ std::mutex g_cs_conlog;
static const uint max_item_count = 500; static const uint max_item_count = 500;
static const uint buffer_size = 1024 * 64; static const uint buffer_size = 1024 * 64;
static const std::string g_log_colors[] = static const wxString g_log_colors[] =
{ {
"Black", "Green", "White", "Yellow", "Red", "Black", "Green", "White", "Yellow", "Red",
}; };
struct LogPacket struct LogPacket
{ {
std::string m_prefix; wxString m_prefix;
std::string m_text; wxString m_text;
std::string m_colour; wxString m_colour;
LogPacket(const std::string& prefix, const std::string& text, const std::string& colour) LogPacket(const wxString& prefix, const wxString& text, const wxString& colour)
: m_prefix(prefix) : m_prefix(prefix)
, m_text(text) , m_text(text)
, m_colour(colour) , m_colour(colour)
@ -46,9 +46,9 @@ struct _LogBuffer : public MTPacketBuffer<LogPacket>
void _push(const LogPacket& data) void _push(const LogPacket& data)
{ {
const u32 sprefix = data.m_prefix.length(); const u32 sprefix = data.m_prefix.length() * sizeof(wxChar);
const u32 stext = data.m_text.length(); const u32 stext = data.m_text.length() * sizeof(wxChar);
const u32 scolour = data.m_colour.length(); const u32 scolour = data.m_colour.length() * sizeof(wxChar);
m_buffer.Reserve( m_buffer.Reserve(
sizeof(u32) + sprefix + sizeof(u32) + sprefix +
@ -59,17 +59,17 @@ struct _LogBuffer : public MTPacketBuffer<LogPacket>
memcpy(&m_buffer[c_put], &sprefix, sizeof(u32)); memcpy(&m_buffer[c_put], &sprefix, sizeof(u32));
c_put += sizeof(u32); c_put += sizeof(u32);
memcpy(&m_buffer[c_put], data.m_prefix.c_str(), sprefix); memcpy(&m_buffer[c_put], data.m_prefix.wx_str(), sprefix);
c_put += sprefix; c_put += sprefix;
memcpy(&m_buffer[c_put], &stext, sizeof(u32)); memcpy(&m_buffer[c_put], &stext, sizeof(u32));
c_put += sizeof(u32); c_put += sizeof(u32);
memcpy(&m_buffer[c_put], data.m_text.c_str(), stext); memcpy(&m_buffer[c_put], data.m_text.wx_str(), stext);
c_put += stext; c_put += stext;
memcpy(&m_buffer[c_put], &scolour, sizeof(u32)); memcpy(&m_buffer[c_put], &scolour, sizeof(u32));
c_put += sizeof(u32); c_put += sizeof(u32);
memcpy(&m_buffer[c_put], data.m_colour.c_str(), scolour); memcpy(&m_buffer[c_put], data.m_colour.wx_str(), scolour);
c_put += scolour; c_put += scolour;
m_put = c_put; m_put = c_put;
@ -84,20 +84,17 @@ struct _LogBuffer : public MTPacketBuffer<LogPacket>
const u32& sprefix = *(u32*)&m_buffer[c_get]; const u32& sprefix = *(u32*)&m_buffer[c_get];
c_get += sizeof(u32); c_get += sizeof(u32);
ret.m_prefix.resize(sprefix); ret.m_prefix = wxString((wxChar*)&m_buffer[c_get], sprefix / sizeof(wxChar));
if(sprefix) memcpy((void*)ret.m_prefix.c_str(), &m_buffer[c_get], sprefix);
c_get += sprefix; c_get += sprefix;
const u32& stext = *(u32*)&m_buffer[c_get]; const u32& stext = *(u32*)&m_buffer[c_get];
c_get += sizeof(u32); c_get += sizeof(u32);
ret.m_text.resize(stext); ret.m_text = wxString((wxChar*)&m_buffer[c_get], stext / sizeof(wxChar));
if(stext) memcpy((void*)ret.m_text.c_str(), &m_buffer[c_get], stext);
c_get += stext; c_get += stext;
const u32& scolour = *(u32*)&m_buffer[c_get]; const u32& scolour = *(u32*)&m_buffer[c_get];
c_get += sizeof(u32); c_get += sizeof(u32);
ret.m_colour.resize(scolour); ret.m_colour = wxString((wxChar*)&m_buffer[c_get], scolour / sizeof(wxChar));
if(scolour) memcpy((void*)ret.m_colour.c_str(), &m_buffer[c_get], scolour);
c_get += scolour; c_get += scolour;
m_get = c_get; m_get = c_get;
@ -117,7 +114,7 @@ LogWriter::LogWriter()
} }
} }
void LogWriter::WriteToLog(std::string prefix, std::string value, u8 lvl/*, wxColour bgcolour*/) void LogWriter::WriteToLog(wxString prefix, wxString value, u8 lvl/*, wxColour bgcolour*/)
{ {
if(!prefix.empty()) if(!prefix.empty())
{ {
@ -127,8 +124,8 @@ void LogWriter::WriteToLog(std::string prefix, std::string value, u8 lvl/*, wxCo
} }
} }
if(m_logfile.IsOpened()) if(m_logfile.IsOpened() && !prefix.empty())
m_logfile.Write(wxString(prefix.empty() ? "" : std::string("[" + prefix + "]: ") + value + "\n").wx_str()); m_logfile.Write(wxString("[") + prefix + "]: " + value + "\n");
if(!ConLogFrame || Ini.HLELogLvl.GetValue() == 4 || (lvl != 0 && lvl <= Ini.HLELogLvl.GetValue())) if(!ConLogFrame || Ini.HLELogLvl.GetValue() == 4 || (lvl != 0 && lvl <= Ini.HLELogLvl.GetValue()))
return; return;
@ -175,7 +172,7 @@ void LogWriter::Write(const wxString fmt, ...)
va_end(list); va_end(list);
WriteToLog("!", (const char *)frmt.ToAscii(), 2); WriteToLog("!", frmt, 2);
} }
void LogWriter::Error(const wxString fmt, ...) void LogWriter::Error(const wxString fmt, ...)
@ -188,7 +185,7 @@ void LogWriter::Error(const wxString fmt, ...)
va_end(list); va_end(list);
WriteToLog("E", static_cast<const char *>(frmt), 4); WriteToLog("E", frmt, 4);
} }
void LogWriter::Warning(const wxString fmt, ...) void LogWriter::Warning(const wxString fmt, ...)
@ -201,7 +198,7 @@ void LogWriter::Warning(const wxString fmt, ...)
va_end(list); va_end(list);
WriteToLog("W", static_cast<const char *>(frmt), 3); WriteToLog("W", frmt, 3);
} }
void LogWriter::Success(const wxString fmt, ...) void LogWriter::Success(const wxString fmt, ...)
@ -214,7 +211,7 @@ void LogWriter::Success(const wxString fmt, ...)
va_end(list); va_end(list);
WriteToLog("S", static_cast<const char *>(frmt), 1); WriteToLog("S", frmt, 1);
} }
void LogWriter::SkipLn() void LogWriter::SkipLn()
@ -279,9 +276,9 @@ void LogFrame::Task()
const int cur_item = m_log.GetItemCount(); const int cur_item = m_log.GetItemCount();
m_log.InsertItem(cur_item, wxString(item.m_prefix).wx_str()); m_log.InsertItem(cur_item, item.m_prefix);
m_log.SetItem(cur_item, 1, wxString(item.m_text).wx_str()); m_log.SetItem(cur_item, 1, item.m_text);
m_log.SetItemTextColour(cur_item, wxString(item.m_colour).wx_str()); m_log.SetItemTextColour(cur_item, item.m_colour);
m_log.SetColumnWidth(0, -1); // crashes on exit m_log.SetColumnWidth(0, -1); // crashes on exit
m_log.SetColumnWidth(1, -1); m_log.SetColumnWidth(1, -1);

6
rpcs3/Gui/ConLog.h
View file

@ -8,10 +8,10 @@ class LogWriter
wxFile m_logfile; wxFile m_logfile;
wxColour m_txtcolour; wxColour m_txtcolour;
std::string m_prefix; //wxString m_prefix;
std::string m_value; //wxString m_value;
virtual void WriteToLog(std::string prefix, std::string value, u8 lvl); virtual void WriteToLog(wxString prefix, wxString value, u8 lvl);
public: public:
LogWriter(); LogWriter();

50
rpcs3/stdafx.h
View file

@ -35,7 +35,8 @@
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
#define wx_str() ToStdString().c_str() //hack, disabled
//#define wx_str() ToStdString().c_str()
#endif #endif
#include <cstdint> #include <cstdint>
@ -72,6 +73,12 @@ union u128
operator bool() const { return _u64[0] != 0 || _u64[1] != 0; } operator bool() const { return _u64[0] != 0 || _u64[1] != 0; }
static u128 From128( u64 hi, u64 lo )
{
u128 ret = {hi, lo};
return ret;
}
static u128 From64( u64 src ) static u128 From64( u64 src )
{ {
u128 ret = {0, src}; u128 ret = {0, src};
@ -88,6 +95,27 @@ union u128
return ret; return ret;
} }
static u128 FromBit ( u32 bit )
{
u128 ret;
if (bit < 64)
{
ret.hi = 0;
ret.lo = (u64)1 << bit;
}
else if (bit < 128)
{
ret.hi = (u64)1 << (bit - 64);
ret.lo = 0;
}
else
{
ret.hi = 0;
ret.lo = 0;
}
return ret;
}
bool operator == ( const u128& right ) const bool operator == ( const u128& right ) const
{ {
return (lo == right.lo) && (hi == right.hi); return (lo == right.lo) && (hi == right.hi);
@ -97,6 +125,26 @@ union u128
{ {
return (lo != right.lo) || (hi != right.hi); return (lo != right.lo) || (hi != right.hi);
} }
u128 operator | ( const u128& right ) const
{
return From128(hi | right.hi, lo | right.lo);
}
u128 operator & ( const u128& right ) const
{
return From128(hi & right.hi, lo & right.lo);
}
u128 operator ^ ( const u128& right ) const
{
return From128(hi ^ right.hi, lo ^ right.lo);
}
u128 operator ~ () const
{
return From128(~hi, ~lo);
}
}; };
union s128 union s128