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.388 by root, Wed Mar 31 23:30:28 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 0x08000000UL // value 1
316#define RS_Italic 0x00008000UL // value 2 319#define RS_Italic 0x10000000UL // value 2
317 320
318// fake styles 321// fake styles
319#define RS_Blink 0x00010000UL // blink 322#define RS_Blink 0x20000000UL // blink
320#define RS_RVid 0x00020000UL // reverse video 323#define RS_RVid 0x40000000UL // reverse video
321#define RS_Uline 0x00040000UL // underline 324#define RS_Uline 0x80000000UL // underline
322
323// toggle this to force redraw, must be != RS_Careful
324#define RS_redraw 0x01000000UL
325 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 0x07800000UL
329#define RS_customShift 19 329#define RS_customShift 23
330 330
331// other flags 331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0x001f0000UL // includes RS_Careful
333#define RS_fontShift 16
332#define RS_Careful 0x80000000UL /* be careful when drawing these */ 334#define RS_Careful 0x00010000UL /* be careful when drawing these */
335
336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
337#define RS_redraw 0x00020000UL
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 27
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
… …
457 Color_White = maxBrightCOLOR, 458 Color_White = maxBrightCOLOR,
458#else 459#else
459 Color_White = maxCOLOR, 460 Color_White = maxCOLOR,
460#endif 461#endif
461 minTermCOLOR = Color_White + 1, 462 minTermCOLOR = Color_White + 1,
463#ifndef XTERM_256_COLORS
462 maxTermCOLOR = Color_White + 72, 464 maxTermCOLOR = Color_White + 72,
465#else
466 maxTermCOLOR = Color_White + 240,
467#endif
463#ifndef NO_CURSORCOLOR 468#ifndef NO_CURSORCOLOR
464 Color_cursor, 469 Color_cursor,
465 Color_cursor2, 470 Color_cursor2,
466#endif 471#endif
467 Color_pointer_fg, 472 Color_pointer_fg,
… …
497#else 502#else
498 TOTAL_COLORS = NRS_COLORS 503 TOTAL_COLORS = NRS_COLORS
499#endif 504#endif
500}; 505};
501 506
507#ifndef XTERM_256_COLORS
502#define Color_Bits 7 // 0 .. maxTermCOLOR 508#define Color_Bits 7 // 0 .. maxTermCOLOR
509#else
510#define Color_Bits 9 // 0 .. maxTermCOLOR
511#endif
503 512
504/* 513/*
505 * Resource list 514 * Resource list
506 */ 515 */
507enum { 516enum {
… …
618 627
619#define LINENO(n) LINENO_of (this, n) 628#define LINENO(n) LINENO_of (this, n)
620#define ROW(n) ROW_of (this, n) 629#define ROW(n) ROW_of (this, n)
621 630
622/* how to build & extract colors and attributes */ 631/* how to build & extract colors and attributes */
623#define GET_BASEFG(x) (((x) & RS_fgMask)) 632#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
624#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 633#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
625 634
626#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 635#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
627#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 636#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
628 637
629#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 638#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
630#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 639#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
631 640
632#define GET_ATTR(x) (((x) & RS_attrMask)) 641#define GET_ATTR(x) (((x) & RS_attrMask))
633#define GET_BGATTR(x) \ 642#define GET_BGATTR(x) \
634 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 643 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
635 | (((x) & RS_fgMask)<<Color_Bits)) \ 644 | (((x) & RS_colorMask) << RS_bgShift)) \
636 : ((x) & (RS_attrMask | RS_bgMask))) 645 : ((x) & (RS_attrMask | RS_bgMask)))
637#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 646#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
638#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 647#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
639#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 648#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
640 649
641#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 650#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
642 651
643#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 652#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
986 hidden_text:1, 995 hidden_text:1,
987#endif 996#endif
988#if POINTER_BLANK 997#if POINTER_BLANK
989 hidden_pointer:1, 998 hidden_pointer:1,
990#endif 999#endif
991 enc_utf8:1, /* wether locale uses utf-8 */ 1000 enc_utf8:1, /* whether locale uses utf-8 */
992 seen_input:1, /* wether we have seen some program output yet */ 1001 seen_input:1, /* whether we have seen some program output yet */
993 seen_resize:1, /* wether we had a resize event */ 1002 seen_resize:1, /* whether we had a resize event */
994 parsed_geometry:1; 1003 parsed_geometry:1;
995 1004
996 unsigned char refresh_type, 1005 unsigned char refresh_type,
997#ifdef META8_OPTION 1006#ifdef META8_OPTION
998 meta_char, /* Alt-key prefix */ 1007 meta_char, /* Alt-key prefix */

Diff Legend

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