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.380 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs.
Revision 1.410 by sf-exg, Mon Jul 19 16:43:21 2010 UTC

… …
110 110
111#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 112# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 114# define STDERR_FILENO 2
115#endif
116
117#if !defined (EACCESS) && defined(EAGAIN)
118# define EACCESS EAGAIN
119#endif 115#endif
120 116
121#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
122# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
123# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
… …
251# define COLORTERMENVFULL COLORTERMENV "-xpm" 247# define COLORTERMENVFULL COLORTERMENV "-xpm"
252#else 248#else
253# define COLORTERMENVFULL COLORTERMENV 249# define COLORTERMENVFULL COLORTERMENV
254#endif 250#endif
255#ifndef TERMENV 251#ifndef TERMENV
252# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color"
254# else
256# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif
257#endif 257#endif
258 258
259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
260# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
261#endif 261#endif
… …
308enum { 308enum {
309 PRIMARY = 0, 309 PRIMARY = 0,
310 SECONDARY, 310 SECONDARY,
311}; 311};
312 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
313#define RS_None 0 316#define RS_None 0
314 317
315#define RS_fgMask 0x0000007fUL // 128 colors 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
316#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)
317 340
318// font styles 341// font styles
319#define RS_Bold 0x00004000UL // value 1 342#define RS_Bold (1UL << RS_styleShift)
320#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)
321 348
322// fake styles 349// fake styles
323#define RS_Blink 0x00010000UL // blink 350#define RS_Blink (1UL << 29)
324#define RS_RVid 0x00020000UL // reverse video 351#define RS_RVid (1UL << 30) // reverse video
325#define RS_Uline 0x00040000UL // underline 352#define RS_Uline (1UL << 31) // underline
326
327// toggle this to force redraw, must be != RS_Careful
328#define RS_redraw 0x01000000UL
329
330// 5 custom bits for extensions
331#define RS_customCount 32
332#define RS_customMask 0x00f80000UL
333#define RS_customShift 19
334
335// other flags
336#define RS_Careful 0x80000000UL /* be careful when drawing these */
337
338#define RS_styleCount 4
339#define RS_styleMask (RS_Bold | RS_Italic)
340#define RS_styleShift 14
341 353
342#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)
343#define RS_attrMask (RS_baseattrMask | RS_fontMask) 355#define RS_attrMask (RS_baseattrMask | RS_fontMask)
344 356
345#define RS_fontCount 127 // not 128 or 256, see rxvtfont.h
346#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
347#define RS_fontShift 24
348
349#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))
350#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))
351 359
352#define Sel_none 0 /* Not waiting */ 360#define Sel_none 0 /* Not waiting */
353#define Sel_normal 0x01 /* normal selection */ 361#define Sel_normal 0x01 /* normal selection */
354#define Sel_incr 0x02 /* incremental selection */ 362#define Sel_incr 0x02 /* incremental selection */
355#define Sel_direct 0x00 363#define Sel_direct 0x00
… …
384 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
385 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
386 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
387 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
388 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
389 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
390 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
391 XTerm_font = 50, 400 XTerm_font = 50,
392 401
393 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
394 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
396 /* 405 /*
397 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
398 */ 407 */
399 408
400 // deprecated 409 // deprecated
401 Rxvt_Color_BD = 18,
402 Rxvt_Color_UL = 19,
403 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
404 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
405 412
406 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
407 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
461 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
462#else 469#else
463 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
464#endif 471#endif
465 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
466 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
477#endif
467#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
468 Color_cursor, 479 Color_cursor,
469 Color_cursor2, 480 Color_cursor2,
470#endif 481#endif
471 Color_pointer_fg, 482 Color_pointer_fg,
… …
480#if ENABLE_FRILLS 491#if ENABLE_FRILLS
481 Color_underline, 492 Color_underline,
482#endif 493#endif
483#ifdef OPTION_HC 494#ifdef OPTION_HC
484 Color_HC, 495 Color_HC,
496 Color_HTC,
485#endif 497#endif
486 Color_scroll, 498 Color_scroll,
487#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
488 Color_trough, 500 Color_trough,
489#endif 501#endif
… …
501#else 513#else
502 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
503#endif 515#endif
504}; 516};
505 517
518#if USE_256_COLORS
519# define Color_Bits 9 // 0 .. maxTermCOLOR
520#else
506#define Color_Bits 7 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
522#endif
507 523
508/* 524/*
509 * Resource list 525 * Resource list
510 */ 526 */
511enum { 527enum {
… …
599/* 615/*
600 ***************************************************************************** 616 *****************************************************************************
601 * MACRO DEFINES 617 * MACRO DEFINES
602 ***************************************************************************** 618 *****************************************************************************
603 */ 619 */
620
621// speed hack, copy some member variable into a local variable of the same name
604#define dLocal(type,name) type const name = this->name 622#define dLocal(type,name) type const name = this->name
605 623
606// 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
607// single-width. 625// single-width.
608#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))
… …
622 640
623#define LINENO(n) LINENO_of (this, n) 641#define LINENO(n) LINENO_of (this, n)
624#define ROW(n) ROW_of (this, n) 642#define ROW(n) ROW_of (this, n)
625 643
626/* how to build & extract colors and attributes */ 644/* how to build & extract colors and attributes */
627#define GET_BASEFG(x) (((x) & RS_fgMask)) 645#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 646#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
629 647
630#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 648#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
631#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 649#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
632 650
633#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 651#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
634#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 652#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
635 653
636#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
637#define GET_BGATTR(x) \ 657#define GET_BGATTR(x) \
658 (expect_false ((x) & RS_RVid) \
638 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 659 ? (((x) & (RS_attrMask & ~RS_RVid)) \
639 | (((x) & RS_fgMask)<<Color_Bits)) \ 660 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
640 : ((x) & (RS_attrMask | RS_bgMask))) 661 : ((x) & (RS_attrMask | RS_bgMask)))
641#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 662#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
642#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 663#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
643#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 664#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
644 665
645#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 666#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
646 667
647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 668#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
945 scrollBar_t scrollBar; 966 scrollBar_t scrollBar;
946 uint8_t options[(Opt_count + 7) >> 3]; 967 uint8_t options[(Opt_count + 7) >> 3];
947 XSizeHints szHint; 968 XSizeHints szHint;
948 rxvt_color *pix_colors; 969 rxvt_color *pix_colors;
949 Cursor TermWin_cursor; /* cursor for vt window */ 970 Cursor TermWin_cursor; /* cursor for vt window */
950 int numlock_state;
951 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
952 line_t *drawn_buf; // text on screen 972 line_t *drawn_buf; // text on screen
953 line_t *swap_buf; // lines for swap buffer 973 line_t *swap_buf; // lines for swap buffer
954 char *tabs; /* per location: 1 == tab-stop */ 974 char *tabs; /* per location: 1 == tab-stop */
955 screen_t screen; 975 screen_t screen;
… …
990 hidden_text:1, 1010 hidden_text:1,
991#endif 1011#endif
992#if POINTER_BLANK 1012#if POINTER_BLANK
993 hidden_pointer:1, 1013 hidden_pointer:1,
994#endif 1014#endif
995 enc_utf8:1, /* wether locale uses utf-8 */ 1015 enc_utf8:1, /* whether locale uses utf-8 */
996 seen_input:1, /* wether we have seen some program output yet */ 1016 seen_input:1, /* whether we have seen some program output yet */
997 seen_resize:1, /* wether we had a resize event */ 1017 seen_resize:1, /* whether we had a resize event */
998 parsed_geometry:1; 1018 parsed_geometry:1;
999 1019
1000 unsigned char refresh_type, 1020 unsigned char refresh_type,
1001#ifdef META8_OPTION 1021#ifdef META8_OPTION
1002 meta_char, /* Alt-key prefix */ 1022 meta_char, /* Alt-key prefix */
… …
1288 void recolour_cursor (); 1308 void recolour_cursor ();
1289 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);
1290 void window_calc (unsigned int newwidth, unsigned int newheight); 1310 void window_calc (unsigned int newwidth, unsigned int newheight);
1291 bool set_fonts (); 1311 bool set_fonts ();
1292 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);
1293 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);
1294 void set_title (const char *str); 1315 void set_title (const char *str);
1295 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1296 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1297 void set_colorfgbg (); 1318 void set_colorfgbg ();

Diff Legend

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