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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.372 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.441 by sf-exg, Fri Apr 29 10:10:20 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>
…		…
72	#include <X11/cursorfont.h>	74	#include <X11/cursorfont.h>
73	#include <X11/keysym.h>	75	#include <X11/keysym.h>
74	#include <X11/keysymdef.h>	76	#include <X11/keysymdef.h>
75	#include <X11/Xatom.h>	77	#include <X11/Xatom.h>
76		78
		79	#ifdef HAVE_AFTERIMAGE
		80	# include <afterimage.h>
		81	# undef min
		82	# undef max
		83	#endif
		84
		85	#ifdef HAVE_PIXBUF
		86	# include <gdk-pixbuf/gdk-pixbuf.h>
		87	#endif
		88
		89	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)
		90	# define HAVE_BG_PIXMAP 1
		91	#endif
		92
77	#include "encoding.h"	93	#include "encoding.h"
78	#include "rxvtutil.h"	94	#include "rxvtutil.h"
79	#include "rxvtfont.h"	95	#include "rxvtfont.h"
80	#include "rxvttoolkit.h"	96	#include "rxvttoolkit.h"
81	#include "scrollbar.h"	97	#include "scrollbar.h"
…		…
98	*****************************************************************************	114	*****************************************************************************
99	* SYSTEM HACKS	115	* SYSTEM HACKS
100	*****************************************************************************	116	*****************************************************************************
101	*/	117	*/
102		118
103	#ifndef HAVE_XPOINTER
104	typedef char *XPointer;
105	#endif
106
107	#include <termios.h>	119	#include <termios.h>
108
109	#include "background.h"
110		120
111	#ifndef STDIN_FILENO	121	#ifndef STDIN_FILENO
112	# define STDIN_FILENO 0	122	# define STDIN_FILENO 0
113	# define STDOUT_FILENO 1	123	# define STDOUT_FILENO 1
114	# define STDERR_FILENO 2	124	# define STDERR_FILENO 2
115	#endif
116
117	#if !defined (EACCESS) && defined(EAGAIN)
118	# define EACCESS EAGAIN
119	#endif	125	#endif
120		126
121	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */	127	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
122	# define EXIT_SUCCESS 0 /* exit function success */	128	# define EXIT_SUCCESS 0 /* exit function success */
123	# define EXIT_FAILURE 1 /* exit function failure */	129	# define EXIT_FAILURE 1 /* exit function failure */
…		…
151	char * rxvt_wcstombs (const wchar_t *str, int len = -1);	157	char * rxvt_wcstombs (const wchar_t *str, int len = -1);
152	wchar_t * rxvt_mbstowcs (const char *str, int len = -1);	158	wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
153	char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);	159	char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
154	wchar_t * rxvt_utf8towcs (const char *str, int len = -1);	160	wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
155		161
156	char * rxvt_basename (const char *str) NOTHROW;	162	const char * rxvt_basename (const char *str) NOTHROW;
157	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	163	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158	void rxvt_log (const char *fmt,...) NOTHROW;	164	void rxvt_log (const char *fmt,...) NOTHROW;
159	void rxvt_warn (const char *fmt,...) NOTHROW;	165	void rxvt_warn (const char *fmt,...) NOTHROW;
160	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;	166	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
161	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;	167	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
162		168
163	char * rxvt_strtrim (char *str) NOTHROW;	169	char * rxvt_strtrim (char *str) NOTHROW;
164	char ** rxvt_splitcommastring (const char *cs) NOTHROW;	170	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
165	void rxvt_freecommastring (char **cs) NOTHROW;	171
		172	static inline void
		173	rxvt_free_strsplit (char **ptr) NOTHROW
		174	{
		175	free (ptr[0]);
		176	free (ptr);
		177	}
166		178
167	void * rxvt_malloc (size_t size);	179	void * rxvt_malloc (size_t size);
168	void * rxvt_calloc (size_t number, size_t size);	180	void * rxvt_calloc (size_t number, size_t size);
169	void * rxvt_realloc (void *ptr, size_t size);	181	void * rxvt_realloc (void *ptr, size_t size);
170		182
…		…
193	#else	205	#else
194	if (envv)	206	if (envv)
195	#endif	207	#endif
196	environ = envv;	208	environ = envv;
197	}	209	}
		210
		211	struct localise_env
		212	{
		213	char **orig_env;
		214
		215	localise_env (char **new_env)
		216	{
		217	orig_env = environ;
		218	environ = new_env;
		219	}
		220
		221	~localise_env ()
		222	{
		223	environ = orig_env;
		224	}
		225	};
198		226
199	/*	227	/*
200	*****************************************************************************	228	*****************************************************************************
201	* STRUCTURES AND TYPEDEFS	229	* STRUCTURES AND TYPEDEFS
202	*****************************************************************************	230	*****************************************************************************
…		…
251	# define COLORTERMENVFULL COLORTERMENV "-xpm"	279	# define COLORTERMENVFULL COLORTERMENV "-xpm"
252	#else	280	#else
253	# define COLORTERMENVFULL COLORTERMENV	281	# define COLORTERMENVFULL COLORTERMENV
254	#endif	282	#endif
255	#ifndef TERMENV	283	#ifndef TERMENV
		284	# if USE_256_COLORS
		285	# define TERMENV "rxvt-unicode-256color"
		286	# else
256	# define TERMENV "rxvt-unicode"	287	# define TERMENV "rxvt-unicode"
		288	# endif
257	#endif	289	#endif
258		290
259	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)	291	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
260	# define NO_MOUSE_REPORT_SCROLLBAR 1	292	# define NO_MOUSE_REPORT_SCROLLBAR 1
261	#endif	293	#endif
…		…
276	# define NSCREENS 0	308	# define NSCREENS 0
277	#else	309	#else
278	# define NSCREENS 1	310	# define NSCREENS 1
279	#endif	311	#endif
280		312
281	/* special (internal) prefix for font commands */
282	#define FONT_CMD '#'
283	#define FONT_DN "#-"
284	#define FONT_UP "#+"
285
286	/* flags for rxvt_scr_gotorc () */	313	/* flags for rxvt_term::scr_gotorc () */
287	enum {	314	enum {
288	C_RELATIVE = 1, /* col movement is relative */	315	C_RELATIVE = 1, /* col movement is relative */
289	R_RELATIVE = 2, /* row movement is relative */	316	R_RELATIVE = 2, /* row movement is relative */
290	RELATIVE = C_RELATIVE \| R_RELATIVE,	317	RELATIVE = C_RELATIVE \| R_RELATIVE,
291	};	318	};
292		319
293	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */	320	/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294	enum {	321	enum {
295	INSERT = -1, /* don't change these values */	322	INSERT = -1, /* don't change these values */
296	DELETE = +1,	323	DELETE = +1,
297	ERASE = +2,	324	ERASE = +2,
298	};	325	};
299		326
300	/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */	327	/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301	enum page_dirn {	328	enum page_dirn {
302	UP,	329	UP,
303	DN,	330	DN,
304	NO_DIR,	331	NO_DIR,
305	};	332	};
306		333
307	/* arguments for rxvt_scr_change_screen () */	334	/* arguments for rxvt_term::scr_change_screen () */
308	enum {	335	enum {
309	PRIMARY = 0,	336	PRIMARY = 0,
310	SECONDARY,	337	SECONDARY,
311	};	338	};
312		339
		340	// define various rendition bits and masks. the rendition word
		341	// is 32 bits in size, and we should use it as efficiently as possible
		342
313	#define RS_None 0	343	#define RS_None 0
314		344
315	#define RS_fgMask 0x0000007fUL // 128 colors	345	// GET_BGATTR depends on RS_fgShift > RS_bgShift
316	#define RS_bgMask 0x00003f80UL // 128 colors	346	#define RS_colorMask ((1UL << Color_Bits) - 1UL)
		347	#define RS_bgShift 0
		348	#define RS_fgShift (RS_bgShift + Color_Bits)
		349	#define RS_bgMask (RS_colorMask << RS_bgShift)
		350	#define RS_fgMask (RS_colorMask << RS_fgShift)
		351
		352	// must have space for rxvt_fontset::fontCount * 2 + 2 values
		353	#define RS_fontShift (RS_fgShift + Color_Bits)
		354	#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
		355	#define RS_fontCount rxvt_fontset::fontCount
		356	#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) \| RS_Careful) // includes RS_Careful
		357
		358	// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
		359	#define RS_redraw (2UL << RS_fontShift)
		360
		361	#define RS_Sel (1UL << 22)
		362
		363	// 4 custom bits for extensions
		364	#define RS_customCount 16UL
		365	#define RS_customShift 23
		366	#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
317		367
318	// font styles	368	// font styles
319	#define RS_Bold 0x00004000UL // value 1	369	#define RS_Bold (1UL << RS_styleShift)
320	#define RS_Italic 0x00008000UL // value 2	370	#define RS_Italic (2UL << RS_styleShift)
		371
		372	#define RS_styleCount 4
		373	#define RS_styleShift 27
		374	#define RS_styleMask (RS_Bold \| RS_Italic)
321		375
322	// fake styles	376	// fake styles
323	#define RS_Blink 0x00010000UL // blink	377	#define RS_Blink (1UL << 29)
324	#define RS_RVid 0x00020000UL // reverse video	378	#define RS_RVid (1UL << 30) // reverse video
325	#define RS_Uline 0x00040000UL // underline	379	#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		380
342	#define RS_baseattrMask (RS_Italic \| RS_Bold \| RS_Blink \| RS_RVid \| RS_Uline)	381	#define RS_baseattrMask (RS_Italic \| RS_Bold \| RS_Blink \| RS_RVid \| RS_Uline)
343	#define RS_attrMask (RS_baseattrMask \| RS_fontMask)	382	#define RS_attrMask (RS_baseattrMask \| RS_fontMask)
344		383
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))	384	#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))	385	#define OVERLAY_RSTYLE (RS_None \| (Color_Black << RS_fgShift) \| (Color_Yellow << RS_bgShift))
351
352	#define Sel_none 0 /* Not waiting */
353	#define Sel_normal 0x01 /* normal selection */
354	#define Sel_incr 0x02 /* incremental selection */
355	#define Sel_direct 0x00
356	#define Sel_Primary 0x01
357	#define Sel_Secondary 0x02
358	#define Sel_Clipboard 0x03
359	#define Sel_whereMask 0x0f
360	#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
361	#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
362		386
363	enum {	387	enum {
364	C0_NUL = 0x00,	388	C0_NUL = 0x00,
365	C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,	389	C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
366	C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,	390	C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
…		…
384	XTerm_Color_cursor = 12, // change actual 'Cursor' color	408	XTerm_Color_cursor = 12, // change actual 'Cursor' color
385	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color	409	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
386	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color	410	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
387	XTerm_Color05 = 15, // not implemented (tektronix fg)	411	XTerm_Color05 = 15, // not implemented (tektronix fg)
388	XTerm_Color06 = 16, // not implemented (tektronix bg)	412	XTerm_Color06 = 16, // not implemented (tektronix bg)
389	XTerm_Color_RV = 17, // change actual 'Highlight' color	413	XTerm_Color_HC = 17, // change actual 'Highlight' bg color
		414	XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
390	XTerm_logfile = 46, // not implemented	415	XTerm_logfile = 46, // not implemented
391	XTerm_font = 50,	416	XTerm_font = 50,
392		417
393	XTerm_konsole30 = 30, // reserved for konsole	418	XTerm_konsole30 = 30, // reserved for konsole
394	XTerm_konsole31 = 31, // reserved for konsole	419	XTerm_konsole31 = 31, // reserved for konsole
…		…
396	/*	421	/*
397	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)	422	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)
398	*/	423	*/
399		424
400	// deprecated	425	// deprecated
401	Rxvt_Color_BD = 18,
402	Rxvt_Color_UL = 19,
403	Rxvt_restoreFG = 39,	426	Rxvt_restoreFG = 39,
404	Rxvt_restoreBG = 49,	427	Rxvt_restoreBG = 49,
405		428
406	Rxvt_Pixmap = 20, // new bg pixmap	429	Rxvt_Pixmap = 20, // new bg pixmap
407	Rxvt_dumpscreen = 55, // dump scrollback and all of screen	430	Rxvt_dumpscreen = 55, // dump scrollback and all of screen
…		…
411		434
412	URxvt_Color_IT = 704, // change actual 'Italic' colour	435	URxvt_Color_IT = 704, // change actual 'Italic' colour
413	URxvt_Color_tint = 705, // change actual tint colour	436	URxvt_Color_tint = 705, // change actual tint colour
414	URxvt_Color_BD = 706, // change actual 'Bold' color	437	URxvt_Color_BD = 706, // change actual 'Bold' color
415	URxvt_Color_UL = 707, // change actual 'Underline' color	438	URxvt_Color_UL = 707, // change actual 'Underline' color
		439	URxvt_Color_border = 708,
416		440
417	URxvt_font = 710,	441	URxvt_font = 710,
418	URxvt_boldFont = 711,	442	URxvt_boldFont = 711,
419	URxvt_italicFont = 712,	443	URxvt_italicFont = 712,
420	URxvt_boldItalicFont = 713,	444	URxvt_boldItalicFont = 713,
…		…
460	Color_White = maxBrightCOLOR,	484	Color_White = maxBrightCOLOR,
461	#else	485	#else
462	Color_White = maxCOLOR,	486	Color_White = maxCOLOR,
463	#endif	487	#endif
464	minTermCOLOR = Color_White + 1,	488	minTermCOLOR = Color_White + 1,
		489	#if USE_256_COLORS
		490	maxTermCOLOR = Color_White + 240,
		491	#else
465	maxTermCOLOR = Color_White + 72,	492	maxTermCOLOR = Color_White + 72,
		493	#endif
466	#ifndef NO_CURSORCOLOR	494	#ifndef NO_CURSORCOLOR
467	Color_cursor,	495	Color_cursor,
468	Color_cursor2,	496	Color_cursor2,
469	#endif	497	#endif
470	Color_pointer_fg,	498	Color_pointer_fg,
…		…
479	#if ENABLE_FRILLS	507	#if ENABLE_FRILLS
480	Color_underline,	508	Color_underline,
481	#endif	509	#endif
482	#ifdef OPTION_HC	510	#ifdef OPTION_HC
483	Color_HC,	511	Color_HC,
		512	Color_HTC,
484	#endif	513	#endif
485	Color_scroll,	514	Color_scroll,
486	#ifdef RXVT_SCROLLBAR	515	#ifdef RXVT_SCROLLBAR
487	Color_trough,	516	Color_trough,
488	#endif	517	#endif
…		…
500	#else	529	#else
501	TOTAL_COLORS = NRS_COLORS	530	TOTAL_COLORS = NRS_COLORS
502	#endif	531	#endif
503	};	532	};
504		533
		534	#if USE_256_COLORS
		535	# define Color_Bits 9 // 0 .. maxTermCOLOR
		536	#else
505	#define Color_Bits 7 // 0 .. maxTermCOLOR	537	# define Color_Bits 7 // 0 .. maxTermCOLOR
		538	#endif
506		539
507	/*	540	/*
508	* Resource list	541	* Resource list
509	*/	542	*/
510	enum {	543	enum {
…		…
538	#define PrivMode_vt52 (1UL<<18)	571	#define PrivMode_vt52 (1UL<<18)
539	#define PrivMode_LFNL (1UL<<19)	572	#define PrivMode_LFNL (1UL<<19)
540	#define PrivMode_MouseBtnEvent (1UL<<20)	573	#define PrivMode_MouseBtnEvent (1UL<<20)
541	#define PrivMode_MouseAnyEvent (1UL<<21)	574	#define PrivMode_MouseAnyEvent (1UL<<21)
542	#define PrivMode_BracketPaste (1UL<<22)	575	#define PrivMode_BracketPaste (1UL<<22)
		576	#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
		577	#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
543		578
544	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent)	579	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent)
545		580
546	#ifdef ALLOW_132_MODE	581	#ifdef ALLOW_132_MODE
547	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor\|PrivMode_132OK)	582	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor\|PrivMode_132OK)
…		…
598	/*	633	/*
599	*****************************************************************************	634	*****************************************************************************
600	* MACRO DEFINES	635	* MACRO DEFINES
601	*****************************************************************************	636	*****************************************************************************
602	*/	637	*/
		638
		639	// speed hack, copy some member variable into a local variable of the same name
603	#define dLocal(type,name) type const name = this->name	640	#define dLocal(type,name) type const name = this->name
604		641
605	// for speed reasons, we assume that all codepoints 32 to 126 are	642	// for speed reasons, we assume that all codepoints 32 to 126 are
606	// single-width.	643	// single-width.
607	#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))	644	#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
…		…
621		658
622	#define LINENO(n) LINENO_of (this, n)	659	#define LINENO(n) LINENO_of (this, n)
623	#define ROW(n) ROW_of (this, n)	660	#define ROW(n) ROW_of (this, n)
624		661
625	/* how to build & extract colors and attributes */	662	/* how to build & extract colors and attributes */
626	#define GET_BASEFG(x) (((x) & RS_fgMask))	663	#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
627	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	664	#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
628		665
629	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)	666	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
630	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))	667	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))
631		668
632	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)	669	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
633	#define SET_STYLE(x,style) (((x) & ~RS_styleMask) \| ((style) << RS_styleShift))	670	#define SET_STYLE(x,style) (((x) & ~RS_styleMask) \| ((style) << RS_styleShift))
634		671
635	#define GET_ATTR(x) (((x) & RS_attrMask))	672	#define GET_ATTR(x) (((x) & RS_attrMask))
		673	// return attributes defining the background, encoding doesn't matter
		674	// depends on RS_fgShift > RS_bgShift
636	#define GET_BGATTR(x) \	675	#define GET_BGATTR(x) \
		676	(expect_false ((x) & RS_RVid) \
637	(((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \	677	? (((x) & (RS_attrMask & ~RS_RVid)) \
638	\| (((x) & RS_fgMask)<<Color_Bits)) \	678	\| (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
639	: ((x) & (RS_attrMask \| RS_bgMask)))	679	: ((x) & (RS_attrMask \| RS_bgMask)))
640	#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) \| (fg))	680	#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) \| ((fg) << RS_fgShift))
641	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg)<<Color_Bits))	681	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg) << RS_bgShift))
642	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))	682	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))
643		683
644	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))	684	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
645		685
646	#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]	686	#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
…		…
785	{	825	{
786	int x, y, w, h; // overlay dimensions	826	int x, y, w, h; // overlay dimensions
787	text_t **text;	827	text_t **text;
788	rend_t **rend;	828	rend_t **rend;
789		829
790	// while tempting to add swap() etc. here, it effetcively only increases code size	830	// while tempting to add swap() etc. here, it effectively only increases code size
791	};	831	};
792		832
793	/* ------------------------------------------------------------------------- */	833	/* ------------------------------------------------------------------------- */
794		834
795	typedef struct	835	typedef struct
…		…
846	int focus; /* window has focus */	886	int focus; /* window has focus */
847	int mapped; /* window state mapped? */	887	int mapped; /* window state mapped? */
848	int int_bwidth; /* internal border width */	888	int int_bwidth; /* internal border width */
849	int ext_bwidth; /* external border width */	889	int ext_bwidth; /* external border width */
850	int lineSpace; /* number of extra pixels between rows */	890	int lineSpace; /* number of extra pixels between rows */
		891	int letterSpace; /* number of extra pixels between columns */
851	int saveLines; /* number of lines that fit in scrollback */	892	int saveLines; /* number of lines that fit in scrollback */
852	int total_rows; /* total number of rows in this terminal */	893	int total_rows; /* total number of rows in this terminal */
853	int term_start; /* term lines start here */	894	int term_start; /* term lines start here */
854	int view_start; /* scrollback view starts here */	895	int view_start; /* scrollback view starts here */
855	int top_row; /* topmost row index of scrollback */	896	int top_row; /* topmost row index of scrollback */
856	Window parent[6]; /* parent identifiers - we're parent[0] */	897	Window parent; /* parent identifier */
857	Window vt; /* vt100 window */	898	Window vt; /* vt100 window */
858	GC gc; /* GC for drawing */	899	GC gc; /* GC for drawing */
859	Pixmap pixmap;	900	Pixmap pixmap;
860	rxvt_drawable *drawable;	901	rxvt_drawable *drawable;
861	rxvt_fontset *fontset[4];	902	rxvt_fontset *fontset[4];
…		…
910	selection_op_t op; /* current operation */	951	selection_op_t op; /* current operation */
911	bool rect; /* rectangular selection? */	952	bool rect; /* rectangular selection? */
912	row_col_t beg; /* beginning of selection <= mark */	953	row_col_t beg; /* beginning of selection <= mark */
913	row_col_t mark; /* point of initial click <= end */	954	row_col_t mark; /* point of initial click <= end */
914	row_col_t end; /* one character past end point */	955	row_col_t end; /* one character past end point */
		956	wchar_t clip_text; / text copied to the clipboard */
		957	unsigned int clip_len; /* length of clipboard text */
915	};	958	};
916		959
917	/* ------------------------------------------------------------------------- */	960	/* ------------------------------------------------------------------------- */
918		961
919	/* screen_t flags */	962	/* screen_t flags */
…		…
924	#define Screen_WrapNext (1<<4) /* need to wrap for next char? */	967	#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
925	#define Screen_DefaultFlags (Screen_VisibleCursor \| Screen_Autowrap)	968	#define Screen_DefaultFlags (Screen_VisibleCursor \| Screen_Autowrap)
926		969
927	/* rxvt_vars.options */	970	/* rxvt_vars.options */
928	enum {	971	enum {
929	# define def(name,idx) Opt_ ## name = idx,
930	# define nodef(name) Opt_ ## name = 0,	972	# define def(name) Opt_ ## name,
		973	# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
		974	Opt_0,
931	# include "optinc.h"	975	# include "optinc.h"
932	# undef nodef	976	# undef nodef
933	# undef def	977	# undef def
934	Opt_count	978	Opt_count
935	};	979	};
936		980
937	/* ------------------------------------------------------------------------- */	981	/* ------------------------------------------------------------------------- */
938		982
939	struct rxvt_vars : TermWin_t	983	struct rxvt_vars : TermWin_t
…		…
941	scrollBar_t scrollBar;	985	scrollBar_t scrollBar;
942	uint8_t options[(Opt_count + 7) >> 3];	986	uint8_t options[(Opt_count + 7) >> 3];
943	XSizeHints szHint;	987	XSizeHints szHint;
944	rxvt_color *pix_colors;	988	rxvt_color *pix_colors;
945	Cursor TermWin_cursor; /* cursor for vt window */	989	Cursor TermWin_cursor; /* cursor for vt window */
946	int numlock_state;
947	line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf	990	line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
948	line_t *drawn_buf; // text on screen	991	line_t *drawn_buf; // text on screen
949	line_t *swap_buf; // lines for swap buffer	992	line_t *swap_buf; // lines for swap buffer
950	char tabs; / per location: 1 == tab-stop */	993	char tabs; / per location: 1 == tab-stop */
951	screen_t screen;	994	screen_t screen;
…		…
974		1017
975	unsigned char want_refresh:1,	1018	unsigned char want_refresh:1,
976	current_screen:1, /* primary or secondary */	1019	current_screen:1, /* primary or secondary */
977	num_scr_allow:1,	1020	num_scr_allow:1,
978	bypass_keystate:1,	1021	bypass_keystate:1,
979	#ifdef ENABLE_FRILLS	1022	#if ENABLE_FRILLS
980	urgency_hint:1,	1023	urgency_hint:1,
981	#endif	1024	#endif
982	#ifdef CURSOR_BLINK	1025	#if CURSOR_BLINK
983	hidden_cursor:1,	1026	hidden_cursor:1,
984	#endif	1027	#endif
985	#ifdef TEXT_BLINK	1028	#if TEXT_BLINK
986	hidden_text:1,	1029	hidden_text:1,
987	#endif	1030	#endif
988	#ifdef POINTER_BLANK	1031	#if POINTER_BLANK
989	hidden_pointer:1,	1032	hidden_pointer:1,
990	#endif	1033	#endif
991	enc_utf8:1, /* wether locale uses utf-8 */	1034	enc_utf8:1, /* whether locale uses utf-8 */
992	seen_input:1, /* wether we have seen some program output yet */	1035	seen_input:1, /* whether we have seen some program output yet */
993	seen_resize:1, /* wether we had a resize event */	1036	seen_resize:1, /* whether we had a resize event */
994	parsed_geometry:1;	1037	parsed_geometry:1;
995		1038
996	unsigned char refresh_type,	1039	unsigned char refresh_type,
997	#ifdef META8_OPTION	1040	#ifdef META8_OPTION
998	meta_char, /* Alt-key prefix */	1041	meta_char; /* Alt-key prefix */
999	#endif	1042	#endif
1000	selection_wait,
1001	selection_type;
1002	/* ---------- */	1043	/* ---------- */
1003	bool rvideo_state, rvideo_mode;	1044	bool rvideo_state, rvideo_mode;
1004	#ifndef NO_BELL	1045	#ifndef NO_BELL
1005	bool rvideo_bell;	1046	bool rvideo_bell;
1006	#endif	1047	#endif
1007	int num_scr; /* screen: number lines scrolled */	1048	int num_scr; /* screen: number of lines scrolled */
1008	int prev_ncol, /* screen: previous number of columns */	1049	int prev_ncol, /* screen: previous number of columns */
1009	prev_nrow; /* screen: previous number of rows */	1050	prev_nrow; /* screen: previous number of rows */
1010	/* ---------- */	1051	/* ---------- */
1011	rend_t rstyle;	1052	rend_t rstyle;
1012	/* ---------- */	1053	/* ---------- */
…		…
1042	SavedModes;	1083	SavedModes;
1043	/* ---------- */	1084	/* ---------- */
1044	Atom *xa;	1085	Atom *xa;
1045	/* ---------- */	1086	/* ---------- */
1046	Time selection_time,	1087	Time selection_time,
1047	selection_request_time;	1088	clipboard_time;
		1089	rxvt_selection *selection_req;
1048	pid_t cmd_pid; /* process id of child */	1090	pid_t cmd_pid; /* process id of child */
1049	char * incr_buf;
1050	size_t incr_buf_size, incr_buf_fill;
1051	/* ---------- */	1091	/* ---------- */
1052	struct mouse_event MEvent;	1092	struct mouse_event MEvent;
1053	XComposeStatus compose;	1093	XComposeStatus compose;
1054	struct termios tio;	1094	static struct termios def_tio;
1055	row_col_t oldcursor;	1095	row_col_t oldcursor;
1056	#ifdef HAVE_BG_PIXMAP	1096	#ifdef HAVE_BG_PIXMAP
1057	bgPixmap_t bgPixmap;	1097	void bg_init ();
		1098	void bg_destroy ();
		1099
		1100	enum {
		1101	//subset returned by make_transparency_pixmap
		1102	BG_IS_VALID = 1 << 0,
		1103	BG_NEEDS_TINT = 1 << 1,
		1104	BG_NEEDS_BLUR = 1 << 2,
		1105
		1106	BG_EFFECTS_FLAGS = BG_NEEDS_TINT \| BG_NEEDS_BLUR,
		1107
		1108	BG_PROP_SCALE = 1 << 3,
		1109	BG_ROOT_ALIGN = 1 << 4,
		1110	BG_GEOMETRY_FLAGS = BG_PROP_SCALE \| BG_ROOT_ALIGN,
		1111
		1112	BG_TINT_SET = 1 << 5,
		1113	BG_TINT_BITAND = 1 << 6,
		1114	BG_TINT_FLAGS = BG_NEEDS_TINT \| BG_TINT_BITAND,
		1115
		1116	BG_HAS_RENDER = 1 << 7,
		1117	BG_HAS_RENDER_CONV = 1 << 8,
		1118	BG_CLIENT_RENDER = 1 << 9,
		1119
		1120	BG_IS_TRANSPARENT = 1 << 10,
		1121	BG_NEEDS_REFRESH = 1 << 11,
		1122	BG_IS_SIZE_SENSITIVE = 1 << 12,
		1123	BG_IS_FROM_FILE = 1 << 13,
		1124	};
		1125
		1126	unsigned int bg_flags;
		1127
		1128	# ifdef BG_IMAGE_FROM_FILE
		1129	void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
		1130	bool render_image (unsigned long tr_flags);
		1131
		1132	enum {
		1133	noScale = 0,
		1134	windowScale = 100,
		1135	defaultScale = windowScale,
		1136	centerAlign = 50,
		1137	defaultAlign = centerAlign,
		1138	};
		1139
		1140	unsigned int h_scale, v_scale; /* percents of the window size */
		1141	int h_align, v_align; /* percents of the window size:
		1142	0 - left align, 50 - center, 100 - right */
		1143
		1144	bool bg_set_geometry (const char *geom, bool update = false);
		1145	void bg_set_default_geometry ()
		1146	{
		1147	h_scale = v_scale = defaultScale;
		1148	h_align = v_align = defaultAlign;
		1149	}
		1150
		1151	bool bg_set_file (const char *file);
		1152	# endif
		1153
		1154	# ifdef ENABLE_TRANSPARENCY
		1155	Pixmap root_pixmap; /* current root pixmap set */
		1156	rxvt_color tint;
		1157	int shade;
		1158	int h_blurRadius, v_blurRadius;
		1159
		1160	bool bg_set_transparent ();
		1161	void bg_set_root_pixmap ();
		1162	void set_tint_shade_flags ();
		1163	bool bg_set_tint (rxvt_color &new_tint);
		1164	bool bg_set_shade (const char *shade_str);
		1165	bool bg_set_blur (const char *geom);
		1166
		1167	bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
		1168	bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
		1169	unsigned long make_transparency_pixmap ();
		1170	# endif
		1171
		1172	ev_tstamp bg_valid_since;
		1173
		1174	Pixmap bg_pixmap;
		1175	unsigned int bg_pmap_width, bg_pmap_height;
		1176
		1177	int target_x;
		1178	int target_y;
		1179	bool bg_set_position (int x, int y);
		1180	bool bg_window_size_sensitive ();
		1181	bool bg_window_position_sensitive ();
		1182
		1183	bool bg_render ();
		1184	void bg_invalidate ()
		1185	{
		1186	bg_flags &= ~BG_IS_VALID;
		1187	}
1058	#endif	1188	#endif
1059	#ifdef HAVE_AFTERIMAGE	1189	#ifdef HAVE_AFTERIMAGE
		1190	ASImage *original_asim;
1060	ASVisual *asv;	1191	ASVisual *asv;
1061	ASImageManager *asimman;	1192	ASImageManager *asimman;
1062		1193
1063	void init_asv ()	1194	void init_asv ()
1064	{	1195	{
1065	if (!asv)	1196	if (!asv)
1066	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);	1197	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1067	}	1198	}
		1199	#endif
		1200	#ifdef HAVE_PIXBUF
		1201	GdkPixbuf *pixbuf;
		1202	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
		1203	int src_x, int src_y, int dst_x, int dst_y,
		1204	unsigned int width, unsigned int height);
1068	#endif	1205	#endif
1069		1206
1070	#if ENABLE_OVERLAY	1207	#if ENABLE_OVERLAY
1071	overlay_base ov;	1208	overlay_base ov;
1072		1209
…		…
1133	void rootwin_cb (XEvent &xev);	1270	void rootwin_cb (XEvent &xev);
1134	xevent_watcher rootwin_ev;	1271	xevent_watcher rootwin_ev;
1135	#endif	1272	#endif
1136	#ifdef HAVE_BG_PIXMAP	1273	#ifdef HAVE_BG_PIXMAP
1137	void update_background ();	1274	void update_background ();
1138	#if TRACE_PIXMAPS
1139	void trace_update_background (const char *file, int line);
1140	# define update_background() trace_update_background (__FILE__, __LINE__)
1141	#endif
1142	void update_background_cb (ev::timer &w, int revents);	1275	void update_background_cb (ev::timer &w, int revents);
1143	ev::timer update_background_ev;	1276	ev::timer update_background_ev;
1144	#endif	1277	#endif
1145		1278
1146	void x_cb (XEvent &xev);	1279	void x_cb (XEvent &xev);
…		…
1151	void child_cb (ev::child &w, int revents); ev::child child_ev;	1284	void child_cb (ev::child &w, int revents); ev::child child_ev;
1152	void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;	1285	void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1153	void refresh_check ();	1286	void refresh_check ();
1154	void flush ();	1287	void flush ();
1155	void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;	1288	void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
		1289	void cmdbuf_reify ();
		1290	void cmdbuf_append (const char *str, size_t count);
1156	bool pty_fill ();	1291	bool pty_fill ();
1157	void pty_cb (ev::io &w, int revents); ev::io pty_ev;	1292	void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1158	void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1159		1293
1160	#ifdef CURSOR_BLINK	1294	#ifdef CURSOR_BLINK
1161	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;	1295	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1162	#endif	1296	#endif
1163	#ifdef TEXT_BLINK	1297	#ifdef TEXT_BLINK
…		…
1220	#endif	1354	#endif
1221		1355
1222	// command.C	1356	// command.C
1223	void key_press (XKeyEvent &ev);	1357	void key_press (XKeyEvent &ev);
1224	void key_release (XKeyEvent &ev);	1358	void key_release (XKeyEvent &ev);
1225	unsigned int cmd_write (const char *str, unsigned int count);
1226		1359
1227	wchar_t next_char () NOTHROW;	1360	wchar_t next_char () NOTHROW;
1228	wchar_t cmd_getc () THROW ((class out_of_input));	1361	wchar_t cmd_getc () THROW ((class out_of_input));
1229	uint32_t next_octet () NOTHROW;	1362	uint32_t next_octet () NOTHROW;
1230	uint32_t cmd_get8 () THROW ((class out_of_input));	1363	uint32_t cmd_get8 () THROW ((class out_of_input));
…		…
1233	void mouse_report (XButtonEvent &ev);	1366	void mouse_report (XButtonEvent &ev);
1234	void button_press (XButtonEvent &ev);	1367	void button_press (XButtonEvent &ev);
1235	void button_release (XButtonEvent &ev);	1368	void button_release (XButtonEvent &ev);
1236	void focus_in ();	1369	void focus_in ();
1237	void focus_out ();	1370	void focus_out ();
		1371	#if ENABLE_FRILLS
1238	void set_urgency (bool enable);	1372	void set_urgency (bool enable);
		1373	#else
		1374	void set_urgency (bool enable) { }
		1375	#endif
1239	void update_fade_color (unsigned int idx);	1376	void update_fade_color (unsigned int idx);
1240	#ifdef PRINTPIPE	1377	#ifdef PRINTPIPE
1241	FILE *popen_printer ();	1378	FILE *popen_printer ();
1242	int pclose_printer (FILE *stream);	1379	int pclose_printer (FILE *stream);
1243	#endif	1380	#endif
…		…
1249	void process_window_ops (const int *args, unsigned int nargs);	1386	void process_window_ops (const int *args, unsigned int nargs);
1250	char *get_to_st (unicode_t &ends_how);	1387	char *get_to_st (unicode_t &ends_how);
1251	void process_dcs_seq ();	1388	void process_dcs_seq ();
1252	void process_osc_seq ();	1389	void process_osc_seq ();
1253	void process_color_seq (int report, int color, const char *str, char resp);	1390	void process_color_seq (int report, int color, const char *str, char resp);
1254	void process_xterm_seq (int op, const char *str, char resp);	1391	void process_xterm_seq (int op, char *str, char resp);
1255	int privcases (int mode, unsigned long bit);	1392	int privcases (int mode, unsigned long bit);
1256	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1393	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1257	void process_sgr_mode (unsigned int nargs, const int *arg);	1394	void process_sgr_mode (unsigned int nargs, const int *arg);
1258	void process_graphics ();
1259	// init.C	1395	// init.C
1260	void init_vars ();	1396	void init_vars ();
1261	const char *init_resources (int argc, const char const *argv);	1397	const char *init_resources (int argc, const char const *argv);
1262	void init (int argc, const char const argv, stringvec *envv);	1398	void init (int argc, const char const argv, stringvec *envv);
1263	void init_env ();	1399	void init_env ();
…		…
1268	int run_child (const char const argv);	1404	int run_child (const char const argv);
1269	void color_aliases (int idx);	1405	void color_aliases (int idx);
1270	void create_windows (int argc, const char const argv);	1406	void create_windows (int argc, const char const argv);
1271	void get_colours ();	1407	void get_colours ();
1272	void get_ourmods ();	1408	void get_ourmods ();
		1409	void set_icon (const char *file);
1273	// main.C	1410	// main.C
1274	void tt_winch ();	1411	void tt_winch ();
1275	rxvt_term ();	1412	rxvt_term ();
1276	~rxvt_term ();	1413	~rxvt_term ();
1277	void destroy ();	1414	void destroy ();
…		…
1279	void recolour_cursor ();	1416	void recolour_cursor ();
1280	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);	1417	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1281	void window_calc (unsigned int newwidth, unsigned int newheight);	1418	void window_calc (unsigned int newwidth, unsigned int newheight);
1282	bool set_fonts ();	1419	bool set_fonts ();
1283	void set_string_property (Atom prop, const char *str, int len = -1);	1420	void set_string_property (Atom prop, const char *str, int len = -1);
		1421	void set_mbstring_property (Atom prop, const char *str, int len = -1);
1284	void set_utf8_property (Atom prop, const char *str, int len = -1);	1422	void set_utf8_property (Atom prop, const char *str, int len = -1);
1285	void set_title (const char *str);	1423	void set_title (const char *str);
1286	void set_icon_name (const char *str);	1424	void set_icon_name (const char *str);
1287	void set_window_color (int idx, const char *color);	1425	void set_window_color (int idx, const char *color);
1288	void set_colorfgbg ();	1426	void set_colorfgbg ();
1289	bool set_color (rxvt_color &color, const char *name);	1427	bool set_color (rxvt_color &color, const char *name);
1290	void alias_color (int dst, int src);	1428	void alias_color (int dst, int src);
1291	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1429	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1292	void get_window_origin (int &x, int &y);	1430	void get_window_origin (int &x, int &y);
1293	Pixmap get_pixmap_property (int prop_id);	1431	Pixmap get_pixmap_property (Atom property);
1294		1432
1295	// screen.C	1433	// screen.C
1296		1434
1297	void lalloc (line_t &l) const	1435	void lalloc (line_t &l) const
1298	{	1436	{
…		…
1350	return base;	1488	return base;
1351	}	1489	}
1352		1490
1353	bool option (uint8_t opt) const NOTHROW	1491	bool option (uint8_t opt) const NOTHROW
1354	{	1492	{
1355	if (!opt)
1356	return 0;
1357
1358	--opt;
1359	return options[opt >> 3] & (1 << (opt & 7));	1493	return options[opt >> 3] & (1 << (opt & 7));
1360	}	1494	}
1361		1495
1362	void set_option (uint8_t opt, bool set = true) NOTHROW	1496	void set_option (uint8_t opt, bool set = true) NOTHROW;
1363	{
1364	if (!opt)
1365	return;
1366
1367	--opt;
1368	if (set)
1369	options[opt >> 3] \|= (1 << (opt & 7));
1370	else
1371	options[opt >> 3] &= ~(1 << (opt & 7));
1372	}
1373		1497
1374	void set_privmode (unsigned bit, int set) NOTHROW	1498	void set_privmode (unsigned bit, int set) NOTHROW
1375	{	1499	{
1376	if (set)	1500	if (set)
1377	priv_modes \|= bit;	1501	priv_modes \|= bit;
1378	else	1502	else
1379	priv_modes &= ~bit;	1503	priv_modes &= ~bit;
1380	}	1504	}
1381		1505
1382	// modifies first argument(!)	1506	// modifies first argument(!)
		1507	void tt_paste (char *data, unsigned int len) NOTHROW;
1383	void paste (char *data, unsigned int len) NOTHROW;	1508	void paste (char *data, unsigned int len) NOTHROW;
1384	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;	1509	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1385	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;	1510	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1386	void scr_kill_char (line_t &l, int col) const NOTHROW;	1511	void scr_kill_char (line_t &l, int col) const NOTHROW;
1387	int scr_scroll_text (int row1, int row2, int count) NOTHROW;	1512	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
…		…
1396	void scr_backindex () NOTHROW;	1521	void scr_backindex () NOTHROW;
1397	void scr_forwardindex () NOTHROW;	1522	void scr_forwardindex () NOTHROW;
1398	#endif	1523	#endif
1399	void scr_touch (bool refresh) NOTHROW;	1524	void scr_touch (bool refresh) NOTHROW;
1400	void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;	1525	void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1401	void scr_recolour () NOTHROW;	1526	void scr_recolour (bool refresh = true) NOTHROW;
1402	void scr_remap_chars () NOTHROW;	1527	void scr_remap_chars () NOTHROW;
1403	void scr_remap_chars (line_t &l) NOTHROW;	1528	void scr_remap_chars (line_t &l) NOTHROW;
1404		1529
1405	enum cursor_mode { SAVE, RESTORE };	1530	enum cursor_mode { SAVE, RESTORE };
1406		1531
…		…
1441	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;	1566	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1442	void scr_reverse_selection () NOTHROW;	1567	void scr_reverse_selection () NOTHROW;
1443	void scr_dump (int fd) NOTHROW;	1568	void scr_dump (int fd) NOTHROW;
1444		1569
1445	void selection_check (int check_more) NOTHROW;	1570	void selection_check (int check_more) NOTHROW;
1446	void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1447	void selection_property (Window win, Atom prop) NOTHROW;
1448	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;	1571	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1449	int selection_request_other (Atom target, int selnum) NOTHROW;
1450	void selection_clear () NOTHROW;	1572	void selection_clear (bool clipboard = false) NOTHROW;
1451	void selection_make (Time tm);	1573	void selection_make (Time tm);
1452	bool selection_grab (Time tm) NOTHROW;	1574	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1453	void selection_start_colrow (int col, int row) NOTHROW;	1575	void selection_start_colrow (int col, int row) NOTHROW;
1454	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW;	1576	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW;
1455	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;	1577	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1456	void selection_remove_trailing_spaces () NOTHROW;	1578	void selection_remove_trailing_spaces () NOTHROW;
1457	void selection_send (const XSelectionRequestEvent &rq) NOTHROW;	1579	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.372 by root, Wed Nov 5 14:43:54 2008 UTC vs. Revision 1.441 by sf-exg, Fri Apr 29 10:10:20 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.372 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.441 by sf-exg, Fri Apr 29 10:10:20 2011 UTC