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.173 by root, Sat Dec 31 16:40:28 2005 UTC vs.
Revision 1.176 by root, Sat Dec 31 19:30:25 2005 UTC

… …
376enum { 376enum {
377 PRIMARY = 0, 377 PRIMARY = 0,
378 SECONDARY, 378 SECONDARY,
379}; 379};
380 380
381#define RS_None 0 /* Normal */ 381#define RS_None 0
382 382
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 383#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 384#define RS_bgMask 0x00003f80UL // 128 colors
385 385
386// font styles 386// font styles
387#define RS_Bold 0x00004000UL // value 1 387#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 388#define RS_Italic 0x00008000UL // value 2
389 389
390// fake styles 390// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 391#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 392#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 393#define RS_Uline 0x00040000UL // underline
394 394
395// 5 bits still to go 395// 5 custom bits for extensions
396#define RS_customCount 32
397#define RS_customMask 0x00f80000UL
398#define RS_customShift 19
396 399
397// other flags 400// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 401#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 402
400#define RS_styleCount 4 403#define RS_styleCount 4
… …
573 Rs_font, 576 Rs_font,
574#if ENABLE_STYLES 577#if ENABLE_STYLES
575 Rs_boldFont, 578 Rs_boldFont,
576 Rs_italicFont, 579 Rs_italicFont,
577 Rs_boldItalicFont, 580 Rs_boldItalicFont,
581 Rs_intensityStyles,
578#endif 582#endif
579 Rs_name, 583 Rs_name,
580 Rs_title, 584 Rs_title,
581#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 585#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
582 Rs_path, 586 Rs_path,
… …
636 Rs_ext_bwidth, 640 Rs_ext_bwidth,
637 Rs_int_bwidth, 641 Rs_int_bwidth,
638 Rs_borderLess, 642 Rs_borderLess,
639 Rs_lineSpace, 643 Rs_lineSpace,
640 Rs_cursorUnderline, 644 Rs_cursorUnderline,
641 Rs_intensityStyles,
642#endif 645#endif
643#if CURSOR_BLINK 646#if CURSOR_BLINK
644 Rs_cursorBlink, 647 Rs_cursorBlink,
645#endif 648#endif
646#if ENABLE_XEMBED 649#if ENABLE_XEMBED
… …
1483 int fgcolor_of (rend_t r) 1486 int fgcolor_of (rend_t r)
1484 { 1487 {
1485 int base = GET_BASEFG (r); 1488 int base = GET_BASEFG (r);
1486#ifndef NO_BRIGHTCOLOR 1489#ifndef NO_BRIGHTCOLOR
1487 if (r & RS_Bold 1490 if (r & RS_Bold
1488 && (!ENABLE_STYLES || options & Opt_intensityStyles) 1491# if ENABLE_STYLES
1492 && OPTION (Opt_intensityStyles)
1493# endif
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1494 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR; 1495 base += minBrightCOLOR - minCOLOR;
1491#endif 1496#endif
1492 return base; 1497 return base;
1493 } 1498 }
… …
1495 int bgcolor_of (rend_t r) 1500 int bgcolor_of (rend_t r)
1496 { 1501 {
1497 int base = GET_BASEBG (r); 1502 int base = GET_BASEBG (r);
1498#ifndef NO_BRIGHTCOLOR 1503#ifndef NO_BRIGHTCOLOR
1499 if (r & RS_Blink 1504 if (r & RS_Blink
1500 && (!ENABLE_STYLES || options & Opt_intensityStyles) 1505# if ENABLE_STYLES
1506 && OPTION (Opt_intensityStyles)
1507# endif
1501 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1508 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1502 base += minBrightCOLOR - minCOLOR; 1509 base += minBrightCOLOR - minCOLOR;
1503#endif 1510#endif
1504 return base; 1511 return base;
1505 } 1512 }

Diff Legend

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