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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.184 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.217 by root, Tue Jan 17 10:59:32 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;
…		…
107	char * rxvt_Str_trim (char *str);	129	char * rxvt_Str_trim (char *str);
108	int rxvt_Str_escaped (char *str);	130	int rxvt_Str_escaped (char *str);
109	char ** rxvt_splitcommastring (const char *cs);	131	char ** rxvt_splitcommastring (const char *cs);
110	void rxvt_freecommastring (char **cs);	132	void rxvt_freecommastring (char **cs);
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);
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);	134	void rxvt_usleep (int usecs);
		135
		136	/////////////////////////////////////////////////////////////////////////////
		137
		138	// temporarily replace the process environment
		139	extern char **environ;
		140	extern char **rxvt_environ; // the original environ pointer
		141
		142	inline void set_environ (stringvec *envv)
		143	{
		144	if (envv)
		145	environ = (char **)envv->begin ();
		146	}
		147
		148	inline void set_environ (char **envv)
		149	{
		150	if (envv)
		151	environ = envv;
		152	}
115		153
116	/*	154	/*
117	*****************************************************************************	155	*****************************************************************************
118	* STRUCTURES AND TYPEDEFS	156	* STRUCTURES AND TYPEDEFS
119	*****************************************************************************	157	*****************************************************************************
120	*/	158	*/
121	struct grwin_t;	159	struct grwin_t;
122		160
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	161	/* If we're using either the rxvt scrollbar, keep the
132	* scrollColor resource.	162	* scrollColor resource.
133	*/	163	*/
134	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)	164	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)
135	# define KEEP_SCROLLCOLOR 1	165	# define KEEP_SCROLLCOLOR 1
136	#else	166	#else
137	# undef KEEP_SCROLLCOLOR	167	# undef KEEP_SCROLLCOLOR
138	#endif	168	#endif
139		169
…		…
209		239
210	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)	240	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211	# define NO_MOUSE_REPORT_SCROLLBAR 1	241	# define NO_MOUSE_REPORT_SCROLLBAR 1
212	#endif	242	#endif
213		243
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 */	244	/* now look for other badly set stuff */
223		245
224	#if !defined (EACCESS) && defined(EAGAIN)	246	#if !defined (EACCESS) && defined(EAGAIN)
225	# define EACCESS EAGAIN	247	# define EACCESS EAGAIN
226	#endif	248	#endif
…		…
228	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */	250	#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
229	# define EXIT_SUCCESS 0 /* exit function success */	251	# define EXIT_SUCCESS 0 /* exit function success */
230	# define EXIT_FAILURE 1 /* exit function failure */	252	# define EXIT_FAILURE 1 /* exit function failure */
231	#endif	253	#endif
232		254
233	#define menuBar_esc 10
234	#define scrollBar_esc 30	255	#define scrollBar_esc 30
235	#define menuBar_margin 2 /* margin below text */
236		256
237	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(XTERM_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)	257	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(XTERM_SCROLLBAR) \|\| defined(PLAIN_SCROLLBAR)
238	# define HAVE_SCROLLBARS 1	258	# define HAVE_SCROLLBARS 1
239	#endif
240
241	/* width of scrollBar, menuBar shadow, must be 1 or 2 */
242	#ifdef HALFSHADOW
243	# define MENU_SHADOW 1
244	#else
245	# define MENU_SHADOW 2
246	#endif	259	#endif
247		260
248	#define R_SB_ALIGN_CENTRE 0	261	#define R_SB_ALIGN_CENTRE 0
249	#define R_SB_ALIGN_TOP 1	262	#define R_SB_ALIGN_TOP 1
250	#define R_SB_ALIGN_BOTTOM 2	263	#define R_SB_ALIGN_BOTTOM 2
…		…
323	* \|	336	* \|
324	* +---< SB_WIDTH_NEXT	337	* +---< SB_WIDTH_NEXT
325	*/	338	*/
326		339
327	enum {	340	enum {
328	NO_REFRESH = 0 , /* Window not visible at all! */	341	NO_REFRESH = 0, /* Window not visible at all! */
329	FAST_REFRESH = 1<<0, /* Fully exposed window */	342	FAST_REFRESH = 1, /* Fully exposed window */
330	SLOW_REFRESH = 1<<1, /* Partially exposed window */	343	SLOW_REFRESH = 2, /* Partially exposed window */
331	SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
332	};	344	};
333		345
334	#ifdef NO_SECONDARY_SCREEN	346	#ifdef NO_SECONDARY_SCREEN
335	# define NSCREENS 0	347	# define NSCREENS 0
336	#else	348	#else
…		…
436	XTerm_property = 3, // change X property	448	XTerm_property = 3, // change X property
437	XTerm_Color = 4, // change colors	449	XTerm_Color = 4, // change colors
438	XTerm_Color00 = 10, // not implemented, CLASH!	450	XTerm_Color00 = 10, // not implemented, CLASH!
439	XTerm_Color01 = 11, // not implemented	451	XTerm_Color01 = 11, // not implemented
440	XTerm_Color_cursor = 12, // change actual 'Cursor' color	452	XTerm_Color_cursor = 12, // change actual 'Cursor' color
441	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color	453	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442	XTerm_Color_pointer_bg = 14, // not implemented	454	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443	XTerm_Color05 = 15, // not implemented	455	XTerm_Color05 = 15, // not implemented (tektronix fg)
444	XTerm_Color06 = 16, // not implemented	456	XTerm_Color06 = 16, // not implemented (tektronix bg)
445	XTerm_Color_RV = 17, // change actual 'Highlight' color	457	XTerm_Color_RV = 17, // change actual 'Highlight' color
446	XTerm_logfile = 46, // not implemented	458	XTerm_logfile = 46, // not implemented
447	XTerm_font = 50,	459	XTerm_font = 50,
448		460
449	XTerm_konsole30 = 30, // reserved for konsole	461	XTerm_konsole30 = 30, // reserved for konsole
450	XTerm_konsole31 = 31, // reserved for konsole	462	XTerm_konsole31 = 31, // reserved for konsole
451	XTerm_emacs51 = 51, // reserved for emacs shell	463	XTerm_emacs51 = 51, // reserved for emacs shell
452	/*	464	/*
453	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)	465	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)
		466	* at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454	*/	467	*/
455	XTerm_Color_BD = 18, // change actual 'Bold' color	468	Rxvt_Color_BD = 18, // change actual 'Bold' color
456	XTerm_Color_UL = 19, // change actual 'Underline' color	469	Rxvt_Color_UL = 19, // change actual 'Underline' color
457	XTerm_Pixmap = 20, // new bg pixmap	470	Rxvt_Pixmap = 20, // new bg pixmap
458	XTerm_restoreFG = 39, // change default fg color	471	Rxvt_restoreFG = 39, // change default fg color
459	XTerm_restoreBG = 49, // change default bg color	472	Rxvt_restoreBG = 49, // change default bg color
460	XTerm_dumpscreen = 55, // dump scrollback and all of screen	473	Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461		474
462	URxvt_locale = 701, // change locale	475	URxvt_locale = 701, // change locale
463	URxvt_Menu = 703, // set menu item	476
464	URxvt_Color_IT = 704, // change actual 'Italic' colour	477	URxvt_Color_IT = 704, // change actual 'Italic' colour
465	URxvt_Color_tint = 705, // change actual tint colour	478	URxvt_Color_tint = 705, // change actual tint colour
		479	URxvt_Color_BD = 706,
		480	URxvt_Color_UL = 707,
466		481
467	URxvt_font = 710,	482	URxvt_font = 710,
468	URxvt_boldFont = 711,	483	URxvt_boldFont = 711,
469	URxvt_italicFont = 712,	484	URxvt_italicFont = 712,
470	URxvt_boldItalicFont = 713,	485	URxvt_boldItalicFont = 713,
…		…
557		572
558	/*	573	/*
559	* Resource list	574	* Resource list
560	*/	575	*/
561	enum {	576	enum {
562	#define Rs_def(name) Rs_ ## name,	577	# define def(name) Rs_ ## name,
563	#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,	578	# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
564	#include "rsinc.h"	579	# include "rsinc.h"
565	#undef Rs_def	580	# undef def
566	#undef Rs_reserve	581	# undef reserve
567	NUM_RESOURCES	582	NUM_RESOURCES
568	};	583	};
569		584
570	// see init.C:xa_names, which must be kept in sync	585	// see init.C:xa_names, which must be kept in sync
571	enum {	586	enum {
…		…
621	#define PrivMode_ShiftKeys (1UL<<10)	636	#define PrivMode_ShiftKeys (1UL<<10)
622	#define PrivMode_VisibleCursor (1UL<<11)	637	#define PrivMode_VisibleCursor (1UL<<11)
623	#define PrivMode_MouseX10 (1UL<<12)	638	#define PrivMode_MouseX10 (1UL<<12)
624	#define PrivMode_MouseX11 (1UL<<13)	639	#define PrivMode_MouseX11 (1UL<<13)
625	#define PrivMode_scrollBar (1UL<<14)	640	#define PrivMode_scrollBar (1UL<<14)
626	#define PrivMode_menuBar (1UL<<15)
627	#define PrivMode_TtyOutputInh (1UL<<16)	641	#define PrivMode_TtyOutputInh (1UL<<15)
628	#define PrivMode_Keypress (1UL<<17)	642	#define PrivMode_Keypress (1UL<<16)
629	#define PrivMode_smoothScroll (1UL<<18)	643	#define PrivMode_smoothScroll (1UL<<17)
630	#define PrivMode_vt52 (1UL<<19)	644	#define PrivMode_vt52 (1UL<<18)
631	#define PrivMode_LFNL (1UL<<20)	645	#define PrivMode_LFNL (1UL<<19)
632	/* too annoying to implement X11 highlight tracking */	646	/* too annoying to implement X11 highlight tracking */
633	/* #define PrivMode_MouseX11Track (1LU<<21) */	647	/* #define PrivMode_MouseX11Track (1LU<<20) */
634		648
635	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)	649	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)
636	#define PrivMode(test,bit) \	650	#define PrivMode(test,bit) \
637	if (test) \	651	if (test) \
638	priv_modes \|= (bit); \	652	priv_modes \|= (bit); \
…		…
685	/*	699	/*
686	*****************************************************************************	700	*****************************************************************************
687	* MACRO DEFINES	701	* MACRO DEFINES
688	*****************************************************************************	702	*****************************************************************************
689	*/	703	*/
690	#define memset(x, y, z) memset((x), (y), (size_t)(z))	704	#define dLocal(type,name) type const name = this->name
691	#define memcpy(x, y, z) memcpy((void )(x), (const void )(y), (z))
692	#define memmove(x, y, z) memmove((void )(x), (const void )(y), (z))
693	#define strcasecmp(x, y) strcasecmp((x), (y))
694	#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
695	#define strcpy(x, y) strcpy((char )(x), (const char )(y))
696	#define strncpy(x, y, z) strncpy((char )(x), (const char )(y), (z))
697	#define strcmp(x, y) strcmp((const char )(x), (const char )(y))
698	#define strncmp(x, y, z) strncmp((const char )(x), (const char )(y), (z))
699	#define strcat(x, y) strcat((char )(x), (const char )(y))
700	#define strncat(x, y, z) strncat((char )(x), (const char )(y), (z))
701	#define strdup(x) strdup((const char *)(x))
702	#define strlen(x) strlen((const char *)(x))
703	#define strchr(x, y) strchr((const char *)(x), (int)(y))
704	#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
705
706	#define dDisp Display *disp = display->display	705	#define dDisp Display *disp = this->display->display
707		706
708	/* convert pixel dimensions to row/column values. Everything as int32_t */	707	/* convert pixel dimensions to row/column values. Everything as int32_t */
709	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	708	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
710	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	709	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
711	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)	710	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
…		…
713	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	712	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
714	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	713	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
715	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)	714	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
716	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)	715	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
717		716
718	#define TermWin_TotalWidth() ((int32_t)this->width)	717	#define OPTION(opt) (options & (opt))
719	#define TermWin_TotalHeight() ((int32_t)this->height)	718	#define DEFAULT_OPTIONS (Opt_scrollBar \| Opt_scrollTtyOutput \
		719	\| Opt_jumpScroll \| Opt_secondaryScreen \
		720	\| Opt_pastableTabs \| Opt_intensityStyles)
720		721
721	// for m >= -n, ensure remainder lies between 0..n-1	722	// for m >= -n, ensure remainder lies between 0..n-1
722	#define MOD(m,n) (((m) + (n)) % (n))	723	#define MOD(m,n) (((m) + (n)) % (n))
723		724
724	#define LINENO(n) MOD (term_start + int(n), total_rows)	725	#define LINENO(n) MOD (term_start + int(n), total_rows)
…		…
782	#define scrollbar_below_slider(y) ((y) > scrollBar.bot)	783	#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
783	#define scrollbar_position(y) ((y) - scrollBar.beg)	784	#define scrollbar_position(y) ((y) - scrollBar.beg)
784	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	785	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
785	- scrollbar_minheight ())	786	- scrollbar_minheight ())
786		787
787	#if (MENUBAR_MAX > 1)
788	/* rendition style flags */
789	# define menuBar_height() (fheight + MENU_SHADOW)
790	# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
791	# define isMenuBarWindow(w) ((w) == menuBar.win)
792	#else
793	# define menuBar_height() (0)
794	# define menuBar_TotalHeight() (0)
795	# define isMenuBarWindow(w) (0)
796	#endif
797
798	#ifdef XPM_BACKGROUND	788	#ifdef XPM_BACKGROUND
799	# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))	789	# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
800	#else	790	#else
801	# define XPMClearArea(a, b, c, d, e, f, g)	791	# define XPMClearArea(a, b, c, d, e, f, g)
802	#endif
803
804	#ifdef UTMP_SUPPORT
805	# if !defined(RXVT_UTMPX_FILE) \|\| !defined(HAVE_STRUCT_UTMPX)
806	# undef HAVE_UTMPX_H
807	# undef HAVE_STRUCT_UTMPX
808	# endif
809	# if !defined(RXVT_UTMP_FILE) \|\| !defined(HAVE_STRUCT_UTMP)
810	# undef HAVE_UTMP_H
811	# undef HAVE_STRUCT_UTMP
812	# endif
813
814	# ifdef HAVE_UTMPX_H
815	# include <utmpx.h>
816	# endif
817	# ifdef HAVE_UTMP_H
818	# include <utmp.h>
819	# endif
820	#endif	792	#endif
821		793
822	#ifdef DEBUG_CMD	794	#ifdef DEBUG_CMD
823	# define D_CMD(x) fprintf x ; fputc('\n', stderr)	795	# define D_CMD(x) fprintf x ; fputc('\n', stderr)
824	#else	796	#else
…		…
851	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	823	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
852	extern void rxvt_exit_failure () __attribute__ ((noreturn));	824	extern void rxvt_exit_failure () __attribute__ ((noreturn));
853		825
854	#define SET_LOCALE(locale) rxvt_set_locale (locale)	826	#define SET_LOCALE(locale) rxvt_set_locale (locale)
855	extern bool rxvt_set_locale (const char *locale);	827	extern bool rxvt_set_locale (const char *locale);
856	extern bool rxvt_push_locale (const char *locale);	828	extern void rxvt_push_locale (const char *locale);
857	extern void rxvt_pop_locale ();	829	extern void rxvt_pop_locale ();
858		830
859	/*
860	*****************************************************************************	831	/****************************************************************************/
861	* VARIABLES
862	*****************************************************************************
863	*/
864	#ifdef MENUBAR
865	# include "menubar.h"
866	#endif
867		832
868	#define BLINK_INTERVAL 0.5	833	#define BLINK_INTERVAL 0.5
869	#define TEXT_BLINK_INTERVAL 0.5	834	#define TEXT_BLINK_INTERVAL 0.5
870		835
871	#ifndef __attribute__	836	#ifndef __attribute__
…		…
875	# endif	840	# endif
876	# endif	841	# endif
877	# define __attribute__(x)	842	# define __attribute__(x)
878	#endif	843	#endif
879		844
		845	/****************************************************************************/
		846
		847	#define LINE_LONGER 0x0001 // line is continued on the next row
		848	#define LINE_FILTERED 0x0002 // line has been filtered
		849	#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
		850
		851	struct line_t {
		852	text_t *t; // terminal the text
		853	rend_t *r; // rendition, uses RS_ flags
		854	tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
		855	uint32_t f; // flags
		856
		857	bool is_longer ()
		858	{
		859	return f & LINE_LONGER;
		860	}
		861
		862	void is_longer (int set)
		863	{
		864	if (set)
		865	f \|= LINE_LONGER;
		866	else
		867	f &= ~LINE_LONGER;
		868	}
		869
		870	void clear ()
		871	{
		872	t = 0;
		873	r = 0;
		874	l = 0;
		875	f = 0;
		876	}
		877
		878	void touch () // call whenever a line is changed/touched/updated
		879	{
		880	#if ENABLE_PERL
		881	f &= ~LINE_FILTERED;
		882	#endif
		883	}
		884
		885	void touch (int col)
		886	{
		887	max_it (l, col);
		888	touch ();
		889	}
		890	};
		891
		892	/****************************************************************************/
		893
880	// primivite wrapper around mbstate_t to ensure initialisation	894	// primivite wrapper around mbstate_t to ensure initialisation
881	struct mbstate {	895	struct mbstate {
882	mbstate_t mbs;	896	mbstate_t mbs;
883		897
884	operator mbstate_t *() { return &mbs; }	898	operator mbstate_t *() { return &mbs; }
885	void reset () { memset (&mbs, 0, sizeof (mbs)); }	899	void reset () { memset (&mbs, 0, sizeof (mbs)); }
886	mbstate () { reset (); }	900	mbstate () { reset (); }
887	};	901	};
888		902
		903	/****************************************************************************/
		904
889	#define UNICODE_MASK 0x1fffffUL	905	#define UNICODE_MASK 0x1fffffUL
890		906
891	#if UNICODE3	907	#if UNICODE3
892	# define COMPOSE_LO 0x40000000UL	908	# define COMPOSE_LO 0x40000000UL
893	# define COMPOSE_HI 0x400fffffUL	909	# define COMPOSE_HI 0x400fffffUL
894	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)	910	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
895	#else	911	#else
		912	# if ENABLE_PERL
		913	# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
		914	# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
		915	# else
896	# define COMPOSE_LO 0xd800UL	916	# define COMPOSE_LO 0xd800UL
897	# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...	917	# define COMPOSE_HI 0xf8ffUL
898	# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)	918	# endif
		919	# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
899	#endif	920	#endif
900		921
901	#if ENABLE_COMBINING	922	#if ENABLE_COMBINING
902	// compose chars are used to represent composite characters	923	// compose chars are used to represent composite characters
903	// that are not representable in unicode, as well as characters	924	// that are not representable in unicode, as well as characters
…		…
923	};	944	};
924		945
925	extern class rxvt_composite_vec rxvt_composite;	946	extern class rxvt_composite_vec rxvt_composite;
926	#endif	947	#endif
927		948
		949	/****************************************************************************/
928		950
929	#ifdef KEYSYM_RESOURCE	951	#ifdef KEYSYM_RESOURCE
930	class keyboard_manager;	952	class keyboard_manager;
931	#endif	953	#endif
932		954
933	struct rxvt_term : zero_initialized, rxvt_vars {	955	struct rxvt_term : zero_initialized, rxvt_vars {
934	log_callback *log_hook; // log error messages through this hook, if != 0	956	log_callback *log_hook; // log error messages through this hook, if != 0
935	getfd_callback *getfd_hook; // convert remote to local fd, if != 0	957	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
936
937	#if ENABLE_PERL	958	#if ENABLE_PERL
938	void *self; // perl's $self	959	rxvt_perl_term perl;
939	#endif	960	#endif
940
941	struct mbstate mbstate; // current input multibyte state	961	struct mbstate mbstate; // current input multibyte state
942		962
943	unsigned char want_refresh:1,	963	unsigned char want_refresh:1,
944	#ifdef TRANSPARENT	964	#ifdef TRANSPARENT
945	want_full_refresh:1, /* awaiting full screen refresh */	965	want_full_refresh:1, /* awaiting full screen refresh */
…		…
1000	refresh_limit,	1020	refresh_limit,
1001	last_bot, /* scrollbar last bottom position */	1021	last_bot, /* scrollbar last bottom position */
1002	last_top, /* scrollbar last top position */	1022	last_top, /* scrollbar last top position */
1003	last_state, /* scrollbar last state */	1023	last_state, /* scrollbar last state */
1004	scrollbar_len,	1024	scrollbar_len,
1005	#ifdef MENUBAR
1006	menu_readonly, /* okay to alter menu? */
1007	Arrows_x,
1008	#endif
1009	#if MENUBAR_MAX > 1
1010	Nbars,
1011	#endif
1012	window_vt_x,	1025	window_vt_x,
1013	window_vt_y,	1026	window_vt_y,
1014	window_sb_x,	1027	window_sb_x,
1015	# ifdef POINTER_BLANK	1028	# ifdef POINTER_BLANK
1016	pointerBlankDelay,	1029	pointerBlankDelay,
…		…
1025	unsigned long priv_modes,	1038	unsigned long priv_modes,
1026	SavedModes;	1039	SavedModes;
1027	/* ---------- */	1040	/* ---------- */
1028	Atom xa[NUM_XA];	1041	Atom xa[NUM_XA];
1029	/* ---------- */	1042	/* ---------- */
1030	#ifdef MENUBAR	1043	#ifdef RXVT_SCROLLBAR
1031	GC menubarGC;
1032	#endif
1033	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1034	GC scrollbarGC,	1044	GC scrollbarGC,
1035	topShadowGC,	1045	topShadowGC,
1036	botShadowGC;	1046	botShadowGC;
1037	#endif	1047	#endif
1038	#ifdef XTERM_SCROLLBAR	1048	#ifdef XTERM_SCROLLBAR
…		…
1070	const char *key_delete;	1080	const char *key_delete;
1071	#endif	1081	#endif
1072	struct mouse_event MEvent;	1082	struct mouse_event MEvent;
1073	XComposeStatus compose;	1083	XComposeStatus compose;
1074	ttymode_t tio;	1084	ttymode_t tio;
1075	#ifdef UTMP_SUPPORT
1076	# ifdef HAVE_STRUCT_UTMP
1077	struct utmp ut;
1078	# endif
1079	# ifdef HAVE_STRUCT_UTMPX
1080	struct utmpx utx;
1081	# endif
1082	# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) \|\| defined(HAVE_STRUCT_UTMPX)
1083	char ut_id[5];
1084	# endif
1085	int utmp_pos;
1086	#endif
1087	row_col_t oldcursor;	1085	row_col_t oldcursor;
1088	#ifdef XPM_BACKGROUND	1086	#ifdef XPM_BACKGROUND
1089	bgPixmap_t bgPixmap;	1087	bgPixmap_t bgPixmap;
1090	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */	1088	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1091	#endif
1092	#ifdef MENUBAR
1093	menu_t ActiveMenu, / currently active menu */
1094	BuildMenu; / the menu currently being built */
1095	bar_t *CurrentBar;
1096	# if ! (MENUBAR_MAX > 1)
1097	bar_t BarList;
1098	# endif /* (MENUBAR_MAX > 1) */
1099	#endif
1100	#ifdef CURSOR_BLINK
1101	struct timeval lastcursorchange;
1102	#endif
1103	#ifdef POINTER_BLANK
1104	struct timeval lastmotion;
1105	#endif	1089	#endif
1106		1090
1107	#if ENABLE_OVERLAY	1091	#if ENABLE_OVERLAY
1108	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions	1092	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1109	text_t **ov_text;	1093	text_t **ov_text;
…		…
1125	char env_display; / environmental variable DISPLAY */	1109	char env_display; / environmental variable DISPLAY */
1126	char env_term; / environmental variable TERM */	1110	char env_term; / environmental variable TERM */
1127	char *env_colorfgbg;	1111	char *env_colorfgbg;
1128	char *locale;	1112	char *locale;
1129	char charsets[4];	1113	char charsets[4];
1130	unsigned char v_buffer; / pointer to physical buffer */	1114	char v_buffer; / pointer to physical buffer */
1131	unsigned int v_buflen; /* size of area to write */	1115	unsigned int v_buflen; /* size of area to write */
1132	stringvec argv, envv; /* if != 0, will be freed on destroy time */	1116	stringvec argv, envv; /* if != 0, will be freed on destroy time */
1133		1117
1134	#ifdef KEYSYM_RESOURCE	1118	#ifdef KEYSYM_RESOURCE
1135	keyboard_manager *keyboard;	1119	keyboard_manager *keyboard;
1136	#endif	1120	#endif
1137		1121
1138	const char *rs[NUM_RESOURCES];	1122	const char *rs[NUM_RESOURCES];
1139	/* command input buffering */	1123	/* command input buffering */
1140	unsigned char cmdbuf_ptr, cmdbuf_endp;	1124	char cmdbuf_ptr, cmdbuf_endp;
1141	unsigned char cmdbuf_base[CBUFSIZ];	1125	char cmdbuf_base[CBUFSIZ];
		1126
		1127	rxvt_ptytty_unix pty;
1142		1128
1143	rxvt_salloc *talloc; // text line allocator	1129	rxvt_salloc *talloc; // text line allocator
1144	rxvt_salloc *ralloc; // rend line allocator	1130	rxvt_salloc *ralloc; // rend line allocator
1145		1131
1146	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1132	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
…		…
1155	void iso14755_54 (int x, int y);	1141	void iso14755_54 (int x, int y);
1156	# endif	1142	# endif
1157	#endif	1143	#endif
1158		1144
1159	// modifies first argument(!)	1145	// modifies first argument(!)
1160	void paste (unsigned char *data, unsigned int len);	1146	void paste (char *data, unsigned int len);
1161		1147
1162	void flush ();	1148	long vt_emask, vt_emask_perl;
		1149
		1150	void vt_select_input () const
		1151	{
		1152	XSelectInput (display->display, vt, vt_emask \| vt_emask_perl);
		1153	}
1163		1154
1164	#if TRANSPARENT	1155	#if TRANSPARENT
1165	void rootwin_cb (XEvent &xev);	1156	void rootwin_cb (XEvent &xev);
1166	xevent_watcher rootwin_ev;	1157	xevent_watcher rootwin_ev;
1167	#endif	1158	#endif
1168		1159
1169	void x_cb (XEvent &xev);	1160	void x_cb (XEvent &xev);
		1161	void flush ();
1170	xevent_watcher termwin_ev;	1162	xevent_watcher termwin_ev;
1171	xevent_watcher vt_ev;	1163	xevent_watcher vt_ev;
1172	#ifdef HAVE_SCROLLBARS	1164	#ifdef HAVE_SCROLLBARS
1173	xevent_watcher scrollbar_ev;	1165	xevent_watcher scrollbar_ev;
1174	#endif	1166	#endif
1175	#ifdef MENUBAR
1176	xevent_watcher menubar_ev;
1177	#endif
1178		1167
1179	void check_cb (check_watcher &w); check_watcher check_ev;	1168	void check_cb (check_watcher &w); check_watcher check_ev;
1180	void destroy_cb (time_watcher &w); time_watcher destroy_ev;	1169	void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1181	void flush_cb (time_watcher &w); time_watcher flush_ev;	1170	void flush_cb (time_watcher &w); time_watcher flush_ev;
1182		1171
…		…
1206	void pointer_blank ();	1195	void pointer_blank ();
1207	#endif	1196	#endif
1208	void pointer_unblank ();	1197	void pointer_unblank ();
1209		1198
1210	void tt_printf (const char *fmt,...);	1199	void tt_printf (const char *fmt,...);
1211	void tt_write (const unsigned char *data, unsigned int len);	1200	void tt_write (const char *data, unsigned int len);
1212	void pty_write ();	1201	void pty_write ();
1213		1202
1214	void tt_winch ();	1203	void tt_winch ();
1215		1204
1216	rxvt_term ();	1205	rxvt_term ();
…		…
1222	bool init (int argc, const char const argv);	1211	bool init (int argc, const char const argv);
1223	bool init_vars ();	1212	bool init_vars ();
1224		1213
1225	bool pty_fill ();	1214	bool pty_fill ();
1226		1215
		1216	void make_current () const // make this the "currently active" urxvt instance
		1217	{
		1218	SET_R (this);
		1219	rxvt_set_locale (locale);
		1220	set_environ (envv);
		1221	}
		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);
		1225	const char x_resource (const char name);
1229	void init_env ();	1226	void init_env ();
1230	void set_locale (const char *locale);	1227	void set_locale (const char *locale);
1231	void init_xlocale ();	1228	void init_xlocale ();
1232	void init_command (const char const argv);	1229	void init_command (const char const argv);
1233	void run_command (const char const argv);	1230	void run_command (const char const argv);
…		…
1268		1265
1269	/* autoconvert */	1266	/* autoconvert */
1270		1267
1271	// command.C	1268	// command.C
1272	void lookup_key (XKeyEvent &ev);	1269	void lookup_key (XKeyEvent &ev);
1273	unsigned int cmd_write (const unsigned char *str, unsigned int count);	1270	unsigned int cmd_write (const char *str, unsigned int count);
1274		1271
1275	unicode_t next_char ();	1272	wchar_t next_char ();
1276	unicode_t cmd_getc ();	1273	wchar_t cmd_getc ();
1277	unicode_t next_octet ();	1274	uint32_t next_octet ();
1278	unicode_t cmd_get8 ();	1275	uint32_t cmd_get8 ();
1279		1276
1280	bool cmd_parse ();	1277	bool cmd_parse ();
1281	void mouse_report (XButtonEvent &ev);	1278	void mouse_report (XButtonEvent &ev);
1282	void button_press (XButtonEvent &ev);	1279	void button_press (XButtonEvent &ev);
1283	void button_release (XButtonEvent &ev);	1280	void button_release (XButtonEvent &ev);
…		…
1292	void process_nonprinting (unicode_t ch);	1289	void process_nonprinting (unicode_t ch);
1293	void process_escape_vt52 (unicode_t ch);	1290	void process_escape_vt52 (unicode_t ch);
1294	void process_escape_seq ();	1291	void process_escape_seq ();
1295	void process_csi_seq ();	1292	void process_csi_seq ();
1296	void process_window_ops (const int *args, unsigned int nargs);	1293	void process_window_ops (const int *args, unsigned int nargs);
1297	unsigned char *get_to_st (unicode_t &ends_how);	1294	char *get_to_st (unicode_t &ends_how);
1298	void process_dcs_seq ();	1295	void process_dcs_seq ();
1299	void process_osc_seq ();	1296	void process_osc_seq ();
1300	void process_color_seq (int report, int color, const char *str, unsigned char resp);	1297	void process_color_seq (int report, int color, const char *str, char resp);
1301	void process_xterm_seq (int op, const char *str, unsigned char resp);	1298	void process_xterm_seq (int op, const char *str, char resp);
1302	int privcases (int mode, unsigned long bit);	1299	int privcases (int mode, unsigned long bit);
1303	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1300	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1304	void process_sgr_mode (unsigned int nargs, const int *arg);	1301	void process_sgr_mode (unsigned int nargs, const int *arg);
1305	void process_graphics ();	1302	void process_graphics ();
1306	// init.C	1303	// init.C
1307	void Get_Colours ();	1304	void Get_Colours ();
1308	void get_ourmods ();	1305	void get_ourmods ();
1309	// logging.C
1310	void makeutent (const char pty, const char hostname);
1311	void cleanutent ();
1312	// main.C	1306	// main.C
1313	void privileged_utmp (rxvt_privaction action);	1307	void privileged_utmp (rxvt_privaction action);
1314	bool set_fonts ();	1308	bool set_fonts ();
1315	void set_string_property (Atom prop, const char *str, int len = -1);	1309	void set_string_property (Atom prop, const char *str, int len = -1);
1316	void set_utf8_property (Atom prop, const char *str, int len = -1);	1310	void set_utf8_property (Atom prop, const char *str, int len = -1);
…		…
1319	void set_window_color (int idx, const char *color);	1313	void set_window_color (int idx, const char *color);
1320	void set_colorfgbg ();	1314	void set_colorfgbg ();
1321	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1315	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1322	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1316	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1323		1317
1324	#ifdef MENUBAR
1325	// menubar.C
1326	void menuitem_free (menu_t menu, menuitem_t item);
1327	int action_dispatch (action_t *action);
1328	void menuarrow_free (char name);
1329	void menuarrow_add (char *string);
1330	char menu_find_base (menu_t menu, char path);
1331	menu_t menu_delete (menu_t menu);
1332	menu_t menu_add (menu_t parent, char *path);
1333	void drawbox_menubar (int x, int len, int state);
1334	void drawtriangle (int x, int y, int state);
1335	void drawbox_menuitem (int y, int state);
1336	void menu_show ();
1337	void menu_display (void (rxvt_term::*update) ());
1338	void menu_hide_all ();
1339	void menu_hide ();
1340	void menu_clear (menu_t *menu);
1341	void menubar_clear ();
1342	bar_t menubar_find (const char name);
1343	int menubar_push (const char *name);
1344	void menubar_remove (const char *name);
1345	void menubar_dump (FILE *fp);
1346	void menubar_read (const char *filename);
1347	void menubar_dispatch (char *str);
1348	void draw_Arrows (int name, int state);
1349	void menubar_expose ();
1350	int menubar_mapping (int map);
1351	int menu_select (XButtonEvent &ev);
1352	void menubar_select (XButtonEvent &ev);
1353	void menubar_control (XButtonEvent &ev);
1354	void map_menuBar (int map);
1355	#endif
1356
1357	// screen.C	1318	// screen.C
1358		1319
1359	void lalloc (line_t &l)	1320	void lalloc (line_t &l) const
1360	{	1321	{
1361	l.t = (text_t *)talloc->alloc ();	1322	l.t = (text_t *)talloc->alloc ();
1362	l.r = (rend_t *)ralloc->alloc ();	1323	l.r = (rend_t *)ralloc->alloc ();
1363	}	1324	}
1364		1325
…		…
1368	talloc->free (l.t);	1329	talloc->free (l.t);
1369	ralloc->free (l.r);	1330	ralloc->free (l.r);
1370	}	1331	}
1371	#endif	1332	#endif
1372		1333
1373	void lresize (line_t &l)	1334	void lresize (line_t &l) const
1374	{	1335	{
1375	if (!l.t)	1336	if (!l.t)
1376	return;	1337	return;
1377		1338
1378	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));	1339	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
…		…
1382		1343
1383	if (ncol > prev_ncol)	1344	if (ncol > prev_ncol)
1384	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);	1345	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1385	}	1346	}
1386		1347
1387	int fgcolor_of (rend_t r)	1348	int fgcolor_of (rend_t r) const
1388	{	1349	{
1389	int base = GET_BASEFG (r);	1350	int base = GET_BASEFG (r);
1390	#ifndef NO_BRIGHTCOLOR	1351	#ifndef NO_BRIGHTCOLOR
1391	if (r & RS_Bold	1352	if (r & RS_Bold
1392	# if ENABLE_STYLES	1353	# if ENABLE_STYLES
…		…
1396	base += minBrightCOLOR - minCOLOR;	1357	base += minBrightCOLOR - minCOLOR;
1397	#endif	1358	#endif
1398	return base;	1359	return base;
1399	}	1360	}
1400		1361
1401	int bgcolor_of (rend_t r)	1362	int bgcolor_of (rend_t r) const
1402	{	1363	{
1403	int base = GET_BASEBG (r);	1364	int base = GET_BASEBG (r);
1404	#ifndef NO_BRIGHTCOLOR	1365	#ifndef NO_BRIGHTCOLOR
1405	if (r & RS_Blink	1366	if (r & RS_Blink
1406	# if ENABLE_STYLES	1367	# if ENABLE_STYLES
…		…
1410	base += minBrightCOLOR - minCOLOR;	1371	base += minBrightCOLOR - minCOLOR;
1411	#endif	1372	#endif
1412	return base;	1373	return base;
1413	}	1374	}
1414		1375
		1376	bool option (uint32_t opt) const
		1377	{
		1378	return OPTION (opt);
		1379	}
		1380
		1381	void set_option (uint32_t opt, bool set)
		1382	{
		1383	if (set)
		1384	options \|= opt;
		1385	else
		1386	options &= ~opt;
		1387	}
		1388
1415	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);	1389	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1416	void scr_blank_screen_mem (line_t &l, rend_t efs);	1390	void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1417	int scr_scroll_text (int row1, int row2, int count);	1391	int scr_scroll_text (int row1, int row2, int count);
1418	void scr_reset ();	1392	void scr_reset ();
1419	void scr_release ();	1393	void scr_release ();
1420	void scr_clear (bool really = false);	1394	void scr_clear (bool really = false);
1421	void scr_refresh (unsigned char refresh_type);	1395	void scr_refresh ();
1422	bool scr_refresh_rend (rend_t mask, rend_t value);	1396	bool scr_refresh_rend (rend_t mask, rend_t value);
1423	void scr_erase_screen (int mode);	1397	void scr_erase_screen (int mode);
1424	#if ENABLE_FRILLS	1398	#if ENABLE_FRILLS
1425	void scr_erase_savelines ();	1399	void scr_erase_savelines ();
1426	void scr_backindex ();	1400	void scr_backindex ();
…		…
1429	void scr_touch (bool refresh);	1403	void scr_touch (bool refresh);
1430	void scr_expose (int x, int y, int width, int height, bool refresh);	1404	void scr_expose (int x, int y, int width, int height, bool refresh);
1431	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1405	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1432	void scr_recolour ();	1406	void scr_recolour ();
1433	void scr_remap_chars ();	1407	void scr_remap_chars ();
1434	void scr_remap_chars (const line_t &l);	1408	void scr_remap_chars (line_t &l);
1435		1409
1436	void scr_poweron ();	1410	void scr_poweron ();
1437	void scr_cursor (int mode);	1411	void scr_cursor (int mode);
1438	void scr_do_wrap ();	1412	void scr_do_wrap ();
1439	int scr_change_screen (int scrn);	1413	int scr_change_screen (int scrn);
1440	void scr_color (unsigned int color, int fgbg);	1414	void scr_color (unsigned int color, int fgbg);
1441	void scr_rendition (int set, int style);	1415	void scr_rendition (int set, int style);
1442	void scr_add_lines (const unicode_t *str, int nlines, int len);	1416	void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1443	void scr_backspace ();	1417	void scr_backspace ();
1444	void scr_tab (int count, bool ht = false);	1418	void scr_tab (int count, bool ht = false);
1445	void scr_gotorc (int row, int col, int relative);	1419	void scr_gotorc (int row, int col, int relative);
1446	void scr_index (enum page_dirn direction);	1420	void scr_index (enum page_dirn direction);
1447	void scr_erase_line (int mode);	1421	void scr_erase_line (int mode);
…		…
1457	void scr_rvideo_mode (int mode);	1431	void scr_rvideo_mode (int mode);
1458	void scr_report_position ();	1432	void scr_report_position ();
1459	void set_font_style ();	1433	void set_font_style ();
1460	void scr_charset_choose (int set);	1434	void scr_charset_choose (int set);
1461	void scr_charset_set (int set, unsigned int ch);	1435	void scr_charset_set (int set, unsigned int ch);
1462	int scr_move_to (int y, int len);	1436	void scr_move_to (int y, int len);
1463	int scr_page (enum page_dirn direction, int nlines);	1437	bool scr_page (enum page_dirn direction, int nlines);
1464	int scr_changeview (unsigned int oldviewstart);	1438	bool scr_changeview (int new_view_start);
1465	void scr_bell ();	1439	void scr_bell ();
1466	void scr_printscreen (int fullhist);	1440	void scr_printscreen (int fullhist);
		1441	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
		1442	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1467	void scr_reverse_selection ();	1443	void scr_reverse_selection ();
1468	void scr_dump (int fd);	1444	void scr_dump (int fd);
1469	void selection_check (int check_more);	1445	void selection_check (int check_more);
1470	void selection_paste (Window win, Atom prop, bool delete_prop);	1446	void selection_paste (Window win, Atom prop, bool delete_prop);
1471	void selection_property (Window win, Atom prop);	1447	void selection_property (Window win, Atom prop);
…		…
1488	int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);	1464	int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1489	#endif	1465	#endif
1490		1466
1491	#if defined(RXVT_SCROLLBAR)	1467	#if defined(RXVT_SCROLLBAR)
1492	// scrollbar-rxvt.C	1468	// scrollbar-rxvt.C
1493	void Draw_button (int x, int y, int state, int dirn);
1494	int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);	1469	int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1495	#endif	1470	#endif
1496		1471
1497	#if defined(XTERM_SCROLLBAR)	1472	#if defined(XTERM_SCROLLBAR)
1498	// scrollbar-xterm.C	1473	// scrollbar-xterm.C

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.184 by root, Wed Jan 4 00:09:12 2006 UTC vs. Revision 1.217 by root, Tue Jan 17 10:59:32 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.184 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.217 by root, Tue Jan 17 10:59:32 2006 UTC