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.390 by root, Wed Mar 31 23:49:08 2010 UTC vs.
Revision 1.395 by root, Thu Apr 1 00:41:07 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_colorMask 0x0000007fUL // 128 colors 311#define RS_colorMask ((1UL << Color_Bits) - 1UL)
312#define RS_fgShift 0 312#define RS_bgShift 0
313#define RS_bgShift Color_Bits 313#define RS_fgShift (RS_bgShift + Color_Bits)
314#define RS_bgMask (RS_colorMask << RS_bgShift)
314#define RS_fgMask (RS_colorMask << RS_fgShift) 315#define RS_fgMask (RS_colorMask << RS_fgShift)
315#define RS_bgMask (RS_colorMask << RS_bgShift)
316 316
317// font styles 317// font styles
318#define RS_Bold 0x08000000UL // value 1 318#define RS_Bold 0x08000000UL // value 1
319#define RS_Italic 0x10000000UL // value 2 319#define RS_Italic 0x10000000UL // value 2
320 320
322#define RS_Blink 0x20000000UL // blink 322#define RS_Blink 0x20000000UL // blink
323#define RS_RVid 0x40000000UL // reverse video 323#define RS_RVid 0x40000000UL // reverse video
324#define RS_Uline 0x80000000UL // 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 16UL
328#define RS_customMask 0x07800000UL
329#define RS_customShift 23 328#define RS_customShift 23
329#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
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 0x007c0000UL // includes RS_Careful 332#define RS_fontShift (RS_fgShift + Color_Bits)
333#define RS_fontShift 18
334#define RS_Careful 0x00010000UL /* be careful when drawing these */ 333#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
334#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
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 0x00020000UL 337#define RS_redraw (2UL << RS_fontShift)
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 27 341#define RS_styleShift 27
342 342
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#ifndef USE_256_COLORS
464 maxTermCOLOR = Color_White + 72, 464 maxTermCOLOR = Color_White + 72,
465#else 465#else
466 maxTermCOLOR = Color_White + 240, 466 maxTermCOLOR = Color_White + 240,
467#endif 467#endif
468#ifndef NO_CURSORCOLOR 468#ifndef NO_CURSORCOLOR
502#else 502#else
503 TOTAL_COLORS = NRS_COLORS 503 TOTAL_COLORS = NRS_COLORS
504#endif 504#endif
505}; 505};
506 506
507#ifndef XTERM_256_COLORS 507#ifndef USE_256_COLORS
508#define Color_Bits 7 // 0 .. maxTermCOLOR 508#define Color_Bits 7 // 0 .. maxTermCOLOR
509#else 509#else
510#define Color_Bits 9 // 0 .. maxTermCOLOR 510#define Color_Bits 9 // 0 .. maxTermCOLOR
511#endif 511#endif
512 512

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines