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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.466 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.523 by root, Wed Mar 27 17:24:16 2013 UTC

…		…
24	# include <wchar.h>	24	# include <wchar.h>
25	#else	25	#else
26	// stdlib.h might provide it	26	// stdlib.h might provide it
27	#endif	27	#endif
28		28
29	using namespace std;
30
31	// 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...
32		30
33	extern "C" {	31	extern "C" {
34	#include <X11/Xlib.h>	32	#include <X11/Xlib.h>
35	#include <X11/Xutil.h>	33	#include <X11/Xutil.h>
…		…
47		45
48	#include "feature.h"	46	#include "feature.h"
49		47
50	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)	48	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
51	# define ENABLE_OVERLAY 1	49	# define ENABLE_OVERLAY 1
		50	# undef NO_RESOURCES
52	#endif	51	#endif
53		52
54	#if ENABLE_PERL	53	#if ENABLE_PERL
55	# define ENABLE_FRILLS 1	54	# define ENABLE_FRILLS 1
56	# define ENABLE_COMBINING 1	55	# define ENABLE_COMBINING 1
…		…
72	#include <X11/cursorfont.h>	71	#include <X11/cursorfont.h>
73	#include <X11/keysym.h>	72	#include <X11/keysym.h>
74	#include <X11/keysymdef.h>	73	#include <X11/keysymdef.h>
75	#include <X11/Xatom.h>	74	#include <X11/Xatom.h>
76		75
77	#ifdef HAVE_AFTERIMAGE
78	# include <afterimage.h>
79	# undef min
80	# undef max
81	#endif
82
83	#ifdef HAVE_PIXBUF	76	#if HAVE_PIXBUF
84	# include <gdk-pixbuf/gdk-pixbuf.h>	77	# include <gdk-pixbuf/gdk-pixbuf.h>
85	#endif	78	#endif
86		79
87	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)	80	#if XRENDER && (HAVE_PIXBUF \|\| ENABLE_TRANSPARENCY)
88	# define HAVE_BG_PIXMAP 1	81	# define HAVE_BG_PIXMAP 1
89	#endif	82	#endif
90		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>
91	#include "encoding.h"	94	#include "encoding.h"
92	#include "rxvtutil.h"	95	#include "rxvtutil.h"
93	#include "rxvtfont.h"	96	#include "rxvtfont.h"
94	#include "rxvttoolkit.h"	97	#include "rxvttoolkit.h"
		98	#include "rxvtimg.h"
95	#include "scrollbar.h"	99	#include "scrollbar.h"
96	#include "ev_cpp.h"	100	#include "ev_cpp.h"
97	#include "salloc.h"
98	#include "libptytty.h"	101	#include "libptytty.h"
99		102
100	#include "rxvtperl.h"	103	#include "rxvtperl.h"
101		104
102	// 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
…		…
155		158
156	const char * rxvt_basename (const char *str) NOTHROW;	159	const char * rxvt_basename (const char *str) NOTHROW;
157	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	160	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158	void rxvt_log (const char *fmt,...) NOTHROW;	161	void rxvt_log (const char *fmt,...) NOTHROW;
159	void rxvt_warn (const char *fmt,...) NOTHROW;	162	void rxvt_warn (const char *fmt,...) NOTHROW;
160	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;
161	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;
162		165
163	char * rxvt_strtrim (char *str) NOTHROW;	166	char * rxvt_strtrim (char *str) NOTHROW;
164	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;	167	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
165		168
166	static inline void	169	static inline void
…		…
215	~localise_env ()	218	~localise_env ()
216	{	219	{
217	environ = orig_env;	220	environ = orig_env;
218	}	221	}
219	};	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
220		302
221	/*	303	/*
222	*****************************************************************************	304	*****************************************************************************
223	* STRUCTURES AND TYPEDEFS	305	* STRUCTURES AND TYPEDEFS
224	*****************************************************************************	306	*****************************************************************************
…		…
267	*****************************************************************************	349	*****************************************************************************
268	*/	350	*/
269		351
270	/* COLORTERM, TERM environment variables */	352	/* COLORTERM, TERM environment variables */
271	#define COLORTERMENV "rxvt"	353	#define COLORTERMENV "rxvt"
272	#ifdef BG_IMAGE_FROM_FILE	354	#if BG_IMAGE_FROM_FILE
273	# define COLORTERMENVFULL COLORTERMENV "-xpm"	355	# define COLORTERMENVFULL COLORTERMENV "-xpm"
274	#else	356	#else
275	# define COLORTERMENVFULL COLORTERMENV	357	# define COLORTERMENVFULL COLORTERMENV
276	#endif	358	#endif
277	#ifndef TERMENV	359	#ifndef TERMENV
…		…
318	ERASE = +2,	400	ERASE = +2,
319	};	401	};
320		402
321	/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */	403	/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
322	enum page_dirn {	404	enum page_dirn {
323	UP,	405	DN = -1,
324	DN,
325	NO_DIR,	406	NO_DIR = 0,
		407	UP = 1,
326	};	408	};
327		409
328	/* arguments for rxvt_term::scr_change_screen () */	410	/* arguments for rxvt_term::scr_change_screen () */
329	enum {	411	enum {
330	PRIMARY = 0,	412	PRIMARY = 0,
…		…
507	#endif	589	#endif
508	Color_scroll,	590	Color_scroll,
509	#ifdef RXVT_SCROLLBAR	591	#ifdef RXVT_SCROLLBAR
510	Color_trough,	592	Color_trough,
511	#endif	593	#endif
512	#if ENABLE_TRANSPARENCY	594	#if BG_IMAGE_FROM_ROOT
513	Color_tint,	595	Color_tint,
514	#endif	596	#endif
515	#if OFF_FOCUS_FADING	597	#if OFF_FOCUS_FADING
516	Color_fade,	598	Color_fade,
517	#endif	599	#endif
…		…
704	text_t *t; // terminal the text	786	text_t *t; // terminal the text
705	rend_t *r; // rendition, uses RS_ flags	787	rend_t *r; // rendition, uses RS_ flags
706	tlen_t_ l; // length of each text line	788	tlen_t_ l; // length of each text line
707	uint32_t f; // flags	789	uint32_t f; // flags
708		790
		791	bool valid ()
		792	{
		793	return l >= 0;
		794	}
		795
		796	void alloc ()
		797	{
		798	l = 0;
		799	}
		800
709	bool is_longer ()	801	bool is_longer ()
710	{	802	{
711	return f & LINE_LONGER;	803	return f & LINE_LONGER;
712	}	804	}
713		805
…		…
777	// that are not representable in unicode, as well as characters	869	// that are not representable in unicode, as well as characters
778	// not fitting in the BMP.	870	// not fitting in the BMP.
779	struct compose_char	871	struct compose_char
780	{	872	{
781	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
782	compose_char (unicode_t c1, unicode_t c2)	877	compose_char (unicode_t c1, unicode_t c2)
783	: c1(c1), c2(c2)	878	: c1(c1), c2(c2)
784	{ }	879	{ }
785	};	880	};
786		881
…		…
980	scrollBar_t scrollBar;	1075	scrollBar_t scrollBar;
981	uint8_t options[(Opt_count + 7) >> 3];	1076	uint8_t options[(Opt_count + 7) >> 3];
982	XSizeHints szHint;	1077	XSizeHints szHint;
983	rxvt_color *pix_colors;	1078	rxvt_color *pix_colors;
984	Cursor TermWin_cursor; /* cursor for vt window */	1079	Cursor TermWin_cursor; /* cursor for vt window */
		1080
985	line_t *row_buf; // all lines, scrollback + terminal, circular	1081	line_t *row_buf; // all lines, scrollback + terminal, circular
986	line_t *drawn_buf; // text on screen	1082	line_t *drawn_buf; // text on screen
987	line_t *swap_buf; // lines for swap buffer	1083	line_t *swap_buf; // lines for swap buffer
988	char tabs; / per location: 1 == tab-stop */	1084	char tabs; / per location: 1 == tab-stop */
989	screen_t screen;	1085	screen_t screen;
…		…
1085	/* ---------- */	1181	/* ---------- */
1086	struct mouse_event MEvent;	1182	struct mouse_event MEvent;
1087	XComposeStatus compose;	1183	XComposeStatus compose;
1088	static struct termios def_tio;	1184	static struct termios def_tio;
1089	row_col_t oldcursor;	1185	row_col_t oldcursor;
		1186
1090	#ifdef HAVE_BG_PIXMAP	1187	#ifdef HAVE_BG_PIXMAP
1091	void bg_init ();	1188	void bg_init ();
1092	void bg_destroy ();	1189	void bg_destroy ();
1093		1190
1094	enum {
1095	//subset returned by make_transparency_pixmap
1096	BG_IS_VALID = 1 << 0,
1097	BG_NEEDS_TINT = 1 << 1,
1098	BG_NEEDS_BLUR = 1 << 2,
1099
1100	BG_EFFECTS_FLAGS = BG_NEEDS_TINT \| BG_NEEDS_BLUR,
1101
1102	BG_KEEP_ASPECT = 1 << 3,
1103	BG_ROOT_ALIGN = 1 << 4,
1104	BG_TILE = 1 << 14,
1105	BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT \| BG_ROOT_ALIGN \| BG_TILE,
1106
1107	BG_TINT_SET = 1 << 5,
1108	BG_TINT_BITAND = 1 << 6,
1109	BG_TINT_FLAGS = BG_NEEDS_TINT \| BG_TINT_BITAND,
1110
1111	BG_HAS_RENDER = 1 << 7,
1112	BG_HAS_RENDER_CONV = 1 << 8,
1113	BG_CLIENT_RENDER = 1 << 9,
1114
1115	BG_IS_TRANSPARENT = 1 << 10,
1116	BG_NEEDS_REFRESH = 1 << 11,
1117	BG_IS_SIZE_SENSITIVE = 1 << 12,
1118	BG_IS_FROM_FILE = 1 << 13,
1119	};
1120
1121	unsigned int bg_flags;
1122
1123	# ifdef BG_IMAGE_FROM_FILE	1191	# if BG_IMAGE_FROM_FILE
1124	void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);	1192	rxvt_image fimage;
1125	bool render_image (unsigned long tr_flags);	1193	void render_image (rxvt_image &image);
1126
1127	enum {
1128	noScale = 0,
1129	windowScale = 100,
1130	defaultScale = windowScale,
1131	centerAlign = 50,
1132	defaultAlign = centerAlign,
1133	};
1134
1135	unsigned int h_scale, v_scale; /* percents of the window size */
1136	int h_align, v_align; /* percents of the window size:
1137	0 - left align, 50 - center, 100 - right */
1138
1139	bool bg_set_geometry (const char *geom, bool update = false);
1140	void bg_set_default_geometry ()
1141	{
1142	h_scale = v_scale = defaultScale;
1143	h_align = v_align = defaultAlign;
1144	}
1145
1146	bool bg_set_file (const char *file);
1147	# endif	1194	# endif
1148		1195
1149	# ifdef ENABLE_TRANSPARENCY	1196	# if BG_IMAGE_FROM_ROOT
1150	Pixmap root_pixmap; /* current root pixmap set */	1197	rxvt_img *root_img;
1151	rxvt_color tint;	1198	image_effects root_effects;
1152	int shade;
1153	int h_blurRadius, v_blurRadius;
1154		1199
1155	bool bg_set_transparent ();	1200	void render_root_image ();
1156	void bg_set_root_pixmap ();
1157	void set_tint_shade_flags ();
1158	bool bg_set_tint (rxvt_color &new_tint);
1159	bool bg_set_shade (const char *shade_str);
1160	bool bg_set_blur (const char *geom);
1161
1162	bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1163	bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1164	void tint_ximage (Visual visual, XImage ximage);
1165	unsigned long make_transparency_pixmap ();
1166	# endif	1201	# endif
1167		1202
1168	ev_tstamp bg_valid_since;	1203	ev_tstamp bg_valid_since;
1169		1204
1170	Pixmap bg_pixmap;
1171	unsigned int bg_pmap_width, bg_pmap_height;
1172
1173	int target_x;
1174	int target_y;
1175	bool bg_set_position (int x, int y);
1176	bool bg_window_size_sensitive ();	1205	bool bg_window_size_sensitive ();
1177	bool bg_window_position_sensitive ();	1206	bool bg_window_position_sensitive ();
1178		1207
1179	bool bg_render ();	1208	void bg_render ();
1180	void bg_invalidate ()	1209	#endif
1181	{	1210
1182	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,
1183	}	1216	};
1184	#endif
1185	#ifdef HAVE_AFTERIMAGE
1186	ASImage *original_asim;
1187	ASVisual *asv;
1188	ASImageManager *asimman;
1189		1217
1190	void init_asv ()	1218	uint8_t bg_flags;
1191	{	1219
1192	if (!asv)	1220	rxvt_img *bg_img;
1193	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1194	}
1195	#endif
1196	#ifdef HAVE_PIXBUF
1197	GdkPixbuf *pixbuf;
1198	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1199	int src_x, int src_y, int dst_x, int dst_y,
1200	unsigned int width, unsigned int height);
1201	#endif	1221	#endif
1202		1222
1203	#if ENABLE_OVERLAY	1223	#if ENABLE_OVERLAY
1204	overlay_base ov;	1224	overlay_base ov;
1205		1225
…		…
1213	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;
1214	#endif	1234	#endif
1215		1235
1216	vector<void *> allocated; // free these memory blocks with free()	1236	vector<void *> allocated; // free these memory blocks with free()
1217		1237
		1238	int parent_x, parent_y; // parent window position relative to root, only updated on demand
		1239
1218	char *locale;	1240	char *locale;
1219	char charsets[4];	1241	char charsets[4];
1220	char v_buffer; / pointer to physical buffer */	1242	char v_buffer; / pointer to physical buffer */
1221	unsigned int v_buflen; /* size of area to write */	1243	unsigned int v_buflen; /* size of area to write */
1222	stringvec argv, envv; /* if != 0, will be freed at destroy time */	1244	stringvec argv, envv; /* if != 0, will be freed at destroy time */
…		…
1233	char cmdbuf_ptr, cmdbuf_endp;	1255	char cmdbuf_ptr, cmdbuf_endp;
1234	char cmdbuf_base[CBUFSIZ];	1256	char cmdbuf_base[CBUFSIZ];
1235		1257
1236	ptytty *pty;	1258	ptytty *pty;
1237		1259
1238	rxvt_salloc *talloc; // text line allocator	1260	// chunk contains all line_t's as well as rend_t and text_t buffers
1239	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;
1240		1264
1241	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
1242		1266
1243	#if ENABLE_FRILLS \|\| ISO_14755	1267	#if ENABLE_FRILLS \|\| ISO_14755
1244	// ISO 14755 entry support	1268	// ISO 14755 entry support
1245	unicode_t iso14755buf;	1269	unicode_t iso14755buf;
1246	void commit_iso14755 ();	1270	void commit_iso14755 ();
1247	# if ISO_14755	1271	# if ISO_14755
1248	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);
1249	void iso14755_54 (int x, int y);	1273	void iso14755_54 (int x, int y);
1250	# endif	1274	# endif
1251	#endif	1275	#endif
1252		1276
1253	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;
…		…
1255	void vt_select_input () const NOTHROW	1279	void vt_select_input () const NOTHROW
1256	{	1280	{
1257	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);
1258	}	1282	}
1259		1283
1260	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1284	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1261	void rootwin_cb (XEvent &xev);	1285	void rootwin_cb (XEvent &xev);
1262	xevent_watcher rootwin_ev;	1286	xevent_watcher rootwin_ev;
1263	#endif	1287	#endif
1264	#ifdef HAVE_BG_PIXMAP	1288	#ifdef HAVE_BG_PIXMAP
1265	void update_background ();	1289	void update_background ();
…		…
1281	void cmdbuf_append (const char *str, size_t count);	1305	void cmdbuf_append (const char *str, size_t count);
1282	bool pty_fill ();	1306	bool pty_fill ();
1283	void pty_cb (ev::io &w, int revents); ev::io pty_ev;	1307	void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1284		1308
1285	#ifdef CURSOR_BLINK	1309	#ifdef CURSOR_BLINK
		1310	void cursor_blink_reset ();
1286	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;	1311	void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1287	#endif	1312	#endif
1288	#ifdef TEXT_BLINK	1313	#ifdef TEXT_BLINK
1289	void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;	1314	void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1290	#endif	1315	#endif
…		…
1375	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);
1376	void process_xterm_seq (int op, char *str, char resp);	1401	void process_xterm_seq (int op, char *str, char resp);
1377	int privcases (int mode, unsigned long bit);	1402	int privcases (int mode, unsigned long bit);
1378	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);
1379	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);
1380	// init.C	1406	// init.C
1381	void init (stringvec argv, stringvec envv);	1407	void init (stringvec argv, stringvec envv);
1382	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);
1383	void init2 (int argc, const char const argv);	1409	void init2 (int argc, const char const argv);
1384	void init_vars ();	1410	void init_vars ();
…		…
1413	char *get_colorfgbg ();	1439	char *get_colorfgbg ();
1414	bool set_color (rxvt_color &color, const char *name);	1440	bool set_color (rxvt_color &color, const char *name);
1415	void alias_color (int dst, int src);	1441	void alias_color (int dst, int src);
1416	void set_widthheight (unsigned int newwidth, unsigned int newheight);	1442	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1417	void get_window_origin (int &x, int &y);	1443	void get_window_origin (int &x, int &y);
1418	Pixmap get_pixmap_property (Atom property);
1419		1444
1420	// screen.C	1445	// screen.C
1421		1446
1422	void lalloc (line_t &l) const	1447	bool option (uint8_t opt) const NOTHROW
1423	{	1448	{
1424	l.t = (text_t *)talloc->alloc ();	1449	return options[opt >> 3] & (1 << (opt & 7));
1425	l.r = (rend_t *)ralloc->alloc ();
1426	}	1450	}
1427		1451
1428	#if 0	1452	void set_option (uint8_t opt, bool set = true) NOTHROW;
1429	void lfree (line_t &l)
1430	{
1431	talloc->free (l.t);
1432	ralloc->free (l.r);
1433	}
1434	#endif
1435
1436	void lresize (line_t &l) const
1437	{
1438	if (!l.t)
1439	return;
1440
1441	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
1442	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
1443
1444	l.l = min (l.l, ncol);
1445
1446	if (ncol > prev_ncol)
1447	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1448	}
1449		1453
1450	int fgcolor_of (rend_t r) const NOTHROW	1454	int fgcolor_of (rend_t r) const NOTHROW
1451	{	1455	{
1452	int base = GET_BASEFG (r);	1456	int base = GET_BASEFG (r);
1453	#ifndef NO_BRIGHTCOLOR	1457	#ifndef NO_BRIGHTCOLOR
…		…
1473	base += minBrightCOLOR - minCOLOR;	1477	base += minBrightCOLOR - minCOLOR;
1474	#endif	1478	#endif
1475	return base;	1479	return base;
1476	}	1480	}
1477		1481
1478	bool option (uint8_t opt) const NOTHROW
1479	{
1480	return options[opt >> 3] & (1 << (opt & 7));
1481	}
1482
1483	void set_option (uint8_t opt, bool set = true) NOTHROW;
1484
1485	// modifies first argument(!)	1482	// modifies first argument(!)
1486	void tt_paste (char *data, unsigned int len) NOTHROW;	1483	void tt_paste (char *data, unsigned int len) NOTHROW;
1487	void paste (char *data, unsigned int len) NOTHROW;	1484	void paste (char *data, unsigned int len) NOTHROW;
		1485	void scr_alloc () NOTHROW;
1488	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;
1489	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;
1490	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);
1491	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);
1492	void scr_reset ();	1492	void scr_reset ();
1493	void scr_release () NOTHROW;	1493	void scr_release () NOTHROW;
1494	void scr_clear (bool really = false) NOTHROW;	1494	void scr_clear (bool really = false) NOTHROW;
1495	void scr_refresh () NOTHROW;	1495	void scr_refresh () NOTHROW;
1496	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;	1496	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
…		…
1535	void scr_report_position () NOTHROW;	1535	void scr_report_position () NOTHROW;
1536	void set_font_style () NOTHROW;	1536	void set_font_style () NOTHROW;
1537	void scr_charset_choose (int set) NOTHROW;	1537	void scr_charset_choose (int set) NOTHROW;
1538	void scr_charset_set (int set, unsigned int ch) NOTHROW;	1538	void scr_charset_set (int set, unsigned int ch) NOTHROW;
1539	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;
1540	bool scr_page (enum page_dirn direction, int nlines) NOTHROW;	1541	bool scr_page (enum page_dirn direction, int nlines) NOTHROW
		1542	{
		1543	scr_page (direction * nlines);
		1544	}
1541	bool scr_changeview (int new_view_start) NOTHROW;	1545	bool scr_changeview (int new_view_start) NOTHROW;
1542	void scr_bell () NOTHROW;	1546	void scr_bell () NOTHROW;
1543	void scr_printscreen (int fullhist) NOTHROW;	1547	void scr_printscreen (int fullhist) NOTHROW;
1544	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;
1545	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;
1546	void scr_reverse_selection () NOTHROW;	1550	void scr_reverse_selection () NOTHROW;
1547	void scr_dump (int fd) NOTHROW;	1551	void scr_dump (int fd) NOTHROW;
1548		1552
1549	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 */
1550	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;	1555	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1551	void selection_clear (bool clipboard = false) NOTHROW;	1556	void selection_clear (bool clipboard = false) NOTHROW;
1552	void selection_make (Time tm);	1557	void selection_make (Time tm);
1553	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;	1558	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1554	void selection_start_colrow (int col, int row) NOTHROW;	1559	void selection_start_colrow (int col, int row) NOTHROW;
…		…
1559	void selection_click (int clicks, int x, int y) NOTHROW;	1564	void selection_click (int clicks, int x, int y) NOTHROW;
1560	void selection_extend (int x, int y, int flag) NOTHROW;	1565	void selection_extend (int x, int y, int flag) NOTHROW;
1561	void selection_rotate (int x, int y) NOTHROW;	1566	void selection_rotate (int x, int y) NOTHROW;
1562		1567
1563	// xdefaults.C	1568	// xdefaults.C
		1569	void rxvt_usage (int type);
1564	const char *get_options (int argc, const char const *argv);	1570	const char *get_options (int argc, const char const *argv);
1565	int parse_keysym (const char str, const char arg);	1571	int parse_keysym (const char str, const char arg);
1566	const char x_resource (const char name);	1572	const char x_resource (const char name);
1567	void extract_resources ();	1573	void extract_resources ();
1568	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.466 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs. Revision 1.523 by root, Wed Mar 27 17:24:16 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.466 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.523 by root, Wed Mar 27 17:24:16 2013 UTC