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

Diff Legend

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