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.397 by root, Thu Apr 1 01:01:44 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// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_bgMask 0x00003f80UL // 128 colors 312#define RS_colorMask ((1UL << Color_Bits) - 1UL)
313#define RS_bgShift 0
314#define RS_fgShift (RS_bgShift + Color_Bits)
315#define RS_bgMask (RS_colorMask << RS_bgShift)
316#define RS_fgMask (RS_colorMask << RS_fgShift)
317
318// must have space for rxvt_fontset::fontCount * 2 + 2 values
319#define RS_fontShift (RS_fgShift + Color_Bits)
320#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
321#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
322
323// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
324#define RS_redraw (2UL << RS_fontShift)
325
326// 5 custom bits for extensions
327#define RS_customCount 16UL
328#define RS_customShift 23
329#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
313 330
314// font styles 331// font styles
315#define RS_Bold 0x00004000UL // value 1 332#define RS_Bold (1UL << RS_styleShift)
316#define RS_Italic 0x00008000UL // value 2 333#define RS_Italic (2UL << RS_styleShift)
334
335#define RS_styleCount 4
336#define RS_styleShift 27
337#define RS_styleMask (RS_Bold | RS_Italic)
317 338
318// fake styles 339// fake styles
319#define RS_Blink 0x00010000UL // blink 340#define RS_Blink (1UL << 29)
320#define RS_RVid 0x00020000UL // reverse video 341#define RS_RVid (1UL << 30) // reverse video
321#define RS_Uline 0x00040000UL // underline 342#define RS_Uline (1UL << 31) // underline
322
323// toggle this to force redraw, must be != RS_Careful
324#define RS_redraw 0x01000000UL
325
326// 5 custom bits for extensions
327#define RS_customCount 32
328#define RS_customMask 0x00f80000UL
329#define RS_customShift 19
330
331// other flags
332#define RS_Careful 0x80000000UL /* be careful when drawing these */
333
334#define RS_styleCount 4
335#define RS_styleMask (RS_Bold | RS_Italic)
336#define RS_styleShift 14
337 343
338#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 344#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
339#define RS_attrMask (RS_baseattrMask | RS_fontMask) 345#define RS_attrMask (RS_baseattrMask | RS_fontMask)
340 346
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)) 347#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)) 348#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
347 349
348#define Sel_none 0 /* Not waiting */ 350#define Sel_none 0 /* Not waiting */
349#define Sel_normal 0x01 /* normal selection */ 351#define Sel_normal 0x01 /* normal selection */
350#define Sel_incr 0x02 /* incremental selection */ 352#define Sel_incr 0x02 /* incremental selection */
351#define Sel_direct 0x00 353#define Sel_direct 0x00
… …
457 Color_White = maxBrightCOLOR, 459 Color_White = maxBrightCOLOR,
458#else 460#else
459 Color_White = maxCOLOR, 461 Color_White = maxCOLOR,
460#endif 462#endif
461 minTermCOLOR = Color_White + 1, 463 minTermCOLOR = Color_White + 1,
464#ifndef USE_256_COLORS
462 maxTermCOLOR = Color_White + 72, 465 maxTermCOLOR = Color_White + 72,
466#else
467 maxTermCOLOR = Color_White + 240,
468#endif
463#ifndef NO_CURSORCOLOR 469#ifndef NO_CURSORCOLOR
464 Color_cursor, 470 Color_cursor,
465 Color_cursor2, 471 Color_cursor2,
466#endif 472#endif
467 Color_pointer_fg, 473 Color_pointer_fg,
… …
497#else 503#else
498 TOTAL_COLORS = NRS_COLORS 504 TOTAL_COLORS = NRS_COLORS
499#endif 505#endif
500}; 506};
501 507
508#ifndef USE_256_COLORS
502#define Color_Bits 7 // 0 .. maxTermCOLOR 509#define Color_Bits 7 // 0 .. maxTermCOLOR
510#else
511#define Color_Bits 9 // 0 .. maxTermCOLOR
512#endif
503 513
504/* 514/*
505 * Resource list 515 * Resource list
506 */ 516 */
507enum { 517enum {
… …
618 628
619#define LINENO(n) LINENO_of (this, n) 629#define LINENO(n) LINENO_of (this, n)
620#define ROW(n) ROW_of (this, n) 630#define ROW(n) ROW_of (this, n)
621 631
622/* how to build & extract colors and attributes */ 632/* how to build & extract colors and attributes */
623#define GET_BASEFG(x) (((x) & RS_fgMask)) 633#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
624#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 634#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
625 635
626#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 636#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
627#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 637#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
628 638
629#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 639#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
630#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 640#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
631 641
632#define GET_ATTR(x) (((x) & RS_attrMask)) 642#define GET_ATTR(x) (((x) & RS_attrMask))
643// return attributes defining the background, encoding doesn't matter
644// depends on RS_fgShift > RS_bgShift
633#define GET_BGATTR(x) \ 645#define GET_BGATTR(x) \
646 (expect_false ((x) & RS_RVid) \
634 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 647 ? (((x) & (RS_attrMask & ~RS_RVid)) \
635 | (((x) & RS_fgMask)<<Color_Bits)) \ 648 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
636 : ((x) & (RS_attrMask | RS_bgMask))) 649 : ((x) & (RS_attrMask | RS_bgMask)))
637#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
638#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
639#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 652#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
640 653
641#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 654#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
642 655
643#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 656#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
986 hidden_text:1, 999 hidden_text:1,
987#endif 1000#endif
988#if POINTER_BLANK 1001#if POINTER_BLANK
989 hidden_pointer:1, 1002 hidden_pointer:1,
990#endif 1003#endif
991 enc_utf8:1, /* wether locale uses utf-8 */ 1004 enc_utf8:1, /* whether locale uses utf-8 */
992 seen_input:1, /* wether we have seen some program output yet */ 1005 seen_input:1, /* whether we have seen some program output yet */
993 seen_resize:1, /* wether we had a resize event */ 1006 seen_resize:1, /* whether we had a resize event */
994 parsed_geometry:1; 1007 parsed_geometry:1;
995 1008
996 unsigned char refresh_type, 1009 unsigned char refresh_type,
997#ifdef META8_OPTION 1010#ifdef META8_OPTION
998 meta_char, /* Alt-key prefix */ 1011 meta_char, /* Alt-key prefix */

Diff Legend

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