edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6516

Browse source 
6516: More minor cleanup and enhancement of the text render r=def- a=Robyt3

More preparation to port lineinput and IME from upstream.

## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Robert Müller <robytemueller@gmail.com>
This commit is contained in:
bors[bot] 2023-04-15 17:07:15 +00:00 committed by GitHub
parent 60441b4e27 928d278d0c
commit a36e81532f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/engine/client/text.cpp
View file

@ -608,7 +608,7 @@ public:
m_Color = DefaultTextColor(); m_Color = DefaultTextColor();
m_OutlineColor = DefaultTextOutlineColor(); m_OutlineColor = DefaultTextOutlineColor();
m_SelectionColor = DefaultSelectionColor(); m_SelectionColor = DefaultTextSelectionColor();
m_pCurFont = nullptr; m_pCurFont = nullptr;
m_pDefaultFont = nullptr; m_pDefaultFont = nullptr;
@ -823,16 +823,12 @@ public:
pCursor->m_Y = y; pCursor->m_Y = y;
} }
void Text(float x, float y, float Size, const char *pText, float LineWidth) override void Text(float x, float y, float Size, const char *pText, float LineWidth = -1.0f) override
{ {
CTextCursor Cursor; CTextCursor Cursor;
SetCursor(&Cursor, x, y, Size, TEXTFLAG_RENDER); SetCursor(&Cursor, x, y, Size, TEXTFLAG_RENDER);
Cursor.m_LineWidth = LineWidth; Cursor.m_LineWidth = LineWidth;
const unsigned OldRenderFlags = m_RenderFlags;
if(LineWidth <= 0)
SetRenderFlags(OldRenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE);
TextEx(&Cursor, pText, -1); TextEx(&Cursor, pText, -1);
SetRenderFlags(OldRenderFlags);
} }
float TextWidth(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0, float *pHeight = nullptr, float *pAlignedFontSize = nullptr, float *pMaxCharacterHeightInLine = nullptr) override float TextWidth(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0, float *pHeight = nullptr, float *pAlignedFontSize = nullptr, float *pMaxCharacterHeightInLine = nullptr) override
@ -840,11 +836,7 @@ public:
CTextCursor Cursor; CTextCursor Cursor;
SetCursor(&Cursor, 0, 0, Size, Flags); SetCursor(&Cursor, 0, 0, Size, Flags);
Cursor.m_LineWidth = LineWidth; Cursor.m_LineWidth = LineWidth;
const unsigned OldRenderFlags = m_RenderFlags;
if(LineWidth <= 0)
SetRenderFlags(OldRenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE);
TextEx(&Cursor, pText, StrLength); TextEx(&Cursor, pText, StrLength);
SetRenderFlags(OldRenderFlags);
if(pHeight != nullptr) if(pHeight != nullptr)
*pHeight = Cursor.Height(); *pHeight = Cursor.Height();
if(pAlignedFontSize != nullptr) if(pAlignedFontSize != nullptr)
@ -859,11 +851,7 @@ public:
CTextCursor Cursor; CTextCursor Cursor;
SetCursor(&Cursor, 0, 0, Size, Flags); SetCursor(&Cursor, 0, 0, Size, Flags);
Cursor.m_LineWidth = LineWidth; Cursor.m_LineWidth = LineWidth;
const unsigned OldRenderFlags = m_RenderFlags;
if(LineWidth <= 0)
SetRenderFlags(OldRenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE);
TextEx(&Cursor, pText, StrLength); TextEx(&Cursor, pText, StrLength);
SetRenderFlags(OldRenderFlags);
return Cursor.BoundingBox(); return Cursor.BoundingBox();
} }
@ -872,11 +860,7 @@ public:
CTextCursor Cursor; CTextCursor Cursor;
SetCursor(&Cursor, 0, 0, Size, Flags); SetCursor(&Cursor, 0, 0, Size, Flags);
Cursor.m_LineWidth = LineWidth; Cursor.m_LineWidth = LineWidth;
const unsigned OldRenderFlags = m_RenderFlags;
if(LineWidth <= 0)
SetRenderFlags(OldRenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE);
TextEx(&Cursor, pText, StrLength); TextEx(&Cursor, pText, StrLength);
SetRenderFlags(OldRenderFlags);
return vec2(Cursor.m_X, Cursor.m_Y); return vec2(Cursor.m_X, Cursor.m_Y);
} }
@ -934,7 +918,7 @@ public:
return m_SelectionColor; return m_SelectionColor;
} }
void TextEx(CTextCursor *pCursor, const char *pText, int Length) override void TextEx(CTextCursor *pCursor, const char *pText, int Length = -1) override
{ {
const unsigned OldRenderFlags = m_RenderFlags; const unsigned OldRenderFlags = m_RenderFlags;
m_RenderFlags |= TEXT_RENDER_FLAG_ONE_TIME_USE; m_RenderFlags |= TEXT_RENDER_FLAG_ONE_TIME_USE;
@ -1062,6 +1046,8 @@ public:
// string length // string length
if(Length < 0) if(Length < 0)
Length = str_length(pText); Length = str_length(pText);
else
Length = minimum(Length, str_length(pText));
const float Scale = 1.0f / pSizeData->m_FontSize; const float Scale = 1.0f / pSizeData->m_FontSize;
@ -1098,7 +1084,6 @@ public:
} }
int LineCount = pCursor->m_LineCount; int LineCount = pCursor->m_LineCount;
size_t CharacterCounter = 0;
const bool IsRendered = (pCursor->m_Flags & TEXTFLAG_RENDER) != 0; const bool IsRendered = (pCursor->m_Flags & TEXTFLAG_RENDER) != 0;
@ -1126,7 +1111,7 @@ public:
{ {
if(CheckInsideChar(CheckOuter, CursorX_, CursorY_, LastCharX, LastCharWidth, CharX, CharWidth, CharY)) if(CheckInsideChar(CheckOuter, CursorX_, CursorY_, LastCharX, LastCharWidth, CharX, CharWidth, CharY))
{ {
SelectionChar = CharacterCounter; SelectionChar = pCursor->m_GlyphCount;
SelectionStarted = !SelectionStarted; SelectionStarted = !SelectionStarted;
SelectionUsedCase = true; SelectionUsedCase = true;
} }
@ -1144,7 +1129,7 @@ public:
{ {
if(CheckOutsideChar(CheckOuter, CursorX_, CursorY_, CharX, CharWidth, CharY)) if(CheckOutsideChar(CheckOuter, CursorX_, CursorY_, CharX, CharWidth, CharY))
{ {
SelectionChar = CharacterCounter; SelectionChar = pCursor->m_GlyphCount;
SelectionStarted = !SelectionStarted; SelectionStarted = !SelectionStarted;
SelectionUsedCase = true; SelectionUsedCase = true;
} }
@ -1249,7 +1234,6 @@ public:
if((pCursor->m_Flags & TEXTFLAG_DISALLOW_NEWLINE) == 0) if((pCursor->m_Flags & TEXTFLAG_DISALLOW_NEWLINE) == 0)
{ {
LastCharGlyphIndex = 0; LastCharGlyphIndex = 0;
++CharacterCounter;
StartNewLine(); StartNewLine();
if(pCursor->m_MaxLines > 0 && LineCount > pCursor->m_MaxLines) if(pCursor->m_MaxLines > 0 && LineCount > pCursor->m_MaxLines)
break; break;
@ -1264,7 +1248,7 @@ public:
const SFontSizeChar *pChr = GetChar(TextContainer.m_pFont, pSizeData, Character); const SFontSizeChar *pChr = GetChar(TextContainer.m_pFont, pSizeData, Character);
if(pChr) if(pChr)
{ {
bool ApplyBearingX = !(((RenderFlags & TEXT_RENDER_FLAG_NO_X_BEARING) != 0) || (CharacterCounter == 0 && (RenderFlags & TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING) != 0)); bool ApplyBearingX = !(((RenderFlags & TEXT_RENDER_FLAG_NO_X_BEARING) != 0) || (pCursor->m_GlyphCount == 0 && (RenderFlags & TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING) != 0));
float Advance = ((((RenderFlags & TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH) != 0) ? (pChr->m_Width) : (pChr->m_AdvanceX + ((!ApplyBearingX) ? (-pChr->m_OffsetX) : 0.f)))) * Scale * Size; float Advance = ((((RenderFlags & TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH) != 0) ? (pChr->m_Width) : (pChr->m_AdvanceX + ((!ApplyBearingX) ? (-pChr->m_OffsetX) : 0.f)))) * Scale * Size;
float OutLineRealDiff = (pChr->m_Width - pChr->m_CharWidth) * Scale * Size; float OutLineRealDiff = (pChr->m_Width - pChr->m_CharWidth) * Scale * Size;
@ -1368,15 +1352,15 @@ public:
if(pCursor->m_CursorMode == TEXT_CURSOR_CURSOR_MODE_CALCULATE) if(pCursor->m_CursorMode == TEXT_CURSOR_CURSOR_MODE_CALCULATE)
{ {
if(pCursor->m_CursorCharacter == -1 && CheckInsideChar(CharacterCounter == 0, pCursor->m_ReleaseMouseX, pCursor->m_ReleaseMouseY, CharacterCounter == 0 ? std::numeric_limits<float>::lowest() : LastCharX, LastCharWidth, CharX, CharWidth, TmpY)) if(pCursor->m_CursorCharacter == -1 && CheckInsideChar(pCursor->m_GlyphCount == 0, pCursor->m_ReleaseMouseX, pCursor->m_ReleaseMouseY, pCursor->m_GlyphCount == 0 ? std::numeric_limits<float>::lowest() : LastCharX, LastCharWidth, CharX, CharWidth, TmpY))
{ {
pCursor->m_CursorCharacter = CharacterCounter; pCursor->m_CursorCharacter = pCursor->m_GlyphCount;
} }
} }
if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_CALCULATE) if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_CALCULATE)
{ {
if(CharacterCounter == 0) if(pCursor->m_GlyphCount == 0)
{ {
CheckSelectionStart(true, pCursor->m_PressMouseX, pCursor->m_PressMouseY, SelectionStartChar, SelectionUsedPress, std::numeric_limits<float>::lowest(), 0, CharX, CharWidth, TmpY); CheckSelectionStart(true, pCursor->m_PressMouseX, pCursor->m_PressMouseY, SelectionStartChar, SelectionUsedPress, std::numeric_limits<float>::lowest(), 0, CharX, CharWidth, TmpY);
CheckSelectionStart(true, pCursor->m_ReleaseMouseX, pCursor->m_ReleaseMouseY, SelectionEndChar, SelectionUsedRelease, std::numeric_limits<float>::lowest(), 0, CharX, CharWidth, TmpY); CheckSelectionStart(true, pCursor->m_ReleaseMouseX, pCursor->m_ReleaseMouseY, SelectionEndChar, SelectionUsedRelease, std::numeric_limits<float>::lowest(), 0, CharX, CharWidth, TmpY);
@ -1390,23 +1374,23 @@ public:
} }
if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_SET) if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_SET)
{ {
if((int)CharacterCounter == pCursor->m_SelectionStart) if((int)pCursor->m_GlyphCount == pCursor->m_SelectionStart)
{ {
SelectionStarted = !SelectionStarted; SelectionStarted = !SelectionStarted;
SelectionStartChar = CharacterCounter; SelectionStartChar = pCursor->m_GlyphCount;
SelectionUsedPress = true; SelectionUsedPress = true;
} }
if((int)CharacterCounter == pCursor->m_SelectionEnd) if((int)pCursor->m_GlyphCount == pCursor->m_SelectionEnd)
{ {
SelectionStarted = !SelectionStarted; SelectionStarted = !SelectionStarted;
SelectionEndChar = CharacterCounter; SelectionEndChar = pCursor->m_GlyphCount;
SelectionUsedRelease = true; SelectionUsedRelease = true;
} }
} }
if(pCursor->m_CursorMode != TEXT_CURSOR_CURSOR_MODE_NONE) if(pCursor->m_CursorMode != TEXT_CURSOR_CURSOR_MODE_NONE)
{ {
if((int)CharacterCounter == pCursor->m_CursorCharacter) if((int)pCursor->m_GlyphCount == pCursor->m_CursorCharacter)
{ {
HasCursor = true; HasCursor = true;
aCursorQuads[0] = IGraphics::CQuadItem(SelX - CursorOuterInnerDiff, DrawY, CursorOuterWidth, Size); aCursorQuads[0] = IGraphics::CQuadItem(SelX - CursorOuterInnerDiff, DrawY, CursorOuterWidth, Size);
@ -1422,7 +1406,6 @@ public:
DrawX += Advance + CharKerning; DrawX += Advance + CharKerning;
pCursor->m_GlyphCount++; pCursor->m_GlyphCount++;
++CharacterCounter;
if(SelectionStarted && IsRendered) if(SelectionStarted && IsRendered)
{ {
@ -1478,16 +1461,16 @@ public:
} }
else if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_SET) else if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_SET)
{ {
if((int)CharacterCounter == pCursor->m_SelectionStart) if((int)pCursor->m_GlyphCount == pCursor->m_SelectionStart)
{ {
SelectionStarted = !SelectionStarted; SelectionStarted = !SelectionStarted;
SelectionStartChar = CharacterCounter; SelectionStartChar = pCursor->m_GlyphCount;
SelectionUsedPress = true; SelectionUsedPress = true;
} }
if((int)CharacterCounter == pCursor->m_SelectionEnd) if((int)pCursor->m_GlyphCount == pCursor->m_SelectionEnd)
{ {
SelectionStarted = !SelectionStarted; SelectionStarted = !SelectionStarted;
SelectionEndChar = CharacterCounter; SelectionEndChar = pCursor->m_GlyphCount;
SelectionUsedRelease = true; SelectionUsedRelease = true;
} }
} }
@ -1496,10 +1479,10 @@ public:
{ {
if(pCursor->m_CursorMode == TEXT_CURSOR_CURSOR_MODE_CALCULATE && pCursor->m_CursorCharacter == -1 && CheckOutsideChar(true, pCursor->m_ReleaseMouseX, pCursor->m_ReleaseMouseY, std::numeric_limits<float>::max(), 0, DrawY + Size)) if(pCursor->m_CursorMode == TEXT_CURSOR_CURSOR_MODE_CALCULATE && pCursor->m_CursorCharacter == -1 && CheckOutsideChar(true, pCursor->m_ReleaseMouseX, pCursor->m_ReleaseMouseY, std::numeric_limits<float>::max(), 0, DrawY + Size))
{ {
pCursor->m_CursorCharacter = CharacterCounter; pCursor->m_CursorCharacter = pCursor->m_GlyphCount;
} }
if((int)CharacterCounter == pCursor->m_CursorCharacter) if((int)pCursor->m_GlyphCount == pCursor->m_CursorCharacter)
{ {
HasCursor = true; HasCursor = true;
aCursorQuads[0] = IGraphics::CQuadItem((LastSelX + LastSelWidth) - CursorOuterInnerDiff, DrawY, CursorOuterWidth, Size); aCursorQuads[0] = IGraphics::CQuadItem((LastSelX + LastSelWidth) - CursorOuterInnerDiff, DrawY, CursorOuterWidth, Size);

12
src/engine/textrender.h
View file

@ -153,6 +153,12 @@ struct STextBoundingBox
float Right() const { return m_X + m_W; } float Right() const { return m_X + m_W; }
float Bottom() const { return m_Y + m_H; } float Bottom() const { return m_Y + m_H; }
vec2 Size() const { return vec2(m_W, m_H); }
void MoveBy(vec2 Offset)
{
m_X += Offset.x;
m_Y += Offset.y;
}
}; };
class CTextCursor class CTextCursor
@ -226,10 +232,10 @@ public:
ColorRGBA DefaultTextColor() const { return ColorRGBA(1, 1, 1, 1); } ColorRGBA DefaultTextColor() const { return ColorRGBA(1, 1, 1, 1); }
ColorRGBA DefaultTextOutlineColor() const { return ColorRGBA(0, 0, 0, 0.3f); } ColorRGBA DefaultTextOutlineColor() const { return ColorRGBA(0, 0, 0, 0.3f); }
ColorRGBA DefaultSelectionColor() const { return ColorRGBA(0, 0, 1.0f, 1.0f); } ColorRGBA DefaultTextSelectionColor() const { return ColorRGBA(0, 0, 1.0f, 1.0f); }
// //
virtual void TextEx(CTextCursor *pCursor, const char *pText, int Length) = 0; virtual void TextEx(CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
virtual bool CreateTextContainer(int &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0; virtual bool CreateTextContainer(int &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
virtual void AppendTextContainer(int TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0; virtual void AppendTextContainer(int TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
// either creates a new text container or appends to a existing one // either creates a new text container or appends to a existing one
@ -262,7 +268,7 @@ public:
virtual void TextOutlineColor(ColorRGBA rgb) = 0; virtual void TextOutlineColor(ColorRGBA rgb) = 0;
virtual void TextSelectionColor(float r, float g, float b, float a) = 0; virtual void TextSelectionColor(float r, float g, float b, float a) = 0;
virtual void TextSelectionColor(ColorRGBA rgb) = 0; virtual void TextSelectionColor(ColorRGBA rgb) = 0;
virtual void Text(float x, float y, float Size, const char *pText, float LineWidth) = 0; virtual void Text(float x, float y, float Size, const char *pText, float LineWidth = -1.0f) = 0;
virtual float TextWidth(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0, float *pHeight = nullptr, float *pAlignedFontSize = nullptr, float *pMaxCharacterHeightInLine = nullptr) = 0; virtual float TextWidth(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0, float *pHeight = nullptr, float *pAlignedFontSize = nullptr, float *pMaxCharacterHeightInLine = nullptr) = 0;
virtual STextBoundingBox TextBoundingBox(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0) = 0; virtual STextBoundingBox TextBoundingBox(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0) = 0;
virtual vec2 CaretPosition(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0) = 0; virtual vec2 CaretPosition(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0) = 0;

6
src/game/client/ui_listbox.cpp
View file

@ -14,7 +14,6 @@ CListBox::CListBox()
{ {
m_ScrollOffset = vec2(0.0f, 0.0f); m_ScrollOffset = vec2(0.0f, 0.0f);
m_ListBoxUpdateScroll = false; m_ListBoxUpdateScroll = false;
m_aFilterString[0] = '\0';
m_FilterOffset = 0.0f; m_FilterOffset = 0.0f;
m_HasHeader = false; m_HasHeader = false;
m_AutoSpacing = 0.0f; m_AutoSpacing = 0.0f;
@ -215,8 +214,3 @@ int CListBox::DoEnd()
} }
return m_ListBoxNewSelected; return m_ListBoxNewSelected;
} }
bool CListBox::FilterMatches(const char *pNeedle) const
{
return !m_aFilterString[0] || str_find_nocase(pNeedle, m_aFilterString);
}

1
src/game/client/ui_listbox.h
View file

@ -35,7 +35,6 @@ private:
float m_AutoSpacing; float m_AutoSpacing;
CScrollRegion m_ScrollRegion; CScrollRegion m_ScrollRegion;
vec2 m_ScrollOffset; vec2 m_ScrollOffset;
char m_aFilterString[128];
float m_FilterOffset; float m_FilterOffset;
int m_BackgroundCorners; int m_BackgroundCorners;
bool m_HasHeader; bool m_HasHeader;