… | |
… | |
1483 | int fgcolor_of (rend_t r) |
1483 | int fgcolor_of (rend_t r) |
1484 | { |
1484 | { |
1485 | int base = GET_BASEFG (r); |
1485 | int base = GET_BASEFG (r); |
1486 | #ifndef NO_BRIGHTCOLOR |
1486 | #ifndef NO_BRIGHTCOLOR |
1487 | if (r & RS_Bold |
1487 | if (r & RS_Bold |
1488 | && (!ENABLE_STYLES || options & Opt_intensityStyles) |
1488 | && (!ENABLE_STYLES || OPTION (Opt_intensityStyles)) |
1489 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1489 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1490 | base += minBrightCOLOR - minCOLOR; |
1490 | base += minBrightCOLOR - minCOLOR; |
1491 | #endif |
1491 | #endif |
1492 | return base; |
1492 | return base; |
1493 | } |
1493 | } |
… | |
… | |
1495 | int bgcolor_of (rend_t r) |
1495 | int bgcolor_of (rend_t r) |
1496 | { |
1496 | { |
1497 | int base = GET_BASEBG (r); |
1497 | int base = GET_BASEBG (r); |
1498 | #ifndef NO_BRIGHTCOLOR |
1498 | #ifndef NO_BRIGHTCOLOR |
1499 | if (r & RS_Blink |
1499 | if (r & RS_Blink |
1500 | && (!ENABLE_STYLES || options & Opt_intensityStyles) |
1500 | && (!ENABLE_STYLES || OPTION (Opt_intensityStyles)) |
1501 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1501 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1502 | base += minBrightCOLOR - minCOLOR; |
1502 | base += minBrightCOLOR - minCOLOR; |
1503 | #endif |
1503 | #endif |
1504 | return base; |
1504 | return base; |
1505 | } |
1505 | } |