st-bright-bold-text: small style fix

This commit is contained in:
Von Random 2019-04-23 13:43:38 +03:00
parent d7626859f8
commit 074c40762d

View file

@ -24,27 +24,25 @@ index ede7ae6..6e3fabe 100644
term.c.attr.mode &= ~( term.c.attr.mode &= ~(
ATTR_BOLD | ATTR_BOLD |
ATTR_FAINT | ATTR_FAINT |
@@ -1365,6 +1366,9 @@ tsetattr(int *attr, int l) @@ -1365,6 +1366,8 @@ tsetattr(int *attr, int l)
break; break;
case 1: case 1:
term.c.attr.mode |= ATTR_BOLD; term.c.attr.mode |= ATTR_BOLD;
+ if (!term.c.attr.colored) { + if (!term.c.attr.colored)
+ term.c.attr.fg = defaultbd; + term.c.attr.fg = defaultbd;
+ }
break; break;
case 2: case 2:
term.c.attr.mode |= ATTR_FAINT; term.c.attr.mode |= ATTR_FAINT;
@@ -1391,6 +1395,9 @@ tsetattr(int *attr, int l) @@ -1391,6 +1395,8 @@ tsetattr(int *attr, int l)
break; break;
case 22: case 22:
term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT); term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);
+ if (!term.c.attr.colored) { + if (!term.c.attr.colored)
+ term.c.attr.fg = defaultfg; + term.c.attr.fg = defaultfg;
+ }
break; break;
case 23: case 23:
term.c.attr.mode &= ~ATTR_ITALIC; term.c.attr.mode &= ~ATTR_ITALIC;
@@ -1411,11 +1418,18 @@ tsetattr(int *attr, int l) @@ -1411,11 +1416,17 @@ tsetattr(int *attr, int l)
term.c.attr.mode &= ~ATTR_STRUCK; term.c.attr.mode &= ~ATTR_STRUCK;
break; break;
case 38: case 38:
@ -57,15 +55,14 @@ index ede7ae6..6e3fabe 100644
case 39: case 39:
- term.c.attr.fg = defaultfg; - term.c.attr.fg = defaultfg;
+ term.c.attr.colored = 0; + term.c.attr.colored = 0;
+ if (term.c.attr.mode & ATTR_BOLD) { + if (term.c.attr.mode & ATTR_BOLD)
+ term.c.attr.fg = defaultbd; + term.c.attr.fg = defaultbd;
+ } else { + else
+ term.c.attr.fg = defaultfg; + term.c.attr.fg = defaultfg;
+ }
break; break;
case 48: case 48:
if ((idx = tdefcolor(attr, &i, l)) >= 0) if ((idx = tdefcolor(attr, &i, l)) >= 0)
@@ -1426,10 +1440,12 @@ tsetattr(int *attr, int l) @@ -1426,10 +1437,12 @@ tsetattr(int *attr, int l)
break; break;
default: default:
if (BETWEEN(attr[i], 30, 37)) { if (BETWEEN(attr[i], 30, 37)) {