[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.510 by root, Fri Nov 30 07:02:12 2012 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 defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)
80	# define HAVE_BG_PIXMAP 1	81	# define HAVE_BG_PIXMAP 1
81	#endif	82	#endif
82		83
		84	#include <ecb.h>
83	#include "encoding.h"	85	#include "encoding.h"
84	#include "rxvtutil.h"	86	#include "rxvtutil.h"
85	#include "rxvtfont.h"	87	#include "rxvtfont.h"
86	#include "rxvttoolkit.h"	88	#include "rxvttoolkit.h"
		89	#include "rxvtimg.h"
87	#include "scrollbar.h"	90	#include "scrollbar.h"
88	#include "ev_cpp.h"	91	#include "ev_cpp.h"
89	#include "salloc.h"
90	#include "libptytty.h"	92	#include "libptytty.h"
91		93
92	#include "rxvtperl.h"	94	#include "rxvtperl.h"
93		95
94	// try to avoid some macros to decrease code size, on some systems	96	// try to avoid some macros to decrease code size, on some systems
…		…
147		149
148	const char * rxvt_basename (const char *str) NOTHROW;	150	const char * rxvt_basename (const char *str) NOTHROW;
149	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	151	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
150	void rxvt_log (const char *fmt,...) NOTHROW;	152	void rxvt_log (const char *fmt,...) NOTHROW;
151	void rxvt_warn (const char *fmt,...) NOTHROW;	153	void rxvt_warn (const char *fmt,...) NOTHROW;
152	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;	154	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;	155	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
154		156
155	char * rxvt_strtrim (char *str) NOTHROW;	157	char * rxvt_strtrim (char *str) NOTHROW;
156	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;	158	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
157		159
158	static inline void	160	static inline void
…		…
209	environ = orig_env;	211	environ = orig_env;
210	}	212	}
211	};	213	};
212		214
213	#ifdef HAVE_BG_PIXMAP	215	#ifdef HAVE_BG_PIXMAP
		216	struct image_effects
		217	{
		218	bool tint_set;
		219	rxvt_color tint;
		220	int shade;
		221	int h_blurRadius, v_blurRadius;
		222
		223	image_effects ()
		224	{
		225	tint_set =
		226	h_blurRadius =
		227	v_blurRadius = 0;
		228	shade = 100;
		229	}
		230
		231	bool need_tint ()
		232	{
		233	return shade != 100 \|\| tint_set;
		234	}
		235
		236	bool need_blur ()
		237	{
		238	return h_blurRadius && v_blurRadius;
		239	}
		240
		241	bool set_tint (const rxvt_color &new_tint);
		242	bool set_shade (const char *shade_str);
		243	bool set_blur (const char *geom);
		244	};
		245
214	# ifdef BG_IMAGE_FROM_FILE	246	# if BG_IMAGE_FROM_FILE
215	enum {	247	enum {
216	IM_IS_SET = 1 << 0,
217	IM_IS_SIZE_SENSITIVE = 1 << 1,	248	IM_IS_SIZE_SENSITIVE = 1 << 1,
218	IM_KEEP_ASPECT = 1 << 2,	249	IM_KEEP_ASPECT = 1 << 2,
219	IM_ROOT_ALIGN = 1 << 3,	250	IM_ROOT_ALIGN = 1 << 3,
220	IM_TILE = 1 << 4,	251	IM_TILE = 1 << 4,
221	IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT \| IM_ROOT_ALIGN \| IM_TILE,	252	IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT \| IM_ROOT_ALIGN \| IM_TILE,
…		…
227	defaultScale = windowScale,	258	defaultScale = windowScale,
228	centerAlign = 50,	259	centerAlign = 50,
229	defaultAlign = centerAlign,	260	defaultAlign = centerAlign,
230	};	261	};
231		262
232	struct rxvt_image	263	struct rxvt_image : image_effects
233	{	264	{
		265	unsigned short alpha;
234	uint8_t flags;	266	uint8_t flags;
235	unsigned int h_scale, v_scale; /* percents of the window size */	267	unsigned int h_scale, v_scale; /* percents of the window size */
236	int h_align, v_align; /* percents of the window size:	268	int h_align, v_align; /* percents of the window size:
237	0 - left align, 50 - center, 100 - right */	269	0 - left align, 50 - center, 100 - right */
238		270
239	# ifdef HAVE_PIXBUF	271	bool is_size_sensitive ()
240	GdkPixbuf *pixbuf;
241	# endif
242
243	~rxvt_image ()
244	{	272	{
245	# ifdef HAVE_PIXBUF	273	return (!(flags & IM_TILE)
246	if (pixbuf)	274	\|\| h_scale \|\| v_scale
247	g_object_unref (pixbuf);	275	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)));
248	# endif
249	}	276	}
250		277
251	int width ()	278	rxvt_img *img;
		279
		280	void destroy ()
252	{	281	{
253	# ifdef HAVE_PIXBUF	282	delete img;
254	return gdk_pixbuf_get_width (pixbuf);	283	img = 0;
255	# endif
256	}	284	}
257	int height ()	285
258	{	286	rxvt_image ();
259	# ifdef HAVE_PIXBUF	287	void set_file_geometry (rxvt_screen s, const char file);
260	return gdk_pixbuf_get_height (pixbuf);	288	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);	289	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	};	290	};
272	# endif	291	# endif
273	#endif	292	#endif
274		293
275	/*	294	/*
…		…
321	*****************************************************************************	340	*****************************************************************************
322	*/	341	*/
323		342
324	/* COLORTERM, TERM environment variables */	343	/* COLORTERM, TERM environment variables */
325	#define COLORTERMENV "rxvt"	344	#define COLORTERMENV "rxvt"
326	#ifdef BG_IMAGE_FROM_FILE	345	#if BG_IMAGE_FROM_FILE
327	# define COLORTERMENVFULL COLORTERMENV "-xpm"	346	# define COLORTERMENVFULL COLORTERMENV "-xpm"
328	#else	347	#else
329	# define COLORTERMENVFULL COLORTERMENV	348	# define COLORTERMENVFULL COLORTERMENV
330	#endif	349	#endif
331	#ifndef TERMENV	350	#ifndef TERMENV
…		…
758	text_t *t; // terminal the text	777	text_t *t; // terminal the text
759	rend_t *r; // rendition, uses RS_ flags	778	rend_t *r; // rendition, uses RS_ flags
760	tlen_t_ l; // length of each text line	779	tlen_t_ l; // length of each text line
761	uint32_t f; // flags	780	uint32_t f; // flags
762		781
		782	bool valid ()
		783	{
		784	return l >= 0;
		785	}
		786
		787	void alloc ()
		788	{
		789	l = 0;
		790	}
		791
763	bool is_longer ()	792	bool is_longer ()
764	{	793	{
765	return f & LINE_LONGER;	794	return f & LINE_LONGER;
766	}	795	}
767		796
…		…
831	// that are not representable in unicode, as well as characters	860	// that are not representable in unicode, as well as characters
832	// not fitting in the BMP.	861	// not fitting in the BMP.
833	struct compose_char	862	struct compose_char
834	{	863	{
835	unicode_t c1, c2; // any chars != NOCHAR are valid	864	unicode_t c1, c2; // any chars != NOCHAR are valid
		865	#if __cplusplus >= 201103L \|\| ECB_GCC_VERSION(4,4)
		866	compose_char () = default;
		867	#endif
836	compose_char (unicode_t c1, unicode_t c2)	868	compose_char (unicode_t c1, unicode_t c2)
837	: c1(c1), c2(c2)	869	: c1(c1), c2(c2)
838	{ }	870	{ }
839	};	871	};
840		872
…		…
1034	scrollBar_t scrollBar;	1066	scrollBar_t scrollBar;
1035	uint8_t options[(Opt_count + 7) >> 3];	1067	uint8_t options[(Opt_count + 7) >> 3];
1036	XSizeHints szHint;	1068	XSizeHints szHint;
1037	rxvt_color *pix_colors;	1069	rxvt_color *pix_colors;
1038	Cursor TermWin_cursor; /* cursor for vt window */	1070	Cursor TermWin_cursor; /* cursor for vt window */
		1071
1039	line_t *row_buf; // all lines, scrollback + terminal, circular	1072	line_t *row_buf; // all lines, scrollback + terminal, circular
1040	line_t *drawn_buf; // text on screen	1073	line_t *drawn_buf; // text on screen
1041	line_t *swap_buf; // lines for swap buffer	1074	line_t *swap_buf; // lines for swap buffer
1042	char tabs; / per location: 1 == tab-stop */	1075	char tabs; / per location: 1 == tab-stop */
1043	screen_t screen;	1076	screen_t screen;
…		…
1144	#ifdef HAVE_BG_PIXMAP	1177	#ifdef HAVE_BG_PIXMAP
1145	void bg_init ();	1178	void bg_init ();
1146	void bg_destroy ();	1179	void bg_destroy ();
1147		1180
1148	enum {	1181	enum {
1149	BG_IS_VALID = 1 << 0,	1182	BG_IS_VALID = 1 << 0,
1150		1183
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,	1184	BG_IS_TRANSPARENT = 1 << 1,
1159	BG_NEEDS_REFRESH = 1 << 11,	1185	BG_NEEDS_REFRESH = 1 << 2,
		1186	BG_INHIBIT_RENDER = 1 << 3,
1160	};	1187	};
1161		1188
1162	unsigned int bg_flags;	1189	uint8_t bg_flags;
1163		1190
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);	1193	void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1167	bool render_image (rxvt_image &image, bool transparent);	1194	bool render_image (rxvt_image &image);
1168	# endif	1195	# endif
1169		1196
1170	# ifdef ENABLE_TRANSPARENCY	1197	# if ENABLE_TRANSPARENCY
1171	Pixmap root_pixmap; /* current root pixmap set */	1198	rxvt_img *root_img;
1172	rxvt_color tint;	1199	image_effects root_effects;
1173	int shade;
1174	int h_blurRadius, v_blurRadius;
1175		1200
1176	void bg_set_transparent ()	1201	void bg_set_transparent ()
1177	{	1202	{
1178	bg_flags \|= BG_IS_TRANSPARENT;	1203	bg_flags \|= BG_IS_TRANSPARENT;
1179	}	1204	}
1180	void bg_set_root_pixmap ();	1205	void bg_set_root_pixmap ();
1181	bool bg_set_tint (rxvt_color &new_tint);	1206	bool render_root_image ();
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	1207	# endif
1190		1208
		1209	void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
		1210
1191	ev_tstamp bg_valid_since;	1211	ev_tstamp bg_valid_since;
1192		1212
1193	Pixmap bg_pixmap;	1213	rxvt_img *bg_img;
1194	unsigned int bg_pmap_width, bg_pmap_height;
1195		1214
1196	int target_x;
1197	int target_y;
1198	bool bg_set_position (int x, int y);
1199	bool bg_window_size_sensitive ();	1215	bool bg_window_size_sensitive ();
1200	bool bg_window_position_sensitive ();	1216	bool bg_window_position_sensitive ();
1201		1217
1202	bool bg_render ();	1218	void bg_render ();
1203	void bg_invalidate ()	1219	void bg_invalidate ()
1204	{	1220	{
1205	bg_flags &= ~BG_IS_VALID;	1221	bg_flags &= ~BG_IS_VALID;
1206	}	1222	}
1207	#endif
1208	#ifdef HAVE_PIXBUF
1209	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1210	int src_x, int src_y, int dst_x, int dst_y,
1211	unsigned int width, unsigned int height);
1212	#endif	1223	#endif
1213		1224
1214	#if ENABLE_OVERLAY	1225	#if ENABLE_OVERLAY
1215	overlay_base ov;	1226	overlay_base ov;
1216		1227
…		…
1224	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;	1235	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1225	#endif	1236	#endif
1226		1237
1227	vector<void *> allocated; // free these memory blocks with free()	1238	vector<void *> allocated; // free these memory blocks with free()
1228		1239
		1240	int parent_x, parent_y; // parent window position relative to root, only updated on demand
		1241
1229	char *locale;	1242	char *locale;
1230	char charsets[4];	1243	char charsets[4];
1231	char v_buffer; / pointer to physical buffer */	1244	char v_buffer; / pointer to physical buffer */
1232	unsigned int v_buflen; /* size of area to write */	1245	unsigned int v_buflen; /* size of area to write */
1233	stringvec argv, envv; /* if != 0, will be freed at destroy time */	1246	stringvec argv, envv; /* if != 0, will be freed at destroy time */
…		…
1244	char cmdbuf_ptr, cmdbuf_endp;	1257	char cmdbuf_ptr, cmdbuf_endp;
1245	char cmdbuf_base[CBUFSIZ];	1258	char cmdbuf_base[CBUFSIZ];
1246		1259
1247	ptytty *pty;	1260	ptytty *pty;
1248		1261
1249	rxvt_salloc *talloc; // text line allocator	1262	// chunk contains all line_t's as well as rend_t and text_t buffers
1250	rxvt_salloc *ralloc; // rend line allocator	1263	// for drawn_buf, swap_buf and row_buf, in this order
		1264	void *chunk;
		1265	size_t chunk_size;
1251		1266
1252	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1267	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1253		1268
1254	#if ENABLE_FRILLS \|\| ISO_14755	1269	#if ENABLE_FRILLS \|\| ISO_14755
1255	// ISO 14755 entry support	1270	// ISO 14755 entry support
1256	unicode_t iso14755buf;	1271	unicode_t iso14755buf;
1257	void commit_iso14755 ();	1272	void commit_iso14755 ();
1258	# if ISO_14755	1273	# if ISO_14755
1259	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);	1274	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);	1275	void iso14755_54 (int x, int y);
1261	# endif	1276	# endif
1262	#endif	1277	#endif
1263		1278
1264	long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;	1279	long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
…		…
1425	char *get_colorfgbg ();	1440	char *get_colorfgbg ();
1426	bool set_color (rxvt_color &color, const char *name);	1441	bool set_color (rxvt_color &color, const char *name);
1427	void alias_color (int dst, int src);	1442	void alias_color (int dst, int src);
1428	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1443	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1429	void get_window_origin (int &x, int &y);	1444	void get_window_origin (int &x, int &y);
1430	Pixmap get_pixmap_property (Atom property);
1431		1445
1432	// screen.C	1446	// screen.C
1433		1447
1434	void lalloc (line_t &l) const	1448	bool option (uint8_t opt) const NOTHROW
1435	{	1449	{
1436	l.t = (text_t *)talloc->alloc ();	1450	return options[opt >> 3] & (1 << (opt & 7));
1437	l.r = (rend_t *)ralloc->alloc ();
1438	}	1451	}
1439		1452
1440	#if 0	1453	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		1454
1462	int fgcolor_of (rend_t r) const NOTHROW	1455	int fgcolor_of (rend_t r) const NOTHROW
1463	{	1456	{
1464	int base = GET_BASEFG (r);	1457	int base = GET_BASEFG (r);
1465	#ifndef NO_BRIGHTCOLOR	1458	#ifndef NO_BRIGHTCOLOR
…		…
1485	base += minBrightCOLOR - minCOLOR;	1478	base += minBrightCOLOR - minCOLOR;
1486	#endif	1479	#endif
1487	return base;	1480	return base;
1488	}	1481	}
1489		1482
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(!)	1483	// modifies first argument(!)
1498	void tt_paste (char *data, unsigned int len) NOTHROW;	1484	void tt_paste (char *data, unsigned int len) NOTHROW;
1499	void paste (char *data, unsigned int len) NOTHROW;	1485	void paste (char *data, unsigned int len) NOTHROW;
		1486	void scr_alloc () NOTHROW;
1500	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;	1487	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;	1488	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;	1489	void scr_kill_char (line_t &l, int col) const NOTHROW;
1503	int scr_scroll_text (int row1, int row2, int count) NOTHROW;	1490	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1504	void scr_reset ();	1491	void scr_reset ();
…		…
1571	void selection_click (int clicks, int x, int y) NOTHROW;	1558	void selection_click (int clicks, int x, int y) NOTHROW;
1572	void selection_extend (int x, int y, int flag) NOTHROW;	1559	void selection_extend (int x, int y, int flag) NOTHROW;
1573	void selection_rotate (int x, int y) NOTHROW;	1560	void selection_rotate (int x, int y) NOTHROW;
1574		1561
1575	// xdefaults.C	1562	// xdefaults.C
		1563	void rxvt_usage (int type);
1576	const char *get_options (int argc, const char const *argv);	1564	const char *get_options (int argc, const char const *argv);
1577	int parse_keysym (const char str, const char arg);	1565	int parse_keysym (const char str, const char arg);
1578	const char x_resource (const char name);	1566	const char x_resource (const char name);
1579	void extract_resources ();	1567	void extract_resources ();
1580	void extract_keysym_resources ();	1568	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.510 by root, Fri Nov 30 07:02:12 2012 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.510 by root, Fri Nov 30 07:02:12 2012 UTC