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.387 by root, Wed Mar 31 23:19:06 2010 UTC vs.
Revision 1.388 by root, Wed Mar 31 23:30:28 2010 UTC

… …
313#define RS_bgShift Color_Bits 313#define RS_bgShift Color_Bits
314#define RS_fgMask (RS_colorMask << RS_fgShift) 314#define RS_fgMask (RS_colorMask << RS_fgShift)
315#define RS_bgMask (RS_colorMask << RS_bgShift) 315#define RS_bgMask (RS_colorMask << RS_bgShift)
316 316
317// font styles 317// font styles
318#define RS_Bold 0x00004000UL // value 1 318#define RS_Bold 0x08000000UL // value 1
319#define RS_Italic 0x00008000UL // value 2 319#define RS_Italic 0x10000000UL // value 2
320 320
321// fake styles 321// fake styles
322#define RS_Blink 0x00010000UL // blink 322#define RS_Blink 0x20000000UL // blink
323#define RS_RVid 0x00020000UL // reverse video 323#define RS_RVid 0x40000000UL // reverse video
324#define RS_Uline 0x00040000UL // underline 324#define RS_Uline 0x80000000UL // underline
325 325
326// 5 custom bits for extensions 326// 5 custom bits for extensions
327#define RS_customCount 16 327#define RS_customCount 16
328#define RS_customMask 0x00780000UL 328#define RS_customMask 0x07800000UL
329#define RS_customShift 19 329#define RS_customShift 23
330 330
331// must have space for rxvt_fontset::fontCount * 2 + 2 values 331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0xf8000000UL // includes RS_Careful 332#define RS_fontMask 0x001f0000UL // includes RS_Careful
333#define RS_fontShift 27 333#define RS_fontShift 16
334#define RS_Careful 0x08000000UL /* be careful when drawing these */ 334#define RS_Careful 0x00010000UL /* be careful when drawing these */
335 335
336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
337#define RS_redraw 0x02000000UL 337#define RS_redraw 0x00020000UL
338 338
339#define RS_styleCount 4 339#define RS_styleCount 4
340#define RS_styleMask (RS_Bold | RS_Italic) 340#define RS_styleMask (RS_Bold | RS_Italic)
341#define RS_styleShift 14 341#define RS_styleShift 27
342 342
343#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)
344#define RS_attrMask (RS_baseattrMask | RS_fontMask) 344#define RS_attrMask (RS_baseattrMask | RS_fontMask)
345 345
346#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 346#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
… …
458 Color_White = maxBrightCOLOR, 458 Color_White = maxBrightCOLOR,
459#else 459#else
460 Color_White = maxCOLOR, 460 Color_White = maxCOLOR,
461#endif 461#endif
462 minTermCOLOR = Color_White + 1, 462 minTermCOLOR = Color_White + 1,
463#ifndef XTERM_256_COLORS
463 maxTermCOLOR = Color_White + 72, 464 maxTermCOLOR = Color_White + 72,
465#else
466 maxTermCOLOR = Color_White + 240,
467#endif
464#ifndef NO_CURSORCOLOR 468#ifndef NO_CURSORCOLOR
465 Color_cursor, 469 Color_cursor,
466 Color_cursor2, 470 Color_cursor2,
467#endif 471#endif
468 Color_pointer_fg, 472 Color_pointer_fg,
… …
498#else 502#else
499 TOTAL_COLORS = NRS_COLORS 503 TOTAL_COLORS = NRS_COLORS
500#endif 504#endif
501}; 505};
502 506
507#ifndef XTERM_256_COLORS
503#define Color_Bits 7 // 0 .. maxTermCOLOR 508#define Color_Bits 7 // 0 .. maxTermCOLOR
509#else
510#define Color_Bits 9 // 0 .. maxTermCOLOR
511#endif
504 512
505/* 513/*
506 * Resource list 514 * Resource list
507 */ 515 */
508enum { 516enum {

Diff Legend

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