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.355 by ayin, Sun Jan 27 22:48:33 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;
… …
213 204
214/* 205/*
215 * the 'essential' information for reporting Mouse Events 206 * the 'essential' information for reporting Mouse Events
216 * pared down from XButtonEvent 207 * pared down from XButtonEvent
217 */ 208 */
218struct mouse_event { 209struct mouse_event
210{
219 int clicks; 211 int clicks;
220 Time time; /* milliseconds */ 212 Time time; /* milliseconds */
221 unsigned int state; /* key or button mask */ 213 unsigned int state; /* key or button mask */
222 unsigned int button; /* detail */ 214 unsigned int button; /* detail */
223}; 215};
… …
348#define RS_styleShift 14 340#define RS_styleShift 14
349 341
350#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)
351#define RS_attrMask (RS_baseattrMask | RS_fontMask) 343#define RS_attrMask (RS_baseattrMask | RS_fontMask)
352 344
353#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h 345#define RS_fontCount 127 // not 128 or 256, see rxvtfont.h
354#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful 346#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
355#define RS_fontShift 24 347#define RS_fontShift 24
356 348
357#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 349#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
358#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 350#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
… …
419 411
420 URxvt_Color_IT = 704, // change actual 'Italic' colour 412 URxvt_Color_IT = 704, // change actual 'Italic' colour
421 URxvt_Color_tint = 705, // change actual tint colour 413 URxvt_Color_tint = 705, // change actual tint colour
422 URxvt_Color_BD = 706, // change actual 'Bold' color 414 URxvt_Color_BD = 706, // change actual 'Bold' color
423 URxvt_Color_UL = 707, // change actual 'Underline' color 415 URxvt_Color_UL = 707, // change actual 'Underline' color
416 URxvt_Color_border = 708,
424 417
425 URxvt_font = 710, 418 URxvt_font = 710,
426 URxvt_boldFont = 711, 419 URxvt_boldFont = 711,
427 URxvt_italicFont = 712, 420 URxvt_italicFont = 712,
428 URxvt_boldItalicFont = 713, 421 URxvt_boldItalicFont = 713,
429 422
430 URxvt_view_up = 720, 423 URxvt_view_up = 720,
431 URxvt_view_down = 721, 424 URxvt_view_down = 721,
432 425
433 URxvt_perl = 777, 426 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
434}; 427};
435 428
436/* Words starting with `Color_' are colours. Others are counts */ 429/* Words starting with `Color_' are colours. Others are counts */
437/* 430/*
438 * The PixColor and rendition colour usage should probably be decoupled 431 * The PixColor and rendition colour usage should probably be decoupled
… …
559 552
560// do not change these constants lightly, there are many interdependencies 553// do not change these constants lightly, there are many interdependencies
561#define IMBUFSIZ 128 // input modifier buffer sizes 554#define IMBUFSIZ 128 // input modifier buffer sizes
562#define KBUFSZ 512 // size of keyboard mapping buffer 555#define KBUFSZ 512 // size of keyboard mapping buffer
563#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
564#define UBUFSIZ 2048 // character buffer 558#define UBUFSIZ 2048 // character buffer
565 559
566#if ENABLE_FRILLS 560#if ENABLE_FRILLS
567# include <X11/Xmd.h> 561# include <X11/Xmd.h>
568typedef struct _mwmhints { 562typedef struct _mwmhints
563{
569 CARD32 flags; 564 CARD32 flags;
570 CARD32 functions; 565 CARD32 functions;
571 CARD32 decorations; 566 CARD32 decorations;
572 INT32 input_mode; 567 INT32 input_mode;
573 CARD32 status; 568 CARD32 status;
… …
620#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 615#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
621#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 616#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
622#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 617#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
623#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 618#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
624 619
625#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)
626#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)
627 625
628/* how to build & extract colors and attributes */ 626/* how to build & extract colors and attributes */
629#define GET_BASEFG(x) (((x) & RS_fgMask)) 627#define GET_BASEFG(x) (((x) & RS_fgMask))
630#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
631 629
… …
648 646
649#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
650#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 648#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
651 649
652#if ENABLE_STYLES 650#if ENABLE_STYLES
653# define FONTSET(style) fontset[GET_STYLE (style)] 651# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
654#else 652#else
655# define FONTSET(style) fontset[0] 653# define FONTSET_of(t,style) (t)->fontset[0]
656#endif 654#endif
655
656#define FONTSET(style) FONTSET_of (this, style)
657 657
658typedef callback<void (const char *)> log_callback; 658typedef callback<void (const char *)> log_callback;
659typedef callback<int (int)> getfd_callback; 659typedef callback<int (int)> getfd_callback;
660 660
661/****************************************************************************/ 661/****************************************************************************/
… …
664#define LINE_FILTERED 0x0002 // line has been filtered 664#define LINE_FILTERED 0x0002 // line has been filtered
665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
666#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)
667#define LINE_BIDI 0x0010 // line needs bidi (NYI) 667#define LINE_BIDI 0x0010 // line needs bidi (NYI)
668 668
669struct line_t { 669struct line_t
670{
670 text_t *t; // terminal the text 671 text_t *t; // terminal the text
671 rend_t *r; // rendition, uses RS_ flags 672 rend_t *r; // rendition, uses RS_ flags
672 tlen_t_ l; // length of each text line 673 tlen_t_ l; // length of each text line
673 uint32_t f; // flags 674 uint32_t f; // flags
674 675
… …
708}; 709};
709 710
710/****************************************************************************/ 711/****************************************************************************/
711 712
712// primitive wrapper around mbstate_t to ensure initialisation 713// primitive wrapper around mbstate_t to ensure initialisation
713struct mbstate { 714struct mbstate
715{
714 mbstate_t mbs; 716 mbstate_t mbs;
715 717
716 operator mbstate_t *() { return &mbs; } 718 operator mbstate_t *() { return &mbs; }
717 void reset () { memset (&mbs, 0, sizeof (mbs)); } 719 void reset () { memset (&mbs, 0, sizeof (mbs)); }
718 mbstate () { reset (); } 720 mbstate () { reset (); }
… …
739 741
740#if ENABLE_COMBINING 742#if ENABLE_COMBINING
741// compose chars are used to represent composite characters 743// compose chars are used to represent composite characters
742// that are not representable in unicode, as well as characters 744// that are not representable in unicode, as well as characters
743// not fitting in the BMP. 745// not fitting in the BMP.
744struct compose_char { 746struct compose_char
747{
745 unicode_t c1, c2; // any chars != NOCHAR are valid 748 unicode_t c1, c2; // any chars != NOCHAR are valid
746 compose_char (unicode_t c1, unicode_t c2) 749 compose_char (unicode_t c1, unicode_t c2)
747 : c1(c1), c2(c2) 750 : c1(c1), c2(c2)
748 { } 751 { }
749}; 752};
750 753
751class rxvt_composite_vec { 754class rxvt_composite_vec
755{
752 vector<compose_char> v; 756 vector<compose_char> v;
753public: 757public:
754 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 758 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
755 int expand (unicode_t c, wchar_t *r); 759 int expand (unicode_t c, wchar_t *r);
756 compose_char *operator [](text_t c) 760 compose_char *operator [](text_t c)
… …
775extern rxvt_t rxvt_current_term; 779extern rxvt_t rxvt_current_term;
776 780
777#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)
778#define GET_R rxvt_current_term 782#define GET_R rxvt_current_term
779 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
780typedef struct { 796typedef struct
797{
781 int row; 798 int row;
782 int col; 799 int col;
783} row_col_t; 800} row_col_t;
784 801
785/* 802/*
… …
810 * +------------+·display·+·= term_start 827 * +------------+·display·+·= term_start
811 * | terminal | display | 828 * | terminal | display |
812 * | terminal +---------+ 829 * | terminal +---------+
813 * | terminal | 830 * | terminal |
814 * | terminal | 831 * | terminal |
815 * +------------+···········= term_stat + nrow - 1 832 * +------------+···········= term_start + nrow - 1
816 * | 833 * |
817 * | 834 * |
818 * END······················= total_rows 835 * END······················= total_rows
819 */ 836 */
820 837
821struct TermWin_t { 838struct TermWin_t
839{
822 int width; /* window width [pixels] */ 840 int width; /* window width [pixels] */
823 int height; /* window height [pixels] */ 841 int height; /* window height [pixels] */
824 int fwidth; /* font width [pixels] */ 842 int fwidth; /* font width [pixels] */
825 int fheight; /* font height [pixels] */ 843 int fheight; /* font height [pixels] */
826 int fbase; /* font ascent (baseline) [pixels] */ 844 int fbase; /* font ascent (baseline) [pixels] */
… …
829 int focus; /* window has focus */ 847 int focus; /* window has focus */
830 int mapped; /* window state mapped? */ 848 int mapped; /* window state mapped? */
831 int int_bwidth; /* internal border width */ 849 int int_bwidth; /* internal border width */
832 int ext_bwidth; /* external border width */ 850 int ext_bwidth; /* external border width */
833 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 */
834 int saveLines; /* number of lines that fit in scrollback */ 853 int saveLines; /* number of lines that fit in scrollback */
835 int total_rows; /* total number of rows in this terminal */ 854 int total_rows; /* total number of rows in this terminal */
836 int term_start; /* term lines start here */ 855 int term_start; /* term lines start here */
837 int view_start; /* scrollback view starts here */ 856 int view_start; /* scrollback view starts here */
838 int top_row; /* topmost row index of scrollback */ 857 int top_row; /* topmost row index of scrollback */
… …
856 * 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
857 * nothing is selected 876 * nothing is selected
858 * beg: row/column of beginning of selection : never past mark 877 * beg: row/column of beginning of selection : never past mark
859 * mark: row/column of initial click : never past end 878 * mark: row/column of initial click : never past end
860 * end: row/column of one character past end of selection 879 * end: row/column of one character past end of selection
861 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 880 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
862 * * Note: col == -1 ==> we're left of screen 881 * * Note: col == -1 ==> we're left of screen
863 * 882 *
864 */ 883 */
865typedef struct { 884struct screen_t
885{
866 row_col_t cur; /* cursor position on the screen */ 886 row_col_t cur; /* cursor position on the screen */
867 int tscroll; /* top of settable scroll region */ 887 int tscroll; /* top of settable scroll region */
868 int bscroll; /* bottom of settable scroll region */ 888 int bscroll; /* bottom of settable scroll region */
869 unsigned int charset; /* character set number [0..3] */ 889 unsigned int charset; /* character set number [0..3] */
870 unsigned int flags; /* see below */ 890 unsigned int flags; /* see below */
871 row_col_t s_cur; /* saved cursor position */ 891 row_col_t s_cur; /* saved cursor position */
872 unsigned int s_charset; /* saved character set number [0..3] */ 892 unsigned int s_charset; /* saved character set number [0..3] */
873 char s_charset_char; 893 char s_charset_char;
874 rend_t s_rstyle; /* saved rendition style */ 894 rend_t s_rstyle; /* saved rendition style */
875} screen_t; 895};
876 896
877enum selection_op_t { 897enum selection_op_t
898{
878 SELECTION_CLEAR = 0, /* nothing selected */ 899 SELECTION_CLEAR = 0, /* nothing selected */
879 SELECTION_INIT, /* marked a point */ 900 SELECTION_INIT, /* marked a point */
880 SELECTION_BEGIN, /* started a selection */ 901 SELECTION_BEGIN, /* started a selection */
881 SELECTION_CONT, /* continued selection */ 902 SELECTION_CONT, /* continued selection */
882 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 903 SELECTION_DONE /* selection put in CUT_BUFFER0 */
883}; 904};
884 905
885typedef struct { 906struct selection_t
907{
886 wchar_t *text; /* selected text */ 908 wchar_t *text; /* selected text */
887 unsigned int len; /* length of selected text */ 909 unsigned int len; /* length of selected text */
888 unsigned int screen; /* screen being used */ 910 unsigned int screen; /* screen being used */
889 unsigned int clicks; /* number of clicks */ 911 unsigned int clicks; /* number of clicks */
890 selection_op_t op; /* current operation */ 912 selection_op_t op; /* current operation */
891 bool rect; /* rectangular selection? */ 913 bool rect; /* rectangular selection? */
892 row_col_t beg; /* beginning of selection <= mark */ 914 row_col_t beg; /* beginning of selection <= mark */
893 row_col_t mark; /* point of initial click <= end */ 915 row_col_t mark; /* point of initial click <= end */
894 row_col_t end; /* one character past end point */ 916 row_col_t end; /* one character past end point */
895} selection_t; 917};
896 918
897/* ------------------------------------------------------------------------- */ 919/* ------------------------------------------------------------------------- */
898 920
899/* screen_t flags */ 921/* screen_t flags */
900#define Screen_Relative (1<<0) /* relative origin mode flag */ 922#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
914Opt_count 936Opt_count
915}; 937};
916 938
917/* ------------------------------------------------------------------------- */ 939/* ------------------------------------------------------------------------- */
918 940
919struct rxvt_vars : TermWin_t { 941struct rxvt_vars : TermWin_t
942{
920 scrollBar_t scrollBar; 943 scrollBar_t scrollBar;
921 uint8_t options[(Opt_count + 7) >> 3]; 944 uint8_t options[(Opt_count + 7) >> 3];
922 XSizeHints szHint; 945 XSizeHints szHint;
923 rxvt_color *pix_colors; 946 rxvt_color *pix_colors;
924 Cursor TermWin_cursor; /* cursor for vt window */ 947 Cursor TermWin_cursor; /* cursor for vt window */
… …
934#ifdef OFF_FOCUS_FADING 957#ifdef OFF_FOCUS_FADING
935 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 958 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
936#endif 959#endif
937}; 960};
938 961
939struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 962struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
963{
940 964
941 // special markers with magic addresses 965 // special markers with magic addresses
942 static const char resval_undef []; // options specifically unset 966 static const char resval_undef []; // options specifically unset
943 static const char resval_on []; // boolean options switched on 967 static const char resval_on []; // boolean options switched on
944 static const char resval_off []; // or off 968 static const char resval_off []; // or off
… …
952 976
953 unsigned char want_refresh:1, 977 unsigned char want_refresh:1,
954 current_screen:1, /* primary or secondary */ 978 current_screen:1, /* primary or secondary */
955 num_scr_allow:1, 979 num_scr_allow:1,
956 bypass_keystate:1, 980 bypass_keystate:1,
981#if ENABLE_FRILLS
982 urgency_hint:1,
983#endif
957#ifdef CURSOR_BLINK 984#if CURSOR_BLINK
958 hidden_cursor:1, 985 hidden_cursor:1,
959#endif 986#endif
960#ifdef TEXT_BLINK 987#if TEXT_BLINK
961 hidden_text:1, 988 hidden_text:1,
962#endif 989#endif
963#ifdef POINTER_BLANK 990#if POINTER_BLANK
964 hidden_pointer:1, 991 hidden_pointer:1,
965#endif 992#endif
966 enc_utf8:1, /* wether locale uses utf-8 */ 993 enc_utf8:1, /* wether locale uses utf-8 */
967 seen_input:1, /* wether we have seen some program output yet */ 994 seen_input:1, /* wether we have seen some program output yet */
968 seen_resize:1, /* wether we had a resize event */ 995 seen_resize:1, /* wether we had a resize event */
… …
977/* ---------- */ 1004/* ---------- */
978 bool rvideo_state, rvideo_mode; 1005 bool rvideo_state, rvideo_mode;
979#ifndef NO_BELL 1006#ifndef NO_BELL
980 bool rvideo_bell; 1007 bool rvideo_bell;
981#endif 1008#endif
982 int num_scr; /* screen: number lines scrolled */ 1009 int num_scr; /* screen: number of lines scrolled */
983 int prev_ncol, /* screen: previous number of columns */ 1010 int prev_ncol, /* screen: previous number of columns */
984 prev_nrow; /* screen: previous number of rows */ 1011 prev_nrow; /* screen: previous number of rows */
985/* ---------- */ 1012/* ---------- */
986 rend_t rstyle; 1013 rend_t rstyle;
987/* ---------- */ 1014/* ---------- */
… …
999 mouse_slip_wheel_speed, 1026 mouse_slip_wheel_speed,
1000#endif 1027#endif
1001 refresh_count, 1028 refresh_count,
1002 window_vt_x, 1029 window_vt_x,
1003 window_vt_y, 1030 window_vt_y,
1004 window_sb_x,
1005 mouse_row, 1031 mouse_row,
1006 mouse_col, 1032 mouse_col,
1007# ifdef POINTER_BLANK 1033# ifdef POINTER_BLANK
1008 pointerBlankDelay, 1034 pointerBlankDelay,
1009# endif 1035# endif
… …
1017 unsigned long priv_modes, 1043 unsigned long priv_modes,
1018 SavedModes; 1044 SavedModes;
1019/* ---------- */ 1045/* ---------- */
1020 Atom *xa; 1046 Atom *xa;
1021/* ---------- */ 1047/* ---------- */
1022#ifdef RXVT_SCROLLBAR
1023 GC scrollbarGC,
1024 topShadowGC,
1025 botShadowGC;
1026#endif
1027#ifdef XTERM_SCROLLBAR
1028 GC xscrollbarGC,
1029 ShadowGC;
1030#endif
1031#ifdef PLAIN_SCROLLBAR
1032 GC pscrollbarGC;
1033#endif
1034#ifdef NEXT_SCROLLBAR
1035 GC blackGC,
1036 whiteGC,
1037 grayGC,
1038 darkGC,
1039 stippleGC;
1040 Pixmap dimple,
1041 upArrow,
1042 downArrow,
1043 upArrowHi,
1044 downArrowHi;
1045#endif
1046/* ---------- */
1047 Time selection_time, 1048 Time selection_time,
1048 selection_request_time; 1049 selection_request_time;
1049 pid_t cmd_pid; /* process id of child */ 1050 pid_t cmd_pid; /* process id of child */
1050 char * incr_buf; 1051 char * incr_buf;
1051 size_t incr_buf_size, incr_buf_fill; 1052 size_t incr_buf_size, incr_buf_fill;
… …
1058 bgPixmap_t bgPixmap; 1059 bgPixmap_t bgPixmap;
1059#endif 1060#endif
1060#ifdef HAVE_AFTERIMAGE 1061#ifdef HAVE_AFTERIMAGE
1061 ASVisual *asv; 1062 ASVisual *asv;
1062 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 }
1063#endif 1070#endif
1064 1071
1065#if ENABLE_OVERLAY 1072#if ENABLE_OVERLAY
1066 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1073 overlay_base ov;
1067 text_t **ov_text;
1068 rend_t **ov_rend;
1069 1074
1070 void scr_swap_overlay () NOTHROW; 1075 void scr_swap_overlay () NOTHROW;
1071 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;
1072 void scr_overlay_off () NOTHROW; 1077 void scr_overlay_off () NOTHROW;
1073 void scr_overlay_set (int x, int y, 1078 void scr_overlay_set (int x, int y,
… …
1111 1116
1112#if ENABLE_FRILLS || ISO_14755 1117#if ENABLE_FRILLS || ISO_14755
1113 // ISO 14755 entry support 1118 // ISO 14755 entry support
1114 unicode_t iso14755buf; 1119 unicode_t iso14755buf;
1115 void commit_iso14755 (); 1120 void commit_iso14755 ();
1116 int hex_keyval (XKeyEvent &ev);
1117# if ISO_14755 1121# if ISO_14755
1118 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);
1119 void iso14755_54 (int x, int y); 1123 void iso14755_54 (int x, int y);
1120# endif 1124# endif
1121#endif 1125#endif
… …
1225 wchar_t next_char () NOTHROW; 1229 wchar_t next_char () NOTHROW;
1226 wchar_t cmd_getc () THROW ((class out_of_input)); 1230 wchar_t cmd_getc () THROW ((class out_of_input));
1227 uint32_t next_octet () NOTHROW; 1231 uint32_t next_octet () NOTHROW;
1228 uint32_t cmd_get8 () THROW ((class out_of_input)); 1232 uint32_t cmd_get8 () THROW ((class out_of_input));
1229 1233
1230 bool cmd_parse (); 1234 void cmd_parse ();
1231 void mouse_report (XButtonEvent &ev); 1235 void mouse_report (XButtonEvent &ev);
1232 void button_press (XButtonEvent &ev); 1236 void button_press (XButtonEvent &ev);
1233 void button_release (XButtonEvent &ev); 1237 void button_release (XButtonEvent &ev);
1234 void focus_in (); 1238 void focus_in ();
1235 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
1236 void update_fade_color (unsigned int idx); 1245 void update_fade_color (unsigned int idx);
1237#ifdef PRINTPIPE 1246#ifdef PRINTPIPE
1238 FILE *popen_printer (); 1247 FILE *popen_printer ();
1239 int pclose_printer (FILE *stream); 1248 int pclose_printer (FILE *stream);
1240#endif 1249#endif
… …
1246 void process_window_ops (const int *args, unsigned int nargs); 1255 void process_window_ops (const int *args, unsigned int nargs);
1247 char *get_to_st (unicode_t &ends_how); 1256 char *get_to_st (unicode_t &ends_how);
1248 void process_dcs_seq (); 1257 void process_dcs_seq ();
1249 void process_osc_seq (); 1258 void process_osc_seq ();
1250 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);
1251 void process_xterm_seq (int op, const char *str, char resp); 1260 void process_xterm_seq (int op, char *str, char resp);
1252 int privcases (int mode, unsigned long bit); 1261 int privcases (int mode, unsigned long bit);
1253 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);
1254 void process_sgr_mode (unsigned int nargs, const int *arg); 1263 void process_sgr_mode (unsigned int nargs, const int *arg);
1255 void process_graphics (); 1264 void process_graphics ();
1256 // init.C 1265 // init.C
… …
1263 void init_command (const char *const *argv); 1272 void init_command (const char *const *argv);
1264 void run_command (const char *const *argv); 1273 void run_command (const char *const *argv);
1265 int run_child (const char *const *argv); 1274 int run_child (const char *const *argv);
1266 void color_aliases (int idx); 1275 void color_aliases (int idx);
1267 void create_windows (int argc, const char *const *argv); 1276 void create_windows (int argc, const char *const *argv);
1268 void Get_Colours (); 1277 void get_colours ();
1269 void get_ourmods (); 1278 void get_ourmods ();
1270 // main.C 1279 // main.C
1271 void tt_winch (); 1280 void tt_winch ();
1272 rxvt_term (); 1281 rxvt_term ();
1273 ~rxvt_term (); 1282 ~rxvt_term ();
… …
1366 options[opt >> 3] |= (1 << (opt & 7)); 1375 options[opt >> 3] |= (1 << (opt & 7));
1367 else 1376 else
1368 options[opt >> 3] &= ~(1 << (opt & 7)); 1377 options[opt >> 3] &= ~(1 << (opt & 7));
1369 } 1378 }
1370 1379
1371 void PrivMode (int set, unsigned bit) NOTHROW 1380 void set_privmode (unsigned bit, int set) NOTHROW
1372 { 1381 {
1373 if (set) 1382 if (set)
1374 priv_modes |= bit; 1383 priv_modes |= bit;
1375 else 1384 else
1376 priv_modes &= ~bit; 1385 priv_modes &= ~bit;
… …
1378 1387
1379 // modifies first argument(!) 1388 // modifies first argument(!)
1380 void paste (char *data, unsigned int len) NOTHROW; 1389 void paste (char *data, unsigned int len) NOTHROW;
1381 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;
1382 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;
1383 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1393 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1384 void scr_reset (); 1394 void scr_reset ();
1385 void scr_release () NOTHROW; 1395 void scr_release () NOTHROW;
1386 void scr_clear (bool really = false) NOTHROW; 1396 void scr_clear (bool really = false) NOTHROW;
1387 void scr_refresh () NOTHROW; 1397 void scr_refresh () NOTHROW;
… …
1399 void scr_remap_chars (line_t &l) NOTHROW; 1409 void scr_remap_chars (line_t &l) NOTHROW;
1400 1410
1401 enum cursor_mode { SAVE, RESTORE }; 1411 enum cursor_mode { SAVE, RESTORE };
1402 1412
1403 void scr_poweron (); 1413 void scr_poweron ();
1414 void scr_soft_reset () NOTHROW;
1404 void scr_cursor (cursor_mode mode) NOTHROW; 1415 void scr_cursor (cursor_mode mode) NOTHROW;
1405 void scr_do_wrap () NOTHROW; 1416 void scr_do_wrap () NOTHROW;
1406 void scr_swap_screen () NOTHROW; 1417 void scr_swap_screen () NOTHROW;
1407 void scr_change_screen (int scrn); 1418 void scr_change_screen (int scrn);
1408 void scr_color (unsigned int color, int fgbg) NOTHROW; 1419 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1452 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1463 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1453 void selection_click (int clicks, int x, int y) NOTHROW; 1464 void selection_click (int clicks, int x, int y) NOTHROW;
1454 void selection_extend (int x, int y, int flag) NOTHROW; 1465 void selection_extend (int x, int y, int flag) NOTHROW;
1455 void selection_rotate (int x, int y) NOTHROW; 1466 void selection_rotate (int x, int y) NOTHROW;
1456 1467
1457#if defined(NEXT_SCROLLBAR)
1458 // scrollbar-next.C
1459 Pixmap renderPixmap (const char *const *data, int width, int height);
1460 void init_scrollbar_stuff ();
1461 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1462 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1463#endif
1464
1465#if defined(RXVT_SCROLLBAR)
1466 // scrollbar-rxvt.C
1467 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1468#endif
1469
1470#if defined(XTERM_SCROLLBAR)
1471 // scrollbar-xterm.C
1472 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1473#endif
1474
1475#if defined(PLAIN_SCROLLBAR)
1476 // scrollbar-plain.C
1477 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1478#endif
1479
1480 // scrollbar.C
1481 void resize_scrollbar ();
1482 int scrollbar_mapping (int map);
1483 int scrollbar_show (int update);
1484 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1485
1486 // xdefaults.C 1468 // xdefaults.C
1487 void get_options (int argc, const char *const *argv); 1469 void get_options (int argc, const char *const *argv);
1488 int parse_keysym (const char *str, const char *arg); 1470 int parse_keysym (const char *str, const char *arg);
1489 const char *x_resource (const char *name); 1471 const char *x_resource (const char *name);
1490 void extract_resources (); 1472 void extract_resources ();

Diff Legend

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