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.378 by root, Sun Jan 10 21:57:50 2010 UTC vs.
Revision 1.397 by root, Thu Apr 1 01:01:44 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 */
… …
310 SECONDARY, 306 SECONDARY,
311}; 307};
312 308
313#define RS_None 0 309#define RS_None 0
314 310
315#define RS_fgMask 0x0000007fUL // 128 colors 311// GET_BGATTR depends on RS_fgShift > RS_bgShift
316#define RS_bgMask 0x00003f80UL // 128 colors 312#define RS_colorMask ((1UL << Color_Bits) - 1UL)
313#define RS_bgShift 0
314#define RS_fgShift (RS_bgShift + Color_Bits)
315#define RS_bgMask (RS_colorMask << RS_bgShift)
316#define RS_fgMask (RS_colorMask << RS_fgShift)
317
318// must have space for rxvt_fontset::fontCount * 2 + 2 values
319#define RS_fontShift (RS_fgShift + Color_Bits)
320#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
321#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
322
323// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
324#define RS_redraw (2UL << RS_fontShift)
325
326// 5 custom bits for extensions
327#define RS_customCount 16UL
328#define RS_customShift 23
329#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
317 330
318// font styles 331// font styles
319#define RS_Bold 0x00004000UL // value 1 332#define RS_Bold (1UL << RS_styleShift)
320#define RS_Italic 0x00008000UL // value 2 333#define RS_Italic (2UL << RS_styleShift)
334
335#define RS_styleCount 4
336#define RS_styleShift 27
337#define RS_styleMask (RS_Bold | RS_Italic)
321 338
322// fake styles 339// fake styles
323#define RS_Blink 0x00010000UL // blink 340#define RS_Blink (1UL << 29)
324#define RS_RVid 0x00020000UL // reverse video 341#define RS_RVid (1UL << 30) // reverse video
325#define RS_Uline 0x00040000UL // underline 342#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 343
342#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 344#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
343#define RS_attrMask (RS_baseattrMask | RS_fontMask) 345#define RS_attrMask (RS_baseattrMask | RS_fontMask)
344 346
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)) 347#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)) 348#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
351 349
352#define Sel_none 0 /* Not waiting */ 350#define Sel_none 0 /* Not waiting */
353#define Sel_normal 0x01 /* normal selection */ 351#define Sel_normal 0x01 /* normal selection */
354#define Sel_incr 0x02 /* incremental selection */ 352#define Sel_incr 0x02 /* incremental selection */
355#define Sel_direct 0x00 353#define Sel_direct 0x00
… …
461 Color_White = maxBrightCOLOR, 459 Color_White = maxBrightCOLOR,
462#else 460#else
463 Color_White = maxCOLOR, 461 Color_White = maxCOLOR,
464#endif 462#endif
465 minTermCOLOR = Color_White + 1, 463 minTermCOLOR = Color_White + 1,
464#ifndef USE_256_COLORS
466 maxTermCOLOR = Color_White + 72, 465 maxTermCOLOR = Color_White + 72,
466#else
467 maxTermCOLOR = Color_White + 240,
468#endif
467#ifndef NO_CURSORCOLOR 469#ifndef NO_CURSORCOLOR
468 Color_cursor, 470 Color_cursor,
469 Color_cursor2, 471 Color_cursor2,
470#endif 472#endif
471 Color_pointer_fg, 473 Color_pointer_fg,
… …
501#else 503#else
502 TOTAL_COLORS = NRS_COLORS 504 TOTAL_COLORS = NRS_COLORS
503#endif 505#endif
504}; 506};
505 507
508#ifndef USE_256_COLORS
506#define Color_Bits 7 // 0 .. maxTermCOLOR 509#define Color_Bits 7 // 0 .. maxTermCOLOR
510#else
511#define Color_Bits 9 // 0 .. maxTermCOLOR
512#endif
507 513
508/* 514/*
509 * Resource list 515 * Resource list
510 */ 516 */
511enum { 517enum {
… …
622 628
623#define LINENO(n) LINENO_of (this, n) 629#define LINENO(n) LINENO_of (this, n)
624#define ROW(n) ROW_of (this, n) 630#define ROW(n) ROW_of (this, n)
625 631
626/* how to build & extract colors and attributes */ 632/* how to build & extract colors and attributes */
627#define GET_BASEFG(x) (((x) & RS_fgMask)) 633#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 634#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
629 635
630#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 636#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
631#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 637#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
632 638
633#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 639#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
634#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 640#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
635 641
636#define GET_ATTR(x) (((x) & RS_attrMask)) 642#define GET_ATTR(x) (((x) & RS_attrMask))
643// return attributes defining the background, encoding doesn't matter
644// depends on RS_fgShift > RS_bgShift
637#define GET_BGATTR(x) \ 645#define GET_BGATTR(x) \
646 (expect_false ((x) & RS_RVid) \
638 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 647 ? (((x) & (RS_attrMask & ~RS_RVid)) \
639 | (((x) & RS_fgMask)<<Color_Bits)) \ 648 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
640 : ((x) & (RS_attrMask | RS_bgMask))) 649 : ((x) & (RS_attrMask | RS_bgMask)))
641#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
642#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
643#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 652#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
644 653
645#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 654#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
646 655
647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 656#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
912 selection_op_t op; /* current operation */ 921 selection_op_t op; /* current operation */
913 bool rect; /* rectangular selection? */ 922 bool rect; /* rectangular selection? */
914 row_col_t beg; /* beginning of selection <= mark */ 923 row_col_t beg; /* beginning of selection <= mark */
915 row_col_t mark; /* point of initial click <= end */ 924 row_col_t mark; /* point of initial click <= end */
916 row_col_t end; /* one character past end point */ 925 row_col_t end; /* one character past end point */
926 wchar_t *clip_text; /* text copied to the clipboard */
927 unsigned int clip_len; /* length of clipboard text */
917}; 928};
918 929
919/* ------------------------------------------------------------------------- */ 930/* ------------------------------------------------------------------------- */
920 931
921/* screen_t flags */ 932/* screen_t flags */
… …
988 hidden_text:1, 999 hidden_text:1,
989#endif 1000#endif
990#if POINTER_BLANK 1001#if POINTER_BLANK
991 hidden_pointer:1, 1002 hidden_pointer:1,
992#endif 1003#endif
993 enc_utf8:1, /* wether locale uses utf-8 */ 1004 enc_utf8:1, /* whether locale uses utf-8 */
994 seen_input:1, /* wether we have seen some program output yet */ 1005 seen_input:1, /* whether we have seen some program output yet */
995 seen_resize:1, /* wether we had a resize event */ 1006 seen_resize:1, /* whether we had a resize event */
996 parsed_geometry:1; 1007 parsed_geometry:1;
997 1008
998 unsigned char refresh_type, 1009 unsigned char refresh_type,
999#ifdef META8_OPTION 1010#ifdef META8_OPTION
1000 meta_char, /* Alt-key prefix */ 1011 meta_char, /* Alt-key prefix */
… …
1004/* ---------- */ 1015/* ---------- */
1005 bool rvideo_state, rvideo_mode; 1016 bool rvideo_state, rvideo_mode;
1006#ifndef NO_BELL 1017#ifndef NO_BELL
1007 bool rvideo_bell; 1018 bool rvideo_bell;
1008#endif 1019#endif
1009 int num_scr; /* screen: number lines scrolled */ 1020 int num_scr; /* screen: number of lines scrolled */
1010 int prev_ncol, /* screen: previous number of columns */ 1021 int prev_ncol, /* screen: previous number of columns */
1011 prev_nrow; /* screen: previous number of rows */ 1022 prev_nrow; /* screen: previous number of rows */
1012/* ---------- */ 1023/* ---------- */
1013 rend_t rstyle; 1024 rend_t rstyle;
1014/* ---------- */ 1025/* ---------- */
… …
1044 SavedModes; 1055 SavedModes;
1045/* ---------- */ 1056/* ---------- */
1046 Atom *xa; 1057 Atom *xa;
1047/* ---------- */ 1058/* ---------- */
1048 Time selection_time, 1059 Time selection_time,
1049 selection_request_time; 1060 selection_request_time,
1061 clipboard_time;
1050 pid_t cmd_pid; /* process id of child */ 1062 pid_t cmd_pid; /* process id of child */
1051 char * incr_buf; 1063 char * incr_buf;
1052 size_t incr_buf_size, incr_buf_fill; 1064 size_t incr_buf_size, incr_buf_fill;
1053/* ---------- */ 1065/* ---------- */
1054 struct mouse_event MEvent; 1066 struct mouse_event MEvent;
… …
1451 void selection_check (int check_more) NOTHROW; 1463 void selection_check (int check_more) NOTHROW;
1452 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1453 void selection_property (Window win, Atom prop) NOTHROW; 1465 void selection_property (Window win, Atom prop) NOTHROW;
1454 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1455 int selection_request_other (Atom target, int selnum) NOTHROW; 1467 int selection_request_other (Atom target, int selnum) NOTHROW;
1456 void selection_clear () NOTHROW; 1468 void selection_clear (bool clipboard = false) NOTHROW;
1469 void clipboard_copy (Time tm);
1457 void selection_make (Time tm); 1470 void selection_make (Time tm);
1458 bool selection_grab (Time tm) NOTHROW; 1471 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1459 void selection_start_colrow (int col, int row) NOTHROW; 1472 void selection_start_colrow (int col, int row) NOTHROW;
1460 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1473 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1461 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1474 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1462 void selection_remove_trailing_spaces () NOTHROW; 1475 void selection_remove_trailing_spaces () NOTHROW;
1463 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1476 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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