verdsveven/myst
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply ATTR_REVERSE after ATTR_FAINT

Browse Source 
An example where the new behaviour makes more sense:

Suppose some text is formatted with ATTR_FAINT for red for the foreground, so it
is rendered in a dark red. In that case, when selected with the mouse, the
intended behaviour is that foreground and background color are swapped: so the
selection should be rendered in dark red and the text in the default background
color.

Before this patch, what happened was that the selection would be in normal red
and the text in the darkened background color, making it almost unreadable.

For an example application that uses the FAINT attribute, try dmesg from
util-linux with color support, it uses FAINT for segfault messages.
This commit is contained in:
Benno Fünfstück 2017-12-26 16:38:27 +01:00 committed by Hiltjo Posthuma
parent c1d23afa9c
commit e829e13bb1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x.c
View File

@ -1189,12 +1189,6 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
} }
} }
if (base.mode & ATTR_REVERSE) {
temp = fg;
fg = bg;
bg = temp;
}
if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) { if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
colfg.red = fg->color.red / 2; colfg.red = fg->color.red / 2;
colfg.green = fg->color.green / 2; colfg.green = fg->color.green / 2;
@ -1203,6 +1197,13 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
fg = &revfg; fg = &revfg;
} }
if (base.mode & ATTR_REVERSE) {
temp = fg;
fg = bg;
bg = temp;
}
if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK) if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
fg = bg; fg = bg;