Skip to content

Font - use \c to restore the original color #4353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ims21 wants to merge 1 commit into from
+28 −9
Closed

Font - use \c to restore the original color #4353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions lib/gdi/font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ inline FT_Error Font::getGlyphImage(GlyphIndex glyph_index, FT_Glyph *glyph, FT_

DEFINE_REF(eTextPara);
int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt glyphIndex, int flags, int rflags, int border, bool last,
bool activate_newcolor, unsigned long newcolor)
bool activate_newcolor, bool activate_colorreset, unsigned long newcolor)
{
int xadvance, top, left, height;
pGlyph ng;
Expand Down Expand Up @@ -504,6 +504,9 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
ng.newcolor = newcolor;
}

if (activate_colorreset)
ng.flags |= GS_COLORRESET;

glyphs.push_back(ng);
++charCount;

Expand Down Expand Up @@ -769,6 +772,7 @@ int eTextPara::renderString(const char *string, int rflags, int border)

unsigned long newcolor = 0;
bool activate_newcolor = false;
bool activate_colorreset = false;
int nextflags = 0;

for (std::vector<unsigned long>::const_iterator i(uc_visual.begin());
Expand Down Expand Up @@ -818,14 +822,23 @@ int eTextPara::renderString(const char *string, int rflags, int border)
{
if ((i + 2 + codeidx) == uc_visual.end()) break;
color[codeidx] = (char)((*(i + 2 + codeidx)) & 0xff);
if (!isxdigit((unsigned char)color[codeidx]))
break;
}

isprintable = 0;

if (codeidx == 8)
{
newcolor = gRGB(color).argb();
activate_newcolor = true;
isprintable = 0;
i += 1 + codeidx;
}
else
{
activate_colorreset = true;
i++;
}
break;
}
default:
Expand Down Expand Up @@ -888,14 +901,15 @@ nprint: isprintable=0;
if (!index)
eDebug("[eTextPara] Unicode U+%4lx not present", chr);
else
appendGlyph(fallback_font, fallback_face, index, flags, rflags, border, i == uc_visual.end() - 1, activate_newcolor, newcolor);
appendGlyph(fallback_font, fallback_face, index, flags, rflags, border, i == uc_visual.end() - 1, activate_newcolor, activate_colorreset, newcolor);
}
else
appendGlyph(replacement_font, replacement_face, index, flags, rflags, border, i == uc_visual.end() - 1, activate_newcolor, newcolor);
appendGlyph(replacement_font, replacement_face, index, flags, rflags, border, i == uc_visual.end() - 1, activate_newcolor, activate_colorreset, newcolor);
} else
appendGlyph(current_font, current_face, index, flags, rflags, border, i == uc_visual.end() - 1, activate_newcolor, newcolor);
appendGlyph(current_font, current_face, index, flags, rflags, border, i == uc_visual.end() - 1, activate_newcolor, activate_colorreset, newcolor);

activate_newcolor = false;
activate_colorreset = false;
}
}
bboxValid=false;
Expand Down Expand Up @@ -971,10 +985,14 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &cbackground, con
line_offs = *(line_offs_it++);
line_chars = *(line_chars_it++);
}
if (i->flags & GS_COLORCHANGE)
if (!border)
{
/* don't do colorchanges in borders */
if (!border)
if (i->flags & GS_COLORRESET)
{
currentforeground = foreground;
setcolor = true;
}
else if (i->flags & GS_COLORCHANGE)
{
currentforeground = i->newcolor;
setcolor = true;
Expand Down
3 changes: 2 additions & 1 deletion lib/gdi/font.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class fontRenderClass
#define GS_HYPHEN 32
#define GS_COLORCHANGE 64
#define GS_LF 128
#define GS_COLORRESET 256
#define GS_CANBREAK (GS_ISSPACE|GS_SOFTHYPHEN|GS_HYPHEN)

struct pGlyph
Expand Down Expand Up @@ -148,7 +149,7 @@ class eTextPara: public iObject
bool m_blend;

int appendGlyph(Font *current_font, FT_Face current_face, FT_UInt glyphIndex, int flags, int rflags, int border, bool last,
bool activate_newcolor, unsigned long newcolor);
bool activate_newcolor, bool activate_colorreset, unsigned long newcolor);
void newLine(int flags);
void setFont(Font *font, Font *replacement_font, Font *fallback_font);
void calc_bbox();
Expand Down
Loading