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

Diff Legend

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