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.400 by sf-exg, Thu Apr 1 16:39:31 2010 UTC vs.
Revision 1.410 by sf-exg, Mon Jul 19 16:43:21 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
334#define RS_Sel (1UL << 22)
335
333// 5 custom bits for extensions 336// 4 custom bits for extensions
334#define RS_customCount 16UL 337#define RS_customCount 16UL
335#define RS_customShift 23 338#define RS_customShift 23
336#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
337 340
338// font styles 341// font styles
… …
389 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
390 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
391 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
392 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
393 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
394 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
395 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
396 XTerm_font = 50, 400 XTerm_font = 50,
397 401
398 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
399 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
401 /* 405 /*
402 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
403 */ 407 */
404 408
405 // deprecated 409 // deprecated
406 Rxvt_Color_BD = 18,
407 Rxvt_Color_UL = 19,
408 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
409 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
410 412
411 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
412 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
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
… …
489#if ENABLE_FRILLS 491#if ENABLE_FRILLS
490 Color_underline, 492 Color_underline,
491#endif 493#endif
492#ifdef OPTION_HC 494#ifdef OPTION_HC
493 Color_HC, 495 Color_HC,
496 Color_HTC,
494#endif 497#endif
495 Color_scroll, 498 Color_scroll,
496#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
497 Color_trough, 500 Color_trough,
498#endif 501#endif
… …
510#else 513#else
511 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
512#endif 515#endif
513}; 516};
514 517
515#ifndef USE_256_COLORS 518#if USE_256_COLORS
516#define Color_Bits 7 // 0 .. maxTermCOLOR 519# define Color_Bits 9 // 0 .. maxTermCOLOR
517#else 520#else
518#define Color_Bits 9 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
519#endif 522#endif
520 523
521/* 524/*
522 * Resource list 525 * Resource list
523 */ 526 */
… …
612/* 615/*
613 ***************************************************************************** 616 *****************************************************************************
614 * MACRO DEFINES 617 * MACRO DEFINES
615 ***************************************************************************** 618 *****************************************************************************
616 */ 619 */
620
621// speed hack, copy some member variable into a local variable of the same name
617#define dLocal(type,name) type const name = this->name 622#define dLocal(type,name) type const name = this->name
618 623
619// 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
620// single-width. 625// single-width.
621#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))
… …
961 scrollBar_t scrollBar; 966 scrollBar_t scrollBar;
962 uint8_t options[(Opt_count + 7) >> 3]; 967 uint8_t options[(Opt_count + 7) >> 3];
963 XSizeHints szHint; 968 XSizeHints szHint;
964 rxvt_color *pix_colors; 969 rxvt_color *pix_colors;
965 Cursor TermWin_cursor; /* cursor for vt window */ 970 Cursor TermWin_cursor; /* cursor for vt window */
966 int numlock_state;
967 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
968 line_t *drawn_buf; // text on screen 972 line_t *drawn_buf; // text on screen
969 line_t *swap_buf; // lines for swap buffer 973 line_t *swap_buf; // lines for swap buffer
970 char *tabs; /* per location: 1 == tab-stop */ 974 char *tabs; /* per location: 1 == tab-stop */
971 screen_t screen; 975 screen_t screen;
… …
1304 void recolour_cursor (); 1308 void recolour_cursor ();
1305 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1309 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1306 void window_calc (unsigned int newwidth, unsigned int newheight); 1310 void window_calc (unsigned int newwidth, unsigned int newheight);
1307 bool set_fonts (); 1311 bool set_fonts ();
1308 void set_string_property (Atom prop, const char *str, int len = -1); 1312 void set_string_property (Atom prop, const char *str, int len = -1);
1313 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1309 void set_utf8_property (Atom prop, const char *str, int len = -1); 1314 void set_utf8_property (Atom prop, const char *str, int len = -1);
1310 void set_title (const char *str); 1315 void set_title (const char *str);
1311 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1312 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1313 void set_colorfgbg (); 1318 void set_colorfgbg ();

Diff Legend

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