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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.467 by root, Thu Jan 19 17:10:51 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_AFTERIMAGE
76	# include <afterimage.h>
77	# undef min
78	# undef max
79	#endif
80
81	#ifdef HAVE_PIXBUF	76	#if HAVE_PIXBUF
82	# include <gdk-pixbuf/gdk-pixbuf.h>	77	# include <gdk-pixbuf/gdk-pixbuf.h>
83	#endif	78	#endif
84		79
85	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)	80	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)
86	# define HAVE_BG_PIXMAP 1	81	# define HAVE_BG_PIXMAP 1
87	#endif	82	#endif
88		83
		84	#include <ecb.h>
89	#include "encoding.h"	85	#include "encoding.h"
90	#include "rxvtutil.h"	86	#include "rxvtutil.h"
91	#include "rxvtfont.h"	87	#include "rxvtfont.h"
92	#include "rxvttoolkit.h"	88	#include "rxvttoolkit.h"
		89	#include "rxvtimg.h"
93	#include "scrollbar.h"	90	#include "scrollbar.h"
94	#include "ev_cpp.h"	91	#include "ev_cpp.h"
95	#include "salloc.h"
96	#include "libptytty.h"	92	#include "libptytty.h"
97		93
98	#include "rxvtperl.h"	94	#include "rxvtperl.h"
99		95
100	// 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
…		…
153		149
154	const char * rxvt_basename (const char *str) NOTHROW;	150	const char * rxvt_basename (const char *str) NOTHROW;
155	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	151	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
156	void rxvt_log (const char *fmt,...) NOTHROW;	152	void rxvt_log (const char *fmt,...) NOTHROW;
157	void rxvt_warn (const char *fmt,...) NOTHROW;	153	void rxvt_warn (const char *fmt,...) NOTHROW;
158	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;
159	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;
160		156
161	char * rxvt_strtrim (char *str) NOTHROW;	157	char * rxvt_strtrim (char *str) NOTHROW;
162	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;	158	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
163		159
164	static inline void	160	static inline void
…		…
213	~localise_env ()	209	~localise_env ()
214	{	210	{
215	environ = orig_env;	211	environ = orig_env;
216	}	212	}
217	};	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_SIZE_SENSITIVE = 1 << 1,
		249	IM_KEEP_ASPECT = 1 << 2,
		250	IM_ROOT_ALIGN = 1 << 3,
		251	IM_TILE = 1 << 4,
		252	IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT \| IM_ROOT_ALIGN \| IM_TILE,
		253	};
		254
		255	enum {
		256	noScale = 0,
		257	windowScale = 100,
		258	defaultScale = windowScale,
		259	centerAlign = 50,
		260	defaultAlign = centerAlign,
		261	};
		262
		263	struct rxvt_image : image_effects
		264	{
		265	unsigned short alpha;
		266	uint8_t flags;
		267	unsigned int h_scale, v_scale; /* percents of the window size */
		268	int h_align, v_align; /* percents of the window size:
		269	0 - left align, 50 - center, 100 - right */
		270
		271	bool is_size_sensitive ()
		272	{
		273	return (!(flags & IM_TILE)
		274	\|\| h_scale \|\| v_scale
		275	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)));
		276	}
		277
		278	rxvt_img *img;
		279
		280	void destroy ()
		281	{
		282	delete img;
		283	img = 0;
		284	}
		285
		286	rxvt_image ();
		287	void set_file_geometry (rxvt_screen s, const char file);
		288	void set_file (rxvt_screen s, const char file);
		289	bool set_geometry (const char *geom, bool update = false);
		290	};
		291	# endif
		292	#endif
218		293
219	/*	294	/*
220	*****************************************************************************	295	*****************************************************************************
221	* STRUCTURES AND TYPEDEFS	296	* STRUCTURES AND TYPEDEFS
222	*****************************************************************************	297	*****************************************************************************
…		…
265	*****************************************************************************	340	*****************************************************************************
266	*/	341	*/
267		342
268	/* COLORTERM, TERM environment variables */	343	/* COLORTERM, TERM environment variables */
269	#define COLORTERMENV "rxvt"	344	#define COLORTERMENV "rxvt"
270	#ifdef BG_IMAGE_FROM_FILE	345	#if BG_IMAGE_FROM_FILE
271	# define COLORTERMENVFULL COLORTERMENV "-xpm"	346	# define COLORTERMENVFULL COLORTERMENV "-xpm"
272	#else	347	#else
273	# define COLORTERMENVFULL COLORTERMENV	348	# define COLORTERMENVFULL COLORTERMENV
274	#endif	349	#endif
275	#ifndef TERMENV	350	#ifndef TERMENV
…		…
702	text_t *t; // terminal the text	777	text_t *t; // terminal the text
703	rend_t *r; // rendition, uses RS_ flags	778	rend_t *r; // rendition, uses RS_ flags
704	tlen_t_ l; // length of each text line	779	tlen_t_ l; // length of each text line
705	uint32_t f; // flags	780	uint32_t f; // flags
706		781
		782	bool valid ()
		783	{
		784	return l >= 0;
		785	}
		786
		787	void alloc ()
		788	{
		789	l = 0;
		790	}
		791
707	bool is_longer ()	792	bool is_longer ()
708	{	793	{
709	return f & LINE_LONGER;	794	return f & LINE_LONGER;
710	}	795	}
711		796
…		…
775	// that are not representable in unicode, as well as characters	860	// that are not representable in unicode, as well as characters
776	// not fitting in the BMP.	861	// not fitting in the BMP.
777	struct compose_char	862	struct compose_char
778	{	863	{
779	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
780	compose_char (unicode_t c1, unicode_t c2)	868	compose_char (unicode_t c1, unicode_t c2)
781	: c1(c1), c2(c2)	869	: c1(c1), c2(c2)
782	{ }	870	{ }
783	};	871	};
784		872
…		…
978	scrollBar_t scrollBar;	1066	scrollBar_t scrollBar;
979	uint8_t options[(Opt_count + 7) >> 3];	1067	uint8_t options[(Opt_count + 7) >> 3];
980	XSizeHints szHint;	1068	XSizeHints szHint;
981	rxvt_color *pix_colors;	1069	rxvt_color *pix_colors;
982	Cursor TermWin_cursor; /* cursor for vt window */	1070	Cursor TermWin_cursor; /* cursor for vt window */
		1071
983	line_t *row_buf; // all lines, scrollback + terminal, circular	1072	line_t *row_buf; // all lines, scrollback + terminal, circular
984	line_t *drawn_buf; // text on screen	1073	line_t *drawn_buf; // text on screen
985	line_t *swap_buf; // lines for swap buffer	1074	line_t *swap_buf; // lines for swap buffer
986	char tabs; / per location: 1 == tab-stop */	1075	char tabs; / per location: 1 == tab-stop */
987	screen_t screen;	1076	screen_t screen;
…		…
1088	#ifdef HAVE_BG_PIXMAP	1177	#ifdef HAVE_BG_PIXMAP
1089	void bg_init ();	1178	void bg_init ();
1090	void bg_destroy ();	1179	void bg_destroy ();
1091		1180
1092	enum {	1181	enum {
1093	//subset returned by make_transparency_pixmap
1094	BG_IS_VALID = 1 << 0,	1182	BG_IS_VALID = 1 << 0,
1095	BG_NEEDS_TINT = 1 << 1,
1096	BG_NEEDS_BLUR = 1 << 2,
1097		1183
1098	BG_EFFECTS_FLAGS = BG_NEEDS_TINT \| BG_NEEDS_BLUR,
1099
1100	BG_KEEP_ASPECT = 1 << 3,
1101	BG_ROOT_ALIGN = 1 << 4,
1102	BG_TILE = 1 << 14,
1103	BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT \| BG_ROOT_ALIGN \| BG_TILE,
1104
1105	BG_TINT_SET = 1 << 5,
1106	BG_TINT_BITAND = 1 << 6,
1107	BG_TINT_FLAGS = BG_NEEDS_TINT \| BG_TINT_BITAND,
1108
1109	BG_HAS_RENDER = 1 << 7,
1110	BG_HAS_RENDER_CONV = 1 << 8,
1111	BG_CLIENT_RENDER = 1 << 9,
1112
1113	BG_IS_TRANSPARENT = 1 << 10,	1184	BG_IS_TRANSPARENT = 1 << 1,
1114	BG_NEEDS_REFRESH = 1 << 11,	1185	BG_NEEDS_REFRESH = 1 << 2,
1115	BG_IS_SIZE_SENSITIVE = 1 << 12,	1186	BG_INHIBIT_RENDER = 1 << 3,
1116	BG_IS_FROM_FILE = 1 << 13,
1117	};	1187	};
1118		1188
1119	unsigned int bg_flags;	1189	uint8_t bg_flags;
1120		1190
1121	# ifdef BG_IMAGE_FROM_FILE	1191	# if BG_IMAGE_FROM_FILE
		1192	rxvt_image fimage;
1122	void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);	1193	void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1123	bool render_image (unsigned long tr_flags);	1194	bool render_image (rxvt_image &image);
		1195	# endif
1124		1196
1125	enum {	1197	# if ENABLE_TRANSPARENCY
1126	noScale = 0,	1198	rxvt_img *root_img;
1127	windowScale = 100,	1199	image_effects root_effects;
1128	defaultScale = windowScale,
1129	centerAlign = 50,
1130	defaultAlign = centerAlign,
1131	};
1132		1200
1133	unsigned int h_scale, v_scale; /* percents of the window size */	1201	void bg_set_transparent ()
1134	int h_align, v_align; /* percents of the window size:
1135	0 - left align, 50 - center, 100 - right */
1136
1137	bool bg_set_geometry (const char *geom, bool update = false);
1138	void bg_set_default_geometry ()
1139	{	1202	{
1140	h_scale = v_scale = defaultScale;	1203	bg_flags \|= BG_IS_TRANSPARENT;
1141	h_align = v_align = defaultAlign;
1142	}	1204	}
1143		1205	void bg_set_root_pixmap ();
1144	bool bg_set_file (const char *file);	1206	bool render_root_image ();
1145	# endif	1207	# endif
1146		1208
1147	# ifdef ENABLE_TRANSPARENCY	1209	void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1148	Pixmap root_pixmap; /* current root pixmap set */
1149	rxvt_color tint;
1150	int shade;
1151	int h_blurRadius, v_blurRadius;
1152
1153	bool bg_set_transparent ();
1154	void bg_set_root_pixmap ();
1155	void set_tint_shade_flags ();
1156	bool bg_set_tint (rxvt_color &new_tint);
1157	bool bg_set_shade (const char *shade_str);
1158	bool bg_set_blur (const char *geom);
1159
1160	bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1161	bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1162	void tint_ximage (Visual visual, XImage ximage);
1163	unsigned long make_transparency_pixmap ();
1164	# endif
1165		1210
1166	ev_tstamp bg_valid_since;	1211	ev_tstamp bg_valid_since;
1167		1212
1168	Pixmap bg_pixmap;	1213	rxvt_img *bg_img;
1169	unsigned int bg_pmap_width, bg_pmap_height;
1170		1214
1171	int target_x;
1172	int target_y;
1173	bool bg_set_position (int x, int y);
1174	bool bg_window_size_sensitive ();	1215	bool bg_window_size_sensitive ();
1175	bool bg_window_position_sensitive ();	1216	bool bg_window_position_sensitive ();
1176		1217
1177	bool bg_render ();	1218	void bg_render ();
1178	void bg_invalidate ()	1219	void bg_invalidate ()
1179	{	1220	{
1180	bg_flags &= ~BG_IS_VALID;	1221	bg_flags &= ~BG_IS_VALID;
1181	}	1222	}
1182	#endif
1183	#ifdef HAVE_AFTERIMAGE
1184	ASImage *original_asim;
1185	ASVisual *asv;
1186	ASImageManager *asimman;
1187
1188	void init_asv ()
1189	{
1190	if (!asv)
1191	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1192	}
1193	#endif
1194	#ifdef HAVE_PIXBUF
1195	GdkPixbuf *pixbuf;
1196	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1197	int src_x, int src_y, int dst_x, int dst_y,
1198	unsigned int width, unsigned int height);
1199	#endif	1223	#endif
1200		1224
1201	#if ENABLE_OVERLAY	1225	#if ENABLE_OVERLAY
1202	overlay_base ov;	1226	overlay_base ov;
1203		1227
…		…
1211	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;
1212	#endif	1236	#endif
1213		1237
1214	vector<void *> allocated; // free these memory blocks with free()	1238	vector<void *> allocated; // free these memory blocks with free()
1215		1239
		1240	int parent_x, parent_y; // parent window position relative to root, only updated on demand
		1241
1216	char *locale;	1242	char *locale;
1217	char charsets[4];	1243	char charsets[4];
1218	char v_buffer; / pointer to physical buffer */	1244	char v_buffer; / pointer to physical buffer */
1219	unsigned int v_buflen; /* size of area to write */	1245	unsigned int v_buflen; /* size of area to write */
1220	stringvec argv, envv; /* if != 0, will be freed at destroy time */	1246	stringvec argv, envv; /* if != 0, will be freed at destroy time */
…		…
1231	char cmdbuf_ptr, cmdbuf_endp;	1257	char cmdbuf_ptr, cmdbuf_endp;
1232	char cmdbuf_base[CBUFSIZ];	1258	char cmdbuf_base[CBUFSIZ];
1233		1259
1234	ptytty *pty;	1260	ptytty *pty;
1235		1261
1236	rxvt_salloc *talloc; // text line allocator	1262	// chunk contains all line_t's as well as rend_t and text_t buffers
1237	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;
1238		1266
1239	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
1240		1268
1241	#if ENABLE_FRILLS \|\| ISO_14755	1269	#if ENABLE_FRILLS \|\| ISO_14755
1242	// ISO 14755 entry support	1270	// ISO 14755 entry support
1243	unicode_t iso14755buf;	1271	unicode_t iso14755buf;
1244	void commit_iso14755 ();	1272	void commit_iso14755 ();
1245	# if ISO_14755	1273	# if ISO_14755
1246	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);
1247	void iso14755_54 (int x, int y);	1275	void iso14755_54 (int x, int y);
1248	# endif	1276	# endif
1249	#endif	1277	#endif
1250		1278
1251	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;
…		…
1279	void cmdbuf_append (const char *str, size_t count);	1307	void cmdbuf_append (const char *str, size_t count);
1280	bool pty_fill ();	1308	bool pty_fill ();
1281	void pty_cb (ev::io &w, int revents); ev::io pty_ev;	1309	void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1282		1310
1283	#ifdef CURSOR_BLINK	1311	#ifdef CURSOR_BLINK
		1312	void cursor_blink_reset ();
1284	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;	1313	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1285	#endif	1314	#endif
1286	#ifdef TEXT_BLINK	1315	#ifdef TEXT_BLINK
1287	void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;	1316	void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1288	#endif	1317	#endif
…		…
1411	char *get_colorfgbg ();	1440	char *get_colorfgbg ();
1412	bool set_color (rxvt_color &color, const char *name);	1441	bool set_color (rxvt_color &color, const char *name);
1413	void alias_color (int dst, int src);	1442	void alias_color (int dst, int src);
1414	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1443	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1415	void get_window_origin (int &x, int &y);	1444	void get_window_origin (int &x, int &y);
1416	Pixmap get_pixmap_property (Atom property);
1417		1445
1418	// screen.C	1446	// screen.C
1419		1447
1420	void lalloc (line_t &l) const	1448	bool option (uint8_t opt) const NOTHROW
1421	{	1449	{
1422	l.t = (text_t *)talloc->alloc ();	1450	return options[opt >> 3] & (1 << (opt & 7));
1423	l.r = (rend_t *)ralloc->alloc ();
1424	}	1451	}
1425		1452
1426	#if 0	1453	void set_option (uint8_t opt, bool set = true) NOTHROW;
1427	void lfree (line_t &l)
1428	{
1429	talloc->free (l.t);
1430	ralloc->free (l.r);
1431	}
1432	#endif
1433
1434	void lresize (line_t &l) const
1435	{
1436	if (!l.t)
1437	return;
1438
1439	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
1440	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
1441
1442	l.l = min (l.l, ncol);
1443
1444	if (ncol > prev_ncol)
1445	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1446	}
1447		1454
1448	int fgcolor_of (rend_t r) const NOTHROW	1455	int fgcolor_of (rend_t r) const NOTHROW
1449	{	1456	{
1450	int base = GET_BASEFG (r);	1457	int base = GET_BASEFG (r);
1451	#ifndef NO_BRIGHTCOLOR	1458	#ifndef NO_BRIGHTCOLOR
…		…
1471	base += minBrightCOLOR - minCOLOR;	1478	base += minBrightCOLOR - minCOLOR;
1472	#endif	1479	#endif
1473	return base;	1480	return base;
1474	}	1481	}
1475		1482
1476	bool option (uint8_t opt) const NOTHROW
1477	{
1478	return options[opt >> 3] & (1 << (opt & 7));
1479	}
1480
1481	void set_option (uint8_t opt, bool set = true) NOTHROW;
1482
1483	// modifies first argument(!)	1483	// modifies first argument(!)
1484	void tt_paste (char *data, unsigned int len) NOTHROW;	1484	void tt_paste (char *data, unsigned int len) NOTHROW;
1485	void paste (char *data, unsigned int len) NOTHROW;	1485	void paste (char *data, unsigned int len) NOTHROW;
		1486	void scr_alloc () NOTHROW;
1486	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;
1487	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;
1488	void scr_kill_char (line_t &l, int col) const NOTHROW;	1489	void scr_kill_char (line_t &l, int col) const NOTHROW;
1489	int scr_scroll_text (int row1, int row2, int count) NOTHROW;	1490	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1490	void scr_reset ();	1491	void scr_reset ();
…		…
1557	void selection_click (int clicks, int x, int y) NOTHROW;	1558	void selection_click (int clicks, int x, int y) NOTHROW;
1558	void selection_extend (int x, int y, int flag) NOTHROW;	1559	void selection_extend (int x, int y, int flag) NOTHROW;
1559	void selection_rotate (int x, int y) NOTHROW;	1560	void selection_rotate (int x, int y) NOTHROW;
1560		1561
1561	// xdefaults.C	1562	// xdefaults.C
		1563	void rxvt_usage (int type);
1562	const char *get_options (int argc, const char const *argv);	1564	const char *get_options (int argc, const char const *argv);
1563	int parse_keysym (const char str, const char arg);	1565	int parse_keysym (const char str, const char arg);
1564	const char x_resource (const char name);	1566	const char x_resource (const char name);
1565	void extract_resources ();	1567	void extract_resources ();
1566	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.467 by root, Thu Jan 19 17:10:51 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.467 by root, Thu Jan 19 17:10:51 2012 UTC vs.
Revision 1.510 by root, Fri Nov 30 07:02:12 2012 UTC