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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.468 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.527 by root, Thu Feb 20 18:59:13 2014 UTC

…		…
45		45
46	#include "feature.h"	46	#include "feature.h"
47		47
48	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)	48	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
49	# define ENABLE_OVERLAY 1	49	# define ENABLE_OVERLAY 1
		50	# undef NO_RESOURCES
50	#endif	51	#endif
51		52
52	#if ENABLE_PERL	53	#if ENABLE_PERL
53	# define ENABLE_FRILLS 1	54	# define ENABLE_FRILLS 1
54	# define ENABLE_COMBINING 1	55	# define ENABLE_COMBINING 1
…		…
70	#include <X11/cursorfont.h>	71	#include <X11/cursorfont.h>
71	#include <X11/keysym.h>	72	#include <X11/keysym.h>
72	#include <X11/keysymdef.h>	73	#include <X11/keysymdef.h>
73	#include <X11/Xatom.h>	74	#include <X11/Xatom.h>
74		75
75	#ifdef HAVE_PIXBUF	76	#if HAVE_PIXBUF
76	# include <gdk-pixbuf/gdk-pixbuf.h>	77	# include <gdk-pixbuf/gdk-pixbuf.h>
77	#endif	78	#endif
78		79
79	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)	80	#if XRENDER && (HAVE_PIXBUF \|\| ENABLE_TRANSPARENCY)
80	# define HAVE_BG_PIXMAP 1	81	# define HAVE_BG_PIXMAP 1
		82	# define HAVE_IMG 1
		83	#endif
		84
		85	#if HAVE_BG_PIXMAP
		86	# if HAVE_PIXBUF
		87	# define BG_IMAGE_FROM_FILE 1
81	#endif	88	# endif
		89	# if ENABLE_TRANSPARENCY
		90	# define BG_IMAGE_FROM_ROOT 1
		91	# endif
		92	#endif
82		93
		94	#include <ecb.h>
83	#include "encoding.h"	95	#include "encoding.h"
84	#include "rxvtutil.h"	96	#include "rxvtutil.h"
85	#include "rxvtfont.h"	97	#include "rxvtfont.h"
86	#include "rxvttoolkit.h"	98	#include "rxvttoolkit.h"
		99	#include "rxvtimg.h"
87	#include "scrollbar.h"	100	#include "scrollbar.h"
88	#include "ev_cpp.h"	101	#include "ev_cpp.h"
89	#include "salloc.h"
90	#include "libptytty.h"	102	#include "libptytty.h"
91		103
92	#include "rxvtperl.h"	104	#include "rxvtperl.h"
93		105
94	// try to avoid some macros to decrease code size, on some systems	106	// try to avoid some macros to decrease code size, on some systems
…		…
147		159
148	const char * rxvt_basename (const char *str) NOTHROW;	160	const char * rxvt_basename (const char *str) NOTHROW;
149	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	161	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
150	void rxvt_log (const char *fmt,...) NOTHROW;	162	void rxvt_log (const char *fmt,...) NOTHROW;
151	void rxvt_warn (const char *fmt,...) NOTHROW;	163	void rxvt_warn (const char *fmt,...) NOTHROW;
152	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;	164	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
153	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;	165	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
154		166
155	char * rxvt_strtrim (char *str) NOTHROW;	167	char * rxvt_strtrim (char *str) NOTHROW;
156	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;	168	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
157		169
158	static inline void	170	static inline void
…		…
207	~localise_env ()	219	~localise_env ()
208	{	220	{
209	environ = orig_env;	221	environ = orig_env;
210	}	222	}
211	};	223	};
		224
		225	#ifdef HAVE_BG_PIXMAP
		226	struct image_effects
		227	{
		228	bool tint_set;
		229	rxvt_color tint;
		230	int shade;
		231	int h_blurRadius, v_blurRadius;
		232
		233	image_effects ()
		234	{
		235	tint_set =
		236	h_blurRadius =
		237	v_blurRadius = 0;
		238	shade = 100;
		239	}
		240
		241	bool need_tint ()
		242	{
		243	return shade != 100 \|\| tint_set;
		244	}
		245
		246	bool need_blur ()
		247	{
		248	return h_blurRadius && v_blurRadius;
		249	}
		250
		251	bool set_tint (const rxvt_color &new_tint);
		252	bool set_shade (const char *shade_str);
		253	bool set_blur (const char *geom);
		254	};
		255
		256	# if BG_IMAGE_FROM_FILE
		257	enum {
		258	IM_IS_SIZE_SENSITIVE = 1 << 1,
		259	IM_KEEP_ASPECT = 1 << 2,
		260	IM_ROOT_ALIGN = 1 << 3,
		261	IM_TILE = 1 << 4,
		262	IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT \| IM_ROOT_ALIGN \| IM_TILE,
		263	};
		264
		265	enum {
		266	noScale = 0,
		267	windowScale = 100,
		268	defaultScale = windowScale,
		269	centerAlign = 50,
		270	defaultAlign = centerAlign,
		271	};
		272
		273	struct rxvt_image : image_effects
		274	{
		275	unsigned short alpha;
		276	uint8_t flags;
		277	unsigned int h_scale, v_scale; /* percents of the window size */
		278	int h_align, v_align; /* percents of the window size:
		279	0 - left align, 50 - center, 100 - right */
		280
		281	bool is_size_sensitive ()
		282	{
		283	return (!(flags & IM_TILE)
		284	\|\| h_scale \|\| v_scale
		285	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)));
		286	}
		287
		288	rxvt_img *img;
		289
		290	void destroy ()
		291	{
		292	delete img;
		293	img = 0;
		294	}
		295
		296	rxvt_image ();
		297	void set_file_geometry (rxvt_screen s, const char file);
		298	void set_file (rxvt_screen s, const char file);
		299	bool set_geometry (const char *geom, bool update = false);
		300	};
		301	# endif
		302	#endif
212		303
213	/*	304	/*
214	*****************************************************************************	305	*****************************************************************************
215	* STRUCTURES AND TYPEDEFS	306	* STRUCTURES AND TYPEDEFS
216	*****************************************************************************	307	*****************************************************************************
…		…
259	*****************************************************************************	350	*****************************************************************************
260	*/	351	*/
261		352
262	/* COLORTERM, TERM environment variables */	353	/* COLORTERM, TERM environment variables */
263	#define COLORTERMENV "rxvt"	354	#define COLORTERMENV "rxvt"
264	#ifdef BG_IMAGE_FROM_FILE	355	#if BG_IMAGE_FROM_FILE
265	# define COLORTERMENVFULL COLORTERMENV "-xpm"	356	# define COLORTERMENVFULL COLORTERMENV "-xpm"
266	#else	357	#else
267	# define COLORTERMENVFULL COLORTERMENV	358	# define COLORTERMENVFULL COLORTERMENV
268	#endif	359	#endif
269	#ifndef TERMENV	360	#ifndef TERMENV
…		…
310	ERASE = +2,	401	ERASE = +2,
311	};	402	};
312		403
313	/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */	404	/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
314	enum page_dirn {	405	enum page_dirn {
315	UP,	406	DN = -1,
316	DN,
317	NO_DIR,	407	NO_DIR = 0,
		408	UP = 1,
318	};	409	};
319		410
320	/* arguments for rxvt_term::scr_change_screen () */	411	/* arguments for rxvt_term::scr_change_screen () */
321	enum {	412	enum {
322	PRIMARY = 0,	413	PRIMARY = 0,
…		…
499	#endif	590	#endif
500	Color_scroll,	591	Color_scroll,
501	#ifdef RXVT_SCROLLBAR	592	#ifdef RXVT_SCROLLBAR
502	Color_trough,	593	Color_trough,
503	#endif	594	#endif
504	#if ENABLE_TRANSPARENCY	595	#if BG_IMAGE_FROM_ROOT
505	Color_tint,	596	Color_tint,
506	#endif	597	#endif
507	#if OFF_FOCUS_FADING	598	#if OFF_FOCUS_FADING
508	Color_fade,	599	Color_fade,
509	#endif	600	#endif
…		…
571	#endif	662	#endif
572		663
573	// do not change these constants lightly, there are many interdependencies	664	// do not change these constants lightly, there are many interdependencies
574	#define IMBUFSIZ 128 // input modifier buffer sizes	665	#define IMBUFSIZ 128 // input modifier buffer sizes
575	#define KBUFSZ 512 // size of keyboard mapping buffer	666	#define KBUFSZ 512 // size of keyboard mapping buffer
576	#define CBUFSIZ 2048 // size of command buffer	667	#define CBUFSIZ 2048 // size of command buffer (longest command sequence possible)
577	#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row	668	#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
578	#define UBUFSIZ 2048 // character buffer	669	#define UBUFSIZ 2048 // character buffer
579		670
580	#if ENABLE_FRILLS	671	#if ENABLE_FRILLS
581	# include <X11/Xmd.h>	672	# include <X11/Xmd.h>
…		…
696	text_t *t; // terminal the text	787	text_t *t; // terminal the text
697	rend_t *r; // rendition, uses RS_ flags	788	rend_t *r; // rendition, uses RS_ flags
698	tlen_t_ l; // length of each text line	789	tlen_t_ l; // length of each text line
699	uint32_t f; // flags	790	uint32_t f; // flags
700		791
		792	bool valid ()
		793	{
		794	return l >= 0;
		795	}
		796
		797	void alloc ()
		798	{
		799	l = 0;
		800	}
		801
701	bool is_longer ()	802	bool is_longer ()
702	{	803	{
703	return f & LINE_LONGER;	804	return f & LINE_LONGER;
704	}	805	}
705		806
…		…
769	// that are not representable in unicode, as well as characters	870	// that are not representable in unicode, as well as characters
770	// not fitting in the BMP.	871	// not fitting in the BMP.
771	struct compose_char	872	struct compose_char
772	{	873	{
773	unicode_t c1, c2; // any chars != NOCHAR are valid	874	unicode_t c1, c2; // any chars != NOCHAR are valid
		875	#if __cplusplus >= 201103L \|\| ECB_GCC_VERSION(4,4)
		876	compose_char () = default;
		877	#endif
774	compose_char (unicode_t c1, unicode_t c2)	878	compose_char (unicode_t c1, unicode_t c2)
775	: c1(c1), c2(c2)	879	: c1(c1), c2(c2)
776	{ }	880	{ }
777	};	881	};
778		882
…		…
972	scrollBar_t scrollBar;	1076	scrollBar_t scrollBar;
973	uint8_t options[(Opt_count + 7) >> 3];	1077	uint8_t options[(Opt_count + 7) >> 3];
974	XSizeHints szHint;	1078	XSizeHints szHint;
975	rxvt_color *pix_colors;	1079	rxvt_color *pix_colors;
976	Cursor TermWin_cursor; /* cursor for vt window */	1080	Cursor TermWin_cursor; /* cursor for vt window */
		1081
977	line_t *row_buf; // all lines, scrollback + terminal, circular	1082	line_t *row_buf; // all lines, scrollback + terminal, circular
978	line_t *drawn_buf; // text on screen	1083	line_t *drawn_buf; // text on screen
979	line_t *swap_buf; // lines for swap buffer	1084	line_t *swap_buf; // lines for swap buffer
980	char tabs; / per location: 1 == tab-stop */	1085	char tabs; / per location: 1 == tab-stop */
981	screen_t screen;	1086	screen_t screen;
…		…
1039	/* ---------- */	1144	/* ---------- */
1040	rend_t rstyle;	1145	rend_t rstyle;
1041	/* ---------- */	1146	/* ---------- */
1042	#ifdef SELECTION_SCROLLING	1147	#ifdef SELECTION_SCROLLING
1043	int scroll_selection_lines;	1148	int scroll_selection_lines;
1044	enum page_dirn scroll_selection_dir;
1045	int selection_save_x,	1149	int selection_save_x,
1046	selection_save_y,	1150	selection_save_y,
1047	selection_save_state;	1151	selection_save_state;
1048	#endif	1152	#endif
1049	/* ---------- */	1153	/* ---------- */
…		…
1077	/* ---------- */	1181	/* ---------- */
1078	struct mouse_event MEvent;	1182	struct mouse_event MEvent;
1079	XComposeStatus compose;	1183	XComposeStatus compose;
1080	static struct termios def_tio;	1184	static struct termios def_tio;
1081	row_col_t oldcursor;	1185	row_col_t oldcursor;
		1186
1082	#ifdef HAVE_BG_PIXMAP	1187	#ifdef HAVE_BG_PIXMAP
1083	void bg_init ();	1188	void bg_init ();
1084	void bg_destroy ();	1189	void bg_destroy ();
1085		1190
1086	enum {
1087	//subset returned by make_transparency_pixmap
1088	BG_IS_VALID = 1 << 0,
1089	BG_NEEDS_TINT = 1 << 1,
1090	BG_NEEDS_BLUR = 1 << 2,
1091
1092	BG_EFFECTS_FLAGS = BG_NEEDS_TINT \| BG_NEEDS_BLUR,
1093
1094	BG_KEEP_ASPECT = 1 << 3,
1095	BG_ROOT_ALIGN = 1 << 4,
1096	BG_TILE = 1 << 14,
1097	BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT \| BG_ROOT_ALIGN \| BG_TILE,
1098
1099	BG_TINT_SET = 1 << 5,
1100	BG_TINT_BITAND = 1 << 6,
1101	BG_TINT_FLAGS = BG_NEEDS_TINT \| BG_TINT_BITAND,
1102
1103	BG_HAS_RENDER = 1 << 7,
1104	BG_HAS_RENDER_CONV = 1 << 8,
1105	BG_CLIENT_RENDER = 1 << 9,
1106
1107	BG_IS_TRANSPARENT = 1 << 10,
1108	BG_NEEDS_REFRESH = 1 << 11,
1109	BG_IS_SIZE_SENSITIVE = 1 << 12,
1110	BG_IS_FROM_FILE = 1 << 13,
1111	};
1112
1113	unsigned int bg_flags;
1114
1115	# ifdef BG_IMAGE_FROM_FILE	1191	# if BG_IMAGE_FROM_FILE
1116	void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);	1192	rxvt_image fimage;
1117	bool render_image (unsigned long tr_flags);	1193	void render_image (rxvt_image &image);
1118
1119	enum {
1120	noScale = 0,
1121	windowScale = 100,
1122	defaultScale = windowScale,
1123	centerAlign = 50,
1124	defaultAlign = centerAlign,
1125	};
1126
1127	unsigned int h_scale, v_scale; /* percents of the window size */
1128	int h_align, v_align; /* percents of the window size:
1129	0 - left align, 50 - center, 100 - right */
1130
1131	bool bg_set_geometry (const char *geom, bool update = false);
1132	void bg_set_default_geometry ()
1133	{
1134	h_scale = v_scale = defaultScale;
1135	h_align = v_align = defaultAlign;
1136	}
1137
1138	bool bg_set_file (const char *file);
1139	# endif	1194	# endif
1140		1195
1141	# ifdef ENABLE_TRANSPARENCY	1196	# if BG_IMAGE_FROM_ROOT
1142	Pixmap root_pixmap; /* current root pixmap set */	1197	rxvt_img *root_img;
1143	rxvt_color tint;	1198	image_effects root_effects;
1144	int shade;
1145	int h_blurRadius, v_blurRadius;
1146		1199
1147	bool bg_set_transparent ();	1200	void render_root_image ();
1148	void bg_set_root_pixmap ();
1149	void set_tint_shade_flags ();
1150	bool bg_set_tint (rxvt_color &new_tint);
1151	bool bg_set_shade (const char *shade_str);
1152	bool bg_set_blur (const char *geom);
1153
1154	bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1155	bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1156	void tint_ximage (Visual visual, XImage ximage);
1157	unsigned long make_transparency_pixmap ();
1158	# endif	1201	# endif
1159		1202
1160	ev_tstamp bg_valid_since;	1203	ev_tstamp bg_valid_since;
1161		1204
1162	Pixmap bg_pixmap;
1163	unsigned int bg_pmap_width, bg_pmap_height;
1164
1165	int target_x;
1166	int target_y;
1167	bool bg_set_position (int x, int y);
1168	bool bg_window_size_sensitive ();	1205	bool bg_window_size_sensitive ();
1169	bool bg_window_position_sensitive ();	1206	bool bg_window_position_sensitive ();
1170		1207
1171	bool bg_render ();	1208	void bg_render ();
1172	void bg_invalidate ()	1209	#endif
1173	{	1210
1174	bg_flags &= ~BG_IS_VALID;	1211	#ifdef HAVE_IMG
		1212	enum {
		1213	BG_IS_TRANSPARENT = 1 << 1,
		1214	BG_NEEDS_REFRESH = 1 << 2,
		1215	BG_INHIBIT_RENDER = 1 << 3,
1175	}	1216	};
1176	#endif	1217
1177	#ifdef HAVE_PIXBUF	1218	uint8_t bg_flags;
1178	GdkPixbuf *pixbuf;	1219
1179	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,	1220	rxvt_img *bg_img;
1180	int src_x, int src_y, int dst_x, int dst_y,
1181	unsigned int width, unsigned int height);
1182	#endif	1221	#endif
1183		1222
1184	#if ENABLE_OVERLAY	1223	#if ENABLE_OVERLAY
1185	overlay_base ov;	1224	overlay_base ov;
1186		1225
…		…
1194	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;	1233	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1195	#endif	1234	#endif
1196		1235
1197	vector<void *> allocated; // free these memory blocks with free()	1236	vector<void *> allocated; // free these memory blocks with free()
1198		1237
		1238	int parent_x, parent_y; // parent window position relative to root, only updated on demand
		1239
1199	char *locale;	1240	char *locale;
1200	char charsets[4];	1241	char charsets[4];
1201	char v_buffer; / pointer to physical buffer */	1242	char v_buffer; / pointer to physical buffer */
1202	unsigned int v_buflen; /* size of area to write */	1243	unsigned int v_buflen; /* size of area to write */
1203	stringvec argv, envv; /* if != 0, will be freed at destroy time */	1244	stringvec argv, envv; /* if != 0, will be freed at destroy time */
…		…
1214	char cmdbuf_ptr, cmdbuf_endp;	1255	char cmdbuf_ptr, cmdbuf_endp;
1215	char cmdbuf_base[CBUFSIZ];	1256	char cmdbuf_base[CBUFSIZ];
1216		1257
1217	ptytty *pty;	1258	ptytty *pty;
1218		1259
1219	rxvt_salloc *talloc; // text line allocator	1260	// chunk contains all line_t's as well as rend_t and text_t buffers
1220	rxvt_salloc *ralloc; // rend line allocator	1261	// for drawn_buf, swap_buf and row_buf, in this order
		1262	void *chunk;
		1263	size_t chunk_size;
1221		1264
1222	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1265	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1223		1266
1224	#if ENABLE_FRILLS \|\| ISO_14755	1267	#if ENABLE_FRILLS \|\| ISO_14755
1225	// ISO 14755 entry support	1268	// ISO 14755 entry support
1226	unicode_t iso14755buf;	1269	unicode_t iso14755buf;
1227	void commit_iso14755 ();	1270	void commit_iso14755 ();
1228	# if ISO_14755	1271	# if ISO_14755
1229	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);	1272	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1230	void iso14755_54 (int x, int y);	1273	void iso14755_54 (int x, int y);
1231	# endif	1274	# endif
1232	#endif	1275	#endif
1233		1276
1234	long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;	1277	long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
…		…
1236	void vt_select_input () const NOTHROW	1279	void vt_select_input () const NOTHROW
1237	{	1280	{
1238	XSelectInput (dpy, vt, vt_emask \| vt_emask_perl \| vt_emask_xim \| vt_emask_mouse);	1281	XSelectInput (dpy, vt, vt_emask \| vt_emask_perl \| vt_emask_xim \| vt_emask_mouse);
1239	}	1282	}
1240		1283
1241	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1284	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1242	void rootwin_cb (XEvent &xev);	1285	void rootwin_cb (XEvent &xev);
1243	xevent_watcher rootwin_ev;	1286	xevent_watcher rootwin_ev;
1244	#endif	1287	#endif
1245	#ifdef HAVE_BG_PIXMAP	1288	#ifdef HAVE_BG_PIXMAP
1246	void update_background ();	1289	void update_background ();
…		…
1262	void cmdbuf_append (const char *str, size_t count);	1305	void cmdbuf_append (const char *str, size_t count);
1263	bool pty_fill ();	1306	bool pty_fill ();
1264	void pty_cb (ev::io &w, int revents); ev::io pty_ev;	1307	void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1265		1308
1266	#ifdef CURSOR_BLINK	1309	#ifdef CURSOR_BLINK
		1310	void cursor_blink_reset ();
1267	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;	1311	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1268	#endif	1312	#endif
1269	#ifdef TEXT_BLINK	1313	#ifdef TEXT_BLINK
1270	void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;	1314	void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1271	#endif	1315	#endif
…		…
1356	void process_color_seq (int report, int color, const char *str, char resp);	1400	void process_color_seq (int report, int color, const char *str, char resp);
1357	void process_xterm_seq (int op, char *str, char resp);	1401	void process_xterm_seq (int op, char *str, char resp);
1358	int privcases (int mode, unsigned long bit);	1402	int privcases (int mode, unsigned long bit);
1359	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1403	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1360	void process_sgr_mode (unsigned int nargs, const int *arg);	1404	void process_sgr_mode (unsigned int nargs, const int *arg);
		1405	void set_cursor_style (int style);
1361	// init.C	1406	// init.C
1362	void init (stringvec argv, stringvec envv);	1407	void init (stringvec argv, stringvec envv);
1363	void init (int argc, const char const argv, const char const envv);	1408	void init (int argc, const char const argv, const char const envv);
1364	void init2 (int argc, const char const argv);	1409	void init2 (int argc, const char const argv);
1365	void init_vars ();	1410	void init_vars ();
…		…
1394	char *get_colorfgbg ();	1439	char *get_colorfgbg ();
1395	bool set_color (rxvt_color &color, const char *name);	1440	bool set_color (rxvt_color &color, const char *name);
1396	void alias_color (int dst, int src);	1441	void alias_color (int dst, int src);
1397	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1442	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1398	void get_window_origin (int &x, int &y);	1443	void get_window_origin (int &x, int &y);
1399	Pixmap get_pixmap_property (Atom property);
1400		1444
1401	// screen.C	1445	// screen.C
1402		1446
1403	void lalloc (line_t &l) const	1447	bool option (uint8_t opt) const NOTHROW
1404	{	1448	{
1405	l.t = (text_t *)talloc->alloc ();	1449	return options[opt >> 3] & (1 << (opt & 7));
1406	l.r = (rend_t *)ralloc->alloc ();
1407	}	1450	}
1408		1451
1409	#if 0	1452	void set_option (uint8_t opt, bool set = true) NOTHROW;
1410	void lfree (line_t &l)
1411	{
1412	talloc->free (l.t);
1413	ralloc->free (l.r);
1414	}
1415	#endif
1416
1417	void lresize (line_t &l) const
1418	{
1419	if (!l.t)
1420	return;
1421
1422	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
1423	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
1424
1425	l.l = min (l.l, ncol);
1426
1427	if (ncol > prev_ncol)
1428	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1429	}
1430		1453
1431	int fgcolor_of (rend_t r) const NOTHROW	1454	int fgcolor_of (rend_t r) const NOTHROW
1432	{	1455	{
1433	int base = GET_BASEFG (r);	1456	int base = GET_BASEFG (r);
1434	#ifndef NO_BRIGHTCOLOR	1457	#ifndef NO_BRIGHTCOLOR
…		…
1454	base += minBrightCOLOR - minCOLOR;	1477	base += minBrightCOLOR - minCOLOR;
1455	#endif	1478	#endif
1456	return base;	1479	return base;
1457	}	1480	}
1458		1481
1459	bool option (uint8_t opt) const NOTHROW
1460	{
1461	return options[opt >> 3] & (1 << (opt & 7));
1462	}
1463
1464	void set_option (uint8_t opt, bool set = true) NOTHROW;
1465
1466	// modifies first argument(!)	1482	// modifies first argument(!)
1467	void tt_paste (char *data, unsigned int len) NOTHROW;	1483	void tt_paste (char *data, unsigned int len) NOTHROW;
1468	void paste (char *data, unsigned int len) NOTHROW;	1484	void paste (char *data, unsigned int len) NOTHROW;
		1485	void scr_alloc () NOTHROW;
1469	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;	1486	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1470	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;	1487	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1471	void scr_kill_char (line_t &l, int col) const NOTHROW;	1488	void scr_kill_char (line_t &l, int col) const NOTHROW;
		1489	void scr_set_char_rend (line_t &l, int col, rend_t rend);
1472	int scr_scroll_text (int row1, int row2, int count) NOTHROW;	1490	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
		1491	void copy_line (line_t &dst, line_t &src);
1473	void scr_reset ();	1492	void scr_reset ();
1474	void scr_release () NOTHROW;	1493	void scr_release () NOTHROW;
1475	void scr_clear (bool really = false) NOTHROW;	1494	void scr_clear (bool really = false) NOTHROW;
1476	void scr_refresh () NOTHROW;	1495	void scr_refresh () NOTHROW;
1477	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;	1496	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
…		…
1516	void scr_report_position () NOTHROW;	1535	void scr_report_position () NOTHROW;
1517	void set_font_style () NOTHROW;	1536	void set_font_style () NOTHROW;
1518	void scr_charset_choose (int set) NOTHROW;	1537	void scr_charset_choose (int set) NOTHROW;
1519	void scr_charset_set (int set, unsigned int ch) NOTHROW;	1538	void scr_charset_set (int set, unsigned int ch) NOTHROW;
1520	void scr_move_to (int y, int len) NOTHROW;	1539	void scr_move_to (int y, int len) NOTHROW;
		1540	bool scr_page (int nlines) NOTHROW;
1521	bool scr_page (enum page_dirn direction, int nlines) NOTHROW;	1541	bool scr_page (enum page_dirn direction, int nlines) NOTHROW
		1542	{
		1543	return scr_page (direction * nlines);
		1544	}
1522	bool scr_changeview (int new_view_start) NOTHROW;	1545	bool scr_changeview (int new_view_start) NOTHROW;
1523	void scr_bell () NOTHROW;	1546	void scr_bell () NOTHROW;
1524	void scr_printscreen (int fullhist) NOTHROW;	1547	void scr_printscreen (int fullhist) NOTHROW;
1525	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;	1548	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1526	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;	1549	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1527	void scr_reverse_selection () NOTHROW;	1550	void scr_reverse_selection () NOTHROW;
1528	void scr_dump (int fd) NOTHROW;	1551	void scr_dump (int fd) NOTHROW;
1529		1552
1530	void selection_check (int check_more) NOTHROW;	1553	void selection_check (int check_more) NOTHROW;
		1554	void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
1531	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;	1555	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1532	void selection_clear (bool clipboard = false) NOTHROW;	1556	void selection_clear (bool clipboard = false) NOTHROW;
1533	void selection_make (Time tm);	1557	void selection_make (Time tm);
1534	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;	1558	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1535	void selection_start_colrow (int col, int row) NOTHROW;	1559	void selection_start_colrow (int col, int row) NOTHROW;
…		…
1540	void selection_click (int clicks, int x, int y) NOTHROW;	1564	void selection_click (int clicks, int x, int y) NOTHROW;
1541	void selection_extend (int x, int y, int flag) NOTHROW;	1565	void selection_extend (int x, int y, int flag) NOTHROW;
1542	void selection_rotate (int x, int y) NOTHROW;	1566	void selection_rotate (int x, int y) NOTHROW;
1543		1567
1544	// xdefaults.C	1568	// xdefaults.C
		1569	void rxvt_usage (int type);
1545	const char *get_options (int argc, const char const *argv);	1570	const char *get_options (int argc, const char const *argv);
1546	int parse_keysym (const char str, const char arg);	1571	int parse_keysym (const char str, const char arg);
1547	const char x_resource (const char name);	1572	const char x_resource (const char name);
1548	void extract_resources ();	1573	void extract_resources ();
1549	void extract_keysym_resources ();	1574	void extract_keysym_resources ();

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.468 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs. Revision 1.527 by root, Thu Feb 20 18:59:13 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.468 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.527 by root, Thu Feb 20 18:59:13 2014 UTC