ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.382 by root, Tue Mar 30 22:46:25 2010 UTC vs.
Revision 1.387 by root, Wed Mar 31 23:19:06 2010 UTC

… …
306 SECONDARY, 306 SECONDARY,
307}; 307};
308 308
309#define RS_None 0 309#define RS_None 0
310 310
311#define RS_fgMask 0x0000007fUL // 128 colors 311#define RS_colorMask 0x0000007fUL // 128 colors
312#define RS_bgMask 0x00003f80UL // 128 colors 312#define RS_fgShift 0
313#define RS_bgShift Color_Bits
314#define RS_fgMask (RS_colorMask << RS_fgShift)
315#define RS_bgMask (RS_colorMask << RS_bgShift)
313 316
314// font styles 317// font styles
315#define RS_Bold 0x00004000UL // value 1 318#define RS_Bold 0x00004000UL // value 1
316#define RS_Italic 0x00008000UL // value 2 319#define RS_Italic 0x00008000UL // value 2
317 320
318// fake styles 321// fake styles
319#define RS_Blink 0x00010000UL // blink 322#define RS_Blink 0x00010000UL // blink
320#define RS_RVid 0x00020000UL // reverse video 323#define RS_RVid 0x00020000UL // reverse video
321#define RS_Uline 0x00040000UL // underline 324#define RS_Uline 0x00040000UL // underline
322 325
323// toggle this to force redraw, must be != RS_Careful
324#define RS_redraw 0x01000000UL
325
326// 5 custom bits for extensions 326// 5 custom bits for extensions
327#define RS_customCount 32 327#define RS_customCount 16
328#define RS_customMask 0x00f80000UL 328#define RS_customMask 0x00780000UL
329#define RS_customShift 19 329#define RS_customShift 19
330 330
331// other flags 331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0xf8000000UL // includes RS_Careful
333#define RS_fontShift 27
332#define RS_Careful 0x80000000UL /* be careful when drawing these */ 334#define RS_Careful 0x08000000UL /* be careful when drawing these */
335
336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
337#define RS_redraw 0x02000000UL
333 338
334#define RS_styleCount 4 339#define RS_styleCount 4
335#define RS_styleMask (RS_Bold | RS_Italic) 340#define RS_styleMask (RS_Bold | RS_Italic)
336#define RS_styleShift 14 341#define RS_styleShift 14
337 342
338#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 343#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
339#define RS_attrMask (RS_baseattrMask | RS_fontMask) 344#define RS_attrMask (RS_baseattrMask | RS_fontMask)
340 345
341#define RS_fontCount rxvt_fontset::fontCount
342#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
343#define RS_fontShift 24
344
345#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 346#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
346#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 347#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
347 348
348#define Sel_none 0 /* Not waiting */ 349#define Sel_none 0 /* Not waiting */
349#define Sel_normal 0x01 /* normal selection */ 350#define Sel_normal 0x01 /* normal selection */
350#define Sel_incr 0x02 /* incremental selection */ 351#define Sel_incr 0x02 /* incremental selection */
351#define Sel_direct 0x00 352#define Sel_direct 0x00
… …
618 619
619#define LINENO(n) LINENO_of (this, n) 620#define LINENO(n) LINENO_of (this, n)
620#define ROW(n) ROW_of (this, n) 621#define ROW(n) ROW_of (this, n)
621 622
622/* how to build & extract colors and attributes */ 623/* how to build & extract colors and attributes */
623#define GET_BASEFG(x) (((x) & RS_fgMask)) 624#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
624#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 625#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
625 626
626#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 627#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
627#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 628#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
628 629
629#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 630#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
630#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 631#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
631 632
632#define GET_ATTR(x) (((x) & RS_attrMask)) 633#define GET_ATTR(x) (((x) & RS_attrMask))
633#define GET_BGATTR(x) \ 634#define GET_BGATTR(x) \
634 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 635 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
635 | (((x) & RS_fgMask)<<Color_Bits)) \ 636 | (((x) & RS_colorMask) << RS_bgShift)) \
636 : ((x) & (RS_attrMask | RS_bgMask))) 637 : ((x) & (RS_attrMask | RS_bgMask)))
637#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 638#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
638#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 639#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
639#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 640#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
640 641
641#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 642#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
642 643
643#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 644#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
986 hidden_text:1, 987 hidden_text:1,
987#endif 988#endif
988#if POINTER_BLANK 989#if POINTER_BLANK
989 hidden_pointer:1, 990 hidden_pointer:1,
990#endif 991#endif
991 enc_utf8:1, /* wether locale uses utf-8 */ 992 enc_utf8:1, /* whether locale uses utf-8 */
992 seen_input:1, /* wether we have seen some program output yet */ 993 seen_input:1, /* whether we have seen some program output yet */
993 seen_resize:1, /* wether we had a resize event */ 994 seen_resize:1, /* whether we had a resize event */
994 parsed_geometry:1; 995 parsed_geometry:1;
995 996
996 unsigned char refresh_type, 997 unsigned char refresh_type,
997#ifdef META8_OPTION 998#ifdef META8_OPTION
998 meta_char, /* Alt-key prefix */ 999 meta_char, /* Alt-key prefix */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines