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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.510 by root, Fri Nov 30 07:02:12 2012 UTC vs.
Revision 1.544 by sf-exg, Mon May 11 22:05:48 2015 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
51	#endif	50	#endif
52		51
53	#if ENABLE_PERL	52	#if ENABLE_PERL
54	# define ENABLE_FRILLS 1	53	# define ENABLE_FRILLS 1
55	# define ENABLE_COMBINING 1	54	# define ENABLE_COMBINING 1
…		…
75		74
76	#if HAVE_PIXBUF	75	#if HAVE_PIXBUF
77	# include <gdk-pixbuf/gdk-pixbuf.h>	76	# include <gdk-pixbuf/gdk-pixbuf.h>
78	#endif	77	#endif
79		78
80	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)	79	#if XRENDER && (HAVE_PIXBUF \|\| ENABLE_TRANSPARENCY)
81	# define HAVE_BG_PIXMAP 1	80	# define HAVE_BG_PIXMAP 1
		81	# define HAVE_IMG 1
		82	#endif
		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
82	#endif	91	#endif
83		92
84	#include <ecb.h>	93	#include <ecb.h>
85	#include "encoding.h"	94	#include "encoding.h"
86	#include "rxvtutil.h"	95	#include "rxvtutil.h"
…		…
90	#include "scrollbar.h"	99	#include "scrollbar.h"
91	#include "ev_cpp.h"	100	#include "ev_cpp.h"
92	#include "libptytty.h"	101	#include "libptytty.h"
93		102
94	#include "rxvtperl.h"	103	#include "rxvtperl.h"
		104
		105	// this must occur after the last (indirect) include of config.h,
		106	// otherwise it has no effect because config.h does not have include guards.
		107	#if defined (ISO_14755) \|\| defined(ENABLE_PERL) \|\| defined(KEYSYM_RESOURCE)
		108	# undef NO_RESOURCES
		109	#endif
95		110
96	// try to avoid some macros to decrease code size, on some systems	111	// try to avoid some macros to decrease code size, on some systems
97	#if ENABLE_MINIMAL	112	#if ENABLE_MINIMAL
98	# define strcmp(a,b) (strcmp)(a,b)	113	# define strcmp(a,b) (strcmp)(a,b)
99	# define strlen(a) (strlen)(a)	114	# define strlen(a) (strlen)(a)
…		…
149		164
150	const char * rxvt_basename (const char *str) NOTHROW;	165	const char * rxvt_basename (const char *str) NOTHROW;
151	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;	166	void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
152	void rxvt_log (const char *fmt,...) NOTHROW;	167	void rxvt_log (const char *fmt,...) NOTHROW;
153	void rxvt_warn (const char *fmt,...) NOTHROW;	168	void rxvt_warn (const char *fmt,...) NOTHROW;
		169	ecb_noreturn ecb_cold
154	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;	170	void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception));
		171	ecb_noreturn ecb_cold
155	void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;	172	void rxvt_exit_failure () THROW ((class rxvt_failure_exception));
156		173
		174	void * rxvt_malloc (size_t size);
		175	void * rxvt_calloc (size_t number, size_t size);
		176	void * rxvt_realloc (void *ptr, size_t size);
		177
157	char * rxvt_strtrim (char *str) NOTHROW;	178	char * rxvt_strtrim (char *str) NOTHROW;
158	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;	179	char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
159		180
160	static inline void	181	static inline void
161	rxvt_free_strsplit (char **ptr) NOTHROW	182	rxvt_free_strsplit (char **ptr) NOTHROW
162	{	183	{
163	free (ptr[0]);	184	free (ptr[0]);
164	free (ptr);	185	free (ptr);
165	}	186	}
166		187
167	void * rxvt_malloc (size_t size);	188	KeySym rxvt_XKeycodeToKeysym (Display *dpy, KeyCode keycode, int index);
168	void * rxvt_calloc (size_t number, size_t size);
169	void * rxvt_realloc (void *ptr, size_t size);
170		189
171	/////////////////////////////////////////////////////////////////////////////	190	/////////////////////////////////////////////////////////////////////////////
172		191
173	// temporarily replace the process environment	192	// temporarily replace the process environment
174	extern char **environ;	193	extern char **environ;
175	extern char **rxvt_environ; // the original environ pointer	194	extern char **rxvt_environ; // the original environ pointer
176
177	static inline void
178	set_environ (stringvec *envv)
179	{
180	#if ENABLE_PERL
181	assert (envv);
182	#else
183	if (envv)
184	#endif
185	environ = (char **)envv->begin ();
186	}
187		195
188	static inline void	196	static inline void
189	set_environ (char **envv)	197	set_environ (char **envv)
190	{	198	{
191	#if ENABLE_PERL	199	#if ENABLE_PERL
…		…
391	ERASE = +2,	399	ERASE = +2,
392	};	400	};
393		401
394	/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */	402	/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
395	enum page_dirn {	403	enum page_dirn {
396	UP,	404	DN = -1,
397	DN,
398	NO_DIR,	405	NO_DIR = 0,
		406	UP = 1,
399	};	407	};
400		408
401	/* arguments for rxvt_term::scr_change_screen () */	409	/* arguments for rxvt_term::scr_change_screen () */
402	enum {	410	enum {
403	PRIMARY = 0,	411	PRIMARY = 0,
…		…
580	#endif	588	#endif
581	Color_scroll,	589	Color_scroll,
582	#ifdef RXVT_SCROLLBAR	590	#ifdef RXVT_SCROLLBAR
583	Color_trough,	591	Color_trough,
584	#endif	592	#endif
585	#if ENABLE_TRANSPARENCY	593	#if BG_IMAGE_FROM_ROOT
586	Color_tint,	594	Color_tint,
587	#endif	595	#endif
588	#if OFF_FOCUS_FADING	596	#if OFF_FOCUS_FADING
589	Color_fade,	597	Color_fade,
590	#endif	598	#endif
…		…
640	#define PrivMode_MouseBtnEvent (1UL<<20)	648	#define PrivMode_MouseBtnEvent (1UL<<20)
641	#define PrivMode_MouseAnyEvent (1UL<<21)	649	#define PrivMode_MouseAnyEvent (1UL<<21)
642	#define PrivMode_BracketPaste (1UL<<22)	650	#define PrivMode_BracketPaste (1UL<<22)
643	#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack	651	#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
644	#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales	652	#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
		653	#define PrivMode_BlinkingCursor (1UL<<25)
645		654
646	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent)	655	#define PrivMode_mouse_report (PrivMode_MouseX10\|PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent)
647		656
648	#ifdef ALLOW_132_MODE	657	#ifdef ALLOW_132_MODE
649	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor\|PrivMode_132OK)	658	# define PrivMode_Default (PrivMode_Autowrap\|PrivMode_ShiftKeys\|PrivMode_VisibleCursor\|PrivMode_132OK)
…		…
652	#endif	661	#endif
653		662
654	// do not change these constants lightly, there are many interdependencies	663	// do not change these constants lightly, there are many interdependencies
655	#define IMBUFSIZ 128 // input modifier buffer sizes	664	#define IMBUFSIZ 128 // input modifier buffer sizes
656	#define KBUFSZ 512 // size of keyboard mapping buffer	665	#define KBUFSZ 512 // size of keyboard mapping buffer
657	#define CBUFSIZ 2048 // size of command buffer	666	#define CBUFSIZ 32768 // size of command buffer (longest command sequence possible)
658	#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row	667	#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
659	#define UBUFSIZ 2048 // character buffer	668	#define UBUFSIZ 2048 // character buffer
660		669
661	#if ENABLE_FRILLS	670	#if ENABLE_FRILLS
662	# include <X11/Xmd.h>	671	# include <X11/Xmd.h>
…		…
735		744
736	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)	745	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
737	#define SET_STYLE(x,style) (((x) & ~RS_styleMask) \| ((style) << RS_styleShift))	746	#define SET_STYLE(x,style) (((x) & ~RS_styleMask) \| ((style) << RS_styleShift))
738		747
739	#define GET_ATTR(x) (((x) & RS_attrMask))	748	#define GET_ATTR(x) (((x) & RS_attrMask))
740	// return attributes defining the background, encoding doesn't matter
741	// depends on RS_fgShift > RS_bgShift
742	#define GET_BGATTR(x) \
743	(ecb_unlikely ((x) & RS_RVid) \
744	? (((x) & (RS_attrMask & ~RS_RVid)) \
745	\| (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
746	: ((x) & (RS_attrMask \| RS_bgMask)))
747	#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) \| ((fg) << RS_fgShift))	749	#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) \| ((fg) << RS_fgShift))
748	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg) << RS_bgShift))	750	#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) \| ((bg) << RS_bgShift))
749	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))	751	#define SET_ATTR(x,a) (((x) & ~RS_attrMask) \| (a))
750		752
751	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))	753	#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
…		…
860	// that are not representable in unicode, as well as characters	862	// that are not representable in unicode, as well as characters
861	// not fitting in the BMP.	863	// not fitting in the BMP.
862	struct compose_char	864	struct compose_char
863	{	865	{
864	unicode_t c1, c2; // any chars != NOCHAR are valid	866	unicode_t c1, c2; // any chars != NOCHAR are valid
865	#if __cplusplus >= 201103L \|\| ECB_GCC_VERSION(4,4)	867
866	compose_char () = default;
867	#endif
868	compose_char (unicode_t c1, unicode_t c2)	868	compose_char (unicode_t c1, unicode_t c2)
869	: c1(c1), c2(c2)	869	: c1(c1), c2(c2)
870	{ }	870	{ }
871	};	871	};
872		872
…		…
1134	/* ---------- */	1134	/* ---------- */
1135	rend_t rstyle;	1135	rend_t rstyle;
1136	/* ---------- */	1136	/* ---------- */
1137	#ifdef SELECTION_SCROLLING	1137	#ifdef SELECTION_SCROLLING
1138	int scroll_selection_lines;	1138	int scroll_selection_lines;
1139	enum page_dirn scroll_selection_dir;
1140	int selection_save_x,	1139	int selection_save_x,
1141	selection_save_y,	1140	selection_save_y,
1142	selection_save_state;	1141	selection_save_state;
1143	#endif	1142	#endif
1144	/* ---------- */	1143	/* ---------- */
…		…
1153	mouse_row,	1152	mouse_row,
1154	mouse_col,	1153	mouse_col,
1155	# ifdef POINTER_BLANK	1154	# ifdef POINTER_BLANK
1156	pointerBlankDelay,	1155	pointerBlankDelay,
1157	# endif	1156	# endif
		1157	multiClickTime,
		1158	cursor_type,
1158	allowedxerror;	1159	allowedxerror;
1159	/* ---------- */	1160	/* ---------- */
1160	unsigned int ModLevel3Mask,	1161	unsigned int ModLevel3Mask,
1161	ModMetaMask,	1162	ModMetaMask,
1162	ModNumLockMask;	1163	ModNumLockMask;
…		…
1172	/* ---------- */	1173	/* ---------- */
1173	struct mouse_event MEvent;	1174	struct mouse_event MEvent;
1174	XComposeStatus compose;	1175	XComposeStatus compose;
1175	static struct termios def_tio;	1176	static struct termios def_tio;
1176	row_col_t oldcursor;	1177	row_col_t oldcursor;
		1178
1177	#ifdef HAVE_BG_PIXMAP	1179	#ifdef HAVE_BG_PIXMAP
1178	void bg_init ();	1180	void bg_init ();
1179	void bg_destroy ();	1181	void bg_destroy ();
1180		1182
		1183	# if BG_IMAGE_FROM_FILE
		1184	rxvt_image fimage;
		1185	void render_image (rxvt_image &image);
		1186	# endif
		1187
		1188	# if BG_IMAGE_FROM_ROOT
		1189	rxvt_img *root_img;
		1190	image_effects root_effects;
		1191
		1192	void render_root_image ();
		1193	# endif
		1194
		1195	ev_tstamp bg_valid_since;
		1196
		1197	bool bg_window_size_sensitive ();
		1198	bool bg_window_position_sensitive ();
		1199
		1200	void bg_render ();
		1201	#endif
		1202
		1203	#ifdef HAVE_IMG
1181	enum {	1204	enum {
1182	BG_IS_VALID = 1 << 0,
1183
1184	BG_IS_TRANSPARENT = 1 << 1,	1205	BG_IS_TRANSPARENT = 1 << 1,
1185	BG_NEEDS_REFRESH = 1 << 2,	1206	BG_NEEDS_REFRESH = 1 << 2,
1186	BG_INHIBIT_RENDER = 1 << 3,	1207	BG_INHIBIT_RENDER = 1 << 3,
1187	};	1208	};
1188		1209
1189	uint8_t bg_flags;	1210	uint8_t bg_flags;
1190		1211
1191	# if BG_IMAGE_FROM_FILE
1192	rxvt_image fimage;
1193	void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1194	bool render_image (rxvt_image &image);
1195	# endif
1196
1197	# if ENABLE_TRANSPARENCY
1198	rxvt_img *root_img;
1199	image_effects root_effects;
1200
1201	void bg_set_transparent ()
1202	{
1203	bg_flags \|= BG_IS_TRANSPARENT;
1204	}
1205	void bg_set_root_pixmap ();
1206	bool render_root_image ();
1207	# endif
1208
1209	void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1210
1211	ev_tstamp bg_valid_since;
1212
1213	rxvt_img *bg_img;	1212	rxvt_img *bg_img;
1214
1215	bool bg_window_size_sensitive ();
1216	bool bg_window_position_sensitive ();
1217
1218	void bg_render ();
1219	void bg_invalidate ()
1220	{
1221	bg_flags &= ~BG_IS_VALID;
1222	}
1223	#endif	1213	#endif
1224		1214
1225	#if ENABLE_OVERLAY	1215	#if ENABLE_OVERLAY
1226	overlay_base ov;	1216	overlay_base ov;
1227		1217
…		…
1242	char *locale;	1232	char *locale;
1243	char charsets[4];	1233	char charsets[4];
1244	char v_buffer; / pointer to physical buffer */	1234	char v_buffer; / pointer to physical buffer */
1245	unsigned int v_buflen; /* size of area to write */	1235	unsigned int v_buflen; /* size of area to write */
1246	stringvec argv, envv; /* if != 0, will be freed at destroy time */	1236	stringvec argv, envv; /* if != 0, will be freed at destroy time */
		1237	char **env;
1247		1238
1248	#ifdef KEYSYM_RESOURCE	1239	#ifdef KEYSYM_RESOURCE
1249	keyboard_manager *keyboard;	1240	keyboard_manager *keyboard;
1250	#endif	1241	#endif
1251	#ifndef NO_RESOURCES	1242	#ifndef NO_RESOURCES
…		…
1281	void vt_select_input () const NOTHROW	1272	void vt_select_input () const NOTHROW
1282	{	1273	{
1283	XSelectInput (dpy, vt, vt_emask \| vt_emask_perl \| vt_emask_xim \| vt_emask_mouse);	1274	XSelectInput (dpy, vt, vt_emask \| vt_emask_perl \| vt_emask_xim \| vt_emask_mouse);
1284	}	1275	}
1285		1276
1286	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1277	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1287	void rootwin_cb (XEvent &xev);	1278	void rootwin_cb (XEvent &xev);
1288	xevent_watcher rootwin_ev;	1279	xevent_watcher rootwin_ev;
1289	#endif	1280	#endif
1290	#ifdef HAVE_BG_PIXMAP	1281	#ifdef HAVE_BG_PIXMAP
1291	void update_background ();	1282	void update_background ();
…		…
1334	void pointer_blank ();	1325	void pointer_blank ();
1335	#endif	1326	#endif
1336	void pointer_unblank ();	1327	void pointer_unblank ();
1337		1328
1338	void tt_printf (const char *fmt,...);	1329	void tt_printf (const char *fmt,...);
		1330	void tt_write_ (const char *data, unsigned int len);
1339	void tt_write (const char *data, unsigned int len);	1331	void tt_write (const char *data, unsigned int len);
		1332	void tt_write_user_input (const char *data, unsigned int len);
1340	void pty_write ();	1333	void pty_write ();
1341		1334
1342	void make_current () const // make this the "currently active" urxvt instance	1335	void make_current () const // make this the "currently active" urxvt instance
1343	{	1336	{
1344	SET_R (this);	1337	SET_R (this);
1345	set_environ (envv);	1338	set_environ (env);
1346	rxvt_set_locale (locale);	1339	rxvt_set_locale (locale);
1347	}	1340	}
1348		1341
1349	#if USE_XIM	1342	#if USE_XIM
1350	rxvt_xim *input_method;	1343	rxvt_xim *input_method;
…		…
1383	#if ENABLE_FRILLS	1376	#if ENABLE_FRILLS
1384	void set_urgency (bool enable);	1377	void set_urgency (bool enable);
1385	#else	1378	#else
1386	void set_urgency (bool enable) { }	1379	void set_urgency (bool enable) { }
1387	#endif	1380	#endif
1388	void update_fade_color (unsigned int idx);	1381	void update_fade_color (unsigned int idx, bool first_time = false);
1389	#ifdef PRINTPIPE	1382	#ifdef PRINTPIPE
1390	FILE *popen_printer ();	1383	FILE *popen_printer ();
1391	int pclose_printer (FILE *stream);	1384	int pclose_printer (FILE *stream);
1392	#endif	1385	#endif
1393	void process_print_pipe ();	1386	void process_print_pipe ();
…		…
1402	void process_color_seq (int report, int color, const char *str, char resp);	1395	void process_color_seq (int report, int color, const char *str, char resp);
1403	void process_xterm_seq (int op, char *str, char resp);	1396	void process_xterm_seq (int op, char *str, char resp);
1404	int privcases (int mode, unsigned long bit);	1397	int privcases (int mode, unsigned long bit);
1405	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1398	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1406	void process_sgr_mode (unsigned int nargs, const int *arg);	1399	void process_sgr_mode (unsigned int nargs, const int *arg);
		1400	void set_cursor_style (int style);
1407	// init.C	1401	// init.C
1408	void init (stringvec argv, stringvec envv);	1402	void init (stringvec argv, stringvec envv);
1409	void init (int argc, const char const argv, const char const envv);	1403	void init (int argc, const char const argv, const char const envv);
1410	void init2 (int argc, const char const argv);	1404	void init2 (int argc, const char const argv);
1411	void init_vars ();	1405	void init_vars ();
…		…
1416	void init_command (const char const argv);	1410	void init_command (const char const argv);
1417	void run_command (const char const argv);	1411	void run_command (const char const argv);
1418	int run_child (const char const argv);	1412	int run_child (const char const argv);
1419	void color_aliases (int idx);	1413	void color_aliases (int idx);
1420	void create_windows (int argc, const char const argv);	1414	void create_windows (int argc, const char const argv);
1421	void get_colours ();	1415	void get_colors ();
1422	void get_ourmods ();	1416	void get_ourmods ();
1423	void set_icon (const char *file);	1417	void set_icon (const char *file);
1424	// main.C	1418	// main.C
1425	void tt_winch ();	1419	void tt_winch ();
1426	rxvt_term ();	1420	rxvt_term ();
1427	~rxvt_term ();	1421	~rxvt_term ();
1428	void destroy ();	1422	void destroy ();
1429	void emergency_cleanup ();	1423	void emergency_cleanup ();
1430	void recolour_cursor ();	1424	void recolor_cursor ();
1431	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);	1425	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1432	void window_calc (unsigned int newwidth, unsigned int newheight);	1426	void window_calc (unsigned int newwidth, unsigned int newheight);
1433	bool set_fonts ();	1427	bool set_fonts ();
1434	void set_string_property (Atom prop, const char *str, int len = -1);	1428	void set_string_property (Atom prop, const char *str, int len = -1);
1435	void set_mbstring_property (Atom prop, const char *str, int len = -1);	1429	void set_mbstring_property (Atom prop, const char *str, int len = -1);
…		…
1485	void paste (char *data, unsigned int len) NOTHROW;	1479	void paste (char *data, unsigned int len) NOTHROW;
1486	void scr_alloc () NOTHROW;	1480	void scr_alloc () NOTHROW;
1487	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;	1481	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1488	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;	1482	void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1489	void scr_kill_char (line_t &l, int col) const NOTHROW;	1483	void scr_kill_char (line_t &l, int col) const NOTHROW;
		1484	void scr_set_char_rend (line_t &l, int col, rend_t rend);
1490	int scr_scroll_text (int row1, int row2, int count) NOTHROW;	1485	int scr_scroll_text (int row1, int row2, int count) NOTHROW;
		1486	void copy_line (line_t &dst, line_t &src);
1491	void scr_reset ();	1487	void scr_reset ();
1492	void scr_release () NOTHROW;	1488	void scr_release () NOTHROW;
1493	void scr_clear (bool really = false) NOTHROW;	1489	void scr_clear (bool really = false) NOTHROW;
1494	void scr_refresh () NOTHROW;	1490	void scr_refresh () NOTHROW;
1495	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;	1491	bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
…		…
1499	void scr_backindex () NOTHROW;	1495	void scr_backindex () NOTHROW;
1500	void scr_forwardindex () NOTHROW;	1496	void scr_forwardindex () NOTHROW;
1501	#endif	1497	#endif
1502	void scr_touch (bool refresh) NOTHROW;	1498	void scr_touch (bool refresh) NOTHROW;
1503	void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;	1499	void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1504	void scr_recolour (bool refresh = true) NOTHROW;	1500	void scr_recolor (bool refresh = true) NOTHROW;
1505	void scr_remap_chars () NOTHROW;	1501	void scr_remap_chars () NOTHROW;
1506	void scr_remap_chars (line_t &l) NOTHROW;	1502	void scr_remap_chars (line_t &l) NOTHROW;
1507		1503
1508	enum cursor_mode { SAVE, RESTORE };	1504	enum cursor_mode { SAVE, RESTORE };
1509		1505
…		…
1534	void scr_report_position () NOTHROW;	1530	void scr_report_position () NOTHROW;
1535	void set_font_style () NOTHROW;	1531	void set_font_style () NOTHROW;
1536	void scr_charset_choose (int set) NOTHROW;	1532	void scr_charset_choose (int set) NOTHROW;
1537	void scr_charset_set (int set, unsigned int ch) NOTHROW;	1533	void scr_charset_set (int set, unsigned int ch) NOTHROW;
1538	void scr_move_to (int y, int len) NOTHROW;	1534	void scr_move_to (int y, int len) NOTHROW;
		1535	bool scr_page (int nlines) NOTHROW;
1539	bool scr_page (enum page_dirn direction, int nlines) NOTHROW;	1536	bool scr_page (enum page_dirn direction, int nlines) NOTHROW
		1537	{
		1538	return scr_page (direction * nlines);
		1539	}
1540	bool scr_changeview (int new_view_start) NOTHROW;	1540	bool scr_changeview (int new_view_start) NOTHROW;
1541	void scr_bell () NOTHROW;	1541	void scr_bell () NOTHROW;
1542	void scr_printscreen (int fullhist) NOTHROW;	1542	void scr_printscreen (int fullhist) NOTHROW;
1543	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;	1543	void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1544	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;	1544	void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1545	void scr_reverse_selection () NOTHROW;	1545	void scr_reverse_selection () NOTHROW;
1546	void scr_dump (int fd) NOTHROW;	1546	void scr_dump (int fd) NOTHROW;
1547		1547
1548	void selection_check (int check_more) NOTHROW;	1548	void selection_check (int check_more) NOTHROW;
		1549	void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
1549	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;	1550	void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1550	void selection_clear (bool clipboard = false) NOTHROW;	1551	void selection_clear (bool clipboard = false) NOTHROW;
1551	void selection_make (Time tm);	1552	void selection_make (Time tm);
1552	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;	1553	bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1553	void selection_start_colrow (int col, int row) NOTHROW;	1554	void selection_start_colrow (int col, int row) NOTHROW;
…		…
1560	void selection_rotate (int x, int y) NOTHROW;	1561	void selection_rotate (int x, int y) NOTHROW;
1561		1562
1562	// xdefaults.C	1563	// xdefaults.C
1563	void rxvt_usage (int type);	1564	void rxvt_usage (int type);
1564	const char *get_options (int argc, const char const *argv);	1565	const char *get_options (int argc, const char const *argv);
		1566	int parse_keysym (const char *str, unsigned int &state);
1565	int parse_keysym (const char str, const char arg);	1567	int bind_action (const char str, const char arg);
1566	const char x_resource (const char name);	1568	const char x_resource (const char name);
1567	void extract_resources ();	1569	void extract_resources ();
		1570	void enumerate_keysym_resources (void (cb)(rxvt_term , const char , const char ));
1568	void extract_keysym_resources ();	1571	void extract_keysym_resources ();
1569	};	1572	};
1570		1573
1571	#endif /* _RXVT_H_ */	1574	#endif /* _RXVT_H_ */
1572		1575

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.510 by root, Fri Nov 30 07:02:12 2012 UTC vs. Revision 1.544 by sf-exg, Mon May 11 22:05:48 2015 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.510 by root, Fri Nov 30 07:02:12 2012 UTC vs.
Revision 1.544 by sf-exg, Mon May 11 22:05:48 2015 UTC