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.316 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.340 by ayin, Fri Dec 28 14:00:47 2007 UTC

1#ifndef RXVT_H_ /* include once only */ 1#ifndef RXVT_H_ /* include once only */
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include "rxvtlib.h" 4#include <cstdio>
5#include <cctype>
6#include <cerrno>
7#include <cstdarg>
8#include <cstdlib>
9#ifdef HAVE_STDINT_H
10#include <stdint.h>
11#endif
12#include <sys/types.h>
13#include <unistd.h>
14#include <cstring>
15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h>
18#endif
19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h>
21#endif
22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H
26# include <wchar.h>
27#else
28// stdlib.h might provide it
29#endif
30
31using namespace std;
32
33extern "C" {
34#include <X11/Xlib.h>
35#include <X11/Xutil.h>
36#include <X11/Xresource.h>
37}
38
39#if UNICODE_3
40typedef uint32_t text_t;
41#else
42typedef uint16_t text_t; // saves lots of memory
43#endif
44typedef uint32_t rend_t;
45typedef int32_t tlen_t; // was int16_t, but this results in smaller code and memory use
46typedef int32_t tlen_t_; // specifically for use in the line_t structure
5 47
6#include "feature.h" 48#include "feature.h"
7 49
8#if defined (ISO_14755) || defined (ENABLE_PERL) 50#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 51# define ENABLE_OVERLAY 1
… …
18# define ENABLE_XEMBED 1 60# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 61# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1 62# define ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 63# define CURSOR_BLINK 1
22# define OPTION_HC 1 64# define OPTION_HC 1
65# define BUILTIN_GLYPHS 1
23#else 66#else
24# define ENABLE_MINIMAL 1 67# define ENABLE_MINIMAL 1
25#endif 68#endif
26 69
27#include <limits.h> 70#include <limits.h>
28 71
29#include <X11/cursorfont.h> 72#include <X11/cursorfont.h>
30#include <X11/keysym.h> 73#include <X11/keysym.h>
31#include <X11/keysymdef.h> 74#include <X11/keysymdef.h>
32#include <X11/Xatom.h> 75#include <X11/Xatom.h>
33#if ENABLE_FRILLS
34# include <X11/Xmd.h>
35#endif
36 76
37#include "encoding.h" 77#include "encoding.h"
38#include "rxvtutil.h" 78#include "rxvtutil.h"
39#include "rxvtfont.h" 79#include "rxvtfont.h"
40#include "rxvttoolkit.h" 80#include "rxvttoolkit.h"
41#include "iom.h" 81#include "ev_cpp.h"
42#include "salloc.h" 82#include "salloc.h"
43#include "libptytty.h" 83#include "libptytty.h"
44 84
45#include "rxvtperl.h" 85#include "rxvtperl.h"
46 86
… …
81# define STDIN_FILENO 0 121# define STDIN_FILENO 0
82# define STDOUT_FILENO 1 122# define STDOUT_FILENO 1
83# define STDERR_FILENO 2 123# define STDERR_FILENO 2
84#endif 124#endif
85 125
126#if !defined (EACCESS) && defined(EAGAIN)
127# define EACCESS EAGAIN
128#endif
129
130#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
131# define EXIT_SUCCESS 0 /* exit function success */
132# define EXIT_FAILURE 1 /* exit function failure */
133#endif
134
135#ifndef PATH_MAX
136# define PATH_MAX 16384
137#endif
138
86/****************************************************************************/ 139/****************************************************************************/
87 140
88// exception thrown on fatal (per-instance) errors 141// exception thrown on fatal (per-instance) errors
89class rxvt_failure_exception { }; 142class rxvt_failure_exception { };
90 143
… …
95 ***************************************************************************** 148 *****************************************************************************
96 * PROTOTYPES 149 * PROTOTYPES
97 ***************************************************************************** 150 *****************************************************************************
98 */ 151 */
99// main.C 152// main.C
100void * rxvt_malloc (size_t size); 153#define SET_LOCALE(locale) rxvt_set_locale (locale)
101void * rxvt_calloc (size_t number, size_t size); 154extern bool rxvt_set_locale (const char *locale) NOTHROW;
102void * rxvt_realloc (void *ptr, size_t size); 155extern void rxvt_push_locale (const char *locale) NOTHROW;
156extern void rxvt_pop_locale () NOTHROW;
157void rxvt_init ();
103 158
104// misc.C 159// misc.C
105char * rxvt_wcstombs (const wchar_t *str, int len = -1); 160char * rxvt_wcstombs (const wchar_t *str, int len = -1);
106wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 161wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
107char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 162char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
… …
116 171
117char * rxvt_strtrim (char *str) NOTHROW; 172char * rxvt_strtrim (char *str) NOTHROW;
118char ** rxvt_splitcommastring (const char *cs) NOTHROW; 173char ** rxvt_splitcommastring (const char *cs) NOTHROW;
119void rxvt_freecommastring (char **cs) NOTHROW; 174void rxvt_freecommastring (char **cs) NOTHROW;
120 175
176void * rxvt_malloc (size_t size);
177void * rxvt_calloc (size_t number, size_t size);
178void * rxvt_realloc (void *ptr, size_t size);
179
121///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
122 181
123// temporarily replace the process environment 182// temporarily replace the process environment
124extern char **environ; 183extern char **environ;
125extern char **rxvt_environ; // the original environ pointer 184extern char **rxvt_environ; // the original environ pointer
126 185
186static inline void
127static inline void set_environ (stringvec *envv) 187set_environ (stringvec *envv)
128{ 188{
129#if ENABLE_PERL 189#if ENABLE_PERL
130 assert (envv); 190 assert (envv);
131#else 191#else
132 if (envv) 192 if (envv)
133#endif 193#endif
134 environ = (char **)envv->begin (); 194 environ = (char **)envv->begin ();
135} 195}
136 196
137static inline void set_environ (char **envv) 197static inline void
198set_environ (char **envv)
138{ 199{
139#if ENABLE_PERL 200#if ENABLE_PERL
140 assert (envv); 201 assert (envv);
141#else 202#else
142 if (envv) 203 if (envv)
… …
147/* 208/*
148 ***************************************************************************** 209 *****************************************************************************
149 * STRUCTURES AND TYPEDEFS 210 * STRUCTURES AND TYPEDEFS
150 ***************************************************************************** 211 *****************************************************************************
151 */ 212 */
152struct grwin_t;
153 213
154/* If we're using either the rxvt scrollbar, keep the 214/* If we're using either the rxvt scrollbar, keep the
155 * scrollColor resource. 215 * scrollColor resource.
156 */ 216 */
157#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 217#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
… …
168 int clicks; 228 int clicks;
169 Time time; /* milliseconds */ 229 Time time; /* milliseconds */
170 unsigned int state; /* key or button mask */ 230 unsigned int state; /* key or button mask */
171 unsigned int button; /* detail */ 231 unsigned int button; /* detail */
172}; 232};
173
174#if ENABLE_FRILLS
175typedef struct _mwmhints {
176 CARD32 flags;
177 CARD32 functions;
178 CARD32 decorations;
179 INT32 input_mode;
180 CARD32 status;
181} MWMHints;
182#endif
183 233
184#if ENABLE_XEMBED 234#if ENABLE_XEMBED
185// XEMBED messages 235// XEMBED messages
186# define XEMBED_EMBEDDED_NOTIFY 0 236# define XEMBED_EMBEDDED_NOTIFY 0
187# define XEMBED_WINDOW_ACTIVATE 1 237# define XEMBED_WINDOW_ACTIVATE 1
… …
223# define TERMENV "rxvt-unicode" 273# define TERMENV "rxvt-unicode"
224#endif 274#endif
225 275
226#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 276#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
227# define NO_MOUSE_REPORT_SCROLLBAR 1 277# define NO_MOUSE_REPORT_SCROLLBAR 1
228#endif
229
230/* now look for other badly set stuff */
231
232#if !defined (EACCESS) && defined(EAGAIN)
233# define EACCESS EAGAIN
234#endif
235
236#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
237# define EXIT_SUCCESS 0 /* exit function success */
238# define EXIT_FAILURE 1 /* exit function failure */
239#endif 278#endif
240 279
241#define scrollBar_esc 30 280#define scrollBar_esc 30
242 281
243#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
… …
592#define PrivMode_smoothScroll (1UL<<17) 631#define PrivMode_smoothScroll (1UL<<17)
593#define PrivMode_vt52 (1UL<<18) 632#define PrivMode_vt52 (1UL<<18)
594#define PrivMode_LFNL (1UL<<19) 633#define PrivMode_LFNL (1UL<<19)
595#define PrivMode_MouseBtnEvent (1UL<<20) 634#define PrivMode_MouseBtnEvent (1UL<<20)
596#define PrivMode_MouseAnyEvent (1UL<<21) 635#define PrivMode_MouseAnyEvent (1UL<<21)
597/* too annoying to implement X11 highlight tracking */
598/* #define PrivMode_MouseX11Track (1LU<<20) */
599 636
600#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 637#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
601 638
602#ifdef ALLOW_132_MODE 639#ifdef ALLOW_132_MODE
603# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 640# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
609#define IMBUFSIZ 128 // input modifier buffer sizes 646#define IMBUFSIZ 128 // input modifier buffer sizes
610#define KBUFSZ 512 // size of keyboard mapping buffer 647#define KBUFSZ 512 // size of keyboard mapping buffer
611#define CBUFSIZ 2048 // size of command buffer 648#define CBUFSIZ 2048 // size of command buffer
612#define UBUFSIZ 2048 // character buffer 649#define UBUFSIZ 2048 // character buffer
613 650
614#ifndef PATH_MAX 651#if ENABLE_FRILLS
615# define PATH_MAX 16384 652# include <X11/Xmd.h>
653typedef struct _mwmhints {
654 CARD32 flags;
655 CARD32 functions;
656 CARD32 decorations;
657 INT32 input_mode;
658 CARD32 status;
659} MWMHints;
616#endif 660#endif
617 661
618/* Motif window hints */ 662/* Motif window hints */
619#define MWM_HINTS_FUNCTIONS (1L << 0) 663#define MWM_HINTS_FUNCTIONS (1L << 0)
620#define MWM_HINTS_DECORATIONS (1L << 1) 664#define MWM_HINTS_DECORATIONS (1L << 1)
… …
661#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 705#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
662#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 706#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
663#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 707#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
664#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 708#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
665 709
666// for m >= -n, ensure remainder lies between 0..n-1
667#define MOD(m,n) (((m) + (n)) % (n))
668
669#define LINENO(n) MOD (term_start + int(n), total_rows) 710#define LINENO(n) MOD (term_start + int(n), total_rows)
670#define ROW(n) row_buf [LINENO (n)] 711#define ROW(n) row_buf [LINENO (n)]
671 712
672/* how to build & extract colors and attributes */ 713/* how to build & extract colors and attributes */
673#define GET_BASEFG(x) (((x) & RS_fgMask)) 714#define GET_BASEFG(x) (((x) & RS_fgMask))
… …
730 - scrollbar_minheight ()) 771 - scrollbar_minheight ())
731 772
732typedef callback<void (const char *)> log_callback; 773typedef callback<void (const char *)> log_callback;
733typedef callback<int (int)> getfd_callback; 774typedef callback<int (int)> getfd_callback;
734 775
735#define SET_LOCALE(locale) rxvt_set_locale (locale)
736extern bool rxvt_set_locale (const char *locale) NOTHROW;
737extern void rxvt_push_locale (const char *locale) NOTHROW;
738extern void rxvt_pop_locale () NOTHROW;
739
740/****************************************************************************/ 776/****************************************************************************/
741 777
742#define LINE_LONGER 0x0001 // line is continued on the next row 778#define LINE_LONGER 0x0001 // line is continued on the next row
743#define LINE_FILTERED 0x0002 // line has been filtered 779#define LINE_FILTERED 0x0002 // line has been filtered
744#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 780#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
… …
746#define LINE_BIDI 0x0010 // line needs bidi (NYI) 782#define LINE_BIDI 0x0010 // line needs bidi (NYI)
747 783
748struct line_t { 784struct line_t {
749 text_t *t; // terminal the text 785 text_t *t; // terminal the text
750 rend_t *r; // rendition, uses RS_ flags 786 rend_t *r; // rendition, uses RS_ flags
751 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 787 tlen_t_ l; // length of each text line
752 uint32_t f; // flags 788 uint32_t f; // flags
753 789
754 bool is_longer () 790 bool is_longer ()
755 { 791 {
756 return f & LINE_LONGER; 792 return f & LINE_LONGER;
… …
786 } 822 }
787}; 823};
788 824
789/****************************************************************************/ 825/****************************************************************************/
790 826
791// primivite wrapper around mbstate_t to ensure initialisation 827// primitive wrapper around mbstate_t to ensure initialisation
792struct mbstate { 828struct mbstate {
793 mbstate_t mbs; 829 mbstate_t mbs;
794 830
795 operator mbstate_t *() { return &mbs; } 831 operator mbstate_t *() { return &mbs; }
796 void reset () { memset (&mbs, 0, sizeof (mbs)); } 832 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
799 835
800/****************************************************************************/ 836/****************************************************************************/
801 837
802#define UNICODE_MASK 0x1fffffUL 838#define UNICODE_MASK 0x1fffffUL
803 839
804#if UNICODE3 840#if UNICODE_3
805# define COMPOSE_LO 0x40000000UL 841# define COMPOSE_LO 0x40000000UL
806# define COMPOSE_HI 0x400fffffUL 842# define COMPOSE_HI 0x400fffffUL
807# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 843# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
808#else 844#else
809# if ENABLE_PERL 845# if ENABLE_PERL
… …
846/****************************************************************************/ 882/****************************************************************************/
847 883
848#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
849class keyboard_manager; 885class keyboard_manager;
850#endif 886#endif
887
888typedef struct rxvt_term *rxvt_t;
889
890extern rxvt_t rxvt_current_term;
891
892#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
893#define GET_R rxvt_current_term
894
895typedef struct {
896 int row;
897 int col;
898} row_col_t;
899
900/*
901 * terminal limits:
902 *
903 * width : 1 <= width
904 * height : 1 <= height
905 * ncol : 1 <= ncol <= MAX(tlen_t)
906 * nrow : 1 <= nrow <= MAX(int)
907 * saveLines : 0 <= saveLines <= MAX(int)
908 * term_start : 0 <= term_start < saveLines
909 * total_rows : nrow + saveLines
910 *
911 * top_row : -saveLines <= top_row <= 0
912 * view_start : top_row <= view_start <= 0
913 *
914 * | most coordinates are stored relative to term_start,
915 * ROW_BUF | which is the first line of the terminal screen
916 * |························= row_buf[0]
917 * |························= row_buf[1]
918 * |························= row_buf[2] etc.
919 * |
920 * +------------+···········= term_start + top_row
921 * | scrollback |
922 * | scrollback +---------+·= term_start + view_start
923 * | scrollback | display |
924 * | scrollback | display |
925 * +------------+·display·+·= term_start
926 * | terminal | display |
927 * | terminal +---------+
928 * | terminal |
929 * | terminal |
930 * +------------+···········= term_stat + nrow - 1
931 * |
932 * |
933 * END······················= total_rows
934 */
935
936struct TermWin_t {
937 int width; /* window width [pixels] */
938 int height; /* window height [pixels] */
939 int fwidth; /* font width [pixels] */
940 int fheight; /* font height [pixels] */
941 int fbase; /* font ascent (baseline) [pixels] */
942 int ncol; /* window columns [characters] */
943 int nrow; /* window rows [characters] */
944 int focus; /* window has focus */
945 int mapped; /* window state mapped? */
946 int int_bwidth; /* internal border width */
947 int ext_bwidth; /* external border width */
948 int lineSpace; /* number of extra pixels between rows */
949 int saveLines; /* number of lines that fit in scrollback */
950 int total_rows; /* total number of rows in this terminal */
951 int term_start; /* term lines start here */
952 int view_start; /* scrollback view starts here */
953 int top_row; /* topmost row index of scrollback */
954 Window parent[6]; /* parent identifiers - we're parent[0] */
955 Window vt; /* vt100 window */
956 GC gc; /* GC for drawing */
957 Pixmap pixmap;
958 rxvt_drawable *drawable;
959 rxvt_fontset *fontset[4];
960};
961
962/*
963 * screen accounting:
964 * screen_t elements
965 * row: Cursor row position : 0 <= row < nrow
966 * col: Cursor column position : 0 <= col < ncol
967 * tscroll: Scrolling region top row inclusive : 0 <= row < nrow
968 * bscroll: Scrolling region bottom row inclusive : 0 <= row < nrow
969 *
970 * selection_t elements
971 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
972 * nothing is selected
973 * beg: row/column of beginning of selection : never past mark
974 * mark: row/column of initial click : never past end
975 * end: row/column of one character past end of selection
976 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow
977 * * Note: col == -1 ==> we're left of screen
978 *
979 */
980typedef struct {
981 row_col_t cur; /* cursor position on the screen */
982 int tscroll; /* top of settable scroll region */
983 int bscroll; /* bottom of settable scroll region */
984 unsigned int charset; /* character set number [0..3] */
985 unsigned int flags; /* see below */
986 row_col_t s_cur; /* saved cursor position */
987 unsigned int s_charset; /* saved character set number [0..3] */
988 char s_charset_char;
989 rend_t s_rstyle; /* saved rendition style */
990} screen_t;
991
992enum selection_op_t {
993 SELECTION_CLEAR = 0, /* nothing selected */
994 SELECTION_INIT, /* marked a point */
995 SELECTION_BEGIN, /* started a selection */
996 SELECTION_CONT, /* continued selection */
997 SELECTION_DONE /* selection put in CUT_BUFFER0 */
998};
999
1000typedef struct {
1001 wchar_t *text; /* selected text */
1002 unsigned int len; /* length of selected text */
1003 unsigned int screen; /* screen being used */
1004 unsigned int clicks; /* number of clicks */
1005 selection_op_t op; /* current operation */
1006 bool rect; /* rectangular selection? */
1007 row_col_t beg; /* beginning of selection <= mark */
1008 row_col_t mark; /* point of initial click <= end */
1009 row_col_t end; /* one character past end point */
1010} selection_t;
1011
1012/* ------------------------------------------------------------------------- */
1013
1014/* screen_t flags */
1015#define Screen_Relative (1<<0) /* relative origin mode flag */
1016#define Screen_VisibleCursor (1<<1) /* cursor visible? */
1017#define Screen_Autowrap (1<<2) /* auto-wrap flag */
1018#define Screen_Insert (1<<3) /* insert mode (vs. overstrike) */
1019#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
1020#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
1021
1022/* rxvt_vars.options */
1023enum {
1024# define def(name,idx) Opt_ ## name = idx,
1025# define nodef(name) Opt_ ## name = 0,
1026# include "optinc.h"
1027# undef nodef
1028# undef def
1029Opt_count
1030};
1031
1032/* ------------------------------------------------------------------------- */
1033
1034typedef struct {
1035 char state; /* scrollbar state */
1036 char init; /* scrollbar has been initialised */
1037 unsigned int beg; /* slider sub-window begin height */
1038 unsigned int end; /* slider sub-window end height */
1039 unsigned int top; /* slider top position */
1040 unsigned int bot; /* slider bottom position */
1041 unsigned int style; /* style: rxvt, xterm, next */
1042 unsigned int width; /* scrollbar width */
1043 Window win;
1044 int (rxvt_term::*update)(int, int, int, int);
1045
1046 void setIdle() { state = 1 ; }
1047 void setMotion() { state = 'm'; }
1048 void setUp() { state = 'U'; }
1049 void setDn() { state = 'D'; }
1050} scrollBar_t;
1051
1052struct rxvt_vars : TermWin_t {
1053 scrollBar_t scrollBar;
1054 uint8_t options[(Opt_count + 7) >> 3];
1055 XSizeHints szHint;
1056 rxvt_color *pix_colors;
1057 rxvt_color *pix_colors_focused;
1058#ifdef OFF_FOCUS_FADING
1059 rxvt_color *pix_colors_unfocused;
1060#endif
1061 Cursor TermWin_cursor; /* cursor for vt window */
1062 int sb_shadow; /* scrollbar shadow width */
1063 int numlock_state;
1064 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
1065 line_t *drawn_buf; // text on screen
1066 line_t *swap_buf; // lines for swap buffer
1067 char *tabs; /* per location: 1 == tab-stop */
1068 screen_t screen;
1069 screen_t swap;
1070 selection_t selection;
1071};
851 1072
852struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 1073struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
853 1074
854 // special markers with magic addresses 1075 // special markers with magic addresses
855 static const char resval_undef []; // options specifically unset 1076 static const char resval_undef []; // options specifically unset
… …
1011 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1232 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1012 1233
1013#ifdef KEYSYM_RESOURCE 1234#ifdef KEYSYM_RESOURCE
1014 keyboard_manager *keyboard; 1235 keyboard_manager *keyboard;
1015#endif 1236#endif
1237#ifndef NO_RESOURCES
1238 XrmDatabase option_db;
1239#endif
1016 1240
1017 const char *rs[NUM_RESOURCES]; 1241 const char *rs[NUM_RESOURCES];
1018 /* command input buffering */ 1242 /* command input buffering */
1019 char *cmdbuf_ptr, *cmdbuf_endp; 1243 char *cmdbuf_ptr, *cmdbuf_endp;
1020 char cmdbuf_base[CBUFSIZ]; 1244 char cmdbuf_base[CBUFSIZ];
… …
1047#if ENABLE_TRANSPARENCY || ENABLE_PERL 1271#if ENABLE_TRANSPARENCY || ENABLE_PERL
1048 void rootwin_cb (XEvent &xev); 1272 void rootwin_cb (XEvent &xev);
1049 xevent_watcher rootwin_ev; 1273 xevent_watcher rootwin_ev;
1050#endif 1274#endif
1051#ifdef HAVE_BG_PIXMAP 1275#ifdef HAVE_BG_PIXMAP
1052 int update_background (); 1276 void update_background ();
1277#if TRACE_PIXMAPS
1278 void trace_update_background (const char *file, int line);
1279# define update_background() trace_update_background (__FILE__, __LINE__)
1280#endif
1053 void update_background_cb (time_watcher &w); 1281 void update_background_cb (ev::timer &w, int revents);
1054 time_watcher update_background_ev; 1282 ev::timer update_background_ev;
1055#endif 1283#endif
1056 1284
1057 void x_cb (XEvent &xev); 1285 void x_cb (XEvent &xev);
1058 xevent_watcher termwin_ev; 1286 xevent_watcher termwin_ev;
1059 xevent_watcher vt_ev; 1287 xevent_watcher vt_ev;
1060#ifdef HAVE_SCROLLBARS 1288#ifdef HAVE_SCROLLBARS
1061 xevent_watcher scrollbar_ev; 1289 xevent_watcher scrollbar_ev;
1062#endif 1290#endif
1063 1291
1064 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1292 void child_cb (ev::child &w, int revents); ev::child child_ev;
1065 void check_cb (check_watcher &w); check_watcher check_ev; 1293 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1066 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1294 void refresh_check ();
1067 void flush (); 1295 void flush ();
1068 void flush_cb (time_watcher &w); time_watcher flush_ev; 1296 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1069 bool pty_fill (); 1297 bool pty_fill ();
1070 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1298 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1071 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1299 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1072 1300
1073#ifdef CURSOR_BLINK 1301#ifdef CURSOR_BLINK
1074 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1302 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1075#endif 1303#endif
1076#ifdef TEXT_BLINK 1304#ifdef TEXT_BLINK
1077 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1305 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1078#endif 1306#endif
1079#ifndef NO_BELL 1307#ifndef NO_BELL
1080 void bell_cb (time_watcher &w); time_watcher bell_ev; 1308 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1081#endif 1309#endif
1082 1310
1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1311#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1084 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1312 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1085#endif 1313#endif
1086#ifdef SELECTION_SCROLLING 1314#ifdef SELECTION_SCROLLING
1087 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1315 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1088#endif 1316#endif
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1317#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1318 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1091#endif 1319#endif
1092 1320
1093#ifdef POINTER_BLANK 1321#ifdef POINTER_BLANK
1094 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1322 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1095 void pointer_blank (); 1323 void pointer_blank ();
1096#endif 1324#endif
1097 void pointer_unblank (); 1325 void pointer_unblank ();
1098 1326
1099 void tt_printf (const char *fmt,...); 1327 void tt_printf (const char *fmt,...);
1100 void tt_write (const char *data, unsigned int len); 1328 void tt_write (const char *data, unsigned int len);
1101 void pty_write (); 1329 void pty_write ();
1102 1330
1103 bool init (stringvec *argv, stringvec *envv) 1331 void init (stringvec *argv, stringvec *envv)
1104 { 1332 {
1105 this->argv = argv; 1333 this->argv = argv;
1106 return init (argv->size (), argv->begin (), envv); 1334 init (argv->size (), argv->begin (), envv);
1107 } 1335 }
1108 1336
1109 void make_current () const // make this the "currently active" urxvt instance 1337 void make_current () const // make this the "currently active" urxvt instance
1110 { 1338 {
1111 SET_R (this); 1339 SET_R (this);
… …
1167 int privcases (int mode, unsigned long bit); 1395 int privcases (int mode, unsigned long bit);
1168 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1396 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1169 void process_sgr_mode (unsigned int nargs, const int *arg); 1397 void process_sgr_mode (unsigned int nargs, const int *arg);
1170 void process_graphics (); 1398 void process_graphics ();
1171 // init.C 1399 // init.C
1172 bool init_vars (); 1400 void init_vars ();
1173 void init_secondary (); 1401 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv); 1402 const char **init_resources (int argc, const char *const *argv);
1175 void init_env (); 1403 void init_env ();
1176 void set_locale (const char *locale); 1404 void set_locale (const char *locale);
1177 void init_xlocale (); 1405 void init_xlocale ();
… …
1186 void tt_winch (); 1414 void tt_winch ();
1187 rxvt_term (); 1415 rxvt_term ();
1188 ~rxvt_term (); 1416 ~rxvt_term ();
1189 void destroy (); 1417 void destroy ();
1190 void emergency_cleanup (); 1418 void emergency_cleanup ();
1191 bool init (int argc, const char *const *argv, stringvec *envv); 1419 void init (int argc, const char *const *argv, stringvec *envv);
1192 void recolour_cursor (); 1420 void recolour_cursor ();
1193 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1421 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1194 void window_calc (unsigned int newwidth, unsigned int newheight); 1422 void window_calc (unsigned int newwidth, unsigned int newheight);
1195 bool set_fonts (); 1423 bool set_fonts ();
1196 void set_string_property (Atom prop, const char *str, int len = -1); 1424 void set_string_property (Atom prop, const char *str, int len = -1);
… …
1263 return base; 1491 return base;
1264 } 1492 }
1265 1493
1266 bool option (uint8_t opt) const NOTHROW 1494 bool option (uint8_t opt) const NOTHROW
1267 { 1495 {
1496 if (!opt)
1497 return 0;
1498
1499 --opt;
1268 return options[opt >> 3] & (1 << (opt & 7)); 1500 return options[opt >> 3] & (1 << (opt & 7));
1269 } 1501 }
1270 1502
1271 void set_option (uint8_t opt, bool set = true) NOTHROW 1503 void set_option (uint8_t opt, bool set = true) NOTHROW
1272 { 1504 {
1505 if (!opt)
1506 return;
1507
1508 --opt;
1273 if (set) 1509 if (set)
1274 options[opt >> 3] |= (1 << (opt & 7)); 1510 options[opt >> 3] |= (1 << (opt & 7));
1275 else 1511 else
1276 options[opt >> 3] &= ~(1 << (opt & 7)); 1512 options[opt >> 3] &= ~(1 << (opt & 7));
1277 } 1513 }
… …
1396 int parse_keysym (const char *str, const char *arg); 1632 int parse_keysym (const char *str, const char *arg);
1397 const char *x_resource (const char *name); 1633 const char *x_resource (const char *name);
1398 void extract_resources (); 1634 void extract_resources ();
1399}; 1635};
1400 1636
1401#endif /* _RXVT_H_ */ 1637#endif /* _RXVT_H_ */
1402 1638

Diff Legend

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