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.353 by ayin, Sat Jan 26 15:26:54 2008 UTC vs.
Revision 1.379 by sf-exg, Mon Jan 18 10:04:05 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
… …
160char * rxvt_wcstombs (const wchar_t *str, int len = -1); 151char * rxvt_wcstombs (const wchar_t *str, int len = -1);
161wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 152wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
162char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
163wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 154wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
164 155
165char * rxvt_basename (const char *str) NOTHROW; 156const char * rxvt_basename (const char *str) NOTHROW;
166void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
167void rxvt_log (const char *fmt,...) NOTHROW; 158void rxvt_log (const char *fmt,...) NOTHROW;
168void rxvt_warn (const char *fmt,...) NOTHROW; 159void rxvt_warn (const char *fmt,...) NOTHROW;
169void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
170void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
209 ***************************************************************************** 200 *****************************************************************************
210 * STRUCTURES AND TYPEDEFS 201 * STRUCTURES AND TYPEDEFS
211 ***************************************************************************** 202 *****************************************************************************
212 */ 203 */
213 204
214/* If we're using either the rxvt scrollbar, keep the
215 * scrollColor resource.
216 */
217#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
218# define KEEP_SCROLLCOLOR 1
219#else
220# undef KEEP_SCROLLCOLOR
221#endif
222
223/* 205/*
224 * the 'essential' information for reporting Mouse Events 206 * the 'essential' information for reporting Mouse Events
225 * pared down from XButtonEvent 207 * pared down from XButtonEvent
226 */ 208 */
227struct mouse_event { 209struct mouse_event
210{
228 int clicks; 211 int clicks;
229 Time time; /* milliseconds */ 212 Time time; /* milliseconds */
230 unsigned int state; /* key or button mask */ 213 unsigned int state; /* key or button mask */
231 unsigned int button; /* detail */ 214 unsigned int button; /* detail */
232}; 215};
… …
277# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
278#endif 261#endif
279 262
280#define scrollBar_esc 30 263#define scrollBar_esc 30
281 264
282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
283# define HAVE_SCROLLBARS 1
284#endif
285
286#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR) 265#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
287# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1 266# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
288#endif 267#endif
289 268
290enum { 269enum {
… …
361#define RS_styleShift 14 340#define RS_styleShift 14
362 341
363#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 342#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
364#define RS_attrMask (RS_baseattrMask | RS_fontMask) 343#define RS_attrMask (RS_baseattrMask | RS_fontMask)
365 344
366#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h 345#define RS_fontCount 127 // not 128 or 256, see rxvtfont.h
367#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful 346#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
368#define RS_fontShift 24 347#define RS_fontShift 24
369 348
370#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 349#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
371#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 350#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
… …
432 411
433 URxvt_Color_IT = 704, // change actual 'Italic' colour 412 URxvt_Color_IT = 704, // change actual 'Italic' colour
434 URxvt_Color_tint = 705, // change actual tint colour 413 URxvt_Color_tint = 705, // change actual tint colour
435 URxvt_Color_BD = 706, // change actual 'Bold' color 414 URxvt_Color_BD = 706, // change actual 'Bold' color
436 URxvt_Color_UL = 707, // change actual 'Underline' color 415 URxvt_Color_UL = 707, // change actual 'Underline' color
416 URxvt_Color_border = 708,
437 417
438 URxvt_font = 710, 418 URxvt_font = 710,
439 URxvt_boldFont = 711, 419 URxvt_boldFont = 711,
440 URxvt_italicFont = 712, 420 URxvt_italicFont = 712,
441 URxvt_boldItalicFont = 713, 421 URxvt_boldItalicFont = 713,
442 422
443 URxvt_view_up = 720, 423 URxvt_view_up = 720,
444 URxvt_view_down = 721, 424 URxvt_view_down = 721,
445 425
446 URxvt_perl = 777, 426 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
447}; 427};
448 428
449/* Words starting with `Color_' are colours. Others are counts */ 429/* Words starting with `Color_' are colours. Others are counts */
450/* 430/*
451 * The PixColor and rendition colour usage should probably be decoupled 431 * The PixColor and rendition colour usage should probably be decoupled
… …
501 Color_underline, 481 Color_underline,
502#endif 482#endif
503#ifdef OPTION_HC 483#ifdef OPTION_HC
504 Color_HC, 484 Color_HC,
505#endif 485#endif
506#ifdef KEEP_SCROLLCOLOR
507 Color_scroll, 486 Color_scroll,
487#ifdef RXVT_SCROLLBAR
508 Color_trough, 488 Color_trough,
509#endif 489#endif
510#if ENABLE_TRANSPARENCY 490#if ENABLE_TRANSPARENCY
511 Color_tint, 491 Color_tint,
512#endif 492#endif
513#if OFF_FOCUS_FADING 493#if OFF_FOCUS_FADING
514 Color_fade, 494 Color_fade,
515#endif 495#endif
516 NRS_COLORS, /* */ 496 NRS_COLORS, /* */
517#ifdef KEEP_SCROLLCOLOR 497#ifdef RXVT_SCROLLBAR
518 Color_topShadow = NRS_COLORS, 498 Color_topShadow = NRS_COLORS,
519 Color_bottomShadow, 499 Color_bottomShadow,
520 TOTAL_COLORS 500 TOTAL_COLORS
521#else 501#else
522 TOTAL_COLORS = NRS_COLORS 502 TOTAL_COLORS = NRS_COLORS
… …
572 552
573// do not change these constants lightly, there are many interdependencies 553// do not change these constants lightly, there are many interdependencies
574#define IMBUFSIZ 128 // input modifier buffer sizes 554#define IMBUFSIZ 128 // input modifier buffer sizes
575#define KBUFSZ 512 // size of keyboard mapping buffer 555#define KBUFSZ 512 // size of keyboard mapping buffer
576#define CBUFSIZ 2048 // size of command buffer 556#define CBUFSIZ 2048 // size of command buffer
557#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
577#define UBUFSIZ 2048 // character buffer 558#define UBUFSIZ 2048 // character buffer
578 559
579#if ENABLE_FRILLS 560#if ENABLE_FRILLS
580# include <X11/Xmd.h> 561# include <X11/Xmd.h>
581typedef struct _mwmhints { 562typedef struct _mwmhints
563{
582 CARD32 flags; 564 CARD32 flags;
583 CARD32 functions; 565 CARD32 functions;
584 CARD32 decorations; 566 CARD32 decorations;
585 INT32 input_mode; 567 INT32 input_mode;
586 CARD32 status; 568 CARD32 status;
… …
633#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 615#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
634#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 616#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
635#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 617#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
636#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 618#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
637 619
638#define LINENO(n) MOD (term_start + int(n), total_rows) 620#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
639#define ROW(n) row_buf [LINENO (n)] 621#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
622
623#define LINENO(n) LINENO_of (this, n)
624#define ROW(n) ROW_of (this, n)
640 625
641/* how to build & extract colors and attributes */ 626/* how to build & extract colors and attributes */
642#define GET_BASEFG(x) (((x) & RS_fgMask)) 627#define GET_BASEFG(x) (((x) & RS_fgMask))
643#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
644 629
… …
661 646
662#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
663#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 648#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
664 649
665#if ENABLE_STYLES 650#if ENABLE_STYLES
666# define FONTSET(style) fontset[GET_STYLE (style)] 651# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
667#else 652#else
668# define FONTSET(style) fontset[0] 653# define FONTSET_of(t,style) (t)->fontset[0]
669#endif 654#endif
655
656#define FONTSET(style) FONTSET_of (this, style)
670 657
671typedef callback<void (const char *)> log_callback; 658typedef callback<void (const char *)> log_callback;
672typedef callback<int (int)> getfd_callback; 659typedef callback<int (int)> getfd_callback;
673 660
674/****************************************************************************/ 661/****************************************************************************/
… …
677#define LINE_FILTERED 0x0002 // line has been filtered 664#define LINE_FILTERED 0x0002 // line has been filtered
678#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
679#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 666#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
680#define LINE_BIDI 0x0010 // line needs bidi (NYI) 667#define LINE_BIDI 0x0010 // line needs bidi (NYI)
681 668
682struct line_t { 669struct line_t
670{
683 text_t *t; // terminal the text 671 text_t *t; // terminal the text
684 rend_t *r; // rendition, uses RS_ flags 672 rend_t *r; // rendition, uses RS_ flags
685 tlen_t_ l; // length of each text line 673 tlen_t_ l; // length of each text line
686 uint32_t f; // flags 674 uint32_t f; // flags
687 675
… …
721}; 709};
722 710
723/****************************************************************************/ 711/****************************************************************************/
724 712
725// primitive wrapper around mbstate_t to ensure initialisation 713// primitive wrapper around mbstate_t to ensure initialisation
726struct mbstate { 714struct mbstate
715{
727 mbstate_t mbs; 716 mbstate_t mbs;
728 717
729 operator mbstate_t *() { return &mbs; } 718 operator mbstate_t *() { return &mbs; }
730 void reset () { memset (&mbs, 0, sizeof (mbs)); } 719 void reset () { memset (&mbs, 0, sizeof (mbs)); }
731 mbstate () { reset (); } 720 mbstate () { reset (); }
… …
752 741
753#if ENABLE_COMBINING 742#if ENABLE_COMBINING
754// compose chars are used to represent composite characters 743// compose chars are used to represent composite characters
755// that are not representable in unicode, as well as characters 744// that are not representable in unicode, as well as characters
756// not fitting in the BMP. 745// not fitting in the BMP.
757struct compose_char { 746struct compose_char
747{
758 unicode_t c1, c2; // any chars != NOCHAR are valid 748 unicode_t c1, c2; // any chars != NOCHAR are valid
759 compose_char (unicode_t c1, unicode_t c2) 749 compose_char (unicode_t c1, unicode_t c2)
760 : c1(c1), c2(c2) 750 : c1(c1), c2(c2)
761 { } 751 { }
762}; 752};
763 753
764class rxvt_composite_vec { 754class rxvt_composite_vec
755{
765 vector<compose_char> v; 756 vector<compose_char> v;
766public: 757public:
767 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 758 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
768 int expand (unicode_t c, wchar_t *r); 759 int expand (unicode_t c, wchar_t *r);
769 compose_char *operator [](text_t c) 760 compose_char *operator [](text_t c)
… …
788extern rxvt_t rxvt_current_term; 779extern rxvt_t rxvt_current_term;
789 780
790#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 781#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
791#define GET_R rxvt_current_term 782#define GET_R rxvt_current_term
792 783
784/* ------------------------------------------------------------------------- */
785struct overlay_base
786{
787 int x, y, w, h; // overlay dimensions
788 text_t **text;
789 rend_t **rend;
790
791 // while tempting to add swap() etc. here, it effetcively only increases code size
792};
793
794/* ------------------------------------------------------------------------- */
795
793typedef struct { 796typedef struct
797{
794 int row; 798 int row;
795 int col; 799 int col;
796} row_col_t; 800} row_col_t;
797 801
798/* 802/*
… …
823 * +------------+·display·+·= term_start 827 * +------------+·display·+·= term_start
824 * | terminal | display | 828 * | terminal | display |
825 * | terminal +---------+ 829 * | terminal +---------+
826 * | terminal | 830 * | terminal |
827 * | terminal | 831 * | terminal |
828 * +------------+···········= term_stat + nrow - 1 832 * +------------+···········= term_start + nrow - 1
829 * | 833 * |
830 * | 834 * |
831 * END······················= total_rows 835 * END······················= total_rows
832 */ 836 */
833 837
834struct TermWin_t { 838struct TermWin_t
839{
835 int width; /* window width [pixels] */ 840 int width; /* window width [pixels] */
836 int height; /* window height [pixels] */ 841 int height; /* window height [pixels] */
837 int fwidth; /* font width [pixels] */ 842 int fwidth; /* font width [pixels] */
838 int fheight; /* font height [pixels] */ 843 int fheight; /* font height [pixels] */
839 int fbase; /* font ascent (baseline) [pixels] */ 844 int fbase; /* font ascent (baseline) [pixels] */
… …
842 int focus; /* window has focus */ 847 int focus; /* window has focus */
843 int mapped; /* window state mapped? */ 848 int mapped; /* window state mapped? */
844 int int_bwidth; /* internal border width */ 849 int int_bwidth; /* internal border width */
845 int ext_bwidth; /* external border width */ 850 int ext_bwidth; /* external border width */
846 int lineSpace; /* number of extra pixels between rows */ 851 int lineSpace; /* number of extra pixels between rows */
852 int letterSpace; /* number of extra pixels between columns */
847 int saveLines; /* number of lines that fit in scrollback */ 853 int saveLines; /* number of lines that fit in scrollback */
848 int total_rows; /* total number of rows in this terminal */ 854 int total_rows; /* total number of rows in this terminal */
849 int term_start; /* term lines start here */ 855 int term_start; /* term lines start here */
850 int view_start; /* scrollback view starts here */ 856 int view_start; /* scrollback view starts here */
851 int top_row; /* topmost row index of scrollback */ 857 int top_row; /* topmost row index of scrollback */
… …
869 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 875 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
870 * nothing is selected 876 * nothing is selected
871 * beg: row/column of beginning of selection : never past mark 877 * beg: row/column of beginning of selection : never past mark
872 * mark: row/column of initial click : never past end 878 * mark: row/column of initial click : never past end
873 * end: row/column of one character past end of selection 879 * end: row/column of one character past end of selection
874 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 880 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
875 * * Note: col == -1 ==> we're left of screen 881 * * Note: col == -1 ==> we're left of screen
876 * 882 *
877 */ 883 */
878typedef struct { 884struct screen_t
885{
879 row_col_t cur; /* cursor position on the screen */ 886 row_col_t cur; /* cursor position on the screen */
880 int tscroll; /* top of settable scroll region */ 887 int tscroll; /* top of settable scroll region */
881 int bscroll; /* bottom of settable scroll region */ 888 int bscroll; /* bottom of settable scroll region */
882 unsigned int charset; /* character set number [0..3] */ 889 unsigned int charset; /* character set number [0..3] */
883 unsigned int flags; /* see below */ 890 unsigned int flags; /* see below */
884 row_col_t s_cur; /* saved cursor position */ 891 row_col_t s_cur; /* saved cursor position */
885 unsigned int s_charset; /* saved character set number [0..3] */ 892 unsigned int s_charset; /* saved character set number [0..3] */
886 char s_charset_char; 893 char s_charset_char;
887 rend_t s_rstyle; /* saved rendition style */ 894 rend_t s_rstyle; /* saved rendition style */
888} screen_t; 895};
889 896
890enum selection_op_t { 897enum selection_op_t
898{
891 SELECTION_CLEAR = 0, /* nothing selected */ 899 SELECTION_CLEAR = 0, /* nothing selected */
892 SELECTION_INIT, /* marked a point */ 900 SELECTION_INIT, /* marked a point */
893 SELECTION_BEGIN, /* started a selection */ 901 SELECTION_BEGIN, /* started a selection */
894 SELECTION_CONT, /* continued selection */ 902 SELECTION_CONT, /* continued selection */
895 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 903 SELECTION_DONE /* selection put in CUT_BUFFER0 */
896}; 904};
897 905
898typedef struct { 906struct selection_t
907{
899 wchar_t *text; /* selected text */ 908 wchar_t *text; /* selected text */
900 unsigned int len; /* length of selected text */ 909 unsigned int len; /* length of selected text */
901 unsigned int screen; /* screen being used */ 910 unsigned int screen; /* screen being used */
902 unsigned int clicks; /* number of clicks */ 911 unsigned int clicks; /* number of clicks */
903 selection_op_t op; /* current operation */ 912 selection_op_t op; /* current operation */
904 bool rect; /* rectangular selection? */ 913 bool rect; /* rectangular selection? */
905 row_col_t beg; /* beginning of selection <= mark */ 914 row_col_t beg; /* beginning of selection <= mark */
906 row_col_t mark; /* point of initial click <= end */ 915 row_col_t mark; /* point of initial click <= end */
907 row_col_t end; /* one character past end point */ 916 row_col_t end; /* one character past end point */
908} selection_t; 917};
909 918
910/* ------------------------------------------------------------------------- */ 919/* ------------------------------------------------------------------------- */
911 920
912/* screen_t flags */ 921/* screen_t flags */
913#define Screen_Relative (1<<0) /* relative origin mode flag */ 922#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
927Opt_count 936Opt_count
928}; 937};
929 938
930/* ------------------------------------------------------------------------- */ 939/* ------------------------------------------------------------------------- */
931 940
932struct rxvt_vars : TermWin_t { 941struct rxvt_vars : TermWin_t
942{
933 scrollBar_t scrollBar; 943 scrollBar_t scrollBar;
934 uint8_t options[(Opt_count + 7) >> 3]; 944 uint8_t options[(Opt_count + 7) >> 3];
935 XSizeHints szHint; 945 XSizeHints szHint;
936 rxvt_color *pix_colors; 946 rxvt_color *pix_colors;
937 Cursor TermWin_cursor; /* cursor for vt window */ 947 Cursor TermWin_cursor; /* cursor for vt window */
… …
947#ifdef OFF_FOCUS_FADING 957#ifdef OFF_FOCUS_FADING
948 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 958 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
949#endif 959#endif
950}; 960};
951 961
952struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 962struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
963{
953 964
954 // special markers with magic addresses 965 // special markers with magic addresses
955 static const char resval_undef []; // options specifically unset 966 static const char resval_undef []; // options specifically unset
956 static const char resval_on []; // boolean options switched on 967 static const char resval_on []; // boolean options switched on
957 static const char resval_off []; // or off 968 static const char resval_off []; // or off
… …
965 976
966 unsigned char want_refresh:1, 977 unsigned char want_refresh:1,
967 current_screen:1, /* primary or secondary */ 978 current_screen:1, /* primary or secondary */
968 num_scr_allow:1, 979 num_scr_allow:1,
969 bypass_keystate:1, 980 bypass_keystate:1,
981#if ENABLE_FRILLS
982 urgency_hint:1,
983#endif
970#ifdef CURSOR_BLINK 984#if CURSOR_BLINK
971 hidden_cursor:1, 985 hidden_cursor:1,
972#endif 986#endif
973#ifdef TEXT_BLINK 987#if TEXT_BLINK
974 hidden_text:1, 988 hidden_text:1,
975#endif 989#endif
976#ifdef POINTER_BLANK 990#if POINTER_BLANK
977 hidden_pointer:1, 991 hidden_pointer:1,
978#endif 992#endif
979 enc_utf8:1, /* wether locale uses utf-8 */ 993 enc_utf8:1, /* wether locale uses utf-8 */
980 seen_input:1, /* wether we have seen some program output yet */ 994 seen_input:1, /* wether we have seen some program output yet */
981 seen_resize:1, /* wether we had a resize event */ 995 seen_resize:1, /* wether we had a resize event */
… …
990/* ---------- */ 1004/* ---------- */
991 bool rvideo_state, rvideo_mode; 1005 bool rvideo_state, rvideo_mode;
992#ifndef NO_BELL 1006#ifndef NO_BELL
993 bool rvideo_bell; 1007 bool rvideo_bell;
994#endif 1008#endif
995 int num_scr; /* screen: number lines scrolled */ 1009 int num_scr; /* screen: number of lines scrolled */
996 int prev_ncol, /* screen: previous number of columns */ 1010 int prev_ncol, /* screen: previous number of columns */
997 prev_nrow; /* screen: previous number of rows */ 1011 prev_nrow; /* screen: previous number of rows */
998/* ---------- */ 1012/* ---------- */
999 rend_t rstyle; 1013 rend_t rstyle;
1000/* ---------- */ 1014/* ---------- */
… …
1012 mouse_slip_wheel_speed, 1026 mouse_slip_wheel_speed,
1013#endif 1027#endif
1014 refresh_count, 1028 refresh_count,
1015 window_vt_x, 1029 window_vt_x,
1016 window_vt_y, 1030 window_vt_y,
1017 window_sb_x,
1018 mouse_row, 1031 mouse_row,
1019 mouse_col, 1032 mouse_col,
1020# ifdef POINTER_BLANK 1033# ifdef POINTER_BLANK
1021 pointerBlankDelay, 1034 pointerBlankDelay,
1022# endif 1035# endif
… …
1030 unsigned long priv_modes, 1043 unsigned long priv_modes,
1031 SavedModes; 1044 SavedModes;
1032/* ---------- */ 1045/* ---------- */
1033 Atom *xa; 1046 Atom *xa;
1034/* ---------- */ 1047/* ---------- */
1035#ifdef RXVT_SCROLLBAR
1036 GC scrollbarGC,
1037 topShadowGC,
1038 botShadowGC;
1039#endif
1040#ifdef XTERM_SCROLLBAR
1041 GC xscrollbarGC,
1042 ShadowGC;
1043#endif
1044#ifdef PLAIN_SCROLLBAR
1045 GC pscrollbarGC;
1046#endif
1047#ifdef NEXT_SCROLLBAR
1048 GC blackGC,
1049 whiteGC,
1050 grayGC,
1051 darkGC,
1052 stippleGC;
1053 Pixmap dimple,
1054 upArrow,
1055 downArrow,
1056 upArrowHi,
1057 downArrowHi;
1058#endif
1059/* ---------- */
1060 Time selection_time, 1048 Time selection_time,
1061 selection_request_time; 1049 selection_request_time;
1062 pid_t cmd_pid; /* process id of child */ 1050 pid_t cmd_pid; /* process id of child */
1063 char * incr_buf; 1051 char * incr_buf;
1064 size_t incr_buf_size, incr_buf_fill; 1052 size_t incr_buf_size, incr_buf_fill;
… …
1071 bgPixmap_t bgPixmap; 1059 bgPixmap_t bgPixmap;
1072#endif 1060#endif
1073#ifdef HAVE_AFTERIMAGE 1061#ifdef HAVE_AFTERIMAGE
1074 ASVisual *asv; 1062 ASVisual *asv;
1075 ASImageManager *asimman; 1063 ASImageManager *asimman;
1064
1065 void init_asv ()
1066 {
1067 if (!asv)
1068 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1069 }
1076#endif 1070#endif
1077 1071
1078#if ENABLE_OVERLAY 1072#if ENABLE_OVERLAY
1079 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1073 overlay_base ov;
1080 text_t **ov_text;
1081 rend_t **ov_rend;
1082 1074
1083 void scr_swap_overlay () NOTHROW; 1075 void scr_swap_overlay () NOTHROW;
1084 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1076 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1085 void scr_overlay_off () NOTHROW; 1077 void scr_overlay_off () NOTHROW;
1086 void scr_overlay_set (int x, int y, 1078 void scr_overlay_set (int x, int y,
… …
1124 1116
1125#if ENABLE_FRILLS || ISO_14755 1117#if ENABLE_FRILLS || ISO_14755
1126 // ISO 14755 entry support 1118 // ISO 14755 entry support
1127 unicode_t iso14755buf; 1119 unicode_t iso14755buf;
1128 void commit_iso14755 (); 1120 void commit_iso14755 ();
1129 int hex_keyval (XKeyEvent &ev);
1130# if ISO_14755 1121# if ISO_14755
1131 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1122 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1132 void iso14755_54 (int x, int y); 1123 void iso14755_54 (int x, int y);
1133# endif 1124# endif
1134#endif 1125#endif
… …
1155#endif 1146#endif
1156 1147
1157 void x_cb (XEvent &xev); 1148 void x_cb (XEvent &xev);
1158 xevent_watcher termwin_ev; 1149 xevent_watcher termwin_ev;
1159 xevent_watcher vt_ev; 1150 xevent_watcher vt_ev;
1160#ifdef HAVE_SCROLLBARS
1161 xevent_watcher scrollbar_ev; 1151 xevent_watcher scrollbar_ev;
1162#endif
1163 1152
1164 void child_cb (ev::child &w, int revents); ev::child child_ev; 1153 void child_cb (ev::child &w, int revents); ev::child child_ev;
1165 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1154 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1166 void refresh_check (); 1155 void refresh_check ();
1167 void flush (); 1156 void flush ();
… …
1240 wchar_t next_char () NOTHROW; 1229 wchar_t next_char () NOTHROW;
1241 wchar_t cmd_getc () THROW ((class out_of_input)); 1230 wchar_t cmd_getc () THROW ((class out_of_input));
1242 uint32_t next_octet () NOTHROW; 1231 uint32_t next_octet () NOTHROW;
1243 uint32_t cmd_get8 () THROW ((class out_of_input)); 1232 uint32_t cmd_get8 () THROW ((class out_of_input));
1244 1233
1245 bool cmd_parse (); 1234 void cmd_parse ();
1246 void mouse_report (XButtonEvent &ev); 1235 void mouse_report (XButtonEvent &ev);
1247 void button_press (XButtonEvent &ev); 1236 void button_press (XButtonEvent &ev);
1248 void button_release (XButtonEvent &ev); 1237 void button_release (XButtonEvent &ev);
1249 void focus_in (); 1238 void focus_in ();
1250 void focus_out (); 1239 void focus_out ();
1240#if ENABLE_FRILLS
1241 void set_urgency (bool enable);
1242#else
1243 void set_urgency (bool enable) { }
1244#endif
1251 void update_fade_color (unsigned int idx); 1245 void update_fade_color (unsigned int idx);
1252#ifdef PRINTPIPE 1246#ifdef PRINTPIPE
1253 FILE *popen_printer (); 1247 FILE *popen_printer ();
1254 int pclose_printer (FILE *stream); 1248 int pclose_printer (FILE *stream);
1255#endif 1249#endif
… …
1261 void process_window_ops (const int *args, unsigned int nargs); 1255 void process_window_ops (const int *args, unsigned int nargs);
1262 char *get_to_st (unicode_t &ends_how); 1256 char *get_to_st (unicode_t &ends_how);
1263 void process_dcs_seq (); 1257 void process_dcs_seq ();
1264 void process_osc_seq (); 1258 void process_osc_seq ();
1265 void process_color_seq (int report, int color, const char *str, char resp); 1259 void process_color_seq (int report, int color, const char *str, char resp);
1266 void process_xterm_seq (int op, const char *str, char resp); 1260 void process_xterm_seq (int op, char *str, char resp);
1267 int privcases (int mode, unsigned long bit); 1261 int privcases (int mode, unsigned long bit);
1268 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1262 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1269 void process_sgr_mode (unsigned int nargs, const int *arg); 1263 void process_sgr_mode (unsigned int nargs, const int *arg);
1270 void process_graphics (); 1264 void process_graphics ();
1271 // init.C 1265 // init.C
… …
1278 void init_command (const char *const *argv); 1272 void init_command (const char *const *argv);
1279 void run_command (const char *const *argv); 1273 void run_command (const char *const *argv);
1280 int run_child (const char *const *argv); 1274 int run_child (const char *const *argv);
1281 void color_aliases (int idx); 1275 void color_aliases (int idx);
1282 void create_windows (int argc, const char *const *argv); 1276 void create_windows (int argc, const char *const *argv);
1283 void Get_Colours (); 1277 void get_colours ();
1284 void get_ourmods (); 1278 void get_ourmods ();
1285 // main.C 1279 // main.C
1286 void tt_winch (); 1280 void tt_winch ();
1287 rxvt_term (); 1281 rxvt_term ();
1288 ~rxvt_term (); 1282 ~rxvt_term ();
… …
1381 options[opt >> 3] |= (1 << (opt & 7)); 1375 options[opt >> 3] |= (1 << (opt & 7));
1382 else 1376 else
1383 options[opt >> 3] &= ~(1 << (opt & 7)); 1377 options[opt >> 3] &= ~(1 << (opt & 7));
1384 } 1378 }
1385 1379
1386 void PrivMode (int set, unsigned bit) NOTHROW 1380 void set_privmode (unsigned bit, int set) NOTHROW
1387 { 1381 {
1388 if (set) 1382 if (set)
1389 priv_modes |= bit; 1383 priv_modes |= bit;
1390 else 1384 else
1391 priv_modes &= ~bit; 1385 priv_modes &= ~bit;
… …
1393 1387
1394 // modifies first argument(!) 1388 // modifies first argument(!)
1395 void paste (char *data, unsigned int len) NOTHROW; 1389 void paste (char *data, unsigned int len) NOTHROW;
1396 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1390 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1397 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1391 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1392 void scr_kill_char (line_t &l, int col) const NOTHROW;
1398 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1393 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1399 void scr_reset (); 1394 void scr_reset ();
1400 void scr_release () NOTHROW; 1395 void scr_release () NOTHROW;
1401 void scr_clear (bool really = false) NOTHROW; 1396 void scr_clear (bool really = false) NOTHROW;
1402 void scr_refresh () NOTHROW; 1397 void scr_refresh () NOTHROW;
… …
1414 void scr_remap_chars (line_t &l) NOTHROW; 1409 void scr_remap_chars (line_t &l) NOTHROW;
1415 1410
1416 enum cursor_mode { SAVE, RESTORE }; 1411 enum cursor_mode { SAVE, RESTORE };
1417 1412
1418 void scr_poweron (); 1413 void scr_poweron ();
1414 void scr_soft_reset () NOTHROW;
1419 void scr_cursor (cursor_mode mode) NOTHROW; 1415 void scr_cursor (cursor_mode mode) NOTHROW;
1420 void scr_do_wrap () NOTHROW; 1416 void scr_do_wrap () NOTHROW;
1421 void scr_swap_screen () NOTHROW; 1417 void scr_swap_screen () NOTHROW;
1422 void scr_change_screen (int scrn); 1418 void scr_change_screen (int scrn);
1423 void scr_color (unsigned int color, int fgbg) NOTHROW; 1419 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1467 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1463 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1468 void selection_click (int clicks, int x, int y) NOTHROW; 1464 void selection_click (int clicks, int x, int y) NOTHROW;
1469 void selection_extend (int x, int y, int flag) NOTHROW; 1465 void selection_extend (int x, int y, int flag) NOTHROW;
1470 void selection_rotate (int x, int y) NOTHROW; 1466 void selection_rotate (int x, int y) NOTHROW;
1471 1467
1472#if defined(NEXT_SCROLLBAR)
1473 // scrollbar-next.C
1474 Pixmap renderPixmap (const char *const *data, int width, int height);
1475 void init_scrollbar_stuff ();
1476 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1477 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1478#endif
1479
1480#if defined(RXVT_SCROLLBAR)
1481 // scrollbar-rxvt.C
1482 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1483#endif
1484
1485#if defined(XTERM_SCROLLBAR)
1486 // scrollbar-xterm.C
1487 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1488#endif
1489
1490#if defined(PLAIN_SCROLLBAR)
1491 // scrollbar-plain.C
1492 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1493#endif
1494
1495 // scrollbar.C
1496 void resize_scrollbar ();
1497 int scrollbar_mapping (int map);
1498 int scrollbar_show (int update);
1499 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1500
1501 // xdefaults.C 1468 // xdefaults.C
1502 void get_options (int argc, const char *const *argv); 1469 void get_options (int argc, const char *const *argv);
1503 int parse_keysym (const char *str, const char *arg); 1470 int parse_keysym (const char *str, const char *arg);
1504 const char *x_resource (const char *name); 1471 const char *x_resource (const char *name);
1505 void extract_resources (); 1472 void extract_resources ();

Diff Legend

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