Simplify how we keep ATTRs under cursor

Thanks to tarug0 for the suggestion/patch.
This commit is contained in:
Quentin Rameau 2017-04-04 17:20:55 +02:00 committed by Roberto E. Vargas Caballero
parent 149c0d3aed
commit 745c40f8b0

5
x.c
View file

@ -1266,7 +1266,6 @@ xdrawcursor(void)
Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og; Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
Color drawcol; Color drawcol;
unsigned attr;
LIMIT(oldx, 0, term.col-1); LIMIT(oldx, 0, term.col-1);
LIMIT(oldy, 0, term.row-1); LIMIT(oldy, 0, term.row-1);
@ -1286,8 +1285,8 @@ xdrawcursor(void)
xdrawglyph(og, oldx, oldy); xdrawglyph(og, oldx, oldy);
g.u = term.line[term.c.y][term.c.x].u; g.u = term.line[term.c.y][term.c.x].u;
attr = ATTR_BOLD | ATTR_ITALIC | ATTR_UNDERLINE | ATTR_STRUCK; g.mode |= term.line[term.c.y][term.c.x].mode &
g.mode |= term.line[term.c.y][term.c.x].mode & attr; (ATTR_BOLD | ATTR_ITALIC | ATTR_UNDERLINE | ATTR_STRUCK);
/* /*
* Select the right color for the right mode. * Select the right color for the right mode.