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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.199 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.292 by sasha, Mon Aug 13 22:41:34 2007 UTC

…		…
2	#define RXVT_H_	2	#define RXVT_H_
3		3
4	#include "rxvtlib.h"	4	#include "rxvtlib.h"
5		5
6	#include "feature.h"	6	#include "feature.h"
		7
		8	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
		9	# define ENABLE_OVERLAY 1
		10	#endif
		11
		12	#if ENABLE_PERL
		13	# define ENABLE_FRILLS 1
		14	# define ENABLE_COMBINING 1
		15	#endif
		16
		17	#if ENABLE_FRILLS
		18	# define ENABLE_XEMBED 1
		19	# define ENABLE_EWMH 1
		20	# define ENABLE_XIM_ONTHESPOT 1
		21	# define CURSOR_BLINK 1
		22	# define OPTION_HC 1
		23	#else
		24	# define ENABLE_MINIMAL 1
		25	#endif
7		26
8	#include <limits.h>	27	#include <limits.h>
9		28
10	#include <X11/cursorfont.h>	29	#include <X11/cursorfont.h>
11	#include <X11/keysym.h>	30	#include <X11/keysym.h>
…		…
14	#if ENABLE_FRILLS	33	#if ENABLE_FRILLS
15	# include <X11/Xmd.h>	34	# include <X11/Xmd.h>
16	#endif	35	#endif
17		36
18	#include "encoding.h"	37	#include "encoding.h"
		38	#include "rxvtutil.h"
19	#include "rxvtfont.h"	39	#include "rxvtfont.h"
20	#include "rxvttoolkit.h"	40	#include "rxvttoolkit.h"
21	#include "iom.h"	41	#include "iom.h"
22	#include "salloc.h"	42	#include "salloc.h"
		43	#include "libptytty.h"
23		44
24	#include "rxvtperl.h"	45	#include "rxvtperl.h"
25		46
26	#if ENABLE_FRILLS	47	// try to avoid some macros to decrease code size, on some systems
27	# define ENABLE_XEMBED 1	48	#if ENABLE_MINIMAL
28	# define ENABLE_EWMH 1	49	# define strcmp(a,b) (strcmp)(a,b)
29	# define CURSOR_BLINK 1	50	# define strlen(a) (strlen)(a)
		51	# define strcpy(a,b) (strcpy)(a,b)
		52	# define memset(a,c,l) (memset)(a,c,l)
		53	# define memcpy(a,b,l) (memcpy)(a,b,l)
30	#endif	54	#endif
31		55
32	/*	56	/*
33	*****************************************************************************	57	*****************************************************************************
34	* SYSTEM HACKS	58	* SYSTEM HACKS
…		…
43	#if defined (sun) && !defined (__sun__)	67	#if defined (sun) && !defined (__sun__)
44	# define __sun__ 1	68	# define __sun__ 1
45	#endif	69	#endif
46		70
47	#ifndef HAVE_XPOINTER	71	#ifndef HAVE_XPOINTER
48	typedef char *XPointer;	72	typedef char *XPointer;
49	#endif	73	#endif
50		74
51	#ifdef HAVE_TERMIOS_H
52	# include <termios.h>	75	#include <termios.h>
53	typedef struct termios ttymode_t;	76	typedef struct termios ttymode_t;
54	#else
55	# include <sgtty.h>
56	typedef struct {
57	struct sgttyb sg;
58	struct tchars tc;
59	struct ltchars lc;
60	int line;
61	int local;
62	} ttymode_t;
63	#endif
64		77
65	#ifdef XPM_BACKGROUND	78	#ifdef HAVE_AFTERIMAGE
66	# ifdef XPM_INC_X11	79	# include <afterimage.h>
67	# include <X11/xpm.h>	80	#undef min
68	# else	81	#undef max
69	# include <xpm.h>
70	# endif
71	#endif	82	#endif
72		83
73	#ifndef STDIN_FILENO	84	#ifndef STDIN_FILENO
74	# define STDIN_FILENO 0	85	# define STDIN_FILENO 0
75	# define STDOUT_FILENO 1	86	# define STDOUT_FILENO 1
76	# define STDERR_FILENO 2	87	# define STDERR_FILENO 2
77	#endif	88	#endif
		89
		90	/****************************************************************************/
		91
		92	// exception thrown on fatal (per-instance) errors
		93	class rxvt_failure_exception { };
		94
		95	// exception thrown when the command parser runs out of input data
		96	class out_of_input { };
78		97
79	/*	98	/*
80	*****************************************************************************	99	*****************************************************************************
81	* PROTOTYPES	100	* PROTOTYPES
82	*****************************************************************************	101	*****************************************************************************
83	*/	102	*/
84	// main.C	103	// main.C
85	RETSIGTYPE rxvt_Child_signal (int sig);	104	RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
86	RETSIGTYPE rxvt_Exit_signal (int sig);	105	RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
87	void rxvt_clean_exit ();	106	void rxvt_clean_exit () NOTHROW;
88	void * rxvt_malloc (size_t size);	107	void * rxvt_malloc (size_t size);
89	void * rxvt_calloc (size_t number, size_t size);	108	void * rxvt_calloc (size_t number, size_t size);
90	void * rxvt_realloc (void *ptr, size_t size);	109	void * rxvt_realloc (void *ptr, size_t size);
91	void rxvt_privileges (rxvt_privaction action);
92		110
93	// util.C	111	// misc.C
94	char * rxvt_wcstombs (const wchar_t *str, int len = -1);	112	char * rxvt_wcstombs (const wchar_t *str, int len = -1);
95	wchar_t * rxvt_mbstowcs (const char *str, int len = -1);	113	wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
96	char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);	114	char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
97	wchar_t * rxvt_utf8towcs (const char *str, int len = -1);	115	wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
98	char * rxvt_strdup (const char *str);
99		116
100	// misc.C	117	#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
		118
101	char * rxvt_r_basename (const char *str);	119	char * rxvt_r_basename (const char *str) NOTHROW;
102	void rxvt_vlog (const char *fmt, va_list arg_ptr);	120	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
103	void rxvt_log (const char *fmt,...);	121	void rxvt_log (const char *fmt,...) NOTHROW;
104	void rxvt_warn (const char *fmt,...);	122	void rxvt_warn (const char *fmt,...) NOTHROW;
105	void rxvt_fatal (const char *fmt,...);	123	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
106	void rxvt_exit_failure ();	124	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
		125
107	int rxvt_Str_match (const char s1, const char s2);	126	int rxvt_Str_match (const char s1, const char s2) NOTHROW;
108	const char * rxvt_Str_skip_space (const char *str);	127	const char * rxvt_Str_skip_space (const char *str) NOTHROW;
109	char * rxvt_Str_trim (char *str);	128	char * rxvt_Str_trim (char *str) NOTHROW;
110	int rxvt_Str_escaped (char *str);	129	int rxvt_Str_escaped (char *str) NOTHROW;
111	char ** rxvt_splitcommastring (const char *cs);	130	char ** rxvt_splitcommastring (const char *cs) NOTHROW;
112	void rxvt_freecommastring (char **cs);	131	void rxvt_freecommastring (char **cs) NOTHROW;
113	char * rxvt_File_find (const char file, const char ext, const char *path);
114	void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
115	void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
116	void rxvt_usleep (int usecs);
117		132
118	/////////////////////////////////////////////////////////////////////////////	133	/////////////////////////////////////////////////////////////////////////////
119		134
120	// temporarily replace the process environment	135	// temporarily replace the process environment
121	extern char **environ;	136	extern char **environ;
122	extern char **rxvt_environ; // the original environ pointer	137	extern char **rxvt_environ; // the original environ pointer
123		138
124	inline void set_environ (stringvec *envv)	139	inline void set_environ (stringvec *envv)
125	{	140	{
		141	#if ENABLE_PERL
		142	assert (envv);
		143	#else
126	if (envv)	144	if (envv)
		145	#endif
127	environ = (char **)envv->begin ();	146	environ = (char **)envv->begin ();
128	}	147	}
129		148
130	inline void set_environ (char **envv)	149	inline void set_environ (char **envv)
131	{	150	{
		151	#if ENABLE_PERL
		152	assert (envv);
		153	#else
132	if (envv)	154	if (envv)
		155	#endif
133	environ = envv;	156	environ = envv;
134	}	157	}
135		158
136	/*	159	/*
137	*****************************************************************************	160	*****************************************************************************
138	* STRUCTURES AND TYPEDEFS	161	* STRUCTURES AND TYPEDEFS
139	*****************************************************************************	162	*****************************************************************************
140	*/	163	*/
141	struct grwin_t;	164	struct grwin_t;
142		165
143	/* Sanitize menubar info */
144	#ifndef MENUBAR
145	# undef MENUBAR_MAX
146	#endif
147	#ifndef MENUBAR_MAX
148	# define MENUBAR_MAX 0
149	#endif
150
151	/* If we're using either the rxvt scrollbar or menu bars, keep the	166	/* If we're using either the rxvt scrollbar, keep the
152	* scrollColor resource.	167	* scrollColor resource.
153	*/	168	*/
154	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)	169	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)
155	# define KEEP_SCROLLCOLOR 1	170	# define KEEP_SCROLLCOLOR 1
156	#else	171	#else
157	# undef KEEP_SCROLLCOLOR	172	# undef KEEP_SCROLLCOLOR
158	#endif	173	#endif
159		174
		175	#if defined(XPM_BACKGROUND) \|\| defined(ENABLE_TRANSPARENCY)
		176	# define HAVE_BG_PIXMAP 1/* to simplify further usage */
		177	struct bgPixmap_t {
		178
		179	enum {
		180	geometrySet = (1UL<<0),
		181	propScale = (1UL<<1),
		182	geometryFlags = (geometrySet\|propScale),
		183
		184	tintSet = (1UL<<8),
		185	tintNeeded = (1UL<<9),
		186	tintServerSide = (1UL<<10),
		187	tintFlags = (tintSet\|tintServerSide\|tintNeeded),
		188	blurNeeded = (1UL<<11),
		189
		190	isTransparent = (1UL<<16),
		191	isInvalid = (1UL<<17)
		192	};
		193
		194	unsigned long flags;
		195
160	#ifdef XPM_BACKGROUND	196	# ifdef XPM_BACKGROUND
161	typedef struct {	197	# ifdef HAVE_AFTERIMAGE
162	short w, h, x, y;	198	ASImage *original_asim;
		199	bool render_asim (ASImage *background, ARGB32 background_tint);
		200	# endif
		201
		202	enum { defaultScale = 100, defaultAlign = 50 };
		203
		204	unsigned int h_scale, v_scale;/* percents of the window size */
		205	int h_align, v_align; /* percents of the window size:
		206	0 - left align, 50 - center, 100 - right */
		207	void unset_geometry () { flags = flags & ~geometryFlags; };
		208	bool set_geometry (const char *geom);
		209	void set_defaultGeometry ()
		210	{
		211	h_scale = v_scale = defaultScale;
		212	h_align = v_align = defaultAlign;
		213	flags \|= geometrySet;
		214	};
		215
		216	bool set_file (const char *file);
		217	# endif /* XPM_BACKGROUND */
		218
		219	rxvt_term *target;
		220	bool set_target (rxvt_term *new_target);
		221
		222	# ifdef ENABLE_TRANSPARENCY
		223	int root_depth; /* obtained when target is set */
		224	Pixmap root_pixmap; /* current root pixmap set */
		225	rxvt_color tint;
		226	int shade;
		227	int h_blurRadius, v_blurRadius;
		228
		229	bool set_transparent ();
		230	bool set_blur_radius (const char *geom);
		231	bool set_tint (rxvt_color &new_tint);
		232	bool unset_tint ();
		233	bool set_shade (const char *shade_str);
		234	bool set_root_pixmap ();
		235
		236	enum {
		237	transpPmapTiled = (1UL<<0),
		238	transpPmapTinted = tintNeeded,
		239	transpPmapBlured = blurNeeded,
		240	transpTransformations = (tintNeeded\|blurNeeded)
		241	};
		242	unsigned long make_transparency_pixmap ();/* returns combination of the above flags */
		243	# endif
		244
163	Pixmap pixmap;	245	Pixmap pixmap;
164	} bgPixmap_t;	246	unsigned int pmap_width, pmap_height;
		247	unsigned int pmap_depth;
		248
		249	bool window_size_sensitive ();
		250	void apply ();
		251	bool render ();
		252	void invalidate () { flags \|= isInvalid; };
		253	};
		254	#else
		255	# undef HAVE_BG_PIXMAP
165	#endif	256	#endif
166		257
167	/*	258	/*
168	* the 'essential' information for reporting Mouse Events	259	* the 'essential' information for reporting Mouse Events
169	* pared down from XButtonEvent	260	* pared down from XButtonEvent
…		…
229		320
230	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)	321	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
231	# define NO_MOUSE_REPORT_SCROLLBAR 1	322	# define NO_MOUSE_REPORT_SCROLLBAR 1
232	#endif	323	#endif
233		324
234	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
235	# define ENABLE_OVERLAY 1
236	#endif
237
238	/* now look for other badly set stuff */	325	/* now look for other badly set stuff */
239		326
240	#if !defined (EACCESS) && defined(EAGAIN)	327	#if !defined (EACCESS) && defined(EAGAIN)
241	# define EACCESS EAGAIN	328	# define EACCESS EAGAIN
242	#endif	329	#endif
…		…
244	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */	331	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
245	# define EXIT_SUCCESS 0 /* exit function success */	332	# define EXIT_SUCCESS 0 /* exit function success */
246	# define EXIT_FAILURE 1 /* exit function failure */	333	# define EXIT_FAILURE 1 /* exit function failure */
247	#endif	334	#endif
248		335
249	#define menuBar_esc 10
250	#define scrollBar_esc 30	336	#define scrollBar_esc 30
251	#define menuBar_margin 2 /* margin below text */
252		337
253	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(XTERM_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)	338	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(XTERM_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)
254	# define HAVE_SCROLLBARS 1	339	# define HAVE_SCROLLBARS 1
255	#endif
256
257	/* width of scrollBar, menuBar shadow, must be 1 or 2 */
258	#ifdef HALFSHADOW
259	# define MENU_SHADOW 1
260	#else
261	# define MENU_SHADOW 2
262	#endif	340	#endif
263		341
264	#define R_SB_ALIGN_CENTRE 0	342	#define R_SB_ALIGN_CENTRE 0
265	#define R_SB_ALIGN_TOP 1	343	#define R_SB_ALIGN_TOP 1
266	#define R_SB_ALIGN_BOTTOM 2	344	#define R_SB_ALIGN_BOTTOM 2
…		…
339	* \|	417	* \|
340	* +---< SB_WIDTH_NEXT	418	* +---< SB_WIDTH_NEXT
341	*/	419	*/
342		420
343	enum {	421	enum {
344	NO_REFRESH = 0 , /* Window not visible at all! */	422	NO_REFRESH = 0, /* Window not visible at all! */
345	FAST_REFRESH = 1<<0, /* Fully exposed window */	423	FAST_REFRESH = 1, /* Fully exposed window */
346	SLOW_REFRESH = 1<<1, /* Partially exposed window */	424	SLOW_REFRESH = 2, /* Partially exposed window */
347	SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
348	};	425	};
349		426
350	#ifdef NO_SECONDARY_SCREEN	427	#ifdef NO_SECONDARY_SCREEN
351	# define NSCREENS 0	428	# define NSCREENS 0
352	#else	429	#else
…		…
396		473
397	// fake styles	474	// fake styles
398	#define RS_Blink 0x00010000UL // blink	475	#define RS_Blink 0x00010000UL // blink
399	#define RS_RVid 0x00020000UL // reverse video	476	#define RS_RVid 0x00020000UL // reverse video
400	#define RS_Uline 0x00040000UL // underline	477	#define RS_Uline 0x00040000UL // underline
		478
		479	// toggle this to force redraw, must be != RS_Careful
		480	#define RS_redraw 0x01000000UL
401		481
402	// 5 custom bits for extensions	482	// 5 custom bits for extensions
403	#define RS_customCount 32	483	#define RS_customCount 32
404	#define RS_customMask 0x00f80000UL	484	#define RS_customMask 0x00f80000UL
405	#define RS_customShift 19	485	#define RS_customShift 19
…		…
475	Rxvt_restoreFG = 39, // change default fg color	555	Rxvt_restoreFG = 39, // change default fg color
476	Rxvt_restoreBG = 49, // change default bg color	556	Rxvt_restoreBG = 49, // change default bg color
477	Rxvt_dumpscreen = 55, // dump scrollback and all of screen	557	Rxvt_dumpscreen = 55, // dump scrollback and all of screen
478		558
479	URxvt_locale = 701, // change locale	559	URxvt_locale = 701, // change locale
480	URxvt_Menu = 703, // set menu item	560	URxvt_version = 702, // request version
		561
481	URxvt_Color_IT = 704, // change actual 'Italic' colour	562	URxvt_Color_IT = 704, // change actual 'Italic' colour
482	URxvt_Color_tint = 705, // change actual tint colour	563	URxvt_Color_tint = 705, // change actual tint colour
483	URxvt_Color_BD = 706,	564	URxvt_Color_BD = 706,
484	URxvt_Color_UL = 707,	565	URxvt_Color_UL = 707,
485		566
…		…
500	* on the unnecessary items, e.g. Color_pointer, but won't bother	581	* on the unnecessary items, e.g. Color_pointer, but won't bother
501	* until we need to. Also, be aware of usage in pixcolor_set	582	* until we need to. Also, be aware of usage in pixcolor_set
502	*/	583	*/
503		584
504	enum colour_list {	585	enum colour_list {
		586	Color_none = -2,
		587	Color_transparent = -1,
505	Color_fg = 0,	588	Color_fg = 0,
506	Color_bg,	589	Color_bg,
507	minCOLOR, /* 2 */	590	minCOLOR, /* 2 */
508	Color_Black = minCOLOR,	591	Color_Black = minCOLOR,
509	Color_Red3,	592	Color_Red3,
…		…
551	#endif	634	#endif
552	#ifdef KEEP_SCROLLCOLOR	635	#ifdef KEEP_SCROLLCOLOR
553	Color_scroll,	636	Color_scroll,
554	Color_trough,	637	Color_trough,
555	#endif	638	#endif
556	#if TINTING	639	#if ENABLE_TRANSPARENCY
557	Color_tint,	640	Color_tint,
558	#endif	641	#endif
559	#if OFF_FOCUS_FADING	642	#if OFF_FOCUS_FADING
560	Color_fade,	643	Color_fade,
561	#endif	644	#endif
…		…
568	TOTAL_COLORS = NRS_COLORS	651	TOTAL_COLORS = NRS_COLORS
569	#endif	652	#endif
570	};	653	};
571		654
572	#define Color_Bits 7 // 0 .. maxTermCOLOR	655	#define Color_Bits 7 // 0 .. maxTermCOLOR
573
574	#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
575	#define NPIXCLR_BITS 32
576		656
577	/*	657	/*
578	* Resource list	658	* Resource list
579	*/	659	*/
580	enum {	660	enum {
…		…
582	# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,	662	# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
583	# include "rsinc.h"	663	# include "rsinc.h"
584	# undef def	664	# undef def
585	# undef reserve	665	# undef reserve
586	NUM_RESOURCES	666	NUM_RESOURCES
587	};
588
589	// see init.C:xa_names, which must be kept in sync
590	enum {
591	XA_TEXT = 0,
592	XA_COMPOUND_TEXT,
593	XA_UTF8_STRING,
594	XA_MULTIPLE,
595	XA_TARGETS,
596	XA_TIMESTAMP,
597	XA_VT_SELECTION,
598	XA_INCR,
599	XA_WM_PROTOCOLS,
600	XA_WM_DELETE_WINDOW,
601	XA_CLIPBOARD,
602	#if ENABLE_FRILLS
603	XA_MOTIF_WM_HINTS,
604	#endif
605	#if ENABLE_EWMH
606	XA_NET_WM_PID,
607	XA_NET_WM_NAME,
608	XA_NET_WM_ICON_NAME,
609	XA_NET_WM_PING,
610	#endif
611	#if USE_XIM
612	XA_WM_LOCALE_NAME,
613	#endif
614	#if TRANSPARENT
615	XA_XROOTPMAP_ID,
616	XA_ESETROOT_PMAP_ID,
617	#endif
618	#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
619	XA_DNDPROTOCOL,
620	XA_DNDSELECTION,
621	#endif
622	#if ENABLE_XEMBED
623	XA_XEMBED,
624	XA_XEMBED_INFO,
625	#endif
626	NUM_XA
627	};	667	};
628		668
629	/* DEC private modes */	669	/* DEC private modes */
630	#define PrivMode_132 (1UL<<0)	670	#define PrivMode_132 (1UL<<0)
631	#define PrivMode_132OK (1UL<<1)	671	#define PrivMode_132OK (1UL<<1)
…		…
640	#define PrivMode_ShiftKeys (1UL<<10)	680	#define PrivMode_ShiftKeys (1UL<<10)
641	#define PrivMode_VisibleCursor (1UL<<11)	681	#define PrivMode_VisibleCursor (1UL<<11)
642	#define PrivMode_MouseX10 (1UL<<12)	682	#define PrivMode_MouseX10 (1UL<<12)
643	#define PrivMode_MouseX11 (1UL<<13)	683	#define PrivMode_MouseX11 (1UL<<13)
644	#define PrivMode_scrollBar (1UL<<14)	684	#define PrivMode_scrollBar (1UL<<14)
645	#define PrivMode_menuBar (1UL<<15)
646	#define PrivMode_TtyOutputInh (1UL<<16)	685	#define PrivMode_TtyOutputInh (1UL<<15)
647	#define PrivMode_Keypress (1UL<<17)	686	#define PrivMode_Keypress (1UL<<16)
648	#define PrivMode_smoothScroll (1UL<<18)	687	#define PrivMode_smoothScroll (1UL<<17)
649	#define PrivMode_vt52 (1UL<<19)	688	#define PrivMode_vt52 (1UL<<18)
650	#define PrivMode_LFNL (1UL<<20)	689	#define PrivMode_LFNL (1UL<<19)
651	/* too annoying to implement X11 highlight tracking */	690	/* too annoying to implement X11 highlight tracking */
652	/* #define PrivMode_MouseX11Track (1LU<<21) */	691	/* #define PrivMode_MouseX11Track (1LU<<20) */
653		692
654	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)	693	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)
655	#define PrivMode(test,bit) \	694	#define PrivMode(test,bit) \
656	if (test) \	695	if (test) \
657	priv_modes \|= (bit); \	696	priv_modes \|= (bit); \
…		…
704	/*	743	/*
705	*****************************************************************************	744	*****************************************************************************
706	* MACRO DEFINES	745	* MACRO DEFINES
707	*****************************************************************************	746	*****************************************************************************
708	*/	747	*/
709	#define dDisp Display *disp = display->display	748	#define dLocal(type,name) type const name = this->name
		749
		750	// for speed reasons, we assume that all codepoints 32 to 126 are
		751	// single-width.
		752	#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
710		753
711	/* convert pixel dimensions to row/column values. Everything as int32_t */	754	/* convert pixel dimensions to row/column values. Everything as int32_t */
712	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	755	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	756	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)	757	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
…		…
716	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	759	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
717	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	760	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
718	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)	761	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
719	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)	762	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
720		763
721	#define OPTION(opt) (options & (opt))
722	#define DEFAULT_OPTIONS (Opt_scrollBar \| Opt_scrollTtyOutput \
723	\| Opt_jumpScroll \| Opt_secondaryScreen \
724	\| Opt_pastableTabs \| Opt_intensityStyles)
725
726	// for m >= -n, ensure remainder lies between 0..n-1	764	// for m >= -n, ensure remainder lies between 0..n-1
727	#define MOD(m,n) (((m) + (n)) % (n))	765	#define MOD(m,n) (((m) + (n)) % (n))
728		766
729	#define LINENO(n) MOD (term_start + int(n), total_rows)	767	#define LINENO(n) MOD (term_start + int(n), total_rows)
730	#define ROW(n) row_buf [LINENO (n)]	768	#define ROW(n) row_buf [LINENO (n)]
…		…
748	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg)<<Color_Bits))	786	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg)<<Color_Bits))
749	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))	787	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))
750		788
751	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))	789	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752		790
753	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))	791	#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))	792	#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755		793
756	#if ENABLE_STYLES	794	#if ENABLE_STYLES
757	# define FONTSET(style) fontset[GET_STYLE (style)]	795	# define FONTSET(style) fontset[GET_STYLE (style)]
758	#else	796	#else
759	# define FONTSET(style) fontset[0]	797	# define FONTSET(style) fontset[0]
…		…
787	#define scrollbar_below_slider(y) ((y) > scrollBar.bot)	825	#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788	#define scrollbar_position(y) ((y) - scrollBar.beg)	826	#define scrollbar_position(y) ((y) - scrollBar.beg)
789	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	827	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790	- scrollbar_minheight ())	828	- scrollbar_minheight ())
791		829
792	#if (MENUBAR_MAX > 1)
793	/* rendition style flags */
794	# define menuBar_height() (fheight + MENU_SHADOW)
795	# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
796	# define isMenuBarWindow(w) ((w) == menuBar.win)
797	#else
798	# define menuBar_height() (0)
799	# define menuBar_TotalHeight() (0)
800	# define isMenuBarWindow(w) (0)
801	#endif
802
803	#ifdef XPM_BACKGROUND
804	# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
805	#else
806	# define XPMClearArea(a, b, c, d, e, f, g)
807	#endif
808
809	#ifdef UTMP_SUPPORT
810	# if !defined(RXVT_UTMPX_FILE) \|\| !defined(HAVE_STRUCT_UTMPX)
811	# undef HAVE_UTMPX_H
812	# undef HAVE_STRUCT_UTMPX
813	# endif
814	# if !defined(RXVT_UTMP_FILE) \|\| !defined(HAVE_STRUCT_UTMP)
815	# undef HAVE_UTMP_H
816	# undef HAVE_STRUCT_UTMP
817	# endif
818
819	# ifdef HAVE_UTMPX_H
820	# include <utmpx.h>
821	# endif
822	# ifdef HAVE_UTMP_H
823	# include <utmp.h>
824	# endif
825	#endif
826
827	#ifdef DEBUG_CMD
828	# define D_CMD(x) fprintf x ; fputc('\n', stderr)
829	#else
830	# define D_CMD(x)
831	#endif
832	#ifdef DEBUG_INIT
833	# define D_INIT(x) fprintf x ; fputc('\n', stderr)
834	#else
835	# define D_INIT(x)
836	#endif
837	#ifdef DEBUG_MAIN
838	# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
839	#else
840	# define D_MAIN(x)
841	#endif
842	#ifdef DEBUG_SIZE
843	# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
844	#else
845	# define D_SIZE(x)
846	#endif
847
848	extern class rxvt_failure_exception { } rxvt_failure_exception;
849
850	typedef callback1<void, const char *> log_callback;	830	typedef callback<void (const char *)> log_callback;
851	typedef callback1<int, int> getfd_callback;	831	typedef callback<int (int)> getfd_callback;
852
853	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
854	extern void rxvt_log (const char *fmt, ...);
855	extern void rxvt_warn (const char *fmt, ...);
856	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
857	extern void rxvt_exit_failure () __attribute__ ((noreturn));
858		832
859	#define SET_LOCALE(locale) rxvt_set_locale (locale)	833	#define SET_LOCALE(locale) rxvt_set_locale (locale)
860	extern bool rxvt_set_locale (const char *locale);	834	extern bool rxvt_set_locale (const char *locale) NOTHROW;
861	extern void rxvt_push_locale (const char *locale);	835	extern void rxvt_push_locale (const char *locale) NOTHROW;
862	extern void rxvt_pop_locale ();	836	extern void rxvt_pop_locale () NOTHROW;
863
864	/****************************************************************************/
865
866	#ifdef MENUBAR
867	# include "menubar.h"
868	#endif
869
870	#define BLINK_INTERVAL 0.5
871	#define TEXT_BLINK_INTERVAL 0.5
872
873	#ifndef __attribute__
874	# ifdef __GNUC__
875	# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) \|\| (__GNUC__ < 2)
876	# define __attribute__(x)
877	# endif
878	# endif
879	# define __attribute__(x)
880	#endif
881		837
882	/****************************************************************************/	838	/****************************************************************************/
883		839
884	#define LINE_LONGER 0x0001 // line is continued on the next row	840	#define LINE_LONGER 0x0001 // line is continued on the next row
885	#define LINE_FILTERED 0x0002 // line has been filtered	841	#define LINE_FILTERED 0x0002 // line has been filtered
886	#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)	842	#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
		843	#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
		844	#define LINE_BIDI 0x0010 // line needs bidi (NYI)
887		845
888	struct line_t {	846	struct line_t {
889	text_t *t; // terminal the text	847	text_t *t; // terminal the text
890	rend_t *r; // rendition, uses RS_ flags	848	rend_t *r; // rendition, uses RS_ flags
891	tlen_t_ l; // length of each text line, LINE_CONT == continued on next line	849	tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
…		…
945	# define COMPOSE_LO 0x40000000UL	903	# define COMPOSE_LO 0x40000000UL
946	# define COMPOSE_HI 0x400fffffUL	904	# define COMPOSE_HI 0x400fffffUL
947	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)	905	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
948	#else	906	#else
949	# if ENABLE_PERL	907	# if ENABLE_PERL
950	# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates	908	# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
951	# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only	909	# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
952	# else	910	# else
953	# define COMPOSE_LO 0xd800UL	911	# define COMPOSE_LO 0xd800UL
954	# define COMPOSE_HI 0xf8ffUL	912	# define COMPOSE_HI 0xf8ffUL
955	# endif	913	# endif
…		…
984	#endif	942	#endif
985		943
986	/****************************************************************************/	944	/****************************************************************************/
987		945
988	#ifdef KEYSYM_RESOURCE	946	#ifdef KEYSYM_RESOURCE
989	class keyboard_manager;	947	class keyboard_manager;
990	#endif	948	#endif
991		949
992	struct rxvt_term : zero_initialized, rxvt_vars {	950	struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
		951
		952	// special markers with magic addresses
		953	static const char resval_undef []; // options specifically unset
		954	static const char resval_on []; // boolean options switched on
		955	static const char resval_off []; // or off
		956
993	log_callback *log_hook; // log error messages through this hook, if != 0	957	log_callback *log_hook; // log error messages through this hook, if != 0
994	getfd_callback *getfd_hook; // convert remote to local fd, if != 0	958	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
995	#if ENABLE_PERL	959	#if ENABLE_PERL
996	rxvt_perl_term perl;	960	rxvt_perl_term perl;
997	#endif	961	#endif
998	struct mbstate mbstate; // current input multibyte state	962	struct mbstate mbstate; // current input multibyte state
999		963
1000	unsigned char want_refresh:1,	964	unsigned char want_refresh:1,
1001	#ifdef TRANSPARENT	965	#ifdef ENABLE_TRANSPARENCY
1002	want_full_refresh:1, /* awaiting full screen refresh */	966	want_full_refresh:1, /* awaiting full screen refresh */
1003	#endif
1004	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
1005	am_transparent:1, /* is a transparent term */	967	am_transparent:1, /* is a transparent term */
1006	am_pixmap_trans:1, /* transparency w/known root pixmap */	968	am_pixmap_trans:1, /* transparency w/known root pixmap */
1007	#endif	969	#endif
1008	current_screen:1, /* primary or secondary */	970	current_screen:1, /* primary or secondary */
1009	hate_those_clicks:1, /* a.k.a. keep mark position */
1010	num_scr_allow:1,	971	num_scr_allow:1,
1011	bypass_keystate:1,	972	bypass_keystate:1,
1012	#ifdef CURSOR_BLINK	973	#ifdef CURSOR_BLINK
1013	hidden_cursor:1,	974	hidden_cursor:1,
1014	#endif	975	#endif
…		…
1029	#endif	990	#endif
1030	scrollbar_align,	991	scrollbar_align,
1031	selection_wait,	992	selection_wait,
1032	selection_type;	993	selection_type;
1033	/* ---------- */	994	/* ---------- */
		995	bool rvideo_state, rvideo_mode;
		996	#ifndef NO_BELL
1034	short rvideo;	997	bool rvideo_bell;
		998	#endif
1035	int num_scr; /* screen: number lines scrolled */	999	int num_scr; /* screen: number lines scrolled */
1036	int prev_ncol, /* screen: previous number of columns */	1000	int prev_ncol, /* screen: previous number of columns */
1037	prev_nrow; /* screen: previous number of rows */	1001	prev_nrow; /* screen: previous number of rows */
1038	/* ---------- */	1002	/* ---------- */
1039	rend_t rstyle;	1003	rend_t rstyle;
1040	/* ---------- */
1041	uint32_t pixcolor_set[NPIXCLR_SETS];
1042	/* ---------- */	1004	/* ---------- */
1043	#ifdef SELECTION_SCROLLING	1005	#ifdef SELECTION_SCROLLING
1044	int scroll_selection_lines;	1006	int scroll_selection_lines;
1045	enum page_dirn scroll_selection_dir;	1007	enum page_dirn scroll_selection_dir;
1046	int selection_save_x,	1008	int selection_save_x,
…		…
1052	/* give proper Scroll behaviour */	1014	/* give proper Scroll behaviour */
1053	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1015	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1054	mouse_slip_wheel_speed,	1016	mouse_slip_wheel_speed,
1055	#endif	1017	#endif
1056	refresh_count,	1018	refresh_count,
1057	refresh_limit,
1058	last_bot, /* scrollbar last bottom position */	1019	last_bot, /* scrollbar last bottom position */
1059	last_top, /* scrollbar last top position */	1020	last_top, /* scrollbar last top position */
1060	last_state, /* scrollbar last state */	1021	last_state, /* scrollbar last state */
1061	scrollbar_len,	1022	scrollbar_len,
1062	#ifdef MENUBAR
1063	menu_readonly, /* okay to alter menu? */
1064	Arrows_x,
1065	#endif
1066	#if MENUBAR_MAX > 1
1067	Nbars,
1068	#endif
1069	window_vt_x,	1023	window_vt_x,
1070	window_vt_y,	1024	window_vt_y,
1071	window_sb_x,	1025	window_sb_x,
1072	# ifdef POINTER_BLANK	1026	# ifdef POINTER_BLANK
1073	pointerBlankDelay,	1027	pointerBlankDelay,
…		…
1080	int old_width, /* last used width in screen resize */	1034	int old_width, /* last used width in screen resize */
1081	old_height; /* last used height in screen resize */	1035	old_height; /* last used height in screen resize */
1082	unsigned long priv_modes,	1036	unsigned long priv_modes,
1083	SavedModes;	1037	SavedModes;
1084	/* ---------- */	1038	/* ---------- */
1085	Atom xa[NUM_XA];	1039	Atom *xa;
1086	/* ---------- */	1040	/* ---------- */
1087	#ifdef MENUBAR	1041	#ifdef RXVT_SCROLLBAR
1088	GC menubarGC;
1089	#endif
1090	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1091	GC scrollbarGC,	1042	GC scrollbarGC,
1092	topShadowGC,	1043	topShadowGC,
1093	botShadowGC;	1044	botShadowGC;
1094	#endif	1045	#endif
1095	#ifdef XTERM_SCROLLBAR	1046	#ifdef XTERM_SCROLLBAR
…		…
1127	const char *key_delete;	1078	const char *key_delete;
1128	#endif	1079	#endif
1129	struct mouse_event MEvent;	1080	struct mouse_event MEvent;
1130	XComposeStatus compose;	1081	XComposeStatus compose;
1131	ttymode_t tio;	1082	ttymode_t tio;
1132	#ifdef UTMP_SUPPORT
1133	# ifdef HAVE_STRUCT_UTMP
1134	struct utmp ut;
1135	# endif
1136	# ifdef HAVE_STRUCT_UTMPX
1137	struct utmpx utx;
1138	# endif
1139	# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) \|\| defined(HAVE_STRUCT_UTMPX)
1140	char ut_id[5];
1141	# endif
1142	int utmp_pos;
1143	#endif
1144	row_col_t oldcursor;	1083	row_col_t oldcursor;
1145	#ifdef XPM_BACKGROUND	1084	#ifdef HAVE_BG_PIXMAP
1146	bgPixmap_t bgPixmap;	1085	bgPixmap_t bgPixmap;
1147	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1148	#endif	1086	#endif
1149	#ifdef MENUBAR	1087	#ifdef HAVE_AFTERIMAGE
1150	menu_t ActiveMenu, / currently active menu */	1088	ASVisual *asv;
1151	BuildMenu; / the menu currently being built */	1089	ASImageManager *asimman;
1152	bar_t *CurrentBar;
1153	# if ! (MENUBAR_MAX > 1)
1154	bar_t BarList;
1155	# endif /* (MENUBAR_MAX > 1) */
1156	#endif	1090	#endif
1157		1091
1158	#if ENABLE_OVERLAY	1092	#if ENABLE_OVERLAY
1159	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions	1093	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1160	text_t **ov_text;	1094	text_t **ov_text;
1161	rend_t **ov_rend;	1095	rend_t **ov_rend;
1162		1096
1163	void scr_swap_overlay ();	1097	void scr_swap_overlay () NOTHROW;
1164	void scr_overlay_new (int x, int y, int w, int h);	1098	void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1165	void scr_overlay_off ();	1099	void scr_overlay_off () NOTHROW;
1166	void scr_overlay_set (int x, int y,	1100	void scr_overlay_set (int x, int y,
1167	text_t text,	1101	text_t text,
1168	rend_t rend = OVERLAY_RSTYLE);	1102	rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1169	void scr_overlay_set (int x, int y, const char *s);	1103	void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1170	void scr_overlay_set (int x, int y, const wchar_t *s);	1104	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1171	#endif	1105	#endif
1172		1106
1173	vector<void *> allocated; // free these memory blocks with free()	1107	vector<void *> allocated; // free these memory blocks with free()
1174		1108
1175	char env_windowid; / environmental variable WINDOWID */	1109	char env_windowid[21]; /* environmental variable WINDOWID */
		1110	char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1176	char env_display; / environmental variable DISPLAY */	1111	char env_display; / environmental variable DISPLAY */
1177	char env_term; / environmental variable TERM */	1112	char env_term; / environmental variable TERM */
1178	char *env_colorfgbg;	1113
1179	char *locale;	1114	char *locale;
1180	char charsets[4];	1115	char charsets[4];
1181	char v_buffer; / pointer to physical buffer */	1116	char v_buffer; / pointer to physical buffer */
1182	unsigned int v_buflen; /* size of area to write */	1117	unsigned int v_buflen; /* size of area to write */
1183	stringvec argv, envv; /* if != 0, will be freed on destroy time */	1118	stringvec argv, envv; /* if != 0, will be freed at destroy time */
1184		1119
1185	#ifdef KEYSYM_RESOURCE	1120	#ifdef KEYSYM_RESOURCE
1186	keyboard_manager *keyboard;	1121	keyboard_manager *keyboard;
1187	#endif	1122	#endif
1188		1123
1189	const char *rs[NUM_RESOURCES];	1124	const char *rs[NUM_RESOURCES];
1190	/* command input buffering */	1125	/* command input buffering */
1191	char cmdbuf_ptr, cmdbuf_endp;	1126	char cmdbuf_ptr, cmdbuf_endp;
1192	char cmdbuf_base[CBUFSIZ];	1127	char cmdbuf_base[CBUFSIZ];
		1128
		1129	ptytty *pty;
1193		1130
1194	rxvt_salloc *talloc; // text line allocator	1131	rxvt_salloc *talloc; // text line allocator
1195	rxvt_salloc *ralloc; // rend line allocator	1132	rxvt_salloc *ralloc; // rend line allocator
1196		1133
1197	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1134	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
…		…
1206	void iso14755_54 (int x, int y);	1143	void iso14755_54 (int x, int y);
1207	# endif	1144	# endif
1208	#endif	1145	#endif
1209		1146
1210	// modifies first argument(!)	1147	// modifies first argument(!)
1211	void paste (char *data, unsigned int len);	1148	void paste (char *data, unsigned int len) NOTHROW;
1212		1149
1213	void flush ();	1150	long vt_emask, vt_emask_perl, vt_emask_xim;
1214		1151
1215	#if TRANSPARENT	1152	void vt_select_input () const NOTHROW
		1153	{
		1154	XSelectInput (dpy, vt, vt_emask \| vt_emask_perl \| vt_emask_xim);
		1155	}
		1156
		1157	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1216	void rootwin_cb (XEvent &xev);	1158	void rootwin_cb (XEvent &xev);
1217	xevent_watcher rootwin_ev;	1159	xevent_watcher rootwin_ev;
1218	#endif	1160	#endif
		1161	#if ENABLE_TRANSPARENCY
		1162	int check_our_parents ();
		1163	void check_our_parents_cb (time_watcher &w);
		1164	time_watcher check_our_parents_ev;
		1165	#endif
1219		1166
1220	void x_cb (XEvent &xev);	1167	void x_cb (XEvent &xev);
		1168	void flush ();
1221	xevent_watcher termwin_ev;	1169	xevent_watcher termwin_ev;
1222	xevent_watcher vt_ev;	1170	xevent_watcher vt_ev;
1223	#ifdef HAVE_SCROLLBARS	1171	#ifdef HAVE_SCROLLBARS
1224	xevent_watcher scrollbar_ev;	1172	xevent_watcher scrollbar_ev;
1225	#endif	1173	#endif
1226	#ifdef MENUBAR
1227	xevent_watcher menubar_ev;
1228	#endif
1229		1174
		1175	void child_cb (child_watcher &w, int status); child_watcher child_ev;
1230	void check_cb (check_watcher &w); check_watcher check_ev;	1176	void check_cb (check_watcher &w); check_watcher check_ev;
1231	void destroy_cb (time_watcher &w); time_watcher destroy_ev;	1177	void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1232	void flush_cb (time_watcher &w); time_watcher flush_ev;	1178	void flush_cb (time_watcher &w); time_watcher flush_ev;
1233
1234	void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;	1179	void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1235
1236	void incr_cb (time_watcher &w); time_watcher incr_ev;	1180	void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1237		1181
1238	#ifdef CURSOR_BLINK	1182	#ifdef CURSOR_BLINK
1239	void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;	1183	void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1240	#endif	1184	#endif
1241	#ifdef TEXT_BLINK	1185	#ifdef TEXT_BLINK
1242	void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;	1186	void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
		1187	#endif
		1188	#ifndef NO_BELL
		1189	void bell_cb (time_watcher &w); time_watcher bell_ev;
1243	#endif	1190	#endif
1244		1191
1245	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1192	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1246	void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;	1193	void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1247	#endif	1194	#endif
…		…
1264		1211
1265	void tt_winch ();	1212	void tt_winch ();
1266		1213
1267	rxvt_term ();	1214	rxvt_term ();
1268	~rxvt_term ();	1215	~rxvt_term ();
1269	void child_exit (); // child has exited, usually destroys
1270	void destroy ();	1216	void destroy ();
1271	void emergency_cleanup ();	1217	void emergency_cleanup ();
1272		1218
1273	bool init (int argc, const char const argv);	1219	bool init (int argc, const char const argv, stringvec *envv);
		1220
		1221	bool init (stringvec argv, stringvec envv)
		1222	{
		1223	this->argv = argv;
		1224	return init (argv->size (), argv->begin (), envv);
		1225	}
		1226
1274	bool init_vars ();	1227	bool init_vars ();
1275		1228
1276	bool pty_fill ();	1229	bool pty_fill ();
		1230
		1231	void make_current () const // make this the "currently active" urxvt instance
		1232	{
		1233	SET_R (this);
		1234	set_environ (envv);
		1235	rxvt_set_locale (locale);
		1236	}
1277		1237
1278	void init_secondary ();	1238	void init_secondary ();
1279	const char *init_resources (int argc, const char const *argv);	1239	const char *init_resources (int argc, const char const *argv);
1280	const char x_resource (const char name);	1240	const char x_resource (const char name);
1281	void init_env ();	1241	void init_env ();
…		…
1290	void create_windows (int argc, const char const argv);	1250	void create_windows (int argc, const char const argv);
1291	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);	1251	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1292	void window_calc (unsigned int newwidth, unsigned int newheight);	1252	void window_calc (unsigned int newwidth, unsigned int newheight);
1293		1253
1294	#if USE_XIM	1254	#if USE_XIM
1295	rxvt_xim *input_method;	1255	rxvt_xim *input_method;
1296	XIC Input_Context;	1256	XIC Input_Context;
1297	XIMStyle input_style;	1257	XIMStyle input_style;
1298	XPoint spot; // most recently sent spot position	1258	XPoint spot; // most recently sent spot position
1299		1259
1300	void im_destroy ();	1260	void im_destroy ();
1301	void im_cb (); im_watcher im_ev;	1261	void im_cb (); im_watcher im_ev;
1302	void im_set_size (XRectangle &size);	1262	void im_set_size (XRectangle &size);
1303	void im_set_position (XPoint &pos);	1263	void im_set_position (XPoint &pos) NOTHROW;
1304	void im_set_color (unsigned long &fg, unsigned long &bg);	1264	void im_set_color (unsigned long &fg, unsigned long &bg);
1305	void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);	1265	void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1306		1266
1307	bool IMisRunning ();	1267	bool IMisRunning ();
1308	void IMSendSpot ();	1268	void IMSendSpot ();
1309	bool IM_get_IC (const char *modifiers);	1269	bool IM_get_IC (const char *modifiers);
1310	void IMSetStatusPosition ();	1270	void IMSetPosition ();
1311	#endif	1271	#endif
1312		1272
1313	void resize_scrollbar ();	1273	void resize_scrollbar ();
1314		1274
1315	void pixel_position (int x, int y);
1316
1317	void selection_click (int clicks, int x, int y);
1318	void selection_extend (int x, int y, int flag);
1319	void selection_rotate (int x, int y);
1320
1321	/* autoconvert */
1322
1323	// command.C	1275	// command.C
1324	void lookup_key (XKeyEvent &ev);	1276	void key_press (XKeyEvent &ev);
		1277	void key_release (XKeyEvent &ev);
1325	unsigned int cmd_write (const char *str, unsigned int count);	1278	unsigned int cmd_write (const char *str, unsigned int count);
1326		1279
1327	wchar_t next_char ();	1280	wchar_t next_char () NOTHROW;
1328	wchar_t cmd_getc ();	1281	wchar_t cmd_getc () THROW ((class out_of_input));
1329	uint32_t next_octet ();	1282	uint32_t next_octet () NOTHROW;
1330	uint32_t cmd_get8 ();	1283	uint32_t cmd_get8 () THROW ((class out_of_input));
1331		1284
1332	bool cmd_parse ();	1285	bool cmd_parse ();
1333	void mouse_report (XButtonEvent &ev);	1286	void mouse_report (XButtonEvent &ev);
1334	void button_press (XButtonEvent &ev);	1287	void button_press (XButtonEvent &ev);
1335	void button_release (XButtonEvent &ev);	1288	void button_release (XButtonEvent &ev);
1336	void focus_in ();	1289	void focus_in ();
1337	void focus_out ();	1290	void focus_out ();
1338	int check_our_parents ();	1291	void update_fade_color (unsigned int idx);
1339	#ifdef PRINTPIPE	1292	#ifdef PRINTPIPE
1340	FILE *popen_printer ();	1293	FILE *popen_printer ();
1341	int pclose_printer (FILE *stream);	1294	int pclose_printer (FILE *stream);
1342	#endif	1295	#endif
1343	void process_print_pipe ();	1296	void process_print_pipe ();
…		…
1356	void process_sgr_mode (unsigned int nargs, const int *arg);	1309	void process_sgr_mode (unsigned int nargs, const int *arg);
1357	void process_graphics ();	1310	void process_graphics ();
1358	// init.C	1311	// init.C
1359	void Get_Colours ();	1312	void Get_Colours ();
1360	void get_ourmods ();	1313	void get_ourmods ();
1361	// logging.C
1362	void makeutent (const char pty, const char hostname);
1363	void cleanutent ();
1364	// main.C	1314	// main.C
1365	void privileged_utmp (rxvt_privaction action);
1366	bool set_fonts ();	1315	bool set_fonts ();
1367	void set_string_property (Atom prop, const char *str, int len = -1);	1316	void set_string_property (Atom prop, const char *str, int len = -1);
1368	void set_utf8_property (Atom prop, const char *str, int len = -1);	1317	void set_utf8_property (Atom prop, const char *str, int len = -1);
1369	void set_title (const char *str);	1318	void set_title (const char *str);
1370	void set_icon_name (const char *str);	1319	void set_icon_name (const char *str);
1371	void set_window_color (int idx, const char *color);	1320	void set_window_color (int idx, const char *color);
1372	void set_colorfgbg ();	1321	void set_colorfgbg ();
1373	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1322	bool set_color (rxvt_color &color, const char *name);
		1323	void alias_color (int dst, int src);
1374	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1324	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1375		1325
1376	#ifdef MENUBAR
1377	// menubar.C
1378	void menuitem_free (menu_t menu, menuitem_t item);
1379	int action_dispatch (action_t *action);
1380	void menuarrow_free (char name);
1381	void menuarrow_add (char *string);
1382	char menu_find_base (menu_t menu, char path);
1383	menu_t menu_delete (menu_t menu);
1384	menu_t menu_add (menu_t parent, char *path);
1385	void drawbox_menubar (int x, int len, int state);
1386	void drawtriangle (int x, int y, int state);
1387	void drawbox_menuitem (int y, int state);
1388	void menu_show ();
1389	void menu_display (void (rxvt_term::*update) ());
1390	void menu_hide_all ();
1391	void menu_hide ();
1392	void menu_clear (menu_t *menu);
1393	void menubar_clear ();
1394	bar_t menubar_find (const char name);
1395	int menubar_push (const char *name);
1396	void menubar_remove (const char *name);
1397	void menubar_dump (FILE *fp);
1398	void menubar_read (const char *filename);
1399	void menubar_dispatch (char *str);
1400	void draw_Arrows (int name, int state);
1401	void menubar_expose ();
1402	int menubar_mapping (int map);
1403	int menu_select (XButtonEvent &ev);
1404	void menubar_select (XButtonEvent &ev);
1405	void menubar_control (XButtonEvent &ev);
1406	void map_menuBar (int map);
1407	#endif
1408
1409	// screen.C	1326	// screen.C
1410		1327
1411	void lalloc (line_t &l)	1328	void lalloc (line_t &l) const
1412	{	1329	{
1413	l.t = (text_t *)talloc->alloc ();	1330	l.t = (text_t *)talloc->alloc ();
1414	l.r = (rend_t *)ralloc->alloc ();	1331	l.r = (rend_t *)ralloc->alloc ();
1415	}	1332	}
1416		1333
…		…
1420	talloc->free (l.t);	1337	talloc->free (l.t);
1421	ralloc->free (l.r);	1338	ralloc->free (l.r);
1422	}	1339	}
1423	#endif	1340	#endif
1424		1341
1425	void lresize (line_t &l)	1342	void lresize (line_t &l) const
1426	{	1343	{
1427	if (!l.t)	1344	if (!l.t)
1428	return;	1345	return;
1429		1346
1430	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));	1347	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
…		…
1434		1351
1435	if (ncol > prev_ncol)	1352	if (ncol > prev_ncol)
1436	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);	1353	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1437	}	1354	}
1438		1355
1439	int fgcolor_of (rend_t r)	1356	int fgcolor_of (rend_t r) const NOTHROW
1440	{	1357	{
1441	int base = GET_BASEFG (r);	1358	int base = GET_BASEFG (r);
1442	#ifndef NO_BRIGHTCOLOR	1359	#ifndef NO_BRIGHTCOLOR
1443	if (r & RS_Bold	1360	if (r & RS_Bold
1444	# if ENABLE_STYLES	1361	# if ENABLE_STYLES
1445	&& OPTION (Opt_intensityStyles)	1362	&& option (Opt_intensityStyles)
1446	# endif	1363	# endif
1447	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))	1364	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1448	base += minBrightCOLOR - minCOLOR;	1365	base += minBrightCOLOR - minCOLOR;
1449	#endif	1366	#endif
1450	return base;	1367	return base;
1451	}	1368	}
1452		1369
1453	int bgcolor_of (rend_t r)	1370	int bgcolor_of (rend_t r) const NOTHROW
1454	{	1371	{
1455	int base = GET_BASEBG (r);	1372	int base = GET_BASEBG (r);
1456	#ifndef NO_BRIGHTCOLOR	1373	#ifndef NO_BRIGHTCOLOR
1457	if (r & RS_Blink	1374	if (r & RS_Blink
1458	# if ENABLE_STYLES	1375	# if ENABLE_STYLES
1459	&& OPTION (Opt_intensityStyles)	1376	&& option (Opt_intensityStyles)
1460	# endif	1377	# endif
1461	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))	1378	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1462	base += minBrightCOLOR - minCOLOR;	1379	base += minBrightCOLOR - minCOLOR;
1463	#endif	1380	#endif
1464	return base;	1381	return base;
1465	}	1382	}
1466		1383
1467	bool option (uint32_t opt)	1384	bool option (uint8_t opt) const NOTHROW
1468	{	1385	{
1469	return OPTION (opt);	1386	return options[opt >> 3] & (1 << (opt & 7));
1470	}	1387	}
1471		1388
1472	void set_option (uint32_t opt, bool set)	1389	void set_option (uint8_t opt, bool set = true) NOTHROW
1473	{	1390	{
1474	if (set)	1391	if (set)
1475	options \|= opt;	1392	options[opt >> 3] \|= (1 << (opt & 7));
1476	else	1393	else
1477	options &= ~opt;	1394	options[opt >> 3] &= ~(1 << (opt & 7));
1478	}	1395	}
1479		1396
1480	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);	1397	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1481	void scr_blank_screen_mem (line_t &l, rend_t efs);	1398	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1482	int scr_scroll_text (int row1, int row2, int count);	1399	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1483	void scr_reset ();	1400	void scr_reset ();
1484	void scr_release ();	1401	void scr_release () NOTHROW;
1485	void scr_clear (bool really = false);	1402	void scr_clear (bool really = false) NOTHROW;
1486	void scr_refresh (unsigned char refresh_type);	1403	void scr_refresh () NOTHROW;
1487	bool scr_refresh_rend (rend_t mask, rend_t value);	1404	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1488	void scr_erase_screen (int mode);	1405	void scr_erase_screen (int mode) NOTHROW;
1489	#if ENABLE_FRILLS	1406	#if ENABLE_FRILLS
1490	void scr_erase_savelines ();	1407	void scr_erase_savelines () NOTHROW;
1491	void scr_backindex ();	1408	void scr_backindex () NOTHROW;
1492	void scr_forwardindex ();	1409	void scr_forwardindex () NOTHROW;
1493	#endif	1410	#endif
1494	void scr_touch (bool refresh);	1411	void scr_touch (bool refresh) NOTHROW;
1495	void scr_expose (int x, int y, int width, int height, bool refresh);	1412	void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1496	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1413	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1497	void scr_recolour ();	1414	void scr_recolour () NOTHROW;
1498	void scr_remap_chars ();	1415	void scr_remap_chars () NOTHROW;
1499	void scr_remap_chars (line_t &l);	1416	void scr_remap_chars (line_t &l) NOTHROW;
		1417
		1418	enum cursor_mode { SAVE, RESTORE };
1500		1419
1501	void scr_poweron ();	1420	void scr_poweron ();
1502	void scr_cursor (int mode);	1421	void scr_cursor (cursor_mode mode) NOTHROW;
1503	void scr_do_wrap ();	1422	void scr_do_wrap () NOTHROW;
		1423	void scr_swap_screen () NOTHROW;
1504	int scr_change_screen (int scrn);	1424	void scr_change_screen (int scrn);
1505	void scr_color (unsigned int color, int fgbg);	1425	void scr_color (unsigned int color, int fgbg) NOTHROW;
1506	void scr_rendition (int set, int style);	1426	void scr_rendition (int set, int style) NOTHROW;
1507	void scr_add_lines (const wchar_t *str, int len, int minlines = 0);	1427	void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1508	void scr_backspace ();	1428	void scr_backspace () NOTHROW;
1509	void scr_tab (int count, bool ht = false);	1429	void scr_tab (int count, bool ht = false) NOTHROW;
1510	void scr_gotorc (int row, int col, int relative);	1430	void scr_gotorc (int row, int col, int relative) NOTHROW;
1511	void scr_index (enum page_dirn direction);	1431	void scr_index (enum page_dirn direction) NOTHROW;
1512	void scr_erase_line (int mode);	1432	void scr_erase_line (int mode) NOTHROW;
1513	void scr_E ();	1433	void scr_E () NOTHROW;
1514	void scr_insdel_lines (int count, int insdel);	1434	void scr_insdel_lines (int count, int insdel) NOTHROW;
1515	void scr_insdel_chars (int count, int insdel);	1435	void scr_insdel_chars (int count, int insdel) NOTHROW;
1516	void scr_scroll_region (int top, int bot);	1436	void scr_scroll_region (int top, int bot) NOTHROW;
1517	void scr_cursor_visible (int mode);	1437	void scr_cursor_visible (int mode) NOTHROW;
1518	void scr_autowrap (int mode);	1438	void scr_autowrap (int mode) NOTHROW;
1519	void scr_relative_origin (int mode);	1439	void scr_relative_origin (int mode) NOTHROW;
1520	void scr_insert_mode (int mode);	1440	void scr_insert_mode (int mode) NOTHROW;
1521	void scr_set_tab (int mode);	1441	void scr_set_tab (int mode) NOTHROW;
1522	void scr_rvideo_mode (int mode);	1442	void scr_rvideo_mode (bool on) NOTHROW;
1523	void scr_report_position ();	1443	void scr_report_position () NOTHROW;
1524	void set_font_style ();	1444	void set_font_style () NOTHROW;
1525	void scr_charset_choose (int set);	1445	void scr_charset_choose (int set) NOTHROW;
1526	void scr_charset_set (int set, unsigned int ch);	1446	void scr_charset_set (int set, unsigned int ch) NOTHROW;
1527	int scr_move_to (int y, int len);	1447	void scr_move_to (int y, int len) NOTHROW;
1528	int scr_page (enum page_dirn direction, int nlines);	1448	bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1529	int scr_changeview (unsigned int oldviewstart);	1449	bool scr_changeview (int new_view_start) NOTHROW;
1530	void scr_bell ();	1450	void scr_bell () NOTHROW;
1531	void scr_printscreen (int fullhist);	1451	void scr_printscreen (int fullhist) NOTHROW;
1532	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);	1452	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1533	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);	1453	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1534	void scr_reverse_selection ();	1454	void scr_reverse_selection () NOTHROW;
1535	void scr_dump (int fd);	1455	void scr_dump (int fd) NOTHROW;
		1456
1536	void selection_check (int check_more);	1457	void selection_check (int check_more) NOTHROW;
1537	void selection_paste (Window win, Atom prop, bool delete_prop);	1458	void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1538	void selection_property (Window win, Atom prop);	1459	void selection_property (Window win, Atom prop) NOTHROW;
1539	void selection_request (Time tm, int x, int y);	1460	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1540	int selection_request_other (Atom target, int selnum);	1461	int selection_request_other (Atom target, int selnum) NOTHROW;
1541	void selection_clear ();	1462	void selection_clear () NOTHROW;
1542	void selection_make (Time tm);	1463	void selection_make (Time tm);
1543	bool selection_grab (Time tm);	1464	bool selection_grab (Time tm) NOTHROW;
1544	void selection_start_colrow (int col, int row);	1465	void selection_start_colrow (int col, int row) NOTHROW;
1545	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);	1466	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW;
1546	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);	1467	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1547	void selection_remove_trailing_spaces ();	1468	void selection_remove_trailing_spaces () NOTHROW;
1548	void selection_send (const XSelectionRequestEvent &rq);	1469	void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
		1470	void selection_click (int clicks, int x, int y) NOTHROW;
		1471	void selection_extend (int x, int y, int flag) NOTHROW;
		1472	void selection_rotate (int x, int y) NOTHROW;
		1473
		1474	void pixel_position (int x, int y) NOTHROW;
1549		1475
1550	#if defined(NEXT_SCROLLBAR)	1476	#if defined(NEXT_SCROLLBAR)
1551	// scrollbar-next.C	1477	// scrollbar-next.C
1552	Pixmap renderPixmap (const char const data, int width, int height);	1478	Pixmap renderPixmap (const char const data, int width, int height);
1553	void init_scrollbar_stuff ();	1479	void init_scrollbar_stuff ();
…		…
1555	int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);	1481	int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1556	#endif	1482	#endif
1557		1483
1558	#if defined(RXVT_SCROLLBAR)	1484	#if defined(RXVT_SCROLLBAR)
1559	// scrollbar-rxvt.C	1485	// scrollbar-rxvt.C
1560	void Draw_button (int x, int y, int state, int dirn);
1561	int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);	1486	int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1562	#endif	1487	#endif
1563		1488
1564	#if defined(XTERM_SCROLLBAR)	1489	#if defined(XTERM_SCROLLBAR)
1565	// scrollbar-xterm.C	1490	// scrollbar-xterm.C
…		…
1580	void get_options (int argc, const char const argv);	1505	void get_options (int argc, const char const argv);
1581	int parse_keysym (const char str, const char arg);	1506	int parse_keysym (const char str, const char arg);
1582	void get_xdefaults (FILE stream, const char name);	1507	void get_xdefaults (FILE stream, const char name);
1583	void extract_resources ();	1508	void extract_resources ();
1584	// xpm.C	1509	// xpm.C
1585	int scale_pixmap (const char *geom);	1510	void get_window_origin (int &x, int &y);
1586	void resize_pixmap ();	1511	Pixmap get_pixmap_property (int prop_id);
1587	Pixmap set_bgPixmap (const char *file);
1588	};	1512	};
1589		1513
1590	/*	1514	/*
1591	*****************************************************************************	1515	*****************************************************************************
1592	* PROTOTYPES	1516	* PROTOTYPES
…		…
1596	# define __PROTO(p) p	1520	# define __PROTO(p) p
1597	#else	1521	#else
1598	# define __PROTO(p) ()	1522	# define __PROTO(p) ()
1599	#endif	1523	#endif
1600		1524
1601	#ifdef DEBUG_malloc
1602	# include "dmalloc.h" /* This comes last */
1603	#endif
1604
1605	#endif /* _RXVT_H_ */	1525	#endif /* _RXVT_H_ */
1606		1526

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.199 by root, Thu Jan 12 01:30:53 2006 UTC vs. Revision 1.292 by sasha, Mon Aug 13 22:41:34 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.199 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.292 by sasha, Mon Aug 13 22:41:34 2007 UTC