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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.180 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.208 by root, Mon Jan 16 15:00:20 2006 UTC

…		…
2	#define RXVT_H_	2	#define RXVT_H_
3		3
4	#include "rxvtlib.h"	4	#include "rxvtlib.h"
5		5
6	#include "feature.h"	6	#include "feature.h"
		7
		8	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
		9	# define ENABLE_OVERLAY 1
		10	#endif
		11
		12	#if ENABLE_PERL
		13	# define ENABLE_FRILLS 1
		14	# define ENABLE_COMBINING 1
		15	#endif
		16
		17	#if ENABLE_FRILLS
		18	# define ENABLE_XEMBED 1
		19	# define ENABLE_EWMH 1
		20	# define CURSOR_BLINK 1
		21	#else
		22	# define ENABLE_MINIMAL 1
		23	#endif
7		24
8	#include <limits.h>	25	#include <limits.h>
9		26
10	#include <X11/cursorfont.h>	27	#include <X11/cursorfont.h>
11	#include <X11/keysym.h>	28	#include <X11/keysym.h>
…		…
19	#include "rxvtfont.h"	36	#include "rxvtfont.h"
20	#include "rxvttoolkit.h"	37	#include "rxvttoolkit.h"
21	#include "iom.h"	38	#include "iom.h"
22	#include "salloc.h"	39	#include "salloc.h"
23		40
24	#if ENABLE_FRILLS	41	#include "rxvtperl.h"
25	# define ENABLE_XEMBED 1	42
26	# define ENABLE_EWMH 1	43	// try to avoid some macros to decrease code size, on some systems
27	# define CURSOR_BLINK 1	44	#if ENABLE_MINIMAL
		45	# define strcmp(a,b) (strcmp)(a,b)
		46	# define strlen(a) (strlen)(a)
		47	# define strcpy(a,b) (strcpy)(a,b)
		48	# define memset(a,c,l) (memset)(a,c,l)
		49	# define memcpy(a,b,l) (memcpy)(a,b,l)
28	#endif	50	#endif
29		51
30	/*	52	/*
31	*****************************************************************************	53	*****************************************************************************
32	* SYSTEM HACKS	54	* SYSTEM HACKS
…		…
41	#if defined (sun) && !defined (__sun__)	63	#if defined (sun) && !defined (__sun__)
42	# define __sun__ 1	64	# define __sun__ 1
43	#endif	65	#endif
44		66
45	#ifndef HAVE_XPOINTER	67	#ifndef HAVE_XPOINTER
46	typedef char *XPointer;	68	typedef char *XPointer;
47	#endif	69	#endif
48		70
49	#ifdef HAVE_TERMIOS_H	71	#ifdef HAVE_TERMIOS_H
50	# include <termios.h>	72	# include <termios.h>
51	typedef struct termios ttymode_t;	73	typedef struct termios ttymode_t;
…		…
111	char * rxvt_File_find (const char file, const char ext, const char *path);	133	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);	134	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);	135	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);	136	void rxvt_usleep (int usecs);
115		137
		138	/////////////////////////////////////////////////////////////////////////////
		139
		140	// temporarily replace the process environment
		141	extern char **environ;
		142	extern char **rxvt_environ; // the original environ pointer
		143
		144	inline void set_environ (stringvec *envv)
		145	{
		146	if (envv)
		147	environ = (char **)envv->begin ();
		148	}
		149
		150	inline void set_environ (char **envv)
		151	{
		152	if (envv)
		153	environ = envv;
		154	}
		155
116	/*	156	/*
117	*****************************************************************************	157	*****************************************************************************
118	* STRUCTURES AND TYPEDEFS	158	* STRUCTURES AND TYPEDEFS
119	*****************************************************************************	159	*****************************************************************************
120	*/	160	*/
121	struct grwin_t;	161	struct grwin_t;
122		162
123	/* Sanitize menubar info */
124	#ifndef MENUBAR
125	# undef MENUBAR_MAX
126	#endif
127	#ifndef MENUBAR_MAX
128	# define MENUBAR_MAX 0
129	#endif
130
131	/* If we're using either the rxvt scrollbar or menu bars, keep the	163	/* If we're using either the rxvt scrollbar or menu bars, keep the
132	* scrollColor resource.	164	* scrollColor resource.
133	*/	165	*/
134	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)	166	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)
135	# define KEEP_SCROLLCOLOR 1	167	# define KEEP_SCROLLCOLOR 1
136	#else	168	#else
137	# undef KEEP_SCROLLCOLOR	169	# undef KEEP_SCROLLCOLOR
138	#endif	170	#endif
139		171
…		…
209		241
210	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)	242	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211	# define NO_MOUSE_REPORT_SCROLLBAR 1	243	# define NO_MOUSE_REPORT_SCROLLBAR 1
212	#endif	244	#endif
213		245
214	#ifdef NO_RESOURCES
215	# undef USE_XGETDEFAULT
216	#endif
217
218	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
219	# define ENABLE_OVERLAY 1
220	#endif
221
222	/* now look for other badly set stuff */	246	/* now look for other badly set stuff */
223		247
224	#if !defined (EACCESS) && defined(EAGAIN)	248	#if !defined (EACCESS) && defined(EAGAIN)
225	# define EACCESS EAGAIN	249	# define EACCESS EAGAIN
226	#endif	250	#endif
…		…
228	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */	252	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
229	# define EXIT_SUCCESS 0 /* exit function success */	253	# define EXIT_SUCCESS 0 /* exit function success */
230	# define EXIT_FAILURE 1 /* exit function failure */	254	# define EXIT_FAILURE 1 /* exit function failure */
231	#endif	255	#endif
232		256
233	#define menuBar_esc 10
234	#define scrollBar_esc 30	257	#define scrollBar_esc 30
235	#define menuBar_margin 2 /* margin below text */
236		258
237	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(XTERM_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)	259	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(XTERM_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)
238	# define HAVE_SCROLLBARS 1	260	# define HAVE_SCROLLBARS 1
239	#endif	261	#endif
240		262
241	/* width of scrollBar, menuBar shadow, must be 1 or 2 */	263	/* width of scrollBar shadow, must be 1 or 2 */
242	#ifdef HALFSHADOW	264	#ifdef HALFSHADOW
243	# define SHADOW 1	265	# define MENU_SHADOW 1
244	#else	266	#else
245	# define SHADOW 2	267	# define MENU_SHADOW 2
246	#endif	268	#endif
247		269
248	#define R_SB_ALIGN_CENTRE 0	270	#define R_SB_ALIGN_CENTRE 0
249	#define R_SB_ALIGN_TOP 1	271	#define R_SB_ALIGN_TOP 1
250	#define R_SB_ALIGN_BOTTOM 2	272	#define R_SB_ALIGN_BOTTOM 2
…		…
436	XTerm_property = 3, // change X property	458	XTerm_property = 3, // change X property
437	XTerm_Color = 4, // change colors	459	XTerm_Color = 4, // change colors
438	XTerm_Color00 = 10, // not implemented, CLASH!	460	XTerm_Color00 = 10, // not implemented, CLASH!
439	XTerm_Color01 = 11, // not implemented	461	XTerm_Color01 = 11, // not implemented
440	XTerm_Color_cursor = 12, // change actual 'Cursor' color	462	XTerm_Color_cursor = 12, // change actual 'Cursor' color
441	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color	463	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442	XTerm_Color_pointer_bg = 14, // not implemented	464	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443	XTerm_Color05 = 15, // not implemented	465	XTerm_Color05 = 15, // not implemented (tektronix fg)
444	XTerm_Color06 = 16, // not implemented	466	XTerm_Color06 = 16, // not implemented (tektronix bg)
445	XTerm_Color_RV = 17, // change actual 'Highlight' color	467	XTerm_Color_RV = 17, // change actual 'Highlight' color
446	XTerm_logfile = 46, // not implemented	468	XTerm_logfile = 46, // not implemented
447	XTerm_font = 50,	469	XTerm_font = 50,
448		470
449	XTerm_konsole30 = 30, // reserved for konsole	471	XTerm_konsole30 = 30, // reserved for konsole
450	XTerm_konsole31 = 31, // reserved for konsole	472	XTerm_konsole31 = 31, // reserved for konsole
451	XTerm_emacs51 = 51, // reserved for emacs shell	473	XTerm_emacs51 = 51, // reserved for emacs shell
452	/*	474	/*
453	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)	475	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)
		476	* at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454	*/	477	*/
455	XTerm_Color_BD = 18, // change actual 'Bold' color	478	Rxvt_Color_BD = 18, // change actual 'Bold' color
456	XTerm_Color_UL = 19, // change actual 'Underline' color	479	Rxvt_Color_UL = 19, // change actual 'Underline' color
457	XTerm_Pixmap = 20, // new bg pixmap	480	Rxvt_Pixmap = 20, // new bg pixmap
458	XTerm_restoreFG = 39, // change default fg color	481	Rxvt_restoreFG = 39, // change default fg color
459	XTerm_restoreBG = 49, // change default bg color	482	Rxvt_restoreBG = 49, // change default bg color
460	XTerm_dumpscreen = 55, // dump scrollback and all of screen	483	Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461		484
462	URxvt_locale = 701, // change locale	485	URxvt_locale = 701, // change locale
463	URxvt_Menu = 703, // set menu item	486	URxvt_Menu = 703, // set menu item
464	URxvt_Color_IT = 704, // change actual 'Italic' colour	487	URxvt_Color_IT = 704, // change actual 'Italic' colour
465	URxvt_Color_tint = 705, // change actual tint colour	488	URxvt_Color_tint = 705, // change actual tint colour
		489	URxvt_Color_BD = 706,
		490	URxvt_Color_UL = 707,
466		491
467	URxvt_font = 710,	492	URxvt_font = 710,
468	URxvt_boldFont = 711,	493	URxvt_boldFont = 711,
469	URxvt_italicFont = 712,	494	URxvt_italicFont = 712,
470	URxvt_boldItalicFont = 713,	495	URxvt_boldItalicFont = 713,
471		496
472	URxvt_view_up = 720,	497	URxvt_view_up = 720,
473	URxvt_view_down = 721,	498	URxvt_view_down = 721,
		499
		500	URxvt_perl = 777,
474	};	501	};
475		502
476	/* Words starting with `Color_' are colours. Others are counts */	503	/* Words starting with `Color_' are colours. Others are counts */
477	/*	504	/*
478	* The PixColor and rendition colour usage should probably be decoupled	505	* The PixColor and rendition colour usage should probably be decoupled
…		…
555		582
556	/*	583	/*
557	* Resource list	584	* Resource list
558	*/	585	*/
559	enum {	586	enum {
560	Rs_display_name = 0,	587	# define def(name) Rs_ ## name,
561	Rs_term_name,	588	# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562	Rs_iconName,	589	# include "rsinc.h"
563	Rs_geometry,	590	# undef def
564	Rs_reverseVideo,	591	# undef reserve
565	Rs_color,
566	_Rs_color = Rs_color + NRS_COLORS - 1,
567	Rs_font,
568	#if ENABLE_STYLES
569	Rs_boldFont,
570	Rs_italicFont,
571	Rs_boldItalicFont,
572	Rs_intensityStyles,
573	#endif
574	Rs_name,
575	Rs_title,
576	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
577	Rs_path,
578	#endif
579	#ifdef XPM_BACKGROUND
580	Rs_backgroundPixmap,
581	#endif
582	#if (MENUBAR_MAX)
583	Rs_menu,
584	#endif
585	Rs_loginShell,
586	Rs_jumpScroll,
587	#ifdef HAVE_SCROLLBARS
588	Rs_scrollBar,
589	Rs_scrollBar_right,
590	Rs_scrollBar_floating,
591	Rs_scrollBar_align,
592	Rs_scrollstyle, /* Rs_scrollBar_style */
593	Rs_scrollBar_thickness,
594	#endif
595	Rs_scrollTtyOutput,
596	Rs_scrollTtyKeypress,
597	Rs_scrollWithBuffer,
598	Rs_saveLines,
599	Rs_utmpInhibit,
600	Rs_visualBell,
601	#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
602	Rs_mapAlert,
603	#endif
604	#ifdef META8_OPTION
605	Rs_meta8,
606	#endif
607	#ifdef MOUSE_WHEEL
608	Rs_mouseWheelScrollPage,
609	#endif
610	#ifndef NO_BACKSPACE_KEY
611	Rs_backspace_key,
612	#endif
613	#ifndef NO_DELETE_KEY
614	Rs_delete_key,
615	#endif
616	Rs_selectstyle,
617	#ifdef PRINTPIPE
618	Rs_print_pipe,
619	#endif
620	#ifdef USE_XIM
621	Rs_preeditType,
622	Rs_inputMethod,
623	#endif
624	#ifdef TRANSPARENT
625	Rs_transparent,
626	Rs_transparent_all,
627	#endif
628	#if ENABLE_FRILLS
629	Rs_pty_fd,
630	Rs_hold,
631	Rs_ext_bwidth,
632	Rs_int_bwidth,
633	Rs_borderLess,
634	Rs_lineSpace,
635	Rs_cursorUnderline,
636	#endif
637	#if CURSOR_BLINK
638	Rs_cursorBlink,
639	#endif
640	#if ENABLE_XEMBED
641	Rs_embed,
642	#endif
643	Rs_cutchars,
644	Rs_modifier,
645	Rs_answerbackstring,
646	Rs_tripleclickwords,
647	Rs_insecure,
648	Rs_pointerBlank,
649	Rs_pointerBlankDelay,
650	Rs_imLocale,
651	Rs_imFont,
652	Rs_pastableTabs,
653	#ifndef NO_SECONDARY_SCREEN
654	Rs_secondaryScreen,
655	Rs_secondaryScroll,
656	#endif
657	#ifdef OFF_FOCUS_FADING
658	Rs_fade,
659	#endif
660	#ifdef TINTING
661	Rs_shade,
662	#endif
663	NUM_RESOURCES	592	NUM_RESOURCES
664	};	593	};
665		594
666	// see init.C:xa_names, which must be kept in sync	595	// see init.C:xa_names, which must be kept in sync
667	enum {	596	enum {
…		…
717	#define PrivMode_ShiftKeys (1UL<<10)	646	#define PrivMode_ShiftKeys (1UL<<10)
718	#define PrivMode_VisibleCursor (1UL<<11)	647	#define PrivMode_VisibleCursor (1UL<<11)
719	#define PrivMode_MouseX10 (1UL<<12)	648	#define PrivMode_MouseX10 (1UL<<12)
720	#define PrivMode_MouseX11 (1UL<<13)	649	#define PrivMode_MouseX11 (1UL<<13)
721	#define PrivMode_scrollBar (1UL<<14)	650	#define PrivMode_scrollBar (1UL<<14)
722	#define PrivMode_menuBar (1UL<<15)
723	#define PrivMode_TtyOutputInh (1UL<<16)	651	#define PrivMode_TtyOutputInh (1UL<<15)
724	#define PrivMode_Keypress (1UL<<17)	652	#define PrivMode_Keypress (1UL<<16)
725	#define PrivMode_smoothScroll (1UL<<18)	653	#define PrivMode_smoothScroll (1UL<<17)
726	#define PrivMode_vt52 (1UL<<19)	654	#define PrivMode_vt52 (1UL<<18)
727	#define PrivMode_LFNL (1UL<<20)	655	#define PrivMode_LFNL (1UL<<19)
728	/* too annoying to implement X11 highlight tracking */	656	/* too annoying to implement X11 highlight tracking */
729	/* #define PrivMode_MouseX11Track (1LU<<21) */	657	/* #define PrivMode_MouseX11Track (1LU<<20) */
730		658
731	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)	659	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)
732	#define PrivMode(test,bit) \	660	#define PrivMode(test,bit) \
733	if (test) \	661	if (test) \
734	priv_modes \|= (bit); \	662	priv_modes \|= (bit); \
…		…
781	/*	709	/*
782	*****************************************************************************	710	*****************************************************************************
783	* MACRO DEFINES	711	* MACRO DEFINES
784	*****************************************************************************	712	*****************************************************************************
785	*/	713	*/
786	#define memset(x, y, z) memset((x), (y), (size_t)(z))
787	#define memcpy(x, y, z) memcpy((void )(x), (const void )(y), (z))
788	#define memmove(x, y, z) memmove((void )(x), (const void )(y), (z))
789	#define strcasecmp(x, y) strcasecmp((x), (y))
790	#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
791	#define strcpy(x, y) strcpy((char )(x), (const char )(y))
792	#define strncpy(x, y, z) strncpy((char )(x), (const char )(y), (z))
793	#define strcmp(x, y) strcmp((const char )(x), (const char )(y))
794	#define strncmp(x, y, z) strncmp((const char )(x), (const char )(y), (z))
795	#define strcat(x, y) strcat((char )(x), (const char )(y))
796	#define strncat(x, y, z) strncat((char )(x), (const char )(y), (z))
797	#define strdup(x) strdup((const char *)(x))
798	#define strlen(x) strlen((const char *)(x))
799	#define strchr(x, y) strchr((const char *)(x), (int)(y))
800	#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
801
802	#define dDisp Display *disp = display->display	714	#define dDisp Display *disp = display->display
803		715
804	/* convert pixel dimensions to row/column values. Everything as int32_t */	716	/* convert pixel dimensions to row/column values. Everything as int32_t */
805	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	717	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
806	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	718	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
…		…
809	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	721	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
810	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	722	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
811	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)	723	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
812	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)	724	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
813		725
814	#define TermWin_TotalWidth() ((int32_t)this->width)	726	#define OPTION(opt) (options & (opt))
815	#define TermWin_TotalHeight() ((int32_t)this->height)	727	#define DEFAULT_OPTIONS (Opt_scrollBar \| Opt_scrollTtyOutput \
		728	\| Opt_jumpScroll \| Opt_secondaryScreen \
		729	\| Opt_pastableTabs \| Opt_intensityStyles)
816		730
817	// for m >= -n, ensure remainder lies between 0..n-1	731	// for m >= -n, ensure remainder lies between 0..n-1
818	#define MOD(m,n) (((m) + (n)) % (n))	732	#define MOD(m,n) (((m) + (n)) % (n))
819		733
820	#define LINENO(n) MOD (term_start + int(n), total_rows)	734	#define LINENO(n) MOD (term_start + int(n), total_rows)
…		…
878	#define scrollbar_below_slider(y) ((y) > scrollBar.bot)	792	#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
879	#define scrollbar_position(y) ((y) - scrollBar.beg)	793	#define scrollbar_position(y) ((y) - scrollBar.beg)
880	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	794	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
881	- scrollbar_minheight ())	795	- scrollbar_minheight ())
882		796
883	#if (MENUBAR_MAX > 1)
884	/* rendition style flags */
885	# define menuBar_height() (fheight + SHADOW)
886	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
887	# define isMenuBarWindow(w) ((w) == menuBar.win)
888	#else
889	# define menuBar_height() (0)
890	# define menuBar_TotalHeight() (0)
891	# define isMenuBarWindow(w) (0)
892	#endif
893
894	#ifdef XPM_BACKGROUND	797	#ifdef XPM_BACKGROUND
895	# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))	798	# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
896	#else	799	#else
897	# define XPMClearArea(a, b, c, d, e, f, g)	800	# define XPMClearArea(a, b, c, d, e, f, g)
898	#endif	801	#endif
…		…
947	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	850	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
948	extern void rxvt_exit_failure () __attribute__ ((noreturn));	851	extern void rxvt_exit_failure () __attribute__ ((noreturn));
949		852
950	#define SET_LOCALE(locale) rxvt_set_locale (locale)	853	#define SET_LOCALE(locale) rxvt_set_locale (locale)
951	extern bool rxvt_set_locale (const char *locale);	854	extern bool rxvt_set_locale (const char *locale);
		855	extern void rxvt_push_locale (const char *locale);
		856	extern void rxvt_pop_locale ();
952		857
953	/*
954	*****************************************************************************	858	/****************************************************************************/
955	* VARIABLES
956	*****************************************************************************
957	*/
958	#ifdef MENUBAR
959	# include "menubar.h"
960	#endif
961		859
962	#define BLINK_INTERVAL 0.5	860	#define BLINK_INTERVAL 0.5
963	#define TEXT_BLINK_INTERVAL 0.5	861	#define TEXT_BLINK_INTERVAL 0.5
964		862
965	#ifndef __attribute__	863	#ifndef __attribute__
…		…
969	# endif	867	# endif
970	# endif	868	# endif
971	# define __attribute__(x)	869	# define __attribute__(x)
972	#endif	870	#endif
973		871
		872	/****************************************************************************/
		873
		874	#define LINE_LONGER 0x0001 // line is continued on the next row
		875	#define LINE_FILTERED 0x0002 // line has been filtered
		876	#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
		877
		878	struct line_t {
		879	text_t *t; // terminal the text
		880	rend_t *r; // rendition, uses RS_ flags
		881	tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
		882	uint32_t f; // flags
		883
		884	bool is_longer ()
		885	{
		886	return f & LINE_LONGER;
		887	}
		888
		889	void is_longer (int set)
		890	{
		891	if (set)
		892	f \|= LINE_LONGER;
		893	else
		894	f &= ~LINE_LONGER;
		895	}
		896
		897	void clear ()
		898	{
		899	t = 0;
		900	r = 0;
		901	l = 0;
		902	f = 0;
		903	}
		904
		905	void touch () // call whenever a line is changed/touched/updated
		906	{
		907	#if ENABLE_PERL
		908	f &= ~LINE_FILTERED;
		909	#endif
		910	}
		911
		912	void touch (int col)
		913	{
		914	max_it (l, col);
		915	touch ();
		916	}
		917	};
		918
		919	/****************************************************************************/
		920
974	// primivite wrapper around mbstate_t to ensure initialisation	921	// primivite wrapper around mbstate_t to ensure initialisation
975	struct mbstate {	922	struct mbstate {
976	mbstate_t mbs;	923	mbstate_t mbs;
977		924
978	operator mbstate_t *() { return &mbs; }	925	operator mbstate_t *() { return &mbs; }
979	void reset () { memset (&mbs, 0, sizeof (mbs)); }	926	void reset () { memset (&mbs, 0, sizeof (mbs)); }
980	mbstate () { reset (); }	927	mbstate () { reset (); }
981	};	928	};
982		929
		930	/****************************************************************************/
		931
983	#define UNICODE_MASK 0x1fffffUL	932	#define UNICODE_MASK 0x1fffffUL
984		933
985	#if UNICODE3	934	#if UNICODE3
986	# define COMPOSE_LO 0x40000000UL	935	# define COMPOSE_LO 0x40000000UL
987	# define COMPOSE_HI 0x400fffffUL	936	# define COMPOSE_HI 0x400fffffUL
988	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)	937	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
989	#else	938	#else
		939	# if ENABLE_PERL
		940	# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
		941	# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
		942	# else
990	# define COMPOSE_LO 0xd800UL	943	# define COMPOSE_LO 0xd800UL
991	# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...	944	# define COMPOSE_HI 0xf8ffUL
992	# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)	945	# endif
		946	# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
993	#endif	947	#endif
994		948
995	#if ENABLE_COMBINING	949	#if ENABLE_COMBINING
996	// compose chars are used to represent composite characters	950	// compose chars are used to represent composite characters
997	// that are not representable in unicode, as well as characters	951	// that are not representable in unicode, as well as characters
…		…
1017	};	971	};
1018		972
1019	extern class rxvt_composite_vec rxvt_composite;	973	extern class rxvt_composite_vec rxvt_composite;
1020	#endif	974	#endif
1021		975
		976	/****************************************************************************/
1022		977
1023	#ifdef KEYSYM_RESOURCE	978	#ifdef KEYSYM_RESOURCE
1024	class keyboard_manager;	979	class keyboard_manager;
1025	#endif	980	#endif
1026		981
1027	struct rxvt_term : zero_initialized, rxvt_vars {	982	struct rxvt_term : zero_initialized, rxvt_vars {
1028	log_callback *log_hook; // log error messages through this hook, if != 0	983	log_callback *log_hook; // log error messages through this hook, if != 0
1029	getfd_callback *getfd_hook; // convert remote to local fd, if != 0	984	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1030
1031	#if ENABLE_PERL	985	#if ENABLE_PERL
1032	void *self; // perl's $self	986	rxvt_perl_term perl;
1033	#endif	987	#endif
1034
1035	struct mbstate mbstate; // current input multibyte state	988	struct mbstate mbstate; // current input multibyte state
1036		989
1037	unsigned char want_refresh:1,	990	unsigned char want_refresh:1,
1038	#ifdef TRANSPARENT	991	#ifdef TRANSPARENT
1039	want_full_refresh:1, /* awaiting full screen refresh */	992	want_full_refresh:1, /* awaiting full screen refresh */
…		…
1094	refresh_limit,	1047	refresh_limit,
1095	last_bot, /* scrollbar last bottom position */	1048	last_bot, /* scrollbar last bottom position */
1096	last_top, /* scrollbar last top position */	1049	last_top, /* scrollbar last top position */
1097	last_state, /* scrollbar last state */	1050	last_state, /* scrollbar last state */
1098	scrollbar_len,	1051	scrollbar_len,
1099	#ifdef MENUBAR
1100	menu_readonly, /* okay to alter menu? */
1101	Arrows_x,
1102	#endif
1103	#if MENUBAR_MAX > 1
1104	Nbars,
1105	#endif
1106	window_vt_x,	1052	window_vt_x,
1107	window_vt_y,	1053	window_vt_y,
1108	window_sb_x,	1054	window_sb_x,
1109	# ifdef POINTER_BLANK	1055	# ifdef POINTER_BLANK
1110	pointerBlankDelay,	1056	pointerBlankDelay,
…		…
1119	unsigned long priv_modes,	1065	unsigned long priv_modes,
1120	SavedModes;	1066	SavedModes;
1121	/* ---------- */	1067	/* ---------- */
1122	Atom xa[NUM_XA];	1068	Atom xa[NUM_XA];
1123	/* ---------- */	1069	/* ---------- */
1124	#ifdef MENUBAR	1070	#ifdef RXVT_SCROLLBAR
1125	GC menubarGC;
1126	#endif
1127	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1128	GC scrollbarGC,	1071	GC scrollbarGC,
1129	topShadowGC,	1072	topShadowGC,
1130	botShadowGC;	1073	botShadowGC;
1131	#endif	1074	#endif
1132	#ifdef XTERM_SCROLLBAR	1075	#ifdef XTERM_SCROLLBAR
…		…
1181	row_col_t oldcursor;	1124	row_col_t oldcursor;
1182	#ifdef XPM_BACKGROUND	1125	#ifdef XPM_BACKGROUND
1183	bgPixmap_t bgPixmap;	1126	bgPixmap_t bgPixmap;
1184	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */	1127	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1185	#endif	1128	#endif
1186	#ifdef MENUBAR
1187	menu_t ActiveMenu, / currently active menu */
1188	BuildMenu; / the menu currently being built */
1189	bar_t *CurrentBar;
1190	# if ! (MENUBAR_MAX > 1)
1191	bar_t BarList;
1192	# endif /* (MENUBAR_MAX > 1) */
1193	#endif
1194	#ifdef CURSOR_BLINK
1195	struct timeval lastcursorchange;
1196	#endif
1197	#ifdef POINTER_BLANK
1198	struct timeval lastmotion;
1199	#endif
1200		1129
1201	#if ENABLE_OVERLAY	1130	#if ENABLE_OVERLAY
1202	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions	1131	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1203	text_t **ov_text;	1132	text_t **ov_text;
1204	rend_t **ov_rend;	1133	rend_t **ov_rend;
…		…
1219	char env_display; / environmental variable DISPLAY */	1148	char env_display; / environmental variable DISPLAY */
1220	char env_term; / environmental variable TERM */	1149	char env_term; / environmental variable TERM */
1221	char *env_colorfgbg;	1150	char *env_colorfgbg;
1222	char *locale;	1151	char *locale;
1223	char charsets[4];	1152	char charsets[4];
1224	unsigned char v_buffer; / pointer to physical buffer */	1153	char v_buffer; / pointer to physical buffer */
1225	unsigned int v_buflen; /* size of area to write */	1154	unsigned int v_buflen; /* size of area to write */
1226	stringvec argv, envv; /* if != 0, will be freed on destroy time */	1155	stringvec argv, envv; /* if != 0, will be freed on destroy time */
1227		1156
1228	#ifdef KEYSYM_RESOURCE	1157	#ifdef KEYSYM_RESOURCE
1229	keyboard_manager *keyboard;	1158	keyboard_manager *keyboard;
1230	#endif	1159	#endif
1231		1160
1232	const char *rs[NUM_RESOURCES];	1161	const char *rs[NUM_RESOURCES];
1233	/* command input buffering */	1162	/* command input buffering */
1234	unsigned char cmdbuf_ptr, cmdbuf_endp;	1163	char cmdbuf_ptr, cmdbuf_endp;
1235	unsigned char cmdbuf_base[CBUFSIZ];	1164	char cmdbuf_base[CBUFSIZ];
1236		1165
1237	rxvt_salloc *talloc; // text line allocator	1166	rxvt_salloc *talloc; // text line allocator
1238	rxvt_salloc *ralloc; // rend line allocator	1167	rxvt_salloc *ralloc; // rend line allocator
1239		1168
1240	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1169	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
…		…
1249	void iso14755_54 (int x, int y);	1178	void iso14755_54 (int x, int y);
1250	# endif	1179	# endif
1251	#endif	1180	#endif
1252		1181
1253	// modifies first argument(!)	1182	// modifies first argument(!)
1254	void paste (unsigned char *data, unsigned int len);	1183	void paste (char *data, unsigned int len);
1255		1184
1256	void flush ();	1185	long vt_emask, vt_emask_perl;
		1186
		1187	void vt_select_input () const
		1188	{
		1189	XSelectInput (display->display, vt, vt_emask \| vt_emask_perl);
		1190	}
1257		1191
1258	#if TRANSPARENT	1192	#if TRANSPARENT
1259	void rootwin_cb (XEvent &xev);	1193	void rootwin_cb (XEvent &xev);
1260	xevent_watcher rootwin_ev;	1194	xevent_watcher rootwin_ev;
1261	#endif	1195	#endif
1262		1196
1263	void x_cb (XEvent &xev);	1197	void x_cb (XEvent &xev);
		1198	void flush ();
1264	xevent_watcher termwin_ev;	1199	xevent_watcher termwin_ev;
1265	xevent_watcher vt_ev;	1200	xevent_watcher vt_ev;
1266	#ifdef HAVE_SCROLLBARS	1201	#ifdef HAVE_SCROLLBARS
1267	xevent_watcher scrollbar_ev;	1202	xevent_watcher scrollbar_ev;
1268	#endif	1203	#endif
1269	#ifdef MENUBAR
1270	xevent_watcher menubar_ev;
1271	#endif
1272		1204
1273	void check_cb (check_watcher &w); check_watcher check_ev;	1205	void check_cb (check_watcher &w); check_watcher check_ev;
1274	void destroy_cb (time_watcher &w); time_watcher destroy_ev;	1206	void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1275	void flush_cb (time_watcher &w); time_watcher flush_ev;	1207	void flush_cb (time_watcher &w); time_watcher flush_ev;
1276		1208
…		…
1300	void pointer_blank ();	1232	void pointer_blank ();
1301	#endif	1233	#endif
1302	void pointer_unblank ();	1234	void pointer_unblank ();
1303		1235
1304	void tt_printf (const char *fmt,...);	1236	void tt_printf (const char *fmt,...);
1305	void tt_write (const unsigned char *data, unsigned int len);	1237	void tt_write (const char *data, unsigned int len);
1306	void pty_write ();	1238	void pty_write ();
1307		1239
1308	void tt_winch ();	1240	void tt_winch ();
1309		1241
1310	rxvt_term ();	1242	rxvt_term ();
…		…
1316	bool init (int argc, const char const argv);	1248	bool init (int argc, const char const argv);
1317	bool init_vars ();	1249	bool init_vars ();
1318		1250
1319	bool pty_fill ();	1251	bool pty_fill ();
1320		1252
		1253	void make_current () const // make this the "currently active" urxvt instance
		1254	{
		1255	SET_R (this);
		1256	rxvt_set_locale (locale);
		1257	set_environ (envv);
		1258	}
		1259
1321	void init_secondary ();	1260	void init_secondary ();
1322	const char *init_resources (int argc, const char const *argv);	1261	const char *init_resources (int argc, const char const *argv);
		1262	const char x_resource (const char name);
1323	void init_env ();	1263	void init_env ();
1324	void set_locale (const char *locale);	1264	void set_locale (const char *locale);
1325	void init_xlocale ();	1265	void init_xlocale ();
1326	void init_command (const char const argv);	1266	void init_command (const char const argv);
1327	void run_command (const char const argv);	1267	void run_command (const char const argv);
…		…
1362		1302
1363	/* autoconvert */	1303	/* autoconvert */
1364		1304
1365	// command.C	1305	// command.C
1366	void lookup_key (XKeyEvent &ev);	1306	void lookup_key (XKeyEvent &ev);
1367	unsigned int cmd_write (const unsigned char *str, unsigned int count);	1307	unsigned int cmd_write (const char *str, unsigned int count);
1368		1308
1369	unicode_t next_char ();	1309	wchar_t next_char ();
1370	unicode_t cmd_getc ();	1310	wchar_t cmd_getc ();
1371	unicode_t next_octet ();	1311	uint32_t next_octet ();
1372	unicode_t cmd_get8 ();	1312	uint32_t cmd_get8 ();
1373		1313
1374	bool cmd_parse ();	1314	bool cmd_parse ();
1375	void mouse_report (XButtonEvent &ev);	1315	void mouse_report (XButtonEvent &ev);
1376	void button_press (XButtonEvent &ev);	1316	void button_press (XButtonEvent &ev);
1377	void button_release (XButtonEvent &ev);	1317	void button_release (XButtonEvent &ev);
…		…
1386	void process_nonprinting (unicode_t ch);	1326	void process_nonprinting (unicode_t ch);
1387	void process_escape_vt52 (unicode_t ch);	1327	void process_escape_vt52 (unicode_t ch);
1388	void process_escape_seq ();	1328	void process_escape_seq ();
1389	void process_csi_seq ();	1329	void process_csi_seq ();
1390	void process_window_ops (const int *args, unsigned int nargs);	1330	void process_window_ops (const int *args, unsigned int nargs);
1391	unsigned char *get_to_st (unicode_t &ends_how);	1331	char *get_to_st (unicode_t &ends_how);
1392	void process_dcs_seq ();	1332	void process_dcs_seq ();
1393	void process_osc_seq ();	1333	void process_osc_seq ();
1394	void process_color_seq (int report, int color, const char *str, unsigned char resp);	1334	void process_color_seq (int report, int color, const char *str, char resp);
1395	void process_xterm_seq (int op, const char *str, unsigned char resp);	1335	void process_xterm_seq (int op, const char *str, char resp);
1396	int privcases (int mode, unsigned long bit);	1336	int privcases (int mode, unsigned long bit);
1397	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1337	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1398	void process_sgr_mode (unsigned int nargs, const int *arg);	1338	void process_sgr_mode (unsigned int nargs, const int *arg);
1399	void process_graphics ();	1339	void process_graphics ();
1400	// init.C	1340	// init.C
…		…
1413	void set_window_color (int idx, const char *color);	1353	void set_window_color (int idx, const char *color);
1414	void set_colorfgbg ();	1354	void set_colorfgbg ();
1415	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1355	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1416	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1356	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1417		1357
1418	#ifdef MENUBAR
1419	// menubar.C
1420	void menuitem_free (menu_t menu, menuitem_t item);
1421	int action_dispatch (action_t *action);
1422	void menuarrow_free (char name);
1423	void menuarrow_add (char *string);
1424	char menu_find_base (menu_t menu, char path);
1425	menu_t menu_delete (menu_t menu);
1426	menu_t menu_add (menu_t parent, char *path);
1427	void drawbox_menubar (int x, int len, int state);
1428	void drawtriangle (int x, int y, int state);
1429	void drawbox_menuitem (int y, int state);
1430	void menu_show ();
1431	void menu_display (void (rxvt_term::*update) ());
1432	void menu_hide_all ();
1433	void menu_hide ();
1434	void menu_clear (menu_t *menu);
1435	void menubar_clear ();
1436	bar_t menubar_find (const char name);
1437	int menubar_push (const char *name);
1438	void menubar_remove (const char *name);
1439	void menubar_dump (FILE *fp);
1440	void menubar_read (const char *filename);
1441	void menubar_dispatch (char *str);
1442	void draw_Arrows (int name, int state);
1443	void menubar_expose ();
1444	int menubar_mapping (int map);
1445	int menu_select (XButtonEvent &ev);
1446	void menubar_select (XButtonEvent &ev);
1447	void menubar_control (XButtonEvent &ev);
1448	void map_menuBar (int map);
1449	#endif
1450
1451	// screen.C	1358	// screen.C
1452		1359
1453	void lalloc (line_t &l)	1360	void lalloc (line_t &l) const
1454	{	1361	{
1455	l.t = (text_t *)talloc->alloc ();	1362	l.t = (text_t *)talloc->alloc ();
1456	l.r = (rend_t *)ralloc->alloc ();	1363	l.r = (rend_t *)ralloc->alloc ();
1457	}	1364	}
1458		1365
…		…
1462	talloc->free (l.t);	1369	talloc->free (l.t);
1463	ralloc->free (l.r);	1370	ralloc->free (l.r);
1464	}	1371	}
1465	#endif	1372	#endif
1466		1373
1467	void lresize (line_t &l)	1374	void lresize (line_t &l) const
1468	{	1375	{
1469	if (!l.t)	1376	if (!l.t)
1470	return;	1377	return;
1471		1378
1472	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));	1379	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
…		…
1476		1383
1477	if (ncol > prev_ncol)	1384	if (ncol > prev_ncol)
1478	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);	1385	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1479	}	1386	}
1480		1387
1481	int fgcolor_of (rend_t r)	1388	int fgcolor_of (rend_t r) const
1482	{	1389	{
1483	int base = GET_BASEFG (r);	1390	int base = GET_BASEFG (r);
1484	#ifndef NO_BRIGHTCOLOR	1391	#ifndef NO_BRIGHTCOLOR
1485	if (r & RS_Bold	1392	if (r & RS_Bold
1486	# if ENABLE_STYLES	1393	# if ENABLE_STYLES
…		…
1490	base += minBrightCOLOR - minCOLOR;	1397	base += minBrightCOLOR - minCOLOR;
1491	#endif	1398	#endif
1492	return base;	1399	return base;
1493	}	1400	}
1494		1401
1495	int bgcolor_of (rend_t r)	1402	int bgcolor_of (rend_t r) const
1496	{	1403	{
1497	int base = GET_BASEBG (r);	1404	int base = GET_BASEBG (r);
1498	#ifndef NO_BRIGHTCOLOR	1405	#ifndef NO_BRIGHTCOLOR
1499	if (r & RS_Blink	1406	if (r & RS_Blink
1500	# if ENABLE_STYLES	1407	# if ENABLE_STYLES
…		…
1504	base += minBrightCOLOR - minCOLOR;	1411	base += minBrightCOLOR - minCOLOR;
1505	#endif	1412	#endif
1506	return base;	1413	return base;
1507	}	1414	}
1508		1415
		1416	bool option (uint32_t opt) const
		1417	{
		1418	return OPTION (opt);
		1419	}
		1420
		1421	void set_option (uint32_t opt, bool set)
		1422	{
		1423	if (set)
		1424	options \|= opt;
		1425	else
		1426	options &= ~opt;
		1427	}
		1428
1509	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);	1429	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1510	void scr_blank_screen_mem (line_t &l, rend_t efs);	1430	void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1511	int scr_scroll_text (int row1, int row2, int count);	1431	int scr_scroll_text (int row1, int row2, int count);
1512	void scr_reset ();	1432	void scr_reset ();
1513	void scr_release ();	1433	void scr_release ();
1514	void scr_clear (bool really = false);	1434	void scr_clear (bool really = false);
1515	void scr_refresh (unsigned char refresh_type);	1435	void scr_refresh (unsigned char refresh_type);
…		…
1523	void scr_touch (bool refresh);	1443	void scr_touch (bool refresh);
1524	void scr_expose (int x, int y, int width, int height, bool refresh);	1444	void scr_expose (int x, int y, int width, int height, bool refresh);
1525	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1445	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1526	void scr_recolour ();	1446	void scr_recolour ();
1527	void scr_remap_chars ();	1447	void scr_remap_chars ();
1528	void scr_remap_chars (const line_t &l);	1448	void scr_remap_chars (line_t &l);
1529		1449
1530	void scr_poweron ();	1450	void scr_poweron ();
1531	void scr_cursor (int mode);	1451	void scr_cursor (int mode);
1532	void scr_do_wrap ();	1452	void scr_do_wrap ();
1533	int scr_change_screen (int scrn);	1453	int scr_change_screen (int scrn);
1534	void scr_color (unsigned int color, int fgbg);	1454	void scr_color (unsigned int color, int fgbg);
1535	void scr_rendition (int set, int style);	1455	void scr_rendition (int set, int style);
1536	void scr_add_lines (const unicode_t *str, int nlines, int len);	1456	void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1537	void scr_backspace ();	1457	void scr_backspace ();
1538	void scr_tab (int count, bool ht = false);	1458	void scr_tab (int count, bool ht = false);
1539	void scr_gotorc (int row, int col, int relative);	1459	void scr_gotorc (int row, int col, int relative);
1540	void scr_index (enum page_dirn direction);	1460	void scr_index (enum page_dirn direction);
1541	void scr_erase_line (int mode);	1461	void scr_erase_line (int mode);
…		…
1551	void scr_rvideo_mode (int mode);	1471	void scr_rvideo_mode (int mode);
1552	void scr_report_position ();	1472	void scr_report_position ();
1553	void set_font_style ();	1473	void set_font_style ();
1554	void scr_charset_choose (int set);	1474	void scr_charset_choose (int set);
1555	void scr_charset_set (int set, unsigned int ch);	1475	void scr_charset_set (int set, unsigned int ch);
1556	int scr_move_to (int y, int len);	1476	void scr_move_to (int y, int len);
1557	int scr_page (enum page_dirn direction, int nlines);	1477	bool scr_page (enum page_dirn direction, int nlines);
1558	int scr_changeview (unsigned int oldviewstart);	1478	bool scr_changeview (int new_view_start);
1559	void scr_bell ();	1479	void scr_bell ();
1560	void scr_printscreen (int fullhist);	1480	void scr_printscreen (int fullhist);
		1481	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
		1482	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1561	void scr_reverse_selection ();	1483	void scr_reverse_selection ();
1562	void scr_dump (int fd);	1484	void scr_dump (int fd);
1563	void selection_check (int check_more);	1485	void selection_check (int check_more);
1564	void selection_paste (Window win, Atom prop, bool delete_prop);	1486	void selection_paste (Window win, Atom prop, bool delete_prop);
1565	void selection_property (Window win, Atom prop);	1487	void selection_property (Window win, Atom prop);

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.180 by root, Mon Jan 2 15:35:43 2006 UTC vs. Revision 1.208 by root, Mon Jan 16 15:00:20 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.180 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.208 by root, Mon Jan 16 15:00:20 2006 UTC