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.371 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.396 by root, Thu Apr 1 00:58:38 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 */
… …
151char * rxvt_wcstombs (const wchar_t *str, int len = -1); 147char * rxvt_wcstombs (const wchar_t *str, int len = -1);
152wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 148wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 149char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
154wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 150wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
155 151
156char * rxvt_basename (const char *str) NOTHROW; 152const char * rxvt_basename (const char *str) NOTHROW;
157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158void rxvt_log (const char *fmt,...) NOTHROW; 154void rxvt_log (const char *fmt,...) NOTHROW;
159void rxvt_warn (const char *fmt,...) NOTHROW; 155void rxvt_warn (const char *fmt,...) NOTHROW;
160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
204 200
205/* 201/*
206 * the 'essential' information for reporting Mouse Events 202 * the 'essential' information for reporting Mouse Events
207 * pared down from XButtonEvent 203 * pared down from XButtonEvent
208 */ 204 */
209struct mouse_event { 205struct mouse_event
206{
210 int clicks; 207 int clicks;
211 Time time; /* milliseconds */ 208 Time time; /* milliseconds */
212 unsigned int state; /* key or button mask */ 209 unsigned int state; /* key or button mask */
213 unsigned int button; /* detail */ 210 unsigned int button; /* detail */
214}; 211};
… …
309 SECONDARY, 306 SECONDARY,
310}; 307};
311 308
312#define RS_None 0 309#define RS_None 0
313 310
314#define RS_fgMask 0x0000007fUL // 128 colors 311// GET_BGATTR depends on RS_fgShift > RS_bgShift
315#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)
316 317
317// font styles 318// font styles
318#define RS_Bold 0x00004000UL // value 1 319#define RS_Bold 0x08000000UL // value 1
319#define RS_Italic 0x00008000UL // value 2 320#define RS_Italic 0x10000000UL // value 2
320
321// fake styles
322#define RS_Blink 0x00010000UL // blink
323#define RS_RVid 0x00020000UL // reverse video
324#define RS_Uline 0x00040000UL // underline
325
326// toggle this to force redraw, must be != RS_Careful
327#define RS_redraw 0x01000000UL
328
329// 5 custom bits for extensions
330#define RS_customCount 32
331#define RS_customMask 0x00f80000UL
332#define RS_customShift 19
333
334// other flags
335#define RS_Careful 0x80000000UL /* be careful when drawing these */
336 321
337#define RS_styleCount 4 322#define RS_styleCount 4
338#define RS_styleMask (RS_Bold | RS_Italic) 323#define RS_styleMask (RS_Bold | RS_Italic)
339#define RS_styleShift 14 324#define RS_styleShift 27
325
326// fake styles
327#define RS_Blink 0x20000000UL // blink
328#define RS_RVid 0x40000000UL // reverse video
329#define RS_Uline 0x80000000UL // underline
330
331// 5 custom bits for extensions
332#define RS_customCount 16UL
333#define RS_customShift 23
334#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
335
336// must have space for rxvt_fontset::fontCount * 2 + 2 values
337#define RS_fontShift (RS_fgShift + Color_Bits)
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)
340 343
341#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)
342#define RS_attrMask (RS_baseattrMask | RS_fontMask) 345#define RS_attrMask (RS_baseattrMask | RS_fontMask)
343 346
344#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
345#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
346#define RS_fontShift 24
347
348#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))
349#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))
350 349
351#define Sel_none 0 /* Not waiting */ 350#define Sel_none 0 /* Not waiting */
352#define Sel_normal 0x01 /* normal selection */ 351#define Sel_normal 0x01 /* normal selection */
353#define Sel_incr 0x02 /* incremental selection */ 352#define Sel_incr 0x02 /* incremental selection */
354#define Sel_direct 0x00 353#define Sel_direct 0x00
… …
410 409
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 410 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 411 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 412 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 413 URxvt_Color_UL = 707, // change actual 'Underline' color
414 URxvt_Color_border = 708,
415 415
416 URxvt_font = 710, 416 URxvt_font = 710,
417 URxvt_boldFont = 711, 417 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 418 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 419 URxvt_boldItalicFont = 713,
… …
459 Color_White = maxBrightCOLOR, 459 Color_White = maxBrightCOLOR,
460#else 460#else
461 Color_White = maxCOLOR, 461 Color_White = maxCOLOR,
462#endif 462#endif
463 minTermCOLOR = Color_White + 1, 463 minTermCOLOR = Color_White + 1,
464#ifndef USE_256_COLORS
464 maxTermCOLOR = Color_White + 72, 465 maxTermCOLOR = Color_White + 72,
466#else
467 maxTermCOLOR = Color_White + 240,
468#endif
465#ifndef NO_CURSORCOLOR 469#ifndef NO_CURSORCOLOR
466 Color_cursor, 470 Color_cursor,
467 Color_cursor2, 471 Color_cursor2,
468#endif 472#endif
469 Color_pointer_fg, 473 Color_pointer_fg,
… …
499#else 503#else
500 TOTAL_COLORS = NRS_COLORS 504 TOTAL_COLORS = NRS_COLORS
501#endif 505#endif
502}; 506};
503 507
508#ifndef USE_256_COLORS
504#define Color_Bits 7 // 0 .. maxTermCOLOR 509#define Color_Bits 7 // 0 .. maxTermCOLOR
510#else
511#define Color_Bits 9 // 0 .. maxTermCOLOR
512#endif
505 513
506/* 514/*
507 * Resource list 515 * Resource list
508 */ 516 */
509enum { 517enum {
… …
555#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 563#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
556#define UBUFSIZ 2048 // character buffer 564#define UBUFSIZ 2048 // character buffer
557 565
558#if ENABLE_FRILLS 566#if ENABLE_FRILLS
559# include <X11/Xmd.h> 567# include <X11/Xmd.h>
560typedef struct _mwmhints { 568typedef struct _mwmhints
569{
561 CARD32 flags; 570 CARD32 flags;
562 CARD32 functions; 571 CARD32 functions;
563 CARD32 decorations; 572 CARD32 decorations;
564 INT32 input_mode; 573 INT32 input_mode;
565 CARD32 status; 574 CARD32 status;
… …
612#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 621#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
613#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 622#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
614#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 623#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
615#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 624#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
616 625
617#define LINENO(n) MOD (term_start + int(n), total_rows) 626#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
618#define ROW(n) row_buf [LINENO (n)] 627#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
628
629#define LINENO(n) LINENO_of (this, n)
630#define ROW(n) ROW_of (this, n)
619 631
620/* how to build & extract colors and attributes */ 632/* how to build & extract colors and attributes */
621#define GET_BASEFG(x) (((x) & RS_fgMask)) 633#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 634#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
623 635
624#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 636#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
625#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 637#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
626 638
627#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 639#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
628#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 640#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
629 641
630#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
631#define GET_BGATTR(x) \ 645#define GET_BGATTR(x) \
646 (expect_false ((x) & RS_RVid) \
632 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 647 ? (((x) & (RS_attrMask & ~RS_RVid)) \
633 | (((x) & RS_fgMask)<<Color_Bits)) \ 648 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
634 : ((x) & (RS_attrMask | RS_bgMask))) 649 : ((x) & (RS_attrMask | RS_bgMask)))
635#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
636#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
637#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 652#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
638 653
639#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 654#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
640 655
641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 656#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
642#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 657#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
643 658
644#if ENABLE_STYLES 659#if ENABLE_STYLES
645# define FONTSET(style) fontset[GET_STYLE (style)] 660# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
646#else 661#else
647# define FONTSET(style) fontset[0] 662# define FONTSET_of(t,style) (t)->fontset[0]
648#endif 663#endif
664
665#define FONTSET(style) FONTSET_of (this, style)
649 666
650typedef callback<void (const char *)> log_callback; 667typedef callback<void (const char *)> log_callback;
651typedef callback<int (int)> getfd_callback; 668typedef callback<int (int)> getfd_callback;
652 669
653/****************************************************************************/ 670/****************************************************************************/
… …
656#define LINE_FILTERED 0x0002 // line has been filtered 673#define LINE_FILTERED 0x0002 // line has been filtered
657#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 674#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
658#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 675#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
659#define LINE_BIDI 0x0010 // line needs bidi (NYI) 676#define LINE_BIDI 0x0010 // line needs bidi (NYI)
660 677
661struct line_t { 678struct line_t
679{
662 text_t *t; // terminal the text 680 text_t *t; // terminal the text
663 rend_t *r; // rendition, uses RS_ flags 681 rend_t *r; // rendition, uses RS_ flags
664 tlen_t_ l; // length of each text line 682 tlen_t_ l; // length of each text line
665 uint32_t f; // flags 683 uint32_t f; // flags
666 684
… …
700}; 718};
701 719
702/****************************************************************************/ 720/****************************************************************************/
703 721
704// primitive wrapper around mbstate_t to ensure initialisation 722// primitive wrapper around mbstate_t to ensure initialisation
705struct mbstate { 723struct mbstate
724{
706 mbstate_t mbs; 725 mbstate_t mbs;
707 726
708 operator mbstate_t *() { return &mbs; } 727 operator mbstate_t *() { return &mbs; }
709 void reset () { memset (&mbs, 0, sizeof (mbs)); } 728 void reset () { memset (&mbs, 0, sizeof (mbs)); }
710 mbstate () { reset (); } 729 mbstate () { reset (); }
… …
731 750
732#if ENABLE_COMBINING 751#if ENABLE_COMBINING
733// compose chars are used to represent composite characters 752// compose chars are used to represent composite characters
734// that are not representable in unicode, as well as characters 753// that are not representable in unicode, as well as characters
735// not fitting in the BMP. 754// not fitting in the BMP.
736struct compose_char { 755struct compose_char
756{
737 unicode_t c1, c2; // any chars != NOCHAR are valid 757 unicode_t c1, c2; // any chars != NOCHAR are valid
738 compose_char (unicode_t c1, unicode_t c2) 758 compose_char (unicode_t c1, unicode_t c2)
739 : c1(c1), c2(c2) 759 : c1(c1), c2(c2)
740 { } 760 { }
741}; 761};
742 762
743class rxvt_composite_vec { 763class rxvt_composite_vec
764{
744 vector<compose_char> v; 765 vector<compose_char> v;
745public: 766public:
746 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 767 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
747 int expand (unicode_t c, wchar_t *r); 768 int expand (unicode_t c, wchar_t *r);
748 compose_char *operator [](text_t c) 769 compose_char *operator [](text_t c)
… …
767extern rxvt_t rxvt_current_term; 788extern rxvt_t rxvt_current_term;
768 789
769#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 790#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
770#define GET_R rxvt_current_term 791#define GET_R rxvt_current_term
771 792
793/* ------------------------------------------------------------------------- */
794struct overlay_base
795{
796 int x, y, w, h; // overlay dimensions
797 text_t **text;
798 rend_t **rend;
799
800 // while tempting to add swap() etc. here, it effetcively only increases code size
801};
802
803/* ------------------------------------------------------------------------- */
804
772typedef struct { 805typedef struct
806{
773 int row; 807 int row;
774 int col; 808 int col;
775} row_col_t; 809} row_col_t;
776 810
777/* 811/*
… …
808 * | 842 * |
809 * | 843 * |
810 * END······················= total_rows 844 * END······················= total_rows
811 */ 845 */
812 846
813struct TermWin_t { 847struct TermWin_t
848{
814 int width; /* window width [pixels] */ 849 int width; /* window width [pixels] */
815 int height; /* window height [pixels] */ 850 int height; /* window height [pixels] */
816 int fwidth; /* font width [pixels] */ 851 int fwidth; /* font width [pixels] */
817 int fheight; /* font height [pixels] */ 852 int fheight; /* font height [pixels] */
818 int fbase; /* font ascent (baseline) [pixels] */ 853 int fbase; /* font ascent (baseline) [pixels] */
… …
821 int focus; /* window has focus */ 856 int focus; /* window has focus */
822 int mapped; /* window state mapped? */ 857 int mapped; /* window state mapped? */
823 int int_bwidth; /* internal border width */ 858 int int_bwidth; /* internal border width */
824 int ext_bwidth; /* external border width */ 859 int ext_bwidth; /* external border width */
825 int lineSpace; /* number of extra pixels between rows */ 860 int lineSpace; /* number of extra pixels between rows */
861 int letterSpace; /* number of extra pixels between columns */
826 int saveLines; /* number of lines that fit in scrollback */ 862 int saveLines; /* number of lines that fit in scrollback */
827 int total_rows; /* total number of rows in this terminal */ 863 int total_rows; /* total number of rows in this terminal */
828 int term_start; /* term lines start here */ 864 int term_start; /* term lines start here */
829 int view_start; /* scrollback view starts here */ 865 int view_start; /* scrollback view starts here */
830 int top_row; /* topmost row index of scrollback */ 866 int top_row; /* topmost row index of scrollback */
… …
852 * end: row/column of one character past end of selection 888 * end: row/column of one character past end of selection
853 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow 889 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
854 * * Note: col == -1 ==> we're left of screen 890 * * Note: col == -1 ==> we're left of screen
855 * 891 *
856 */ 892 */
857typedef struct { 893struct screen_t
894{
858 row_col_t cur; /* cursor position on the screen */ 895 row_col_t cur; /* cursor position on the screen */
859 int tscroll; /* top of settable scroll region */ 896 int tscroll; /* top of settable scroll region */
860 int bscroll; /* bottom of settable scroll region */ 897 int bscroll; /* bottom of settable scroll region */
861 unsigned int charset; /* character set number [0..3] */ 898 unsigned int charset; /* character set number [0..3] */
862 unsigned int flags; /* see below */ 899 unsigned int flags; /* see below */
863 row_col_t s_cur; /* saved cursor position */ 900 row_col_t s_cur; /* saved cursor position */
864 unsigned int s_charset; /* saved character set number [0..3] */ 901 unsigned int s_charset; /* saved character set number [0..3] */
865 char s_charset_char; 902 char s_charset_char;
866 rend_t s_rstyle; /* saved rendition style */ 903 rend_t s_rstyle; /* saved rendition style */
867} screen_t; 904};
868 905
869enum selection_op_t { 906enum selection_op_t
907{
870 SELECTION_CLEAR = 0, /* nothing selected */ 908 SELECTION_CLEAR = 0, /* nothing selected */
871 SELECTION_INIT, /* marked a point */ 909 SELECTION_INIT, /* marked a point */
872 SELECTION_BEGIN, /* started a selection */ 910 SELECTION_BEGIN, /* started a selection */
873 SELECTION_CONT, /* continued selection */ 911 SELECTION_CONT, /* continued selection */
874 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 912 SELECTION_DONE /* selection put in CUT_BUFFER0 */
875}; 913};
876 914
877typedef struct { 915struct selection_t
916{
878 wchar_t *text; /* selected text */ 917 wchar_t *text; /* selected text */
879 unsigned int len; /* length of selected text */ 918 unsigned int len; /* length of selected text */
880 unsigned int screen; /* screen being used */ 919 unsigned int screen; /* screen being used */
881 unsigned int clicks; /* number of clicks */ 920 unsigned int clicks; /* number of clicks */
882 selection_op_t op; /* current operation */ 921 selection_op_t op; /* current operation */
883 bool rect; /* rectangular selection? */ 922 bool rect; /* rectangular selection? */
884 row_col_t beg; /* beginning of selection <= mark */ 923 row_col_t beg; /* beginning of selection <= mark */
885 row_col_t mark; /* point of initial click <= end */ 924 row_col_t mark; /* point of initial click <= end */
886 row_col_t end; /* one character past end point */ 925 row_col_t end; /* one character past end point */
887} selection_t; 926 wchar_t *clip_text; /* text copied to the clipboard */
927 unsigned int clip_len; /* length of clipboard text */
928};
888 929
889/* ------------------------------------------------------------------------- */ 930/* ------------------------------------------------------------------------- */
890 931
891/* screen_t flags */ 932/* screen_t flags */
892#define Screen_Relative (1<<0) /* relative origin mode flag */ 933#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
906Opt_count 947Opt_count
907}; 948};
908 949
909/* ------------------------------------------------------------------------- */ 950/* ------------------------------------------------------------------------- */
910 951
911struct rxvt_vars : TermWin_t { 952struct rxvt_vars : TermWin_t
953{
912 scrollBar_t scrollBar; 954 scrollBar_t scrollBar;
913 uint8_t options[(Opt_count + 7) >> 3]; 955 uint8_t options[(Opt_count + 7) >> 3];
914 XSizeHints szHint; 956 XSizeHints szHint;
915 rxvt_color *pix_colors; 957 rxvt_color *pix_colors;
916 Cursor TermWin_cursor; /* cursor for vt window */ 958 Cursor TermWin_cursor; /* cursor for vt window */
… …
926#ifdef OFF_FOCUS_FADING 968#ifdef OFF_FOCUS_FADING
927 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 969 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
928#endif 970#endif
929}; 971};
930 972
931struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 973struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
974{
932 975
933 // special markers with magic addresses 976 // special markers with magic addresses
934 static const char resval_undef []; // options specifically unset 977 static const char resval_undef []; // options specifically unset
935 static const char resval_on []; // boolean options switched on 978 static const char resval_on []; // boolean options switched on
936 static const char resval_off []; // or off 979 static const char resval_off []; // or off
… …
944 987
945 unsigned char want_refresh:1, 988 unsigned char want_refresh:1,
946 current_screen:1, /* primary or secondary */ 989 current_screen:1, /* primary or secondary */
947 num_scr_allow:1, 990 num_scr_allow:1,
948 bypass_keystate:1, 991 bypass_keystate:1,
949#ifdef ENABLE_FRILLS 992#if ENABLE_FRILLS
950 urgency_hint:1, 993 urgency_hint:1,
951#endif 994#endif
952#ifdef CURSOR_BLINK 995#if CURSOR_BLINK
953 hidden_cursor:1, 996 hidden_cursor:1,
954#endif 997#endif
955#ifdef TEXT_BLINK 998#if TEXT_BLINK
956 hidden_text:1, 999 hidden_text:1,
957#endif 1000#endif
958#ifdef POINTER_BLANK 1001#if POINTER_BLANK
959 hidden_pointer:1, 1002 hidden_pointer:1,
960#endif 1003#endif
961 enc_utf8:1, /* wether locale uses utf-8 */ 1004 enc_utf8:1, /* whether locale uses utf-8 */
962 seen_input:1, /* wether we have seen some program output yet */ 1005 seen_input:1, /* whether we have seen some program output yet */
963 seen_resize:1, /* wether we had a resize event */ 1006 seen_resize:1, /* whether we had a resize event */
964 parsed_geometry:1; 1007 parsed_geometry:1;
965 1008
966 unsigned char refresh_type, 1009 unsigned char refresh_type,
967#ifdef META8_OPTION 1010#ifdef META8_OPTION
968 meta_char, /* Alt-key prefix */ 1011 meta_char, /* Alt-key prefix */
… …
972/* ---------- */ 1015/* ---------- */
973 bool rvideo_state, rvideo_mode; 1016 bool rvideo_state, rvideo_mode;
974#ifndef NO_BELL 1017#ifndef NO_BELL
975 bool rvideo_bell; 1018 bool rvideo_bell;
976#endif 1019#endif
977 int num_scr; /* screen: number lines scrolled */ 1020 int num_scr; /* screen: number of lines scrolled */
978 int prev_ncol, /* screen: previous number of columns */ 1021 int prev_ncol, /* screen: previous number of columns */
979 prev_nrow; /* screen: previous number of rows */ 1022 prev_nrow; /* screen: previous number of rows */
980/* ---------- */ 1023/* ---------- */
981 rend_t rstyle; 1024 rend_t rstyle;
982/* ---------- */ 1025/* ---------- */
… …
1012 SavedModes; 1055 SavedModes;
1013/* ---------- */ 1056/* ---------- */
1014 Atom *xa; 1057 Atom *xa;
1015/* ---------- */ 1058/* ---------- */
1016 Time selection_time, 1059 Time selection_time,
1017 selection_request_time; 1060 selection_request_time,
1061 clipboard_time;
1018 pid_t cmd_pid; /* process id of child */ 1062 pid_t cmd_pid; /* process id of child */
1019 char * incr_buf; 1063 char * incr_buf;
1020 size_t incr_buf_size, incr_buf_fill; 1064 size_t incr_buf_size, incr_buf_fill;
1021/* ---------- */ 1065/* ---------- */
1022 struct mouse_event MEvent; 1066 struct mouse_event MEvent;
… …
1036 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1080 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1037 } 1081 }
1038#endif 1082#endif
1039 1083
1040#if ENABLE_OVERLAY 1084#if ENABLE_OVERLAY
1041 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1085 overlay_base ov;
1042 text_t **ov_text;
1043 rend_t **ov_rend;
1044 1086
1045 void scr_swap_overlay () NOTHROW; 1087 void scr_swap_overlay () NOTHROW;
1046 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1088 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1047 void scr_overlay_off () NOTHROW; 1089 void scr_overlay_off () NOTHROW;
1048 void scr_overlay_set (int x, int y, 1090 void scr_overlay_set (int x, int y,
… …
1205 void mouse_report (XButtonEvent &ev); 1247 void mouse_report (XButtonEvent &ev);
1206 void button_press (XButtonEvent &ev); 1248 void button_press (XButtonEvent &ev);
1207 void button_release (XButtonEvent &ev); 1249 void button_release (XButtonEvent &ev);
1208 void focus_in (); 1250 void focus_in ();
1209 void focus_out (); 1251 void focus_out ();
1252#if ENABLE_FRILLS
1210 void set_urgency (bool enable); 1253 void set_urgency (bool enable);
1254#else
1255 void set_urgency (bool enable) { }
1256#endif
1211 void update_fade_color (unsigned int idx); 1257 void update_fade_color (unsigned int idx);
1212#ifdef PRINTPIPE 1258#ifdef PRINTPIPE
1213 FILE *popen_printer (); 1259 FILE *popen_printer ();
1214 int pclose_printer (FILE *stream); 1260 int pclose_printer (FILE *stream);
1215#endif 1261#endif
… …
1221 void process_window_ops (const int *args, unsigned int nargs); 1267 void process_window_ops (const int *args, unsigned int nargs);
1222 char *get_to_st (unicode_t &ends_how); 1268 char *get_to_st (unicode_t &ends_how);
1223 void process_dcs_seq (); 1269 void process_dcs_seq ();
1224 void process_osc_seq (); 1270 void process_osc_seq ();
1225 void process_color_seq (int report, int color, const char *str, char resp); 1271 void process_color_seq (int report, int color, const char *str, char resp);
1226 void process_xterm_seq (int op, const char *str, char resp); 1272 void process_xterm_seq (int op, char *str, char resp);
1227 int privcases (int mode, unsigned long bit); 1273 int privcases (int mode, unsigned long bit);
1228 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1274 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1229 void process_sgr_mode (unsigned int nargs, const int *arg); 1275 void process_sgr_mode (unsigned int nargs, const int *arg);
1230 void process_graphics (); 1276 void process_graphics ();
1231 // init.C 1277 // init.C
… …
1417 void selection_check (int check_more) NOTHROW; 1463 void selection_check (int check_more) NOTHROW;
1418 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1419 void selection_property (Window win, Atom prop) NOTHROW; 1465 void selection_property (Window win, Atom prop) NOTHROW;
1420 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1421 int selection_request_other (Atom target, int selnum) NOTHROW; 1467 int selection_request_other (Atom target, int selnum) NOTHROW;
1422 void selection_clear () NOTHROW; 1468 void selection_clear (bool clipboard = false) NOTHROW;
1469 void clipboard_copy (Time tm);
1423 void selection_make (Time tm); 1470 void selection_make (Time tm);
1424 bool selection_grab (Time tm) NOTHROW; 1471 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1425 void selection_start_colrow (int col, int row) NOTHROW; 1472 void selection_start_colrow (int col, int row) NOTHROW;
1426 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;
1427 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;
1428 void selection_remove_trailing_spaces () NOTHROW; 1475 void selection_remove_trailing_spaces () NOTHROW;
1429 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