mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
Logger improvements
Fix crash cases due to concurrent access and wrong type casting. Improve filter logic (now greys out everything outside criteria). TODO: Return 'size_t' for everything size related.
This commit is contained in:
Kawe Mazidjatari
parent
98741a9591
commit
f7dd4089f0
317
r5dev/thirdparty/imgui/src/imgui_logger.cpp
vendored
317
r5dev/thirdparty/imgui/src/imgui_logger.cpp
vendored
@ -451,7 +451,7 @@ int CTextLogger::GetCharacterIndex(const Coordinates& aCoordinates) const
|
||||
auto& line = m_Lines[aCoordinates.m_nLine];
|
||||
int c = 0;
|
||||
int i = 0;
|
||||
for (; i < line.size() && c < aCoordinates.m_nColumn;)
|
||||
for (; i < static_cast<int>(line.size()) && c < aCoordinates.m_nColumn;)
|
||||
{
|
||||
if (line[i].m_Char == '\t')
|
||||
c = (c / m_nTabSize) * m_nTabSize + m_nTabSize;
|
||||
@ -464,12 +464,13 @@ int CTextLogger::GetCharacterIndex(const Coordinates& aCoordinates) const
|
||||
|
||||
int CTextLogger::GetCharacterColumn(int aLine, int aIndex) const
|
||||
{
|
||||
if (aLine >= m_Lines.size())
|
||||
if (aLine >= static_cast<int>(m_Lines.size()))
|
||||
return 0;
|
||||
|
||||
auto& line = m_Lines[aLine];
|
||||
int col = 0;
|
||||
int i = 0;
|
||||
while (i < aIndex && i < (int)line.size())
|
||||
while (i < aIndex && i < static_cast<int>(line.size()))
|
||||
{
|
||||
auto c = line[i].m_Char;
|
||||
i += UTF8CharLength(c);
|
||||
@ -483,29 +484,29 @@ int CTextLogger::GetCharacterColumn(int aLine, int aIndex) const
|
||||
|
||||
int CTextLogger::GetLineCharacterCount(int aLine) const
|
||||
{
|
||||
if (aLine >= m_Lines.size())
|
||||
if (aLine >= static_cast<int>(m_Lines.size()))
|
||||
return 0;
|
||||
auto& line = m_Lines[aLine];
|
||||
|
||||
int c = 0;
|
||||
for (unsigned i = 0; i < line.size(); c++)
|
||||
i += UTF8CharLength(line[i].m_Char);
|
||||
for (size_t i = 0; i < m_Lines[aLine].size(); c++)
|
||||
i += static_cast<size_t>(UTF8CharLength(m_Lines[aLine][i].m_Char));
|
||||
return c;
|
||||
}
|
||||
|
||||
int CTextLogger::GetLineMaxColumn(int aLine) const
|
||||
{
|
||||
if (aLine >= m_Lines.size())
|
||||
if (aLine >= static_cast<int>(m_Lines.size()))
|
||||
return 0;
|
||||
auto& line = m_Lines[aLine];
|
||||
|
||||
int col = 0;
|
||||
for (unsigned i = 0; i < line.size(); )
|
||||
for (size_t i = 0; i < m_Lines[aLine].size(); )
|
||||
{
|
||||
auto c = line[i].m_Char;
|
||||
auto c = m_Lines[aLine][i].m_Char;
|
||||
if (c == '\t')
|
||||
col = (col / m_nTabSize) * m_nTabSize + m_nTabSize;
|
||||
else
|
||||
col++;
|
||||
i += UTF8CharLength(c);
|
||||
i += static_cast<size_t>(UTF8CharLength(c));
|
||||
}
|
||||
return col;
|
||||
}
|
||||
@ -516,8 +517,8 @@ bool CTextLogger::IsOnWordBoundary(const Coordinates & aAt) const
|
||||
return true;
|
||||
|
||||
auto& line = m_Lines[aAt.m_nLine];
|
||||
auto cindex = GetCharacterIndex(aAt);
|
||||
if (cindex >= (int)line.size())
|
||||
size_t cindex = static_cast<size_t>(GetCharacterIndex(aAt));
|
||||
if (cindex >= line.size())
|
||||
return true;
|
||||
|
||||
return isspace(line[cindex].m_Char) != isspace(line[cindex - 1].m_Char);
|
||||
@ -708,6 +709,8 @@ void CTextLogger::HandleMouseInputs()
|
||||
|
||||
void CTextLogger::Render()
|
||||
{
|
||||
m_Mutex.lock();
|
||||
|
||||
m_bWithinRender = true;
|
||||
m_bCursorPositionChanged = false;
|
||||
|
||||
@ -739,168 +742,169 @@ void CTextLogger::Render()
|
||||
auto lineMax = std::max(0, std::min((int)m_Lines.size() - 1, lineNo + (int)floor((scrollY + contentSize.y) / m_CharAdvance.y)));
|
||||
|
||||
//m_flTextStart = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, buf, nullptr, nullptr).x + m_nLeftMargin;
|
||||
|
||||
if (!m_Lines.empty())
|
||||
{
|
||||
float spaceSize = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, " ", nullptr, nullptr).x;
|
||||
|
||||
while (lineNo <= lineMax)
|
||||
{
|
||||
ImVec2 lineStartScreenPos = ImVec2(cursorScreenPos.x, cursorScreenPos.y + lineNo * m_CharAdvance.y);
|
||||
ImVec2 textScreenPos = ImVec2(lineStartScreenPos.x + m_flTextStart, lineStartScreenPos.y);
|
||||
|
||||
auto& line = m_Lines[lineNo];
|
||||
if (m_itFilter.PassFilter(GetTextFromLine(line).c_str()))
|
||||
longest = std::max(m_flTextStart + TextDistanceToLineStart(Coordinates(lineNo, GetLineMaxColumn(lineNo))), longest);
|
||||
auto columnNo = 0;
|
||||
Coordinates lineStartCoord(lineNo, 0);
|
||||
Coordinates lineEndCoord(lineNo, GetLineMaxColumn(lineNo));
|
||||
|
||||
// Draw selection for the current line
|
||||
float sstart = -1.0f;
|
||||
float ssend = -1.0f;
|
||||
|
||||
assert(m_State.m_SelectionStart <= m_State.m_SelectionEnd);
|
||||
if (m_State.m_SelectionStart <= lineEndCoord)
|
||||
sstart = m_State.m_SelectionStart > lineStartCoord ? TextDistanceToLineStart(m_State.m_SelectionStart) : 0.0f;
|
||||
if (m_State.m_SelectionEnd > lineStartCoord)
|
||||
ssend = TextDistanceToLineStart(m_State.m_SelectionEnd < lineEndCoord ? m_State.m_SelectionEnd : lineEndCoord);
|
||||
|
||||
if (m_State.m_SelectionEnd.m_nLine > lineNo)
|
||||
ssend += m_CharAdvance.x;
|
||||
|
||||
if (sstart != -1 && ssend != -1 && sstart < ssend)
|
||||
{
|
||||
ImVec2 lineStartScreenPos = ImVec2(cursorScreenPos.x, cursorScreenPos.y + lineNo * m_CharAdvance.y);
|
||||
ImVec2 textScreenPos = ImVec2(lineStartScreenPos.x + m_flTextStart, lineStartScreenPos.y);
|
||||
ImVec2 vstart(lineStartScreenPos.x + m_flTextStart + sstart, lineStartScreenPos.y);
|
||||
ImVec2 vend(lineStartScreenPos.x + m_flTextStart + ssend, lineStartScreenPos.y + m_CharAdvance.y);
|
||||
drawList->AddRectFilled(vstart, vend, ImGui::GetColorU32(ImGuiCol_TextSelectedBg));
|
||||
}
|
||||
|
||||
longest = std::max(m_flTextStart + TextDistanceToLineStart(Coordinates(lineNo, GetLineMaxColumn(lineNo))), longest);
|
||||
auto columnNo = 0;
|
||||
Coordinates lineStartCoord(lineNo, 0);
|
||||
Coordinates lineEndCoord(lineNo, GetLineMaxColumn(lineNo));
|
||||
if (m_State.m_CursorPosition.m_nLine == lineNo)
|
||||
{
|
||||
bool focused = ImGui::IsWindowFocused();
|
||||
ImVec2 start = ImVec2(lineStartScreenPos.x + scrollX, lineStartScreenPos.y);
|
||||
|
||||
// Draw selection for the current line
|
||||
float sstart = -1.0f;
|
||||
float ssend = -1.0f;
|
||||
// Highlight the current line (where the cursor is)
|
||||
//if (!HasSelection())
|
||||
//{
|
||||
// auto end = ImVec2(start.x + contentSize.x + scrollX, start.y + m_CharAdvance.y);
|
||||
// drawList->AddRectFilled(start, end, 0x80a06020);
|
||||
// drawList->AddRect(start, end, 0x80a06020, 1.0f);
|
||||
//}
|
||||
|
||||
assert(m_State.m_SelectionStart <= m_State.m_SelectionEnd);
|
||||
if (m_State.m_SelectionStart <= lineEndCoord)
|
||||
sstart = m_State.m_SelectionStart > lineStartCoord ? TextDistanceToLineStart(m_State.m_SelectionStart) : 0.0f;
|
||||
if (m_State.m_SelectionEnd > lineStartCoord)
|
||||
ssend = TextDistanceToLineStart(m_State.m_SelectionEnd < lineEndCoord ? m_State.m_SelectionEnd : lineEndCoord);
|
||||
|
||||
if (m_State.m_SelectionEnd.m_nLine > lineNo)
|
||||
ssend += m_CharAdvance.x;
|
||||
|
||||
if (sstart != -1 && ssend != -1 && sstart < ssend)
|
||||
// Render the cursor
|
||||
if (focused)
|
||||
{
|
||||
ImVec2 vstart(lineStartScreenPos.x + m_flTextStart + sstart, lineStartScreenPos.y);
|
||||
ImVec2 vend(lineStartScreenPos.x + m_flTextStart + ssend, lineStartScreenPos.y + m_CharAdvance.y);
|
||||
drawList->AddRectFilled(vstart, vend, ImGui::GetColorU32(ImGuiCol_TextSelectedBg));
|
||||
}
|
||||
|
||||
if (m_State.m_CursorPosition.m_nLine == lineNo)
|
||||
{
|
||||
bool focused = ImGui::IsWindowFocused();
|
||||
ImVec2 start = ImVec2(lineStartScreenPos.x + scrollX, lineStartScreenPos.y);
|
||||
|
||||
// Highlight the current line (where the cursor is)
|
||||
//if (!HasSelection())
|
||||
//{
|
||||
// auto end = ImVec2(start.x + contentSize.x + scrollX, start.y + m_CharAdvance.y);
|
||||
// drawList->AddRectFilled(start, end, 0x80a06020);
|
||||
// drawList->AddRect(start, end, 0x80a06020, 1.0f);
|
||||
//}
|
||||
|
||||
// Render the cursor
|
||||
if (focused)
|
||||
auto timeEnd = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
|
||||
auto elapsed = timeEnd - m_nStartTime;
|
||||
if (elapsed > 400)
|
||||
{
|
||||
auto timeEnd = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
|
||||
auto elapsed = timeEnd - m_nStartTime;
|
||||
if (elapsed > 400)
|
||||
{
|
||||
float width = 1.0f;
|
||||
auto cindex = GetCharacterIndex(m_State.m_CursorPosition);
|
||||
float cx = TextDistanceToLineStart(m_State.m_CursorPosition);
|
||||
float width = 1.0f;
|
||||
auto cindex = GetCharacterIndex(m_State.m_CursorPosition);
|
||||
float cx = TextDistanceToLineStart(m_State.m_CursorPosition);
|
||||
|
||||
if (m_Overwrite && cindex < (int)line.size())
|
||||
if (m_Overwrite && cindex < (int)line.size())
|
||||
{
|
||||
auto c = line[cindex].m_Char;
|
||||
if (c == '\t')
|
||||
{
|
||||
auto c = line[cindex].m_Char;
|
||||
if (c == '\t')
|
||||
{
|
||||
auto x = (1.0f + std::floor((1.0f + cx) / (float(m_nTabSize) * spaceSize))) * (float(m_nTabSize) * spaceSize);
|
||||
width = x - cx;
|
||||
}
|
||||
else
|
||||
{
|
||||
char buf2[2];
|
||||
buf2[0] = line[cindex].m_Char;
|
||||
buf2[1] = '\0';
|
||||
width = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, buf2).x;
|
||||
}
|
||||
auto x = (1.0f + std::floor((1.0f + cx) / (float(m_nTabSize) * spaceSize))) * (float(m_nTabSize) * spaceSize);
|
||||
width = x - cx;
|
||||
}
|
||||
else
|
||||
{
|
||||
char buf2[2];
|
||||
buf2[0] = line[cindex].m_Char;
|
||||
buf2[1] = '\0';
|
||||
width = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, buf2).x;
|
||||
}
|
||||
ImVec2 cstart(textScreenPos.x + cx, lineStartScreenPos.y);
|
||||
ImVec2 cend(textScreenPos.x + cx + width, lineStartScreenPos.y + m_CharAdvance.y);
|
||||
drawList->AddRectFilled(cstart, cend, 0xffe0e0e0);
|
||||
if (elapsed > 800)
|
||||
m_nStartTime = timeEnd;
|
||||
}
|
||||
ImVec2 cstart(textScreenPos.x + cx, lineStartScreenPos.y);
|
||||
ImVec2 cend(textScreenPos.x + cx + width, lineStartScreenPos.y + m_CharAdvance.y);
|
||||
drawList->AddRectFilled(cstart, cend, 0xffe0e0e0);
|
||||
if (elapsed > 800)
|
||||
m_nStartTime = timeEnd;
|
||||
}
|
||||
}
|
||||
|
||||
// Render colorized text
|
||||
//auto prevColor = GetGlyphColor(line[0]);
|
||||
ImVec2 bufferOffset;
|
||||
|
||||
for (size_t i = 0; i < line.size();)
|
||||
{
|
||||
auto& glyph = line[i];
|
||||
auto color = GetGlyphColor(glyph);
|
||||
|
||||
if ((glyph.m_Char == '\t' || glyph.m_Char == '\n' || glyph.m_Char == ' ') && !m_svLineBuffer.empty())
|
||||
{
|
||||
const ImVec2 newOffset(textScreenPos.x + bufferOffset.x, textScreenPos.y + bufferOffset.y);
|
||||
drawList->AddText(newOffset, color, m_svLineBuffer.c_str());
|
||||
auto textSize = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, m_svLineBuffer.c_str(), nullptr, nullptr);
|
||||
bufferOffset.x += textSize.x;
|
||||
m_svLineBuffer.clear();
|
||||
}
|
||||
|
||||
if (glyph.m_Char == '\t' || glyph.m_Char == '\n')
|
||||
{
|
||||
auto oldX = bufferOffset.x;
|
||||
bufferOffset.x = (1.0f + std::floor((1.0f + bufferOffset.x) / (float(m_nTabSize) * spaceSize))) * (float(m_nTabSize) * spaceSize);
|
||||
++i;
|
||||
|
||||
if (m_bShowWhiteSpaces)
|
||||
{
|
||||
const auto s = ImGui::GetFontSize();
|
||||
const auto x1 = textScreenPos.x + oldX + 1.0f;
|
||||
const auto x2 = textScreenPos.x + bufferOffset.x - 1.0f;
|
||||
const auto y = textScreenPos.y + bufferOffset.y + s * 0.5f;
|
||||
const ImVec2 p1(x1, y);
|
||||
const ImVec2 p2(x2, y);
|
||||
const ImVec2 p3(x2 - s * 0.2f, y - s * 0.2f);
|
||||
const ImVec2 p4(x2 - s * 0.2f, y + s * 0.2f);
|
||||
drawList->AddLine(p1, p2, 0x90909090);
|
||||
drawList->AddLine(p2, p3, 0x90909090);
|
||||
drawList->AddLine(p2, p4, 0x90909090);
|
||||
}
|
||||
}
|
||||
else if (glyph.m_Char == ' ')
|
||||
{
|
||||
if (m_bShowWhiteSpaces)
|
||||
{
|
||||
const auto s = ImGui::GetFontSize();
|
||||
const auto x = textScreenPos.x + bufferOffset.x + spaceSize * 0.5f;
|
||||
const auto y = textScreenPos.y + bufferOffset.y + s * 0.5f;
|
||||
drawList->AddCircleFilled(ImVec2(x, y), 1.5f, 0x80808080, 4);
|
||||
}
|
||||
bufferOffset.x += spaceSize;
|
||||
i++;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_svLineBuffer.push_back(line[i++].m_Char);
|
||||
//auto l = UTF8CharLength(glyph.m_Char); // !TODO: (this currently causes crashes)
|
||||
//while (l-- > 0)
|
||||
//{
|
||||
// m_svLineBuffer.push_back(line[i++].m_Char);
|
||||
//}
|
||||
}
|
||||
++columnNo;
|
||||
}
|
||||
|
||||
if (!m_svLineBuffer.empty())
|
||||
{
|
||||
const ImVec2 newOffset(textScreenPos.x + bufferOffset.x, textScreenPos.y + bufferOffset.y);
|
||||
drawList->AddText(newOffset, 0xffffffff, m_svLineBuffer.c_str()); // COLOR (obtain from glyph?)
|
||||
m_svLineBuffer.clear();
|
||||
}
|
||||
}
|
||||
if (m_itFilter.IsActive() && m_itFilter.PassFilter(GetTextFromLine(line).c_str()))
|
||||
++lineNo;
|
||||
else /*if (!m_itFilter.IsActive())*/
|
||||
++lineNo;
|
||||
|
||||
// Render colorized text
|
||||
//auto prevColor = GetGlyphColor(line[0]);
|
||||
ImVec2 bufferOffset;
|
||||
|
||||
for (size_t i = 0; i < line.size();)
|
||||
{
|
||||
Glyph& glyph = line[i];
|
||||
ImU32 color = 0xff605040;
|
||||
|
||||
if (m_itFilter.PassFilter(GetTextFromLine(line).c_str()))
|
||||
color = GetGlyphColor(glyph);
|
||||
|
||||
if ((glyph.m_Char == '\t' || glyph.m_Char == '\n' || glyph.m_Char == ' ') && !m_svLineBuffer.empty())
|
||||
{
|
||||
const ImVec2 newOffset(textScreenPos.x + bufferOffset.x, textScreenPos.y + bufferOffset.y);
|
||||
drawList->AddText(newOffset, color, m_svLineBuffer.c_str());
|
||||
auto textSize = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, m_svLineBuffer.c_str(), nullptr, nullptr);
|
||||
bufferOffset.x += textSize.x;
|
||||
m_svLineBuffer.clear();
|
||||
}
|
||||
|
||||
if (glyph.m_Char == '\t' || glyph.m_Char == '\n')
|
||||
{
|
||||
auto oldX = bufferOffset.x;
|
||||
bufferOffset.x = (1.0f + std::floor((1.0f + bufferOffset.x) / (float(m_nTabSize) * spaceSize))) * (float(m_nTabSize) * spaceSize);
|
||||
++i;
|
||||
|
||||
if (m_bShowWhiteSpaces)
|
||||
{
|
||||
const auto s = ImGui::GetFontSize();
|
||||
const auto x1 = textScreenPos.x + oldX + 1.0f;
|
||||
const auto x2 = textScreenPos.x + bufferOffset.x - 1.0f;
|
||||
const auto y = textScreenPos.y + bufferOffset.y + s * 0.5f;
|
||||
const ImVec2 p1(x1, y);
|
||||
const ImVec2 p2(x2, y);
|
||||
const ImVec2 p3(x2 - s * 0.2f, y - s * 0.2f);
|
||||
const ImVec2 p4(x2 - s * 0.2f, y + s * 0.2f);
|
||||
drawList->AddLine(p1, p2, 0x90909090);
|
||||
drawList->AddLine(p2, p3, 0x90909090);
|
||||
drawList->AddLine(p2, p4, 0x90909090);
|
||||
}
|
||||
}
|
||||
else if (glyph.m_Char == ' ')
|
||||
{
|
||||
if (m_bShowWhiteSpaces)
|
||||
{
|
||||
const auto s = ImGui::GetFontSize();
|
||||
const auto x = textScreenPos.x + bufferOffset.x + spaceSize * 0.5f;
|
||||
const auto y = textScreenPos.y + bufferOffset.y + s * 0.5f;
|
||||
drawList->AddCircleFilled(ImVec2(x, y), 1.5f, 0x80808080, 4);
|
||||
}
|
||||
bufferOffset.x += spaceSize;
|
||||
i++;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (line.size() > 0)
|
||||
{
|
||||
auto l = UTF8CharLength(glyph.m_Char); // !TODO: (this currently causes crashes)
|
||||
while (l-- > 0)
|
||||
m_svLineBuffer.push_back(line[i++].m_Char);
|
||||
}
|
||||
}
|
||||
++columnNo;
|
||||
}
|
||||
|
||||
if (!m_svLineBuffer.empty())
|
||||
{
|
||||
const ImVec2 newOffset(textScreenPos.x + bufferOffset.x, textScreenPos.y + bufferOffset.y);
|
||||
drawList->AddText(newOffset, 0xffffffff, m_svLineBuffer.c_str()); // COLOR (obtain from glyph?)
|
||||
m_svLineBuffer.clear();
|
||||
}
|
||||
|
||||
++lineNo;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ImGui::Dummy(ImVec2((longest + 2), m_Lines.size() * m_CharAdvance.y));
|
||||
|
||||
if (m_bScrollToCursor)
|
||||
@ -915,6 +919,8 @@ void CTextLogger::Render()
|
||||
|
||||
ImGui::PopStyleVar();
|
||||
m_bWithinRender = false;
|
||||
|
||||
m_Mutex.unlock();
|
||||
}
|
||||
|
||||
void CTextLogger::SetText(const CConLog& aText)
|
||||
@ -1377,6 +1383,9 @@ std::string CTextLogger::GetCurrentLineText()const
|
||||
std::string CTextLogger::GetTextFromLine(const Line& aLine) const
|
||||
{
|
||||
std::string result;
|
||||
if (aLine.size() < 1)
|
||||
return result;
|
||||
|
||||
for (size_t i = 0; i < aLine.size(); i++)
|
||||
{
|
||||
result += (aLine[i].m_Char);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user