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.386 by root, Wed Mar 31 23:01:51 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# 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#define RS_fgMask 0x0000007fUL // 128 colors 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_bgMask 0x00003f80UL // 128 colors 319#define RS_colorMask ((1UL << Color_Bits) - 1UL)
320#define RS_bgShift 0
321#define RS_fgShift (RS_bgShift + Color_Bits)
322#define RS_bgMask (RS_colorMask << RS_bgShift)
323#define RS_fgMask (RS_colorMask << RS_fgShift)
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)
313 340
314// font styles 341// font styles
315#define RS_Bold 0x00004000UL // value 1 342#define RS_Bold (1UL << RS_styleShift)
316#define RS_Italic 0x00008000UL // 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)
317 348
318// fake styles 349// fake styles
319#define RS_Blink 0x00010000UL // blink 350#define RS_Blink (1UL << 29)
320#define RS_RVid 0x00020000UL // reverse video 351#define RS_RVid (1UL << 30) // reverse video
321#define RS_Uline 0x00040000UL // underline 352#define RS_Uline (1UL << 31) // underline
322
323// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
324#define RS_redraw 0x02000000UL
325
326// 5 custom bits for extensions
327#define RS_customCount 16
328#define RS_customMask 0x00780000UL
329#define RS_customShift 19
330
331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0xf8000000UL // includes RS_Careful
333#define RS_fontShift 27
334#define RS_Careful 0x08000000UL /* be careful when drawing these */
335
336#define RS_styleCount 4
337#define RS_styleMask (RS_Bold | RS_Italic)
338#define RS_styleShift 14
339 353
340#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)
341#define RS_attrMask (RS_baseattrMask | RS_fontMask) 355#define RS_attrMask (RS_baseattrMask | RS_fontMask)
342 356
343#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
344#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 358#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
345 359
346#define Sel_none 0 /* Not waiting */ 360#define Sel_none 0 /* Not waiting */
347#define Sel_normal 0x01 /* normal selection */ 361#define Sel_normal 0x01 /* normal selection */
348#define Sel_incr 0x02 /* incremental selection */ 362#define Sel_incr 0x02 /* incremental selection */
349#define Sel_direct 0x00 363#define Sel_direct 0x00
… …
378 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
379 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
380 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
381 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
382 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
383 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
384 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
385 XTerm_font = 50, 400 XTerm_font = 50,
386 401
387 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
388 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
390 /* 405 /*
391 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
392 */ 407 */
393 408
394 // deprecated 409 // deprecated
395 Rxvt_Color_BD = 18,
396 Rxvt_Color_UL = 19,
397 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
398 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
399 412
400 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
401 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
455 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
456#else 469#else
457 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
458#endif 471#endif
459 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
460 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
477#endif
461#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
462 Color_cursor, 479 Color_cursor,
463 Color_cursor2, 480 Color_cursor2,
464#endif 481#endif
465 Color_pointer_fg, 482 Color_pointer_fg,
… …
474#if ENABLE_FRILLS 491#if ENABLE_FRILLS
475 Color_underline, 492 Color_underline,
476#endif 493#endif
477#ifdef OPTION_HC 494#ifdef OPTION_HC
478 Color_HC, 495 Color_HC,
496 Color_HTC,
479#endif 497#endif
480 Color_scroll, 498 Color_scroll,
481#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
482 Color_trough, 500 Color_trough,
483#endif 501#endif
… …
495#else 513#else
496 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
497#endif 515#endif
498}; 516};
499 517
518#if USE_256_COLORS
519# define Color_Bits 9 // 0 .. maxTermCOLOR
520#else
500#define Color_Bits 7 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
522#endif
501 523
502/* 524/*
503 * Resource list 525 * Resource list
504 */ 526 */
505enum { 527enum {
… …
593/* 615/*
594 ***************************************************************************** 616 *****************************************************************************
595 * MACRO DEFINES 617 * MACRO DEFINES
596 ***************************************************************************** 618 *****************************************************************************
597 */ 619 */
620
621// speed hack, copy some member variable into a local variable of the same name
598#define dLocal(type,name) type const name = this->name 622#define dLocal(type,name) type const name = this->name
599 623
600// 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
601// single-width. 625// single-width.
602#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))
… …
616 640
617#define LINENO(n) LINENO_of (this, n) 641#define LINENO(n) LINENO_of (this, n)
618#define ROW(n) ROW_of (this, n) 642#define ROW(n) ROW_of (this, n)
619 643
620/* how to build & extract colors and attributes */ 644/* how to build & extract colors and attributes */
621#define GET_BASEFG(x) (((x) & RS_fgMask)) 645#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 646#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
623 647
624#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 648#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
625#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 649#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
626 650
627#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 651#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
628#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 652#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
629 653
630#define GET_ATTR(x) (((x) & RS_attrMask)) 654#define GET_ATTR(x) (((x) & RS_attrMask))
655// return attributes defining the background, encoding doesn't matter
656// depends on RS_fgShift > RS_bgShift
631#define GET_BGATTR(x) \ 657#define GET_BGATTR(x) \
658 (expect_false ((x) & RS_RVid) \
632 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 659 ? (((x) & (RS_attrMask & ~RS_RVid)) \
633 | (((x) & RS_fgMask)<<Color_Bits)) \ 660 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
634 : ((x) & (RS_attrMask | RS_bgMask))) 661 : ((x) & (RS_attrMask | RS_bgMask)))
635#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 662#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
636#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 663#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
637#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 664#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
638 665
639#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 666#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
640 667
641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 668#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
939 scrollBar_t scrollBar; 966 scrollBar_t scrollBar;
940 uint8_t options[(Opt_count + 7) >> 3]; 967 uint8_t options[(Opt_count + 7) >> 3];
941 XSizeHints szHint; 968 XSizeHints szHint;
942 rxvt_color *pix_colors; 969 rxvt_color *pix_colors;
943 Cursor TermWin_cursor; /* cursor for vt window */ 970 Cursor TermWin_cursor; /* cursor for vt window */
944 int numlock_state;
945 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 971 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
946 line_t *drawn_buf; // text on screen 972 line_t *drawn_buf; // text on screen
947 line_t *swap_buf; // lines for swap buffer 973 line_t *swap_buf; // lines for swap buffer
948 char *tabs; /* per location: 1 == tab-stop */ 974 char *tabs; /* per location: 1 == tab-stop */
949 screen_t screen; 975 screen_t screen;

Diff Legend

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