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.357 by ayin, Wed Feb 6 12:05:59 2008 UTC vs.
Revision 1.391 by sf-exg, Thu Apr 1 00:12:33 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#ifndef USE_256_COLORS
315#define RS_bgMask 0x00003f80UL // 128 colors 312#define RS_colorMask 0x0000007fUL // 128 colors
313#else
314#define RS_colorMask 0x000001ffUL
315#endif
316#define RS_fgShift 0
317#define RS_bgShift Color_Bits
318#define RS_fgMask (RS_colorMask << RS_fgShift)
319#define RS_bgMask (RS_colorMask << RS_bgShift)
316 320
317// font styles 321// font styles
318#define RS_Bold 0x00004000UL // value 1 322#define RS_Bold 0x08000000UL // value 1
319#define RS_Italic 0x00008000UL // value 2 323#define RS_Italic 0x10000000UL // value 2
320 324
321// fake styles 325// fake styles
322#define RS_Blink 0x00010000UL // blink 326#define RS_Blink 0x20000000UL // blink
323#define RS_RVid 0x00020000UL // reverse video 327#define RS_RVid 0x40000000UL // reverse video
324#define RS_Uline 0x00040000UL // underline 328#define RS_Uline 0x80000000UL // underline
325
326// toggle this to force redraw, must be != RS_Careful
327#define RS_redraw 0x01000000UL
328 329
329// 5 custom bits for extensions 330// 5 custom bits for extensions
330#define RS_customCount 32 331#define RS_customCount 16
331#define RS_customMask 0x00f80000UL 332#define RS_customMask 0x07800000UL
332#define RS_customShift 19 333#define RS_customShift 23
333 334
334// other flags 335// must have space for rxvt_fontset::fontCount * 2 + 2 values
336#define RS_fontMask 0x007c0000UL // includes RS_Careful
337#define RS_fontShift 18
335#define RS_Careful 0x80000000UL /* be careful when drawing these */ 338#define RS_Careful 0x00010000UL /* be careful when drawing these */
339
340// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
341#define RS_redraw 0x00020000UL
336 342
337#define RS_styleCount 4 343#define RS_styleCount 4
338#define RS_styleMask (RS_Bold | RS_Italic) 344#define RS_styleMask (RS_Bold | RS_Italic)
339#define RS_styleShift 14 345#define RS_styleShift 27
340 346
341#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 347#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
342#define RS_attrMask (RS_baseattrMask | RS_fontMask) 348#define RS_attrMask (RS_baseattrMask | RS_fontMask)
343 349
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)) 350#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)) 351#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
350 352
351#define Sel_none 0 /* Not waiting */ 353#define Sel_none 0 /* Not waiting */
352#define Sel_normal 0x01 /* normal selection */ 354#define Sel_normal 0x01 /* normal selection */
353#define Sel_incr 0x02 /* incremental selection */ 355#define Sel_incr 0x02 /* incremental selection */
354#define Sel_direct 0x00 356#define Sel_direct 0x00
… …
410 412
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 413 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 414 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 415 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 416 URxvt_Color_UL = 707, // change actual 'Underline' color
417 URxvt_Color_border = 708,
415 418
416 URxvt_font = 710, 419 URxvt_font = 710,
417 URxvt_boldFont = 711, 420 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 421 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 422 URxvt_boldItalicFont = 713,
420 423
421 URxvt_view_up = 720, 424 URxvt_view_up = 720,
422 URxvt_view_down = 721, 425 URxvt_view_down = 721,
423 426
424 URxvt_perl = 777, 427 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
425}; 428};
426 429
427/* Words starting with `Color_' are colours. Others are counts */ 430/* Words starting with `Color_' are colours. Others are counts */
428/* 431/*
429 * The PixColor and rendition colour usage should probably be decoupled 432 * The PixColor and rendition colour usage should probably be decoupled
… …
459 Color_White = maxBrightCOLOR, 462 Color_White = maxBrightCOLOR,
460#else 463#else
461 Color_White = maxCOLOR, 464 Color_White = maxCOLOR,
462#endif 465#endif
463 minTermCOLOR = Color_White + 1, 466 minTermCOLOR = Color_White + 1,
467#ifndef USE_256_COLORS
464 maxTermCOLOR = Color_White + 72, 468 maxTermCOLOR = Color_White + 72,
469#else
470 maxTermCOLOR = Color_White + 240,
471#endif
465#ifndef NO_CURSORCOLOR 472#ifndef NO_CURSORCOLOR
466 Color_cursor, 473 Color_cursor,
467 Color_cursor2, 474 Color_cursor2,
468#endif 475#endif
469 Color_pointer_fg, 476 Color_pointer_fg,
… …
499#else 506#else
500 TOTAL_COLORS = NRS_COLORS 507 TOTAL_COLORS = NRS_COLORS
501#endif 508#endif
502}; 509};
503 510
511#ifndef USE_256_COLORS
504#define Color_Bits 7 // 0 .. maxTermCOLOR 512#define Color_Bits 7 // 0 .. maxTermCOLOR
513#else
514#define Color_Bits 9 // 0 .. maxTermCOLOR
515#endif
505 516
506/* 517/*
507 * Resource list 518 * Resource list
508 */ 519 */
509enum { 520enum {
… …
550 561
551// do not change these constants lightly, there are many interdependencies 562// do not change these constants lightly, there are many interdependencies
552#define IMBUFSIZ 128 // input modifier buffer sizes 563#define IMBUFSIZ 128 // input modifier buffer sizes
553#define KBUFSZ 512 // size of keyboard mapping buffer 564#define KBUFSZ 512 // size of keyboard mapping buffer
554#define CBUFSIZ 2048 // size of command buffer 565#define CBUFSIZ 2048 // size of command buffer
566#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
555#define UBUFSIZ 2048 // character buffer 567#define UBUFSIZ 2048 // character buffer
556 568
557#if ENABLE_FRILLS 569#if ENABLE_FRILLS
558# include <X11/Xmd.h> 570# include <X11/Xmd.h>
559typedef struct _mwmhints { 571typedef struct _mwmhints
572{
560 CARD32 flags; 573 CARD32 flags;
561 CARD32 functions; 574 CARD32 functions;
562 CARD32 decorations; 575 CARD32 decorations;
563 INT32 input_mode; 576 INT32 input_mode;
564 CARD32 status; 577 CARD32 status;
… …
611#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 624#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
612#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 625#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
613#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 626#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
614#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 627#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
615 628
616#define LINENO(n) MOD (term_start + int(n), total_rows) 629#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
617#define ROW(n) row_buf [LINENO (n)] 630#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
631
632#define LINENO(n) LINENO_of (this, n)
633#define ROW(n) ROW_of (this, n)
618 634
619/* how to build & extract colors and attributes */ 635/* how to build & extract colors and attributes */
620#define GET_BASEFG(x) (((x) & RS_fgMask)) 636#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
621#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 637#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
622 638
623#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 639#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
624#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 640#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
625 641
626#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 642#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
627#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 643#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
628 644
629#define GET_ATTR(x) (((x) & RS_attrMask)) 645#define GET_ATTR(x) (((x) & RS_attrMask))
630#define GET_BGATTR(x) \ 646#define GET_BGATTR(x) \
631 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 647 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
632 | (((x) & RS_fgMask)<<Color_Bits)) \ 648 | (((x) & RS_colorMask) << RS_bgShift)) \
633 : ((x) & (RS_attrMask | RS_bgMask))) 649 : ((x) & (RS_attrMask | RS_bgMask)))
634#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
635#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
636#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 652#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
637 653
638#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 654#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
639 655
640#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 656#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
641#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 657#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
642 658
643#if ENABLE_STYLES 659#if ENABLE_STYLES
644# define FONTSET(style) fontset[GET_STYLE (style)] 660# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
645#else 661#else
646# define FONTSET(style) fontset[0] 662# define FONTSET_of(t,style) (t)->fontset[0]
647#endif 663#endif
664
665#define FONTSET(style) FONTSET_of (this, style)
648 666
649typedef callback<void (const char *)> log_callback; 667typedef callback<void (const char *)> log_callback;
650typedef callback<int (int)> getfd_callback; 668typedef callback<int (int)> getfd_callback;
651 669
652/****************************************************************************/ 670/****************************************************************************/
… …
655#define LINE_FILTERED 0x0002 // line has been filtered 673#define LINE_FILTERED 0x0002 // line has been filtered
656#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 674#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
657#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)
658#define LINE_BIDI 0x0010 // line needs bidi (NYI) 676#define LINE_BIDI 0x0010 // line needs bidi (NYI)
659 677
660struct line_t { 678struct line_t
679{
661 text_t *t; // terminal the text 680 text_t *t; // terminal the text
662 rend_t *r; // rendition, uses RS_ flags 681 rend_t *r; // rendition, uses RS_ flags
663 tlen_t_ l; // length of each text line 682 tlen_t_ l; // length of each text line
664 uint32_t f; // flags 683 uint32_t f; // flags
665 684
… …
699}; 718};
700 719
701/****************************************************************************/ 720/****************************************************************************/
702 721
703// primitive wrapper around mbstate_t to ensure initialisation 722// primitive wrapper around mbstate_t to ensure initialisation
704struct mbstate { 723struct mbstate
724{
705 mbstate_t mbs; 725 mbstate_t mbs;
706 726
707 operator mbstate_t *() { return &mbs; } 727 operator mbstate_t *() { return &mbs; }
708 void reset () { memset (&mbs, 0, sizeof (mbs)); } 728 void reset () { memset (&mbs, 0, sizeof (mbs)); }
709 mbstate () { reset (); } 729 mbstate () { reset (); }
… …
730 750
731#if ENABLE_COMBINING 751#if ENABLE_COMBINING
732// compose chars are used to represent composite characters 752// compose chars are used to represent composite characters
733// that are not representable in unicode, as well as characters 753// that are not representable in unicode, as well as characters
734// not fitting in the BMP. 754// not fitting in the BMP.
735struct compose_char { 755struct compose_char
756{
736 unicode_t c1, c2; // any chars != NOCHAR are valid 757 unicode_t c1, c2; // any chars != NOCHAR are valid
737 compose_char (unicode_t c1, unicode_t c2) 758 compose_char (unicode_t c1, unicode_t c2)
738 : c1(c1), c2(c2) 759 : c1(c1), c2(c2)
739 { } 760 { }
740}; 761};
741 762
742class rxvt_composite_vec { 763class rxvt_composite_vec
764{
743 vector<compose_char> v; 765 vector<compose_char> v;
744public: 766public:
745 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 767 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
746 int expand (unicode_t c, wchar_t *r); 768 int expand (unicode_t c, wchar_t *r);
747 compose_char *operator [](text_t c) 769 compose_char *operator [](text_t c)
… …
766extern rxvt_t rxvt_current_term; 788extern rxvt_t rxvt_current_term;
767 789
768#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)
769#define GET_R rxvt_current_term 791#define GET_R rxvt_current_term
770 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
771typedef struct { 805typedef struct
806{
772 int row; 807 int row;
773 int col; 808 int col;
774} row_col_t; 809} row_col_t;
775 810
776/* 811/*
… …
801 * +------------+·display·+·= term_start 836 * +------------+·display·+·= term_start
802 * | terminal | display | 837 * | terminal | display |
803 * | terminal +---------+ 838 * | terminal +---------+
804 * | terminal | 839 * | terminal |
805 * | terminal | 840 * | terminal |
806 * +------------+···········= term_stat + nrow - 1 841 * +------------+···········= term_start + nrow - 1
807 * | 842 * |
808 * | 843 * |
809 * END······················= total_rows 844 * END······················= total_rows
810 */ 845 */
811 846
812struct TermWin_t { 847struct TermWin_t
848{
813 int width; /* window width [pixels] */ 849 int width; /* window width [pixels] */
814 int height; /* window height [pixels] */ 850 int height; /* window height [pixels] */
815 int fwidth; /* font width [pixels] */ 851 int fwidth; /* font width [pixels] */
816 int fheight; /* font height [pixels] */ 852 int fheight; /* font height [pixels] */
817 int fbase; /* font ascent (baseline) [pixels] */ 853 int fbase; /* font ascent (baseline) [pixels] */
… …
820 int focus; /* window has focus */ 856 int focus; /* window has focus */
821 int mapped; /* window state mapped? */ 857 int mapped; /* window state mapped? */
822 int int_bwidth; /* internal border width */ 858 int int_bwidth; /* internal border width */
823 int ext_bwidth; /* external border width */ 859 int ext_bwidth; /* external border width */
824 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 */
825 int saveLines; /* number of lines that fit in scrollback */ 862 int saveLines; /* number of lines that fit in scrollback */
826 int total_rows; /* total number of rows in this terminal */ 863 int total_rows; /* total number of rows in this terminal */
827 int term_start; /* term lines start here */ 864 int term_start; /* term lines start here */
828 int view_start; /* scrollback view starts here */ 865 int view_start; /* scrollback view starts here */
829 int top_row; /* topmost row index of scrollback */ 866 int top_row; /* topmost row index of scrollback */
… …
847 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 884 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
848 * nothing is selected 885 * nothing is selected
849 * beg: row/column of beginning of selection : never past mark 886 * beg: row/column of beginning of selection : never past mark
850 * mark: row/column of initial click : never past end 887 * mark: row/column of initial click : never past end
851 * end: row/column of one character past end of selection 888 * end: row/column of one character past end of selection
852 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 889 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
853 * * Note: col == -1 ==> we're left of screen 890 * * Note: col == -1 ==> we're left of screen
854 * 891 *
855 */ 892 */
856typedef struct { 893struct screen_t
894{
857 row_col_t cur; /* cursor position on the screen */ 895 row_col_t cur; /* cursor position on the screen */
858 int tscroll; /* top of settable scroll region */ 896 int tscroll; /* top of settable scroll region */
859 int bscroll; /* bottom of settable scroll region */ 897 int bscroll; /* bottom of settable scroll region */
860 unsigned int charset; /* character set number [0..3] */ 898 unsigned int charset; /* character set number [0..3] */
861 unsigned int flags; /* see below */ 899 unsigned int flags; /* see below */
862 row_col_t s_cur; /* saved cursor position */ 900 row_col_t s_cur; /* saved cursor position */
863 unsigned int s_charset; /* saved character set number [0..3] */ 901 unsigned int s_charset; /* saved character set number [0..3] */
864 char s_charset_char; 902 char s_charset_char;
865 rend_t s_rstyle; /* saved rendition style */ 903 rend_t s_rstyle; /* saved rendition style */
866} screen_t; 904};
867 905
868enum selection_op_t { 906enum selection_op_t
907{
869 SELECTION_CLEAR = 0, /* nothing selected */ 908 SELECTION_CLEAR = 0, /* nothing selected */
870 SELECTION_INIT, /* marked a point */ 909 SELECTION_INIT, /* marked a point */
871 SELECTION_BEGIN, /* started a selection */ 910 SELECTION_BEGIN, /* started a selection */
872 SELECTION_CONT, /* continued selection */ 911 SELECTION_CONT, /* continued selection */
873 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 912 SELECTION_DONE /* selection put in CUT_BUFFER0 */
874}; 913};
875 914
876typedef struct { 915struct selection_t
916{
877 wchar_t *text; /* selected text */ 917 wchar_t *text; /* selected text */
878 unsigned int len; /* length of selected text */ 918 unsigned int len; /* length of selected text */
879 unsigned int screen; /* screen being used */ 919 unsigned int screen; /* screen being used */
880 unsigned int clicks; /* number of clicks */ 920 unsigned int clicks; /* number of clicks */
881 selection_op_t op; /* current operation */ 921 selection_op_t op; /* current operation */
882 bool rect; /* rectangular selection? */ 922 bool rect; /* rectangular selection? */
883 row_col_t beg; /* beginning of selection <= mark */ 923 row_col_t beg; /* beginning of selection <= mark */
884 row_col_t mark; /* point of initial click <= end */ 924 row_col_t mark; /* point of initial click <= end */
885 row_col_t end; /* one character past end point */ 925 row_col_t end; /* one character past end point */
886} selection_t; 926 wchar_t *clip_text; /* text copied to the clipboard */
927 unsigned int clip_len; /* length of clipboard text */
928};
887 929
888/* ------------------------------------------------------------------------- */ 930/* ------------------------------------------------------------------------- */
889 931
890/* screen_t flags */ 932/* screen_t flags */
891#define Screen_Relative (1<<0) /* relative origin mode flag */ 933#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
905Opt_count 947Opt_count
906}; 948};
907 949
908/* ------------------------------------------------------------------------- */ 950/* ------------------------------------------------------------------------- */
909 951
910struct rxvt_vars : TermWin_t { 952struct rxvt_vars : TermWin_t
953{
911 scrollBar_t scrollBar; 954 scrollBar_t scrollBar;
912 uint8_t options[(Opt_count + 7) >> 3]; 955 uint8_t options[(Opt_count + 7) >> 3];
913 XSizeHints szHint; 956 XSizeHints szHint;
914 rxvt_color *pix_colors; 957 rxvt_color *pix_colors;
915 Cursor TermWin_cursor; /* cursor for vt window */ 958 Cursor TermWin_cursor; /* cursor for vt window */
… …
925#ifdef OFF_FOCUS_FADING 968#ifdef OFF_FOCUS_FADING
926 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 969 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
927#endif 970#endif
928}; 971};
929 972
930struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 973struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
974{
931 975
932 // special markers with magic addresses 976 // special markers with magic addresses
933 static const char resval_undef []; // options specifically unset 977 static const char resval_undef []; // options specifically unset
934 static const char resval_on []; // boolean options switched on 978 static const char resval_on []; // boolean options switched on
935 static const char resval_off []; // or off 979 static const char resval_off []; // or off
… …
943 987
944 unsigned char want_refresh:1, 988 unsigned char want_refresh:1,
945 current_screen:1, /* primary or secondary */ 989 current_screen:1, /* primary or secondary */
946 num_scr_allow:1, 990 num_scr_allow:1,
947 bypass_keystate:1, 991 bypass_keystate:1,
992#if ENABLE_FRILLS
993 urgency_hint:1,
994#endif
948#ifdef CURSOR_BLINK 995#if CURSOR_BLINK
949 hidden_cursor:1, 996 hidden_cursor:1,
950#endif 997#endif
951#ifdef TEXT_BLINK 998#if TEXT_BLINK
952 hidden_text:1, 999 hidden_text:1,
953#endif 1000#endif
954#ifdef POINTER_BLANK 1001#if POINTER_BLANK
955 hidden_pointer:1, 1002 hidden_pointer:1,
956#endif 1003#endif
957 enc_utf8:1, /* wether locale uses utf-8 */ 1004 enc_utf8:1, /* whether locale uses utf-8 */
958 seen_input:1, /* wether we have seen some program output yet */ 1005 seen_input:1, /* whether we have seen some program output yet */
959 seen_resize:1, /* wether we had a resize event */ 1006 seen_resize:1, /* whether we had a resize event */
960 parsed_geometry:1; 1007 parsed_geometry:1;
961 1008
962 unsigned char refresh_type, 1009 unsigned char refresh_type,
963#ifdef META8_OPTION 1010#ifdef META8_OPTION
964 meta_char, /* Alt-key prefix */ 1011 meta_char, /* Alt-key prefix */
… …
968/* ---------- */ 1015/* ---------- */
969 bool rvideo_state, rvideo_mode; 1016 bool rvideo_state, rvideo_mode;
970#ifndef NO_BELL 1017#ifndef NO_BELL
971 bool rvideo_bell; 1018 bool rvideo_bell;
972#endif 1019#endif
973 int num_scr; /* screen: number lines scrolled */ 1020 int num_scr; /* screen: number of lines scrolled */
974 int prev_ncol, /* screen: previous number of columns */ 1021 int prev_ncol, /* screen: previous number of columns */
975 prev_nrow; /* screen: previous number of rows */ 1022 prev_nrow; /* screen: previous number of rows */
976/* ---------- */ 1023/* ---------- */
977 rend_t rstyle; 1024 rend_t rstyle;
978/* ---------- */ 1025/* ---------- */
… …
990 mouse_slip_wheel_speed, 1037 mouse_slip_wheel_speed,
991#endif 1038#endif
992 refresh_count, 1039 refresh_count,
993 window_vt_x, 1040 window_vt_x,
994 window_vt_y, 1041 window_vt_y,
995 window_sb_x,
996 mouse_row, 1042 mouse_row,
997 mouse_col, 1043 mouse_col,
998# ifdef POINTER_BLANK 1044# ifdef POINTER_BLANK
999 pointerBlankDelay, 1045 pointerBlankDelay,
1000# endif 1046# endif
… …
1008 unsigned long priv_modes, 1054 unsigned long priv_modes,
1009 SavedModes; 1055 SavedModes;
1010/* ---------- */ 1056/* ---------- */
1011 Atom *xa; 1057 Atom *xa;
1012/* ---------- */ 1058/* ---------- */
1013#ifdef RXVT_SCROLLBAR
1014 GC scrollbarGC,
1015 topShadowGC,
1016 botShadowGC;
1017#endif
1018#ifdef XTERM_SCROLLBAR
1019 GC xscrollbarGC,
1020 ShadowGC;
1021#endif
1022#ifdef PLAIN_SCROLLBAR
1023 GC pscrollbarGC;
1024#endif
1025#ifdef NEXT_SCROLLBAR
1026 GC blackGC,
1027 whiteGC,
1028 grayGC,
1029 darkGC,
1030 stippleGC;
1031 Pixmap dimple,
1032 upArrow,
1033 downArrow,
1034 upArrowHi,
1035 downArrowHi;
1036#endif
1037/* ---------- */
1038 Time selection_time, 1059 Time selection_time,
1039 selection_request_time; 1060 selection_request_time,
1061 clipboard_time;
1040 pid_t cmd_pid; /* process id of child */ 1062 pid_t cmd_pid; /* process id of child */
1041 char * incr_buf; 1063 char * incr_buf;
1042 size_t incr_buf_size, incr_buf_fill; 1064 size_t incr_buf_size, incr_buf_fill;
1043/* ---------- */ 1065/* ---------- */
1044 struct mouse_event MEvent; 1066 struct mouse_event MEvent;
… …
1049 bgPixmap_t bgPixmap; 1071 bgPixmap_t bgPixmap;
1050#endif 1072#endif
1051#ifdef HAVE_AFTERIMAGE 1073#ifdef HAVE_AFTERIMAGE
1052 ASVisual *asv; 1074 ASVisual *asv;
1053 ASImageManager *asimman; 1075 ASImageManager *asimman;
1076
1077 void init_asv ()
1078 {
1079 if (!asv)
1080 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1081 }
1054#endif 1082#endif
1055 1083
1056#if ENABLE_OVERLAY 1084#if ENABLE_OVERLAY
1057 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1085 overlay_base ov;
1058 text_t **ov_text;
1059 rend_t **ov_rend;
1060 1086
1061 void scr_swap_overlay () NOTHROW; 1087 void scr_swap_overlay () NOTHROW;
1062 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;
1063 void scr_overlay_off () NOTHROW; 1089 void scr_overlay_off () NOTHROW;
1064 void scr_overlay_set (int x, int y, 1090 void scr_overlay_set (int x, int y,
… …
1102 1128
1103#if ENABLE_FRILLS || ISO_14755 1129#if ENABLE_FRILLS || ISO_14755
1104 // ISO 14755 entry support 1130 // ISO 14755 entry support
1105 unicode_t iso14755buf; 1131 unicode_t iso14755buf;
1106 void commit_iso14755 (); 1132 void commit_iso14755 ();
1107 int hex_keyval (XKeyEvent &ev);
1108# if ISO_14755 1133# if ISO_14755
1109 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1134 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1110 void iso14755_54 (int x, int y); 1135 void iso14755_54 (int x, int y);
1111# endif 1136# endif
1112#endif 1137#endif
… …
1216 wchar_t next_char () NOTHROW; 1241 wchar_t next_char () NOTHROW;
1217 wchar_t cmd_getc () THROW ((class out_of_input)); 1242 wchar_t cmd_getc () THROW ((class out_of_input));
1218 uint32_t next_octet () NOTHROW; 1243 uint32_t next_octet () NOTHROW;
1219 uint32_t cmd_get8 () THROW ((class out_of_input)); 1244 uint32_t cmd_get8 () THROW ((class out_of_input));
1220 1245
1221 bool cmd_parse (); 1246 void cmd_parse ();
1222 void mouse_report (XButtonEvent &ev); 1247 void mouse_report (XButtonEvent &ev);
1223 void button_press (XButtonEvent &ev); 1248 void button_press (XButtonEvent &ev);
1224 void button_release (XButtonEvent &ev); 1249 void button_release (XButtonEvent &ev);
1225 void focus_in (); 1250 void focus_in ();
1226 void focus_out (); 1251 void focus_out ();
1252#if ENABLE_FRILLS
1253 void set_urgency (bool enable);
1254#else
1255 void set_urgency (bool enable) { }
1256#endif
1227 void update_fade_color (unsigned int idx); 1257 void update_fade_color (unsigned int idx);
1228#ifdef PRINTPIPE 1258#ifdef PRINTPIPE
1229 FILE *popen_printer (); 1259 FILE *popen_printer ();
1230 int pclose_printer (FILE *stream); 1260 int pclose_printer (FILE *stream);
1231#endif 1261#endif
… …
1237 void process_window_ops (const int *args, unsigned int nargs); 1267 void process_window_ops (const int *args, unsigned int nargs);
1238 char *get_to_st (unicode_t &ends_how); 1268 char *get_to_st (unicode_t &ends_how);
1239 void process_dcs_seq (); 1269 void process_dcs_seq ();
1240 void process_osc_seq (); 1270 void process_osc_seq ();
1241 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);
1242 void process_xterm_seq (int op, const char *str, char resp); 1272 void process_xterm_seq (int op, char *str, char resp);
1243 int privcases (int mode, unsigned long bit); 1273 int privcases (int mode, unsigned long bit);
1244 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);
1245 void process_sgr_mode (unsigned int nargs, const int *arg); 1275 void process_sgr_mode (unsigned int nargs, const int *arg);
1246 void process_graphics (); 1276 void process_graphics ();
1247 // init.C 1277 // init.C
… …
1254 void init_command (const char *const *argv); 1284 void init_command (const char *const *argv);
1255 void run_command (const char *const *argv); 1285 void run_command (const char *const *argv);
1256 int run_child (const char *const *argv); 1286 int run_child (const char *const *argv);
1257 void color_aliases (int idx); 1287 void color_aliases (int idx);
1258 void create_windows (int argc, const char *const *argv); 1288 void create_windows (int argc, const char *const *argv);
1259 void Get_Colours (); 1289 void get_colours ();
1260 void get_ourmods (); 1290 void get_ourmods ();
1261 // main.C 1291 // main.C
1262 void tt_winch (); 1292 void tt_winch ();
1263 rxvt_term (); 1293 rxvt_term ();
1264 ~rxvt_term (); 1294 ~rxvt_term ();
… …
1357 options[opt >> 3] |= (1 << (opt & 7)); 1387 options[opt >> 3] |= (1 << (opt & 7));
1358 else 1388 else
1359 options[opt >> 3] &= ~(1 << (opt & 7)); 1389 options[opt >> 3] &= ~(1 << (opt & 7));
1360 } 1390 }
1361 1391
1362 void PrivMode (int set, unsigned bit) NOTHROW 1392 void set_privmode (unsigned bit, int set) NOTHROW
1363 { 1393 {
1364 if (set) 1394 if (set)
1365 priv_modes |= bit; 1395 priv_modes |= bit;
1366 else 1396 else
1367 priv_modes &= ~bit; 1397 priv_modes &= ~bit;
… …
1369 1399
1370 // modifies first argument(!) 1400 // modifies first argument(!)
1371 void paste (char *data, unsigned int len) NOTHROW; 1401 void paste (char *data, unsigned int len) NOTHROW;
1372 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1373 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1404 void scr_kill_char (line_t &l, int col) const NOTHROW;
1374 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1405 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1375 void scr_reset (); 1406 void scr_reset ();
1376 void scr_release () NOTHROW; 1407 void scr_release () NOTHROW;
1377 void scr_clear (bool really = false) NOTHROW; 1408 void scr_clear (bool really = false) NOTHROW;
1378 void scr_refresh () NOTHROW; 1409 void scr_refresh () NOTHROW;
… …
1390 void scr_remap_chars (line_t &l) NOTHROW; 1421 void scr_remap_chars (line_t &l) NOTHROW;
1391 1422
1392 enum cursor_mode { SAVE, RESTORE }; 1423 enum cursor_mode { SAVE, RESTORE };
1393 1424
1394 void scr_poweron (); 1425 void scr_poweron ();
1426 void scr_soft_reset () NOTHROW;
1395 void scr_cursor (cursor_mode mode) NOTHROW; 1427 void scr_cursor (cursor_mode mode) NOTHROW;
1396 void scr_do_wrap () NOTHROW; 1428 void scr_do_wrap () NOTHROW;
1397 void scr_swap_screen () NOTHROW; 1429 void scr_swap_screen () NOTHROW;
1398 void scr_change_screen (int scrn); 1430 void scr_change_screen (int scrn);
1399 void scr_color (unsigned int color, int fgbg) NOTHROW; 1431 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1431 void selection_check (int check_more) NOTHROW; 1463 void selection_check (int check_more) NOTHROW;
1432 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1433 void selection_property (Window win, Atom prop) NOTHROW; 1465 void selection_property (Window win, Atom prop) NOTHROW;
1434 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1435 int selection_request_other (Atom target, int selnum) NOTHROW; 1467 int selection_request_other (Atom target, int selnum) NOTHROW;
1436 void selection_clear () NOTHROW; 1468 void selection_clear (bool clipboard = false) NOTHROW;
1469 void clipboard_copy (Time tm);
1437 void selection_make (Time tm); 1470 void selection_make (Time tm);
1438 bool selection_grab (Time tm) NOTHROW; 1471 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1439 void selection_start_colrow (int col, int row) NOTHROW; 1472 void selection_start_colrow (int col, int row) NOTHROW;
1440 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;
1441 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;
1442 void selection_remove_trailing_spaces () NOTHROW; 1475 void selection_remove_trailing_spaces () NOTHROW;
1443 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1476 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1444 void selection_click (int clicks, int x, int y) NOTHROW; 1477 void selection_click (int clicks, int x, int y) NOTHROW;
1445 void selection_extend (int x, int y, int flag) NOTHROW; 1478 void selection_extend (int x, int y, int flag) NOTHROW;
1446 void selection_rotate (int x, int y) NOTHROW; 1479 void selection_rotate (int x, int y) NOTHROW;
1447 1480
1448#if defined(NEXT_SCROLLBAR)
1449 // scrollbar-next.C
1450 Pixmap renderPixmap (const char *const *data, int width, int height);
1451 void init_scrollbar_stuff ();
1452 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1453 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1454#endif
1455
1456#if defined(RXVT_SCROLLBAR)
1457 // scrollbar-rxvt.C
1458 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1459#endif
1460
1461#if defined(XTERM_SCROLLBAR)
1462 // scrollbar-xterm.C
1463 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1464#endif
1465
1466#if defined(PLAIN_SCROLLBAR)
1467 // scrollbar-plain.C
1468 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1469#endif
1470
1471 // scrollbar.C
1472 void resize_scrollbar ();
1473 int scrollbar_mapping (int map);
1474 int scrollbar_show (int update);
1475
1476 // xdefaults.C 1481 // xdefaults.C
1477 void get_options (int argc, const char *const *argv); 1482 void get_options (int argc, const char *const *argv);
1478 int parse_keysym (const char *str, const char *arg); 1483 int parse_keysym (const char *str, const char *arg);
1479 const char *x_resource (const char *name); 1484 const char *x_resource (const char *name);
1480 void extract_resources (); 1485 void extract_resources ();

Diff Legend

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