… | |
… | |
636 | Rs_ext_bwidth, |
636 | Rs_ext_bwidth, |
637 | Rs_int_bwidth, |
637 | Rs_int_bwidth, |
638 | Rs_borderLess, |
638 | Rs_borderLess, |
639 | Rs_lineSpace, |
639 | Rs_lineSpace, |
640 | Rs_cursorUnderline, |
640 | Rs_cursorUnderline, |
|
|
641 | Rs_intensityStyles, |
641 | #endif |
642 | #endif |
642 | #if CURSOR_BLINK |
643 | #if CURSOR_BLINK |
643 | Rs_cursorBlink, |
644 | Rs_cursorBlink, |
644 | #endif |
645 | #endif |
645 | #if ENABLE_XEMBED |
646 | #if ENABLE_XEMBED |
… | |
… | |
827 | |
828 | |
828 | /* how to build & extract colors and attributes */ |
829 | /* how to build & extract colors and attributes */ |
829 | #define GET_BASEFG(x) (((x) & RS_fgMask)) |
830 | #define GET_BASEFG(x) (((x) & RS_fgMask)) |
830 | #define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) |
831 | #define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) |
831 | #ifndef NO_BRIGHTCOLOR |
832 | #ifndef NO_BRIGHTCOLOR |
832 | # define GET_FGCOLOR(x) \ |
833 | # define GET_FGCOLOR(x) ( \ |
833 | ((((x) & RS_Bold) == 0 \ |
834 | !((x) & RS_Bold) \ |
834 | || GET_BASEFG (x) < minCOLOR \ |
835 | || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \ |
835 | || GET_BASEFG (x) >= minBrightCOLOR) \ |
836 | || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \ |
836 | ? GET_BASEFG (x) \ |
837 | ? GET_BASEFG (x) \ |
837 | : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) |
838 | : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) |
838 | # define GET_BGCOLOR(x) \ |
839 | # define GET_BGCOLOR(x) ( \ |
839 | ((((x) & RS_Blink) == 0 \ |
840 | !((x) & RS_Blink) \ |
840 | || GET_BASEBG (x) < minCOLOR \ |
841 | || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \ |
841 | || GET_BASEBG (x) >= minBrightCOLOR) \ |
842 | || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \ |
842 | ? GET_BASEBG (x) \ |
843 | ? GET_BASEBG (x) \ |
843 | : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) |
844 | : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) |
844 | #else |
845 | #else |
845 | # define GET_FGCOLOR(x) GET_BASEFG(x) |
846 | # define GET_FGCOLOR(x) GET_BASEFG(x) |
846 | # define GET_BGCOLOR(x) GET_BASEBG(x) |
847 | # define GET_BGCOLOR(x) GET_BASEBG(x) |
847 | #endif |
848 | #endif |
848 | |
849 | |