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.396 by root, Thu Apr 1 00:58:38 2010 UTC vs.
Revision 1.403 by sf-exg, Sat Apr 17 23:00:45 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
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
… …
303/* arguments for rxvt_scr_change_screen () */ 307/* arguments for rxvt_scr_change_screen () */
304enum { 308enum {
305 PRIMARY = 0, 309 PRIMARY = 0,
306 SECONDARY, 310 SECONDARY,
307}; 311};
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
308 315
309#define RS_None 0 316#define RS_None 0
310 317
311// GET_BGATTR depends on RS_fgShift > RS_bgShift 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_colorMask ((1UL << Color_Bits) - 1UL) 319#define RS_colorMask ((1UL << Color_Bits) - 1UL)
313#define RS_bgShift 0 320#define RS_bgShift 0
314#define RS_fgShift (RS_bgShift + Color_Bits) 321#define RS_fgShift (RS_bgShift + Color_Bits)
315#define RS_bgMask (RS_colorMask << RS_bgShift) 322#define RS_bgMask (RS_colorMask << RS_bgShift)
316#define RS_fgMask (RS_colorMask << RS_fgShift) 323#define RS_fgMask (RS_colorMask << RS_fgShift)
317 324
318// font styles 325// must have space for rxvt_fontset::fontCount * 2 + 2 values
319#define RS_Bold 0x08000000UL // value 1 326#define RS_fontShift (RS_fgShift + Color_Bits)
320#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
321 329
322#define RS_styleCount 4 330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
323#define RS_styleMask (RS_Bold | RS_Italic) 331#define RS_redraw (2UL << RS_fontShift)
324#define RS_styleShift 27
325 332
326// fake styles 333#define RS_Sel (1UL << 22)
327#define RS_Blink 0x20000000UL // blink
328#define RS_RVid 0x40000000UL // reverse video
329#define RS_Uline 0x80000000UL // underline
330 334
331// 5 custom bits for extensions 335// 5 custom bits for extensions
332#define RS_customCount 16UL 336#define RS_customCount 16UL
333#define RS_customShift 23 337#define RS_customShift 23
334#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 338#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
335 339
336// must have space for rxvt_fontset::fontCount * 2 + 2 values 340// font styles
337#define RS_fontShift (RS_fgShift + Color_Bits) 341#define RS_Bold (1UL << RS_styleShift)
338#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
339#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
340
341// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
342#define RS_redraw (2UL << RS_fontShift) 342#define RS_Italic (2UL << RS_styleShift)
343
344#define RS_styleCount 4
345#define RS_styleShift 27
346#define RS_styleMask (RS_Bold | RS_Italic)
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
343 352
344#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)
345#define RS_attrMask (RS_baseattrMask | RS_fontMask) 354#define RS_attrMask (RS_baseattrMask | RS_fontMask)
346 355
347#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))
… …
382 XTerm_Color_cursor = 12, // change actual 'Cursor' color 391 XTerm_Color_cursor = 12, // change actual 'Cursor' color
383 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 392 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
384 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 393 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
385 XTerm_Color05 = 15, // not implemented (tektronix fg) 394 XTerm_Color05 = 15, // not implemented (tektronix fg)
386 XTerm_Color06 = 16, // not implemented (tektronix bg) 395 XTerm_Color06 = 16, // not implemented (tektronix bg)
387 XTerm_Color_RV = 17, // change actual 'Highlight' color 396 XTerm_Color_HC = 17, // change actual 'Highlight' color
388 XTerm_logfile = 46, // not implemented 397 XTerm_logfile = 46, // not implemented
389 XTerm_font = 50, 398 XTerm_font = 50,
390 399
391 XTerm_konsole30 = 30, // reserved for konsole 400 XTerm_konsole30 = 30, // reserved for konsole
392 XTerm_konsole31 = 31, // reserved for konsole 401 XTerm_konsole31 = 31, // reserved for konsole
… …
482#if ENABLE_FRILLS 491#if ENABLE_FRILLS
483 Color_underline, 492 Color_underline,
484#endif 493#endif
485#ifdef OPTION_HC 494#ifdef OPTION_HC
486 Color_HC, 495 Color_HC,
496 Color_HTC,
487#endif 497#endif
488 Color_scroll, 498 Color_scroll,
489#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
490 Color_trough, 500 Color_trough,
491#endif 501#endif
… …
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