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.354 by ayin, Sun Jan 27 16:52:13 2008 UTC vs.
Revision 1.386 by root, Wed Mar 31 23:01:51 2010 UTC

… …
97/* 97/*
98 ***************************************************************************** 98 *****************************************************************************
99 * SYSTEM HACKS 99 * SYSTEM HACKS
100 ***************************************************************************** 100 *****************************************************************************
101 */ 101 */
102/* Consistent defines - please report on the necessity
103 * @ Unixware: defines (__svr4__)
104 */
105#if defined (SVR4) && !defined (__svr4__)
106# define __svr4__ 1
107#endif
108#if defined (sun) && !defined (__sun__)
109# define __sun__ 1
110#endif
111 102
112#ifndef HAVE_XPOINTER 103#ifndef HAVE_XPOINTER
113typedef char *XPointer; 104typedef char *XPointer;
114#endif 105#endif
115 106
… …
119 110
120#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
121# define STDIN_FILENO 0 112# define STDIN_FILENO 0
122# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
123# define STDERR_FILENO 2 114# define STDERR_FILENO 2
124#endif
125
126#if !defined (EACCESS) && defined(EAGAIN)
127# define EACCESS EAGAIN
128#endif 115#endif
129 116
130#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
131# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
132# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
… …
160char * rxvt_wcstombs (const wchar_t *str, int len = -1); 147char * rxvt_wcstombs (const wchar_t *str, int len = -1);
161wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 148wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
162char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 149char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
163wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 150wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
164 151
165char * rxvt_basename (const char *str) NOTHROW; 152const char * rxvt_basename (const char *str) NOTHROW;
166void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
167void rxvt_log (const char *fmt,...) NOTHROW; 154void rxvt_log (const char *fmt,...) NOTHROW;
168void rxvt_warn (const char *fmt,...) NOTHROW; 155void rxvt_warn (const char *fmt,...) NOTHROW;
169void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
170void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
213 200
214/* 201/*
215 * the 'essential' information for reporting Mouse Events 202 * the 'essential' information for reporting Mouse Events
216 * pared down from XButtonEvent 203 * pared down from XButtonEvent
217 */ 204 */
218struct mouse_event { 205struct mouse_event
206{
219 int clicks; 207 int clicks;
220 Time time; /* milliseconds */ 208 Time time; /* milliseconds */
221 unsigned int state; /* key or button mask */ 209 unsigned int state; /* key or button mask */
222 unsigned int button; /* detail */ 210 unsigned int button; /* detail */
223}; 211};
… …
268# define NO_MOUSE_REPORT_SCROLLBAR 1 256# define NO_MOUSE_REPORT_SCROLLBAR 1
269#endif 257#endif
270 258
271#define scrollBar_esc 30 259#define scrollBar_esc 30
272 260
273#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
274# define HAVE_SCROLLBARS 1
275#endif
276
277#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR) 261#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
278# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1 262# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
279#endif 263#endif
280 264
281enum { 265enum {
… …
334// fake styles 318// fake styles
335#define RS_Blink 0x00010000UL // blink 319#define RS_Blink 0x00010000UL // blink
336#define RS_RVid 0x00020000UL // reverse video 320#define RS_RVid 0x00020000UL // reverse video
337#define RS_Uline 0x00040000UL // underline 321#define RS_Uline 0x00040000UL // underline
338 322
339// toggle this to force redraw, must be != RS_Careful 323// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
340#define RS_redraw 0x01000000UL 324#define RS_redraw 0x02000000UL
341 325
342// 5 custom bits for extensions 326// 5 custom bits for extensions
343#define RS_customCount 32 327#define RS_customCount 16
344#define RS_customMask 0x00f80000UL 328#define RS_customMask 0x00780000UL
345#define RS_customShift 19 329#define RS_customShift 19
346 330
347// other flags 331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0xf8000000UL // includes RS_Careful
333#define RS_fontShift 27
348#define RS_Careful 0x80000000UL /* be careful when drawing these */ 334#define RS_Careful 0x08000000UL /* be careful when drawing these */
349 335
350#define RS_styleCount 4 336#define RS_styleCount 4
351#define RS_styleMask (RS_Bold | RS_Italic) 337#define RS_styleMask (RS_Bold | RS_Italic)
352#define RS_styleShift 14 338#define RS_styleShift 14
353 339
354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 340#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
355#define RS_attrMask (RS_baseattrMask | RS_fontMask) 341#define RS_attrMask (RS_baseattrMask | RS_fontMask)
356
357#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
358#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
359#define RS_fontShift 24
360 342
361#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 343#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
362#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 344#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
363 345
364#define Sel_none 0 /* Not waiting */ 346#define Sel_none 0 /* Not waiting */
… …
423 405
424 URxvt_Color_IT = 704, // change actual 'Italic' colour 406 URxvt_Color_IT = 704, // change actual 'Italic' colour
425 URxvt_Color_tint = 705, // change actual tint colour 407 URxvt_Color_tint = 705, // change actual tint colour
426 URxvt_Color_BD = 706, // change actual 'Bold' color 408 URxvt_Color_BD = 706, // change actual 'Bold' color
427 URxvt_Color_UL = 707, // change actual 'Underline' color 409 URxvt_Color_UL = 707, // change actual 'Underline' color
410 URxvt_Color_border = 708,
428 411
429 URxvt_font = 710, 412 URxvt_font = 710,
430 URxvt_boldFont = 711, 413 URxvt_boldFont = 711,
431 URxvt_italicFont = 712, 414 URxvt_italicFont = 712,
432 URxvt_boldItalicFont = 713, 415 URxvt_boldItalicFont = 713,
433 416
434 URxvt_view_up = 720, 417 URxvt_view_up = 720,
435 URxvt_view_down = 721, 418 URxvt_view_down = 721,
436 419
437 URxvt_perl = 777, 420 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
438}; 421};
439 422
440/* Words starting with `Color_' are colours. Others are counts */ 423/* Words starting with `Color_' are colours. Others are counts */
441/* 424/*
442 * The PixColor and rendition colour usage should probably be decoupled 425 * The PixColor and rendition colour usage should probably be decoupled
… …
492 Color_underline, 475 Color_underline,
493#endif 476#endif
494#ifdef OPTION_HC 477#ifdef OPTION_HC
495 Color_HC, 478 Color_HC,
496#endif 479#endif
497#ifdef HAVE_SCROLLBARS
498 Color_scroll, 480 Color_scroll,
499#endif
500#ifdef RXVT_SCROLLBAR 481#ifdef RXVT_SCROLLBAR
501 Color_trough, 482 Color_trough,
502#endif 483#endif
503#if ENABLE_TRANSPARENCY 484#if ENABLE_TRANSPARENCY
504 Color_tint, 485 Color_tint,
… …
565 546
566// do not change these constants lightly, there are many interdependencies 547// do not change these constants lightly, there are many interdependencies
567#define IMBUFSIZ 128 // input modifier buffer sizes 548#define IMBUFSIZ 128 // input modifier buffer sizes
568#define KBUFSZ 512 // size of keyboard mapping buffer 549#define KBUFSZ 512 // size of keyboard mapping buffer
569#define CBUFSIZ 2048 // size of command buffer 550#define CBUFSIZ 2048 // size of command buffer
551#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
570#define UBUFSIZ 2048 // character buffer 552#define UBUFSIZ 2048 // character buffer
571 553
572#if ENABLE_FRILLS 554#if ENABLE_FRILLS
573# include <X11/Xmd.h> 555# include <X11/Xmd.h>
574typedef struct _mwmhints { 556typedef struct _mwmhints
557{
575 CARD32 flags; 558 CARD32 flags;
576 CARD32 functions; 559 CARD32 functions;
577 CARD32 decorations; 560 CARD32 decorations;
578 INT32 input_mode; 561 INT32 input_mode;
579 CARD32 status; 562 CARD32 status;
… …
626#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 609#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
627#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 610#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
628#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 611#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
629#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 612#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
630 613
631#define LINENO(n) MOD (term_start + int(n), total_rows) 614#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
632#define ROW(n) row_buf [LINENO (n)] 615#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
616
617#define LINENO(n) LINENO_of (this, n)
618#define ROW(n) ROW_of (this, n)
633 619
634/* how to build & extract colors and attributes */ 620/* how to build & extract colors and attributes */
635#define GET_BASEFG(x) (((x) & RS_fgMask)) 621#define GET_BASEFG(x) (((x) & RS_fgMask))
636#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
637 623
… …
654 640
655#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
656#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 642#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
657 643
658#if ENABLE_STYLES 644#if ENABLE_STYLES
659# define FONTSET(style) fontset[GET_STYLE (style)] 645# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
660#else 646#else
661# define FONTSET(style) fontset[0] 647# define FONTSET_of(t,style) (t)->fontset[0]
662#endif 648#endif
649
650#define FONTSET(style) FONTSET_of (this, style)
663 651
664typedef callback<void (const char *)> log_callback; 652typedef callback<void (const char *)> log_callback;
665typedef callback<int (int)> getfd_callback; 653typedef callback<int (int)> getfd_callback;
666 654
667/****************************************************************************/ 655/****************************************************************************/
… …
670#define LINE_FILTERED 0x0002 // line has been filtered 658#define LINE_FILTERED 0x0002 // line has been filtered
671#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 659#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
672#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 660#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
673#define LINE_BIDI 0x0010 // line needs bidi (NYI) 661#define LINE_BIDI 0x0010 // line needs bidi (NYI)
674 662
675struct line_t { 663struct line_t
664{
676 text_t *t; // terminal the text 665 text_t *t; // terminal the text
677 rend_t *r; // rendition, uses RS_ flags 666 rend_t *r; // rendition, uses RS_ flags
678 tlen_t_ l; // length of each text line 667 tlen_t_ l; // length of each text line
679 uint32_t f; // flags 668 uint32_t f; // flags
680 669
… …
714}; 703};
715 704
716/****************************************************************************/ 705/****************************************************************************/
717 706
718// primitive wrapper around mbstate_t to ensure initialisation 707// primitive wrapper around mbstate_t to ensure initialisation
719struct mbstate { 708struct mbstate
709{
720 mbstate_t mbs; 710 mbstate_t mbs;
721 711
722 operator mbstate_t *() { return &mbs; } 712 operator mbstate_t *() { return &mbs; }
723 void reset () { memset (&mbs, 0, sizeof (mbs)); } 713 void reset () { memset (&mbs, 0, sizeof (mbs)); }
724 mbstate () { reset (); } 714 mbstate () { reset (); }
… …
745 735
746#if ENABLE_COMBINING 736#if ENABLE_COMBINING
747// compose chars are used to represent composite characters 737// compose chars are used to represent composite characters
748// that are not representable in unicode, as well as characters 738// that are not representable in unicode, as well as characters
749// not fitting in the BMP. 739// not fitting in the BMP.
750struct compose_char { 740struct compose_char
741{
751 unicode_t c1, c2; // any chars != NOCHAR are valid 742 unicode_t c1, c2; // any chars != NOCHAR are valid
752 compose_char (unicode_t c1, unicode_t c2) 743 compose_char (unicode_t c1, unicode_t c2)
753 : c1(c1), c2(c2) 744 : c1(c1), c2(c2)
754 { } 745 { }
755}; 746};
756 747
757class rxvt_composite_vec { 748class rxvt_composite_vec
749{
758 vector<compose_char> v; 750 vector<compose_char> v;
759public: 751public:
760 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 752 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
761 int expand (unicode_t c, wchar_t *r); 753 int expand (unicode_t c, wchar_t *r);
762 compose_char *operator [](text_t c) 754 compose_char *operator [](text_t c)
… …
781extern rxvt_t rxvt_current_term; 773extern rxvt_t rxvt_current_term;
782 774
783#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 775#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
784#define GET_R rxvt_current_term 776#define GET_R rxvt_current_term
785 777
778/* ------------------------------------------------------------------------- */
779struct overlay_base
780{
781 int x, y, w, h; // overlay dimensions
782 text_t **text;
783 rend_t **rend;
784
785 // while tempting to add swap() etc. here, it effetcively only increases code size
786};
787
788/* ------------------------------------------------------------------------- */
789
786typedef struct { 790typedef struct
791{
787 int row; 792 int row;
788 int col; 793 int col;
789} row_col_t; 794} row_col_t;
790 795
791/* 796/*
… …
816 * +------------+·display·+·= term_start 821 * +------------+·display·+·= term_start
817 * | terminal | display | 822 * | terminal | display |
818 * | terminal +---------+ 823 * | terminal +---------+
819 * | terminal | 824 * | terminal |
820 * | terminal | 825 * | terminal |
821 * +------------+···········= term_stat + nrow - 1 826 * +------------+···········= term_start + nrow - 1
822 * | 827 * |
823 * | 828 * |
824 * END······················= total_rows 829 * END······················= total_rows
825 */ 830 */
826 831
827struct TermWin_t { 832struct TermWin_t
833{
828 int width; /* window width [pixels] */ 834 int width; /* window width [pixels] */
829 int height; /* window height [pixels] */ 835 int height; /* window height [pixels] */
830 int fwidth; /* font width [pixels] */ 836 int fwidth; /* font width [pixels] */
831 int fheight; /* font height [pixels] */ 837 int fheight; /* font height [pixels] */
832 int fbase; /* font ascent (baseline) [pixels] */ 838 int fbase; /* font ascent (baseline) [pixels] */
… …
835 int focus; /* window has focus */ 841 int focus; /* window has focus */
836 int mapped; /* window state mapped? */ 842 int mapped; /* window state mapped? */
837 int int_bwidth; /* internal border width */ 843 int int_bwidth; /* internal border width */
838 int ext_bwidth; /* external border width */ 844 int ext_bwidth; /* external border width */
839 int lineSpace; /* number of extra pixels between rows */ 845 int lineSpace; /* number of extra pixels between rows */
846 int letterSpace; /* number of extra pixels between columns */
840 int saveLines; /* number of lines that fit in scrollback */ 847 int saveLines; /* number of lines that fit in scrollback */
841 int total_rows; /* total number of rows in this terminal */ 848 int total_rows; /* total number of rows in this terminal */
842 int term_start; /* term lines start here */ 849 int term_start; /* term lines start here */
843 int view_start; /* scrollback view starts here */ 850 int view_start; /* scrollback view starts here */
844 int top_row; /* topmost row index of scrollback */ 851 int top_row; /* topmost row index of scrollback */
… …
862 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 869 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
863 * nothing is selected 870 * nothing is selected
864 * beg: row/column of beginning of selection : never past mark 871 * beg: row/column of beginning of selection : never past mark
865 * mark: row/column of initial click : never past end 872 * mark: row/column of initial click : never past end
866 * end: row/column of one character past end of selection 873 * end: row/column of one character past end of selection
867 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 874 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
868 * * Note: col == -1 ==> we're left of screen 875 * * Note: col == -1 ==> we're left of screen
869 * 876 *
870 */ 877 */
871typedef struct { 878struct screen_t
879{
872 row_col_t cur; /* cursor position on the screen */ 880 row_col_t cur; /* cursor position on the screen */
873 int tscroll; /* top of settable scroll region */ 881 int tscroll; /* top of settable scroll region */
874 int bscroll; /* bottom of settable scroll region */ 882 int bscroll; /* bottom of settable scroll region */
875 unsigned int charset; /* character set number [0..3] */ 883 unsigned int charset; /* character set number [0..3] */
876 unsigned int flags; /* see below */ 884 unsigned int flags; /* see below */
877 row_col_t s_cur; /* saved cursor position */ 885 row_col_t s_cur; /* saved cursor position */
878 unsigned int s_charset; /* saved character set number [0..3] */ 886 unsigned int s_charset; /* saved character set number [0..3] */
879 char s_charset_char; 887 char s_charset_char;
880 rend_t s_rstyle; /* saved rendition style */ 888 rend_t s_rstyle; /* saved rendition style */
881} screen_t; 889};
882 890
883enum selection_op_t { 891enum selection_op_t
892{
884 SELECTION_CLEAR = 0, /* nothing selected */ 893 SELECTION_CLEAR = 0, /* nothing selected */
885 SELECTION_INIT, /* marked a point */ 894 SELECTION_INIT, /* marked a point */
886 SELECTION_BEGIN, /* started a selection */ 895 SELECTION_BEGIN, /* started a selection */
887 SELECTION_CONT, /* continued selection */ 896 SELECTION_CONT, /* continued selection */
888 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 897 SELECTION_DONE /* selection put in CUT_BUFFER0 */
889}; 898};
890 899
891typedef struct { 900struct selection_t
901{
892 wchar_t *text; /* selected text */ 902 wchar_t *text; /* selected text */
893 unsigned int len; /* length of selected text */ 903 unsigned int len; /* length of selected text */
894 unsigned int screen; /* screen being used */ 904 unsigned int screen; /* screen being used */
895 unsigned int clicks; /* number of clicks */ 905 unsigned int clicks; /* number of clicks */
896 selection_op_t op; /* current operation */ 906 selection_op_t op; /* current operation */
897 bool rect; /* rectangular selection? */ 907 bool rect; /* rectangular selection? */
898 row_col_t beg; /* beginning of selection <= mark */ 908 row_col_t beg; /* beginning of selection <= mark */
899 row_col_t mark; /* point of initial click <= end */ 909 row_col_t mark; /* point of initial click <= end */
900 row_col_t end; /* one character past end point */ 910 row_col_t end; /* one character past end point */
901} selection_t; 911 wchar_t *clip_text; /* text copied to the clipboard */
912 unsigned int clip_len; /* length of clipboard text */
913};
902 914
903/* ------------------------------------------------------------------------- */ 915/* ------------------------------------------------------------------------- */
904 916
905/* screen_t flags */ 917/* screen_t flags */
906#define Screen_Relative (1<<0) /* relative origin mode flag */ 918#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
920Opt_count 932Opt_count
921}; 933};
922 934
923/* ------------------------------------------------------------------------- */ 935/* ------------------------------------------------------------------------- */
924 936
925struct rxvt_vars : TermWin_t { 937struct rxvt_vars : TermWin_t
938{
926 scrollBar_t scrollBar; 939 scrollBar_t scrollBar;
927 uint8_t options[(Opt_count + 7) >> 3]; 940 uint8_t options[(Opt_count + 7) >> 3];
928 XSizeHints szHint; 941 XSizeHints szHint;
929 rxvt_color *pix_colors; 942 rxvt_color *pix_colors;
930 Cursor TermWin_cursor; /* cursor for vt window */ 943 Cursor TermWin_cursor; /* cursor for vt window */
… …
940#ifdef OFF_FOCUS_FADING 953#ifdef OFF_FOCUS_FADING
941 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 954 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
942#endif 955#endif
943}; 956};
944 957
945struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 958struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
959{
946 960
947 // special markers with magic addresses 961 // special markers with magic addresses
948 static const char resval_undef []; // options specifically unset 962 static const char resval_undef []; // options specifically unset
949 static const char resval_on []; // boolean options switched on 963 static const char resval_on []; // boolean options switched on
950 static const char resval_off []; // or off 964 static const char resval_off []; // or off
… …
958 972
959 unsigned char want_refresh:1, 973 unsigned char want_refresh:1,
960 current_screen:1, /* primary or secondary */ 974 current_screen:1, /* primary or secondary */
961 num_scr_allow:1, 975 num_scr_allow:1,
962 bypass_keystate:1, 976 bypass_keystate:1,
977#if ENABLE_FRILLS
978 urgency_hint:1,
979#endif
963#ifdef CURSOR_BLINK 980#if CURSOR_BLINK
964 hidden_cursor:1, 981 hidden_cursor:1,
965#endif 982#endif
966#ifdef TEXT_BLINK 983#if TEXT_BLINK
967 hidden_text:1, 984 hidden_text:1,
968#endif 985#endif
969#ifdef POINTER_BLANK 986#if POINTER_BLANK
970 hidden_pointer:1, 987 hidden_pointer:1,
971#endif 988#endif
972 enc_utf8:1, /* wether locale uses utf-8 */ 989 enc_utf8:1, /* whether locale uses utf-8 */
973 seen_input:1, /* wether we have seen some program output yet */ 990 seen_input:1, /* whether we have seen some program output yet */
974 seen_resize:1, /* wether we had a resize event */ 991 seen_resize:1, /* whether we had a resize event */
975 parsed_geometry:1; 992 parsed_geometry:1;
976 993
977 unsigned char refresh_type, 994 unsigned char refresh_type,
978#ifdef META8_OPTION 995#ifdef META8_OPTION
979 meta_char, /* Alt-key prefix */ 996 meta_char, /* Alt-key prefix */
… …
983/* ---------- */ 1000/* ---------- */
984 bool rvideo_state, rvideo_mode; 1001 bool rvideo_state, rvideo_mode;
985#ifndef NO_BELL 1002#ifndef NO_BELL
986 bool rvideo_bell; 1003 bool rvideo_bell;
987#endif 1004#endif
988 int num_scr; /* screen: number lines scrolled */ 1005 int num_scr; /* screen: number of lines scrolled */
989 int prev_ncol, /* screen: previous number of columns */ 1006 int prev_ncol, /* screen: previous number of columns */
990 prev_nrow; /* screen: previous number of rows */ 1007 prev_nrow; /* screen: previous number of rows */
991/* ---------- */ 1008/* ---------- */
992 rend_t rstyle; 1009 rend_t rstyle;
993/* ---------- */ 1010/* ---------- */
… …
1005 mouse_slip_wheel_speed, 1022 mouse_slip_wheel_speed,
1006#endif 1023#endif
1007 refresh_count, 1024 refresh_count,
1008 window_vt_x, 1025 window_vt_x,
1009 window_vt_y, 1026 window_vt_y,
1010 window_sb_x,
1011 mouse_row, 1027 mouse_row,
1012 mouse_col, 1028 mouse_col,
1013# ifdef POINTER_BLANK 1029# ifdef POINTER_BLANK
1014 pointerBlankDelay, 1030 pointerBlankDelay,
1015# endif 1031# endif
… …
1023 unsigned long priv_modes, 1039 unsigned long priv_modes,
1024 SavedModes; 1040 SavedModes;
1025/* ---------- */ 1041/* ---------- */
1026 Atom *xa; 1042 Atom *xa;
1027/* ---------- */ 1043/* ---------- */
1028#ifdef RXVT_SCROLLBAR
1029 GC scrollbarGC,
1030 topShadowGC,
1031 botShadowGC;
1032#endif
1033#ifdef XTERM_SCROLLBAR
1034 GC xscrollbarGC,
1035 ShadowGC;
1036#endif
1037#ifdef PLAIN_SCROLLBAR
1038 GC pscrollbarGC;
1039#endif
1040#ifdef NEXT_SCROLLBAR
1041 GC blackGC,
1042 whiteGC,
1043 grayGC,
1044 darkGC,
1045 stippleGC;
1046 Pixmap dimple,
1047 upArrow,
1048 downArrow,
1049 upArrowHi,
1050 downArrowHi;
1051#endif
1052/* ---------- */
1053 Time selection_time, 1044 Time selection_time,
1054 selection_request_time; 1045 selection_request_time,
1046 clipboard_time;
1055 pid_t cmd_pid; /* process id of child */ 1047 pid_t cmd_pid; /* process id of child */
1056 char * incr_buf; 1048 char * incr_buf;
1057 size_t incr_buf_size, incr_buf_fill; 1049 size_t incr_buf_size, incr_buf_fill;
1058/* ---------- */ 1050/* ---------- */
1059 struct mouse_event MEvent; 1051 struct mouse_event MEvent;
… …
1064 bgPixmap_t bgPixmap; 1056 bgPixmap_t bgPixmap;
1065#endif 1057#endif
1066#ifdef HAVE_AFTERIMAGE 1058#ifdef HAVE_AFTERIMAGE
1067 ASVisual *asv; 1059 ASVisual *asv;
1068 ASImageManager *asimman; 1060 ASImageManager *asimman;
1061
1062 void init_asv ()
1063 {
1064 if (!asv)
1065 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1066 }
1069#endif 1067#endif
1070 1068
1071#if ENABLE_OVERLAY 1069#if ENABLE_OVERLAY
1072 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1070 overlay_base ov;
1073 text_t **ov_text;
1074 rend_t **ov_rend;
1075 1071
1076 void scr_swap_overlay () NOTHROW; 1072 void scr_swap_overlay () NOTHROW;
1077 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1073 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1078 void scr_overlay_off () NOTHROW; 1074 void scr_overlay_off () NOTHROW;
1079 void scr_overlay_set (int x, int y, 1075 void scr_overlay_set (int x, int y,
… …
1117 1113
1118#if ENABLE_FRILLS || ISO_14755 1114#if ENABLE_FRILLS || ISO_14755
1119 // ISO 14755 entry support 1115 // ISO 14755 entry support
1120 unicode_t iso14755buf; 1116 unicode_t iso14755buf;
1121 void commit_iso14755 (); 1117 void commit_iso14755 ();
1122 int hex_keyval (XKeyEvent &ev);
1123# if ISO_14755 1118# if ISO_14755
1124 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1119 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1125 void iso14755_54 (int x, int y); 1120 void iso14755_54 (int x, int y);
1126# endif 1121# endif
1127#endif 1122#endif
… …
1148#endif 1143#endif
1149 1144
1150 void x_cb (XEvent &xev); 1145 void x_cb (XEvent &xev);
1151 xevent_watcher termwin_ev; 1146 xevent_watcher termwin_ev;
1152 xevent_watcher vt_ev; 1147 xevent_watcher vt_ev;
1153#ifdef HAVE_SCROLLBARS
1154 xevent_watcher scrollbar_ev; 1148 xevent_watcher scrollbar_ev;
1155#endif
1156 1149
1157 void child_cb (ev::child &w, int revents); ev::child child_ev; 1150 void child_cb (ev::child &w, int revents); ev::child child_ev;
1158 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1151 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1159 void refresh_check (); 1152 void refresh_check ();
1160 void flush (); 1153 void flush ();
… …
1233 wchar_t next_char () NOTHROW; 1226 wchar_t next_char () NOTHROW;
1234 wchar_t cmd_getc () THROW ((class out_of_input)); 1227 wchar_t cmd_getc () THROW ((class out_of_input));
1235 uint32_t next_octet () NOTHROW; 1228 uint32_t next_octet () NOTHROW;
1236 uint32_t cmd_get8 () THROW ((class out_of_input)); 1229 uint32_t cmd_get8 () THROW ((class out_of_input));
1237 1230
1238 bool cmd_parse (); 1231 void cmd_parse ();
1239 void mouse_report (XButtonEvent &ev); 1232 void mouse_report (XButtonEvent &ev);
1240 void button_press (XButtonEvent &ev); 1233 void button_press (XButtonEvent &ev);
1241 void button_release (XButtonEvent &ev); 1234 void button_release (XButtonEvent &ev);
1242 void focus_in (); 1235 void focus_in ();
1243 void focus_out (); 1236 void focus_out ();
1237#if ENABLE_FRILLS
1238 void set_urgency (bool enable);
1239#else
1240 void set_urgency (bool enable) { }
1241#endif
1244 void update_fade_color (unsigned int idx); 1242 void update_fade_color (unsigned int idx);
1245#ifdef PRINTPIPE 1243#ifdef PRINTPIPE
1246 FILE *popen_printer (); 1244 FILE *popen_printer ();
1247 int pclose_printer (FILE *stream); 1245 int pclose_printer (FILE *stream);
1248#endif 1246#endif
… …
1254 void process_window_ops (const int *args, unsigned int nargs); 1252 void process_window_ops (const int *args, unsigned int nargs);
1255 char *get_to_st (unicode_t &ends_how); 1253 char *get_to_st (unicode_t &ends_how);
1256 void process_dcs_seq (); 1254 void process_dcs_seq ();
1257 void process_osc_seq (); 1255 void process_osc_seq ();
1258 void process_color_seq (int report, int color, const char *str, char resp); 1256 void process_color_seq (int report, int color, const char *str, char resp);
1259 void process_xterm_seq (int op, const char *str, char resp); 1257 void process_xterm_seq (int op, char *str, char resp);
1260 int privcases (int mode, unsigned long bit); 1258 int privcases (int mode, unsigned long bit);
1261 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1259 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1262 void process_sgr_mode (unsigned int nargs, const int *arg); 1260 void process_sgr_mode (unsigned int nargs, const int *arg);
1263 void process_graphics (); 1261 void process_graphics ();
1264 // init.C 1262 // init.C
… …
1271 void init_command (const char *const *argv); 1269 void init_command (const char *const *argv);
1272 void run_command (const char *const *argv); 1270 void run_command (const char *const *argv);
1273 int run_child (const char *const *argv); 1271 int run_child (const char *const *argv);
1274 void color_aliases (int idx); 1272 void color_aliases (int idx);
1275 void create_windows (int argc, const char *const *argv); 1273 void create_windows (int argc, const char *const *argv);
1276 void Get_Colours (); 1274 void get_colours ();
1277 void get_ourmods (); 1275 void get_ourmods ();
1278 // main.C 1276 // main.C
1279 void tt_winch (); 1277 void tt_winch ();
1280 rxvt_term (); 1278 rxvt_term ();
1281 ~rxvt_term (); 1279 ~rxvt_term ();
… …
1374 options[opt >> 3] |= (1 << (opt & 7)); 1372 options[opt >> 3] |= (1 << (opt & 7));
1375 else 1373 else
1376 options[opt >> 3] &= ~(1 << (opt & 7)); 1374 options[opt >> 3] &= ~(1 << (opt & 7));
1377 } 1375 }
1378 1376
1379 void PrivMode (int set, unsigned bit) NOTHROW 1377 void set_privmode (unsigned bit, int set) NOTHROW
1380 { 1378 {
1381 if (set) 1379 if (set)
1382 priv_modes |= bit; 1380 priv_modes |= bit;
1383 else 1381 else
1384 priv_modes &= ~bit; 1382 priv_modes &= ~bit;
… …
1386 1384
1387 // modifies first argument(!) 1385 // modifies first argument(!)
1388 void paste (char *data, unsigned int len) NOTHROW; 1386 void paste (char *data, unsigned int len) NOTHROW;
1389 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1387 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1390 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1388 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1389 void scr_kill_char (line_t &l, int col) const NOTHROW;
1391 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1390 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1392 void scr_reset (); 1391 void scr_reset ();
1393 void scr_release () NOTHROW; 1392 void scr_release () NOTHROW;
1394 void scr_clear (bool really = false) NOTHROW; 1393 void scr_clear (bool really = false) NOTHROW;
1395 void scr_refresh () NOTHROW; 1394 void scr_refresh () NOTHROW;
… …
1407 void scr_remap_chars (line_t &l) NOTHROW; 1406 void scr_remap_chars (line_t &l) NOTHROW;
1408 1407
1409 enum cursor_mode { SAVE, RESTORE }; 1408 enum cursor_mode { SAVE, RESTORE };
1410 1409
1411 void scr_poweron (); 1410 void scr_poweron ();
1411 void scr_soft_reset () NOTHROW;
1412 void scr_cursor (cursor_mode mode) NOTHROW; 1412 void scr_cursor (cursor_mode mode) NOTHROW;
1413 void scr_do_wrap () NOTHROW; 1413 void scr_do_wrap () NOTHROW;
1414 void scr_swap_screen () NOTHROW; 1414 void scr_swap_screen () NOTHROW;
1415 void scr_change_screen (int scrn); 1415 void scr_change_screen (int scrn);
1416 void scr_color (unsigned int color, int fgbg) NOTHROW; 1416 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1448 void selection_check (int check_more) NOTHROW; 1448 void selection_check (int check_more) NOTHROW;
1449 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1449 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1450 void selection_property (Window win, Atom prop) NOTHROW; 1450 void selection_property (Window win, Atom prop) NOTHROW;
1451 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1451 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1452 int selection_request_other (Atom target, int selnum) NOTHROW; 1452 int selection_request_other (Atom target, int selnum) NOTHROW;
1453 void selection_clear () NOTHROW; 1453 void selection_clear (bool clipboard = false) NOTHROW;
1454 void clipboard_copy (Time tm);
1454 void selection_make (Time tm); 1455 void selection_make (Time tm);
1455 bool selection_grab (Time tm) NOTHROW; 1456 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1456 void selection_start_colrow (int col, int row) NOTHROW; 1457 void selection_start_colrow (int col, int row) NOTHROW;
1457 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1458 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1458 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1459 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1459 void selection_remove_trailing_spaces () NOTHROW; 1460 void selection_remove_trailing_spaces () NOTHROW;
1460 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1461 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1461 void selection_click (int clicks, int x, int y) NOTHROW; 1462 void selection_click (int clicks, int x, int y) NOTHROW;
1462 void selection_extend (int x, int y, int flag) NOTHROW; 1463 void selection_extend (int x, int y, int flag) NOTHROW;
1463 void selection_rotate (int x, int y) NOTHROW; 1464 void selection_rotate (int x, int y) NOTHROW;
1464 1465
1465#if defined(NEXT_SCROLLBAR)
1466 // scrollbar-next.C
1467 Pixmap renderPixmap (const char *const *data, int width, int height);
1468 void init_scrollbar_stuff ();
1469 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1470 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1471#endif
1472
1473#if defined(RXVT_SCROLLBAR)
1474 // scrollbar-rxvt.C
1475 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1476#endif
1477
1478#if defined(XTERM_SCROLLBAR)
1479 // scrollbar-xterm.C
1480 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1481#endif
1482
1483#if defined(PLAIN_SCROLLBAR)
1484 // scrollbar-plain.C
1485 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1486#endif
1487
1488 // scrollbar.C
1489 void resize_scrollbar ();
1490 int scrollbar_mapping (int map);
1491 int scrollbar_show (int update);
1492 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1493
1494 // xdefaults.C 1466 // xdefaults.C
1495 void get_options (int argc, const char *const *argv); 1467 void get_options (int argc, const char *const *argv);
1496 int parse_keysym (const char *str, const char *arg); 1468 int parse_keysym (const char *str, const char *arg);
1497 const char *x_resource (const char *name); 1469 const char *x_resource (const char *name);
1498 void extract_resources (); 1470 void extract_resources ();

Diff Legend

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