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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.471 by sf-exg, Wed Apr 11 10:20:00 2012 UTC vs.
Revision 1.511 by sf-exg, Sat Dec 29 14:23:35 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 XRENDER && (HAVE_PIXBUF \|\| ENABLE_TRANSPARENCY)
80	# define HAVE_BG_PIXMAP 1	81	# define HAVE_BG_PIXMAP 1
81	#endif	82	#endif
82		83
		84	#if HAVE_BG_PIXMAP
		85	# if HAVE_PIXBUF
		86	# define BG_IMAGE_FROM_FILE 1
		87	# endif
		88	# if ENABLE_TRANSPARENCY
		89	# define BG_IMAGE_FROM_ROOT 1
		90	# endif
		91	#endif
		92
		93	#include <ecb.h>
83	#include "encoding.h"	94	#include "encoding.h"
84	#include "rxvtutil.h"	95	#include "rxvtutil.h"
85	#include "rxvtfont.h"	96	#include "rxvtfont.h"
86	#include "rxvttoolkit.h"	97	#include "rxvttoolkit.h"
		98	#include "rxvtimg.h"
87	#include "scrollbar.h"	99	#include "scrollbar.h"
88	#include "ev_cpp.h"	100	#include "ev_cpp.h"
89	#include "salloc.h"
90	#include "libptytty.h"	101	#include "libptytty.h"
91		102
92	#include "rxvtperl.h"	103	#include "rxvtperl.h"
93		104
94	// try to avoid some macros to decrease code size, on some systems	105	// try to avoid some macros to decrease code size, on some systems
…		…
147		158
148	const char * rxvt_basename (const char *str) NOTHROW;	159	const char * rxvt_basename (const char *str) NOTHROW;
149	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	160	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
150	void rxvt_log (const char *fmt,...) NOTHROW;	161	void rxvt_log (const char *fmt,...) NOTHROW;
151	void rxvt_warn (const char *fmt,...) NOTHROW;	162	void rxvt_warn (const char *fmt,...) NOTHROW;
152	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;	163	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;	164	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
154		165
155	char * rxvt_strtrim (char *str) NOTHROW;	166	char * rxvt_strtrim (char *str) NOTHROW;
156	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;	167	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
157		168
158	static inline void	169	static inline void
…		…
207	~localise_env ()	218	~localise_env ()
208	{	219	{
209	environ = orig_env;	220	environ = orig_env;
210	}	221	}
211	};	222	};
		223
		224	#ifdef HAVE_BG_PIXMAP
		225	struct image_effects
		226	{
		227	bool tint_set;
		228	rxvt_color tint;
		229	int shade;
		230	int h_blurRadius, v_blurRadius;
		231
		232	image_effects ()
		233	{
		234	tint_set =
		235	h_blurRadius =
		236	v_blurRadius = 0;
		237	shade = 100;
		238	}
		239
		240	bool need_tint ()
		241	{
		242	return shade != 100 \|\| tint_set;
		243	}
		244
		245	bool need_blur ()
		246	{
		247	return h_blurRadius && v_blurRadius;
		248	}
		249
		250	bool set_tint (const rxvt_color &new_tint);
		251	bool set_shade (const char *shade_str);
		252	bool set_blur (const char *geom);
		253	};
		254
		255	# if BG_IMAGE_FROM_FILE
		256	enum {
		257	IM_IS_SIZE_SENSITIVE = 1 << 1,
		258	IM_KEEP_ASPECT = 1 << 2,
		259	IM_ROOT_ALIGN = 1 << 3,
		260	IM_TILE = 1 << 4,
		261	IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT \| IM_ROOT_ALIGN \| IM_TILE,
		262	};
		263
		264	enum {
		265	noScale = 0,
		266	windowScale = 100,
		267	defaultScale = windowScale,
		268	centerAlign = 50,
		269	defaultAlign = centerAlign,
		270	};
		271
		272	struct rxvt_image : image_effects
		273	{
		274	unsigned short alpha;
		275	uint8_t flags;
		276	unsigned int h_scale, v_scale; /* percents of the window size */
		277	int h_align, v_align; /* percents of the window size:
		278	0 - left align, 50 - center, 100 - right */
		279
		280	bool is_size_sensitive ()
		281	{
		282	return (!(flags & IM_TILE)
		283	\|\| h_scale \|\| v_scale
		284	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)));
		285	}
		286
		287	rxvt_img *img;
		288
		289	void destroy ()
		290	{
		291	delete img;
		292	img = 0;
		293	}
		294
		295	rxvt_image ();
		296	void set_file_geometry (rxvt_screen s, const char file);
		297	void set_file (rxvt_screen s, const char file);
		298	bool set_geometry (const char *geom, bool update = false);
		299	};
		300	# endif
		301	#endif
212		302
213	/*	303	/*
214	*****************************************************************************	304	*****************************************************************************
215	* STRUCTURES AND TYPEDEFS	305	* STRUCTURES AND TYPEDEFS
216	*****************************************************************************	306	*****************************************************************************
…		…
259	*****************************************************************************	349	*****************************************************************************
260	*/	350	*/
261		351
262	/* COLORTERM, TERM environment variables */	352	/* COLORTERM, TERM environment variables */
263	#define COLORTERMENV "rxvt"	353	#define COLORTERMENV "rxvt"
264	#ifdef BG_IMAGE_FROM_FILE	354	#if BG_IMAGE_FROM_FILE
265	# define COLORTERMENVFULL COLORTERMENV "-xpm"	355	# define COLORTERMENVFULL COLORTERMENV "-xpm"
266	#else	356	#else
267	# define COLORTERMENVFULL COLORTERMENV	357	# define COLORTERMENVFULL COLORTERMENV
268	#endif	358	#endif
269	#ifndef TERMENV	359	#ifndef TERMENV
…		…
499	#endif	589	#endif
500	Color_scroll,	590	Color_scroll,
501	#ifdef RXVT_SCROLLBAR	591	#ifdef RXVT_SCROLLBAR
502	Color_trough,	592	Color_trough,
503	#endif	593	#endif
504	#if ENABLE_TRANSPARENCY	594	#if BG_IMAGE_FROM_ROOT
505	Color_tint,	595	Color_tint,
506	#endif	596	#endif
507	#if OFF_FOCUS_FADING	597	#if OFF_FOCUS_FADING
508	Color_fade,	598	Color_fade,
509	#endif	599	#endif
…		…
696	text_t *t; // terminal the text	786	text_t *t; // terminal the text
697	rend_t *r; // rendition, uses RS_ flags	787	rend_t *r; // rendition, uses RS_ flags
698	tlen_t_ l; // length of each text line	788	tlen_t_ l; // length of each text line
699	uint32_t f; // flags	789	uint32_t f; // flags
700		790
		791	bool valid ()
		792	{
		793	return l >= 0;
		794	}
		795
		796	void alloc ()
		797	{
		798	l = 0;
		799	}
		800
701	bool is_longer ()	801	bool is_longer ()
702	{	802	{
703	return f & LINE_LONGER;	803	return f & LINE_LONGER;
704	}	804	}
705		805
…		…
769	// that are not representable in unicode, as well as characters	869	// that are not representable in unicode, as well as characters
770	// not fitting in the BMP.	870	// not fitting in the BMP.
771	struct compose_char	871	struct compose_char
772	{	872	{
773	unicode_t c1, c2; // any chars != NOCHAR are valid	873	unicode_t c1, c2; // any chars != NOCHAR are valid
		874	#if __cplusplus >= 201103L \|\| ECB_GCC_VERSION(4,4)
		875	compose_char () = default;
		876	#endif
774	compose_char (unicode_t c1, unicode_t c2)	877	compose_char (unicode_t c1, unicode_t c2)
775	: c1(c1), c2(c2)	878	: c1(c1), c2(c2)
776	{ }	879	{ }
777	};	880	};
778		881
…		…
972	scrollBar_t scrollBar;	1075	scrollBar_t scrollBar;
973	uint8_t options[(Opt_count + 7) >> 3];	1076	uint8_t options[(Opt_count + 7) >> 3];
974	XSizeHints szHint;	1077	XSizeHints szHint;
975	rxvt_color *pix_colors;	1078	rxvt_color *pix_colors;
976	Cursor TermWin_cursor; /* cursor for vt window */	1079	Cursor TermWin_cursor; /* cursor for vt window */
		1080
977	line_t *row_buf; // all lines, scrollback + terminal, circular	1081	line_t *row_buf; // all lines, scrollback + terminal, circular
978	line_t *drawn_buf; // text on screen	1082	line_t *drawn_buf; // text on screen
979	line_t *swap_buf; // lines for swap buffer	1083	line_t *swap_buf; // lines for swap buffer
980	char tabs; / per location: 1 == tab-stop */	1084	char tabs; / per location: 1 == tab-stop */
981	screen_t screen;	1085	screen_t screen;
…		…
1082	#ifdef HAVE_BG_PIXMAP	1186	#ifdef HAVE_BG_PIXMAP
1083	void bg_init ();	1187	void bg_init ();
1084	void bg_destroy ();	1188	void bg_destroy ();
1085		1189
1086	enum {	1190	enum {
1087	BG_IS_VALID = 1 << 0,	1191	BG_IS_VALID = 1 << 0,
1088	BG_NEEDS_TINT = 1 << 1,
1089	BG_NEEDS_BLUR = 1 << 2,
1090		1192
1091	BG_EFFECTS_FLAGS = BG_NEEDS_TINT \| BG_NEEDS_BLUR,
1092
1093	BG_KEEP_ASPECT = 1 << 3,
1094	BG_ROOT_ALIGN = 1 << 4,
1095	BG_TILE = 1 << 14,
1096	BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT \| BG_ROOT_ALIGN \| BG_TILE,
1097
1098	BG_TINT_SET = 1 << 5,
1099	BG_TINT_BITAND = 1 << 6,
1100
1101	BG_HAS_RENDER = 1 << 7,
1102	BG_HAS_RENDER_CONV = 1 << 8,
1103	BG_CLIENT_RENDER = 1 << 9,
1104
1105	BG_IS_TRANSPARENT = 1 << 10,	1193	BG_IS_TRANSPARENT = 1 << 1,
1106	BG_NEEDS_REFRESH = 1 << 11,	1194	BG_NEEDS_REFRESH = 1 << 2,
1107	BG_IS_SIZE_SENSITIVE = 1 << 12,	1195	BG_INHIBIT_RENDER = 1 << 3,
1108	BG_IS_FROM_FILE = 1 << 13,
1109	};	1196	};
1110		1197
1111	unsigned int bg_flags;	1198	uint8_t bg_flags;
1112		1199
1113	# ifdef BG_IMAGE_FROM_FILE	1200	# if BG_IMAGE_FROM_FILE
		1201	rxvt_image fimage;
1114	void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);	1202	void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1115	bool render_image (bool transparent);	1203	bool render_image (rxvt_image &image);
		1204	# endif
1116		1205
1117	enum {	1206	# if BG_IMAGE_FROM_ROOT
1118	noScale = 0,	1207	rxvt_img *root_img;
1119	windowScale = 100,	1208	image_effects root_effects;
1120	defaultScale = windowScale,
1121	centerAlign = 50,
1122	defaultAlign = centerAlign,
1123	};
1124		1209
1125	unsigned int h_scale, v_scale; /* percents of the window size */	1210	void bg_set_transparent ()
1126	int h_align, v_align; /* percents of the window size:
1127	0 - left align, 50 - center, 100 - right */
1128
1129	bool bg_set_geometry (const char *geom, bool update = false);
1130	void bg_set_default_geometry ()
1131	{	1211	{
1132	h_scale = v_scale = defaultScale;	1212	bg_flags \|= BG_IS_TRANSPARENT;
1133	h_align = v_align = defaultAlign;
1134	}	1213	}
1135		1214	void bg_set_root_pixmap ();
1136	bool bg_set_file (const char *file);	1215	bool render_root_image ();
1137	# endif	1216	# endif
1138		1217
1139	# ifdef ENABLE_TRANSPARENCY	1218	void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1140	Pixmap root_pixmap; /* current root pixmap set */
1141	rxvt_color tint;
1142	int shade;
1143	int h_blurRadius, v_blurRadius;
1144
1145	bool bg_set_transparent ();
1146	void bg_set_root_pixmap ();
1147	void set_tint_shade_flags ();
1148	bool bg_set_tint (rxvt_color &new_tint);
1149	bool bg_set_shade (const char *shade_str);
1150	bool bg_set_blur (const char *geom);
1151
1152	bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1153	bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1154	void tint_ximage (Visual visual, XImage ximage);
1155	bool make_transparency_pixmap ();
1156	# endif
1157		1219
1158	ev_tstamp bg_valid_since;	1220	ev_tstamp bg_valid_since;
1159		1221
1160	Pixmap bg_pixmap;	1222	rxvt_img *bg_img;
1161	unsigned int bg_pmap_width, bg_pmap_height;
1162		1223
1163	int target_x;
1164	int target_y;
1165	bool bg_set_position (int x, int y);
1166	bool bg_window_size_sensitive ();	1224	bool bg_window_size_sensitive ();
1167	bool bg_window_position_sensitive ();	1225	bool bg_window_position_sensitive ();
1168		1226
1169	bool bg_render ();	1227	void bg_render ();
1170	void bg_invalidate ()	1228	void bg_invalidate ()
1171	{	1229	{
1172	bg_flags &= ~BG_IS_VALID;	1230	bg_flags &= ~BG_IS_VALID;
1173	}	1231	}
1174	#endif
1175	#ifdef HAVE_PIXBUF
1176	GdkPixbuf *pixbuf;
1177	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1178	int src_x, int src_y, int dst_x, int dst_y,
1179	unsigned int width, unsigned int height);
1180	#endif	1232	#endif
1181		1233
1182	#if ENABLE_OVERLAY	1234	#if ENABLE_OVERLAY
1183	overlay_base ov;	1235	overlay_base ov;
1184		1236
…		…
1192	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;	1244	void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1193	#endif	1245	#endif
1194		1246
1195	vector<void *> allocated; // free these memory blocks with free()	1247	vector<void *> allocated; // free these memory blocks with free()
1196		1248
		1249	int parent_x, parent_y; // parent window position relative to root, only updated on demand
		1250
1197	char *locale;	1251	char *locale;
1198	char charsets[4];	1252	char charsets[4];
1199	char v_buffer; / pointer to physical buffer */	1253	char v_buffer; / pointer to physical buffer */
1200	unsigned int v_buflen; /* size of area to write */	1254	unsigned int v_buflen; /* size of area to write */
1201	stringvec argv, envv; /* if != 0, will be freed at destroy time */	1255	stringvec argv, envv; /* if != 0, will be freed at destroy time */
…		…
1212	char cmdbuf_ptr, cmdbuf_endp;	1266	char cmdbuf_ptr, cmdbuf_endp;
1213	char cmdbuf_base[CBUFSIZ];	1267	char cmdbuf_base[CBUFSIZ];
1214		1268
1215	ptytty *pty;	1269	ptytty *pty;
1216		1270
1217	rxvt_salloc *talloc; // text line allocator	1271	// chunk contains all line_t's as well as rend_t and text_t buffers
1218	rxvt_salloc *ralloc; // rend line allocator	1272	// for drawn_buf, swap_buf and row_buf, in this order
		1273	void *chunk;
		1274	size_t chunk_size;
1219		1275
1220	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1276	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1221		1277
1222	#if ENABLE_FRILLS \|\| ISO_14755	1278	#if ENABLE_FRILLS \|\| ISO_14755
1223	// ISO 14755 entry support	1279	// ISO 14755 entry support
1224	unicode_t iso14755buf;	1280	unicode_t iso14755buf;
1225	void commit_iso14755 ();	1281	void commit_iso14755 ();
1226	# if ISO_14755	1282	# if ISO_14755
1227	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);	1283	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1228	void iso14755_54 (int x, int y);	1284	void iso14755_54 (int x, int y);
1229	# endif	1285	# endif
1230	#endif	1286	#endif
1231		1287
1232	long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;	1288	long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
…		…
1234	void vt_select_input () const NOTHROW	1290	void vt_select_input () const NOTHROW
1235	{	1291	{
1236	XSelectInput (dpy, vt, vt_emask \| vt_emask_perl \| vt_emask_xim \| vt_emask_mouse);	1292	XSelectInput (dpy, vt, vt_emask \| vt_emask_perl \| vt_emask_xim \| vt_emask_mouse);
1237	}	1293	}
1238		1294
1239	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1295	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1240	void rootwin_cb (XEvent &xev);	1296	void rootwin_cb (XEvent &xev);
1241	xevent_watcher rootwin_ev;	1297	xevent_watcher rootwin_ev;
1242	#endif	1298	#endif
1243	#ifdef HAVE_BG_PIXMAP	1299	#ifdef HAVE_BG_PIXMAP
1244	void update_background ();	1300	void update_background ();
…		…
1393	char *get_colorfgbg ();	1449	char *get_colorfgbg ();
1394	bool set_color (rxvt_color &color, const char *name);	1450	bool set_color (rxvt_color &color, const char *name);
1395	void alias_color (int dst, int src);	1451	void alias_color (int dst, int src);
1396	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1452	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1397	void get_window_origin (int &x, int &y);	1453	void get_window_origin (int &x, int &y);
1398	Pixmap get_pixmap_property (Atom property);
1399		1454
1400	// screen.C	1455	// screen.C
1401		1456
1402	void lalloc (line_t &l) const	1457	bool option (uint8_t opt) const NOTHROW
1403	{	1458	{
1404	l.t = (text_t *)talloc->alloc ();	1459	return options[opt >> 3] & (1 << (opt & 7));
1405	l.r = (rend_t *)ralloc->alloc ();
1406	}	1460	}
1407		1461
1408	#if 0	1462	void set_option (uint8_t opt, bool set = true) NOTHROW;
1409	void lfree (line_t &l)
1410	{
1411	talloc->free (l.t);
1412	ralloc->free (l.r);
1413	}
1414	#endif
1415
1416	void lresize (line_t &l) const
1417	{
1418	if (!l.t)
1419	return;
1420
1421	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
1422	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
1423
1424	l.l = min (l.l, ncol);
1425
1426	if (ncol > prev_ncol)
1427	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1428	}
1429		1463
1430	int fgcolor_of (rend_t r) const NOTHROW	1464	int fgcolor_of (rend_t r) const NOTHROW
1431	{	1465	{
1432	int base = GET_BASEFG (r);	1466	int base = GET_BASEFG (r);
1433	#ifndef NO_BRIGHTCOLOR	1467	#ifndef NO_BRIGHTCOLOR
…		…
1453	base += minBrightCOLOR - minCOLOR;	1487	base += minBrightCOLOR - minCOLOR;
1454	#endif	1488	#endif
1455	return base;	1489	return base;
1456	}	1490	}
1457		1491
1458	bool option (uint8_t opt) const NOTHROW
1459	{
1460	return options[opt >> 3] & (1 << (opt & 7));
1461	}
1462
1463	void set_option (uint8_t opt, bool set = true) NOTHROW;
1464
1465	// modifies first argument(!)	1492	// modifies first argument(!)
1466	void tt_paste (char *data, unsigned int len) NOTHROW;	1493	void tt_paste (char *data, unsigned int len) NOTHROW;
1467	void paste (char *data, unsigned int len) NOTHROW;	1494	void paste (char *data, unsigned int len) NOTHROW;
		1495	void scr_alloc () NOTHROW;
1468	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;	1496	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1469	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;	1497	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1470	void scr_kill_char (line_t &l, int col) const NOTHROW;	1498	void scr_kill_char (line_t &l, int col) const NOTHROW;
1471	int scr_scroll_text (int row1, int row2, int count) NOTHROW;	1499	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1472	void scr_reset ();	1500	void scr_reset ();
…		…
1539	void selection_click (int clicks, int x, int y) NOTHROW;	1567	void selection_click (int clicks, int x, int y) NOTHROW;
1540	void selection_extend (int x, int y, int flag) NOTHROW;	1568	void selection_extend (int x, int y, int flag) NOTHROW;
1541	void selection_rotate (int x, int y) NOTHROW;	1569	void selection_rotate (int x, int y) NOTHROW;
1542		1570
1543	// xdefaults.C	1571	// xdefaults.C
		1572	void rxvt_usage (int type);
1544	const char *get_options (int argc, const char const *argv);	1573	const char *get_options (int argc, const char const *argv);
1545	int parse_keysym (const char str, const char arg);	1574	int parse_keysym (const char str, const char arg);
1546	const char x_resource (const char name);	1575	const char x_resource (const char name);
1547	void extract_resources ();	1576	void extract_resources ();
1548	void extract_keysym_resources ();	1577	void extract_keysym_resources ();

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.471 by sf-exg, Wed Apr 11 10:20:00 2012 UTC vs. Revision 1.511 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.471 by sf-exg, Wed Apr 11 10:20:00 2012 UTC vs.
Revision 1.511 by sf-exg, Sat Dec 29 14:23:35 2012 UTC