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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.154 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.176 by root, Sat Dec 31 19:30:25 2005 UTC

…		…
22	#include "salloc.h"	22	#include "salloc.h"
23		23
24	#if ENABLE_FRILLS	24	#if ENABLE_FRILLS
25	# define ENABLE_XEMBED 1	25	# define ENABLE_XEMBED 1
26	# define ENABLE_EWMH 1	26	# define ENABLE_EWMH 1
		27	# define CURSOR_BLINK 1
27	#endif	28	#endif
28		29
29	/*	30	/*
30	*****************************************************************************	31	*****************************************************************************
31	* SYSTEM HACKS	32	* SYSTEM HACKS
…		…
117	char ** rxvt_splitcommastring (const char *cs);	118	char ** rxvt_splitcommastring (const char *cs);
118	void rxvt_freecommastring (char **cs);	119	void rxvt_freecommastring (char **cs);
119	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);
120	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);
121	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);
122		124
123	/*	125	/*
124	*****************************************************************************	126	*****************************************************************************
125	* STRUCTURES AND TYPEDEFS	127	* STRUCTURES AND TYPEDEFS
126	*****************************************************************************	128	*****************************************************************************
…		…
136	#endif	138	#endif
137		139
138	/* 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
139	* scrollColor resource.	141	* scrollColor resource.
140	*/	142	*/
141	#if defined(RXVT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)	143	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)
142	# define KEEP_SCROLLCOLOR 1	144	# define KEEP_SCROLLCOLOR 1
143	#else	145	#else
144	# undef KEEP_SCROLLCOLOR	146	# undef KEEP_SCROLLCOLOR
145	#endif	147	#endif
146		148
…		…
160	Time time; /* milliseconds */	162	Time time; /* milliseconds */
161	unsigned int state; /* key or button mask */	163	unsigned int state; /* key or button mask */
162	unsigned int button; /* detail */	164	unsigned int button; /* detail */
163	};	165	};
164		166
165	#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
166	#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
167	#define SWAP_IT(one, two, typeof) \
168	do { \
169	typeof swapittmp; \
170	(swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
171	} while (/* CONSTCOND */ 0)
172	#define BOUND_POSITIVE_INT16(val) \
173	(int16_t) ((val) <= 0 \
174	? 0 \
175	: min ((val), (((uint16_t)-1)>>1)))
176
177	#if ENABLE_FRILLS	167	#if ENABLE_FRILLS
178	typedef struct _mwmhints {	168	typedef struct _mwmhints {
179	CARD32 flags;	169	CARD32 flags;
180	CARD32 functions;	170	CARD32 functions;
181	CARD32 decorations;	171	CARD32 decorations;
…		…
266		256
267	#define R_SB_ALIGN_CENTRE 0	257	#define R_SB_ALIGN_CENTRE 0
268	#define R_SB_ALIGN_TOP 1	258	#define R_SB_ALIGN_TOP 1
269	#define R_SB_ALIGN_BOTTOM 2	259	#define R_SB_ALIGN_BOTTOM 2
270		260
271	#define R_SB_RXVT 0
272	#define R_SB_NEXT 1	261	#define R_SB_NEXT 1
273	#define R_SB_XTERM 2	262	#define R_SB_XTERM 2
274	#define R_SB_PLAIN 4	263	#define R_SB_PLAIN 4
		264	#define R_SB_RXVT 8
275		265
276	#define SB_WIDTH_NEXT 19	266	#define SB_WIDTH_NEXT 19
277	#define SB_WIDTH_XTERM 15	267	#define SB_WIDTH_XTERM 15
278	#define SB_WIDTH_PLAIN 7	268	#define SB_WIDTH_PLAIN 7
279	#ifndef SB_WIDTH_RXVT	269	#ifndef SB_WIDTH_RXVT
…		…
361	#define FONT_DN "#-"	351	#define FONT_DN "#-"
362	#define FONT_UP "#+"	352	#define FONT_UP "#+"
363		353
364	/* flags for rxvt_scr_gotorc () */	354	/* flags for rxvt_scr_gotorc () */
365	enum {	355	enum {
366	C_RELATIVE = 1 , /* col movement is relative */	356	C_RELATIVE = 1, /* col movement is relative */
367	R_RELATIVE = 2, /* row movement is relative */	357	R_RELATIVE = 2, /* row movement is relative */
368	RELATIVE = 1 \| 2,	358	RELATIVE = C_RELATIVE \| R_RELATIVE,
369	};	359	};
370		360
371	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */	361	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
372	enum {	362	enum {
373	INSERT = -1, /* don't change these values */	363	INSERT = -1, /* don't change these values */
…		…
386	enum {	376	enum {
387	PRIMARY = 0,	377	PRIMARY = 0,
388	SECONDARY,	378	SECONDARY,
389	};	379	};
390		380
391	#define RS_None 0 /* Normal */	381	#define RS_None 0
392		382
393	#define RS_fgMask 0x0000007fUL /* 128 colors */	383	#define RS_fgMask 0x0000007fUL // 128 colors
394	#define RS_bgMask 0x00003f80UL /* 128 colors */	384	#define RS_bgMask 0x00003f80UL // 128 colors
395		385
396	// font styles	386	// font styles
397	#define RS_Bold 0x00004000UL // value 1	387	#define RS_Bold 0x00004000UL // value 1
398	#define RS_Italic 0x00008000UL // value 2	388	#define RS_Italic 0x00008000UL // value 2
399		389
400	// fake styles	390	// fake styles
401	#define RS_Blink 0x00010000UL /* blink */	391	#define RS_Blink 0x00010000UL // blink
402	#define RS_RVid 0x00020000UL /* reverse video */	392	#define RS_RVid 0x00020000UL // reverse video
403	#define RS_Uline 0x00040000UL /* underline */	393	#define RS_Uline 0x00040000UL // underline
404		394
405	// 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
406		399
407	// other flags	400	// other flags
408	#define RS_Careful 0x80000000UL /* be careful when drawing these */	401	#define RS_Careful 0x80000000UL /* be careful when drawing these */
409		402
410	#define RS_styleCount 4	403	#define RS_styleCount 4
…		…
489	URxvt_view_down = 721,	482	URxvt_view_down = 721,
490	};	483	};
491		484
492	/* Words starting with `Color_' are colours. Others are counts */	485	/* Words starting with `Color_' are colours. Others are counts */
493	/*	486	/*
494	* The following comment is mostly obsolete since pixcolor_set was expanded:
495	* We're currently upto 29 colours. Only 3 more available. The
496	* PixColor and rendition colour usage should probably be decoupled	487	* The PixColor and rendition colour usage should probably be decoupled
497	* 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
498	* 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
499	*/	490	*/
500		491
501	enum colour_list {	492	enum colour_list {
…		…
551	Color_trough,	542	Color_trough,
552	#endif	543	#endif
553	#if TINTING	544	#if TINTING
554	Color_tint,	545	Color_tint,
555	#endif	546	#endif
		547	#if OFF_FOCUS_FADING
		548	Color_fade,
		549	#endif
556	NRS_COLORS, /* */	550	NRS_COLORS, /* */
557	#ifdef KEEP_SCROLLCOLOR	551	#ifdef KEEP_SCROLLCOLOR
558	Color_topShadow = NRS_COLORS,	552	Color_topShadow = NRS_COLORS,
559	Color_bottomShadow,	553	Color_bottomShadow,
560	TOTAL_COLORS	554	TOTAL_COLORS
…		…
582	Rs_font,	576	Rs_font,
583	#if ENABLE_STYLES	577	#if ENABLE_STYLES
584	Rs_boldFont,	578	Rs_boldFont,
585	Rs_italicFont,	579	Rs_italicFont,
586	Rs_boldItalicFont,	580	Rs_boldItalicFont,
		581	Rs_intensityStyles,
587	#endif	582	#endif
588	Rs_name,	583	Rs_name,
589	Rs_title,	584	Rs_title,
590	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	585	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
591	Rs_path,	586	Rs_path,
…		…
638	#ifdef TRANSPARENT	633	#ifdef TRANSPARENT
639	Rs_transparent,	634	Rs_transparent,
640	Rs_transparent_all,	635	Rs_transparent_all,
641	#endif	636	#endif
642	#if ENABLE_FRILLS	637	#if ENABLE_FRILLS
		638	Rs_pty_fd,
		639	Rs_hold,
643	Rs_ext_bwidth,	640	Rs_ext_bwidth,
644	Rs_int_bwidth,	641	Rs_int_bwidth,
645	Rs_borderLess,	642	Rs_borderLess,
646	Rs_lineSpace,	643	Rs_lineSpace,
647	Rs_pty_fd,	644	Rs_cursorUnderline,
		645	#endif
		646	#if CURSOR_BLINK
		647	Rs_cursorBlink,
648	#endif	648	#endif
649	#if ENABLE_XEMBED	649	#if ENABLE_XEMBED
650	Rs_embed,	650	Rs_embed,
651	#endif	651	#endif
652	Rs_cutchars,	652	Rs_cutchars,
653	Rs_modifier,	653	Rs_modifier,
654	Rs_answerbackstring,	654	Rs_answerbackstring,
655	Rs_tripleclickwords,	655	Rs_tripleclickwords,
656	Rs_insecure,	656	Rs_insecure,
657	Rs_cursorBlink,
658	Rs_pointerBlank,	657	Rs_pointerBlank,
659	Rs_pointerBlankDelay,	658	Rs_pointerBlankDelay,
660	Rs_imLocale,	659	Rs_imLocale,
661	Rs_imFont,	660	Rs_imFont,
662	Rs_pastableTabs,	661	Rs_pastableTabs,
…		…
812	#define dDisp Display *disp = display->display	811	#define dDisp Display *disp = display->display
813		812
814	/* convert pixel dimensions to row/column values. Everything as int32_t */	813	/* convert pixel dimensions to row/column values. Everything as int32_t */
815	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	814	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
816	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	815	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
817	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)	816	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
818	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)	817	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
819	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	818	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
820	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	819	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
821	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)	820	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
822	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)	821	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
823		822
824	#define TermWin_TotalWidth() ((int32_t)TermWin.width)	823	#define TermWin_TotalWidth() ((int32_t)this->width)
825	#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)]
826		831
827	/* how to build & extract colors and attributes */	832	/* how to build & extract colors and attributes */
828	#define GET_BASEFG(x) (((x) & RS_fgMask))	833	#define GET_BASEFG(x) (((x) & RS_fgMask))
829	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	834	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
830	#ifndef NO_BRIGHTCOLOR
831	# define GET_FGCOLOR(x) \
832	((((x) & RS_Bold) == 0 \
833	\|\| GET_BASEFG (x) < minCOLOR \
834	\|\| GET_BASEFG (x) >= minBrightCOLOR) \
835	? GET_BASEFG (x) \
836	: (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
837	# define GET_BGCOLOR(x) \
838	((((x) & RS_Blink) == 0 \
839	\|\| GET_BASEBG (x) < minCOLOR \
840	\|\| GET_BASEBG (x) >= minBrightCOLOR) \
841	? GET_BASEBG (x) \
842	: (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
843	#else
844	# define GET_FGCOLOR(x) GET_BASEFG(x)
845	# define GET_BGCOLOR(x) GET_BASEBG(x)
846	#endif
847		835
848	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)	836	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
849	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))	837	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))
850		838
851	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)	839	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
…		…
864		852
865	#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)))
866	#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)))
867		855
868	#if ENABLE_STYLES	856	#if ENABLE_STYLES
869	# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]	857	# define FONTSET(style) fontset[GET_STYLE (style)]
870	#else	858	#else
871	# define FONTSET(style) TermWin.fontset[0]	859	# define FONTSET(style) fontset[0]
872	#endif	860	#endif
873		861
874	#ifdef HAVE_SCROLLBARS	862	#ifdef HAVE_SCROLLBARS
875	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)	863	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
876	#else	864	#else
…		…
901	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	889	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
902	- scrollbar_minheight ())	890	- scrollbar_minheight ())
903		891
904	#if (MENUBAR_MAX > 1)	892	#if (MENUBAR_MAX > 1)
905	/* rendition style flags */	893	/* rendition style flags */
906	# define menuBar_height() (TermWin.fheight + SHADOW)	894	# define menuBar_height() (fheight + SHADOW)
907	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	895	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
908	# define isMenuBarWindow(w) ((w) == menuBar.win)	896	# define isMenuBarWindow(w) ((w) == menuBar.win)
909	#else	897	#else
910	# define menuBar_height() (0)	898	# define menuBar_height() (0)
911	# define menuBar_TotalHeight() (0)	899	# define menuBar_TotalHeight() (0)
…		…
958	#endif	946	#endif
959		947
960	extern class rxvt_failure_exception { } rxvt_failure_exception;	948	extern class rxvt_failure_exception { } rxvt_failure_exception;
961		949
962	typedef callback1<void, const char *> log_callback;	950	typedef callback1<void, const char *> log_callback;
		951	typedef callback1<int, int> getfd_callback;
963		952
964	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);	953	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
965	extern void rxvt_log (const char *fmt, ...);	954	extern void rxvt_log (const char *fmt, ...);
966	extern void rxvt_warn (const char *fmt, ...);	955	extern void rxvt_warn (const char *fmt, ...);
967	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	956	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
…		…
1044	class keyboard_manager;	1033	class keyboard_manager;
1045	#endif	1034	#endif
1046		1035
1047	struct rxvt_term : zero_initialized, rxvt_vars {	1036	struct rxvt_term : zero_initialized, rxvt_vars {
1048	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
1049		1039
1050	struct mbstate mbstate; // current input multibyte state	1040	struct mbstate mbstate; // current input multibyte state
1051		1041
1052	unsigned char want_refresh:1,	1042	unsigned char want_refresh:1,
1053	#ifdef TRANSPARENT	1043	#ifdef TRANSPARENT
…		…
1223	void scr_overlay_off ();	1213	void scr_overlay_off ();
1224	void scr_overlay_set (int x, int y,	1214	void scr_overlay_set (int x, int y,
1225	text_t text,	1215	text_t text,
1226	rend_t rend = OVERLAY_RSTYLE);	1216	rend_t rend = OVERLAY_RSTYLE);
1227	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);
1228	#endif	1219	#endif
1229		1220
1230	vector<void *> allocated; // free these memory blocks with free()	1221	vector<void *> allocated; // free these memory blocks with free()
1231		1222
1232	char env_windowid; / environmental variable WINDOWID */	1223	char env_windowid; / environmental variable WINDOWID */
…		…
1257	// ISO 14755 entry support	1248	// ISO 14755 entry support
1258	unicode_t iso14755buf;	1249	unicode_t iso14755buf;
1259	void commit_iso14755 ();	1250	void commit_iso14755 ();
1260	int hex_keyval (XKeyEvent &ev);	1251	int hex_keyval (XKeyEvent &ev);
1261	# if ISO_14755	1252	# if ISO_14755
1262	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);
1263	void iso14755_54 (int x, int y);	1254	void iso14755_54 (int x, int y);
1264	# endif	1255	# endif
1265	#endif	1256	#endif
1266		1257
1267	// modifies first argument(!)	1258	// modifies first argument(!)
…		…
1271		1262
1272	#if TRANSPARENT	1263	#if TRANSPARENT
1273	void rootwin_cb (XEvent &xev);	1264	void rootwin_cb (XEvent &xev);
1274	xevent_watcher rootwin_ev;	1265	xevent_watcher rootwin_ev;
1275	#endif	1266	#endif
1276
1277
1278	void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1279	void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1280		1267
1281	void x_cb (XEvent &xev);	1268	void x_cb (XEvent &xev);
1282	xevent_watcher termwin_ev;	1269	xevent_watcher termwin_ev;
1283	xevent_watcher vt_ev;	1270	xevent_watcher vt_ev;
1284	#ifdef HAVE_SCROLLBARS	1271	#ifdef HAVE_SCROLLBARS
…		…
1325		1312
1326	void tt_winch ();	1313	void tt_winch ();
1327		1314
1328	rxvt_term ();	1315	rxvt_term ();
1329	~rxvt_term ();	1316	~rxvt_term ();
		1317	void child_exit (); // child has exited, usually destroys
1330	void destroy ();	1318	void destroy ();
1331	void emergency_cleanup ();	1319	void emergency_cleanup ();
1332		1320
1333	bool init (int argc, const char const argv);	1321	bool init (int argc, const char const argv);
1334	bool init_vars ();	1322	bool init_vars ();
…		…
1345	int run_child (const char const argv);	1333	int run_child (const char const argv);
1346		1334
1347	void color_aliases (int idx);	1335	void color_aliases (int idx);
1348	void recolour_cursor ();	1336	void recolour_cursor ();
1349	void create_windows (int argc, const char const argv);	1337	void create_windows (int argc, const char const argv);
1350	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);
1351	void window_calc (unsigned int width, unsigned int height);	1339	void window_calc (unsigned int newwidth, unsigned int newheight);
1352		1340
1353	#if USE_XIM	1341	#if USE_XIM
1354	rxvt_xim *input_method;	1342	rxvt_xim *input_method;
1355	XIC Input_Context;	1343	XIC Input_Context;
1356	XIMStyle input_style;	1344	XIMStyle input_style;
…		…
1428	void set_title (const char *str);	1416	void set_title (const char *str);
1429	void set_icon_name (const char *str);	1417	void set_icon_name (const char *str);
1430	void set_window_color (int idx, const char *color);	1418	void set_window_color (int idx, const char *color);
1431	void set_colorfgbg ();	1419	void set_colorfgbg ();
1432	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1420	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1433	void set_widthheight (unsigned int width, unsigned int height);	1421	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1434		1422
1435	#ifdef MENUBAR	1423	#ifdef MENUBAR
1436	// menubar.C	1424	// menubar.C
1437	void menuitem_free (menu_t menu, menuitem_t item);	1425	void menuitem_free (menu_t menu, menuitem_t item);
1438	int action_dispatch (action_t *action);	1426	int action_dispatch (action_t *action);
…		…
1464	void menubar_control (XButtonEvent &ev);	1452	void menubar_control (XButtonEvent &ev);
1465	void map_menuBar (int map);	1453	void map_menuBar (int map);
1466	#endif	1454	#endif
1467		1455
1468	// screen.C	1456	// screen.C
1469	void scr_blank_line (text_t et, rend_t er, unsigned int width, rend_t efs);	1457
1470	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);
1471	int scr_scroll_text (int row1, int row2, int count, int spec);	1516	int scr_scroll_text (int row1, int row2, int count);
1472	void scr_reset ();	1517	void scr_reset ();
1473	void scr_reset_realloc ();
1474	void scr_release ();	1518	void scr_release ();
1475	void scr_clear (bool really = false);	1519	void scr_clear (bool really = false);
1476	void scr_refresh (unsigned char refresh_type);	1520	void scr_refresh (unsigned char refresh_type);
1477	bool scr_refresh_rend (rend_t mask, rend_t value);	1521	bool scr_refresh_rend (rend_t mask, rend_t value);
1478	void scr_erase_screen (int mode);	1522	void scr_erase_screen (int mode);
…		…
1484	void scr_touch (bool refresh);	1528	void scr_touch (bool refresh);
1485	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);
1486	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1530	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1487	void scr_recolour ();	1531	void scr_recolour ();
1488	void scr_remap_chars ();	1532	void scr_remap_chars ();
1489	void scr_remap_chars (text_t tp, rend_t rp);	1533	void scr_remap_chars (const line_t &l);
1490		1534
1491	void scr_poweron ();	1535	void scr_poweron ();
1492	void scr_cursor (int mode);	1536	void scr_cursor (int mode);
1493	void scr_do_wrap ();	1537	void scr_do_wrap ();
1494	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.154 by root, Mon Feb 21 19:30:58 2005 UTC vs. Revision 1.176 by root, Sat Dec 31 19:30:25 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.154 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.176 by root, Sat Dec 31 19:30:25 2005 UTC