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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.91 by root, Fri Aug 13 18:38:23 2004 UTC vs.
Revision 1.181 by root, Mon Jan 2 17:17:02 2006 UTC

…		…
9		9
10	#include <X11/cursorfont.h>	10	#include <X11/cursorfont.h>
11	#include <X11/keysym.h>	11	#include <X11/keysym.h>
12	#include <X11/keysymdef.h>	12	#include <X11/keysymdef.h>
13	#include <X11/Xatom.h>	13	#include <X11/Xatom.h>
14	#ifndef NO_FRILLS	14	#if ENABLE_FRILLS
15	#include <X11/Xmd.h>	15	# include <X11/Xmd.h>
16	#endif	16	#endif
17		17
18	#include "encoding.h"	18	#include "encoding.h"
19	#include "defaultfont.h"
20	#include "rxvtcolor.h"	19	#include "rxvtfont.h"
		20	#include "rxvttoolkit.h"
21	#include "iom.h"	21	#include "iom.h"
22	#include "salloc.h"	22	#include "salloc.h"
		23
		24	#if ENABLE_FRILLS
		25	# define ENABLE_XEMBED 1
		26	# define ENABLE_EWMH 1
		27	# define CURSOR_BLINK 1
		28	#endif
23		29
24	/*	30	/*
25	*****************************************************************************	31	*****************************************************************************
26	* SYSTEM HACKS	32	* SYSTEM HACKS
27	*****************************************************************************	33	*****************************************************************************
28	*/	34	*/
29	/* Consistent defines - please report on the necessity	35	/* Consistent defines - please report on the necessity
30	* @ Unixware: defines (__svr4__)	36	* @ Unixware: defines (__svr4__)
31	*/	37	*/
32	#if defined (SVR4) && !defined (__svr4__)	38	#if defined (SVR4) && !defined (__svr4__)
33	# define __svr4__	39	# define __svr4__ 1
34	#endif	40	#endif
35	#if defined (sun) && !defined (__sun__)	41	#if defined (sun) && !defined (__sun__)
36	# define __sun__	42	# define __sun__ 1
37	#endif	43	#endif
38		44
39	#ifndef HAVE_XPOINTER	45	#ifndef HAVE_XPOINTER
40	typedef char *XPointer;	46	typedef char *XPointer;
41	#endif	47	#endif
…		…
66	# define STDIN_FILENO 0	72	# define STDIN_FILENO 0
67	# define STDOUT_FILENO 1	73	# define STDOUT_FILENO 1
68	# define STDERR_FILENO 2	74	# define STDERR_FILENO 2
69	#endif	75	#endif
70		76
71	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)	77	/*
72	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_PTMX)	78	*****************************************************************************
73	# define NO_SETOWNER_TTYDEV	79	* PROTOTYPES
74	# endif	80	*****************************************************************************
75	#endif	81	*/
76	#if defined(__CYGWIN32__) \|\| defined(PTYS_ARE_OPENPTY)	82	// main.C
77	# define NO_SETOWNER_TTYDEV	83	RETSIGTYPE rxvt_Child_signal (int sig);
78	#endif	84	RETSIGTYPE rxvt_Exit_signal (int sig);
		85	void rxvt_clean_exit ();
		86	void * rxvt_malloc (size_t size);
		87	void * rxvt_calloc (size_t number, size_t size);
		88	void * rxvt_realloc (void *ptr, size_t size);
		89	void rxvt_privileges (rxvt_privaction action);
		90
		91	// util.C
		92	char * rxvt_wcstombs (const wchar_t *str, int len = -1);
		93	wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
		94	char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
		95	wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
		96	char * rxvt_strdup (const char *str);
		97
		98	// misc.C
		99	char * rxvt_r_basename (const char *str);
		100	void rxvt_vlog (const char *fmt, va_list arg_ptr);
		101	void rxvt_log (const char *fmt,...);
		102	void rxvt_warn (const char *fmt,...);
		103	void rxvt_fatal (const char *fmt,...);
		104	void rxvt_exit_failure ();
		105	int rxvt_Str_match (const char s1, const char s2);
		106	const char * rxvt_Str_skip_space (const char *str);
		107	char * rxvt_Str_trim (char *str);
		108	int rxvt_Str_escaped (char *str);
		109	char ** rxvt_splitcommastring (const char *cs);
		110	void rxvt_freecommastring (char **cs);
		111	char * rxvt_File_find (const char file, const char ext, const char *path);
		112	void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
		113	void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
		114	void rxvt_usleep (int usecs);
79		115
80	/*	116	/*
81	*****************************************************************************	117	*****************************************************************************
82	* STRUCTURES AND TYPEDEFS	118	* STRUCTURES AND TYPEDEFS
83	*****************************************************************************	119	*****************************************************************************
…		…
93	#endif	129	#endif
94		130
95	/* If we're using either the rxvt scrollbar or menu bars, keep the	131	/* If we're using either the rxvt scrollbar or menu bars, keep the
96	* scrollColor resource.	132	* scrollColor resource.
97	*/	133	*/
98	#if defined(RXVT_SCROLLBAR) \|\| defined(MENUBAR)	134	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)
99	# define KEEP_SCROLLCOLOR 1	135	# define KEEP_SCROLLCOLOR 1
100	#else	136	#else
101	# undef KEEP_SCROLLCOLOR	137	# undef KEEP_SCROLLCOLOR
102	#endif	138	#endif
103		139
104	#ifdef XPM_BACKGROUND	140	#ifdef XPM_BACKGROUND
105	typedef struct {	141	typedef struct {
106	short w, h, x, y;	142	short w, h, x, y;
107	Pixmap pixmap;	143	Pixmap pixmap;
108	} bgPixmap_t;	144	} bgPixmap_t;
109	#endif	145	#endif
110		146
111	/*	147	/*
112	* the 'essential' information for reporting Mouse Events	148	* the 'essential' information for reporting Mouse Events
113	* pared down from XButtonEvent	149	* pared down from XButtonEvent
114	*/	150	*/
115	struct mouse_event {	151	struct mouse_event {
116	int clicks;	152	int clicks;
117	Time time; /* milliseconds */	153	Time time; /* milliseconds */
118	unsigned int state; /* key or button mask */	154	unsigned int state; /* key or button mask */
119	unsigned int button; /* detail */	155	unsigned int button; /* detail */
120	};	156	};
121		157
122	#ifndef min	158	#if ENABLE_FRILLS
123	# define min(a,b) (((a) < (b)) ? (a) : (b))
124	# define max(a,b) (((a) > (b)) ? (a) : (b))
125	#endif
126
127	#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
128	#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
129	#define SWAP_IT(one, two, typeof) \
130	do { \
131	typeof swapittmp; \
132	(swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
133	} while (/* CONSTCOND */ 0)
134	#define BOUND_POSITIVE_INT16(val) \
135	(int16_t) ((val) <= 0 \
136	? 0 \
137	: min ((val), (((uint16_t)-1)>>1)))
138
139	#ifndef NO_FRILLS
140	typedef struct _mwmhints {	159	typedef struct _mwmhints {
141	CARD32 flags;	160	CARD32 flags;
142	CARD32 functions;	161	CARD32 functions;
143	CARD32 decorations;	162	CARD32 decorations;
144	INT32 input_mode;	163	INT32 input_mode;
145	CARD32 status;	164	CARD32 status;
146	} MWMHints;	165	} MWMHints;
147	#endif	166	#endif
148		167
		168	#if ENABLE_XEMBED
		169	// XEMBED messages
		170	# define XEMBED_EMBEDDED_NOTIFY 0
		171	# define XEMBED_WINDOW_ACTIVATE 1
		172	# define XEMBED_WINDOW_DEACTIVATE 2
		173	# define XEMBED_REQUEST_FOCUS 3
		174	# define XEMBED_FOCUS_IN 4
		175	# define XEMBED_FOCUS_OUT 5
		176	# define XEMBED_FOCUS_NEXT 6
		177	# define XEMBED_FOCUS_PREV 7
		178
		179	# define XEMBED_MODALITY_ON 10
		180	# define XEMBED_MODALITY_OFF 11
		181	# define XEMBED_REGISTER_ACCELERATOR 12
		182	# define XEMBED_UNREGISTER_ACCELERATOR 13
		183	# define XEMBED_ACTIVATE_ACCELERATOR 14
		184
		185	// XEMBED detail code
		186	# define XEMBED_FOCUS_CURRENT 0
		187	# define XEMBED_FOCUS_FIRST 1
		188	# define XEMBED_FOCUS_LAST 2
		189
		190	# define XEMBED_MAPPED (1 << 0)
		191	#endif
		192
149	/*	193	/*
150	*****************************************************************************	194	*****************************************************************************
151	* NORMAL DEFINES	195	* NORMAL DEFINES
152	*****************************************************************************	196	*****************************************************************************
153	*/	197	*/
…		…
158	# define COLORTERMENVFULL COLORTERMENV "-xpm"	202	# define COLORTERMENVFULL COLORTERMENV "-xpm"
159	#else	203	#else
160	# define COLORTERMENVFULL COLORTERMENV	204	# define COLORTERMENVFULL COLORTERMENV
161	#endif	205	#endif
162	#ifndef TERMENV	206	#ifndef TERMENV
163	# define TERMENV "rxvt"	207	# define TERMENV "rxvt-unicode"
164	#endif	208	#endif
165		209
166	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)	210	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
167	# define NO_MOUSE_REPORT_SCROLLBAR	211	# define NO_MOUSE_REPORT_SCROLLBAR 1
168	#endif	212	#endif
169		213
170	#ifdef NO_RESOURCES	214	#ifdef NO_RESOURCES
171	# undef USE_XGETDEFAULT	215	# undef USE_XGETDEFAULT
		216	#endif
		217
		218	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
		219	# define ENABLE_OVERLAY 1
172	#endif	220	#endif
173		221
174	/* now look for other badly set stuff */	222	/* now look for other badly set stuff */
175		223
176	#if !defined (EACCESS) && defined(EAGAIN)	224	#if !defined (EACCESS) && defined(EAGAIN)
…		…
199		247
200	#define R_SB_ALIGN_CENTRE 0	248	#define R_SB_ALIGN_CENTRE 0
201	#define R_SB_ALIGN_TOP 1	249	#define R_SB_ALIGN_TOP 1
202	#define R_SB_ALIGN_BOTTOM 2	250	#define R_SB_ALIGN_BOTTOM 2
203		251
204	#define R_SB_RXVT 0
205	#define R_SB_NEXT 1	252	#define R_SB_NEXT 1
206	#define R_SB_XTERM 2	253	#define R_SB_XTERM 2
207	#define R_SB_PLAIN 4	254	#define R_SB_PLAIN 4
		255	#define R_SB_RXVT 8
208		256
209	#define SB_WIDTH_NEXT 19	257	#define SB_WIDTH_NEXT 19
210	#define SB_WIDTH_XTERM 15	258	#define SB_WIDTH_XTERM 15
211	#define SB_WIDTH_PLAIN 7	259	#define SB_WIDTH_PLAIN 7
212	#ifndef SB_WIDTH_RXVT	260	#ifndef SB_WIDTH_RXVT
…		…
287	# define NSCREENS 0	335	# define NSCREENS 0
288	#else	336	#else
289	# define NSCREENS 1	337	# define NSCREENS 1
290	#endif	338	#endif
291		339
292	#define IGNORE 0
293	#define SAVE 's'
294	#define RESTORE 'r'
295
296	/* special (internal) prefix for font commands */	340	/* special (internal) prefix for font commands */
297	#define FONT_CMD '#'	341	#define FONT_CMD '#'
298	#define FONT_DN "#-"	342	#define FONT_DN "#-"
299	#define FONT_UP "#+"	343	#define FONT_UP "#+"
300		344
301	/* flags for rxvt_scr_gotorc () */	345	/* flags for rxvt_scr_gotorc () */
302	enum {	346	enum {
303	C_RELATIVE = 1 , /* col movement is relative */	347	C_RELATIVE = 1, /* col movement is relative */
304	R_RELATIVE = 2, /* row movement is relative */	348	R_RELATIVE = 2, /* row movement is relative */
305	RELATIVE = 1 \| 2,	349	RELATIVE = C_RELATIVE \| R_RELATIVE,
306	};	350	};
307		351
308	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */	352	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
309	enum {	353	enum {
310	INSERT = -1, /* don't change these values */	354	INSERT = -1, /* don't change these values */
…		…
323	enum {	367	enum {
324	PRIMARY = 0,	368	PRIMARY = 0,
325	SECONDARY,	369	SECONDARY,
326	};	370	};
327		371
328	#define RS_None 0 /* Normal */	372	#define RS_None 0
329		373
330	#define RS_fgMask 0x000001FFu /* 512 colors */	374	#define RS_fgMask 0x0000007fUL // 128 colors
331	#define RS_bgMask 0x0003FE00u /* 512 colors */	375	#define RS_bgMask 0x00003f80UL // 128 colors
332	#define RS_Bold 0x00040000u /* bold */	376
		377	// font styles
		378	#define RS_Bold 0x00004000UL // value 1
		379	#define RS_Italic 0x00008000UL // value 2
		380
		381	// fake styles
333	#define RS_Blink 0x00080000u /* blink */	382	#define RS_Blink 0x00010000UL // blink
334	#define RS_RVid 0x00100000u /* reverse video */	383	#define RS_RVid 0x00020000UL // reverse video
335	#define RS_Uline 0x00200000u /* underline */	384	#define RS_Uline 0x00040000UL // underline
336		385
337	#define RS_fontMask 0xffc00000u /* plenty(?) of fonts */	386	// 5 custom bits for extensions
		387	#define RS_customCount 32
		388	#define RS_customMask 0x00f80000UL
338	#define RS_fontShift 22	389	#define RS_customShift 19
339		390
		391	// other flags
		392	#define RS_Careful 0x80000000UL /* be careful when drawing these */
		393
		394	#define RS_styleCount 4
		395	#define RS_styleMask (RS_Bold \| RS_Italic)
		396	#define RS_styleShift 14
		397
340	#define RS_baseattrMask (RS_Bold\|RS_Blink\|RS_RVid\|RS_Uline)	398	#define RS_baseattrMask (RS_Italic \| RS_Bold \| RS_Blink \| RS_RVid \| RS_Uline)
341	#define RS_attrMask (RS_baseattrMask\|RS_fontMask)	399	#define RS_attrMask (RS_baseattrMask \| RS_fontMask)
		400
		401	#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
		402	#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
		403	#define RS_fontShift 24
		404
		405	#define DEFAULT_RSTYLE (RS_None \| Color_fg \| (Color_bg << Color_Bits))
		406	#define OVERLAY_RSTYLE (RS_None \| Color_Black \| (Color_Yellow << Color_Bits))
342		407
343	#define Sel_none 0 /* Not waiting */	408	#define Sel_none 0 /* Not waiting */
344	#define Sel_normal 0x01 /* normal selection */	409	#define Sel_normal 0x01 /* normal selection */
345	#define Sel_incr 0x02 /* incremental selection */	410	#define Sel_incr 0x02 /* incremental selection */
346	#define Sel_direct 0x00	411	#define Sel_direct 0x00
…		…
391	XTerm_Color_UL = 19, // change actual 'Underline' color	456	XTerm_Color_UL = 19, // change actual 'Underline' color
392	XTerm_Pixmap = 20, // new bg pixmap	457	XTerm_Pixmap = 20, // new bg pixmap
393	XTerm_restoreFG = 39, // change default fg color	458	XTerm_restoreFG = 39, // change default fg color
394	XTerm_restoreBG = 49, // change default bg color	459	XTerm_restoreBG = 49, // change default bg color
395	XTerm_dumpscreen = 55, // dump scrollback and all of screen	460	XTerm_dumpscreen = 55, // dump scrollback and all of screen
		461
396	XTerm_locale = 701, // change locale	462	URxvt_locale = 701, // change locale
397	XTerm_findfont = 702, // find font of given character (in decimal)
398	XTerm_Menu = 703, // set menu item	463	URxvt_Menu = 703, // set menu item
		464	URxvt_Color_IT = 704, // change actual 'Italic' colour
		465	URxvt_Color_tint = 705, // change actual tint colour
		466
		467	URxvt_font = 710,
		468	URxvt_boldFont = 711,
		469	URxvt_italicFont = 712,
		470	URxvt_boldItalicFont = 713,
		471
		472	URxvt_view_up = 720,
		473	URxvt_view_down = 721,
399	};	474	};
400		475
401	/* Words starting with `Color_' are colours. Others are counts */	476	/* Words starting with `Color_' are colours. Others are counts */
402	/*	477	/*
403	* The following comment is mostly obsolete since pixcolor_set was expanded:
404	* We're currently upto 29 colours. Only 3 more available. The
405	* PixColor and rendition colour usage should probably be decoupled	478	* The PixColor and rendition colour usage should probably be decoupled
406	* on the unnecessary items, e.g. Color_pointer, but won't bother	479	* on the unnecessary items, e.g. Color_pointer, but won't bother
407	* until we need to. Also, be aware of usage in pixcolor_set	480	* until we need to. Also, be aware of usage in pixcolor_set
408	*/	481	*/
409		482
410	enum colour_list {	483	enum colour_list {
…		…
432	maxBrightCOLOR, /* minBrightCOLOR + 7 */	505	maxBrightCOLOR, /* minBrightCOLOR + 7 */
433	Color_White = maxBrightCOLOR,	506	Color_White = maxBrightCOLOR,
434	#else	507	#else
435	Color_White = maxCOLOR,	508	Color_White = maxCOLOR,
436	#endif	509	#endif
437	#ifdef TTY_256COLOR
438	min256COLOR = Color_White + 1,	510	minTermCOLOR = Color_White + 1,
439	max256COLOR = minCOLOR + 255,	511	maxTermCOLOR = Color_White + 72,
440	#endif
441	#ifndef NO_CURSORCOLOR	512	#ifndef NO_CURSORCOLOR
442	Color_cursor,	513	Color_cursor,
443	Color_cursor2,	514	Color_cursor2,
444	#endif	515	#endif
445	Color_pointer_fg,	516	Color_pointer_fg,
446	Color_pointer_bg,	517	Color_pointer_bg,
447	Color_border,	518	Color_border,
448	#ifndef NO_BOLD_UNDERLINE_REVERSE	519	#ifndef NO_BOLD_UNDERLINE_REVERSE
449	Color_BD,	520	Color_BD,
		521	Color_IT,
450	Color_UL,	522	Color_UL,
451	Color_RV,	523	Color_RV,
		524	#endif
		525	#if ENABLE_FRILLS
		526	Color_underline,
452	#endif	527	#endif
453	#ifdef OPTION_HC	528	#ifdef OPTION_HC
454	Color_HC,	529	Color_HC,
455	#endif	530	#endif
456	#ifdef KEEP_SCROLLCOLOR	531	#ifdef KEEP_SCROLLCOLOR
457	Color_scroll,	532	Color_scroll,
458	Color_trough,	533	Color_trough,
459	#endif	534	#endif
460	#if TINTING	535	#if TINTING
461	Color_tint,	536	Color_tint,
		537	#endif
		538	#if OFF_FOCUS_FADING
		539	Color_fade,
462	#endif	540	#endif
463	NRS_COLORS, /* */	541	NRS_COLORS, /* */
464	#ifdef KEEP_SCROLLCOLOR	542	#ifdef KEEP_SCROLLCOLOR
465	Color_topShadow = NRS_COLORS,	543	Color_topShadow = NRS_COLORS,
466	Color_bottomShadow,	544	Color_bottomShadow,
467	TOTAL_COLORS /* upto 30 */	545	TOTAL_COLORS
468	#else	546	#else
469	TOTAL_COLORS = NRS_COLORS /* */	547	TOTAL_COLORS = NRS_COLORS
470	#endif	548	#endif
471	};	549	};
472		550
473	#define Color_Bits 9	551	#define Color_Bits 7 // 0 .. maxTermCOLOR
		552
474	#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)	553	#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
475	#define NPIXCLR_BITS 32	554	#define NPIXCLR_BITS 32
476
477	#define DEFAULT_RSTYLE (RS_None \| (Color_fg) \| (Color_bg<<Color_Bits))
478		555
479	/*	556	/*
480	* Resource list	557	* Resource list
481	*/	558	*/
482	enum {	559	enum {
483	Rs_display_name = 0,	560	#define Rs_def(name) Rs_ ## name,
484	Rs_term_name,	561	#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
485	Rs_iconName,	562	#include "rsinc.h"
486	Rs_geometry,	563	#undef Rs_def
487	Rs_reverseVideo,	564	#undef Rs_reserve
488	Rs_color,
489	_Rs_color = Rs_color + NRS_COLORS - 1,
490	Rs_font,
491	Rs_name,
492	Rs_title,
493	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
494	Rs_path,
495	#endif
496	#ifdef XPM_BACKGROUND
497	Rs_backgroundPixmap,
498	#endif
499	#if (MENUBAR_MAX)
500	Rs_menu,
501	#endif
502	Rs_loginShell,
503	Rs_jumpScroll,
504	#ifdef HAVE_SCROLLBARS
505	Rs_scrollBar,
506	Rs_scrollBar_right,
507	Rs_scrollBar_floating,
508	Rs_scrollBar_align,
509	#endif
510	Rs_scrollstyle, /* Rs_scrollBar_style */
511	Rs_scrollTtyOutput,
512	Rs_scrollTtyKeypress,
513	Rs_scrollWithBuffer,
514	Rs_saveLines,
515	Rs_utmpInhibit,
516	Rs_visualBell,
517	#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
518	Rs_mapAlert,
519	#endif
520	#ifdef META8_OPTION
521	Rs_meta8,
522	#endif
523	#ifdef MOUSE_WHEEL
524	Rs_mouseWheelScrollPage,
525	#endif
526	#ifndef NO_BACKSPACE_KEY
527	Rs_backspace_key,
528	#endif
529	#ifndef NO_DELETE_KEY
530	Rs_delete_key,
531	#endif
532	Rs_selectstyle,
533	#ifdef PRINTPIPE
534	Rs_print_pipe,
535	#endif
536	#ifdef USE_XIM
537	Rs_preeditType,
538	Rs_inputMethod,
539	#endif
540	#ifdef TRANSPARENT
541	Rs_transparent,
542	Rs_transparent_all,
543	#endif
544	#ifndef NO_FRILLS
545	Rs_ext_bwidth,
546	Rs_int_bwidth,
547	Rs_borderLess,
548	#endif
549	Rs_scrollBar_thickness,
550	#ifndef NO_LINESPACE
551	Rs_lineSpace,
552	#endif
553	Rs_cutchars,
554	Rs_modifier,
555	Rs_answerbackstring,
556	Rs_tripleclickwords,
557	Rs_insecure,
558	Rs_cursorBlink,
559	Rs_pointerBlank,
560	Rs_pointerBlankDelay,
561	Rs_imLocale,
562	#ifndef NO_SECONDARY_SCREEN
563	Rs_secondaryScreen,
564	Rs_secondaryScroll,
565	#endif
566	#ifndef NO_BOLD_UNDERLINE_REVERSE
567	Rs_realBold,
568	#endif
569	#ifdef OFF_FOCUS_FADING
570	Rs_fade,
571	#endif
572	#ifdef TINTING
573	Rs_shade,
574	#endif
575	NUM_RESOURCES	565	NUM_RESOURCES
576	};	566	};
577		567
578	// see init.C:xa_names, which must be kept in sync	568	// see init.C:xa_names, which must be kept in sync
579	enum {	569	enum {
…		…
583	XA_MULTIPLE,	573	XA_MULTIPLE,
584	XA_TARGETS,	574	XA_TARGETS,
585	XA_TIMESTAMP,	575	XA_TIMESTAMP,
586	XA_VT_SELECTION,	576	XA_VT_SELECTION,
587	XA_INCR,	577	XA_INCR,
		578	XA_WM_PROTOCOLS,
588	XA_WMDELETEWINDOW,	579	XA_WM_DELETE_WINDOW,
		580	XA_CLIPBOARD,
		581	#if ENABLE_FRILLS
		582	XA_MOTIF_WM_HINTS,
		583	#endif
		584	#if ENABLE_EWMH
		585	XA_NET_WM_PID,
		586	XA_NET_WM_NAME,
		587	XA_NET_WM_ICON_NAME,
		588	XA_NET_WM_PING,
		589	#endif
		590	#if USE_XIM
		591	XA_WM_LOCALE_NAME,
		592	#endif
589	#ifdef TRANSPARENT	593	#if TRANSPARENT
590	XA_XROOTPMAPID,	594	XA_XROOTPMAP_ID,
591	XA_XSETROOTID,	595	XA_ESETROOT_PMAP_ID,
592	#endif	596	#endif
593	#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */	597	#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
594	XA_DNDPROTOCOL,	598	XA_DNDPROTOCOL,
595	XA_DNDSELECTION,	599	XA_DNDSELECTION,
596	#endif /* OFFIX_DND */	600	#endif
597	XA_CLIPBOARD,	601	#if ENABLE_XEMBED
		602	XA_XEMBED,
		603	XA_XEMBED_INFO,
		604	#endif
598	NUM_XA	605	NUM_XA
599	};	606	};
600		607
601	/* DEC private modes */	608	/* DEC private modes */
602	#define PrivMode_132 (1LU<<0)	609	#define PrivMode_132 (1UL<<0)
603	#define PrivMode_132OK (1LU<<1)	610	#define PrivMode_132OK (1UL<<1)
604	#define PrivMode_rVideo (1LU<<2)	611	#define PrivMode_rVideo (1UL<<2)
605	#define PrivMode_relOrigin (1LU<<3)	612	#define PrivMode_relOrigin (1UL<<3)
606	#define PrivMode_Screen (1LU<<4)	613	#define PrivMode_Screen (1UL<<4)
607	#define PrivMode_Autowrap (1LU<<5)	614	#define PrivMode_Autowrap (1UL<<5)
608	#define PrivMode_aplCUR (1LU<<6)	615	#define PrivMode_aplCUR (1UL<<6)
609	#define PrivMode_aplKP (1LU<<7)	616	#define PrivMode_aplKP (1UL<<7)
610	#define PrivMode_HaveBackSpace (1LU<<8)	617	#define PrivMode_HaveBackSpace (1UL<<8)
611	#define PrivMode_BackSpace (1LU<<9)	618	#define PrivMode_BackSpace (1UL<<9)
612	#define PrivMode_ShiftKeys (1LU<<10)	619	#define PrivMode_ShiftKeys (1UL<<10)
613	#define PrivMode_VisibleCursor (1LU<<11)	620	#define PrivMode_VisibleCursor (1UL<<11)
614	#define PrivMode_MouseX10 (1LU<<12)	621	#define PrivMode_MouseX10 (1UL<<12)
615	#define PrivMode_MouseX11 (1LU<<13)	622	#define PrivMode_MouseX11 (1UL<<13)
616	#define PrivMode_scrollBar (1LU<<14)	623	#define PrivMode_scrollBar (1UL<<14)
617	#define PrivMode_menuBar (1LU<<15)	624	#define PrivMode_menuBar (1UL<<15)
618	#define PrivMode_TtyOutputInh (1LU<<16)	625	#define PrivMode_TtyOutputInh (1UL<<16)
619	#define PrivMode_Keypress (1LU<<17)	626	#define PrivMode_Keypress (1UL<<17)
620	#define PrivMode_smoothScroll (1LU<<18)	627	#define PrivMode_smoothScroll (1UL<<18)
621	#define PrivMode_vt52 (1LU<<19)	628	#define PrivMode_vt52 (1UL<<19)
		629	#define PrivMode_LFNL (1UL<<20)
622	/* too annoying to implement X11 highlight tracking */	630	/* too annoying to implement X11 highlight tracking */
623	/* #define PrivMode_MouseX11Track (1LU<<20) */	631	/* #define PrivMode_MouseX11Track (1LU<<21) */
624		632
625	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)	633	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)
626	#define PrivMode(test,bit) \	634	#define PrivMode(test,bit) \
627	if (test) \	635	if (test) \
628	PrivateModes \|= (bit); \	636	priv_modes \|= (bit); \
629	else \	637	else \
630	PrivateModes &= ~(bit)	638	priv_modes &= ~(bit)
631		639
632	#ifdef ALLOW_132_MODE	640	#ifdef ALLOW_132_MODE
633	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_aplKP\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor\|PrivMode_132OK)	641	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor\|PrivMode_132OK)
634	#else	642	#else
635	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_aplKP\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor)	643	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor)
636	#endif	644	#endif
637		645
638	// do not change these constants lightly, there are many interdependencies	646	// do not change these constants lightly, there are many interdependencies
639	#define IMBUFSIZ 128 // input modifier buffer sizes	647	#define IMBUFSIZ 128 // input modifier buffer sizes
640	#define KBUFSZ 512 // size of keyboard mapping buffer	648	#define KBUFSZ 512 // size of keyboard mapping buffer
641	#define CBUFSIZ 4096 // size of command buffer	649	#define CBUFSIZ 2048 // size of command buffer
642	#define UBUFSIZ 4096 // character buffer	650	#define UBUFSIZ 2048 // character buffer
643		651
644	#ifndef PATH_MAX	652	#ifndef PATH_MAX
645	# define PATH_MAX 16384	653	# define PATH_MAX 16384
646	#endif	654	#endif
647		655
…		…
675	/*	683	/*
676	*****************************************************************************	684	*****************************************************************************
677	* MACRO DEFINES	685	* MACRO DEFINES
678	*****************************************************************************	686	*****************************************************************************
679	*/	687	*/
680	#define MEMSET(x, y, z) memset((x), (y), (size_t)(z))	688	#define memset(x, y, z) memset((x), (y), (size_t)(z))
681	#define MEMCPY(x, y, z) memcpy((void )(x), (const void )(y), (z))	689	#define memcpy(x, y, z) memcpy((void )(x), (const void )(y), (z))
682	#define MEMMOVE(x, y, z) memmove((void )(x), (const void )(y), (z))	690	#define memmove(x, y, z) memmove((void )(x), (const void )(y), (z))
683	#define STRCASECMP(x, y) strcasecmp((x), (y))	691	#define strcasecmp(x, y) strcasecmp((x), (y))
684	#define STRNCASECMP(x, y, z) strncasecmp((x), (y), (z))	692	#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
685	#define STRCPY(x, y) strcpy((char )(x), (const char )(y))	693	#define strcpy(x, y) strcpy((char )(x), (const char )(y))
686	#define STRNCPY(x, y, z) strncpy((char )(x), (const char )(y), (z))	694	#define strncpy(x, y, z) strncpy((char )(x), (const char )(y), (z))
687	#define STRCMP(x, y) strcmp((const char )(x), (const char )(y))	695	#define strcmp(x, y) strcmp((const char )(x), (const char )(y))
688	#define STRNCMP(x, y, z) strncmp((const char )(x), (const char )(y), (z))	696	#define strncmp(x, y, z) strncmp((const char )(x), (const char )(y), (z))
689	#define STRCAT(x, y) strcat((char )(x), (const char )(y))	697	#define strcat(x, y) strcat((char )(x), (const char )(y))
690	#define STRNCAT(x, y, z) strncat((char )(x), (const char )(y), (z))	698	#define strncat(x, y, z) strncat((char )(x), (const char )(y), (z))
691	#define STRDUP(x) strdup((const char *)(x))	699	#define strdup(x) strdup((const char *)(x))
692	#define STRLEN(x) strlen((const char *)(x))	700	#define strlen(x) strlen((const char *)(x))
693	#define STRCHR(x, y) strchr((const char *)(x), (int)(y))	701	#define strchr(x, y) strchr((const char *)(x), (int)(y))
694	#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y))	702	#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
		703
		704	#define dDisp Display *disp = display->display
695		705
696	/* convert pixel dimensions to row/column values. Everything as int32_t */	706	/* convert pixel dimensions to row/column values. Everything as int32_t */
697	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	707	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
698	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	708	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
699	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)	709	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
700	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)	710	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
701	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	711	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
702	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	712	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
703	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)	713	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
704	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)	714	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
705		715
706	#define TermWin_TotalWidth() ((int32_t)TermWin.width)	716	#define TermWin_TotalWidth() ((int32_t)this->width)
707	#define TermWin_TotalHeight() ((int32_t)TermWin.height)	717	#define TermWin_TotalHeight() ((int32_t)this->height)
		718
		719	// for m >= -n, ensure remainder lies between 0..n-1
		720	#define MOD(m,n) (((m) + (n)) % (n))
		721
		722	#define LINENO(n) MOD (term_start + int(n), total_rows)
		723	#define ROW(n) row_buf [LINENO (n)]
708		724
709	/* how to build & extract colors and attributes */	725	/* how to build & extract colors and attributes */
710	#define GET_BASEFG(x) (((x) & RS_fgMask))	726	#define GET_BASEFG(x) (((x) & RS_fgMask))
711	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	727	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
712	#ifndef NO_BRIGHTCOLOR
713	# define GET_FGCOLOR(x) \
714	((((x) & RS_Bold) == 0 \
715	\|\| GET_BASEFG (x) < minCOLOR \
716	\|\| GET_BASEFG (x) >= minBrightCOLOR) \
717	? GET_BASEFG (x) \
718	: (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
719	# define GET_BGCOLOR(x) \
720	((((x) & RS_Blink) == 0 \
721	\|\| GET_BASEBG (x) < minCOLOR \
722	\|\| GET_BASEBG (x) >= minBrightCOLOR) \
723	? GET_BASEBG (x) \
724	: (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
725	#else
726	# define GET_FGCOLOR(x) GET_BASEFG(x)
727	# define GET_BGCOLOR(x) GET_BASEBG(x)
728	#endif
729		728
730	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)	729	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
731	#define SET_FONT(x,fid) ((x) & ~RS_fontMask) \| ((fid) << RS_fontShift)	730	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))
		731
		732	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
		733	#define SET_STYLE(x,style) (((x) & ~RS_styleMask) \| ((style) << RS_styleShift))
732		734
733	#define GET_ATTR(x) (((x) & RS_attrMask))	735	#define GET_ATTR(x) (((x) & RS_attrMask))
734	#define GET_BGATTR(x) \	736	#define GET_BGATTR(x) \
735	(((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \	737	(((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
736	\| (((x) & RS_fgMask)<<Color_Bits)) \	738	\| (((x) & RS_fgMask)<<Color_Bits)) \
737	: ((x) & (RS_attrMask \| RS_bgMask)))	739	: ((x) & (RS_attrMask \| RS_bgMask)))
738	#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) \| (fg))	740	#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) \| (fg))
739	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg)<<Color_Bits))	741	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg)<<Color_Bits))
740	#define SET_ATTR(x,a) (((x) & ~RS_attrMask)\| (a))	742	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))
		743
		744	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
741		745
742	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))	746	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))
743	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))	747	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
		748
		749	#if ENABLE_STYLES
		750	# define FONTSET(style) fontset[GET_STYLE (style)]
		751	#else
		752	# define FONTSET(style) fontset[0]
		753	#endif
744		754
745	#ifdef HAVE_SCROLLBARS	755	#ifdef HAVE_SCROLLBARS
746	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)	756	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
747	#else	757	#else
748	# define scrollbar_TotalWidth() (0)	758	# define scrollbar_TotalWidth() (0)
…		…
772	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	782	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773	- scrollbar_minheight ())	783	- scrollbar_minheight ())
774		784
775	#if (MENUBAR_MAX > 1)	785	#if (MENUBAR_MAX > 1)
776	/* rendition style flags */	786	/* rendition style flags */
777	# define menuBar_height() (TermWin.fheight + SHADOW)	787	# define menuBar_height() (fheight + SHADOW)
778	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	788	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
779	# define isMenuBarWindow(w) ((w) == menuBar.win)	789	# define isMenuBarWindow(w) ((w) == menuBar.win)
780	#else	790	#else
781	# define menuBar_height() (0)	791	# define menuBar_height() (0)
782	# define menuBar_TotalHeight() (0)	792	# define menuBar_TotalHeight() (0)
…		…
786	#ifdef XPM_BACKGROUND	796	#ifdef XPM_BACKGROUND
787	# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))	797	# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
788	#else	798	#else
789	# define XPMClearArea(a, b, c, d, e, f, g)	799	# define XPMClearArea(a, b, c, d, e, f, g)
790	#endif	800	#endif
791
792	#ifndef STRICT_FONT_CHECKING
793	# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
794	#endif
795
796	#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
797	#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
798		801
799	#ifdef UTMP_SUPPORT	802	#ifdef UTMP_SUPPORT
800	# if !defined(RXVT_UTMPX_FILE) \|\| !defined(HAVE_STRUCT_UTMPX)	803	# if !defined(RXVT_UTMPX_FILE) \|\| !defined(HAVE_STRUCT_UTMPX)
801	# undef HAVE_UTMPX_H	804	# undef HAVE_UTMPX_H
802	# undef HAVE_STRUCT_UTMPX	805	# undef HAVE_STRUCT_UTMPX
…		…
827	#ifdef DEBUG_MAIN	830	#ifdef DEBUG_MAIN
828	# define D_MAIN(x) fprintf x ; fputc('\n', stderr)	831	# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
829	#else	832	#else
830	# define D_MAIN(x)	833	# define D_MAIN(x)
831	#endif	834	#endif
832	#ifdef DEBUG_SCREEN
833	# define D_SCREEN(x) fprintf x ; fputc('\n', stderr)
834	#else
835	# define D_SCREEN(x)
836	#endif
837	#ifdef DEBUG_SELECT
838	# define D_SELECT(x) fprintf x ; fputc('\n', stderr)
839	#else
840	# define D_SELECT(x)
841	#endif
842	#ifdef DEBUG_SIZE	835	#ifdef DEBUG_SIZE
843	# define D_SIZE(x) fprintf x ; fputc('\n', stderr)	836	# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
844	#else	837	#else
845	# define D_SIZE(x)	838	# define D_SIZE(x)
846	#endif	839	#endif
847	#ifdef DEBUG_X
848	# define D_X(x) fprintf x ; fputc('\n', stderr)
849	#else
850	# define D_X(x)
851	#endif
852		840
853	extern class rxvt_failure_exception { } rxvt_failure_exception;	841	extern class rxvt_failure_exception { } rxvt_failure_exception;
854		842
855	typedef callback1<void, const char *> log_callback;	843	typedef callback1<void, const char *> log_callback;
		844	typedef callback1<int, int> getfd_callback;
856		845
857	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);	846	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
858	extern void rxvt_log (const char *fmt, ...);	847	extern void rxvt_log (const char *fmt, ...);
859	extern void rxvt_warn (const char *fmt, ...);	848	extern void rxvt_warn (const char *fmt, ...);
860	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	849	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
…		…
887	// primivite wrapper around mbstate_t to ensure initialisation	876	// primivite wrapper around mbstate_t to ensure initialisation
888	struct mbstate {	877	struct mbstate {
889	mbstate_t mbs;	878	mbstate_t mbs;
890		879
891	operator mbstate_t *() { return &mbs; }	880	operator mbstate_t *() { return &mbs; }
892	void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }	881	void reset () { memset (&mbs, 0, sizeof (mbs)); }
893	mbstate () { reset (); }	882	mbstate () { reset (); }
894	};	883	};
		884
		885	#define UNICODE_MASK 0x1fffffUL
895		886
896	#if UNICODE3	887	#if UNICODE3
897	# define COMPOSE_LO 0x40000000UL	888	# define COMPOSE_LO 0x40000000UL
898	# define COMPOSE_HI 0x400fffffUL	889	# define COMPOSE_HI 0x400fffffUL
899	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)	890	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
…		…
929		920
930	extern class rxvt_composite_vec rxvt_composite;	921	extern class rxvt_composite_vec rxvt_composite;
931	#endif	922	#endif
932		923
933		924
		925	#ifdef KEYSYM_RESOURCE
		926	class keyboard_manager;
		927	#endif
		928
934	struct rxvt_term : rxvt_vars {	929	struct rxvt_term : zero_initialized, rxvt_vars {
935	log_callback *log_hook; // log error messages through this hook, if != 0	930	log_callback *log_hook; // log error messages through this hook, if != 0
		931	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
		932
		933	#if ENABLE_PERL
		934	void *self; // perl's $self
		935	#endif
936		936
937	struct mbstate mbstate; // current input multibyte state	937	struct mbstate mbstate; // current input multibyte state
938		938
939	unsigned char want_refresh:1,	939	unsigned char want_refresh:1,
940	#ifdef TRANSPARENT	940	#ifdef TRANSPARENT
…		…
955	hidden_text:1,	955	hidden_text:1,
956	#endif	956	#endif
957	#ifdef POINTER_BLANK	957	#ifdef POINTER_BLANK
958	hidden_pointer:1,	958	hidden_pointer:1,
959	#endif	959	#endif
960	// enc_utf8:1, /* wether terminal reads/writes utf-8 */	960	enc_utf8:1, /* wether locale uses utf-8 */
		961	seen_input:1, /* wether we have seen some program output yet */
		962	seen_resize:1, /* wether we had a resize event */
961	parsed_geometry:1;	963	parsed_geometry:1;
962		964
963	unsigned char refresh_type,	965	unsigned char refresh_type,
964	#ifdef UTMP_SUPPORT
965	next_utmp_action,
966	#endif
967	#ifndef NO_SETOWNER_TTYDEV
968	next_tty_action,
969	#endif
970	#ifdef META8_OPTION	966	#ifdef META8_OPTION
971	meta_char, /* Alt-key prefix */	967	meta_char, /* Alt-key prefix */
972	#endif	968	#endif
973	scrollbar_align,	969	scrollbar_align,
974	selection_wait,	970	selection_wait,
975	selection_type;	971	selection_type;
976	/* ---------- */	972	/* ---------- */
977	short rvideo;	973	short rvideo;
978	int16_t num_scr; /* screen: number lines scrolled */	974	int num_scr; /* screen: number lines scrolled */
979	unsigned int prev_ncol, /* screen: previous number of columns */	975	int prev_ncol, /* screen: previous number of columns */
980	prev_nrow; /* screen: previous number of rows */	976	prev_nrow; /* screen: previous number of rows */
981	/* ---------- */	977	/* ---------- */
982	rend_t rstyle;	978	rend_t rstyle;
983	/* ---------- */	979	/* ---------- */
984	uint32_t pixcolor_set[NPIXCLR_SETS];	980	uint32_t pixcolor_set[NPIXCLR_SETS];
…		…
1015	# ifdef POINTER_BLANK	1011	# ifdef POINTER_BLANK
1016	pointerBlankDelay,	1012	pointerBlankDelay,
1017	# endif	1013	# endif
1018	allowedxerror;	1014	allowedxerror;
1019	/* ---------- */	1015	/* ---------- */
1020	unsigned int ModMetaMask,	1016	unsigned int ModLevel3Mask,
		1017	ModMetaMask,
1021	ModNumLockMask,	1018	ModNumLockMask;
1022	old_width, /* last used width in screen resize */	1019	int old_width, /* last used width in screen resize */
1023	old_height, /* last used height in screen resize */	1020	old_height; /* last used height in screen resize */
1024	#ifndef NO_BRIGHTCOLOR
1025	colorfgbg,
1026	#endif
1027	ttymode;
1028	unsigned long PrivateModes,	1021	unsigned long priv_modes,
1029	SavedModes;	1022	SavedModes;
1030	/* ---------- */	1023	/* ---------- */
1031	Atom xa[NUM_XA];	1024	Atom xa[NUM_XA];
1032	/* ---------- */	1025	/* ---------- */
1033	#ifdef MENUBAR	1026	#ifdef MENUBAR
…		…
1059	#endif	1052	#endif
1060	/* ---------- */	1053	/* ---------- */
1061	Time selection_time,	1054	Time selection_time,
1062	selection_request_time;	1055	selection_request_time;
1063	pid_t cmd_pid; /* process id of child */	1056	pid_t cmd_pid; /* process id of child */
1064	gid_t ttygid;	1057	char * incr_buf;
1065	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)	1058	size_t incr_buf_size, incr_buf_fill;
1066	uid_t euid;
1067	gid_t egid;
1068	#endif
1069	/* ---------- */	1059	/* ---------- */
1070	Cursor leftptr_cursor;	1060	Cursor leftptr_cursor;
1071	#ifdef POINTER_BLANK
1072	Cursor blank_cursor;
1073	#endif
1074	/* ---------- */	1061	/* ---------- */
1075	const char ttydev; / pty/tty name */
1076	#ifndef NO_BACKSPACE_KEY	1062	#ifndef NO_BACKSPACE_KEY
1077	const char *key_backspace;	1063	const char *key_backspace;
1078	#endif	1064	#endif
1079	#ifndef NO_DELETE_KEY	1065	#ifndef NO_DELETE_KEY
1080	const char *key_delete;	1066	const char *key_delete;
1081	#endif
1082	#ifdef USE_XIM
1083	rxvt_xim *input_method;
1084	XIC Input_Context;
1085	XIMStyle input_style;
1086	int event_type;
1087	#endif	1067	#endif
1088	struct mouse_event MEvent;	1068	struct mouse_event MEvent;
1089	XComposeStatus compose;	1069	XComposeStatus compose;
1090	ttymode_t tio;	1070	ttymode_t tio;
1091	#ifdef UTMP_SUPPORT	1071	#ifdef UTMP_SUPPORT
…		…
1103	row_col_t oldcursor;	1083	row_col_t oldcursor;
1104	#ifdef XPM_BACKGROUND	1084	#ifdef XPM_BACKGROUND
1105	bgPixmap_t bgPixmap;	1085	bgPixmap_t bgPixmap;
1106	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */	1086	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1107	#endif	1087	#endif
1108	#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1109	struct stat ttyfd_stat; /* original status of our tty */
1110	#endif
1111	#ifdef MENUBAR	1088	#ifdef MENUBAR
1112	menu_t ActiveMenu, / currently active menu */	1089	menu_t ActiveMenu, / currently active menu */
1113	BuildMenu; / the menu currently being built */	1090	BuildMenu; / the menu currently being built */
1114	bar_t *CurrentBar;	1091	bar_t *CurrentBar;
1115	# if ! (MENUBAR_MAX > 1)	1092	# if ! (MENUBAR_MAX > 1)
…		…
1121	#endif	1098	#endif
1122	#ifdef POINTER_BLANK	1099	#ifdef POINTER_BLANK
1123	struct timeval lastmotion;	1100	struct timeval lastmotion;
1124	#endif	1101	#endif
1125		1102
		1103	#if ENABLE_OVERLAY
		1104	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
		1105	text_t **ov_text;
		1106	rend_t **ov_rend;
		1107
		1108	void scr_swap_overlay ();
		1109	void scr_overlay_new (int x, int y, int w, int h);
		1110	void scr_overlay_off ();
		1111	void scr_overlay_set (int x, int y,
		1112	text_t text,
		1113	rend_t rend = OVERLAY_RSTYLE);
		1114	void scr_overlay_set (int x, int y, const char *s);
		1115	void scr_overlay_set (int x, int y, const wchar_t *s);
		1116	#endif
		1117
1126	vector<void *> allocated; // free these memory blocks with free()	1118	vector<void *> allocated; // free these memory blocks with free()
1127		1119
1128	char env_windowid; / environmental variable WINDOWID */	1120	char env_windowid; / environmental variable WINDOWID */
1129	char env_display; / environmental variable DISPLAY */	1121	char env_display; / environmental variable DISPLAY */
1130	char env_term; / environmental variable TERM */	1122	char env_term; / environmental variable TERM */
1131	char *env_colorfgbg;	1123	char *env_colorfgbg;
1132	char *locale;	1124	char *locale;
1133	#if 0
1134	char *codeset;
1135	#endif
1136	char charsets[4];	1125	char charsets[4];
1137	unsigned char v_buffer; / pointer to physical buffer */	1126	unsigned char v_buffer; / pointer to physical buffer */
1138	unsigned int v_buflen; /* size of area to write */	1127	unsigned int v_buflen; /* size of area to write */
1139	stringvec argv, envv; /* if != 0, will be freed on destroy time */	1128	stringvec argv, envv; /* if != 0, will be freed on destroy time */
		1129
1140	#ifdef KEYSYM_RESOURCE	1130	#ifdef KEYSYM_RESOURCE
1141	const unsigned char *Keysym_map[256];	1131	keyboard_manager *keyboard;
1142	#endif	1132	#endif
		1133
1143	const char *rs[NUM_RESOURCES];	1134	const char *rs[NUM_RESOURCES];
1144	/* command input buffering */	1135	/* command input buffering */
1145	unsigned char cmdbuf_ptr, cmdbuf_endp;	1136	unsigned char cmdbuf_ptr, cmdbuf_endp;
1146	unsigned char cmdbuf_base[CBUFSIZ];	1137	unsigned char cmdbuf_base[CBUFSIZ];
1147		1138
1148	rxvt_salloc *talloc; // text line allocator	1139	rxvt_salloc *talloc; // text line allocator
1149	rxvt_salloc *ralloc; // rend line allocator	1140	rxvt_salloc *ralloc; // rend line allocator
1150		1141
1151	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1142	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1152		1143
1153	#ifndef NO_FRILLS	1144	#if ENABLE_FRILLS \|\| ISO_14755
1154	// ISO 14755 entry support	1145	// ISO 14755 entry support
1155	unicode_t iso14755buf;	1146	unicode_t iso14755buf;
1156	void commit_iso14755 ();	1147	void commit_iso14755 ();
1157	int hex_keyval (XKeyEvent &ev);	1148	int hex_keyval (XKeyEvent &ev);
		1149	# if ISO_14755
		1150	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
		1151	void iso14755_54 (int x, int y);
1158	#endif	1152	# endif
		1153	#endif
1159		1154
		1155	// modifies first argument(!)
1160	void paste (const unsigned char *data, unsigned int len);	1156	void paste (unsigned char *data, unsigned int len);
1161		1157
1162	void flush ();	1158	void flush ();
1163		1159
1164	#if TRANSPARENT	1160	#if TRANSPARENT
1165	void rootwin_cb (XEvent &xev);	1161	void rootwin_cb (XEvent &xev);
…		…
1207	#endif	1203	#endif
1208	void pointer_unblank ();	1204	void pointer_unblank ();
1209		1205
1210	void tt_printf (const char *fmt,...);	1206	void tt_printf (const char *fmt,...);
1211	void tt_write (const unsigned char *data, unsigned int len);	1207	void tt_write (const unsigned char *data, unsigned int len);
		1208	void pty_write ();
1212		1209
1213	void tt_winch ();	1210	void tt_winch ();
1214		1211
1215	rxvt_term ();	1212	rxvt_term ();
1216	~rxvt_term ();	1213	~rxvt_term ();
		1214	void child_exit (); // child has exited, usually destroys
1217	void destroy ();	1215	void destroy ();
		1216	void emergency_cleanup ();
1218		1217
1219	bool init (int argc, const char const argv);	1218	bool init (int argc, const char const argv);
1220	bool init_vars ();	1219	bool init_vars ();
1221		1220
1222	bool pty_fill ();	1221	bool pty_fill ();
1223
1224	void *operator new (size_t s);
1225	void operator delete (void *p, size_t s);
1226		1222
1227	void init_secondary ();	1223	void init_secondary ();
1228	const char *init_resources (int argc, const char const *argv);	1224	const char *init_resources (int argc, const char const *argv);
1229	void init_env ();	1225	void init_env ();
1230	void set_locale (const char *locale);	1226	void set_locale (const char *locale);
1231	void init_xlocale ();	1227	void init_xlocale ();
1232	void init_command (const char const argv);	1228	void init_command (const char const argv);
1233	void run_command (const char const argv);	1229	void run_command (const char const argv);
1234	int run_child (const char const argv);	1230	int run_child (const char const argv);
1235	static void child_exited (int pid);
1236		1231
1237	void color_aliases (int idx);	1232	void color_aliases (int idx);
1238	void recolour_cursor ();	1233	void recolour_cursor ();
1239	void create_windows (int argc, const char const argv);	1234	void create_windows (int argc, const char const argv);
1240	void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);	1235	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1241	void window_calc (unsigned int width, unsigned int height);	1236	void window_calc (unsigned int newwidth, unsigned int newheight);
1242		1237
1243	#if USE_XIM	1238	#if USE_XIM
		1239	rxvt_xim *input_method;
		1240	XIC Input_Context;
		1241	XIMStyle input_style;
		1242	XPoint spot; // most recently sent spot position
		1243
1244	void im_destroy ();	1244	void im_destroy ();
1245	void im_cb (); im_watcher im_ev;	1245	void im_cb (); im_watcher im_ev;
1246	void im_set_size (XRectangle *size);	1246	void im_set_size (XRectangle &size);
1247	void im_set_position (XPoint *pos);	1247	void im_set_position (XPoint &pos);
1248	void im_set_color (unsigned long fg, unsigned long bg);	1248	void im_set_color (unsigned long &fg, unsigned long &bg);
1249	void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);	1249	void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1250		1250
1251	bool IMisRunning ();	1251	bool IMisRunning ();
1252	void IMSendSpot ();	1252	void IMSendSpot ();
1253	bool IM_get_IC (const char *modifiers);	1253	bool IM_get_IC (const char *modifiers);
1254	void IMSetStatusPosition ();	1254	void IMSetStatusPosition ();
…		…
1260		1260
1261	void selection_click (int clicks, int x, int y);	1261	void selection_click (int clicks, int x, int y);
1262	void selection_extend (int x, int y, int flag);	1262	void selection_extend (int x, int y, int flag);
1263	void selection_rotate (int x, int y);	1263	void selection_rotate (int x, int y);
1264		1264
1265	/* screen (!) */
1266	void scr_blank_line (text_t et, rend_t er, unsigned int width, rend_t efs);
1267	void scr_blank_screen_mem (text_t tp, rend_t rp, unsigned int row, rend_t efs);
1268	int scr_scroll_text (int row1, int row2, int count, int spec);
1269	void scr_reset ();
1270	void scr_reset_realloc ();
1271	void scr_release ();
1272	void scr_clear (bool really = false);
1273	void scr_refresh (unsigned char refresh_type);
1274	bool scr_refresh_rend (rend_t mask, rend_t value);
1275	void scr_erase_screen (int mode);
1276	void scr_touch (bool refresh);
1277	void scr_expose (int x, int y, int width, int height, bool refresh);
1278	void scr_remap_chars ();
1279	void scr_remap_chars (text_t tp, rend_t rp);
1280
1281	/* autoconvert */	1265	/* autoconvert */
1282		1266
1283	// command.C	1267	// command.C
1284	void lookup_key (XKeyEvent &ev);	1268	void lookup_key (XKeyEvent &ev);
1285	unsigned int cmd_write (const unsigned char *str, unsigned int count);	1269	unsigned int cmd_write (const unsigned char *str, unsigned int count);
…		…
1291		1275
1292	bool cmd_parse ();	1276	bool cmd_parse ();
1293	void mouse_report (XButtonEvent &ev);	1277	void mouse_report (XButtonEvent &ev);
1294	void button_press (XButtonEvent &ev);	1278	void button_press (XButtonEvent &ev);
1295	void button_release (XButtonEvent &ev);	1279	void button_release (XButtonEvent &ev);
		1280	void focus_in ();
		1281	void focus_out ();
1296	int check_our_parents ();	1282	int check_our_parents ();
1297	#ifdef PRINTPIPE	1283	#ifdef PRINTPIPE
1298	FILE *popen_printer ();	1284	FILE *popen_printer ();
1299	int pclose_printer (FILE *stream);	1285	int pclose_printer (FILE *stream);
1300	#endif	1286	#endif
…		…
1317	void Get_Colours ();	1303	void Get_Colours ();
1318	void get_ourmods ();	1304	void get_ourmods ();
1319	// logging.C	1305	// logging.C
1320	void makeutent (const char pty, const char hostname);	1306	void makeutent (const char pty, const char hostname);
1321	void cleanutent ();	1307	void cleanutent ();
1322	// main.C;	1308	// main.C
1323	void privileges (int mode);
1324	void privileged_utmp (char action);	1309	void privileged_utmp (rxvt_privaction action);
1325	void privileged_ttydev (char action);	1310	bool set_fonts ();
1326	bool change_font (const char *fontname);	1311	void set_string_property (Atom prop, const char *str, int len = -1);
1327	bool font_up_down (int n, int direction);	1312	void set_utf8_property (Atom prop, const char *str, int len = -1);
1328	void set_title (const char *str);	1313	void set_title (const char *str);
1329	void set_icon_name (const char *str);	1314	void set_icon_name (const char *str);
1330	void set_window_color (int idx, const char *color);	1315	void set_window_color (int idx, const char *color);
1331	void set_colorfgbg ();	1316	void set_colorfgbg ();
1332	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1317	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1333	void set_widthheight (unsigned int width, unsigned int height);	1318	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1334		1319
1335	#ifdef MENUBAR	1320	#ifdef MENUBAR
1336	// menubar.C	1321	// menubar.C
1337	void menuitem_free (menu_t menu, menuitem_t item);	1322	void menuitem_free (menu_t menu, menuitem_t item);
1338	int action_dispatch (action_t *action);	1323	int action_dispatch (action_t *action);
…		…
1364	void menubar_control (XButtonEvent &ev);	1349	void menubar_control (XButtonEvent &ev);
1365	void map_menuBar (int map);	1350	void map_menuBar (int map);
1366	#endif	1351	#endif
1367		1352
1368	// screen.C	1353	// screen.C
		1354
		1355	void lalloc (line_t &l)
		1356	{
		1357	l.t = (text_t *)talloc->alloc ();
		1358	l.r = (rend_t *)ralloc->alloc ();
		1359	}
		1360
		1361	#if 0
		1362	void lfree (line_t &l)
		1363	{
		1364	talloc->free (l.t);
		1365	ralloc->free (l.r);
		1366	}
		1367	#endif
		1368
		1369	void lresize (line_t &l)
		1370	{
		1371	if (!l.t)
		1372	return;
		1373
		1374	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
		1375	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
		1376
		1377	l.l = min (l.l, ncol);
		1378
		1379	if (ncol > prev_ncol)
		1380	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
		1381	}
		1382
		1383	int fgcolor_of (rend_t r)
		1384	{
		1385	int base = GET_BASEFG (r);
		1386	#ifndef NO_BRIGHTCOLOR
		1387	if (r & RS_Bold
		1388	# if ENABLE_STYLES
		1389	&& OPTION (Opt_intensityStyles)
		1390	# endif
		1391	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
		1392	base += minBrightCOLOR - minCOLOR;
		1393	#endif
		1394	return base;
		1395	}
		1396
		1397	int bgcolor_of (rend_t r)
		1398	{
		1399	int base = GET_BASEBG (r);
		1400	#ifndef NO_BRIGHTCOLOR
		1401	if (r & RS_Blink
		1402	# if ENABLE_STYLES
		1403	&& OPTION (Opt_intensityStyles)
		1404	# endif
		1405	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
		1406	base += minBrightCOLOR - minCOLOR;
		1407	#endif
		1408	return base;
		1409	}
		1410
		1411	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
		1412	void scr_blank_screen_mem (line_t &l, rend_t efs);
		1413	int scr_scroll_text (int row1, int row2, int count);
		1414	void scr_reset ();
		1415	void scr_release ();
		1416	void scr_clear (bool really = false);
		1417	void scr_refresh (unsigned char refresh_type);
		1418	bool scr_refresh_rend (rend_t mask, rend_t value);
		1419	void scr_erase_screen (int mode);
		1420	#if ENABLE_FRILLS
		1421	void scr_erase_savelines ();
		1422	void scr_backindex ();
		1423	void scr_forwardindex ();
		1424	#endif
		1425	void scr_touch (bool refresh);
		1426	void scr_expose (int x, int y, int width, int height, bool refresh);
		1427	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
		1428	void scr_recolour ();
		1429	void scr_remap_chars ();
		1430	void scr_remap_chars (const line_t &l);
		1431
1369	void scr_poweron ();	1432	void scr_poweron ();
1370	void scr_cursor (int mode);	1433	void scr_cursor (int mode);
		1434	void scr_do_wrap ();
1371	int scr_change_screen (int scrn);	1435	int scr_change_screen (int scrn);
1372	void scr_color (unsigned int color, int fgbg);	1436	void scr_color (unsigned int color, int fgbg);
1373	void scr_rendition (int set, int style);	1437	void scr_rendition (int set, int style);
1374	void scr_add_lines (const unicode_t *str, int nlines, int len);	1438	void scr_add_lines (const unicode_t *str, int nlines, int len);
1375	void scr_backspace ();	1439	void scr_backspace ();
1376	void scr_tab (int count);	1440	void scr_tab (int count, bool ht = false);
1377	void scr_backindex ();
1378	void scr_forwardindex ();
1379	void scr_gotorc (int row, int col, int relative);	1441	void scr_gotorc (int row, int col, int relative);
1380	void scr_index (enum page_dirn direction);	1442	void scr_index (enum page_dirn direction);
1381	void scr_erase_line (int mode);	1443	void scr_erase_line (int mode);
1382	void scr_E ();	1444	void scr_E ();
1383	void scr_insdel_lines (int count, int insdel);	1445	void scr_insdel_lines (int count, int insdel);
…		…
1393	void set_font_style ();	1455	void set_font_style ();
1394	void scr_charset_choose (int set);	1456	void scr_charset_choose (int set);
1395	void scr_charset_set (int set, unsigned int ch);	1457	void scr_charset_set (int set, unsigned int ch);
1396	int scr_move_to (int y, int len);	1458	int scr_move_to (int y, int len);
1397	int scr_page (enum page_dirn direction, int nlines);	1459	int scr_page (enum page_dirn direction, int nlines);
1398	int scr_changeview (uint16_t oldviewstart);	1460	int scr_changeview (unsigned int oldviewstart);
1399	void scr_bell ();	1461	void scr_bell ();
1400	void scr_printscreen (int fullhist);	1462	void scr_printscreen (int fullhist);
1401	void scr_reverse_selection ();	1463	void scr_reverse_selection ();
1402	void scr_dump (int fd);	1464	void scr_dump (int fd);
1403	void selection_check (int check_more);	1465	void selection_check (int check_more);
1404	int selection_paste (Window win, Atom prop, bool delete_prop);	1466	void selection_paste (Window win, Atom prop, bool delete_prop);
1405	void selection_property (Window win, Atom prop);	1467	void selection_property (Window win, Atom prop);
1406	void selection_request (Time tm, int x, int y);	1468	void selection_request (Time tm, int x, int y);
1407	int selection_request_other (Atom target, int selnum);	1469	int selection_request_other (Atom target, int selnum);
1408	void selection_clear ();	1470	void selection_clear ();
1409	void selection_make (Time tm);	1471	void selection_make (Time tm);
		1472	bool selection_grab (Time tm);
1410	void selection_start_colrow (int col, int row);	1473	void selection_start_colrow (int col, int row);
1411	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);	1474	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);
1412	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);	1475	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1413	void selection_remove_trailing_spaces ();	1476	void selection_remove_trailing_spaces ();
1414	void selection_send (const XSelectionRequestEvent &rq);	1477	void selection_send (const XSelectionRequestEvent &rq);
…		…
1444		1507
1445	// xdefaults.C	1508	// xdefaults.C
1446	void get_options (int argc, const char const argv);	1509	void get_options (int argc, const char const argv);
1447	int parse_keysym (const char str, const char arg);	1510	int parse_keysym (const char str, const char arg);
1448	void get_xdefaults (FILE stream, const char name);	1511	void get_xdefaults (FILE stream, const char name);
1449	void extract_resources (Display display, const char name);	1512	void extract_resources ();
1450	// xpm.C	1513	// xpm.C
1451	int scale_pixmap (const char *geom);	1514	int scale_pixmap (const char *geom);
1452	void resize_pixmap ();	1515	void resize_pixmap ();
1453	Pixmap set_bgPixmap (const char *file);	1516	Pixmap set_bgPixmap (const char *file);
1454	};	1517	};
…		…
1461	#ifdef PROTOTYPES	1524	#ifdef PROTOTYPES
1462	# define __PROTO(p) p	1525	# define __PROTO(p) p
1463	#else	1526	#else
1464	# define __PROTO(p) ()	1527	# define __PROTO(p) ()
1465	#endif	1528	#endif
1466	#include "protos.h"
1467		1529
1468	#ifdef DEBUG_malloc	1530	#ifdef DEBUG_malloc
1469	# include "dmalloc.h" /* This comes last */	1531	# include "dmalloc.h" /* This comes last */
1470	#endif	1532	#endif
1471		1533

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.91 by root, Fri Aug 13 18:38:23 2004 UTC vs. Revision 1.181 by root, Mon Jan 2 17:17:02 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.91 by root, Fri Aug 13 18:38:23 2004 UTC vs.
Revision 1.181 by root, Mon Jan 2 17:17:02 2006 UTC