[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvt.h

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.373 by root, Wed Nov 5 15:44:04 2008 UTC vs.
Revision 1.427 by sf-exg, Mon Jan 10 14:07:19 2011 UTC

…		…
27	#else	27	#else
28	// stdlib.h might provide it	28	// stdlib.h might provide it
29	#endif	29	#endif
30		30
31	using namespace std;	31	using namespace std;
		32
		33	// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32		34
33	extern "C" {	35	extern "C" {
34	#include <X11/Xlib.h>	36	#include <X11/Xlib.h>
35	#include <X11/Xutil.h>	37	#include <X11/Xutil.h>
36	#include <X11/Xresource.h>	38	#include <X11/Xresource.h>
…		…
98	*****************************************************************************	100	*****************************************************************************
99	* SYSTEM HACKS	101	* SYSTEM HACKS
100	*****************************************************************************	102	*****************************************************************************
101	*/	103	*/
102		104
103	#ifndef HAVE_XPOINTER
104	typedef char *XPointer;
105	#endif
106
107	#include <termios.h>	105	#include <termios.h>
108		106
109	#include "background.h"	107	#include "background.h"
110		108
111	#ifndef STDIN_FILENO	109	#ifndef STDIN_FILENO
112	# define STDIN_FILENO 0	110	# define STDIN_FILENO 0
113	# define STDOUT_FILENO 1	111	# define STDOUT_FILENO 1
114	# define STDERR_FILENO 2	112	# define STDERR_FILENO 2
115	#endif
116
117	#if !defined (EACCESS) && defined(EAGAIN)
118	# define EACCESS EAGAIN
119	#endif	113	#endif
120		114
121	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */	115	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
122	# define EXIT_SUCCESS 0 /* exit function success */	116	# define EXIT_SUCCESS 0 /* exit function success */
123	# define EXIT_FAILURE 1 /* exit function failure */	117	# define EXIT_FAILURE 1 /* exit function failure */
…		…
151	char * rxvt_wcstombs (const wchar_t *str, int len = -1);	145	char * rxvt_wcstombs (const wchar_t *str, int len = -1);
152	wchar_t * rxvt_mbstowcs (const char *str, int len = -1);	146	wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
153	char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);	147	char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
154	wchar_t * rxvt_utf8towcs (const char *str, int len = -1);	148	wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
155		149
156	char * rxvt_basename (const char *str) NOTHROW;	150	const char * rxvt_basename (const char *str) NOTHROW;
157	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	151	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158	void rxvt_log (const char *fmt,...) NOTHROW;	152	void rxvt_log (const char *fmt,...) NOTHROW;
159	void rxvt_warn (const char *fmt,...) NOTHROW;	153	void rxvt_warn (const char *fmt,...) NOTHROW;
160	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;	154	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
161	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;	155	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
162		156
163	char * rxvt_strtrim (char *str) NOTHROW;	157	char * rxvt_strtrim (char *str) NOTHROW;
164	char ** rxvt_splitcommastring (const char *cs) NOTHROW;	158	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
165	void rxvt_freecommastring (char **cs) NOTHROW;	159
		160	static inline void
		161	rxvt_free_strsplit (char **ptr) NOTHROW
		162	{
		163	free (ptr[0]);
		164	free (ptr);
		165	}
166		166
167	void * rxvt_malloc (size_t size);	167	void * rxvt_malloc (size_t size);
168	void * rxvt_calloc (size_t number, size_t size);	168	void * rxvt_calloc (size_t number, size_t size);
169	void * rxvt_realloc (void *ptr, size_t size);	169	void * rxvt_realloc (void *ptr, size_t size);
170		170
…		…
193	#else	193	#else
194	if (envv)	194	if (envv)
195	#endif	195	#endif
196	environ = envv;	196	environ = envv;
197	}	197	}
		198
		199	struct localise_env
		200	{
		201	char **orig_env;
		202
		203	localise_env (char **new_env)
		204	{
		205	orig_env = environ;
		206	environ = new_env;
		207	}
		208
		209	~localise_env ()
		210	{
		211	environ = orig_env;
		212	}
		213	};
198		214
199	/*	215	/*
200	*****************************************************************************	216	*****************************************************************************
201	* STRUCTURES AND TYPEDEFS	217	* STRUCTURES AND TYPEDEFS
202	*****************************************************************************	218	*****************************************************************************
…		…
251	# define COLORTERMENVFULL COLORTERMENV "-xpm"	267	# define COLORTERMENVFULL COLORTERMENV "-xpm"
252	#else	268	#else
253	# define COLORTERMENVFULL COLORTERMENV	269	# define COLORTERMENVFULL COLORTERMENV
254	#endif	270	#endif
255	#ifndef TERMENV	271	#ifndef TERMENV
		272	# if USE_256_COLORS
		273	# define TERMENV "rxvt-unicode-256color"
		274	# else
256	# define TERMENV "rxvt-unicode"	275	# define TERMENV "rxvt-unicode"
		276	# endif
257	#endif	277	#endif
258		278
259	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)	279	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
260	# define NO_MOUSE_REPORT_SCROLLBAR 1	280	# define NO_MOUSE_REPORT_SCROLLBAR 1
261	#endif	281	#endif
…		…
308	enum {	328	enum {
309	PRIMARY = 0,	329	PRIMARY = 0,
310	SECONDARY,	330	SECONDARY,
311	};	331	};
312		332
		333	// define various rendition bits and masks. the rendition word
		334	// is 32 bits in size, and we should use it as efficiently as possible
		335
313	#define RS_None 0	336	#define RS_None 0
314		337
315	#define RS_fgMask 0x0000007fUL // 128 colors	338	// GET_BGATTR depends on RS_fgShift > RS_bgShift
316	#define RS_bgMask 0x00003f80UL // 128 colors	339	#define RS_colorMask ((1UL << Color_Bits) - 1UL)
		340	#define RS_bgShift 0
		341	#define RS_fgShift (RS_bgShift + Color_Bits)
		342	#define RS_bgMask (RS_colorMask << RS_bgShift)
		343	#define RS_fgMask (RS_colorMask << RS_fgShift)
		344
		345	// must have space for rxvt_fontset::fontCount * 2 + 2 values
		346	#define RS_fontShift (RS_fgShift + Color_Bits)
		347	#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
		348	#define RS_fontCount rxvt_fontset::fontCount
		349	#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) \| RS_Careful) // includes RS_Careful
		350
		351	// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
		352	#define RS_redraw (2UL << RS_fontShift)
		353
		354	#define RS_Sel (1UL << 22)
		355
		356	// 4 custom bits for extensions
		357	#define RS_customCount 16UL
		358	#define RS_customShift 23
		359	#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
317		360
318	// font styles	361	// font styles
319	#define RS_Bold 0x00004000UL // value 1	362	#define RS_Bold (1UL << RS_styleShift)
320	#define RS_Italic 0x00008000UL // value 2	363	#define RS_Italic (2UL << RS_styleShift)
		364
		365	#define RS_styleCount 4
		366	#define RS_styleShift 27
		367	#define RS_styleMask (RS_Bold \| RS_Italic)
321		368
322	// fake styles	369	// fake styles
323	#define RS_Blink 0x00010000UL // blink	370	#define RS_Blink (1UL << 29)
324	#define RS_RVid 0x00020000UL // reverse video	371	#define RS_RVid (1UL << 30) // reverse video
325	#define RS_Uline 0x00040000UL // underline	372	#define RS_Uline (1UL << 31) // underline
326
327	// toggle this to force redraw, must be != RS_Careful
328	#define RS_redraw 0x01000000UL
329
330	// 5 custom bits for extensions
331	#define RS_customCount 32
332	#define RS_customMask 0x00f80000UL
333	#define RS_customShift 19
334
335	// other flags
336	#define RS_Careful 0x80000000UL /* be careful when drawing these */
337
338	#define RS_styleCount 4
339	#define RS_styleMask (RS_Bold \| RS_Italic)
340	#define RS_styleShift 14
341		373
342	#define RS_baseattrMask (RS_Italic \| RS_Bold \| RS_Blink \| RS_RVid \| RS_Uline)	374	#define RS_baseattrMask (RS_Italic \| RS_Bold \| RS_Blink \| RS_RVid \| RS_Uline)
343	#define RS_attrMask (RS_baseattrMask \| RS_fontMask)	375	#define RS_attrMask (RS_baseattrMask \| RS_fontMask)
344		376
345	#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
346	#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
347	#define RS_fontShift 24
348
349	#define DEFAULT_RSTYLE (RS_None \| Color_fg \| (Color_bg << Color_Bits))	377	#define DEFAULT_RSTYLE (RS_None \| (Color_fg << RS_fgShift) \| (Color_bg << RS_bgShift))
350	#define OVERLAY_RSTYLE (RS_None \| Color_Black \| (Color_Yellow << Color_Bits))	378	#define OVERLAY_RSTYLE (RS_None \| (Color_Black << RS_fgShift) \| (Color_Yellow << RS_bgShift))
351		379
352	#define Sel_none 0 /* Not waiting */	380	#define Sel_none 0 /* Not waiting */
353	#define Sel_normal 0x01 /* normal selection */	381	#define Sel_normal 0x01 /* normal selection */
354	#define Sel_incr 0x02 /* incremental selection */	382	#define Sel_incr 0x02 /* incremental selection */
355	#define Sel_direct 0x00	383	#define Sel_direct 0x00
…		…
384	XTerm_Color_cursor = 12, // change actual 'Cursor' color	412	XTerm_Color_cursor = 12, // change actual 'Cursor' color
385	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color	413	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
386	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color	414	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
387	XTerm_Color05 = 15, // not implemented (tektronix fg)	415	XTerm_Color05 = 15, // not implemented (tektronix fg)
388	XTerm_Color06 = 16, // not implemented (tektronix bg)	416	XTerm_Color06 = 16, // not implemented (tektronix bg)
389	XTerm_Color_RV = 17, // change actual 'Highlight' color	417	XTerm_Color_HC = 17, // change actual 'Highlight' bg color
		418	XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
390	XTerm_logfile = 46, // not implemented	419	XTerm_logfile = 46, // not implemented
391	XTerm_font = 50,	420	XTerm_font = 50,
392		421
393	XTerm_konsole30 = 30, // reserved for konsole	422	XTerm_konsole30 = 30, // reserved for konsole
394	XTerm_konsole31 = 31, // reserved for konsole	423	XTerm_konsole31 = 31, // reserved for konsole
…		…
396	/*	425	/*
397	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)	426	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)
398	*/	427	*/
399		428
400	// deprecated	429	// deprecated
401	Rxvt_Color_BD = 18,
402	Rxvt_Color_UL = 19,
403	Rxvt_restoreFG = 39,	430	Rxvt_restoreFG = 39,
404	Rxvt_restoreBG = 49,	431	Rxvt_restoreBG = 49,
405		432
406	Rxvt_Pixmap = 20, // new bg pixmap	433	Rxvt_Pixmap = 20, // new bg pixmap
407	Rxvt_dumpscreen = 55, // dump scrollback and all of screen	434	Rxvt_dumpscreen = 55, // dump scrollback and all of screen
…		…
461	Color_White = maxBrightCOLOR,	488	Color_White = maxBrightCOLOR,
462	#else	489	#else
463	Color_White = maxCOLOR,	490	Color_White = maxCOLOR,
464	#endif	491	#endif
465	minTermCOLOR = Color_White + 1,	492	minTermCOLOR = Color_White + 1,
		493	#if USE_256_COLORS
		494	maxTermCOLOR = Color_White + 240,
		495	#else
466	maxTermCOLOR = Color_White + 72,	496	maxTermCOLOR = Color_White + 72,
		497	#endif
467	#ifndef NO_CURSORCOLOR	498	#ifndef NO_CURSORCOLOR
468	Color_cursor,	499	Color_cursor,
469	Color_cursor2,	500	Color_cursor2,
470	#endif	501	#endif
471	Color_pointer_fg,	502	Color_pointer_fg,
…		…
480	#if ENABLE_FRILLS	511	#if ENABLE_FRILLS
481	Color_underline,	512	Color_underline,
482	#endif	513	#endif
483	#ifdef OPTION_HC	514	#ifdef OPTION_HC
484	Color_HC,	515	Color_HC,
		516	Color_HTC,
485	#endif	517	#endif
486	Color_scroll,	518	Color_scroll,
487	#ifdef RXVT_SCROLLBAR	519	#ifdef RXVT_SCROLLBAR
488	Color_trough,	520	Color_trough,
489	#endif	521	#endif
…		…
501	#else	533	#else
502	TOTAL_COLORS = NRS_COLORS	534	TOTAL_COLORS = NRS_COLORS
503	#endif	535	#endif
504	};	536	};
505		537
		538	#if USE_256_COLORS
		539	# define Color_Bits 9 // 0 .. maxTermCOLOR
		540	#else
506	#define Color_Bits 7 // 0 .. maxTermCOLOR	541	# define Color_Bits 7 // 0 .. maxTermCOLOR
		542	#endif
507		543
508	/*	544	/*
509	* Resource list	545	* Resource list
510	*/	546	*/
511	enum {	547	enum {
…		…
539	#define PrivMode_vt52 (1UL<<18)	575	#define PrivMode_vt52 (1UL<<18)
540	#define PrivMode_LFNL (1UL<<19)	576	#define PrivMode_LFNL (1UL<<19)
541	#define PrivMode_MouseBtnEvent (1UL<<20)	577	#define PrivMode_MouseBtnEvent (1UL<<20)
542	#define PrivMode_MouseAnyEvent (1UL<<21)	578	#define PrivMode_MouseAnyEvent (1UL<<21)
543	#define PrivMode_BracketPaste (1UL<<22)	579	#define PrivMode_BracketPaste (1UL<<22)
		580	#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
		581	#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
544		582
545	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent)	583	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent)
546		584
547	#ifdef ALLOW_132_MODE	585	#ifdef ALLOW_132_MODE
548	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor\|PrivMode_132OK)	586	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor\|PrivMode_132OK)
…		…
599	/*	637	/*
600	*****************************************************************************	638	*****************************************************************************
601	* MACRO DEFINES	639	* MACRO DEFINES
602	*****************************************************************************	640	*****************************************************************************
603	*/	641	*/
		642
		643	// speed hack, copy some member variable into a local variable of the same name
604	#define dLocal(type,name) type const name = this->name	644	#define dLocal(type,name) type const name = this->name
605		645
606	// for speed reasons, we assume that all codepoints 32 to 126 are	646	// for speed reasons, we assume that all codepoints 32 to 126 are
607	// single-width.	647	// single-width.
608	#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))	648	#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
…		…
622		662
623	#define LINENO(n) LINENO_of (this, n)	663	#define LINENO(n) LINENO_of (this, n)
624	#define ROW(n) ROW_of (this, n)	664	#define ROW(n) ROW_of (this, n)
625		665
626	/* how to build & extract colors and attributes */	666	/* how to build & extract colors and attributes */
627	#define GET_BASEFG(x) (((x) & RS_fgMask))	667	#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
628	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	668	#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
629		669
630	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)	670	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
631	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))	671	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))
632		672
633	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)	673	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
634	#define SET_STYLE(x,style) (((x) & ~RS_styleMask) \| ((style) << RS_styleShift))	674	#define SET_STYLE(x,style) (((x) & ~RS_styleMask) \| ((style) << RS_styleShift))
635		675
636	#define GET_ATTR(x) (((x) & RS_attrMask))	676	#define GET_ATTR(x) (((x) & RS_attrMask))
		677	// return attributes defining the background, encoding doesn't matter
		678	// depends on RS_fgShift > RS_bgShift
637	#define GET_BGATTR(x) \	679	#define GET_BGATTR(x) \
		680	(expect_false ((x) & RS_RVid) \
638	(((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \	681	? (((x) & (RS_attrMask & ~RS_RVid)) \
639	\| (((x) & RS_fgMask)<<Color_Bits)) \	682	\| (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
640	: ((x) & (RS_attrMask \| RS_bgMask)))	683	: ((x) & (RS_attrMask \| RS_bgMask)))
641	#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) \| (fg))	684	#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) \| ((fg) << RS_fgShift))
642	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg)<<Color_Bits))	685	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg) << RS_bgShift))
643	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))	686	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))
644		687
645	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))	688	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
646		689
647	#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]	690	#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
…		…
786	{	829	{
787	int x, y, w, h; // overlay dimensions	830	int x, y, w, h; // overlay dimensions
788	text_t **text;	831	text_t **text;
789	rend_t **rend;	832	rend_t **rend;
790		833
791	// while tempting to add swap() etc. here, it effetcively only increases code size	834	// while tempting to add swap() etc. here, it effectively only increases code size
792	};	835	};
793		836
794	/* ------------------------------------------------------------------------- */	837	/* ------------------------------------------------------------------------- */
795		838
796	typedef struct	839	typedef struct
…		…
847	int focus; /* window has focus */	890	int focus; /* window has focus */
848	int mapped; /* window state mapped? */	891	int mapped; /* window state mapped? */
849	int int_bwidth; /* internal border width */	892	int int_bwidth; /* internal border width */
850	int ext_bwidth; /* external border width */	893	int ext_bwidth; /* external border width */
851	int lineSpace; /* number of extra pixels between rows */	894	int lineSpace; /* number of extra pixels between rows */
		895	int letterSpace; /* number of extra pixels between columns */
852	int saveLines; /* number of lines that fit in scrollback */	896	int saveLines; /* number of lines that fit in scrollback */
853	int total_rows; /* total number of rows in this terminal */	897	int total_rows; /* total number of rows in this terminal */
854	int term_start; /* term lines start here */	898	int term_start; /* term lines start here */
855	int view_start; /* scrollback view starts here */	899	int view_start; /* scrollback view starts here */
856	int top_row; /* topmost row index of scrollback */	900	int top_row; /* topmost row index of scrollback */
…		…
911	selection_op_t op; /* current operation */	955	selection_op_t op; /* current operation */
912	bool rect; /* rectangular selection? */	956	bool rect; /* rectangular selection? */
913	row_col_t beg; /* beginning of selection <= mark */	957	row_col_t beg; /* beginning of selection <= mark */
914	row_col_t mark; /* point of initial click <= end */	958	row_col_t mark; /* point of initial click <= end */
915	row_col_t end; /* one character past end point */	959	row_col_t end; /* one character past end point */
		960	wchar_t clip_text; / text copied to the clipboard */
		961	unsigned int clip_len; /* length of clipboard text */
916	};	962	};
917		963
918	/* ------------------------------------------------------------------------- */	964	/* ------------------------------------------------------------------------- */
919		965
920	/* screen_t flags */	966	/* screen_t flags */
…		…
925	#define Screen_WrapNext (1<<4) /* need to wrap for next char? */	971	#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
926	#define Screen_DefaultFlags (Screen_VisibleCursor \| Screen_Autowrap)	972	#define Screen_DefaultFlags (Screen_VisibleCursor \| Screen_Autowrap)
927		973
928	/* rxvt_vars.options */	974	/* rxvt_vars.options */
929	enum {	975	enum {
930	# define def(name,idx) Opt_ ## name = idx,
931	# define nodef(name) Opt_ ## name = 0,	976	# define def(name) Opt_ ## name,
		977	# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
		978	Opt_0,
932	# include "optinc.h"	979	# include "optinc.h"
933	# undef nodef	980	# undef nodef
934	# undef def	981	# undef def
935	Opt_count	982	Opt_count
936	};	983	};
937		984
938	/* ------------------------------------------------------------------------- */	985	/* ------------------------------------------------------------------------- */
939		986
940	struct rxvt_vars : TermWin_t	987	struct rxvt_vars : TermWin_t
…		…
942	scrollBar_t scrollBar;	989	scrollBar_t scrollBar;
943	uint8_t options[(Opt_count + 7) >> 3];	990	uint8_t options[(Opt_count + 7) >> 3];
944	XSizeHints szHint;	991	XSizeHints szHint;
945	rxvt_color *pix_colors;	992	rxvt_color *pix_colors;
946	Cursor TermWin_cursor; /* cursor for vt window */	993	Cursor TermWin_cursor; /* cursor for vt window */
947	int numlock_state;
948	line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf	994	line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
949	line_t *drawn_buf; // text on screen	995	line_t *drawn_buf; // text on screen
950	line_t *swap_buf; // lines for swap buffer	996	line_t *swap_buf; // lines for swap buffer
951	char tabs; / per location: 1 == tab-stop */	997	char tabs; / per location: 1 == tab-stop */
952	screen_t screen;	998	screen_t screen;
…		…
975		1021
976	unsigned char want_refresh:1,	1022	unsigned char want_refresh:1,
977	current_screen:1, /* primary or secondary */	1023	current_screen:1, /* primary or secondary */
978	num_scr_allow:1,	1024	num_scr_allow:1,
979	bypass_keystate:1,	1025	bypass_keystate:1,
980	#ifdef ENABLE_FRILLS	1026	#if ENABLE_FRILLS
981	urgency_hint:1,	1027	urgency_hint:1,
982	#endif	1028	#endif
983	#ifdef CURSOR_BLINK	1029	#if CURSOR_BLINK
984	hidden_cursor:1,	1030	hidden_cursor:1,
985	#endif	1031	#endif
986	#ifdef TEXT_BLINK	1032	#if TEXT_BLINK
987	hidden_text:1,	1033	hidden_text:1,
988	#endif	1034	#endif
989	#ifdef POINTER_BLANK	1035	#if POINTER_BLANK
990	hidden_pointer:1,	1036	hidden_pointer:1,
991	#endif	1037	#endif
992	enc_utf8:1, /* wether locale uses utf-8 */	1038	enc_utf8:1, /* whether locale uses utf-8 */
993	seen_input:1, /* wether we have seen some program output yet */	1039	seen_input:1, /* whether we have seen some program output yet */
994	seen_resize:1, /* wether we had a resize event */	1040	seen_resize:1, /* whether we had a resize event */
995	parsed_geometry:1;	1041	parsed_geometry:1;
996		1042
997	unsigned char refresh_type,	1043	unsigned char refresh_type,
998	#ifdef META8_OPTION	1044	#ifdef META8_OPTION
999	meta_char, /* Alt-key prefix */	1045	meta_char, /* Alt-key prefix */
…		…
1003	/* ---------- */	1049	/* ---------- */
1004	bool rvideo_state, rvideo_mode;	1050	bool rvideo_state, rvideo_mode;
1005	#ifndef NO_BELL	1051	#ifndef NO_BELL
1006	bool rvideo_bell;	1052	bool rvideo_bell;
1007	#endif	1053	#endif
1008	int num_scr; /* screen: number lines scrolled */	1054	int num_scr; /* screen: number of lines scrolled */
1009	int prev_ncol, /* screen: previous number of columns */	1055	int prev_ncol, /* screen: previous number of columns */
1010	prev_nrow; /* screen: previous number of rows */	1056	prev_nrow; /* screen: previous number of rows */
1011	/* ---------- */	1057	/* ---------- */
1012	rend_t rstyle;	1058	rend_t rstyle;
1013	/* ---------- */	1059	/* ---------- */
…		…
1043	SavedModes;	1089	SavedModes;
1044	/* ---------- */	1090	/* ---------- */
1045	Atom *xa;	1091	Atom *xa;
1046	/* ---------- */	1092	/* ---------- */
1047	Time selection_time,	1093	Time selection_time,
1048	selection_request_time;	1094	selection_request_time,
		1095	clipboard_time;
1049	pid_t cmd_pid; /* process id of child */	1096	pid_t cmd_pid; /* process id of child */
1050	char * incr_buf;	1097	char * incr_buf;
1051	size_t incr_buf_size, incr_buf_fill;	1098	size_t incr_buf_size, incr_buf_fill;
1052	/* ---------- */	1099	/* ---------- */
1053	struct mouse_event MEvent;	1100	struct mouse_event MEvent;
1054	XComposeStatus compose;	1101	XComposeStatus compose;
1055	struct termios tio;	1102	static struct termios def_tio;
1056	row_col_t oldcursor;	1103	row_col_t oldcursor;
1057	#ifdef HAVE_BG_PIXMAP	1104	#ifdef HAVE_BG_PIXMAP
1058	bgPixmap_t bgPixmap;	1105	bgPixmap_t bgPixmap;
1059	#endif	1106	#endif
1060	#ifdef HAVE_AFTERIMAGE	1107	#ifdef HAVE_AFTERIMAGE
…		…
1134	void rootwin_cb (XEvent &xev);	1181	void rootwin_cb (XEvent &xev);
1135	xevent_watcher rootwin_ev;	1182	xevent_watcher rootwin_ev;
1136	#endif	1183	#endif
1137	#ifdef HAVE_BG_PIXMAP	1184	#ifdef HAVE_BG_PIXMAP
1138	void update_background ();	1185	void update_background ();
1139	#if TRACE_PIXMAPS
1140	void trace_update_background (const char *file, int line);
1141	# define update_background() trace_update_background (__FILE__, __LINE__)
1142	#endif
1143	void update_background_cb (ev::timer &w, int revents);	1186	void update_background_cb (ev::timer &w, int revents);
1144	ev::timer update_background_ev;	1187	ev::timer update_background_ev;
1145	#endif	1188	#endif
1146		1189
1147	void x_cb (XEvent &xev);	1190	void x_cb (XEvent &xev);
…		…
1234	void mouse_report (XButtonEvent &ev);	1277	void mouse_report (XButtonEvent &ev);
1235	void button_press (XButtonEvent &ev);	1278	void button_press (XButtonEvent &ev);
1236	void button_release (XButtonEvent &ev);	1279	void button_release (XButtonEvent &ev);
1237	void focus_in ();	1280	void focus_in ();
1238	void focus_out ();	1281	void focus_out ();
		1282	#if ENABLE_FRILLS
1239	void set_urgency (bool enable);	1283	void set_urgency (bool enable);
		1284	#else
		1285	void set_urgency (bool enable) { }
		1286	#endif
1240	void update_fade_color (unsigned int idx);	1287	void update_fade_color (unsigned int idx);
1241	#ifdef PRINTPIPE	1288	#ifdef PRINTPIPE
1242	FILE *popen_printer ();	1289	FILE *popen_printer ();
1243	int pclose_printer (FILE *stream);	1290	int pclose_printer (FILE *stream);
1244	#endif	1291	#endif
…		…
1250	void process_window_ops (const int *args, unsigned int nargs);	1297	void process_window_ops (const int *args, unsigned int nargs);
1251	char *get_to_st (unicode_t &ends_how);	1298	char *get_to_st (unicode_t &ends_how);
1252	void process_dcs_seq ();	1299	void process_dcs_seq ();
1253	void process_osc_seq ();	1300	void process_osc_seq ();
1254	void process_color_seq (int report, int color, const char *str, char resp);	1301	void process_color_seq (int report, int color, const char *str, char resp);
1255	void process_xterm_seq (int op, const char *str, char resp);	1302	void process_xterm_seq (int op, char *str, char resp);
1256	int privcases (int mode, unsigned long bit);	1303	int privcases (int mode, unsigned long bit);
1257	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1304	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1258	void process_sgr_mode (unsigned int nargs, const int *arg);	1305	void process_sgr_mode (unsigned int nargs, const int *arg);
1259	void process_graphics ();	1306	void process_graphics ();
1260	// init.C	1307	// init.C
…		…
1269	int run_child (const char const argv);	1316	int run_child (const char const argv);
1270	void color_aliases (int idx);	1317	void color_aliases (int idx);
1271	void create_windows (int argc, const char const argv);	1318	void create_windows (int argc, const char const argv);
1272	void get_colours ();	1319	void get_colours ();
1273	void get_ourmods ();	1320	void get_ourmods ();
		1321	void set_icon (const char *file);
1274	// main.C	1322	// main.C
1275	void tt_winch ();	1323	void tt_winch ();
1276	rxvt_term ();	1324	rxvt_term ();
1277	~rxvt_term ();	1325	~rxvt_term ();
1278	void destroy ();	1326	void destroy ();
…		…
1280	void recolour_cursor ();	1328	void recolour_cursor ();
1281	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);	1329	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1282	void window_calc (unsigned int newwidth, unsigned int newheight);	1330	void window_calc (unsigned int newwidth, unsigned int newheight);
1283	bool set_fonts ();	1331	bool set_fonts ();
1284	void set_string_property (Atom prop, const char *str, int len = -1);	1332	void set_string_property (Atom prop, const char *str, int len = -1);
		1333	void set_mbstring_property (Atom prop, const char *str, int len = -1);
1285	void set_utf8_property (Atom prop, const char *str, int len = -1);	1334	void set_utf8_property (Atom prop, const char *str, int len = -1);
1286	void set_title (const char *str);	1335	void set_title (const char *str);
1287	void set_icon_name (const char *str);	1336	void set_icon_name (const char *str);
1288	void set_window_color (int idx, const char *color);	1337	void set_window_color (int idx, const char *color);
1289	void set_colorfgbg ();	1338	void set_colorfgbg ();
1290	bool set_color (rxvt_color &color, const char *name);	1339	bool set_color (rxvt_color &color, const char *name);
1291	void alias_color (int dst, int src);	1340	void alias_color (int dst, int src);
1292	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1341	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1293	void get_window_origin (int &x, int &y);	1342	void get_window_origin (int &x, int &y);
1294	Pixmap get_pixmap_property (int prop_id);	1343	Pixmap get_pixmap_property (Atom property);
1295		1344
1296	// screen.C	1345	// screen.C
1297		1346
1298	void lalloc (line_t &l) const	1347	void lalloc (line_t &l) const
1299	{	1348	{
…		…
1351	return base;	1400	return base;
1352	}	1401	}
1353		1402
1354	bool option (uint8_t opt) const NOTHROW	1403	bool option (uint8_t opt) const NOTHROW
1355	{	1404	{
1356	if (!opt)
1357	return 0;
1358
1359	--opt;
1360	return options[opt >> 3] & (1 << (opt & 7));	1405	return options[opt >> 3] & (1 << (opt & 7));
1361	}	1406	}
1362		1407
1363	void set_option (uint8_t opt, bool set = true) NOTHROW	1408	void set_option (uint8_t opt, bool set = true) NOTHROW;
1364	{
1365	if (!opt)
1366	return;
1367
1368	--opt;
1369	if (set)
1370	options[opt >> 3] \|= (1 << (opt & 7));
1371	else
1372	options[opt >> 3] &= ~(1 << (opt & 7));
1373	}
1374		1409
1375	void set_privmode (unsigned bit, int set) NOTHROW	1410	void set_privmode (unsigned bit, int set) NOTHROW
1376	{	1411	{
1377	if (set)	1412	if (set)
1378	priv_modes \|= bit;	1413	priv_modes \|= bit;
1379	else	1414	else
1380	priv_modes &= ~bit;	1415	priv_modes &= ~bit;
1381	}	1416	}
1382		1417
1383	// modifies first argument(!)	1418	// modifies first argument(!)
		1419	void tt_paste (char *data, unsigned int len) NOTHROW;
1384	void paste (char *data, unsigned int len) NOTHROW;	1420	void paste (char *data, unsigned int len) NOTHROW;
1385	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;	1421	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1386	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;	1422	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1387	void scr_kill_char (line_t &l, int col) const NOTHROW;	1423	void scr_kill_char (line_t &l, int col) const NOTHROW;
1388	int scr_scroll_text (int row1, int row2, int count) NOTHROW;	1424	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
…		…
1446	void selection_check (int check_more) NOTHROW;	1482	void selection_check (int check_more) NOTHROW;
1447	void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;	1483	void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1448	void selection_property (Window win, Atom prop) NOTHROW;	1484	void selection_property (Window win, Atom prop) NOTHROW;
1449	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;	1485	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1450	int selection_request_other (Atom target, int selnum) NOTHROW;	1486	int selection_request_other (Atom target, int selnum) NOTHROW;
1451	void selection_clear () NOTHROW;	1487	void selection_clear (bool clipboard = false) NOTHROW;
1452	void selection_make (Time tm);	1488	void selection_make (Time tm);
1453	bool selection_grab (Time tm) NOTHROW;	1489	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1454	void selection_start_colrow (int col, int row) NOTHROW;	1490	void selection_start_colrow (int col, int row) NOTHROW;
1455	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW;	1491	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW;
1456	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;	1492	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1457	void selection_remove_trailing_spaces () NOTHROW;	1493	void selection_remove_trailing_spaces () NOTHROW;
1458	void selection_send (const XSelectionRequestEvent &rq) NOTHROW;	1494	void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.373 by root, Wed Nov 5 15:44:04 2008 UTC vs. Revision 1.427 by sf-exg, Mon Jan 10 14:07:19 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.373 by root, Wed Nov 5 15:44:04 2008 UTC vs.
Revision 1.427 by sf-exg, Mon Jan 10 14:07:19 2011 UTC