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

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.179 by root, Mon Jan 2 15:10:18 2006 UTC vs.
Revision 1.211 by root, Mon Jan 16 18:09:28 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 ISO_14755
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 SHADOW 1
244	#else
245	# define 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
…		…
436	XTerm_property = 3, // change X property	449	XTerm_property = 3, // change X property
437	XTerm_Color = 4, // change colors	450	XTerm_Color = 4, // change colors
438	XTerm_Color00 = 10, // not implemented, CLASH!	451	XTerm_Color00 = 10, // not implemented, CLASH!
439	XTerm_Color01 = 11, // not implemented	452	XTerm_Color01 = 11, // not implemented
440	XTerm_Color_cursor = 12, // change actual 'Cursor' color	453	XTerm_Color_cursor = 12, // change actual 'Cursor' color
441	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color	454	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442	XTerm_Color_pointer_bg = 14, // not implemented	455	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443	XTerm_Color05 = 15, // not implemented	456	XTerm_Color05 = 15, // not implemented (tektronix fg)
444	XTerm_Color06 = 16, // not implemented	457	XTerm_Color06 = 16, // not implemented (tektronix bg)
445	XTerm_Color_RV = 17, // change actual 'Highlight' color	458	XTerm_Color_RV = 17, // change actual 'Highlight' color
446	XTerm_logfile = 46, // not implemented	459	XTerm_logfile = 46, // not implemented
447	XTerm_font = 50,	460	XTerm_font = 50,
448		461
449	XTerm_konsole30 = 30, // reserved for konsole	462	XTerm_konsole30 = 30, // reserved for konsole
450	XTerm_konsole31 = 31, // reserved for konsole	463	XTerm_konsole31 = 31, // reserved for konsole
451	XTerm_emacs51 = 51, // reserved for emacs shell	464	XTerm_emacs51 = 51, // reserved for emacs shell
452	/*	465	/*
453	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)	466	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)
		467	* at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454	*/	468	*/
455	XTerm_Color_BD = 18, // change actual 'Bold' color	469	Rxvt_Color_BD = 18, // change actual 'Bold' color
456	XTerm_Color_UL = 19, // change actual 'Underline' color	470	Rxvt_Color_UL = 19, // change actual 'Underline' color
457	XTerm_Pixmap = 20, // new bg pixmap	471	Rxvt_Pixmap = 20, // new bg pixmap
458	XTerm_restoreFG = 39, // change default fg color	472	Rxvt_restoreFG = 39, // change default fg color
459	XTerm_restoreBG = 49, // change default bg color	473	Rxvt_restoreBG = 49, // change default bg color
460	XTerm_dumpscreen = 55, // dump scrollback and all of screen	474	Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461		475
462	URxvt_locale = 701, // change locale	476	URxvt_locale = 701, // change locale
463	URxvt_Menu = 703, // set menu item	477
464	URxvt_Color_IT = 704, // change actual 'Italic' colour	478	URxvt_Color_IT = 704, // change actual 'Italic' colour
465	URxvt_Color_tint = 705, // change actual tint colour	479	URxvt_Color_tint = 705, // change actual tint colour
		480	URxvt_Color_BD = 706,
		481	URxvt_Color_UL = 707,
466		482
467	URxvt_font = 710,	483	URxvt_font = 710,
468	URxvt_boldFont = 711,	484	URxvt_boldFont = 711,
469	URxvt_italicFont = 712,	485	URxvt_italicFont = 712,
470	URxvt_boldItalicFont = 713,	486	URxvt_boldItalicFont = 713,
471		487
472	URxvt_view_up = 720,	488	URxvt_view_up = 720,
473	URxvt_view_down = 721,	489	URxvt_view_down = 721,
		490
		491	URxvt_perl = 777,
474	};	492	};
475		493
476	/* Words starting with `Color_' are colours. Others are counts */	494	/* Words starting with `Color_' are colours. Others are counts */
477	/*	495	/*
478	* The PixColor and rendition colour usage should probably be decoupled	496	* The PixColor and rendition colour usage should probably be decoupled
…		…
555		573
556	/*	574	/*
557	* Resource list	575	* Resource list
558	*/	576	*/
559	enum {	577	enum {
560	Rs_display_name = 0,	578	# define def(name) Rs_ ## name,
561	Rs_term_name,	579	# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562	Rs_iconName,	580	# include "rsinc.h"
563	Rs_geometry,	581	# undef def
564	Rs_reverseVideo,	582	# 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	583	NUM_RESOURCES
664	};	584	};
665		585
666	// see init.C:xa_names, which must be kept in sync	586	// see init.C:xa_names, which must be kept in sync
667	enum {	587	enum {
…		…
717	#define PrivMode_ShiftKeys (1UL<<10)	637	#define PrivMode_ShiftKeys (1UL<<10)
718	#define PrivMode_VisibleCursor (1UL<<11)	638	#define PrivMode_VisibleCursor (1UL<<11)
719	#define PrivMode_MouseX10 (1UL<<12)	639	#define PrivMode_MouseX10 (1UL<<12)
720	#define PrivMode_MouseX11 (1UL<<13)	640	#define PrivMode_MouseX11 (1UL<<13)
721	#define PrivMode_scrollBar (1UL<<14)	641	#define PrivMode_scrollBar (1UL<<14)
722	#define PrivMode_menuBar (1UL<<15)
723	#define PrivMode_TtyOutputInh (1UL<<16)	642	#define PrivMode_TtyOutputInh (1UL<<15)
724	#define PrivMode_Keypress (1UL<<17)	643	#define PrivMode_Keypress (1UL<<16)
725	#define PrivMode_smoothScroll (1UL<<18)	644	#define PrivMode_smoothScroll (1UL<<17)
726	#define PrivMode_vt52 (1UL<<19)	645	#define PrivMode_vt52 (1UL<<18)
727	#define PrivMode_LFNL (1UL<<20)	646	#define PrivMode_LFNL (1UL<<19)
728	/* too annoying to implement X11 highlight tracking */	647	/* too annoying to implement X11 highlight tracking */
729	/* #define PrivMode_MouseX11Track (1LU<<21) */	648	/* #define PrivMode_MouseX11Track (1LU<<20) */
730		649
731	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)	650	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11)
732	#define PrivMode(test,bit) \	651	#define PrivMode(test,bit) \
733	if (test) \	652	if (test) \
734	priv_modes \|= (bit); \	653	priv_modes \|= (bit); \
…		…
781	/*	700	/*
782	*****************************************************************************	701	*****************************************************************************
783	* MACRO DEFINES	702	* MACRO DEFINES
784	*****************************************************************************	703	*****************************************************************************
785	*/	704	*/
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	705	#define dDisp Display *disp = display->display
803		706
804	/* convert pixel dimensions to row/column values. Everything as int32_t */	707	/* convert pixel dimensions to row/column values. Everything as int32_t */
805	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	708	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
806	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	709	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
…		…
809	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	712	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
810	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	713	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
811	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)	714	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
812	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)	715	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
813		716
814	#define TermWin_TotalWidth() ((int32_t)this->width)	717	#define OPTION(opt) (options & (opt))
815	#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)
816		721
817	// for m >= -n, ensure remainder lies between 0..n-1	722	// for m >= -n, ensure remainder lies between 0..n-1
818	#define MOD(m,n) (((m) + (n)) % (n))	723	#define MOD(m,n) (((m) + (n)) % (n))
819		724
820	#define LINENO(n) MOD (term_start + int(n), total_rows)	725	#define LINENO(n) MOD (term_start + int(n), total_rows)
…		…
878	#define scrollbar_below_slider(y) ((y) > scrollBar.bot)	783	#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
879	#define scrollbar_position(y) ((y) - scrollBar.beg)	784	#define scrollbar_position(y) ((y) - scrollBar.beg)
880	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	785	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
881	- scrollbar_minheight ())	786	- scrollbar_minheight ())
882		787
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	788	#ifdef XPM_BACKGROUND
895	# 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))
896	#else	790	#else
897	# define XPMClearArea(a, b, c, d, e, f, g)	791	# define XPMClearArea(a, b, c, d, e, f, g)
898	#endif	792	#endif
…		…
947	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	841	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
948	extern void rxvt_exit_failure () __attribute__ ((noreturn));	842	extern void rxvt_exit_failure () __attribute__ ((noreturn));
949		843
950	#define SET_LOCALE(locale) rxvt_set_locale (locale)	844	#define SET_LOCALE(locale) rxvt_set_locale (locale)
951	extern bool rxvt_set_locale (const char *locale);	845	extern bool rxvt_set_locale (const char *locale);
		846	extern void rxvt_push_locale (const char *locale);
		847	extern void rxvt_pop_locale ();
952		848
953	/*
954	*****************************************************************************	849	/****************************************************************************/
955	* VARIABLES
956	*****************************************************************************
957	*/
958	#ifdef MENUBAR
959	# include "menubar.h"
960	#endif
961		850
962	#define BLINK_INTERVAL 0.5	851	#define BLINK_INTERVAL 0.5
963	#define TEXT_BLINK_INTERVAL 0.5	852	#define TEXT_BLINK_INTERVAL 0.5
964		853
965	#ifndef __attribute__	854	#ifndef __attribute__
…		…
969	# endif	858	# endif
970	# endif	859	# endif
971	# define __attribute__(x)	860	# define __attribute__(x)
972	#endif	861	#endif
973		862
		863	/****************************************************************************/
		864
		865	#define LINE_LONGER 0x0001 // line is continued on the next row
		866	#define LINE_FILTERED 0x0002 // line has been filtered
		867	#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
		868
		869	struct line_t {
		870	text_t *t; // terminal the text
		871	rend_t *r; // rendition, uses RS_ flags
		872	tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
		873	uint32_t f; // flags
		874
		875	bool is_longer ()
		876	{
		877	return f & LINE_LONGER;
		878	}
		879
		880	void is_longer (int set)
		881	{
		882	if (set)
		883	f \|= LINE_LONGER;
		884	else
		885	f &= ~LINE_LONGER;
		886	}
		887
		888	void clear ()
		889	{
		890	t = 0;
		891	r = 0;
		892	l = 0;
		893	f = 0;
		894	}
		895
		896	void touch () // call whenever a line is changed/touched/updated
		897	{
		898	#if ENABLE_PERL
		899	f &= ~LINE_FILTERED;
		900	#endif
		901	}
		902
		903	void touch (int col)
		904	{
		905	max_it (l, col);
		906	touch ();
		907	}
		908	};
		909
		910	/****************************************************************************/
		911
974	// primivite wrapper around mbstate_t to ensure initialisation	912	// primivite wrapper around mbstate_t to ensure initialisation
975	struct mbstate {	913	struct mbstate {
976	mbstate_t mbs;	914	mbstate_t mbs;
977		915
978	operator mbstate_t *() { return &mbs; }	916	operator mbstate_t *() { return &mbs; }
979	void reset () { memset (&mbs, 0, sizeof (mbs)); }	917	void reset () { memset (&mbs, 0, sizeof (mbs)); }
980	mbstate () { reset (); }	918	mbstate () { reset (); }
981	};	919	};
982		920
		921	/****************************************************************************/
		922
983	#define UNICODE_MASK 0x1fffffUL	923	#define UNICODE_MASK 0x1fffffUL
984		924
985	#if UNICODE3	925	#if UNICODE3
986	# define COMPOSE_LO 0x40000000UL	926	# define COMPOSE_LO 0x40000000UL
987	# define COMPOSE_HI 0x400fffffUL	927	# define COMPOSE_HI 0x400fffffUL
988	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)	928	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
989	#else	929	#else
		930	# if ENABLE_PERL
		931	# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
		932	# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
		933	# else
990	# define COMPOSE_LO 0xd800UL	934	# define COMPOSE_LO 0xd800UL
991	# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...	935	# define COMPOSE_HI 0xf8ffUL
992	# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)	936	# endif
		937	# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
993	#endif	938	#endif
994		939
995	#if ENABLE_COMBINING	940	#if ENABLE_COMBINING
996	// compose chars are used to represent composite characters	941	// compose chars are used to represent composite characters
997	// that are not representable in unicode, as well as characters	942	// that are not representable in unicode, as well as characters
…		…
1017	};	962	};
1018		963
1019	extern class rxvt_composite_vec rxvt_composite;	964	extern class rxvt_composite_vec rxvt_composite;
1020	#endif	965	#endif
1021		966
		967	/****************************************************************************/
1022		968
1023	#ifdef KEYSYM_RESOURCE	969	#ifdef KEYSYM_RESOURCE
1024	class keyboard_manager;	970	class keyboard_manager;
1025	#endif	971	#endif
1026		972
1027	struct rxvt_term : zero_initialized, rxvt_vars {	973	struct rxvt_term : zero_initialized, rxvt_vars {
1028	log_callback *log_hook; // log error messages through this hook, if != 0	974	log_callback *log_hook; // log error messages through this hook, if != 0
1029	getfd_callback *getfd_hook; // convert remote to local fd, if != 0	975	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1030		976	#if ENABLE_PERL
		977	rxvt_perl_term perl;
		978	#endif
1031	struct mbstate mbstate; // current input multibyte state	979	struct mbstate mbstate; // current input multibyte state
1032		980
1033	unsigned char want_refresh:1,	981	unsigned char want_refresh:1,
1034	#ifdef TRANSPARENT	982	#ifdef TRANSPARENT
1035	want_full_refresh:1, /* awaiting full screen refresh */	983	want_full_refresh:1, /* awaiting full screen refresh */
…		…
1090	refresh_limit,	1038	refresh_limit,
1091	last_bot, /* scrollbar last bottom position */	1039	last_bot, /* scrollbar last bottom position */
1092	last_top, /* scrollbar last top position */	1040	last_top, /* scrollbar last top position */
1093	last_state, /* scrollbar last state */	1041	last_state, /* scrollbar last state */
1094	scrollbar_len,	1042	scrollbar_len,
1095	#ifdef MENUBAR
1096	menu_readonly, /* okay to alter menu? */
1097	Arrows_x,
1098	#endif
1099	#if MENUBAR_MAX > 1
1100	Nbars,
1101	#endif
1102	window_vt_x,	1043	window_vt_x,
1103	window_vt_y,	1044	window_vt_y,
1104	window_sb_x,	1045	window_sb_x,
1105	# ifdef POINTER_BLANK	1046	# ifdef POINTER_BLANK
1106	pointerBlankDelay,	1047	pointerBlankDelay,
…		…
1115	unsigned long priv_modes,	1056	unsigned long priv_modes,
1116	SavedModes;	1057	SavedModes;
1117	/* ---------- */	1058	/* ---------- */
1118	Atom xa[NUM_XA];	1059	Atom xa[NUM_XA];
1119	/* ---------- */	1060	/* ---------- */
1120	#ifdef MENUBAR	1061	#ifdef RXVT_SCROLLBAR
1121	GC menubarGC;
1122	#endif
1123	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1124	GC scrollbarGC,	1062	GC scrollbarGC,
1125	topShadowGC,	1063	topShadowGC,
1126	botShadowGC;	1064	botShadowGC;
1127	#endif	1065	#endif
1128	#ifdef XTERM_SCROLLBAR	1066	#ifdef XTERM_SCROLLBAR
…		…
1177	row_col_t oldcursor;	1115	row_col_t oldcursor;
1178	#ifdef XPM_BACKGROUND	1116	#ifdef XPM_BACKGROUND
1179	bgPixmap_t bgPixmap;	1117	bgPixmap_t bgPixmap;
1180	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */	1118	XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1181	#endif	1119	#endif
1182	#ifdef MENUBAR
1183	menu_t ActiveMenu, / currently active menu */
1184	BuildMenu; / the menu currently being built */
1185	bar_t *CurrentBar;
1186	# if ! (MENUBAR_MAX > 1)
1187	bar_t BarList;
1188	# endif /* (MENUBAR_MAX > 1) */
1189	#endif
1190	#ifdef CURSOR_BLINK
1191	struct timeval lastcursorchange;
1192	#endif
1193	#ifdef POINTER_BLANK
1194	struct timeval lastmotion;
1195	#endif
1196		1120
1197	#if ENABLE_OVERLAY	1121	#if ENABLE_OVERLAY
1198	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions	1122	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1199	text_t **ov_text;	1123	text_t **ov_text;
1200	rend_t **ov_rend;	1124	rend_t **ov_rend;
…		…
1215	char env_display; / environmental variable DISPLAY */	1139	char env_display; / environmental variable DISPLAY */
1216	char env_term; / environmental variable TERM */	1140	char env_term; / environmental variable TERM */
1217	char *env_colorfgbg;	1141	char *env_colorfgbg;
1218	char *locale;	1142	char *locale;
1219	char charsets[4];	1143	char charsets[4];
1220	unsigned char v_buffer; / pointer to physical buffer */	1144	char v_buffer; / pointer to physical buffer */
1221	unsigned int v_buflen; /* size of area to write */	1145	unsigned int v_buflen; /* size of area to write */
1222	stringvec argv, envv; /* if != 0, will be freed on destroy time */	1146	stringvec argv, envv; /* if != 0, will be freed on destroy time */
1223		1147
1224	#ifdef KEYSYM_RESOURCE	1148	#ifdef KEYSYM_RESOURCE
1225	keyboard_manager *keyboard;	1149	keyboard_manager *keyboard;
1226	#endif	1150	#endif
1227		1151
1228	const char *rs[NUM_RESOURCES];	1152	const char *rs[NUM_RESOURCES];
1229	/* command input buffering */	1153	/* command input buffering */
1230	unsigned char cmdbuf_ptr, cmdbuf_endp;	1154	char cmdbuf_ptr, cmdbuf_endp;
1231	unsigned char cmdbuf_base[CBUFSIZ];	1155	char cmdbuf_base[CBUFSIZ];
1232		1156
1233	rxvt_salloc *talloc; // text line allocator	1157	rxvt_salloc *talloc; // text line allocator
1234	rxvt_salloc *ralloc; // rend line allocator	1158	rxvt_salloc *ralloc; // rend line allocator
1235		1159
1236	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1160	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
…		…
1245	void iso14755_54 (int x, int y);	1169	void iso14755_54 (int x, int y);
1246	# endif	1170	# endif
1247	#endif	1171	#endif
1248		1172
1249	// modifies first argument(!)	1173	// modifies first argument(!)
1250	void paste (unsigned char *data, unsigned int len);	1174	void paste (char *data, unsigned int len);
1251		1175
1252	void flush ();	1176	long vt_emask, vt_emask_perl;
		1177
		1178	void vt_select_input () const
		1179	{
		1180	XSelectInput (display->display, vt, vt_emask \| vt_emask_perl);
		1181	}
1253		1182
1254	#if TRANSPARENT	1183	#if TRANSPARENT
1255	void rootwin_cb (XEvent &xev);	1184	void rootwin_cb (XEvent &xev);
1256	xevent_watcher rootwin_ev;	1185	xevent_watcher rootwin_ev;
1257	#endif	1186	#endif
1258		1187
1259	void x_cb (XEvent &xev);	1188	void x_cb (XEvent &xev);
		1189	void flush ();
1260	xevent_watcher termwin_ev;	1190	xevent_watcher termwin_ev;
1261	xevent_watcher vt_ev;	1191	xevent_watcher vt_ev;
1262	#ifdef HAVE_SCROLLBARS	1192	#ifdef HAVE_SCROLLBARS
1263	xevent_watcher scrollbar_ev;	1193	xevent_watcher scrollbar_ev;
1264	#endif	1194	#endif
1265	#ifdef MENUBAR
1266	xevent_watcher menubar_ev;
1267	#endif
1268		1195
1269	void check_cb (check_watcher &w); check_watcher check_ev;	1196	void check_cb (check_watcher &w); check_watcher check_ev;
1270	void destroy_cb (time_watcher &w); time_watcher destroy_ev;	1197	void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1271	void flush_cb (time_watcher &w); time_watcher flush_ev;	1198	void flush_cb (time_watcher &w); time_watcher flush_ev;
1272		1199
…		…
1296	void pointer_blank ();	1223	void pointer_blank ();
1297	#endif	1224	#endif
1298	void pointer_unblank ();	1225	void pointer_unblank ();
1299		1226
1300	void tt_printf (const char *fmt,...);	1227	void tt_printf (const char *fmt,...);
1301	void tt_write (const unsigned char *data, unsigned int len);	1228	void tt_write (const char *data, unsigned int len);
1302	void pty_write ();	1229	void pty_write ();
1303		1230
1304	void tt_winch ();	1231	void tt_winch ();
1305		1232
1306	rxvt_term ();	1233	rxvt_term ();
…		…
1312	bool init (int argc, const char const argv);	1239	bool init (int argc, const char const argv);
1313	bool init_vars ();	1240	bool init_vars ();
1314		1241
1315	bool pty_fill ();	1242	bool pty_fill ();
1316		1243
		1244	void make_current () const // make this the "currently active" urxvt instance
		1245	{
		1246	SET_R (this);
		1247	rxvt_set_locale (locale);
		1248	set_environ (envv);
		1249	}
		1250
1317	void init_secondary ();	1251	void init_secondary ();
1318	const char *init_resources (int argc, const char const *argv);	1252	const char *init_resources (int argc, const char const *argv);
		1253	const char x_resource (const char name);
1319	void init_env ();	1254	void init_env ();
1320	void set_locale (const char *locale);	1255	void set_locale (const char *locale);
1321	void init_xlocale ();	1256	void init_xlocale ();
1322	void init_command (const char const argv);	1257	void init_command (const char const argv);
1323	void run_command (const char const argv);	1258	void run_command (const char const argv);
…		…
1358		1293
1359	/* autoconvert */	1294	/* autoconvert */
1360		1295
1361	// command.C	1296	// command.C
1362	void lookup_key (XKeyEvent &ev);	1297	void lookup_key (XKeyEvent &ev);
1363	unsigned int cmd_write (const unsigned char *str, unsigned int count);	1298	unsigned int cmd_write (const char *str, unsigned int count);
1364		1299
1365	unicode_t next_char ();	1300	wchar_t next_char ();
1366	unicode_t cmd_getc ();	1301	wchar_t cmd_getc ();
1367	unicode_t next_octet ();	1302	uint32_t next_octet ();
1368	unicode_t cmd_get8 ();	1303	uint32_t cmd_get8 ();
1369		1304
1370	bool cmd_parse ();	1305	bool cmd_parse ();
1371	void mouse_report (XButtonEvent &ev);	1306	void mouse_report (XButtonEvent &ev);
1372	void button_press (XButtonEvent &ev);	1307	void button_press (XButtonEvent &ev);
1373	void button_release (XButtonEvent &ev);	1308	void button_release (XButtonEvent &ev);
…		…
1382	void process_nonprinting (unicode_t ch);	1317	void process_nonprinting (unicode_t ch);
1383	void process_escape_vt52 (unicode_t ch);	1318	void process_escape_vt52 (unicode_t ch);
1384	void process_escape_seq ();	1319	void process_escape_seq ();
1385	void process_csi_seq ();	1320	void process_csi_seq ();
1386	void process_window_ops (const int *args, unsigned int nargs);	1321	void process_window_ops (const int *args, unsigned int nargs);
1387	unsigned char *get_to_st (unicode_t &ends_how);	1322	char *get_to_st (unicode_t &ends_how);
1388	void process_dcs_seq ();	1323	void process_dcs_seq ();
1389	void process_osc_seq ();	1324	void process_osc_seq ();
1390	void process_color_seq (int report, int color, const char *str, unsigned char resp);	1325	void process_color_seq (int report, int color, const char *str, char resp);
1391	void process_xterm_seq (int op, const char *str, unsigned char resp);	1326	void process_xterm_seq (int op, const char *str, char resp);
1392	int privcases (int mode, unsigned long bit);	1327	int privcases (int mode, unsigned long bit);
1393	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1328	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1394	void process_sgr_mode (unsigned int nargs, const int *arg);	1329	void process_sgr_mode (unsigned int nargs, const int *arg);
1395	void process_graphics ();	1330	void process_graphics ();
1396	// init.C	1331	// init.C
…		…
1409	void set_window_color (int idx, const char *color);	1344	void set_window_color (int idx, const char *color);
1410	void set_colorfgbg ();	1345	void set_colorfgbg ();
1411	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1346	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1412	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1347	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1413		1348
1414	#ifdef MENUBAR
1415	// menubar.C
1416	void menuitem_free (menu_t menu, menuitem_t item);
1417	int action_dispatch (action_t *action);
1418	void menuarrow_free (char name);
1419	void menuarrow_add (char *string);
1420	char menu_find_base (menu_t menu, char path);
1421	menu_t menu_delete (menu_t menu);
1422	menu_t menu_add (menu_t parent, char *path);
1423	void drawbox_menubar (int x, int len, int state);
1424	void drawtriangle (int x, int y, int state);
1425	void drawbox_menuitem (int y, int state);
1426	void menu_show ();
1427	void menu_display (void (rxvt_term::*update) ());
1428	void menu_hide_all ();
1429	void menu_hide ();
1430	void menu_clear (menu_t *menu);
1431	void menubar_clear ();
1432	bar_t menubar_find (const char name);
1433	int menubar_push (const char *name);
1434	void menubar_remove (const char *name);
1435	void menubar_dump (FILE *fp);
1436	void menubar_read (const char *filename);
1437	void menubar_dispatch (char *str);
1438	void draw_Arrows (int name, int state);
1439	void menubar_expose ();
1440	int menubar_mapping (int map);
1441	int menu_select (XButtonEvent &ev);
1442	void menubar_select (XButtonEvent &ev);
1443	void menubar_control (XButtonEvent &ev);
1444	void map_menuBar (int map);
1445	#endif
1446
1447	// screen.C	1349	// screen.C
1448		1350
1449	void lalloc (line_t &l)	1351	void lalloc (line_t &l) const
1450	{	1352	{
1451	l.t = (text_t *)talloc->alloc ();	1353	l.t = (text_t *)talloc->alloc ();
1452	l.r = (rend_t *)ralloc->alloc ();	1354	l.r = (rend_t *)ralloc->alloc ();
1453	}	1355	}
1454		1356
…		…
1458	talloc->free (l.t);	1360	talloc->free (l.t);
1459	ralloc->free (l.r);	1361	ralloc->free (l.r);
1460	}	1362	}
1461	#endif	1363	#endif
1462		1364
1463	void lresize (line_t &l)	1365	void lresize (line_t &l) const
1464	{	1366	{
1465	if (!l.t)	1367	if (!l.t)
1466	return;	1368	return;
1467		1369
1468	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));	1370	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
…		…
1472		1374
1473	if (ncol > prev_ncol)	1375	if (ncol > prev_ncol)
1474	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);	1376	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1475	}	1377	}
1476		1378
1477	int fgcolor_of (rend_t r)	1379	int fgcolor_of (rend_t r) const
1478	{	1380	{
1479	int base = GET_BASEFG (r);	1381	int base = GET_BASEFG (r);
1480	#ifndef NO_BRIGHTCOLOR	1382	#ifndef NO_BRIGHTCOLOR
1481	if (r & RS_Bold	1383	if (r & RS_Bold
1482	# if ENABLE_STYLES	1384	# if ENABLE_STYLES
…		…
1486	base += minBrightCOLOR - minCOLOR;	1388	base += minBrightCOLOR - minCOLOR;
1487	#endif	1389	#endif
1488	return base;	1390	return base;
1489	}	1391	}
1490		1392
1491	int bgcolor_of (rend_t r)	1393	int bgcolor_of (rend_t r) const
1492	{	1394	{
1493	int base = GET_BASEBG (r);	1395	int base = GET_BASEBG (r);
1494	#ifndef NO_BRIGHTCOLOR	1396	#ifndef NO_BRIGHTCOLOR
1495	if (r & RS_Blink	1397	if (r & RS_Blink
1496	# if ENABLE_STYLES	1398	# if ENABLE_STYLES
…		…
1500	base += minBrightCOLOR - minCOLOR;	1402	base += minBrightCOLOR - minCOLOR;
1501	#endif	1403	#endif
1502	return base;	1404	return base;
1503	}	1405	}
1504		1406
		1407	bool option (uint32_t opt) const
		1408	{
		1409	return OPTION (opt);
		1410	}
		1411
		1412	void set_option (uint32_t opt, bool set)
		1413	{
		1414	if (set)
		1415	options \|= opt;
		1416	else
		1417	options &= ~opt;
		1418	}
		1419
1505	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);	1420	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1506	void scr_blank_screen_mem (line_t &l, rend_t efs);	1421	void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1507	int scr_scroll_text (int row1, int row2, int count);	1422	int scr_scroll_text (int row1, int row2, int count);
1508	void scr_reset ();	1423	void scr_reset ();
1509	void scr_release ();	1424	void scr_release ();
1510	void scr_clear (bool really = false);	1425	void scr_clear (bool really = false);
1511	void scr_refresh (unsigned char refresh_type);	1426	void scr_refresh (unsigned char refresh_type);
…		…
1519	void scr_touch (bool refresh);	1434	void scr_touch (bool refresh);
1520	void scr_expose (int x, int y, int width, int height, bool refresh);	1435	void scr_expose (int x, int y, int width, int height, bool refresh);
1521	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1436	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1522	void scr_recolour ();	1437	void scr_recolour ();
1523	void scr_remap_chars ();	1438	void scr_remap_chars ();
1524	void scr_remap_chars (const line_t &l);	1439	void scr_remap_chars (line_t &l);
1525		1440
1526	void scr_poweron ();	1441	void scr_poweron ();
1527	void scr_cursor (int mode);	1442	void scr_cursor (int mode);
1528	void scr_do_wrap ();	1443	void scr_do_wrap ();
1529	int scr_change_screen (int scrn);	1444	int scr_change_screen (int scrn);
1530	void scr_color (unsigned int color, int fgbg);	1445	void scr_color (unsigned int color, int fgbg);
1531	void scr_rendition (int set, int style);	1446	void scr_rendition (int set, int style);
1532	void scr_add_lines (const unicode_t *str, int nlines, int len);	1447	void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1533	void scr_backspace ();	1448	void scr_backspace ();
1534	void scr_tab (int count, bool ht = false);	1449	void scr_tab (int count, bool ht = false);
1535	void scr_gotorc (int row, int col, int relative);	1450	void scr_gotorc (int row, int col, int relative);
1536	void scr_index (enum page_dirn direction);	1451	void scr_index (enum page_dirn direction);
1537	void scr_erase_line (int mode);	1452	void scr_erase_line (int mode);
…		…
1547	void scr_rvideo_mode (int mode);	1462	void scr_rvideo_mode (int mode);
1548	void scr_report_position ();	1463	void scr_report_position ();
1549	void set_font_style ();	1464	void set_font_style ();
1550	void scr_charset_choose (int set);	1465	void scr_charset_choose (int set);
1551	void scr_charset_set (int set, unsigned int ch);	1466	void scr_charset_set (int set, unsigned int ch);
1552	int scr_move_to (int y, int len);	1467	void scr_move_to (int y, int len);
1553	int scr_page (enum page_dirn direction, int nlines);	1468	bool scr_page (enum page_dirn direction, int nlines);
1554	int scr_changeview (unsigned int oldviewstart);	1469	bool scr_changeview (int new_view_start);
1555	void scr_bell ();	1470	void scr_bell ();
1556	void scr_printscreen (int fullhist);	1471	void scr_printscreen (int fullhist);
		1472	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
		1473	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1557	void scr_reverse_selection ();	1474	void scr_reverse_selection ();
1558	void scr_dump (int fd);	1475	void scr_dump (int fd);
1559	void selection_check (int check_more);	1476	void selection_check (int check_more);
1560	void selection_paste (Window win, Atom prop, bool delete_prop);	1477	void selection_paste (Window win, Atom prop, bool delete_prop);
1561	void selection_property (Window win, Atom prop);	1478	void selection_property (Window win, Atom prop);
1562	void selection_request (Time tm, int x, int y);	1479	void selection_request (Time tm, int x, int y);
1563	int selection_request_other (Atom target, int selnum);	1480	int selection_request_other (Atom target, int selnum);
1564	void selection_clear ();	1481	void selection_clear ();
1565	void selection_make (Time tm);	1482	void selection_make (Time tm);
		1483	bool selection_grab (Time tm);
1566	void selection_start_colrow (int col, int row);	1484	void selection_start_colrow (int col, int row);
1567	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);	1485	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);
1568	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);	1486	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1569	void selection_remove_trailing_spaces ();	1487	void selection_remove_trailing_spaces ();
1570	void selection_send (const XSelectionRequestEvent &rq);	1488	void selection_send (const XSelectionRequestEvent &rq);
…		…
1577	int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);	1495	int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1578	#endif	1496	#endif
1579		1497
1580	#if defined(RXVT_SCROLLBAR)	1498	#if defined(RXVT_SCROLLBAR)
1581	// scrollbar-rxvt.C	1499	// scrollbar-rxvt.C
1582	void Draw_button (int x, int y, int state, int dirn);
1583	int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);	1500	int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1584	#endif	1501	#endif
1585		1502
1586	#if defined(XTERM_SCROLLBAR)	1503	#if defined(XTERM_SCROLLBAR)
1587	// scrollbar-xterm.C	1504	// scrollbar-xterm.C

Diff Legend

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

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents): Revision 1.179 by root, Mon Jan 2 15:10:18 2006 UTC vs. Revision 1.211 by root, Mon Jan 16 18:09:28 2006 UTC

Diff Legend

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.179 by root, Mon Jan 2 15:10:18 2006 UTC vs.
Revision 1.211 by root, Mon Jan 16 18:09:28 2006 UTC