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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC vs.
Revision 1.501 by root, Wed Jun 6 11:46:11 2012 UTC

…		…
1	#ifndef RXVT_H_ /* include once only */	1	#ifndef RXVT_H_ /* include once only */
2	#define RXVT_H_	2	#define RXVT_H_
3		3
4	#include <cstdio>	4	#include <stdio.h>
5	#include <cctype>	5	#include <ctype.h>
6	#include <cerrno>	6	#include <errno.h>
7	#include <cstdarg>	7	#include <stdarg.h>
8	#include <cstdlib>	8	#include <stdlib.h>
9	#ifdef HAVE_STDINT_H	9	#ifdef HAVE_STDINT_H
10	#include <stdint.h>	10	#include <stdint.h>
11	#endif	11	#endif
12	#include <sys/types.h>	12	#include <sys/types.h>
13	#include <unistd.h>	13	#include <unistd.h>
14	#include <cstring>	14	#include <string.h>
15	#include <assert.h>	15	#include <assert.h>
16	#ifdef HAVE_SYS_IOCTL_H	16	#ifdef HAVE_SYS_IOCTL_H
17	#include <sys/ioctl.h>	17	#include <sys/ioctl.h>
18	#endif	18	#endif
19	#ifdef HAVE_SYS_STRREDIR_H	19	#ifdef HAVE_SYS_STRREDIR_H
20	#include <sys/strredir.h>	20	#include <sys/strredir.h>
21	#endif	21	#endif
22		22
23	#if HAVE_CWCHAR
24	# include <cwchar>
25	#elif HAVE_WCHAR_H	23	#if HAVE_WCHAR_H
26	# include <wchar.h>	24	# include <wchar.h>
27	#else	25	#else
28	// stdlib.h might provide it	26	// stdlib.h might provide it
29	#endif	27	#endif
30
31	using namespace std;
32		28
33	// we assume that Xlib.h defines XPointer, and it does since at least 1994...	29	// we assume that Xlib.h defines XPointer, and it does since at least 1994...
34		30
35	extern "C" {	31	extern "C" {
36	#include <X11/Xlib.h>	32	#include <X11/Xlib.h>
49		45
50	#include "feature.h"	46	#include "feature.h"
51		47
52	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)	48	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
53	# define ENABLE_OVERLAY 1	49	# define ENABLE_OVERLAY 1
		50	# undef NO_RESOURCES
54	#endif	51	#endif
55		52
56	#if ENABLE_PERL	53	#if ENABLE_PERL
57	# define ENABLE_FRILLS 1	54	# define ENABLE_FRILLS 1
58	# define ENABLE_COMBINING 1	55	# define ENABLE_COMBINING 1
…		…
74	#include <X11/cursorfont.h>	71	#include <X11/cursorfont.h>
75	#include <X11/keysym.h>	72	#include <X11/keysym.h>
76	#include <X11/keysymdef.h>	73	#include <X11/keysymdef.h>
77	#include <X11/Xatom.h>	74	#include <X11/Xatom.h>
78		75
79	#ifdef HAVE_AFTERIMAGE
80	# include <afterimage.h>
81	# undef min
82	# undef max
83	#endif
84
85	#ifdef HAVE_PIXBUF	76	#if HAVE_PIXBUF
86	# include <gdk-pixbuf/gdk-pixbuf.h>	77	# include <gdk-pixbuf/gdk-pixbuf.h>
87	#endif	78	#endif
88		79
89	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)	80	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)
90	# define HAVE_BG_PIXMAP 1	81	# define HAVE_BG_PIXMAP 1
91	#endif	82	#endif
92		83
		84	#include <ecb.h>
93	#include "encoding.h"	85	#include "encoding.h"
94	#include "rxvtutil.h"	86	#include "rxvtutil.h"
95	#include "rxvtfont.h"	87	#include "rxvtfont.h"
96	#include "rxvttoolkit.h"	88	#include "rxvttoolkit.h"
		89	#include "rxvtimg.h"
97	#include "scrollbar.h"	90	#include "scrollbar.h"
98	#include "ev_cpp.h"	91	#include "ev_cpp.h"
99	#include "salloc.h"
100	#include "libptytty.h"	92	#include "libptytty.h"
101		93
102	#include "rxvtperl.h"	94	#include "rxvtperl.h"
103		95
104	// 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
…		…
157		149
158	const char * rxvt_basename (const char *str) NOTHROW;	150	const char * rxvt_basename (const char *str) NOTHROW;
159	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	151	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
160	void rxvt_log (const char *fmt,...) NOTHROW;	152	void rxvt_log (const char *fmt,...) NOTHROW;
161	void rxvt_warn (const char *fmt,...) NOTHROW;	153	void rxvt_warn (const char *fmt,...) NOTHROW;
162	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;
163	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;
164		156
165	char * rxvt_strtrim (char *str) NOTHROW;	157	char * rxvt_strtrim (char *str) NOTHROW;
166	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;	158	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
167		159
168	static inline void	160	static inline void
…		…
217	~localise_env ()	209	~localise_env ()
218	{	210	{
219	environ = orig_env;	211	environ = orig_env;
220	}	212	}
221	};	213	};
		214
		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
		246	# if BG_IMAGE_FROM_FILE
		247	enum {
		248	IM_IS_SET = 1 << 0,
		249	IM_IS_SIZE_SENSITIVE = 1 << 1,
		250	IM_KEEP_ASPECT = 1 << 2,
		251	IM_ROOT_ALIGN = 1 << 3,
		252	IM_TILE = 1 << 4,
		253	IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT \| IM_ROOT_ALIGN \| IM_TILE,
		254	};
		255
		256	enum {
		257	noScale = 0,
		258	windowScale = 100,
		259	defaultScale = windowScale,
		260	centerAlign = 50,
		261	defaultAlign = centerAlign,
		262	};
		263
		264	struct rxvt_image : image_effects
		265	{
		266	unsigned short alpha;
		267	uint8_t flags;
		268	unsigned int h_scale, v_scale; /* percents of the window size */
		269	int h_align, v_align; /* percents of the window size:
		270	0 - left align, 50 - center, 100 - right */
		271
		272	bool is_size_sensitive ()
		273	{
		274	return (!(flags & IM_TILE)
		275	\|\| h_scale \|\| v_scale
		276	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)));
		277	}
		278
		279	# if HAVE_PIXBUF
		280	GdkPixbuf *pixbuf;
		281
		282	void destroy ()
		283	{
		284	if (pixbuf)
		285	g_object_unref (pixbuf);
		286	}
		287
		288	int width ()
		289	{
		290	return gdk_pixbuf_get_width (pixbuf);
		291	}
		292	int height ()
		293	{
		294	return gdk_pixbuf_get_height (pixbuf);
		295	}
		296	# endif
		297
		298	rxvt_image ();
		299	bool set_file_geometry (const char *file);
		300	bool set_file (const char *file);
		301	bool set_geometry (const char *geom, bool update = false);
		302	};
		303	# endif
		304	#endif
222		305
223	/*	306	/*
224	*****************************************************************************	307	*****************************************************************************
225	* STRUCTURES AND TYPEDEFS	308	* STRUCTURES AND TYPEDEFS
226	*****************************************************************************	309	*****************************************************************************
…		…
269	*****************************************************************************	352	*****************************************************************************
270	*/	353	*/
271		354
272	/* COLORTERM, TERM environment variables */	355	/* COLORTERM, TERM environment variables */
273	#define COLORTERMENV "rxvt"	356	#define COLORTERMENV "rxvt"
274	#ifdef BG_IMAGE_FROM_FILE	357	#if BG_IMAGE_FROM_FILE
275	# define COLORTERMENVFULL COLORTERMENV "-xpm"	358	# define COLORTERMENVFULL COLORTERMENV "-xpm"
276	#else	359	#else
277	# define COLORTERMENVFULL COLORTERMENV	360	# define COLORTERMENVFULL COLORTERMENV
278	#endif	361	#endif
279	#ifndef TERMENV	362	#ifndef TERMENV
…		…
706	text_t *t; // terminal the text	789	text_t *t; // terminal the text
707	rend_t *r; // rendition, uses RS_ flags	790	rend_t *r; // rendition, uses RS_ flags
708	tlen_t_ l; // length of each text line	791	tlen_t_ l; // length of each text line
709	uint32_t f; // flags	792	uint32_t f; // flags
710		793
		794	bool valid ()
		795	{
		796	return l >= 0;
		797	}
		798
		799	void alloc ()
		800	{
		801	l = 0;
		802	}
		803
711	bool is_longer ()	804	bool is_longer ()
712	{	805	{
713	return f & LINE_LONGER;	806	return f & LINE_LONGER;
714	}	807	}
715		808
…		…
779	// that are not representable in unicode, as well as characters	872	// that are not representable in unicode, as well as characters
780	// not fitting in the BMP.	873	// not fitting in the BMP.
781	struct compose_char	874	struct compose_char
782	{	875	{
783	unicode_t c1, c2; // any chars != NOCHAR are valid	876	unicode_t c1, c2; // any chars != NOCHAR are valid
		877	#if __cplusplus >= 201103L \|\| ECB_GCC_VERSION(4,4)
		878	compose_char () = default;
		879	#endif
784	compose_char (unicode_t c1, unicode_t c2)	880	compose_char (unicode_t c1, unicode_t c2)
785	: c1(c1), c2(c2)	881	: c1(c1), c2(c2)
786	{ }	882	{ }
787	};	883	};
788		884
…		…
870	* END······················= total_rows	966	* END······················= total_rows
871	*/	967	*/
872		968
873	struct TermWin_t	969	struct TermWin_t
874	{	970	{
		971	int vt_width; /* actual window width [pixels] */
		972	int vt_height; /* actual window height [pixels] */
875	int width; /* window width [pixels] */	973	int width; /* window width [pixels] */
876	int height; /* window height [pixels] */	974	int height; /* window height [pixels] */
877	int fwidth; /* font width [pixels] */	975	int fwidth; /* font width [pixels] */
878	int fheight; /* font height [pixels] */	976	int fheight; /* font height [pixels] */
879	int fbase; /* font ascent (baseline) [pixels] */	977	int fbase; /* font ascent (baseline) [pixels] */
…		…
891	int view_start; /* scrollback view starts here */	989	int view_start; /* scrollback view starts here */
892	int top_row; /* topmost row index of scrollback */	990	int top_row; /* topmost row index of scrollback */
893	Window parent; /* parent identifier */	991	Window parent; /* parent identifier */
894	Window vt; /* vt100 window */	992	Window vt; /* vt100 window */
895	GC gc; /* GC for drawing */	993	GC gc; /* GC for drawing */
896	Pixmap pixmap;
897	rxvt_drawable *drawable;	994	rxvt_drawable *drawable;
898	rxvt_fontset *fontset[4];	995	rxvt_fontset *fontset[4];
899	};	996	};
900		997
901	/*	998	/*
…		…
981	scrollBar_t scrollBar;	1078	scrollBar_t scrollBar;
982	uint8_t options[(Opt_count + 7) >> 3];	1079	uint8_t options[(Opt_count + 7) >> 3];
983	XSizeHints szHint;	1080	XSizeHints szHint;
984	rxvt_color *pix_colors;	1081	rxvt_color *pix_colors;
985	Cursor TermWin_cursor; /* cursor for vt window */	1082	Cursor TermWin_cursor; /* cursor for vt window */
		1083
986	line_t *row_buf; // all lines, scrollback + terminal, circular	1084	line_t *row_buf; // all lines, scrollback + terminal, circular
987	line_t *drawn_buf; // text on screen	1085	line_t *drawn_buf; // text on screen
988	line_t *swap_buf; // lines for swap buffer	1086	line_t *swap_buf; // lines for swap buffer
989	char tabs; / per location: 1 == tab-stop */	1087	char tabs; / per location: 1 == tab-stop */
990	screen_t screen;	1088	screen_t screen;
…		…
1028	hidden_pointer:1,	1126	hidden_pointer:1,
1029	#endif	1127	#endif
1030	enc_utf8:1, /* whether locale uses utf-8 */	1128	enc_utf8:1, /* whether locale uses utf-8 */
1031	seen_input:1, /* whether we have seen some program output yet */	1129	seen_input:1, /* whether we have seen some program output yet */
1032	seen_resize:1, /* whether we had a resize event */	1130	seen_resize:1, /* whether we had a resize event */
		1131	init_done:1,
1033	parsed_geometry:1;	1132	parsed_geometry:1;
1034		1133
1035	unsigned char refresh_type,	1134	unsigned char refresh_type,
1036	#ifdef META8_OPTION	1135	#ifdef META8_OPTION
1037	meta_char; /* Alt-key prefix */	1136	meta_char; /* Alt-key prefix */
…		…
1071	allowedxerror;	1170	allowedxerror;
1072	/* ---------- */	1171	/* ---------- */
1073	unsigned int ModLevel3Mask,	1172	unsigned int ModLevel3Mask,
1074	ModMetaMask,	1173	ModMetaMask,
1075	ModNumLockMask;	1174	ModNumLockMask;
1076	int old_width, /* last used width in screen resize */
1077	old_height; /* last used height in screen resize */
1078	unsigned long priv_modes,	1175	unsigned long priv_modes,
1079	SavedModes;	1176	SavedModes;
1080	/* ---------- */	1177	/* ---------- */
1081	Atom *xa;	1178	Atom *xa;
1082	/* ---------- */	1179	/* ---------- */
…		…
1092	#ifdef HAVE_BG_PIXMAP	1189	#ifdef HAVE_BG_PIXMAP
1093	void bg_init ();	1190	void bg_init ();
1094	void bg_destroy ();	1191	void bg_destroy ();
1095		1192
1096	enum {	1193	enum {
1097	//subset returned by make_transparency_pixmap
1098	BG_IS_VALID = 1 << 0,	1194	BG_IS_VALID = 1 << 0,
1099	BG_NEEDS_TINT = 1 << 1,
1100	BG_NEEDS_BLUR = 1 << 2,
1101		1195
1102	BG_EFFECTS_FLAGS = BG_NEEDS_TINT \| BG_NEEDS_BLUR,
1103
1104	BG_KEEP_ASPECT = 1 << 3,
1105	BG_ROOT_ALIGN = 1 << 4,
1106	BG_TILE = 1 << 14,
1107	BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT \| BG_ROOT_ALIGN \| BG_TILE,
1108
1109	BG_TINT_SET = 1 << 5,
1110	BG_TINT_BITAND = 1 << 6,
1111	BG_TINT_FLAGS = BG_NEEDS_TINT \| BG_TINT_BITAND,
1112
1113	BG_HAS_RENDER = 1 << 7,
1114	BG_HAS_RENDER_CONV = 1 << 8,
1115	BG_CLIENT_RENDER = 1 << 9,
1116
1117	BG_IS_TRANSPARENT = 1 << 10,	1196	BG_IS_TRANSPARENT = 1 << 1,
1118	BG_NEEDS_REFRESH = 1 << 11,	1197	BG_NEEDS_REFRESH = 1 << 2,
1119	BG_IS_SIZE_SENSITIVE = 1 << 12,
1120	BG_IS_FROM_FILE = 1 << 13,
1121	};	1198	};
1122		1199
1123	unsigned int bg_flags;	1200	uint8_t bg_flags;
1124		1201
1125	# ifdef BG_IMAGE_FROM_FILE	1202	# if BG_IMAGE_FROM_FILE
1126	void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);	1203	vector<rxvt_image> image_vec;
1127	bool render_image (unsigned long tr_flags);	1204	rxvt_image *new_image ()
1128		1205	{
1129	enum {	1206	image_vec.resize (image_vec.size () + 1);
1130	noScale = 0,	1207	return &image_vec.back ();
1131	windowScale = 100,
1132	defaultScale = windowScale,
1133	centerAlign = 50,
1134	defaultAlign = centerAlign,
1135	};	1208	}
1136		1209	void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1137	unsigned int h_scale, v_scale; /* percents of the window size */	1210	bool render_image (rxvt_image &image);
1138	int h_align, v_align; /* percents of the window size:	1211	void parse_image (int id, const char type, const char arg);
1139	0 - left align, 50 - center, 100 - right */
1140
1141	bool bg_set_geometry (const char *geom, bool update = false);
1142	void bg_set_default_geometry ()
1143	{
1144	h_scale = v_scale = defaultScale;
1145	h_align = v_align = defaultAlign;
1146	}
1147
1148	bool bg_set_file (const char *file);
1149	# endif	1212	# endif
1150		1213
1151	# ifdef ENABLE_TRANSPARENCY	1214	# if ENABLE_TRANSPARENCY
1152	Pixmap root_pixmap; /* current root pixmap set */	1215	Pixmap root_pixmap; /* current root pixmap set */
1153	rxvt_color tint;	1216	image_effects root_effects;
1154	int shade;
1155	int h_blurRadius, v_blurRadius;
1156		1217
1157	bool bg_set_transparent ();	1218	void bg_set_transparent ()
		1219	{
		1220	bg_flags \|= BG_IS_TRANSPARENT;
		1221	}
1158	void bg_set_root_pixmap ();	1222	void bg_set_root_pixmap ();
1159	void set_tint_shade_flags ();	1223	bool render_root_image ();
1160	bool bg_set_tint (rxvt_color &new_tint);
1161	bool bg_set_shade (const char *shade_str);
1162	bool bg_set_blur (const char *geom);
1163
1164	bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1165	bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1166	void tint_ximage (Visual visual, XImage ximage);
1167	unsigned long make_transparency_pixmap ();
1168	# endif	1224	# endif
		1225
		1226	bool blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius);
		1227	bool tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade);
		1228	void tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade);
1169		1229
1170	ev_tstamp bg_valid_since;	1230	ev_tstamp bg_valid_since;
1171		1231
1172	Pixmap bg_pixmap;	1232	Pixmap bg_pixmap;
1173	unsigned int bg_pmap_width, bg_pmap_height;	1233	unsigned int bg_pmap_width, bg_pmap_height;
…		…
1182	void bg_invalidate ()	1242	void bg_invalidate ()
1183	{	1243	{
1184	bg_flags &= ~BG_IS_VALID;	1244	bg_flags &= ~BG_IS_VALID;
1185	}	1245	}
1186	#endif	1246	#endif
1187	#ifdef HAVE_AFTERIMAGE
1188	ASImage *original_asim;
1189	ASVisual *asv;
1190	ASImageManager *asimman;
1191
1192	void init_asv ()
1193	{
1194	if (!asv)
1195	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1196	}
1197	#endif
1198	#ifdef HAVE_PIXBUF	1247	#if HAVE_PIXBUF
1199	GdkPixbuf *pixbuf;
1200	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,	1248	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1201	int src_x, int src_y, int dst_x, int dst_y,	1249	int src_x, int src_y, int dst_x, int dst_y,
1202	unsigned int width, unsigned int height);	1250	unsigned int width, unsigned int height, bool argb);
1203	#endif	1251	#endif
1204		1252
1205	#if ENABLE_OVERLAY	1253	#if ENABLE_OVERLAY
1206	overlay_base ov;	1254	overlay_base ov;
1207		1255
…		…
1215	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;	1263	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1216	#endif	1264	#endif
1217		1265
1218	vector<void *> allocated; // free these memory blocks with free()	1266	vector<void *> allocated; // free these memory blocks with free()
1219		1267
1220	char env_windowid[21]; /* environmental variable WINDOWID */	1268	int parent_x, parent_y; // parent window position relative to root, only updated on demand
1221	char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1222	char env_display; / environmental variable DISPLAY */
1223	char env_term; / environmental variable TERM */
1224		1269
1225	char *locale;	1270	char *locale;
1226	char charsets[4];	1271	char charsets[4];
1227	char v_buffer; / pointer to physical buffer */	1272	char v_buffer; / pointer to physical buffer */
1228	unsigned int v_buflen; /* size of area to write */	1273	unsigned int v_buflen; /* size of area to write */
…		…
1240	char cmdbuf_ptr, cmdbuf_endp;	1285	char cmdbuf_ptr, cmdbuf_endp;
1241	char cmdbuf_base[CBUFSIZ];	1286	char cmdbuf_base[CBUFSIZ];
1242		1287
1243	ptytty *pty;	1288	ptytty *pty;
1244		1289
1245	rxvt_salloc *talloc; // text line allocator	1290	// chunk contains all line_t's as well as rend_t and text_t buffers
1246	rxvt_salloc *ralloc; // rend line allocator	1291	// for drawn_buf, swap_buf and row_buf, in this order
		1292	void *chunk;
		1293	size_t chunk_size;
1247		1294
1248	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1295	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1249		1296
1250	#if ENABLE_FRILLS \|\| ISO_14755	1297	#if ENABLE_FRILLS \|\| ISO_14755
1251	// ISO 14755 entry support	1298	// ISO 14755 entry support
1252	unicode_t iso14755buf;	1299	unicode_t iso14755buf;
1253	void commit_iso14755 ();	1300	void commit_iso14755 ();
1254	# if ISO_14755	1301	# if ISO_14755
1255	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);	1302	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1256	void iso14755_54 (int x, int y);	1303	void iso14755_54 (int x, int y);
1257	# endif	1304	# endif
1258	#endif	1305	#endif
1259		1306
1260	long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;	1307	long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
…		…
1288	void cmdbuf_append (const char *str, size_t count);	1335	void cmdbuf_append (const char *str, size_t count);
1289	bool pty_fill ();	1336	bool pty_fill ();
1290	void pty_cb (ev::io &w, int revents); ev::io pty_ev;	1337	void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1291		1338
1292	#ifdef CURSOR_BLINK	1339	#ifdef CURSOR_BLINK
		1340	void cursor_blink_reset ();
1293	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;	1341	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1294	#endif	1342	#endif
1295	#ifdef TEXT_BLINK	1343	#ifdef TEXT_BLINK
1296	void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;	1344	void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1297	#endif	1345	#endif
…		…
1415	void set_mbstring_property (Atom prop, const char *str, int len = -1);	1463	void set_mbstring_property (Atom prop, const char *str, int len = -1);
1416	void set_utf8_property (Atom prop, const char *str, int len = -1);	1464	void set_utf8_property (Atom prop, const char *str, int len = -1);
1417	void set_title (const char *str);	1465	void set_title (const char *str);
1418	void set_icon_name (const char *str);	1466	void set_icon_name (const char *str);
1419	void set_window_color (int idx, const char *color);	1467	void set_window_color (int idx, const char *color);
1420	void set_colorfgbg ();	1468	char *get_colorfgbg ();
1421	bool set_color (rxvt_color &color, const char *name);	1469	bool set_color (rxvt_color &color, const char *name);
1422	void alias_color (int dst, int src);	1470	void alias_color (int dst, int src);
1423	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1471	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1424	void get_window_origin (int &x, int &y);	1472	void get_window_origin (int &x, int &y);
1425	Pixmap get_pixmap_property (Atom property);
1426		1473
1427	// screen.C	1474	// screen.C
1428
1429	void lalloc (line_t &l) const
1430	{
1431	l.t = (text_t *)talloc->alloc ();
1432	l.r = (rend_t *)ralloc->alloc ();
1433	}
1434
1435	#if 0
1436	void lfree (line_t &l)
1437	{
1438	talloc->free (l.t);
1439	ralloc->free (l.r);
1440	}
1441	#endif
1442
1443	void lresize (line_t &l) const
1444	{
1445	if (!l.t)
1446	return;
1447
1448	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
1449	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
1450
1451	l.l = min (l.l, ncol);
1452
1453	if (ncol > prev_ncol)
1454	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1455	}
1456		1475
1457	int fgcolor_of (rend_t r) const NOTHROW	1476	int fgcolor_of (rend_t r) const NOTHROW
1458	{	1477	{
1459	int base = GET_BASEFG (r);	1478	int base = GET_BASEFG (r);
1460	#ifndef NO_BRIGHTCOLOR	1479	#ifndef NO_BRIGHTCOLOR
…		…
1490	void set_option (uint8_t opt, bool set = true) NOTHROW;	1509	void set_option (uint8_t opt, bool set = true) NOTHROW;
1491		1510
1492	// modifies first argument(!)	1511	// modifies first argument(!)
1493	void tt_paste (char *data, unsigned int len) NOTHROW;	1512	void tt_paste (char *data, unsigned int len) NOTHROW;
1494	void paste (char *data, unsigned int len) NOTHROW;	1513	void paste (char *data, unsigned int len) NOTHROW;
		1514	void scr_alloc () NOTHROW;
1495	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;	1515	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1496	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;	1516	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1497	void scr_kill_char (line_t &l, int col) const NOTHROW;	1517	void scr_kill_char (line_t &l, int col) const NOTHROW;
1498	int scr_scroll_text (int row1, int row2, int count) NOTHROW;	1518	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1499	void scr_reset ();	1519	void scr_reset ();
…		…
1566	void selection_click (int clicks, int x, int y) NOTHROW;	1586	void selection_click (int clicks, int x, int y) NOTHROW;
1567	void selection_extend (int x, int y, int flag) NOTHROW;	1587	void selection_extend (int x, int y, int flag) NOTHROW;
1568	void selection_rotate (int x, int y) NOTHROW;	1588	void selection_rotate (int x, int y) NOTHROW;
1569		1589
1570	// xdefaults.C	1590	// xdefaults.C
		1591	void rxvt_usage (int type);
1571	const char *get_options (int argc, const char const *argv);	1592	const char *get_options (int argc, const char const *argv);
1572	int parse_keysym (const char str, const char arg);	1593	int parse_keysym (const char str, const char arg);
1573	const char x_resource (const char name);	1594	const char x_resource (const char name);
1574	void extract_resources ();	1595	void extract_resources ();
1575	void extract_keysym_resources ();	1596	void extract_keysym_resources ();
		1597	void find_resources (const char n_prefix, const char c_prefix, int mode,
		1598	Bool (proc)(XrmDatabase , XrmBindingList, XrmQuarkList, XrmRepresentation , XrmValue , XPointer));
		1599	bool parse_bool_resource (const char *str)
		1600	{
		1601	return (!strcasecmp (str, "TRUE")
		1602	\|\| !strcasecmp (str, "YES")
		1603	\|\| !strcasecmp (str, "ON")
		1604	\|\| !strcasecmp (str, "1"));
		1605	}
1576	};	1606	};
1577		1607
1578	#endif /* _RXVT_H_ */	1608	#endif /* _RXVT_H_ */
1579		1609

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC vs. Revision 1.501 by root, Wed Jun 6 11:46:11 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC vs.
Revision 1.501 by root, Wed Jun 6 11:46:11 2012 UTC