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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.475 by sf-exg, Thu May 17 10:18:32 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
…		…
209	environ = orig_env;	221	environ = orig_env;
210	}	222	}
211	};	223	};
212		224
213	#ifdef HAVE_BG_PIXMAP	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
214	# ifdef BG_IMAGE_FROM_FILE	256	# if BG_IMAGE_FROM_FILE
215	enum {	257	enum {
216	IM_IS_SET = 1 << 0,
217	IM_IS_SIZE_SENSITIVE = 1 << 1,	258	IM_IS_SIZE_SENSITIVE = 1 << 1,
218	IM_KEEP_ASPECT = 1 << 2,	259	IM_KEEP_ASPECT = 1 << 2,
219	IM_ROOT_ALIGN = 1 << 3,	260	IM_ROOT_ALIGN = 1 << 3,
220	IM_TILE = 1 << 4,	261	IM_TILE = 1 << 4,
221	IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT \| IM_ROOT_ALIGN \| IM_TILE,	262	IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT \| IM_ROOT_ALIGN \| IM_TILE,
…		…
227	defaultScale = windowScale,	268	defaultScale = windowScale,
228	centerAlign = 50,	269	centerAlign = 50,
229	defaultAlign = centerAlign,	270	defaultAlign = centerAlign,
230	};	271	};
231		272
232	struct rxvt_image	273	struct rxvt_image : image_effects
233	{	274	{
		275	unsigned short alpha;
234	uint8_t flags;	276	uint8_t flags;
235	unsigned int h_scale, v_scale; /* percents of the window size */	277	unsigned int h_scale, v_scale; /* percents of the window size */
236	int h_align, v_align; /* percents of the window size:	278	int h_align, v_align; /* percents of the window size:
237	0 - left align, 50 - center, 100 - right */	279	0 - left align, 50 - center, 100 - right */
238		280
239	# ifdef HAVE_PIXBUF	281	bool is_size_sensitive ()
240	GdkPixbuf *pixbuf;
241	# endif
242
243	~rxvt_image ()
244	{	282	{
245	# ifdef HAVE_PIXBUF	283	return (!(flags & IM_TILE)
246	if (pixbuf)	284	\|\| h_scale \|\| v_scale
247	g_object_unref (pixbuf);	285	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)));
248	# endif
249	}	286	}
250		287
251	int width ()	288	rxvt_img *img;
		289
		290	void destroy ()
252	{	291	{
253	# ifdef HAVE_PIXBUF	292	delete img;
254	return gdk_pixbuf_get_width (pixbuf);	293	img = 0;
255	# endif
256	}	294	}
257	int height ()	295
258	{	296	rxvt_image ();
259	# ifdef HAVE_PIXBUF	297	void set_file_geometry (rxvt_screen s, const char file);
260	return gdk_pixbuf_get_height (pixbuf);	298	void set_file (rxvt_screen s, const char file);
261	# endif
262	}
263	bool set_file (const char *file);
264	bool set_geometry (const char *geom, bool update = false);	299	bool set_geometry (const char *geom, bool update = false);
265	void set_default_geometry ()
266	{
267	h_scale = v_scale = defaultScale;
268	h_align = v_align = defaultAlign;
269	flags \|= IM_IS_SIZE_SENSITIVE;
270	}
271	};	300	};
272	# endif	301	# endif
273	#endif	302	#endif
274		303
275	/*	304	/*
…		…
321	*****************************************************************************	350	*****************************************************************************
322	*/	351	*/
323		352
324	/* COLORTERM, TERM environment variables */	353	/* COLORTERM, TERM environment variables */
325	#define COLORTERMENV "rxvt"	354	#define COLORTERMENV "rxvt"
326	#ifdef BG_IMAGE_FROM_FILE	355	#if BG_IMAGE_FROM_FILE
327	# define COLORTERMENVFULL COLORTERMENV "-xpm"	356	# define COLORTERMENVFULL COLORTERMENV "-xpm"
328	#else	357	#else
329	# define COLORTERMENVFULL COLORTERMENV	358	# define COLORTERMENVFULL COLORTERMENV
330	#endif	359	#endif
331	#ifndef TERMENV	360	#ifndef TERMENV
…		…
372	ERASE = +2,	401	ERASE = +2,
373	};	402	};
374		403
375	/* 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 */
376	enum page_dirn {	405	enum page_dirn {
377	UP,	406	DN = -1,
378	DN,
379	NO_DIR,	407	NO_DIR = 0,
		408	UP = 1,
380	};	409	};
381		410
382	/* arguments for rxvt_term::scr_change_screen () */	411	/* arguments for rxvt_term::scr_change_screen () */
383	enum {	412	enum {
384	PRIMARY = 0,	413	PRIMARY = 0,
…		…
561	#endif	590	#endif
562	Color_scroll,	591	Color_scroll,
563	#ifdef RXVT_SCROLLBAR	592	#ifdef RXVT_SCROLLBAR
564	Color_trough,	593	Color_trough,
565	#endif	594	#endif
566	#if ENABLE_TRANSPARENCY	595	#if BG_IMAGE_FROM_ROOT
567	Color_tint,	596	Color_tint,
568	#endif	597	#endif
569	#if OFF_FOCUS_FADING	598	#if OFF_FOCUS_FADING
570	Color_fade,	599	Color_fade,
571	#endif	600	#endif
…		…
633	#endif	662	#endif
634		663
635	// do not change these constants lightly, there are many interdependencies	664	// do not change these constants lightly, there are many interdependencies
636	#define IMBUFSIZ 128 // input modifier buffer sizes	665	#define IMBUFSIZ 128 // input modifier buffer sizes
637	#define KBUFSZ 512 // size of keyboard mapping buffer	666	#define KBUFSZ 512 // size of keyboard mapping buffer
638	#define CBUFSIZ 2048 // size of command buffer	667	#define CBUFSIZ 2048 // size of command buffer (longest command sequence possible)
639	#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
640	#define UBUFSIZ 2048 // character buffer	669	#define UBUFSIZ 2048 // character buffer
641		670
642	#if ENABLE_FRILLS	671	#if ENABLE_FRILLS
643	# include <X11/Xmd.h>	672	# include <X11/Xmd.h>
…		…
758	text_t *t; // terminal the text	787	text_t *t; // terminal the text
759	rend_t *r; // rendition, uses RS_ flags	788	rend_t *r; // rendition, uses RS_ flags
760	tlen_t_ l; // length of each text line	789	tlen_t_ l; // length of each text line
761	uint32_t f; // flags	790	uint32_t f; // flags
762		791
		792	bool valid ()
		793	{
		794	return l >= 0;
		795	}
		796
		797	void alloc ()
		798	{
		799	l = 0;
		800	}
		801
763	bool is_longer ()	802	bool is_longer ()
764	{	803	{
765	return f & LINE_LONGER;	804	return f & LINE_LONGER;
766	}	805	}
767		806
…		…
831	// that are not representable in unicode, as well as characters	870	// that are not representable in unicode, as well as characters
832	// not fitting in the BMP.	871	// not fitting in the BMP.
833	struct compose_char	872	struct compose_char
834	{	873	{
835	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
836	compose_char (unicode_t c1, unicode_t c2)	878	compose_char (unicode_t c1, unicode_t c2)
837	: c1(c1), c2(c2)	879	: c1(c1), c2(c2)
838	{ }	880	{ }
839	};	881	};
840		882
…		…
1034	scrollBar_t scrollBar;	1076	scrollBar_t scrollBar;
1035	uint8_t options[(Opt_count + 7) >> 3];	1077	uint8_t options[(Opt_count + 7) >> 3];
1036	XSizeHints szHint;	1078	XSizeHints szHint;
1037	rxvt_color *pix_colors;	1079	rxvt_color *pix_colors;
1038	Cursor TermWin_cursor; /* cursor for vt window */	1080	Cursor TermWin_cursor; /* cursor for vt window */
		1081
1039	line_t *row_buf; // all lines, scrollback + terminal, circular	1082	line_t *row_buf; // all lines, scrollback + terminal, circular
1040	line_t *drawn_buf; // text on screen	1083	line_t *drawn_buf; // text on screen
1041	line_t *swap_buf; // lines for swap buffer	1084	line_t *swap_buf; // lines for swap buffer
1042	char tabs; / per location: 1 == tab-stop */	1085	char tabs; / per location: 1 == tab-stop */
1043	screen_t screen;	1086	screen_t screen;
…		…
1101	/* ---------- */	1144	/* ---------- */
1102	rend_t rstyle;	1145	rend_t rstyle;
1103	/* ---------- */	1146	/* ---------- */
1104	#ifdef SELECTION_SCROLLING	1147	#ifdef SELECTION_SCROLLING
1105	int scroll_selection_lines;	1148	int scroll_selection_lines;
1106	enum page_dirn scroll_selection_dir;
1107	int selection_save_x,	1149	int selection_save_x,
1108	selection_save_y,	1150	selection_save_y,
1109	selection_save_state;	1151	selection_save_state;
1110	#endif	1152	#endif
1111	/* ---------- */	1153	/* ---------- */
…		…
1139	/* ---------- */	1181	/* ---------- */
1140	struct mouse_event MEvent;	1182	struct mouse_event MEvent;
1141	XComposeStatus compose;	1183	XComposeStatus compose;
1142	static struct termios def_tio;	1184	static struct termios def_tio;
1143	row_col_t oldcursor;	1185	row_col_t oldcursor;
		1186
1144	#ifdef HAVE_BG_PIXMAP	1187	#ifdef HAVE_BG_PIXMAP
1145	void bg_init ();	1188	void bg_init ();
1146	void bg_destroy ();	1189	void bg_destroy ();
1147		1190
1148	enum {
1149	BG_IS_VALID = 1 << 0,
1150
1151	BG_TINT_SET = 1 << 5,
1152	BG_TINT_BITAND = 1 << 6,
1153
1154	BG_HAS_RENDER = 1 << 7,
1155	BG_HAS_RENDER_CONV = 1 << 8,
1156	BG_CLIENT_RENDER = 1 << 9,
1157
1158	BG_IS_TRANSPARENT = 1 << 10,
1159	BG_NEEDS_REFRESH = 1 << 11,
1160	};
1161
1162	unsigned int bg_flags;
1163
1164	# ifdef BG_IMAGE_FROM_FILE	1191	# if BG_IMAGE_FROM_FILE
1165	rxvt_image bg_image;	1192	rxvt_image fimage;
1166	void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1167	bool render_image (rxvt_image &image, bool transparent);	1193	void render_image (rxvt_image &image);
1168	# endif	1194	# endif
1169		1195
1170	# ifdef ENABLE_TRANSPARENCY	1196	# if BG_IMAGE_FROM_ROOT
1171	Pixmap root_pixmap; /* current root pixmap set */	1197	rxvt_img *root_img;
1172	rxvt_color tint;	1198	image_effects root_effects;
1173	int shade;
1174	int h_blurRadius, v_blurRadius;
1175		1199
1176	void bg_set_transparent ()	1200	void render_root_image ();
1177	{
1178	bg_flags \|= BG_IS_TRANSPARENT;
1179	}
1180	void bg_set_root_pixmap ();
1181	bool bg_set_tint (rxvt_color &new_tint);
1182	bool bg_set_shade (const char *shade_str);
1183	bool bg_set_blur (const char *geom);
1184
1185	bool blur_pixmap (Pixmap pixmap, int width, int height);
1186	bool tint_pixmap (Pixmap pixmap, int width, int height);
1187	void tint_ximage (XImage *ximage);
1188	bool make_transparency_pixmap ();
1189	# endif	1201	# endif
1190		1202
1191	ev_tstamp bg_valid_since;	1203	ev_tstamp bg_valid_since;
1192		1204
1193	Pixmap bg_pixmap;
1194	unsigned int bg_pmap_width, bg_pmap_height;
1195
1196	int target_x;
1197	int target_y;
1198	bool bg_set_position (int x, int y);
1199	bool bg_window_size_sensitive ();	1205	bool bg_window_size_sensitive ();
1200	bool bg_window_position_sensitive ();	1206	bool bg_window_position_sensitive ();
1201		1207
1202	bool bg_render ();	1208	void bg_render ();
1203	void bg_invalidate ()	1209	#endif
1204	{	1210
1205	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,
1206	}	1216	};
1207	#endif	1217
1208	#ifdef HAVE_PIXBUF	1218	uint8_t bg_flags;
1209	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,	1219
1210	int src_x, int src_y, int dst_x, int dst_y,	1220	rxvt_img *bg_img;
1211	unsigned int width, unsigned int height);
1212	#endif	1221	#endif
1213		1222
1214	#if ENABLE_OVERLAY	1223	#if ENABLE_OVERLAY
1215	overlay_base ov;	1224	overlay_base ov;
1216		1225
…		…
1224	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;
1225	#endif	1234	#endif
1226		1235
1227	vector<void *> allocated; // free these memory blocks with free()	1236	vector<void *> allocated; // free these memory blocks with free()
1228		1237
		1238	int parent_x, parent_y; // parent window position relative to root, only updated on demand
		1239
1229	char *locale;	1240	char *locale;
1230	char charsets[4];	1241	char charsets[4];
1231	char v_buffer; / pointer to physical buffer */	1242	char v_buffer; / pointer to physical buffer */
1232	unsigned int v_buflen; /* size of area to write */	1243	unsigned int v_buflen; /* size of area to write */
1233	stringvec argv, envv; /* if != 0, will be freed at destroy time */	1244	stringvec argv, envv; /* if != 0, will be freed at destroy time */
…		…
1244	char cmdbuf_ptr, cmdbuf_endp;	1255	char cmdbuf_ptr, cmdbuf_endp;
1245	char cmdbuf_base[CBUFSIZ];	1256	char cmdbuf_base[CBUFSIZ];
1246		1257
1247	ptytty *pty;	1258	ptytty *pty;
1248		1259
1249	rxvt_salloc *talloc; // text line allocator	1260	// chunk contains all line_t's as well as rend_t and text_t buffers
1250	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;
1251		1264
1252	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
1253		1266
1254	#if ENABLE_FRILLS \|\| ISO_14755	1267	#if ENABLE_FRILLS \|\| ISO_14755
1255	// ISO 14755 entry support	1268	// ISO 14755 entry support
1256	unicode_t iso14755buf;	1269	unicode_t iso14755buf;
1257	void commit_iso14755 ();	1270	void commit_iso14755 ();
1258	# if ISO_14755	1271	# if ISO_14755
1259	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);
1260	void iso14755_54 (int x, int y);	1273	void iso14755_54 (int x, int y);
1261	# endif	1274	# endif
1262	#endif	1275	#endif
1263		1276
1264	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;
…		…
1266	void vt_select_input () const NOTHROW	1279	void vt_select_input () const NOTHROW
1267	{	1280	{
1268	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);
1269	}	1282	}
1270		1283
1271	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1284	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1272	void rootwin_cb (XEvent &xev);	1285	void rootwin_cb (XEvent &xev);
1273	xevent_watcher rootwin_ev;	1286	xevent_watcher rootwin_ev;
1274	#endif	1287	#endif
1275	#ifdef HAVE_BG_PIXMAP	1288	#ifdef HAVE_BG_PIXMAP
1276	void update_background ();	1289	void update_background ();
…		…
1387	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);
1388	void process_xterm_seq (int op, char *str, char resp);	1401	void process_xterm_seq (int op, char *str, char resp);
1389	int privcases (int mode, unsigned long bit);	1402	int privcases (int mode, unsigned long bit);
1390	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);
1391	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);
1392	// init.C	1406	// init.C
1393	void init (stringvec argv, stringvec envv);	1407	void init (stringvec argv, stringvec envv);
1394	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);
1395	void init2 (int argc, const char const argv);	1409	void init2 (int argc, const char const argv);
1396	void init_vars ();	1410	void init_vars ();
…		…
1425	char *get_colorfgbg ();	1439	char *get_colorfgbg ();
1426	bool set_color (rxvt_color &color, const char *name);	1440	bool set_color (rxvt_color &color, const char *name);
1427	void alias_color (int dst, int src);	1441	void alias_color (int dst, int src);
1428	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1442	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1429	void get_window_origin (int &x, int &y);	1443	void get_window_origin (int &x, int &y);
1430	Pixmap get_pixmap_property (Atom property);
1431		1444
1432	// screen.C	1445	// screen.C
1433		1446
1434	void lalloc (line_t &l) const	1447	bool option (uint8_t opt) const NOTHROW
1435	{	1448	{
1436	l.t = (text_t *)talloc->alloc ();	1449	return options[opt >> 3] & (1 << (opt & 7));
1437	l.r = (rend_t *)ralloc->alloc ();
1438	}	1450	}
1439		1451
1440	#if 0	1452	void set_option (uint8_t opt, bool set = true) NOTHROW;
1441	void lfree (line_t &l)
1442	{
1443	talloc->free (l.t);
1444	ralloc->free (l.r);
1445	}
1446	#endif
1447
1448	void lresize (line_t &l) const
1449	{
1450	if (!l.t)
1451	return;
1452
1453	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
1454	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
1455
1456	l.l = min (l.l, ncol);
1457
1458	if (ncol > prev_ncol)
1459	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1460	}
1461		1453
1462	int fgcolor_of (rend_t r) const NOTHROW	1454	int fgcolor_of (rend_t r) const NOTHROW
1463	{	1455	{
1464	int base = GET_BASEFG (r);	1456	int base = GET_BASEFG (r);
1465	#ifndef NO_BRIGHTCOLOR	1457	#ifndef NO_BRIGHTCOLOR
…		…
1485	base += minBrightCOLOR - minCOLOR;	1477	base += minBrightCOLOR - minCOLOR;
1486	#endif	1478	#endif
1487	return base;	1479	return base;
1488	}	1480	}
1489		1481
1490	bool option (uint8_t opt) const NOTHROW
1491	{
1492	return options[opt >> 3] & (1 << (opt & 7));
1493	}
1494
1495	void set_option (uint8_t opt, bool set = true) NOTHROW;
1496
1497	// modifies first argument(!)	1482	// modifies first argument(!)
1498	void tt_paste (char *data, unsigned int len) NOTHROW;	1483	void tt_paste (char *data, unsigned int len) NOTHROW;
1499	void paste (char *data, unsigned int len) NOTHROW;	1484	void paste (char *data, unsigned int len) NOTHROW;
		1485	void scr_alloc () NOTHROW;
1500	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;
1501	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;
1502	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);
1503	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);
1504	void scr_reset ();	1492	void scr_reset ();
1505	void scr_release () NOTHROW;	1493	void scr_release () NOTHROW;
1506	void scr_clear (bool really = false) NOTHROW;	1494	void scr_clear (bool really = false) NOTHROW;
1507	void scr_refresh () NOTHROW;	1495	void scr_refresh () NOTHROW;
1508	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;	1496	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
…		…
1547	void scr_report_position () NOTHROW;	1535	void scr_report_position () NOTHROW;
1548	void set_font_style () NOTHROW;	1536	void set_font_style () NOTHROW;
1549	void scr_charset_choose (int set) NOTHROW;	1537	void scr_charset_choose (int set) NOTHROW;
1550	void scr_charset_set (int set, unsigned int ch) NOTHROW;	1538	void scr_charset_set (int set, unsigned int ch) NOTHROW;
1551	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;
1552	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	}
1553	bool scr_changeview (int new_view_start) NOTHROW;	1545	bool scr_changeview (int new_view_start) NOTHROW;
1554	void scr_bell () NOTHROW;	1546	void scr_bell () NOTHROW;
1555	void scr_printscreen (int fullhist) NOTHROW;	1547	void scr_printscreen (int fullhist) NOTHROW;
1556	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;
1557	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;
1558	void scr_reverse_selection () NOTHROW;	1550	void scr_reverse_selection () NOTHROW;
1559	void scr_dump (int fd) NOTHROW;	1551	void scr_dump (int fd) NOTHROW;
1560		1552
1561	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 */
1562	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;	1555	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1563	void selection_clear (bool clipboard = false) NOTHROW;	1556	void selection_clear (bool clipboard = false) NOTHROW;
1564	void selection_make (Time tm);	1557	void selection_make (Time tm);
1565	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;	1558	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1566	void selection_start_colrow (int col, int row) NOTHROW;	1559	void selection_start_colrow (int col, int row) NOTHROW;
…		…
1571	void selection_click (int clicks, int x, int y) NOTHROW;	1564	void selection_click (int clicks, int x, int y) NOTHROW;
1572	void selection_extend (int x, int y, int flag) NOTHROW;	1565	void selection_extend (int x, int y, int flag) NOTHROW;
1573	void selection_rotate (int x, int y) NOTHROW;	1566	void selection_rotate (int x, int y) NOTHROW;
1574		1567
1575	// xdefaults.C	1568	// xdefaults.C
		1569	void rxvt_usage (int type);
1576	const char *get_options (int argc, const char const *argv);	1570	const char *get_options (int argc, const char const *argv);
1577	int parse_keysym (const char str, const char arg);	1571	int parse_keysym (const char str, const char arg);
1578	const char x_resource (const char name);	1572	const char x_resource (const char name);
1579	void extract_resources ();	1573	void extract_resources ();
1580	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.475 by sf-exg, Thu May 17 10:18:32 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.475 by sf-exg, Thu May 17 10:18:32 2012 UTC vs.
Revision 1.527 by root, Thu Feb 20 18:59:13 2014 UTC