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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.183 by root, Tue Jan 3 02:43:33 2006 UTC vs.
Revision 1.197 by root, Wed Jan 11 05:29:40 2006 UTC

…		…
18	#include "encoding.h"	18	#include "encoding.h"
19	#include "rxvtfont.h"	19	#include "rxvtfont.h"
20	#include "rxvttoolkit.h"	20	#include "rxvttoolkit.h"
21	#include "iom.h"	21	#include "iom.h"
22	#include "salloc.h"	22	#include "salloc.h"
		23
		24	#include "rxvtperl.h"
23		25
24	#if ENABLE_FRILLS	26	#if ENABLE_FRILLS
25	# define ENABLE_XEMBED 1	27	# define ENABLE_XEMBED 1
26	# define ENABLE_EWMH 1	28	# define ENABLE_EWMH 1
27	# define CURSOR_BLINK 1	29	# define CURSOR_BLINK 1
…		…
207	# define TERMENV "rxvt-unicode"	209	# define TERMENV "rxvt-unicode"
208	#endif	210	#endif
209		211
210	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)	212	#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211	# define NO_MOUSE_REPORT_SCROLLBAR 1	213	# define NO_MOUSE_REPORT_SCROLLBAR 1
212	#endif
213
214	#ifdef NO_RESOURCES
215	# undef USE_XGETDEFAULT
216	#endif	214	#endif
217		215
218	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)	216	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
219	# define ENABLE_OVERLAY 1	217	# define ENABLE_OVERLAY 1
220	#endif	218	#endif
…		…
436	XTerm_property = 3, // change X property	434	XTerm_property = 3, // change X property
437	XTerm_Color = 4, // change colors	435	XTerm_Color = 4, // change colors
438	XTerm_Color00 = 10, // not implemented, CLASH!	436	XTerm_Color00 = 10, // not implemented, CLASH!
439	XTerm_Color01 = 11, // not implemented	437	XTerm_Color01 = 11, // not implemented
440	XTerm_Color_cursor = 12, // change actual 'Cursor' color	438	XTerm_Color_cursor = 12, // change actual 'Cursor' color
441	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color	439	XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442	XTerm_Color_pointer_bg = 14, // not implemented	440	XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443	XTerm_Color05 = 15, // not implemented	441	XTerm_Color05 = 15, // not implemented (tektronix fg)
444	XTerm_Color06 = 16, // not implemented	442	XTerm_Color06 = 16, // not implemented (tektronix bg)
445	XTerm_Color_RV = 17, // change actual 'Highlight' color	443	XTerm_Color_RV = 17, // change actual 'Highlight' color
446	XTerm_logfile = 46, // not implemented	444	XTerm_logfile = 46, // not implemented
447	XTerm_font = 50,	445	XTerm_font = 50,
448		446
449	XTerm_konsole30 = 30, // reserved for konsole	447	XTerm_konsole30 = 30, // reserved for konsole
450	XTerm_konsole31 = 31, // reserved for konsole	448	XTerm_konsole31 = 31, // reserved for konsole
451	XTerm_emacs51 = 51, // reserved for emacs shell	449	XTerm_emacs51 = 51, // reserved for emacs shell
452	/*	450	/*
453	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)	451	* rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST\|BEL)
		452	* at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454	*/	453	*/
455	XTerm_Color_BD = 18, // change actual 'Bold' color	454	Rxvt_Color_BD = 18, // change actual 'Bold' color
456	XTerm_Color_UL = 19, // change actual 'Underline' color	455	Rxvt_Color_UL = 19, // change actual 'Underline' color
457	XTerm_Pixmap = 20, // new bg pixmap	456	Rxvt_Pixmap = 20, // new bg pixmap
458	XTerm_restoreFG = 39, // change default fg color	457	Rxvt_restoreFG = 39, // change default fg color
459	XTerm_restoreBG = 49, // change default bg color	458	Rxvt_restoreBG = 49, // change default bg color
460	XTerm_dumpscreen = 55, // dump scrollback and all of screen	459	Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461		460
462	URxvt_locale = 701, // change locale	461	URxvt_locale = 701, // change locale
463	URxvt_Menu = 703, // set menu item	462	URxvt_Menu = 703, // set menu item
464	URxvt_Color_IT = 704, // change actual 'Italic' colour	463	URxvt_Color_IT = 704, // change actual 'Italic' colour
465	URxvt_Color_tint = 705, // change actual tint colour	464	URxvt_Color_tint = 705, // change actual tint colour
		465	URxvt_Color_BD = 706,
		466	URxvt_Color_UL = 707,
466		467
467	URxvt_font = 710,	468	URxvt_font = 710,
468	URxvt_boldFont = 711,	469	URxvt_boldFont = 711,
469	URxvt_italicFont = 712,	470	URxvt_italicFont = 712,
470	URxvt_boldItalicFont = 713,	471	URxvt_boldItalicFont = 713,
471		472
472	URxvt_view_up = 720,	473	URxvt_view_up = 720,
473	URxvt_view_down = 721,	474	URxvt_view_down = 721,
		475
		476	URxvt_perl = 777,
474	};	477	};
475		478
476	/* Words starting with `Color_' are colours. Others are counts */	479	/* Words starting with `Color_' are colours. Others are counts */
477	/*	480	/*
478	* The PixColor and rendition colour usage should probably be decoupled	481	* The PixColor and rendition colour usage should probably be decoupled
…		…
555		558
556	/*	559	/*
557	* Resource list	560	* Resource list
558	*/	561	*/
559	enum {	562	enum {
560	#define Rs_def(name) Rs_ ## name,	563	# define def(name) Rs_ ## name,
561	#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,	564	# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562	#include "rsinc.h"	565	# include "rsinc.h"
563	#undef Rs_def	566	# undef def
564	#undef Rs_reserve	567	# undef reserve
565	NUM_RESOURCES	568	NUM_RESOURCES
566	};	569	};
567		570
568	// see init.C:xa_names, which must be kept in sync	571	// see init.C:xa_names, which must be kept in sync
569	enum {	572	enum {
…		…
683	/*	686	/*
684	*****************************************************************************	687	*****************************************************************************
685	* MACRO DEFINES	688	* MACRO DEFINES
686	*****************************************************************************	689	*****************************************************************************
687	*/	690	*/
688	#define memset(x, y, z) memset((x), (y), (size_t)(z))
689	#define memcpy(x, y, z) memcpy((void )(x), (const void )(y), (z))
690	#define memmove(x, y, z) memmove((void )(x), (const void )(y), (z))
691	#define strcasecmp(x, y) strcasecmp((x), (y))
692	#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
693	#define strcpy(x, y) strcpy((char )(x), (const char )(y))
694	#define strncpy(x, y, z) strncpy((char )(x), (const char )(y), (z))
695	#define strcmp(x, y) strcmp((const char )(x), (const char )(y))
696	#define strncmp(x, y, z) strncmp((const char )(x), (const char )(y), (z))
697	#define strcat(x, y) strcat((char )(x), (const char )(y))
698	#define strncat(x, y, z) strncat((char )(x), (const char )(y), (z))
699	#define strdup(x) strdup((const char *)(x))
700	#define strlen(x) strlen((const char *)(x))
701	#define strchr(x, y) strchr((const char *)(x), (int)(y))
702	#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
703
704	#define dDisp Display *disp = display->display	691	#define dDisp Display *disp = display->display
705		692
706	/* convert pixel dimensions to row/column values. Everything as int32_t */	693	/* convert pixel dimensions to row/column values. Everything as int32_t */
707	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	694	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
708	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	695	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
…		…
711	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	698	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
712	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	699	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
713	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)	700	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
714	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)	701	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
715		702
716	#define TermWin_TotalWidth() ((int32_t)this->width)	703	#define TEMP_ENV temp_environ temp_environ (envv)
717	#define TermWin_TotalHeight() ((int32_t)this->height)	704
		705	#define OPTION(opt) (options & (opt))
		706	#define DEFAULT_OPTIONS (Opt_scrollBar \| Opt_scrollTtyOutput \
		707	\| Opt_jumpScroll \| Opt_secondaryScreen \
		708	\| Opt_pastableTabs \| Opt_intensityStyles)
718		709
719	// for m >= -n, ensure remainder lies between 0..n-1	710	// for m >= -n, ensure remainder lies between 0..n-1
720	#define MOD(m,n) (((m) + (n)) % (n))	711	#define MOD(m,n) (((m) + (n)) % (n))
721		712
722	#define LINENO(n) MOD (term_start + int(n), total_rows)	713	#define LINENO(n) MOD (term_start + int(n), total_rows)
…		…
849	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	840	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
850	extern void rxvt_exit_failure () __attribute__ ((noreturn));	841	extern void rxvt_exit_failure () __attribute__ ((noreturn));
851		842
852	#define SET_LOCALE(locale) rxvt_set_locale (locale)	843	#define SET_LOCALE(locale) rxvt_set_locale (locale)
853	extern bool rxvt_set_locale (const char *locale);	844	extern bool rxvt_set_locale (const char *locale);
854	extern bool rxvt_push_locale (const char *locale);	845	extern void rxvt_push_locale (const char *locale);
855	extern void rxvt_pop_locale ();	846	extern void rxvt_pop_locale ();
856		847
857	/*
858	*****************************************************************************	848	/****************************************************************************/
859	* VARIABLES	849
860	*****************************************************************************
861	*/
862	#ifdef MENUBAR	850	#ifdef MENUBAR
863	# include "menubar.h"	851	# include "menubar.h"
864	#endif	852	#endif
865		853
866	#define BLINK_INTERVAL 0.5	854	#define BLINK_INTERVAL 0.5
…		…
873	# endif	861	# endif
874	# endif	862	# endif
875	# define __attribute__(x)	863	# define __attribute__(x)
876	#endif	864	#endif
877		865
		866	/****************************************************************************/
		867
		868	#define LINE_LONGER 0x0001 // line is continued on the next row
		869	#define LINE_FILTERED 0x0002 // line has been filtered
		870	#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
		871
		872	struct line_t {
		873	text_t *t; // terminal the text
		874	rend_t *r; // rendition, uses RS_ flags
		875	tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
		876	uint32_t f; // flags
		877
		878	bool is_longer ()
		879	{
		880	return f & LINE_LONGER;
		881	}
		882
		883	void is_longer (int set)
		884	{
		885	if (set)
		886	f \|= LINE_LONGER;
		887	else
		888	f &= ~LINE_LONGER;
		889	}
		890
		891	void clear ()
		892	{
		893	t = 0;
		894	r = 0;
		895	l = 0;
		896	f = 0;
		897	}
		898
		899	void touch () // call whenever a line is changed/touched/updated
		900	{
		901	#if ENABLE_PERL
		902	f &= ~LINE_FILTERED;
		903	#endif
		904	}
		905
		906	void touch (int col)
		907	{
		908	max_it (l, col);
		909	touch ();
		910	}
		911	};
		912
		913	/****************************************************************************/
		914
878	// primivite wrapper around mbstate_t to ensure initialisation	915	// primivite wrapper around mbstate_t to ensure initialisation
879	struct mbstate {	916	struct mbstate {
880	mbstate_t mbs;	917	mbstate_t mbs;
881		918
882	operator mbstate_t *() { return &mbs; }	919	operator mbstate_t *() { return &mbs; }
883	void reset () { memset (&mbs, 0, sizeof (mbs)); }	920	void reset () { memset (&mbs, 0, sizeof (mbs)); }
884	mbstate () { reset (); }	921	mbstate () { reset (); }
885	};	922	};
886		923
		924	/****************************************************************************/
		925
887	#define UNICODE_MASK 0x1fffffUL	926	#define UNICODE_MASK 0x1fffffUL
888		927
889	#if UNICODE3	928	#if UNICODE3
890	# define COMPOSE_LO 0x40000000UL	929	# define COMPOSE_LO 0x40000000UL
891	# define COMPOSE_HI 0x400fffffUL	930	# define COMPOSE_HI 0x400fffffUL
892	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)	931	# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
893	#else	932	#else
		933	# if ENABLE_PERL
		934	# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
		935	# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
		936	# else
894	# define COMPOSE_LO 0xd800UL	937	# define COMPOSE_LO 0xd800UL
895	# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...	938	# define COMPOSE_HI 0xf8ffUL
896	# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)	939	# endif
		940	# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
897	#endif	941	#endif
898		942
899	#if ENABLE_COMBINING	943	#if ENABLE_COMBINING
900	// compose chars are used to represent composite characters	944	// compose chars are used to represent composite characters
901	// that are not representable in unicode, as well as characters	945	// that are not representable in unicode, as well as characters
…		…
921	};	965	};
922		966
923	extern class rxvt_composite_vec rxvt_composite;	967	extern class rxvt_composite_vec rxvt_composite;
924	#endif	968	#endif
925		969
		970	/****************************************************************************/
926		971
927	#ifdef KEYSYM_RESOURCE	972	#ifdef KEYSYM_RESOURCE
928	class keyboard_manager;	973	class keyboard_manager;
929	#endif	974	#endif
930		975
931	struct rxvt_term : zero_initialized, rxvt_vars {	976	struct rxvt_term : zero_initialized, rxvt_vars {
932	log_callback *log_hook; // log error messages through this hook, if != 0	977	log_callback *log_hook; // log error messages through this hook, if != 0
933	getfd_callback *getfd_hook; // convert remote to local fd, if != 0	978	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
934
935	#if ENABLE_PERL	979	#if ENABLE_PERL
936	void *self; // perl's $self	980	rxvt_perl_term perl;
937	#endif	981	#endif
938
939	struct mbstate mbstate; // current input multibyte state	982	struct mbstate mbstate; // current input multibyte state
940		983
941	unsigned char want_refresh:1,	984	unsigned char want_refresh:1,
942	#ifdef TRANSPARENT	985	#ifdef TRANSPARENT
943	want_full_refresh:1, /* awaiting full screen refresh */	986	want_full_refresh:1, /* awaiting full screen refresh */
…		…
1093	bar_t *CurrentBar;	1136	bar_t *CurrentBar;
1094	# if ! (MENUBAR_MAX > 1)	1137	# if ! (MENUBAR_MAX > 1)
1095	bar_t BarList;	1138	bar_t BarList;
1096	# endif /* (MENUBAR_MAX > 1) */	1139	# endif /* (MENUBAR_MAX > 1) */
1097	#endif	1140	#endif
1098	#ifdef CURSOR_BLINK
1099	struct timeval lastcursorchange;
1100	#endif
1101	#ifdef POINTER_BLANK
1102	struct timeval lastmotion;
1103	#endif
1104		1141
1105	#if ENABLE_OVERLAY	1142	#if ENABLE_OVERLAY
1106	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions	1143	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1107	text_t **ov_text;	1144	text_t **ov_text;
1108	rend_t **ov_rend;	1145	rend_t **ov_rend;
…		…
1123	char env_display; / environmental variable DISPLAY */	1160	char env_display; / environmental variable DISPLAY */
1124	char env_term; / environmental variable TERM */	1161	char env_term; / environmental variable TERM */
1125	char *env_colorfgbg;	1162	char *env_colorfgbg;
1126	char *locale;	1163	char *locale;
1127	char charsets[4];	1164	char charsets[4];
1128	unsigned char v_buffer; / pointer to physical buffer */	1165	char v_buffer; / pointer to physical buffer */
1129	unsigned int v_buflen; /* size of area to write */	1166	unsigned int v_buflen; /* size of area to write */
1130	stringvec argv, envv; /* if != 0, will be freed on destroy time */	1167	stringvec argv, envv; /* if != 0, will be freed on destroy time */
1131		1168
1132	#ifdef KEYSYM_RESOURCE	1169	#ifdef KEYSYM_RESOURCE
1133	keyboard_manager *keyboard;	1170	keyboard_manager *keyboard;
1134	#endif	1171	#endif
1135		1172
1136	const char *rs[NUM_RESOURCES];	1173	const char *rs[NUM_RESOURCES];
1137	/* command input buffering */	1174	/* command input buffering */
1138	unsigned char cmdbuf_ptr, cmdbuf_endp;	1175	char cmdbuf_ptr, cmdbuf_endp;
1139	unsigned char cmdbuf_base[CBUFSIZ];	1176	char cmdbuf_base[CBUFSIZ];
1140		1177
1141	rxvt_salloc *talloc; // text line allocator	1178	rxvt_salloc *talloc; // text line allocator
1142	rxvt_salloc *ralloc; // rend line allocator	1179	rxvt_salloc *ralloc; // rend line allocator
1143		1180
1144	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1181	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
…		…
1153	void iso14755_54 (int x, int y);	1190	void iso14755_54 (int x, int y);
1154	# endif	1191	# endif
1155	#endif	1192	#endif
1156		1193
1157	// modifies first argument(!)	1194	// modifies first argument(!)
1158	void paste (unsigned char *data, unsigned int len);	1195	void paste (char *data, unsigned int len);
1159		1196
1160	void flush ();	1197	void flush ();
1161		1198
1162	#if TRANSPARENT	1199	#if TRANSPARENT
1163	void rootwin_cb (XEvent &xev);	1200	void rootwin_cb (XEvent &xev);
…		…
1204	void pointer_blank ();	1241	void pointer_blank ();
1205	#endif	1242	#endif
1206	void pointer_unblank ();	1243	void pointer_unblank ();
1207		1244
1208	void tt_printf (const char *fmt,...);	1245	void tt_printf (const char *fmt,...);
1209	void tt_write (const unsigned char *data, unsigned int len);	1246	void tt_write (const char *data, unsigned int len);
1210	void pty_write ();	1247	void pty_write ();
1211		1248
1212	void tt_winch ();	1249	void tt_winch ();
1213		1250
1214	rxvt_term ();	1251	rxvt_term ();
…		…
1222		1259
1223	bool pty_fill ();	1260	bool pty_fill ();
1224		1261
1225	void init_secondary ();	1262	void init_secondary ();
1226	const char *init_resources (int argc, const char const *argv);	1263	const char *init_resources (int argc, const char const *argv);
		1264	const char x_resource (const char name);
1227	void init_env ();	1265	void init_env ();
1228	void set_locale (const char *locale);	1266	void set_locale (const char *locale);
1229	void init_xlocale ();	1267	void init_xlocale ();
1230	void init_command (const char const argv);	1268	void init_command (const char const argv);
1231	void run_command (const char const argv);	1269	void run_command (const char const argv);
…		…
1266		1304
1267	/* autoconvert */	1305	/* autoconvert */
1268		1306
1269	// command.C	1307	// command.C
1270	void lookup_key (XKeyEvent &ev);	1308	void lookup_key (XKeyEvent &ev);
1271	unsigned int cmd_write (const unsigned char *str, unsigned int count);	1309	unsigned int cmd_write (const char *str, unsigned int count);
1272		1310
1273	unicode_t next_char ();	1311	wchar_t next_char ();
1274	unicode_t cmd_getc ();	1312	wchar_t cmd_getc ();
1275	unicode_t next_octet ();	1313	uint32_t next_octet ();
1276	unicode_t cmd_get8 ();	1314	uint32_t cmd_get8 ();
1277		1315
1278	bool cmd_parse ();	1316	bool cmd_parse ();
1279	void mouse_report (XButtonEvent &ev);	1317	void mouse_report (XButtonEvent &ev);
1280	void button_press (XButtonEvent &ev);	1318	void button_press (XButtonEvent &ev);
1281	void button_release (XButtonEvent &ev);	1319	void button_release (XButtonEvent &ev);
…		…
1290	void process_nonprinting (unicode_t ch);	1328	void process_nonprinting (unicode_t ch);
1291	void process_escape_vt52 (unicode_t ch);	1329	void process_escape_vt52 (unicode_t ch);
1292	void process_escape_seq ();	1330	void process_escape_seq ();
1293	void process_csi_seq ();	1331	void process_csi_seq ();
1294	void process_window_ops (const int *args, unsigned int nargs);	1332	void process_window_ops (const int *args, unsigned int nargs);
1295	unsigned char *get_to_st (unicode_t &ends_how);	1333	char *get_to_st (unicode_t &ends_how);
1296	void process_dcs_seq ();	1334	void process_dcs_seq ();
1297	void process_osc_seq ();	1335	void process_osc_seq ();
1298	void process_color_seq (int report, int color, const char *str, unsigned char resp);	1336	void process_color_seq (int report, int color, const char *str, char resp);
1299	void process_xterm_seq (int op, const char *str, unsigned char resp);	1337	void process_xterm_seq (int op, const char *str, char resp);
1300	int privcases (int mode, unsigned long bit);	1338	int privcases (int mode, unsigned long bit);
1301	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1339	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1302	void process_sgr_mode (unsigned int nargs, const int *arg);	1340	void process_sgr_mode (unsigned int nargs, const int *arg);
1303	void process_graphics ();	1341	void process_graphics ();
1304	// init.C	1342	// init.C
…		…
1408	base += minBrightCOLOR - minCOLOR;	1446	base += minBrightCOLOR - minCOLOR;
1409	#endif	1447	#endif
1410	return base;	1448	return base;
1411	}	1449	}
1412		1450
		1451	bool option (uint32_t opt)
		1452	{
		1453	return OPTION (opt);
		1454	}
		1455
		1456	void set_option (uint32_t opt, bool set)
		1457	{
		1458	if (set)
		1459	options \|= opt;
		1460	else
		1461	options &= ~opt;
		1462	}
		1463
1413	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);	1464	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1414	void scr_blank_screen_mem (line_t &l, rend_t efs);	1465	void scr_blank_screen_mem (line_t &l, rend_t efs);
1415	int scr_scroll_text (int row1, int row2, int count);	1466	int scr_scroll_text (int row1, int row2, int count);
1416	void scr_reset ();	1467	void scr_reset ();
1417	void scr_release ();	1468	void scr_release ();
…		…
1427	void scr_touch (bool refresh);	1478	void scr_touch (bool refresh);
1428	void scr_expose (int x, int y, int width, int height, bool refresh);	1479	void scr_expose (int x, int y, int width, int height, bool refresh);
1429	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1480	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430	void scr_recolour ();	1481	void scr_recolour ();
1431	void scr_remap_chars ();	1482	void scr_remap_chars ();
1432	void scr_remap_chars (const line_t &l);	1483	void scr_remap_chars (line_t &l);
1433		1484
1434	void scr_poweron ();	1485	void scr_poweron ();
1435	void scr_cursor (int mode);	1486	void scr_cursor (int mode);
1436	void scr_do_wrap ();	1487	void scr_do_wrap ();
1437	int scr_change_screen (int scrn);	1488	int scr_change_screen (int scrn);
1438	void scr_color (unsigned int color, int fgbg);	1489	void scr_color (unsigned int color, int fgbg);
1439	void scr_rendition (int set, int style);	1490	void scr_rendition (int set, int style);
1440	void scr_add_lines (const unicode_t *str, int nlines, int len);	1491	void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1441	void scr_backspace ();	1492	void scr_backspace ();
1442	void scr_tab (int count, bool ht = false);	1493	void scr_tab (int count, bool ht = false);
1443	void scr_gotorc (int row, int col, int relative);	1494	void scr_gotorc (int row, int col, int relative);
1444	void scr_index (enum page_dirn direction);	1495	void scr_index (enum page_dirn direction);
1445	void scr_erase_line (int mode);	1496	void scr_erase_line (int mode);
…		…
1460	int scr_move_to (int y, int len);	1511	int scr_move_to (int y, int len);
1461	int scr_page (enum page_dirn direction, int nlines);	1512	int scr_page (enum page_dirn direction, int nlines);
1462	int scr_changeview (unsigned int oldviewstart);	1513	int scr_changeview (unsigned int oldviewstart);
1463	void scr_bell ();	1514	void scr_bell ();
1464	void scr_printscreen (int fullhist);	1515	void scr_printscreen (int fullhist);
		1516	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
		1517	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1465	void scr_reverse_selection ();	1518	void scr_reverse_selection ();
1466	void scr_dump (int fd);	1519	void scr_dump (int fd);
1467	void selection_check (int check_more);	1520	void selection_check (int check_more);
1468	void selection_paste (Window win, Atom prop, bool delete_prop);	1521	void selection_paste (Window win, Atom prop, bool delete_prop);
1469	void selection_property (Window win, Atom prop);	1522	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.183 by root, Tue Jan 3 02:43:33 2006 UTC vs. Revision 1.197 by root, Wed Jan 11 05:29:40 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.183 by root, Tue Jan 3 02:43:33 2006 UTC vs.
Revision 1.197 by root, Wed Jan 11 05:29:40 2006 UTC