| … | |
… | |
| 573 | Rs_font, |
573 | Rs_font, |
| 574 | #if ENABLE_STYLES |
574 | #if ENABLE_STYLES |
| 575 | Rs_boldFont, |
575 | Rs_boldFont, |
| 576 | Rs_italicFont, |
576 | Rs_italicFont, |
| 577 | Rs_boldItalicFont, |
577 | Rs_boldItalicFont, |
|
|
578 | Rs_intensityStyles, |
| 578 | #endif |
579 | #endif |
| 579 | Rs_name, |
580 | Rs_name, |
| 580 | Rs_title, |
581 | Rs_title, |
| 581 | #if defined (XPM_BACKGROUND) || (MENUBAR_MAX) |
582 | #if defined (XPM_BACKGROUND) || (MENUBAR_MAX) |
| 582 | Rs_path, |
583 | Rs_path, |
| … | |
… | |
| 636 | Rs_ext_bwidth, |
637 | Rs_ext_bwidth, |
| 637 | Rs_int_bwidth, |
638 | Rs_int_bwidth, |
| 638 | Rs_borderLess, |
639 | Rs_borderLess, |
| 639 | Rs_lineSpace, |
640 | Rs_lineSpace, |
| 640 | Rs_cursorUnderline, |
641 | Rs_cursorUnderline, |
| 641 | Rs_intensityStyles, |
|
|
| 642 | #endif |
642 | #endif |
| 643 | #if CURSOR_BLINK |
643 | #if CURSOR_BLINK |
| 644 | Rs_cursorBlink, |
644 | Rs_cursorBlink, |
| 645 | #endif |
645 | #endif |
| 646 | #if ENABLE_XEMBED |
646 | #if ENABLE_XEMBED |
| … | |
… | |
| 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 | # if ENABLE_STYLES |
| 1488 | && (!ENABLE_STYLES || OPTION (Opt_intensityStyles)) |
1489 | && OPTION (Opt_intensityStyles) |
|
|
1490 | # endif |
| 1489 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1491 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
| 1490 | base += minBrightCOLOR - minCOLOR; |
1492 | base += minBrightCOLOR - minCOLOR; |
| 1491 | #endif |
1493 | #endif |
| 1492 | return base; |
1494 | return base; |
| 1493 | } |
1495 | } |
| … | |
… | |
| 1495 | int bgcolor_of (rend_t r) |
1497 | int bgcolor_of (rend_t r) |
| 1496 | { |
1498 | { |
| 1497 | int base = GET_BASEBG (r); |
1499 | int base = GET_BASEBG (r); |
| 1498 | #ifndef NO_BRIGHTCOLOR |
1500 | #ifndef NO_BRIGHTCOLOR |
| 1499 | if (r & RS_Blink |
1501 | if (r & RS_Blink |
|
|
1502 | # if ENABLE_STYLES |
| 1500 | && (!ENABLE_STYLES || OPTION (Opt_intensityStyles)) |
1503 | && OPTION (Opt_intensityStyles) |
|
|
1504 | # endif |
| 1501 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1505 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
| 1502 | base += minBrightCOLOR - minCOLOR; |
1506 | base += minBrightCOLOR - minCOLOR; |
| 1503 | #endif |
1507 | #endif |
| 1504 | return base; |
1508 | return base; |
| 1505 | } |
1509 | } |
