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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.155 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.178 by root, Sun Jan 1 14:43:43 2006 UTC

…		…
77	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)	77	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_PTMX)	78	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_PTMX)
79	# define NO_SETOWNER_TTYDEV 1	79	# define NO_SETOWNER_TTYDEV 1
80	# endif	80	# endif
81	#endif	81	#endif
82	#if defined(__CYGWIN32__) \|\| defined(PTYS_ARE_OPENPTY)	82	#if defined(__CYGWIN32__)
83	# define NO_SETOWNER_TTYDEV 1	83	# define NO_SETOWNER_TTYDEV 1
84	#endif	84	#endif
85		85
86	/*	86	/*
87	*****************************************************************************	87	*****************************************************************************
…		…
118	char ** rxvt_splitcommastring (const char *cs);	118	char ** rxvt_splitcommastring (const char *cs);
119	void rxvt_freecommastring (char **cs);	119	void rxvt_freecommastring (char **cs);
120	char * rxvt_File_find (const char file, const char ext, const char *path);	120	char * rxvt_File_find (const char file, const char ext, const char *path);
121	void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);	121	void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122	void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);	122	void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
		123	void rxvt_usleep (int usecs);
123		124
124	/*	125	/*
125	*****************************************************************************	126	*****************************************************************************
126	* STRUCTURES AND TYPEDEFS	127	* STRUCTURES AND TYPEDEFS
127	*****************************************************************************	128	*****************************************************************************
…		…
137	#endif	138	#endif
138		139
139	/* If we're using either the rxvt scrollbar or menu bars, keep the	140	/* If we're using either the rxvt scrollbar or menu bars, keep the
140	* scrollColor resource.	141	* scrollColor resource.
141	*/	142	*/
142	#if defined(RXVT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)	143	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)
143	# define KEEP_SCROLLCOLOR 1	144	# define KEEP_SCROLLCOLOR 1
144	#else	145	#else
145	# undef KEEP_SCROLLCOLOR	146	# undef KEEP_SCROLLCOLOR
146	#endif	147	#endif
147		148
…		…
161	Time time; /* milliseconds */	162	Time time; /* milliseconds */
162	unsigned int state; /* key or button mask */	163	unsigned int state; /* key or button mask */
163	unsigned int button; /* detail */	164	unsigned int button; /* detail */
164	};	165	};
165		166
166	#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
167	#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
168	#define SWAP_IT(one, two, typeof) \
169	do { \
170	typeof swapittmp; \
171	(swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
172	} while (/* CONSTCOND */ 0)
173	#define BOUND_POSITIVE_INT16(val) \
174	(int16_t) ((val) <= 0 \
175	? 0 \
176	: min ((val), (((uint16_t)-1)>>1)))
177
178	#if ENABLE_FRILLS	167	#if ENABLE_FRILLS
179	typedef struct _mwmhints {	168	typedef struct _mwmhints {
180	CARD32 flags;	169	CARD32 flags;
181	CARD32 functions;	170	CARD32 functions;
182	CARD32 decorations;	171	CARD32 decorations;
…		…
267		256
268	#define R_SB_ALIGN_CENTRE 0	257	#define R_SB_ALIGN_CENTRE 0
269	#define R_SB_ALIGN_TOP 1	258	#define R_SB_ALIGN_TOP 1
270	#define R_SB_ALIGN_BOTTOM 2	259	#define R_SB_ALIGN_BOTTOM 2
271		260
272	#define R_SB_RXVT 0
273	#define R_SB_NEXT 1	261	#define R_SB_NEXT 1
274	#define R_SB_XTERM 2	262	#define R_SB_XTERM 2
275	#define R_SB_PLAIN 4	263	#define R_SB_PLAIN 4
		264	#define R_SB_RXVT 8
276		265
277	#define SB_WIDTH_NEXT 19	266	#define SB_WIDTH_NEXT 19
278	#define SB_WIDTH_XTERM 15	267	#define SB_WIDTH_XTERM 15
279	#define SB_WIDTH_PLAIN 7	268	#define SB_WIDTH_PLAIN 7
280	#ifndef SB_WIDTH_RXVT	269	#ifndef SB_WIDTH_RXVT
…		…
362	#define FONT_DN "#-"	351	#define FONT_DN "#-"
363	#define FONT_UP "#+"	352	#define FONT_UP "#+"
364		353
365	/* flags for rxvt_scr_gotorc () */	354	/* flags for rxvt_scr_gotorc () */
366	enum {	355	enum {
367	C_RELATIVE = 1 , /* col movement is relative */	356	C_RELATIVE = 1, /* col movement is relative */
368	R_RELATIVE = 2, /* row movement is relative */	357	R_RELATIVE = 2, /* row movement is relative */
369	RELATIVE = 1 \| 2,	358	RELATIVE = C_RELATIVE \| R_RELATIVE,
370	};	359	};
371		360
372	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */	361	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
373	enum {	362	enum {
374	INSERT = -1, /* don't change these values */	363	INSERT = -1, /* don't change these values */
…		…
387	enum {	376	enum {
388	PRIMARY = 0,	377	PRIMARY = 0,
389	SECONDARY,	378	SECONDARY,
390	};	379	};
391		380
392	#define RS_None 0 /* Normal */	381	#define RS_None 0
393		382
394	#define RS_fgMask 0x0000007fUL /* 128 colors */	383	#define RS_fgMask 0x0000007fUL // 128 colors
395	#define RS_bgMask 0x00003f80UL /* 128 colors */	384	#define RS_bgMask 0x00003f80UL // 128 colors
396		385
397	// font styles	386	// font styles
398	#define RS_Bold 0x00004000UL // value 1	387	#define RS_Bold 0x00004000UL // value 1
399	#define RS_Italic 0x00008000UL // value 2	388	#define RS_Italic 0x00008000UL // value 2
400		389
401	// fake styles	390	// fake styles
402	#define RS_Blink 0x00010000UL /* blink */	391	#define RS_Blink 0x00010000UL // blink
403	#define RS_RVid 0x00020000UL /* reverse video */	392	#define RS_RVid 0x00020000UL // reverse video
404	#define RS_Uline 0x00040000UL /* underline */	393	#define RS_Uline 0x00040000UL // underline
405		394
406	// 5 bits still to go	395	// 5 custom bits for extensions
		396	#define RS_customCount 32
		397	#define RS_customMask 0x00f80000UL
		398	#define RS_customShift 19
407		399
408	// other flags	400	// other flags
409	#define RS_Careful 0x80000000UL /* be careful when drawing these */	401	#define RS_Careful 0x80000000UL /* be careful when drawing these */
410		402
411	#define RS_styleCount 4	403	#define RS_styleCount 4
…		…
490	URxvt_view_down = 721,	482	URxvt_view_down = 721,
491	};	483	};
492		484
493	/* Words starting with `Color_' are colours. Others are counts */	485	/* Words starting with `Color_' are colours. Others are counts */
494	/*	486	/*
495	* The following comment is mostly obsolete since pixcolor_set was expanded:
496	* We're currently upto 29 colours. Only 3 more available. The
497	* PixColor and rendition colour usage should probably be decoupled	487	* The PixColor and rendition colour usage should probably be decoupled
498	* on the unnecessary items, e.g. Color_pointer, but won't bother	488	* on the unnecessary items, e.g. Color_pointer, but won't bother
499	* until we need to. Also, be aware of usage in pixcolor_set	489	* until we need to. Also, be aware of usage in pixcolor_set
500	*/	490	*/
501		491
502	enum colour_list {	492	enum colour_list {
…		…
552	Color_trough,	542	Color_trough,
553	#endif	543	#endif
554	#if TINTING	544	#if TINTING
555	Color_tint,	545	Color_tint,
556	#endif	546	#endif
		547	#if OFF_FOCUS_FADING
		548	Color_fade,
		549	#endif
557	NRS_COLORS, /* */	550	NRS_COLORS, /* */
558	#ifdef KEEP_SCROLLCOLOR	551	#ifdef KEEP_SCROLLCOLOR
559	Color_topShadow = NRS_COLORS,	552	Color_topShadow = NRS_COLORS,
560	Color_bottomShadow,	553	Color_bottomShadow,
561	TOTAL_COLORS	554	TOTAL_COLORS
…		…
583	Rs_font,	576	Rs_font,
584	#if ENABLE_STYLES	577	#if ENABLE_STYLES
585	Rs_boldFont,	578	Rs_boldFont,
586	Rs_italicFont,	579	Rs_italicFont,
587	Rs_boldItalicFont,	580	Rs_boldItalicFont,
		581	Rs_intensityStyles,
588	#endif	582	#endif
589	Rs_name,	583	Rs_name,
590	Rs_title,	584	Rs_title,
591	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	585	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
592	Rs_path,	586	Rs_path,
…		…
639	#ifdef TRANSPARENT	633	#ifdef TRANSPARENT
640	Rs_transparent,	634	Rs_transparent,
641	Rs_transparent_all,	635	Rs_transparent_all,
642	#endif	636	#endif
643	#if ENABLE_FRILLS	637	#if ENABLE_FRILLS
		638	Rs_pty_fd,
		639	Rs_hold,
644	Rs_ext_bwidth,	640	Rs_ext_bwidth,
645	Rs_int_bwidth,	641	Rs_int_bwidth,
646	Rs_borderLess,	642	Rs_borderLess,
647	Rs_lineSpace,	643	Rs_lineSpace,
648	Rs_pty_fd,
649	Rs_cursorUnderline,	644	Rs_cursorUnderline,
650	#endif	645	#endif
651	#if CURSOR_BLINK	646	#if CURSOR_BLINK
652	Rs_cursorBlink,	647	Rs_cursorBlink,
653	#endif	648	#endif
…		…
756	#endif	751	#endif
757		752
758	// do not change these constants lightly, there are many interdependencies	753	// do not change these constants lightly, there are many interdependencies
759	#define IMBUFSIZ 128 // input modifier buffer sizes	754	#define IMBUFSIZ 128 // input modifier buffer sizes
760	#define KBUFSZ 512 // size of keyboard mapping buffer	755	#define KBUFSZ 512 // size of keyboard mapping buffer
761	#define CBUFSIZ 4096 // size of command buffer	756	#define CBUFSIZ 2048 // size of command buffer
762	#define UBUFSIZ 4096 // character buffer	757	#define UBUFSIZ 2048 // character buffer
763		758
764	#ifndef PATH_MAX	759	#ifndef PATH_MAX
765	# define PATH_MAX 16384	760	# define PATH_MAX 16384
766	#endif	761	#endif
767		762
…		…
816	#define dDisp Display *disp = display->display	811	#define dDisp Display *disp = display->display
817		812
818	/* convert pixel dimensions to row/column values. Everything as int32_t */	813	/* convert pixel dimensions to row/column values. Everything as int32_t */
819	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	814	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
820	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	815	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
821	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)	816	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
822	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)	817	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
823	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	818	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
824	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	819	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
825	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)	820	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
826	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)	821	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
827		822
828	#define TermWin_TotalWidth() ((int32_t)TermWin.width)	823	#define TermWin_TotalWidth() ((int32_t)this->width)
829	#define TermWin_TotalHeight() ((int32_t)TermWin.height)	824	#define TermWin_TotalHeight() ((int32_t)this->height)
		825
		826	// for m >= -n, ensure remainder lies between 0..n-1
		827	#define MOD(m,n) (((m) + (n)) % (n))
		828
		829	#define LINENO(n) MOD (term_start + int(n), total_rows)
		830	#define ROW(n) row_buf [LINENO (n)]
830		831
831	/* how to build & extract colors and attributes */	832	/* how to build & extract colors and attributes */
832	#define GET_BASEFG(x) (((x) & RS_fgMask))	833	#define GET_BASEFG(x) (((x) & RS_fgMask))
833	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	834	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
834	#ifndef NO_BRIGHTCOLOR
835	# define GET_FGCOLOR(x) \
836	((((x) & RS_Bold) == 0 \
837	\|\| GET_BASEFG (x) < minCOLOR \
838	\|\| GET_BASEFG (x) >= minBrightCOLOR) \
839	? GET_BASEFG (x) \
840	: (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
841	# define GET_BGCOLOR(x) \
842	((((x) & RS_Blink) == 0 \
843	\|\| GET_BASEBG (x) < minCOLOR \
844	\|\| GET_BASEBG (x) >= minBrightCOLOR) \
845	? GET_BASEBG (x) \
846	: (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
847	#else
848	# define GET_FGCOLOR(x) GET_BASEFG(x)
849	# define GET_BGCOLOR(x) GET_BASEBG(x)
850	#endif
851		835
852	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)	836	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
853	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))	837	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))
854		838
855	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)	839	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
…		…
868		852
869	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))	853	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))
870	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))	854	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
871		855
872	#if ENABLE_STYLES	856	#if ENABLE_STYLES
873	# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]	857	# define FONTSET(style) fontset[GET_STYLE (style)]
874	#else	858	#else
875	# define FONTSET(style) TermWin.fontset[0]	859	# define FONTSET(style) fontset[0]
876	#endif	860	#endif
877		861
878	#ifdef HAVE_SCROLLBARS	862	#ifdef HAVE_SCROLLBARS
879	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)	863	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
880	#else	864	#else
…		…
905	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	889	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
906	- scrollbar_minheight ())	890	- scrollbar_minheight ())
907		891
908	#if (MENUBAR_MAX > 1)	892	#if (MENUBAR_MAX > 1)
909	/* rendition style flags */	893	/* rendition style flags */
910	# define menuBar_height() (TermWin.fheight + SHADOW)	894	# define menuBar_height() (fheight + SHADOW)
911	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	895	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
912	# define isMenuBarWindow(w) ((w) == menuBar.win)	896	# define isMenuBarWindow(w) ((w) == menuBar.win)
913	#else	897	#else
914	# define menuBar_height() (0)	898	# define menuBar_height() (0)
915	# define menuBar_TotalHeight() (0)	899	# define menuBar_TotalHeight() (0)
…		…
962	#endif	946	#endif
963		947
964	extern class rxvt_failure_exception { } rxvt_failure_exception;	948	extern class rxvt_failure_exception { } rxvt_failure_exception;
965		949
966	typedef callback1<void, const char *> log_callback;	950	typedef callback1<void, const char *> log_callback;
		951	typedef callback1<int, int> getfd_callback;
967		952
968	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);	953	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
969	extern void rxvt_log (const char *fmt, ...);	954	extern void rxvt_log (const char *fmt, ...);
970	extern void rxvt_warn (const char *fmt, ...);	955	extern void rxvt_warn (const char *fmt, ...);
971	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	956	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
…		…
1048	class keyboard_manager;	1033	class keyboard_manager;
1049	#endif	1034	#endif
1050		1035
1051	struct rxvt_term : zero_initialized, rxvt_vars {	1036	struct rxvt_term : zero_initialized, rxvt_vars {
1052	log_callback *log_hook; // log error messages through this hook, if != 0	1037	log_callback *log_hook; // log error messages through this hook, if != 0
		1038	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1053		1039
1054	struct mbstate mbstate; // current input multibyte state	1040	struct mbstate mbstate; // current input multibyte state
1055		1041
1056	unsigned char want_refresh:1,	1042	unsigned char want_refresh:1,
1057	#ifdef TRANSPARENT	1043	#ifdef TRANSPARENT
…		…
1227	void scr_overlay_off ();	1213	void scr_overlay_off ();
1228	void scr_overlay_set (int x, int y,	1214	void scr_overlay_set (int x, int y,
1229	text_t text,	1215	text_t text,
1230	rend_t rend = OVERLAY_RSTYLE);	1216	rend_t rend = OVERLAY_RSTYLE);
1231	void scr_overlay_set (int x, int y, const char *s);	1217	void scr_overlay_set (int x, int y, const char *s);
		1218	void scr_overlay_set (int x, int y, const wchar_t *s);
1232	#endif	1219	#endif
1233		1220
1234	vector<void *> allocated; // free these memory blocks with free()	1221	vector<void *> allocated; // free these memory blocks with free()
1235		1222
1236	char env_windowid; / environmental variable WINDOWID */	1223	char env_windowid; / environmental variable WINDOWID */
…		…
1261	// ISO 14755 entry support	1248	// ISO 14755 entry support
1262	unicode_t iso14755buf;	1249	unicode_t iso14755buf;
1263	void commit_iso14755 ();	1250	void commit_iso14755 ();
1264	int hex_keyval (XKeyEvent &ev);	1251	int hex_keyval (XKeyEvent &ev);
1265	# if ISO_14755	1252	# if ISO_14755
1266	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);	1253	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1267	void iso14755_54 (int x, int y);	1254	void iso14755_54 (int x, int y);
1268	# endif	1255	# endif
1269	#endif	1256	#endif
1270		1257
1271	// modifies first argument(!)	1258	// modifies first argument(!)
…		…
1275		1262
1276	#if TRANSPARENT	1263	#if TRANSPARENT
1277	void rootwin_cb (XEvent &xev);	1264	void rootwin_cb (XEvent &xev);
1278	xevent_watcher rootwin_ev;	1265	xevent_watcher rootwin_ev;
1279	#endif	1266	#endif
1280
1281
1282	void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1283	void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1284		1267
1285	void x_cb (XEvent &xev);	1268	void x_cb (XEvent &xev);
1286	xevent_watcher termwin_ev;	1269	xevent_watcher termwin_ev;
1287	xevent_watcher vt_ev;	1270	xevent_watcher vt_ev;
1288	#ifdef HAVE_SCROLLBARS	1271	#ifdef HAVE_SCROLLBARS
…		…
1329		1312
1330	void tt_winch ();	1313	void tt_winch ();
1331		1314
1332	rxvt_term ();	1315	rxvt_term ();
1333	~rxvt_term ();	1316	~rxvt_term ();
		1317	void child_exit (); // child has exited, usually destroys
1334	void destroy ();	1318	void destroy ();
1335	void emergency_cleanup ();	1319	void emergency_cleanup ();
1336		1320
1337	bool init (int argc, const char const argv);	1321	bool init (int argc, const char const argv);
1338	bool init_vars ();	1322	bool init_vars ();
…		…
1349	int run_child (const char const argv);	1333	int run_child (const char const argv);
1350		1334
1351	void color_aliases (int idx);	1335	void color_aliases (int idx);
1352	void recolour_cursor ();	1336	void recolour_cursor ();
1353	void create_windows (int argc, const char const argv);	1337	void create_windows (int argc, const char const argv);
1354	void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);	1338	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1355	void window_calc (unsigned int width, unsigned int height);	1339	void window_calc (unsigned int newwidth, unsigned int newheight);
1356		1340
1357	#if USE_XIM	1341	#if USE_XIM
1358	rxvt_xim *input_method;	1342	rxvt_xim *input_method;
1359	XIC Input_Context;	1343	XIC Input_Context;
1360	XIMStyle input_style;	1344	XIMStyle input_style;
…		…
1432	void set_title (const char *str);	1416	void set_title (const char *str);
1433	void set_icon_name (const char *str);	1417	void set_icon_name (const char *str);
1434	void set_window_color (int idx, const char *color);	1418	void set_window_color (int idx, const char *color);
1435	void set_colorfgbg ();	1419	void set_colorfgbg ();
1436	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1420	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1437	void set_widthheight (unsigned int width, unsigned int height);	1421	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1438		1422
1439	#ifdef MENUBAR	1423	#ifdef MENUBAR
1440	// menubar.C	1424	// menubar.C
1441	void menuitem_free (menu_t menu, menuitem_t item);	1425	void menuitem_free (menu_t menu, menuitem_t item);
1442	int action_dispatch (action_t *action);	1426	int action_dispatch (action_t *action);
…		…
1468	void menubar_control (XButtonEvent &ev);	1452	void menubar_control (XButtonEvent &ev);
1469	void map_menuBar (int map);	1453	void map_menuBar (int map);
1470	#endif	1454	#endif
1471		1455
1472	// screen.C	1456	// screen.C
1473	void scr_blank_line (text_t et, rend_t er, unsigned int width, rend_t efs);	1457
1474	void scr_blank_screen_mem (text_t tp, rend_t rp, unsigned int row, rend_t efs);	1458	void lalloc (line_t &l)
		1459	{
		1460	l.t = (text_t *)talloc->alloc ();
		1461	l.r = (rend_t *)ralloc->alloc ();
		1462	}
		1463
		1464	#if 0
		1465	void lfree (line_t &l)
		1466	{
		1467	talloc->free (l.t);
		1468	ralloc->free (l.r);
		1469	}
		1470	#endif
		1471
		1472	void lresize (line_t &l)
		1473	{
		1474	if (!l.t)
		1475	return;
		1476
		1477	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
		1478	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
		1479
		1480	l.l = min (l.l, ncol);
		1481
		1482	if (ncol > prev_ncol)
		1483	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
		1484	}
		1485
		1486	int fgcolor_of (rend_t r)
		1487	{
		1488	int base = GET_BASEFG (r);
		1489	#ifndef NO_BRIGHTCOLOR
		1490	if (r & RS_Bold
		1491	# if ENABLE_STYLES
		1492	&& OPTION (Opt_intensityStyles)
		1493	# endif
		1494	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
		1495	base += minBrightCOLOR - minCOLOR;
		1496	#endif
		1497	return base;
		1498	}
		1499
		1500	int bgcolor_of (rend_t r)
		1501	{
		1502	int base = GET_BASEBG (r);
		1503	#ifndef NO_BRIGHTCOLOR
		1504	if (r & RS_Blink
		1505	# if ENABLE_STYLES
		1506	&& OPTION (Opt_intensityStyles)
		1507	# endif
		1508	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
		1509	base += minBrightCOLOR - minCOLOR;
		1510	#endif
		1511	return base;
		1512	}
		1513
		1514	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
		1515	void scr_blank_screen_mem (line_t &l, rend_t efs);
1475	int scr_scroll_text (int row1, int row2, int count, int spec);	1516	int scr_scroll_text (int row1, int row2, int count);
1476	void scr_reset ();	1517	void scr_reset ();
1477	void scr_reset_realloc ();
1478	void scr_release ();	1518	void scr_release ();
1479	void scr_clear (bool really = false);	1519	void scr_clear (bool really = false);
1480	void scr_refresh (unsigned char refresh_type);	1520	void scr_refresh (unsigned char refresh_type);
1481	bool scr_refresh_rend (rend_t mask, rend_t value);	1521	bool scr_refresh_rend (rend_t mask, rend_t value);
1482	void scr_erase_screen (int mode);	1522	void scr_erase_screen (int mode);
…		…
1488	void scr_touch (bool refresh);	1528	void scr_touch (bool refresh);
1489	void scr_expose (int x, int y, int width, int height, bool refresh);	1529	void scr_expose (int x, int y, int width, int height, bool refresh);
1490	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1530	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1491	void scr_recolour ();	1531	void scr_recolour ();
1492	void scr_remap_chars ();	1532	void scr_remap_chars ();
1493	void scr_remap_chars (text_t tp, rend_t rp);	1533	void scr_remap_chars (const line_t &l);
1494		1534
1495	void scr_poweron ();	1535	void scr_poweron ();
1496	void scr_cursor (int mode);	1536	void scr_cursor (int mode);
1497	void scr_do_wrap ();	1537	void scr_do_wrap ();
1498	int scr_change_screen (int scrn);	1538	int scr_change_screen (int scrn);

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.155 by root, Sun Apr 17 22:36:13 2005 UTC vs. Revision 1.178 by root, Sun Jan 1 14:43:43 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.155 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.178 by root, Sun Jan 1 14:43:43 2006 UTC