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.391 by sf-exg, Thu Apr 1 00:12:33 2010 UTC vs.
Revision 1.408 by root, Sun May 23 00:12:02 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# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color"
254# else
252# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif
253#endif 257#endif
254 258
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 261#endif
… …
304enum { 308enum {
305 PRIMARY = 0, 309 PRIMARY = 0,
306 SECONDARY, 310 SECONDARY,
307}; 311};
308 312
313// define various rendition bits and masks. the rendition word
314// is 32 bits in size, and we should use it as efficiently as possible
315
309#define RS_None 0 316#define RS_None 0
310 317
311#ifndef USE_256_COLORS 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_colorMask 0x0000007fUL // 128 colors 319#define RS_colorMask ((1UL << Color_Bits) - 1UL)
313#else
314#define RS_colorMask 0x000001ffUL
315#endif
316#define RS_fgShift 0 320#define RS_bgShift 0
317#define RS_bgShift Color_Bits 321#define RS_fgShift (RS_bgShift + Color_Bits)
322#define RS_bgMask (RS_colorMask << RS_bgShift)
318#define RS_fgMask (RS_colorMask << RS_fgShift) 323#define RS_fgMask (RS_colorMask << RS_fgShift)
319#define RS_bgMask (RS_colorMask << RS_bgShift) 324
325// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
328#define RS_fontCount rxvt_fontset::fontCount
329#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
330
331// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
332#define RS_redraw (2UL << RS_fontShift)
333
334#define RS_Sel (1UL << 22)
335
336// 4 custom bits for extensions
337#define RS_customCount 16UL
338#define RS_customShift 23
339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
320 340
321// font styles 341// font styles
322#define RS_Bold 0x08000000UL // value 1 342#define RS_Bold (1UL << RS_styleShift)
323#define RS_Italic 0x10000000UL // value 2 343#define RS_Italic (2UL << RS_styleShift)
344
345#define RS_styleCount 4
346#define RS_styleShift 27
347#define RS_styleMask (RS_Bold | RS_Italic)
324 348
325// fake styles 349// fake styles
326#define RS_Blink 0x20000000UL // blink 350#define RS_Blink (1UL << 29)
327#define RS_RVid 0x40000000UL // reverse video 351#define RS_RVid (1UL << 30) // reverse video
328#define RS_Uline 0x80000000UL // underline 352#define RS_Uline (1UL << 31) // underline
329
330// 5 custom bits for extensions
331#define RS_customCount 16
332#define RS_customMask 0x07800000UL
333#define RS_customShift 23
334
335// must have space for rxvt_fontset::fontCount * 2 + 2 values
336#define RS_fontMask 0x007c0000UL // includes RS_Careful
337#define RS_fontShift 18
338#define RS_Careful 0x00010000UL /* be careful when drawing these */
339
340// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
341#define RS_redraw 0x00020000UL
342
343#define RS_styleCount 4
344#define RS_styleMask (RS_Bold | RS_Italic)
345#define RS_styleShift 27
346 353
347#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
348#define RS_attrMask (RS_baseattrMask | RS_fontMask) 355#define RS_attrMask (RS_baseattrMask | RS_fontMask)
349 356
350#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
… …
385 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
386 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
387 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
388 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
389 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
390 XTerm_Color_RV = 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
391 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
392 XTerm_font = 50, 400 XTerm_font = 50,
393 401
394 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
395 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
397 /* 405 /*
398 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
399 */ 407 */
400 408
401 // deprecated 409 // deprecated
402 Rxvt_Color_BD = 18,
403 Rxvt_Color_UL = 19,
404 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
405 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
406 412
407 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
408 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
462 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
463#else 469#else
464 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
465#endif 471#endif
466 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
467#ifndef USE_256_COLORS 473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
468 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
469#else
470 maxTermCOLOR = Color_White + 240,
471#endif 477#endif
472#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
473 Color_cursor, 479 Color_cursor,
474 Color_cursor2, 480 Color_cursor2,
475#endif 481#endif
… …
485#if ENABLE_FRILLS 491#if ENABLE_FRILLS
486 Color_underline, 492 Color_underline,
487#endif 493#endif
488#ifdef OPTION_HC 494#ifdef OPTION_HC
489 Color_HC, 495 Color_HC,
496 Color_HTC,
490#endif 497#endif
491 Color_scroll, 498 Color_scroll,
492#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
493 Color_trough, 500 Color_trough,
494#endif 501#endif
… …
506#else 513#else
507 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
508#endif 515#endif
509}; 516};
510 517
511#ifndef USE_256_COLORS 518#if USE_256_COLORS
512#define Color_Bits 7 // 0 .. maxTermCOLOR 519# define Color_Bits 9 // 0 .. maxTermCOLOR
513#else 520#else
514#define Color_Bits 9 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
515#endif 522#endif
516 523
517/* 524/*
518 * Resource list 525 * Resource list
519 */ 526 */
… …
641 648
642#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 649#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
643#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 650#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
644 651
645#define GET_ATTR(x) (((x) & RS_attrMask)) 652#define GET_ATTR(x) (((x) & RS_attrMask))
653// return attributes defining the background, encoding doesn't matter
654// depends on RS_fgShift > RS_bgShift
646#define GET_BGATTR(x) \ 655#define GET_BGATTR(x) \
656 (expect_false ((x) & RS_RVid) \
647 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 657 ? (((x) & (RS_attrMask & ~RS_RVid)) \
648 | (((x) & RS_colorMask) << RS_bgShift)) \ 658 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
649 : ((x) & (RS_attrMask | RS_bgMask))) 659 : ((x) & (RS_attrMask | RS_bgMask)))
650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 660#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 661#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
652#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 662#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
653 663
654#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 664#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
… …
954 scrollBar_t scrollBar; 964 scrollBar_t scrollBar;
955 uint8_t options[(Opt_count + 7) >> 3]; 965 uint8_t options[(Opt_count + 7) >> 3];
956 XSizeHints szHint; 966 XSizeHints szHint;
957 rxvt_color *pix_colors; 967 rxvt_color *pix_colors;
958 Cursor TermWin_cursor; /* cursor for vt window */ 968 Cursor TermWin_cursor; /* cursor for vt window */
959 int numlock_state;
960 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 969 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
961 line_t *drawn_buf; // text on screen 970 line_t *drawn_buf; // text on screen
962 line_t *swap_buf; // lines for swap buffer 971 line_t *swap_buf; // lines for swap buffer
963 char *tabs; /* per location: 1 == tab-stop */ 972 char *tabs; /* per location: 1 == tab-stop */
964 screen_t screen; 973 screen_t screen;

Diff Legend

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