--- rxvt-unicode/src/rxvt.h 2010/03/31 13:14:50 1.383 +++ rxvt-unicode/src/rxvt.h 2010/05/23 00:02:52 1.406 @@ -249,7 +249,11 @@ # define COLORTERMENVFULL COLORTERMENV #endif #ifndef TERMENV -# define TERMENV "rxvt-unicode" +# if USE_256_COLORS +# define TERMENV "rxvt-unicode-256color" +# else +# define TERMENV "rxvt-unicode" +# endif #endif #if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) @@ -306,44 +310,51 @@ SECONDARY, }; +// define various rendition bits and masks. the rendition word +// is 32 bits in size, and we should use it as efficiently as possible + #define RS_None 0 -#define RS_fgMask 0x0000007fUL // 128 colors -#define RS_bgMask 0x00003f80UL // 128 colors +// GET_BGATTR depends on RS_fgShift > RS_bgShift +#define RS_colorMask ((1UL << Color_Bits) - 1UL) +#define RS_bgShift 0 +#define RS_fgShift (RS_bgShift + Color_Bits) +#define RS_bgMask (RS_colorMask << RS_bgShift) +#define RS_fgMask (RS_colorMask << RS_fgShift) + +// must have space for rxvt_fontset::fontCount * 2 + 2 values +#define RS_fontShift (RS_fgShift + Color_Bits) +#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ +#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful -// font styles -#define RS_Bold 0x00004000UL // value 1 -#define RS_Italic 0x00008000UL // value 2 +// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" +#define RS_redraw (2UL << RS_fontShift) -// fake styles -#define RS_Blink 0x00010000UL // blink -#define RS_RVid 0x00020000UL // reverse video -#define RS_Uline 0x00040000UL // underline - -// toggle this to force redraw, must be != RS_Careful -#define RS_redraw 0x01000000UL +#define RS_Sel (1UL << 22) // 5 custom bits for extensions -#define RS_customCount 32 -#define RS_customMask 0x00f80000UL -#define RS_customShift 19 +#define RS_customCount 16UL +#define RS_customShift 23 +#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) -// other flags -#define RS_Careful 0x80000000UL /* be careful when drawing these */ +// font styles +#define RS_Bold (1UL << RS_styleShift) +#define RS_Italic (2UL << RS_styleShift) #define RS_styleCount 4 +#define RS_styleShift 27 #define RS_styleMask (RS_Bold | RS_Italic) -#define RS_styleShift 14 + +// fake styles +#define RS_Blink (1UL << 29) +#define RS_RVid (1UL << 30) // reverse video +#define RS_Uline (1UL << 31) // underline #define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) #define RS_attrMask (RS_baseattrMask | RS_fontMask) -#define RS_fontCount rxvt_fontset::fontCount -#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful -#define RS_fontShift 24 - -#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) -#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) +#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) +#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) #define Sel_none 0 /* Not waiting */ #define Sel_normal 0x01 /* normal selection */ @@ -382,7 +393,8 @@ XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color XTerm_Color05 = 15, // not implemented (tektronix fg) XTerm_Color06 = 16, // not implemented (tektronix bg) - XTerm_Color_RV = 17, // change actual 'Highlight' color + XTerm_Color_HC = 17, // change actual 'Highlight' bg color + XTerm_Color_HTC = 19, // change actual 'Highlight' fg color XTerm_logfile = 46, // not implemented XTerm_font = 50, @@ -394,8 +406,6 @@ */ // deprecated - Rxvt_Color_BD = 18, - Rxvt_Color_UL = 19, Rxvt_restoreFG = 39, Rxvt_restoreBG = 49, @@ -459,7 +469,11 @@ Color_White = maxCOLOR, #endif minTermCOLOR = Color_White + 1, +#if USE_256_COLORS + maxTermCOLOR = Color_White + 240, +#else maxTermCOLOR = Color_White + 72, +#endif #ifndef NO_CURSORCOLOR Color_cursor, Color_cursor2, @@ -478,6 +492,7 @@ #endif #ifdef OPTION_HC Color_HC, + Color_HTC, #endif Color_scroll, #ifdef RXVT_SCROLLBAR @@ -499,7 +514,11 @@ #endif }; -#define Color_Bits 7 // 0 .. maxTermCOLOR +#if USE_256_COLORS +# define Color_Bits 9 // 0 .. maxTermCOLOR +#else +# define Color_Bits 7 // 0 .. maxTermCOLOR +#endif /* * Resource list @@ -620,8 +639,8 @@ #define ROW(n) ROW_of (this, n) /* how to build & extract colors and attributes */ -#define GET_BASEFG(x) (((x) & RS_fgMask)) -#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) +#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift) +#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift) #define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) #define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) @@ -630,12 +649,15 @@ #define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) #define GET_ATTR(x) (((x) & RS_attrMask)) -#define GET_BGATTR(x) \ - (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ - | (((x) & RS_fgMask)< RS_bgShift +#define GET_BGATTR(x) \ + (expect_false ((x) & RS_RVid) \ + ? (((x) & (RS_attrMask & ~RS_RVid)) \ + | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ + : ((x) & (RS_attrMask | RS_bgMask))) +#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) +#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) #define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) #define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) @@ -943,7 +965,6 @@ XSizeHints szHint; rxvt_color *pix_colors; Cursor TermWin_cursor; /* cursor for vt window */ - int numlock_state; line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf line_t *drawn_buf; // text on screen line_t *swap_buf; // lines for swap buffer