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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.159 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.182 by root, Mon Jan 2 18:20:23 2006 UTC

…		…
70		70
71	#ifndef STDIN_FILENO	71	#ifndef STDIN_FILENO
72	# define STDIN_FILENO 0	72	# define STDIN_FILENO 0
73	# define STDOUT_FILENO 1	73	# define STDOUT_FILENO 1
74	# define STDERR_FILENO 2	74	# define STDERR_FILENO 2
75	#endif
76
77	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_PTMX)
79	# define NO_SETOWNER_TTYDEV 1
80	# endif
81	#endif
82	#if defined(__CYGWIN32__) \|\| defined(PTYS_ARE_OPENPTY)
83	# define NO_SETOWNER_TTYDEV 1
84	#endif	75	#endif
85		76
86	/*	77	/*
87	*****************************************************************************	78	*****************************************************************************
88	* PROTOTYPES	79	* PROTOTYPES
…		…
162	Time time; /* milliseconds */	153	Time time; /* milliseconds */
163	unsigned int state; /* key or button mask */	154	unsigned int state; /* key or button mask */
164	unsigned int button; /* detail */	155	unsigned int button; /* detail */
165	};	156	};
166		157
167	#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
168	#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
169	#define SWAP_IT(one, two, typeof) \
170	do { \
171	typeof swapittmp; \
172	(swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
173	} while (/* CONSTCOND */ 0)
174	#define BOUND_POSITIVE_INT16(val) \
175	(int16_t) ((val) <= 0 \
176	? 0 \
177	: min ((val), (((uint16_t)-1)>>1)))
178
179	#if ENABLE_FRILLS	158	#if ENABLE_FRILLS
180	typedef struct _mwmhints {	159	typedef struct _mwmhints {
181	CARD32 flags;	160	CARD32 flags;
182	CARD32 functions;	161	CARD32 functions;
183	CARD32 decorations;	162	CARD32 decorations;
…		…
234		213
235	#ifdef NO_RESOURCES	214	#ifdef NO_RESOURCES
236	# undef USE_XGETDEFAULT	215	# undef USE_XGETDEFAULT
237	#endif	216	#endif
238		217
239	#if ISO_14755	218	#if defined (ISO_14755) \|\| defined (ENABLE_PERL)
240	# define ENABLE_OVERLAY 1	219	# define ENABLE_OVERLAY 1
241	#endif	220	#endif
242		221
243	/* now look for other badly set stuff */	222	/* now look for other badly set stuff */
244		223
…		…
363	#define FONT_DN "#-"	342	#define FONT_DN "#-"
364	#define FONT_UP "#+"	343	#define FONT_UP "#+"
365		344
366	/* flags for rxvt_scr_gotorc () */	345	/* flags for rxvt_scr_gotorc () */
367	enum {	346	enum {
368	C_RELATIVE = 1 , /* col movement is relative */	347	C_RELATIVE = 1, /* col movement is relative */
369	R_RELATIVE = 2, /* row movement is relative */	348	R_RELATIVE = 2, /* row movement is relative */
370	RELATIVE = 1 \| 2,	349	RELATIVE = C_RELATIVE \| R_RELATIVE,
371	};	350	};
372		351
373	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */	352	/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
374	enum {	353	enum {
375	INSERT = -1, /* don't change these values */	354	INSERT = -1, /* don't change these values */
…		…
388	enum {	367	enum {
389	PRIMARY = 0,	368	PRIMARY = 0,
390	SECONDARY,	369	SECONDARY,
391	};	370	};
392		371
393	#define RS_None 0 /* Normal */	372	#define RS_None 0
394		373
395	#define RS_fgMask 0x0000007fUL /* 128 colors */	374	#define RS_fgMask 0x0000007fUL // 128 colors
396	#define RS_bgMask 0x00003f80UL /* 128 colors */	375	#define RS_bgMask 0x00003f80UL // 128 colors
397		376
398	// font styles	377	// font styles
399	#define RS_Bold 0x00004000UL // value 1	378	#define RS_Bold 0x00004000UL // value 1
400	#define RS_Italic 0x00008000UL // value 2	379	#define RS_Italic 0x00008000UL // value 2
401		380
402	// fake styles	381	// fake styles
403	#define RS_Blink 0x00010000UL /* blink */	382	#define RS_Blink 0x00010000UL // blink
404	#define RS_RVid 0x00020000UL /* reverse video */	383	#define RS_RVid 0x00020000UL // reverse video
405	#define RS_Uline 0x00040000UL /* underline */	384	#define RS_Uline 0x00040000UL // underline
406		385
407	// 5 bits still to go	386	// 5 custom bits for extensions
		387	#define RS_customCount 32
		388	#define RS_customMask 0x00f80000UL
		389	#define RS_customShift 19
408		390
409	// other flags	391	// other flags
410	#define RS_Careful 0x80000000UL /* be careful when drawing these */	392	#define RS_Careful 0x80000000UL /* be careful when drawing these */
411		393
412	#define RS_styleCount 4	394	#define RS_styleCount 4
…		…
491	URxvt_view_down = 721,	473	URxvt_view_down = 721,
492	};	474	};
493		475
494	/* Words starting with `Color_' are colours. Others are counts */	476	/* Words starting with `Color_' are colours. Others are counts */
495	/*	477	/*
496	* The following comment is mostly obsolete since pixcolor_set was expanded:
497	* We're currently upto 29 colours. Only 3 more available. The
498	* PixColor and rendition colour usage should probably be decoupled	478	* The PixColor and rendition colour usage should probably be decoupled
499	* on the unnecessary items, e.g. Color_pointer, but won't bother	479	* on the unnecessary items, e.g. Color_pointer, but won't bother
500	* until we need to. Also, be aware of usage in pixcolor_set	480	* until we need to. Also, be aware of usage in pixcolor_set
501	*/	481	*/
502		482
503	enum colour_list {	483	enum colour_list {
…		…
553	Color_trough,	533	Color_trough,
554	#endif	534	#endif
555	#if TINTING	535	#if TINTING
556	Color_tint,	536	Color_tint,
557	#endif	537	#endif
		538	#if OFF_FOCUS_FADING
		539	Color_fade,
		540	#endif
558	NRS_COLORS, /* */	541	NRS_COLORS, /* */
559	#ifdef KEEP_SCROLLCOLOR	542	#ifdef KEEP_SCROLLCOLOR
560	Color_topShadow = NRS_COLORS,	543	Color_topShadow = NRS_COLORS,
561	Color_bottomShadow,	544	Color_bottomShadow,
562	TOTAL_COLORS	545	TOTAL_COLORS
…		…
572		555
573	/*	556	/*
574	* Resource list	557	* Resource list
575	*/	558	*/
576	enum {	559	enum {
577	Rs_display_name = 0,	560	#define Rs_def(name) Rs_ ## name,
578	Rs_term_name,	561	#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
579	Rs_iconName,	562	#include "rsinc.h"
580	Rs_geometry,	563	#undef Rs_def
581	Rs_reverseVideo,	564	#undef Rs_reserve
582	Rs_color,
583	_Rs_color = Rs_color + NRS_COLORS - 1,
584	Rs_font,
585	#if ENABLE_STYLES
586	Rs_boldFont,
587	Rs_italicFont,
588	Rs_boldItalicFont,
589	#endif
590	Rs_name,
591	Rs_title,
592	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
593	Rs_path,
594	#endif
595	#ifdef XPM_BACKGROUND
596	Rs_backgroundPixmap,
597	#endif
598	#if (MENUBAR_MAX)
599	Rs_menu,
600	#endif
601	Rs_loginShell,
602	Rs_jumpScroll,
603	#ifdef HAVE_SCROLLBARS
604	Rs_scrollBar,
605	Rs_scrollBar_right,
606	Rs_scrollBar_floating,
607	Rs_scrollBar_align,
608	Rs_scrollstyle, /* Rs_scrollBar_style */
609	Rs_scrollBar_thickness,
610	#endif
611	Rs_scrollTtyOutput,
612	Rs_scrollTtyKeypress,
613	Rs_scrollWithBuffer,
614	Rs_saveLines,
615	Rs_utmpInhibit,
616	Rs_visualBell,
617	#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
618	Rs_mapAlert,
619	#endif
620	#ifdef META8_OPTION
621	Rs_meta8,
622	#endif
623	#ifdef MOUSE_WHEEL
624	Rs_mouseWheelScrollPage,
625	#endif
626	#ifndef NO_BACKSPACE_KEY
627	Rs_backspace_key,
628	#endif
629	#ifndef NO_DELETE_KEY
630	Rs_delete_key,
631	#endif
632	Rs_selectstyle,
633	#ifdef PRINTPIPE
634	Rs_print_pipe,
635	#endif
636	#ifdef USE_XIM
637	Rs_preeditType,
638	Rs_inputMethod,
639	#endif
640	#ifdef TRANSPARENT
641	Rs_transparent,
642	Rs_transparent_all,
643	#endif
644	#if ENABLE_FRILLS
645	Rs_ext_bwidth,
646	Rs_int_bwidth,
647	Rs_borderLess,
648	Rs_lineSpace,
649	Rs_pty_fd,
650	Rs_cursorUnderline,
651	#endif
652	#if CURSOR_BLINK
653	Rs_cursorBlink,
654	#endif
655	#if ENABLE_XEMBED
656	Rs_embed,
657	#endif
658	Rs_cutchars,
659	Rs_modifier,
660	Rs_answerbackstring,
661	Rs_tripleclickwords,
662	Rs_insecure,
663	Rs_pointerBlank,
664	Rs_pointerBlankDelay,
665	Rs_imLocale,
666	Rs_imFont,
667	Rs_pastableTabs,
668	#ifndef NO_SECONDARY_SCREEN
669	Rs_secondaryScreen,
670	Rs_secondaryScroll,
671	#endif
672	#ifdef OFF_FOCUS_FADING
673	Rs_fade,
674	#endif
675	#ifdef TINTING
676	Rs_shade,
677	#endif
678	NUM_RESOURCES	565	NUM_RESOURCES
679	};	566	};
680		567
681	// see init.C:xa_names, which must be kept in sync	568	// see init.C:xa_names, which must be kept in sync
682	enum {	569	enum {
…		…
757	#endif	644	#endif
758		645
759	// do not change these constants lightly, there are many interdependencies	646	// do not change these constants lightly, there are many interdependencies
760	#define IMBUFSIZ 128 // input modifier buffer sizes	647	#define IMBUFSIZ 128 // input modifier buffer sizes
761	#define KBUFSZ 512 // size of keyboard mapping buffer	648	#define KBUFSZ 512 // size of keyboard mapping buffer
762	#define CBUFSIZ 4096 // size of command buffer	649	#define CBUFSIZ 2048 // size of command buffer
763	#define UBUFSIZ 4096 // character buffer	650	#define UBUFSIZ 2048 // character buffer
764		651
765	#ifndef PATH_MAX	652	#ifndef PATH_MAX
766	# define PATH_MAX 16384	653	# define PATH_MAX 16384
767	#endif	654	#endif
768		655
…		…
817	#define dDisp Display *disp = display->display	704	#define dDisp Display *disp = display->display
818		705
819	/* convert pixel dimensions to row/column values. Everything as int32_t */	706	/* convert pixel dimensions to row/column values. Everything as int32_t */
820	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	707	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
821	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	708	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
822	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)	709	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
823	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)	710	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
824	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	711	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
825	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	712	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
826	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)	713	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
827	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)	714	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
828		715
829	#define TermWin_TotalWidth() ((int32_t)TermWin.width)	716	#define TermWin_TotalWidth() ((int32_t)this->width)
830	#define TermWin_TotalHeight() ((int32_t)TermWin.height)	717	#define TermWin_TotalHeight() ((int32_t)this->height)
		718
		719	// for m >= -n, ensure remainder lies between 0..n-1
		720	#define MOD(m,n) (((m) + (n)) % (n))
		721
		722	#define LINENO(n) MOD (term_start + int(n), total_rows)
		723	#define ROW(n) row_buf [LINENO (n)]
831		724
832	/* how to build & extract colors and attributes */	725	/* how to build & extract colors and attributes */
833	#define GET_BASEFG(x) (((x) & RS_fgMask))	726	#define GET_BASEFG(x) (((x) & RS_fgMask))
834	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	727	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
835	#ifndef NO_BRIGHTCOLOR
836	# define GET_FGCOLOR(x) \
837	((((x) & RS_Bold) == 0 \
838	\|\| GET_BASEFG (x) < minCOLOR \
839	\|\| GET_BASEFG (x) >= minBrightCOLOR) \
840	? GET_BASEFG (x) \
841	: (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
842	# define GET_BGCOLOR(x) \
843	((((x) & RS_Blink) == 0 \
844	\|\| GET_BASEBG (x) < minCOLOR \
845	\|\| GET_BASEBG (x) >= minBrightCOLOR) \
846	? GET_BASEBG (x) \
847	: (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
848	#else
849	# define GET_FGCOLOR(x) GET_BASEFG(x)
850	# define GET_BGCOLOR(x) GET_BASEBG(x)
851	#endif
852		728
853	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)	729	#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
854	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))	730	#define SET_FONT(x,fid) (((x) & ~RS_fontMask) \| ((fid) << RS_fontShift))
855		731
856	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)	732	#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
…		…
869		745
870	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))	746	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))
871	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))	747	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
872		748
873	#if ENABLE_STYLES	749	#if ENABLE_STYLES
874	# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]	750	# define FONTSET(style) fontset[GET_STYLE (style)]
875	#else	751	#else
876	# define FONTSET(style) TermWin.fontset[0]	752	# define FONTSET(style) fontset[0]
877	#endif	753	#endif
878		754
879	#ifdef HAVE_SCROLLBARS	755	#ifdef HAVE_SCROLLBARS
880	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)	756	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
881	#else	757	#else
…		…
906	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	782	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
907	- scrollbar_minheight ())	783	- scrollbar_minheight ())
908		784
909	#if (MENUBAR_MAX > 1)	785	#if (MENUBAR_MAX > 1)
910	/* rendition style flags */	786	/* rendition style flags */
911	# define menuBar_height() (TermWin.fheight + SHADOW)	787	# define menuBar_height() (fheight + SHADOW)
912	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	788	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
913	# define isMenuBarWindow(w) ((w) == menuBar.win)	789	# define isMenuBarWindow(w) ((w) == menuBar.win)
914	#else	790	#else
915	# define menuBar_height() (0)	791	# define menuBar_height() (0)
916	# define menuBar_TotalHeight() (0)	792	# define menuBar_TotalHeight() (0)
…		…
963	#endif	839	#endif
964		840
965	extern class rxvt_failure_exception { } rxvt_failure_exception;	841	extern class rxvt_failure_exception { } rxvt_failure_exception;
966		842
967	typedef callback1<void, const char *> log_callback;	843	typedef callback1<void, const char *> log_callback;
		844	typedef callback1<int, int> getfd_callback;
968		845
969	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);	846	extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
970	extern void rxvt_log (const char *fmt, ...);	847	extern void rxvt_log (const char *fmt, ...);
971	extern void rxvt_warn (const char *fmt, ...);	848	extern void rxvt_warn (const char *fmt, ...);
972	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));	849	extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
973	extern void rxvt_exit_failure () __attribute__ ((noreturn));	850	extern void rxvt_exit_failure () __attribute__ ((noreturn));
974		851
975	#define SET_LOCALE(locale) rxvt_set_locale (locale)	852	#define SET_LOCALE(locale) rxvt_set_locale (locale)
976	extern bool rxvt_set_locale (const char *locale);	853	extern bool rxvt_set_locale (const char *locale);
		854	extern bool rxvt_push_locale (const char *locale);
		855	extern void rxvt_pop_locale ();
977		856
978	/*	857	/*
979	*****************************************************************************	858	*****************************************************************************
980	* VARIABLES	859	* VARIABLES
981	*****************************************************************************	860	*****************************************************************************
…		…
1049	class keyboard_manager;	928	class keyboard_manager;
1050	#endif	929	#endif
1051		930
1052	struct rxvt_term : zero_initialized, rxvt_vars {	931	struct rxvt_term : zero_initialized, rxvt_vars {
1053	log_callback *log_hook; // log error messages through this hook, if != 0	932	log_callback *log_hook; // log error messages through this hook, if != 0
		933	getfd_callback *getfd_hook; // convert remote to local fd, if != 0
		934
		935	#if ENABLE_PERL
		936	void *self; // perl's $self
		937	#endif
1054		938
1055	struct mbstate mbstate; // current input multibyte state	939	struct mbstate mbstate; // current input multibyte state
1056		940
1057	unsigned char want_refresh:1,	941	unsigned char want_refresh:1,
1058	#ifdef TRANSPARENT	942	#ifdef TRANSPARENT
…		…
1263	// ISO 14755 entry support	1147	// ISO 14755 entry support
1264	unicode_t iso14755buf;	1148	unicode_t iso14755buf;
1265	void commit_iso14755 ();	1149	void commit_iso14755 ();
1266	int hex_keyval (XKeyEvent &ev);	1150	int hex_keyval (XKeyEvent &ev);
1267	# if ISO_14755	1151	# if ISO_14755
1268	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);	1152	void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1269	void iso14755_54 (int x, int y);	1153	void iso14755_54 (int x, int y);
1270	# endif	1154	# endif
1271	#endif	1155	#endif
1272		1156
1273	// modifies first argument(!)	1157	// modifies first argument(!)
…		…
1277		1161
1278	#if TRANSPARENT	1162	#if TRANSPARENT
1279	void rootwin_cb (XEvent &xev);	1163	void rootwin_cb (XEvent &xev);
1280	xevent_watcher rootwin_ev;	1164	xevent_watcher rootwin_ev;
1281	#endif	1165	#endif
1282
1283
1284	void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1285	void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1286		1166
1287	void x_cb (XEvent &xev);	1167	void x_cb (XEvent &xev);
1288	xevent_watcher termwin_ev;	1168	xevent_watcher termwin_ev;
1289	xevent_watcher vt_ev;	1169	xevent_watcher vt_ev;
1290	#ifdef HAVE_SCROLLBARS	1170	#ifdef HAVE_SCROLLBARS
…		…
1331		1211
1332	void tt_winch ();	1212	void tt_winch ();
1333		1213
1334	rxvt_term ();	1214	rxvt_term ();
1335	~rxvt_term ();	1215	~rxvt_term ();
		1216	void child_exit (); // child has exited, usually destroys
1336	void destroy ();	1217	void destroy ();
1337	void emergency_cleanup ();	1218	void emergency_cleanup ();
1338		1219
1339	bool init (int argc, const char const argv);	1220	bool init (int argc, const char const argv);
1340	bool init_vars ();	1221	bool init_vars ();
…		…
1351	int run_child (const char const argv);	1232	int run_child (const char const argv);
1352		1233
1353	void color_aliases (int idx);	1234	void color_aliases (int idx);
1354	void recolour_cursor ();	1235	void recolour_cursor ();
1355	void create_windows (int argc, const char const argv);	1236	void create_windows (int argc, const char const argv);
1356	void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);	1237	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1357	void window_calc (unsigned int width, unsigned int height);	1238	void window_calc (unsigned int newwidth, unsigned int newheight);
1358		1239
1359	#if USE_XIM	1240	#if USE_XIM
1360	rxvt_xim *input_method;	1241	rxvt_xim *input_method;
1361	XIC Input_Context;	1242	XIC Input_Context;
1362	XIMStyle input_style;	1243	XIMStyle input_style;
…		…
1434	void set_title (const char *str);	1315	void set_title (const char *str);
1435	void set_icon_name (const char *str);	1316	void set_icon_name (const char *str);
1436	void set_window_color (int idx, const char *color);	1317	void set_window_color (int idx, const char *color);
1437	void set_colorfgbg ();	1318	void set_colorfgbg ();
1438	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1319	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1439	void set_widthheight (unsigned int width, unsigned int height);	1320	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1440		1321
1441	#ifdef MENUBAR	1322	#ifdef MENUBAR
1442	// menubar.C	1323	// menubar.C
1443	void menuitem_free (menu_t menu, menuitem_t item);	1324	void menuitem_free (menu_t menu, menuitem_t item);
1444	int action_dispatch (action_t *action);	1325	int action_dispatch (action_t *action);
…		…
1470	void menubar_control (XButtonEvent &ev);	1351	void menubar_control (XButtonEvent &ev);
1471	void map_menuBar (int map);	1352	void map_menuBar (int map);
1472	#endif	1353	#endif
1473		1354
1474	// screen.C	1355	// screen.C
1475	void scr_blank_line (text_t et, rend_t er, unsigned int width, rend_t efs);	1356
1476	void scr_blank_screen_mem (text_t tp, rend_t rp, unsigned int row, rend_t efs);	1357	void lalloc (line_t &l)
		1358	{
		1359	l.t = (text_t *)talloc->alloc ();
		1360	l.r = (rend_t *)ralloc->alloc ();
		1361	}
		1362
		1363	#if 0
		1364	void lfree (line_t &l)
		1365	{
		1366	talloc->free (l.t);
		1367	ralloc->free (l.r);
		1368	}
		1369	#endif
		1370
		1371	void lresize (line_t &l)
		1372	{
		1373	if (!l.t)
		1374	return;
		1375
		1376	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
		1377	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
		1378
		1379	l.l = min (l.l, ncol);
		1380
		1381	if (ncol > prev_ncol)
		1382	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
		1383	}
		1384
		1385	int fgcolor_of (rend_t r)
		1386	{
		1387	int base = GET_BASEFG (r);
		1388	#ifndef NO_BRIGHTCOLOR
		1389	if (r & RS_Bold
		1390	# if ENABLE_STYLES
		1391	&& OPTION (Opt_intensityStyles)
		1392	# endif
		1393	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
		1394	base += minBrightCOLOR - minCOLOR;
		1395	#endif
		1396	return base;
		1397	}
		1398
		1399	int bgcolor_of (rend_t r)
		1400	{
		1401	int base = GET_BASEBG (r);
		1402	#ifndef NO_BRIGHTCOLOR
		1403	if (r & RS_Blink
		1404	# if ENABLE_STYLES
		1405	&& OPTION (Opt_intensityStyles)
		1406	# endif
		1407	&& IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
		1408	base += minBrightCOLOR - minCOLOR;
		1409	#endif
		1410	return base;
		1411	}
		1412
		1413	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
		1414	void scr_blank_screen_mem (line_t &l, rend_t efs);
1477	int scr_scroll_text (int row1, int row2, int count, int spec);	1415	int scr_scroll_text (int row1, int row2, int count);
1478	void scr_reset ();	1416	void scr_reset ();
1479	void scr_reset_realloc ();
1480	void scr_release ();	1417	void scr_release ();
1481	void scr_clear (bool really = false);	1418	void scr_clear (bool really = false);
1482	void scr_refresh (unsigned char refresh_type);	1419	void scr_refresh (unsigned char refresh_type);
1483	bool scr_refresh_rend (rend_t mask, rend_t value);	1420	bool scr_refresh_rend (rend_t mask, rend_t value);
1484	void scr_erase_screen (int mode);	1421	void scr_erase_screen (int mode);
…		…
1490	void scr_touch (bool refresh);	1427	void scr_touch (bool refresh);
1491	void scr_expose (int x, int y, int width, int height, bool refresh);	1428	void scr_expose (int x, int y, int width, int height, bool refresh);
1492	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1429	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1493	void scr_recolour ();	1430	void scr_recolour ();
1494	void scr_remap_chars ();	1431	void scr_remap_chars ();
1495	void scr_remap_chars (text_t tp, rend_t rp);	1432	void scr_remap_chars (const line_t &l);
1496		1433
1497	void scr_poweron ();	1434	void scr_poweron ();
1498	void scr_cursor (int mode);	1435	void scr_cursor (int mode);
1499	void scr_do_wrap ();	1436	void scr_do_wrap ();
1500	int scr_change_screen (int scrn);	1437	int scr_change_screen (int scrn);
…		…
1532	void selection_property (Window win, Atom prop);	1469	void selection_property (Window win, Atom prop);
1533	void selection_request (Time tm, int x, int y);	1470	void selection_request (Time tm, int x, int y);
1534	int selection_request_other (Atom target, int selnum);	1471	int selection_request_other (Atom target, int selnum);
1535	void selection_clear ();	1472	void selection_clear ();
1536	void selection_make (Time tm);	1473	void selection_make (Time tm);
		1474	bool selection_grab (Time tm);
1537	void selection_start_colrow (int col, int row);	1475	void selection_start_colrow (int col, int row);
1538	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);	1476	void selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret);
1539	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);	1477	void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1540	void selection_remove_trailing_spaces ();	1478	void selection_remove_trailing_spaces ();
1541	void selection_send (const XSelectionRequestEvent &rq);	1479	void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.159 by root, Fri Aug 5 16:42:44 2005 UTC vs. Revision 1.182 by root, Mon Jan 2 18:20:23 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.159 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.182 by root, Mon Jan 2 18:20:23 2006 UTC