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.404 by sf-exg, Sun Apr 18 11:06:46 2010 UTC vs.
Revision 1.409 by root, Sun May 23 00:37:19 2010 UTC

… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 247# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 248#else
249# define COLORTERMENVFULL COLORTERMENV 249# define COLORTERMENVFULL COLORTERMENV
250#endif 250#endif
251#ifndef TERMENV 251#ifndef TERMENV
252# ifdef USE_256_COLORS 252# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color" 253# define TERMENV "rxvt-unicode-256color"
254# else 254# else
255# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif 256# endif
257#endif 257#endif
… …
323#define RS_fgMask (RS_colorMask << RS_fgShift) 323#define RS_fgMask (RS_colorMask << RS_fgShift)
324 324
325// must have space for rxvt_fontset::fontCount * 2 + 2 values 325// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits) 326#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
328#define RS_fontCount rxvt_fontset::fontCount
328#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful 329#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
329 330
330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 331// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
331#define RS_redraw (2UL << RS_fontShift) 332#define RS_redraw (2UL << RS_fontShift)
332 333
333#define RS_Sel (1UL << 22) 334#define RS_Sel (1UL << 22)
334 335
335// 5 custom bits for extensions 336// 4 custom bits for extensions
336#define RS_customCount 16UL 337#define RS_customCount 16UL
337#define RS_customShift 23 338#define RS_customShift 23
338#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
339 340
340// font styles 341// font styles
… …
391 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
392 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
393 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
394 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
395 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
396 XTerm_Color_HC = 17, // change actual 'Highlight' color 397 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
398 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
397 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
398 XTerm_font = 50, 400 XTerm_font = 50,
399 401
400 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
401 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
466 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
467#else 469#else
468 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
469#endif 471#endif
470 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
471#ifndef USE_256_COLORS 473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
472 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
473#else
474 maxTermCOLOR = Color_White + 240,
475#endif 477#endif
476#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
477 Color_cursor, 479 Color_cursor,
478 Color_cursor2, 480 Color_cursor2,
479#endif 481#endif
… …
511#else 513#else
512 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
513#endif 515#endif
514}; 516};
515 517
516#ifndef USE_256_COLORS 518#if USE_256_COLORS
517#define Color_Bits 7 // 0 .. maxTermCOLOR 519# define Color_Bits 9 // 0 .. maxTermCOLOR
518#else 520#else
519#define Color_Bits 9 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
520#endif 522#endif
521 523
522/* 524/*
523 * Resource list 525 * Resource list
524 */ 526 */
… …
613/* 615/*
614 ***************************************************************************** 616 *****************************************************************************
615 * MACRO DEFINES 617 * MACRO DEFINES
616 ***************************************************************************** 618 *****************************************************************************
617 */ 619 */
620
621// speed hack, copy some member variable into a local variable of the same name
618#define dLocal(type,name) type const name = this->name 622#define dLocal(type,name) type const name = this->name
619 623
620// for speed reasons, we assume that all codepoints 32 to 126 are 624// for speed reasons, we assume that all codepoints 32 to 126 are
621// single-width. 625// single-width.
622#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 626#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))

Diff Legend

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