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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.165 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.202 by root, Fri Jan 13 05:13:09 2006 UTC

…		…
18	#include "encoding.h"	18	#include "encoding.h"
19	#include "rxvtfont.h"	19	#include "rxvtfont.h"
20	#include "rxvttoolkit.h"	20	#include "rxvttoolkit.h"
21	#include "iom.h"	21	#include "iom.h"
22	#include "salloc.h"	22	#include "salloc.h"
		23
		24	#include "rxvtperl.h"
		25
		26	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
		27	# define ENABLE_OVERLAY 1
		28	#endif
		29
		30	#if ENABLE_PERL
		31	# define ENABLE_FRILLS
		32	#endif
23		33
24	#if ENABLE_FRILLS	34	#if ENABLE_FRILLS
25	# define ENABLE_XEMBED 1	35	# define ENABLE_XEMBED 1
26	# define ENABLE_EWMH 1	36	# define ENABLE_EWMH 1
27	# define CURSOR_BLINK 1	37	# define CURSOR_BLINK 1
…		…
41	#if defined (sun) && !defined (__sun__)	51	#if defined (sun) && !defined (__sun__)
42	# define __sun__ 1	52	# define __sun__ 1
43	#endif	53	#endif
44		54
45	#ifndef HAVE_XPOINTER	55	#ifndef HAVE_XPOINTER
46	typedef char *XPointer;	56	typedef char *XPointer;
47	#endif	57	#endif
48		58
49	#ifdef HAVE_TERMIOS_H	59	#ifdef HAVE_TERMIOS_H
50	# include <termios.h>	60	# include <termios.h>
51	typedef struct termios ttymode_t;	61	typedef struct termios ttymode_t;
…		…
70		80
71	#ifndef STDIN_FILENO	81	#ifndef STDIN_FILENO
72	# define STDIN_FILENO 0	82	# define STDIN_FILENO 0
73	# define STDOUT_FILENO 1	83	# define STDOUT_FILENO 1
74	# define STDERR_FILENO 2	84	# define STDERR_FILENO 2
75	#endif
76
77	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_PTMX)
79	# define NO_SETOWNER_TTYDEV 1
80	# endif
81	#endif
82	#if defined(__CYGWIN32__) \|\| defined(PTYS_ARE_OPENPTY)
83	# define NO_SETOWNER_TTYDEV 1
84	#endif	85	#endif
85		86
86	/*	87	/*
87	*****************************************************************************	88	*****************************************************************************
88	* PROTOTYPES	89	* PROTOTYPES
…		…
120	char * rxvt_File_find (const char file, const char ext, const char *path);	121	char * rxvt_File_find (const char file, const char ext, const char *path);
121	void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);	122	void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122	void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);	123	void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
123	void rxvt_usleep (int usecs);	124	void rxvt_usleep (int usecs);
124		125
		126	/////////////////////////////////////////////////////////////////////////////
		127
		128	// temporarily replace the process environment
		129	extern char **environ;
		130	extern char **rxvt_environ; // the original environ pointer
		131
		132	inline void set_environ (stringvec *envv)
		133	{
		134	if (envv)
		135	environ = (char **)envv->begin ();
		136	}
		137
		138	inline void set_environ (char **envv)
		139	{
		140	if (envv)
		141	environ = envv;
		142	}
		143
125	/*	144	/*
126	*****************************************************************************	145	*****************************************************************************
127	* STRUCTURES AND TYPEDEFS	146	* STRUCTURES AND TYPEDEFS
128	*****************************************************************************	147	*****************************************************************************
129	*/	148	*/
…		…
162	Time time; /* milliseconds */	181	Time time; /* milliseconds */
163	unsigned int state; /* key or button mask */	182	unsigned int state; /* key or button mask */
164	unsigned int button; /* detail */	183	unsigned int button; /* detail */
165	};	184	};
166		185
167	#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
168	#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
169	#define SWAP_IT(one, two, typeof) \
170	do { \
171	typeof swapittmp; \
172	(swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
173	} while (/* CONSTCOND */ 0)
174	#define BOUND_POSITIVE_INT16(val) \
175	(int16_t) ((val) <= 0 \
176	? 0 \
177	: min ((val), (((uint16_t)-1)>>1)))
178
179	#if ENABLE_FRILLS	186	#if ENABLE_FRILLS
180	typedef struct _mwmhints {	187	typedef struct _mwmhints {
181	CARD32 flags;	188	CARD32 flags;
182	CARD32 functions;	189	CARD32 functions;
183	CARD32 decorations;	190	CARD32 decorations;
…		…
230		237
231	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)	238	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
232	# define NO_MOUSE_REPORT_SCROLLBAR 1	239	# define NO_MOUSE_REPORT_SCROLLBAR 1
233	#endif	240	#endif
234		241
235	#ifdef NO_RESOURCES
236	# undef USE_XGETDEFAULT
237	#endif
238
239	#if ISO_14755
240	# define ENABLE_OVERLAY 1
241	#endif
242
243	/* now look for other badly set stuff */	242	/* now look for other badly set stuff */
244		243
245	#if !defined (EACCESS) && defined(EAGAIN)	244	#if !defined (EACCESS) && defined(EAGAIN)
246	# define EACCESS EAGAIN	245	# define EACCESS EAGAIN
247	#endif	246	#endif
…		…
259	# define HAVE_SCROLLBARS 1	258	# define HAVE_SCROLLBARS 1
260	#endif	259	#endif
261		260
262	/* width of scrollBar, menuBar shadow, must be 1 or 2 */	261	/* width of scrollBar, menuBar shadow, must be 1 or 2 */
263	#ifdef HALFSHADOW	262	#ifdef HALFSHADOW
264	# define SHADOW 1	263	# define MENU_SHADOW 1
265	#else	264	#else
266	# define SHADOW 2	265	# define MENU_SHADOW 2
267	#endif	266	#endif
268		267
269	#define R_SB_ALIGN_CENTRE 0	268	#define R_SB_ALIGN_CENTRE 0
270	#define R_SB_ALIGN_TOP 1	269	#define R_SB_ALIGN_TOP 1
271	#define R_SB_ALIGN_BOTTOM 2	270	#define R_SB_ALIGN_BOTTOM 2
…		…
363	#define FONT_DN "#-"	362	#define FONT_DN "#-"
364	#define FONT_UP "#+"	363	#define FONT_UP "#+"
365		364
366	/* flags for rxvt_scr_gotorc () */	365	/* flags for rxvt_scr_gotorc () */
367	enum {	366	enum {
368	C_RELATIVE = 1 , /* col movement is relative */	367	C_RELATIVE = 1, /* col movement is relative */
369	R_RELATIVE = 2, /* row movement is relative */	368	R_RELATIVE = 2, /* row movement is relative */
370	RELATIVE = 1 \| 2,	369	RELATIVE = C_RELATIVE \| R_RELATIVE,
371	};	370	};
372		371
373	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */	372	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
374	enum {	373	enum {
375	INSERT = -1, /* don't change these values */	374	INSERT = -1, /* don't change these values */
…		…
388	enum {	387	enum {
389	PRIMARY = 0,	388	PRIMARY = 0,
390	SECONDARY,	389	SECONDARY,
391	};	390	};
392		391
393	#define RS_None 0 /* Normal */	392	#define RS_None 0
394		393
395	#define RS_fgMask 0x0000007fUL /* 128 colors */	394	#define RS_fgMask 0x0000007fUL // 128 colors
396	#define RS_bgMask 0x00003f80UL /* 128 colors */	395	#define RS_bgMask 0x00003f80UL // 128 colors
397		396
398	// font styles	397	// font styles
399	#define RS_Bold 0x00004000UL // value 1	398	#define RS_Bold 0x00004000UL // value 1
400	#define RS_Italic 0x00008000UL // value 2	399	#define RS_Italic 0x00008000UL // value 2
401		400
402	// fake styles	401	// fake styles
403	#define RS_Blink 0x00010000UL /* blink */	402	#define RS_Blink 0x00010000UL // blink
404	#define RS_RVid 0x00020000UL /* reverse video */	403	#define RS_RVid 0x00020000UL // reverse video
405	#define RS_Uline 0x00040000UL /* underline */	404	#define RS_Uline 0x00040000UL // underline
406		405
407	// 5 bits still to go	406	// 5 custom bits for extensions
		407	#define RS_customCount 32
		408	#define RS_customMask 0x00f80000UL
		409	#define RS_customShift 19
408		410
409	// other flags	411	// other flags
410	#define RS_Careful 0x80000000UL /* be careful when drawing these */	412	#define RS_Careful 0x80000000UL /* be careful when drawing these */
411		413
412	#define RS_styleCount 4	414	#define RS_styleCount 4
…		…
454	XTerm_property = 3, // change X property	456	XTerm_property = 3, // change X property
455	XTerm_Color = 4, // change colors	457	XTerm_Color = 4, // change colors
456	XTerm_Color00 = 10, // not implemented, CLASH!	458	XTerm_Color00 = 10, // not implemented, CLASH!
457	XTerm_Color01 = 11, // not implemented	459	XTerm_Color01 = 11, // not implemented
458	XTerm_Color_cursor = 12, // change actual 'Cursor' color	460	XTerm_Color_cursor = 12, // change actual 'Cursor' color
459	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color	461	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
460	XTerm_Color_pointer_bg = 14, // not implemented	462	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
461	XTerm_Color05 = 15, // not implemented	463	XTerm_Color05 = 15, // not implemented (tektronix fg)
462	XTerm_Color06 = 16, // not implemented	464	XTerm_Color06 = 16, // not implemented (tektronix bg)
463	XTerm_Color_RV = 17, // change actual 'Highlight' color	465	XTerm_Color_RV = 17, // change actual 'Highlight' color
464	XTerm_logfile = 46, // not implemented	466	XTerm_logfile = 46, // not implemented
465	XTerm_font = 50,	467	XTerm_font = 50,
466		468
467	XTerm_konsole30 = 30, // reserved for konsole	469	XTerm_konsole30 = 30, // reserved for konsole
468	XTerm_konsole31 = 31, // reserved for konsole	470	XTerm_konsole31 = 31, // reserved for konsole
469	XTerm_emacs51 = 51, // reserved for emacs shell	471	XTerm_emacs51 = 51, // reserved for emacs shell
470	/*	472	/*
471	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)	473	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)
		474	* at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
472	*/	475	*/
473	XTerm_Color_BD = 18, // change actual 'Bold' color	476	Rxvt_Color_BD = 18, // change actual 'Bold' color
474	XTerm_Color_UL = 19, // change actual 'Underline' color	477	Rxvt_Color_UL = 19, // change actual 'Underline' color
475	XTerm_Pixmap = 20, // new bg pixmap	478	Rxvt_Pixmap = 20, // new bg pixmap
476	XTerm_restoreFG = 39, // change default fg color	479	Rxvt_restoreFG = 39, // change default fg color
477	XTerm_restoreBG = 49, // change default bg color	480	Rxvt_restoreBG = 49, // change default bg color
478	XTerm_dumpscreen = 55, // dump scrollback and all of screen	481	Rxvt_dumpscreen = 55, // dump scrollback and all of screen
479		482
480	URxvt_locale = 701, // change locale	483	URxvt_locale = 701, // change locale
481	URxvt_Menu = 703, // set menu item	484	URxvt_Menu = 703, // set menu item
482	URxvt_Color_IT = 704, // change actual 'Italic' colour	485	URxvt_Color_IT = 704, // change actual 'Italic' colour
483	URxvt_Color_tint = 705, // change actual tint colour	486	URxvt_Color_tint = 705, // change actual tint colour
		487	URxvt_Color_BD = 706,
		488	URxvt_Color_UL = 707,
484		489
485	URxvt_font = 710,	490	URxvt_font = 710,
486	URxvt_boldFont = 711,	491	URxvt_boldFont = 711,
487	URxvt_italicFont = 712,	492	URxvt_italicFont = 712,
488	URxvt_boldItalicFont = 713,	493	URxvt_boldItalicFont = 713,
489		494
490	URxvt_view_up = 720,	495	URxvt_view_up = 720,
491	URxvt_view_down = 721,	496	URxvt_view_down = 721,
		497
		498	URxvt_perl = 777,
492	};	499	};
493		500
494	/* Words starting with `Color_' are colours. Others are counts */	501	/* Words starting with `Color_' are colours. Others are counts */
495	/*	502	/*
496	* The PixColor and rendition colour usage should probably be decoupled	503	* The PixColor and rendition colour usage should probably be decoupled
…		…
573		580
574	/*	581	/*
575	* Resource list	582	* Resource list
576	*/	583	*/
577	enum {	584	enum {
578	Rs_display_name = 0,	585	# define def(name) Rs_ ## name,
579	Rs_term_name,	586	# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
580	Rs_iconName,	587	# include "rsinc.h"
581	Rs_geometry,	588	# undef def
582	Rs_reverseVideo,	589	# undef reserve
583	Rs_color,
584	_Rs_color = Rs_color + NRS_COLORS - 1,
585	Rs_font,
586	#if ENABLE_STYLES
587	Rs_boldFont,
588	Rs_italicFont,
589	Rs_boldItalicFont,
590	#endif
591	Rs_name,
592	Rs_title,
593	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
594	Rs_path,
595	#endif
596	#ifdef XPM_BACKGROUND
597	Rs_backgroundPixmap,
598	#endif
599	#if (MENUBAR_MAX)
600	Rs_menu,
601	#endif
602	Rs_loginShell,
603	Rs_jumpScroll,
604	#ifdef HAVE_SCROLLBARS
605	Rs_scrollBar,
606	Rs_scrollBar_right,
607	Rs_scrollBar_floating,
608	Rs_scrollBar_align,
609	Rs_scrollstyle, /* Rs_scrollBar_style */
610	Rs_scrollBar_thickness,
611	#endif
612	Rs_scrollTtyOutput,
613	Rs_scrollTtyKeypress,
614	Rs_scrollWithBuffer,
615	Rs_saveLines,
616	Rs_utmpInhibit,
617	Rs_visualBell,
618	#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
619	Rs_mapAlert,
620	#endif
621	#ifdef META8_OPTION
622	Rs_meta8,
623	#endif
624	#ifdef MOUSE_WHEEL
625	Rs_mouseWheelScrollPage,
626	#endif
627	#ifndef NO_BACKSPACE_KEY
628	Rs_backspace_key,
629	#endif
630	#ifndef NO_DELETE_KEY
631	Rs_delete_key,
632	#endif
633	Rs_selectstyle,
634	#ifdef PRINTPIPE
635	Rs_print_pipe,
636	#endif
637	#ifdef USE_XIM
638	Rs_preeditType,
639	Rs_inputMethod,
640	#endif
641	#ifdef TRANSPARENT
642	Rs_transparent,
643	Rs_transparent_all,
644	#endif
645	#if ENABLE_FRILLS
646	Rs_ext_bwidth,
647	Rs_int_bwidth,
648	Rs_borderLess,
649	Rs_lineSpace,
650	Rs_pty_fd,
651	Rs_cursorUnderline,
652	#endif
653	#if CURSOR_BLINK
654	Rs_cursorBlink,
655	#endif
656	#if ENABLE_XEMBED
657	Rs_embed,
658	#endif
659	Rs_cutchars,
660	Rs_modifier,
661	Rs_answerbackstring,
662	Rs_tripleclickwords,
663	Rs_insecure,
664	Rs_pointerBlank,
665	Rs_pointerBlankDelay,
666	Rs_imLocale,
667	Rs_imFont,
668	Rs_pastableTabs,
669	#ifndef NO_SECONDARY_SCREEN
670	Rs_secondaryScreen,
671	Rs_secondaryScroll,
672	#endif
673	#ifdef OFF_FOCUS_FADING
674	Rs_fade,
675	#endif
676	#ifdef TINTING
677	Rs_shade,
678	#endif
679	NUM_RESOURCES	590	NUM_RESOURCES
680	};	591	};
681		592
682	// see init.C:xa_names, which must be kept in sync	593	// see init.C:xa_names, which must be kept in sync
683	enum {	594	enum {
…		…
758	#endif	669	#endif
759		670
760	// do not change these constants lightly, there are many interdependencies	671	// do not change these constants lightly, there are many interdependencies
761	#define IMBUFSIZ 128 // input modifier buffer sizes	672	#define IMBUFSIZ 128 // input modifier buffer sizes
762	#define KBUFSZ 512 // size of keyboard mapping buffer	673	#define KBUFSZ 512 // size of keyboard mapping buffer
763	#define CBUFSIZ 4096 // size of command buffer	674	#define CBUFSIZ 2048 // size of command buffer
764	#define UBUFSIZ 4096 // character buffer	675	#define UBUFSIZ 2048 // character buffer
765		676
766	#ifndef PATH_MAX	677	#ifndef PATH_MAX
767	# define PATH_MAX 16384	678	# define PATH_MAX 16384
768	#endif	679	#endif
769		680
…		…
797	/*	708	/*
798	*****************************************************************************	709	*****************************************************************************
799	* MACRO DEFINES	710	* MACRO DEFINES
800	*****************************************************************************	711	*****************************************************************************
801	*/	712	*/
802	#define memset(x, y, z) memset((x), (y), (size_t)(z))
803	#define memcpy(x, y, z) memcpy((void )(x), (const void )(y), (z))
804	#define memmove(x, y, z) memmove((void )(x), (const void )(y), (z))
805	#define strcasecmp(x, y) strcasecmp((x), (y))
806	#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
807	#define strcpy(x, y) strcpy((char )(x), (const char )(y))
808	#define strncpy(x, y, z) strncpy((char )(x), (const char )(y), (z))
809	#define strcmp(x, y) strcmp((const char )(x), (const char )(y))
810	#define strncmp(x, y, z) strncmp((const char )(x), (const char )(y), (z))
811	#define strcat(x, y) strcat((char )(x), (const char )(y))
812	#define strncat(x, y, z) strncat((char )(x), (const char )(y), (z))
813	#define strdup(x) strdup((const char *)(x))
814	#define strlen(x) strlen((const char *)(x))
815	#define strchr(x, y) strchr((const char *)(x), (int)(y))
816	#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
817
818	#define dDisp Display *disp = display->display	713	#define dDisp Display *disp = display->display
819		714
820	/* convert pixel dimensions to row/column values. Everything as int32_t */	715	/* convert pixel dimensions to row/column values. Everything as int32_t */
821	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	716	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
822	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	717	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
…		…
825	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	720	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
826	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	721	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
827	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)	722	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
828	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)	723	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
829		724
830	#define TermWin_TotalWidth() ((int32_t)this->width)	725	#define OPTION(opt) (options & (opt))
831	#define TermWin_TotalHeight() ((int32_t)this->height)	726	#define DEFAULT_OPTIONS (Opt_scrollBar \| Opt_scrollTtyOutput \
		727	\| Opt_jumpScroll \| Opt_secondaryScreen \
		728	\| Opt_pastableTabs \| Opt_intensityStyles)
832		729
833	#define LINENO(n) (((n) + term_start + total_rows) % total_rows)	730	// for m >= -n, ensure remainder lies between 0..n-1
		731	#define MOD(m,n) (((m) + (n)) % (n))
		732
		733	#define LINENO(n) MOD (term_start + int(n), total_rows)
834	#define ROW(n) (save [LINENO (n)])	734	#define ROW(n) row_buf [LINENO (n)]
835		735
836	/* how to build & extract colors and attributes */	736	/* how to build & extract colors and attributes */
837	#define GET_BASEFG(x) (((x) & RS_fgMask))	737	#define GET_BASEFG(x) (((x) & RS_fgMask))
838	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	738	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
839	#ifndef NO_BRIGHTCOLOR
840	# define GET_FGCOLOR(x) \
841	((((x) & RS_Bold) == 0 \
842	\|\| GET_BASEFG (x) < minCOLOR \
843	\|\| GET_BASEFG (x) >= minBrightCOLOR) \
844	? GET_BASEFG (x) \
845	: (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
846	# define GET_BGCOLOR(x) \
847	((((x) & RS_Blink) == 0 \
848	\|\| GET_BASEBG (x) < minCOLOR \
849	\|\| GET_BASEBG (x) >= minBrightCOLOR) \
850	? GET_BASEBG (x) \
851	: (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
852	#else
853	# define GET_FGCOLOR(x) GET_BASEFG(x)
854	# define GET_BGCOLOR(x) GET_BASEBG(x)
855	#endif
856		739
857	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)	740	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
858	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))	741	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))
859		742
860	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)	743	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
…		…
910	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	793	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
911	- scrollbar_minheight ())	794	- scrollbar_minheight ())
912		795
913	#if (MENUBAR_MAX > 1)	796	#if (MENUBAR_MAX > 1)
914	/* rendition style flags */	797	/* rendition style flags */
915	# define menuBar_height() (fheight + SHADOW)	798	# define menuBar_height() (fheight + MENU_SHADOW)
916	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	799	# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
917	# define isMenuBarWindow(w) ((w) == menuBar.win)	800	# define isMenuBarWindow(w) ((w) == menuBar.win)
918	#else	801	#else
919	# define menuBar_height() (0)	802	# define menuBar_height() (0)
920	# define menuBar_TotalHeight() (0)	803	# define menuBar_TotalHeight() (0)
921	# define isMenuBarWindow(w) (0)	804	# define isMenuBarWindow(w) (0)
…		…
967	#endif	850	#endif
968		851
969	extern class rxvt_failure_exception { } rxvt_failure_exception;	852	extern class rxvt_failure_exception { } rxvt_failure_exception;
970		853
971	typedef callback1<void, const char *> log_callback;	854	typedef callback1<void, const char *> log_callback;
		855	typedef callback1<int, int> getfd_callback;
972		856
973	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);	857	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
974	extern void rxvt_log (const char *fmt, ...);	858	extern void rxvt_log (const char *fmt, ...);
975	extern void rxvt_warn (const char *fmt, ...);	859	extern void rxvt_warn (const char *fmt, ...);
976	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	860	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
977	extern void rxvt_exit_failure () __attribute__ ((noreturn));	861	extern void rxvt_exit_failure () __attribute__ ((noreturn));
978		862
979	#define SET_LOCALE(locale) rxvt_set_locale (locale)	863	#define SET_LOCALE(locale) rxvt_set_locale (locale)
980	extern bool rxvt_set_locale (const char *locale);	864	extern bool rxvt_set_locale (const char *locale);
		865	extern void rxvt_push_locale (const char *locale);
		866	extern void rxvt_pop_locale ();
981		867
982	/*
983	*****************************************************************************	868	/****************************************************************************/
984	* VARIABLES	869
985	*****************************************************************************
986	*/
987	#ifdef MENUBAR	870	#ifdef MENUBAR
988	# include "menubar.h"	871	# include "menubar.h"
989	#endif	872	#endif
990		873
991	#define BLINK_INTERVAL 0.5	874	#define BLINK_INTERVAL 0.5
…		…
998	# endif	881	# endif
999	# endif	882	# endif
1000	# define __attribute__(x)	883	# define __attribute__(x)
1001	#endif	884	#endif
1002		885
		886	/****************************************************************************/
		887
		888	#define LINE_LONGER 0x0001 // line is continued on the next row
		889	#define LINE_FILTERED 0x0002 // line has been filtered
		890	#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
		891
		892	struct line_t {
		893	text_t *t; // terminal the text
		894	rend_t *r; // rendition, uses RS_ flags
		895	tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
		896	uint32_t f; // flags
		897
		898	bool is_longer ()
		899	{
		900	return f & LINE_LONGER;
		901	}
		902
		903	void is_longer (int set)
		904	{
		905	if (set)
		906	f \|= LINE_LONGER;
		907	else
		908	f &= ~LINE_LONGER;
		909	}
		910
		911	void clear ()
		912	{
		913	t = 0;
		914	r = 0;
		915	l = 0;
		916	f = 0;
		917	}
		918
		919	void touch () // call whenever a line is changed/touched/updated
		920	{
		921	#if ENABLE_PERL
		922	f &= ~LINE_FILTERED;
		923	#endif
		924	}
		925
		926	void touch (int col)
		927	{
		928	max_it (l, col);
		929	touch ();
		930	}
		931	};
		932
		933	/****************************************************************************/
		934
1003	// primivite wrapper around mbstate_t to ensure initialisation	935	// primivite wrapper around mbstate_t to ensure initialisation
1004	struct mbstate {	936	struct mbstate {
1005	mbstate_t mbs;	937	mbstate_t mbs;
1006		938
1007	operator mbstate_t *() { return &mbs; }	939	operator mbstate_t *() { return &mbs; }
1008	void reset () { memset (&mbs, 0, sizeof (mbs)); }	940	void reset () { memset (&mbs, 0, sizeof (mbs)); }
1009	mbstate () { reset (); }	941	mbstate () { reset (); }
1010	};	942	};
1011		943
		944	/****************************************************************************/
		945
1012	#define UNICODE_MASK 0x1fffffUL	946	#define UNICODE_MASK 0x1fffffUL
1013		947
1014	#if UNICODE3	948	#if UNICODE3
1015	# define COMPOSE_LO 0x40000000UL	949	# define COMPOSE_LO 0x40000000UL
1016	# define COMPOSE_HI 0x400fffffUL	950	# define COMPOSE_HI 0x400fffffUL
1017	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)	951	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1018	#else	952	#else
		953	# if ENABLE_PERL
		954	# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
		955	# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
		956	# else
1019	# define COMPOSE_LO 0xd800UL	957	# define COMPOSE_LO 0xd800UL
1020	# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...	958	# define COMPOSE_HI 0xf8ffUL
1021	# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)	959	# endif
		960	# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1022	#endif	961	#endif
1023		962
1024	#if ENABLE_COMBINING	963	#if ENABLE_COMBINING
1025	// compose chars are used to represent composite characters	964	// compose chars are used to represent composite characters
1026	// that are not representable in unicode, as well as characters	965	// that are not representable in unicode, as well as characters
…		…
1046	};	985	};
1047		986
1048	extern class rxvt_composite_vec rxvt_composite;	987	extern class rxvt_composite_vec rxvt_composite;
1049	#endif	988	#endif
1050		989
		990	/****************************************************************************/
1051		991
1052	#ifdef KEYSYM_RESOURCE	992	#ifdef KEYSYM_RESOURCE
1053	class keyboard_manager;	993	class keyboard_manager;
1054	#endif	994	#endif
1055		995
1056	struct rxvt_term : zero_initialized, rxvt_vars {	996	struct rxvt_term : zero_initialized, rxvt_vars {
1057	log_callback *log_hook; // log error messages through this hook, if != 0	997	log_callback *log_hook; // log error messages through this hook, if != 0
1058		998	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
		999	#if ENABLE_PERL
		1000	rxvt_perl_term perl;
		1001	#endif
1059	struct mbstate mbstate; // current input multibyte state	1002	struct mbstate mbstate; // current input multibyte state
1060		1003
1061	unsigned char want_refresh:1,	1004	unsigned char want_refresh:1,
1062	#ifdef TRANSPARENT	1005	#ifdef TRANSPARENT
1063	want_full_refresh:1, /* awaiting full screen refresh */	1006	want_full_refresh:1, /* awaiting full screen refresh */
…		…
1213	bar_t *CurrentBar;	1156	bar_t *CurrentBar;
1214	# if ! (MENUBAR_MAX > 1)	1157	# if ! (MENUBAR_MAX > 1)
1215	bar_t BarList;	1158	bar_t BarList;
1216	# endif /* (MENUBAR_MAX > 1) */	1159	# endif /* (MENUBAR_MAX > 1) */
1217	#endif	1160	#endif
1218	#ifdef CURSOR_BLINK
1219	struct timeval lastcursorchange;
1220	#endif
1221	#ifdef POINTER_BLANK
1222	struct timeval lastmotion;
1223	#endif
1224		1161
1225	#if ENABLE_OVERLAY	1162	#if ENABLE_OVERLAY
1226	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions	1163	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1227	text_t **ov_text;	1164	text_t **ov_text;
1228	rend_t **ov_rend;	1165	rend_t **ov_rend;
…		…
1243	char env_display; / environmental variable DISPLAY */	1180	char env_display; / environmental variable DISPLAY */
1244	char env_term; / environmental variable TERM */	1181	char env_term; / environmental variable TERM */
1245	char *env_colorfgbg;	1182	char *env_colorfgbg;
1246	char *locale;	1183	char *locale;
1247	char charsets[4];	1184	char charsets[4];
1248	unsigned char v_buffer; / pointer to physical buffer */	1185	char v_buffer; / pointer to physical buffer */
1249	unsigned int v_buflen; /* size of area to write */	1186	unsigned int v_buflen; /* size of area to write */
1250	stringvec argv, envv; /* if != 0, will be freed on destroy time */	1187	stringvec argv, envv; /* if != 0, will be freed on destroy time */
1251		1188
1252	#ifdef KEYSYM_RESOURCE	1189	#ifdef KEYSYM_RESOURCE
1253	keyboard_manager *keyboard;	1190	keyboard_manager *keyboard;
1254	#endif	1191	#endif
1255		1192
1256	const char *rs[NUM_RESOURCES];	1193	const char *rs[NUM_RESOURCES];
1257	/* command input buffering */	1194	/* command input buffering */
1258	unsigned char cmdbuf_ptr, cmdbuf_endp;	1195	char cmdbuf_ptr, cmdbuf_endp;
1259	unsigned char cmdbuf_base[CBUFSIZ];	1196	char cmdbuf_base[CBUFSIZ];
1260		1197
1261	rxvt_salloc *talloc; // text line allocator	1198	rxvt_salloc *talloc; // text line allocator
1262	rxvt_salloc *ralloc; // rend line allocator	1199	rxvt_salloc *ralloc; // rend line allocator
1263		1200
1264	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1201	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
…		…
1267	// ISO 14755 entry support	1204	// ISO 14755 entry support
1268	unicode_t iso14755buf;	1205	unicode_t iso14755buf;
1269	void commit_iso14755 ();	1206	void commit_iso14755 ();
1270	int hex_keyval (XKeyEvent &ev);	1207	int hex_keyval (XKeyEvent &ev);
1271	# if ISO_14755	1208	# if ISO_14755
1272	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);	1209	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1273	void iso14755_54 (int x, int y);	1210	void iso14755_54 (int x, int y);
1274	# endif	1211	# endif
1275	#endif	1212	#endif
1276		1213
1277	// modifies first argument(!)	1214	// modifies first argument(!)
1278	void paste (unsigned char *data, unsigned int len);	1215	void paste (char *data, unsigned int len);
1279		1216
1280	void flush ();	1217	long vt_emask, vt_emask_perl;
		1218
		1219	void vt_select_input ()
		1220	{
		1221	XSelectInput (display->display, vt, vt_emask \| vt_emask_perl);
		1222	}
1281		1223
1282	#if TRANSPARENT	1224	#if TRANSPARENT
1283	void rootwin_cb (XEvent &xev);	1225	void rootwin_cb (XEvent &xev);
1284	xevent_watcher rootwin_ev;	1226	xevent_watcher rootwin_ev;
1285	#endif	1227	#endif
1286		1228
1287	void x_cb (XEvent &xev);	1229	void x_cb (XEvent &xev);
		1230	void flush ();
1288	xevent_watcher termwin_ev;	1231	xevent_watcher termwin_ev;
1289	xevent_watcher vt_ev;	1232	xevent_watcher vt_ev;
1290	#ifdef HAVE_SCROLLBARS	1233	#ifdef HAVE_SCROLLBARS
1291	xevent_watcher scrollbar_ev;	1234	xevent_watcher scrollbar_ev;
1292	#endif	1235	#endif
…		…
1324	void pointer_blank ();	1267	void pointer_blank ();
1325	#endif	1268	#endif
1326	void pointer_unblank ();	1269	void pointer_unblank ();
1327		1270
1328	void tt_printf (const char *fmt,...);	1271	void tt_printf (const char *fmt,...);
1329	void tt_write (const unsigned char *data, unsigned int len);	1272	void tt_write (const char *data, unsigned int len);
1330	void pty_write ();	1273	void pty_write ();
1331		1274
1332	void tt_winch ();	1275	void tt_winch ();
1333		1276
1334	rxvt_term ();	1277	rxvt_term ();
1335	~rxvt_term ();	1278	~rxvt_term ();
		1279	void child_exit (); // child has exited, usually destroys
1336	void destroy ();	1280	void destroy ();
1337	void emergency_cleanup ();	1281	void emergency_cleanup ();
1338		1282
1339	bool init (int argc, const char const argv);	1283	bool init (int argc, const char const argv);
1340	bool init_vars ();	1284	bool init_vars ();
1341		1285
1342	bool pty_fill ();	1286	bool pty_fill ();
1343		1287
1344	void init_secondary ();	1288	void init_secondary ();
1345	const char *init_resources (int argc, const char const *argv);	1289	const char *init_resources (int argc, const char const *argv);
		1290	const char x_resource (const char name);
1346	void init_env ();	1291	void init_env ();
1347	void set_locale (const char *locale);	1292	void set_locale (const char *locale);
1348	void init_xlocale ();	1293	void init_xlocale ();
1349	void init_command (const char const argv);	1294	void init_command (const char const argv);
1350	void run_command (const char const argv);	1295	void run_command (const char const argv);
…		…
1385		1330
1386	/* autoconvert */	1331	/* autoconvert */
1387		1332
1388	// command.C	1333	// command.C
1389	void lookup_key (XKeyEvent &ev);	1334	void lookup_key (XKeyEvent &ev);
1390	unsigned int cmd_write (const unsigned char *str, unsigned int count);	1335	unsigned int cmd_write (const char *str, unsigned int count);
1391		1336
1392	unicode_t next_char ();	1337	wchar_t next_char ();
1393	unicode_t cmd_getc ();	1338	wchar_t cmd_getc ();
1394	unicode_t next_octet ();	1339	uint32_t next_octet ();
1395	unicode_t cmd_get8 ();	1340	uint32_t cmd_get8 ();
1396		1341
1397	bool cmd_parse ();	1342	bool cmd_parse ();
1398	void mouse_report (XButtonEvent &ev);	1343	void mouse_report (XButtonEvent &ev);
1399	void button_press (XButtonEvent &ev);	1344	void button_press (XButtonEvent &ev);
1400	void button_release (XButtonEvent &ev);	1345	void button_release (XButtonEvent &ev);
…		…
1409	void process_nonprinting (unicode_t ch);	1354	void process_nonprinting (unicode_t ch);
1410	void process_escape_vt52 (unicode_t ch);	1355	void process_escape_vt52 (unicode_t ch);
1411	void process_escape_seq ();	1356	void process_escape_seq ();
1412	void process_csi_seq ();	1357	void process_csi_seq ();
1413	void process_window_ops (const int *args, unsigned int nargs);	1358	void process_window_ops (const int *args, unsigned int nargs);
1414	unsigned char *get_to_st (unicode_t &ends_how);	1359	char *get_to_st (unicode_t &ends_how);
1415	void process_dcs_seq ();	1360	void process_dcs_seq ();
1416	void process_osc_seq ();	1361	void process_osc_seq ();
1417	void process_color_seq (int report, int color, const char *str, unsigned char resp);	1362	void process_color_seq (int report, int color, const char *str, char resp);
1418	void process_xterm_seq (int op, const char *str, unsigned char resp);	1363	void process_xterm_seq (int op, const char *str, char resp);
1419	int privcases (int mode, unsigned long bit);	1364	int privcases (int mode, unsigned long bit);
1420	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1365	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1421	void process_sgr_mode (unsigned int nargs, const int *arg);	1366	void process_sgr_mode (unsigned int nargs, const int *arg);
1422	void process_graphics ();	1367	void process_graphics ();
1423	// init.C	1368	// init.C
…		…
1477	{	1422	{
1478	l.t = (text_t *)talloc->alloc ();	1423	l.t = (text_t *)talloc->alloc ();
1479	l.r = (rend_t *)ralloc->alloc ();	1424	l.r = (rend_t *)ralloc->alloc ();
1480	}	1425	}
1481		1426
		1427	#if 0
1482	void lfree (line_t &l)	1428	void lfree (line_t &l)
1483	{	1429	{
1484	talloc->free (l.t);	1430	talloc->free (l.t);
1485	ralloc->free (l.r);	1431	ralloc->free (l.r);
1486	}	1432	}
		1433	#endif
1487		1434
1488	void lresize (line_t &l)	1435	void lresize (line_t &l)
1489	{	1436	{
1490	if (!l.t)	1437	if (!l.t)
1491	return;	1438	return;
1492		1439
1493	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));	1440	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
1494	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));	1441	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
1495		1442
1496	MIN_IT (l.l, (int16_t)ncol);	1443	l.l = min (l.l, ncol);
1497		1444
1498	if (ncol > prev_ncol)	1445	if (ncol > prev_ncol)
1499	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);	1446	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
		1447	}
		1448
		1449	int fgcolor_of (rend_t r)
		1450	{
		1451	int base = GET_BASEFG (r);
		1452	#ifndef NO_BRIGHTCOLOR
		1453	if (r & RS_Bold
		1454	# if ENABLE_STYLES
		1455	&& OPTION (Opt_intensityStyles)
		1456	# endif
		1457	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
		1458	base += minBrightCOLOR - minCOLOR;
		1459	#endif
		1460	return base;
		1461	}
		1462
		1463	int bgcolor_of (rend_t r)
		1464	{
		1465	int base = GET_BASEBG (r);
		1466	#ifndef NO_BRIGHTCOLOR
		1467	if (r & RS_Blink
		1468	# if ENABLE_STYLES
		1469	&& OPTION (Opt_intensityStyles)
		1470	# endif
		1471	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
		1472	base += minBrightCOLOR - minCOLOR;
		1473	#endif
		1474	return base;
		1475	}
		1476
		1477	bool option (uint32_t opt)
		1478	{
		1479	return OPTION (opt);
		1480	}
		1481
		1482	void set_option (uint32_t opt, bool set)
		1483	{
		1484	if (set)
		1485	options \|= opt;
		1486	else
		1487	options &= ~opt;
1500	}	1488	}
1501		1489
1502	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);	1490	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1503	void scr_blank_screen_mem (line_t &l, rend_t efs);	1491	void scr_blank_screen_mem (line_t &l, rend_t efs);
1504	int scr_scroll_text (int row1, int row2, int count);	1492	int scr_scroll_text (int row1, int row2, int count);
1505	void scr_reset ();	1493	void scr_reset ();
1506	void scr_reset_realloc ();
1507	void scr_release ();	1494	void scr_release ();
1508	void scr_clear (bool really = false);	1495	void scr_clear (bool really = false);
1509	void scr_refresh (unsigned char refresh_type);	1496	void scr_refresh (unsigned char refresh_type);
1510	bool scr_refresh_rend (rend_t mask, rend_t value);	1497	bool scr_refresh_rend (rend_t mask, rend_t value);
1511	void scr_erase_screen (int mode);	1498	void scr_erase_screen (int mode);
…		…
1517	void scr_touch (bool refresh);	1504	void scr_touch (bool refresh);
1518	void scr_expose (int x, int y, int width, int height, bool refresh);	1505	void scr_expose (int x, int y, int width, int height, bool refresh);
1519	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1506	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1520	void scr_recolour ();	1507	void scr_recolour ();
1521	void scr_remap_chars ();	1508	void scr_remap_chars ();
1522	void scr_remap_chars (const line_t &l);	1509	void scr_remap_chars (line_t &l);
1523		1510
1524	void scr_poweron ();	1511	void scr_poweron ();
1525	void scr_cursor (int mode);	1512	void scr_cursor (int mode);
1526	void scr_do_wrap ();	1513	void scr_do_wrap ();
1527	int scr_change_screen (int scrn);	1514	int scr_change_screen (int scrn);
1528	void scr_color (unsigned int color, int fgbg);	1515	void scr_color (unsigned int color, int fgbg);
1529	void scr_rendition (int set, int style);	1516	void scr_rendition (int set, int style);
1530	void scr_add_lines (const unicode_t *str, int nlines, int len);	1517	void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1531	void scr_backspace ();	1518	void scr_backspace ();
1532	void scr_tab (int count, bool ht = false);	1519	void scr_tab (int count, bool ht = false);
1533	void scr_gotorc (int row, int col, int relative);	1520	void scr_gotorc (int row, int col, int relative);
1534	void scr_index (enum page_dirn direction);	1521	void scr_index (enum page_dirn direction);
1535	void scr_erase_line (int mode);	1522	void scr_erase_line (int mode);
…		…
1550	int scr_move_to (int y, int len);	1537	int scr_move_to (int y, int len);
1551	int scr_page (enum page_dirn direction, int nlines);	1538	int scr_page (enum page_dirn direction, int nlines);
1552	int scr_changeview (unsigned int oldviewstart);	1539	int scr_changeview (unsigned int oldviewstart);
1553	void scr_bell ();	1540	void scr_bell ();
1554	void scr_printscreen (int fullhist);	1541	void scr_printscreen (int fullhist);
		1542	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
		1543	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1555	void scr_reverse_selection ();	1544	void scr_reverse_selection ();
1556	void scr_dump (int fd);	1545	void scr_dump (int fd);
1557	void selection_check (int check_more);	1546	void selection_check (int check_more);
1558	void selection_paste (Window win, Atom prop, bool delete_prop);	1547	void selection_paste (Window win, Atom prop, bool delete_prop);
1559	void selection_property (Window win, Atom prop);	1548	void selection_property (Window win, Atom prop);
1560	void selection_request (Time tm, int x, int y);	1549	void selection_request (Time tm, int x, int y);
1561	int selection_request_other (Atom target, int selnum);	1550	int selection_request_other (Atom target, int selnum);
1562	void selection_clear ();	1551	void selection_clear ();
1563	void selection_make (Time tm);	1552	void selection_make (Time tm);
		1553	bool selection_grab (Time tm);
1564	void selection_start_colrow (int col, int row);	1554	void selection_start_colrow (int col, int row);
1565	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);	1555	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);
1566	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);	1556	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1567	void selection_remove_trailing_spaces ();	1557	void selection_remove_trailing_spaces ();
1568	void selection_send (const XSelectionRequestEvent &rq);	1558	void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.165 by root, Tue Dec 20 22:27:49 2005 UTC vs. Revision 1.202 by root, Fri Jan 13 05:13:09 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.165 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.202 by root, Fri Jan 13 05:13:09 2006 UTC