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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.182 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.188 by root, Fri Jan 6 18:33:30 2006 UTC

…		…
238	# define HAVE_SCROLLBARS 1	238	# define HAVE_SCROLLBARS 1
239	#endif	239	#endif
240		240
241	/* width of scrollBar, menuBar shadow, must be 1 or 2 */	241	/* width of scrollBar, menuBar shadow, must be 1 or 2 */
242	#ifdef HALFSHADOW	242	#ifdef HALFSHADOW
243	# define SHADOW 1	243	# define MENU_SHADOW 1
244	#else	244	#else
245	# define SHADOW 2	245	# define MENU_SHADOW 2
246	#endif	246	#endif
247		247
248	#define R_SB_ALIGN_CENTRE 0	248	#define R_SB_ALIGN_CENTRE 0
249	#define R_SB_ALIGN_TOP 1	249	#define R_SB_ALIGN_TOP 1
250	#define R_SB_ALIGN_BOTTOM 2	250	#define R_SB_ALIGN_BOTTOM 2
…		…
469	URxvt_italicFont = 712,	469	URxvt_italicFont = 712,
470	URxvt_boldItalicFont = 713,	470	URxvt_boldItalicFont = 713,
471		471
472	URxvt_view_up = 720,	472	URxvt_view_up = 720,
473	URxvt_view_down = 721,	473	URxvt_view_down = 721,
		474
		475	URxvt_perl = 777,
474	};	476	};
475		477
476	/* Words starting with `Color_' are colours. Others are counts */	478	/* Words starting with `Color_' are colours. Others are counts */
477	/*	479	/*
478	* The PixColor and rendition colour usage should probably be decoupled	480	* The PixColor and rendition colour usage should probably be decoupled
…		…
555		557
556	/*	558	/*
557	* Resource list	559	* Resource list
558	*/	560	*/
559	enum {	561	enum {
560	#define Rs_def(name) Rs_ ## name,	562	# define def(name) Rs_ ## name,
561	#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,	563	# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562	#include "rsinc.h"	564	# include "rsinc.h"
563	#undef Rs_def	565	# undef def
564	#undef Rs_reserve	566	# undef reserve
565	NUM_RESOURCES	567	NUM_RESOURCES
566	};	568	};
567		569
568	// see init.C:xa_names, which must be kept in sync	570	// see init.C:xa_names, which must be kept in sync
569	enum {	571	enum {
…		…
683	/*	685	/*
684	*****************************************************************************	686	*****************************************************************************
685	* MACRO DEFINES	687	* MACRO DEFINES
686	*****************************************************************************	688	*****************************************************************************
687	*/	689	*/
688	#define memset(x, y, z) memset((x), (y), (size_t)(z))
689	#define memcpy(x, y, z) memcpy((void )(x), (const void )(y), (z))
690	#define memmove(x, y, z) memmove((void )(x), (const void )(y), (z))
691	#define strcasecmp(x, y) strcasecmp((x), (y))
692	#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
693	#define strcpy(x, y) strcpy((char )(x), (const char )(y))
694	#define strncpy(x, y, z) strncpy((char )(x), (const char )(y), (z))
695	#define strcmp(x, y) strcmp((const char )(x), (const char )(y))
696	#define strncmp(x, y, z) strncmp((const char )(x), (const char )(y), (z))
697	#define strcat(x, y) strcat((char )(x), (const char )(y))
698	#define strncat(x, y, z) strncat((char )(x), (const char )(y), (z))
699	#define strdup(x) strdup((const char *)(x))
700	#define strlen(x) strlen((const char *)(x))
701	#define strchr(x, y) strchr((const char *)(x), (int)(y))
702	#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
703
704	#define dDisp Display *disp = display->display	690	#define dDisp Display *disp = display->display
705		691
706	/* convert pixel dimensions to row/column values. Everything as int32_t */	692	/* convert pixel dimensions to row/column values. Everything as int32_t */
707	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	693	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
708	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	694	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
…		…
711	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	697	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
712	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	698	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
713	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)	699	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
714	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)	700	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
715		701
716	#define TermWin_TotalWidth() ((int32_t)this->width)
717	#define TermWin_TotalHeight() ((int32_t)this->height)
718
719	// for m >= -n, ensure remainder lies between 0..n-1	702	// for m >= -n, ensure remainder lies between 0..n-1
720	#define MOD(m,n) (((m) + (n)) % (n))	703	#define MOD(m,n) (((m) + (n)) % (n))
721		704
722	#define LINENO(n) MOD (term_start + int(n), total_rows)	705	#define LINENO(n) MOD (term_start + int(n), total_rows)
723	#define ROW(n) row_buf [LINENO (n)]	706	#define ROW(n) row_buf [LINENO (n)]
…		…
782	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	765	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
783	- scrollbar_minheight ())	766	- scrollbar_minheight ())
784		767
785	#if (MENUBAR_MAX > 1)	768	#if (MENUBAR_MAX > 1)
786	/* rendition style flags */	769	/* rendition style flags */
787	# define menuBar_height() (fheight + SHADOW)	770	# define menuBar_height() (fheight + MENU_SHADOW)
788	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	771	# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
789	# define isMenuBarWindow(w) ((w) == menuBar.win)	772	# define isMenuBarWindow(w) ((w) == menuBar.win)
790	#else	773	#else
791	# define menuBar_height() (0)	774	# define menuBar_height() (0)
792	# define menuBar_TotalHeight() (0)	775	# define menuBar_TotalHeight() (0)
793	# define isMenuBarWindow(w) (0)	776	# define isMenuBarWindow(w) (0)
…		…
852	#define SET_LOCALE(locale) rxvt_set_locale (locale)	835	#define SET_LOCALE(locale) rxvt_set_locale (locale)
853	extern bool rxvt_set_locale (const char *locale);	836	extern bool rxvt_set_locale (const char *locale);
854	extern bool rxvt_push_locale (const char *locale);	837	extern bool rxvt_push_locale (const char *locale);
855	extern void rxvt_pop_locale ();	838	extern void rxvt_pop_locale ();
856		839
857	/*
858	*****************************************************************************	840	/****************************************************************************/
859	* VARIABLES	841
860	*****************************************************************************
861	*/
862	#ifdef MENUBAR	842	#ifdef MENUBAR
863	# include "menubar.h"	843	# include "menubar.h"
864	#endif	844	#endif
865		845
866	#define BLINK_INTERVAL 0.5	846	#define BLINK_INTERVAL 0.5
…		…
873	# endif	853	# endif
874	# endif	854	# endif
875	# define __attribute__(x)	855	# define __attribute__(x)
876	#endif	856	#endif
877		857
		858	/****************************************************************************/
		859
		860	#define LINE_LONGER 0x0001 // line is continued on the next row
		861	#define LINE_FILTERED 0x0002 // line has been filtered
		862	#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
		863
		864	struct line_t {
		865	text_t *t; // terminal the text
		866	rend_t *r; // rendition, uses RS_ flags
		867	tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
		868	uint32_t f; // flags
		869
		870	bool is_longer ()
		871	{
		872	return f & LINE_LONGER;
		873	}
		874
		875	void is_longer (int set)
		876	{
		877	if (set)
		878	f \|= LINE_LONGER;
		879	else
		880	f &= ~LINE_LONGER;
		881	}
		882
		883	void clear ()
		884	{
		885	t = 0;
		886	r = 0;
		887	l = 0;
		888	f = 0;
		889	}
		890
		891	void touch () // call whenever a line is changed/touched/updated
		892	{
		893	#if ENABLE_PERL
		894	f &= ~LINE_FILTERED;
		895	#endif
		896	}
		897
		898	void touch (int col)
		899	{
		900	max_it (l, col);
		901	touch ();
		902	}
		903	};
		904
		905	/****************************************************************************/
		906
878	// primivite wrapper around mbstate_t to ensure initialisation	907	// primivite wrapper around mbstate_t to ensure initialisation
879	struct mbstate {	908	struct mbstate {
880	mbstate_t mbs;	909	mbstate_t mbs;
881		910
882	operator mbstate_t *() { return &mbs; }	911	operator mbstate_t *() { return &mbs; }
883	void reset () { memset (&mbs, 0, sizeof (mbs)); }	912	void reset () { memset (&mbs, 0, sizeof (mbs)); }
884	mbstate () { reset (); }	913	mbstate () { reset (); }
885	};	914	};
		915
		916	/****************************************************************************/
886		917
887	#define UNICODE_MASK 0x1fffffUL	918	#define UNICODE_MASK 0x1fffffUL
888		919
889	#if UNICODE3	920	#if UNICODE3
890	# define COMPOSE_LO 0x40000000UL	921	# define COMPOSE_LO 0x40000000UL
…		…
921	};	952	};
922		953
923	extern class rxvt_composite_vec rxvt_composite;	954	extern class rxvt_composite_vec rxvt_composite;
924	#endif	955	#endif
925		956
		957	/****************************************************************************/
926		958
927	#ifdef KEYSYM_RESOURCE	959	#ifdef KEYSYM_RESOURCE
928	class keyboard_manager;	960	class keyboard_manager;
929	#endif	961	#endif
930		962
…		…
1093	bar_t *CurrentBar;	1125	bar_t *CurrentBar;
1094	# if ! (MENUBAR_MAX > 1)	1126	# if ! (MENUBAR_MAX > 1)
1095	bar_t BarList;	1127	bar_t BarList;
1096	# endif /* (MENUBAR_MAX > 1) */	1128	# endif /* (MENUBAR_MAX > 1) */
1097	#endif	1129	#endif
1098	#ifdef CURSOR_BLINK
1099	struct timeval lastcursorchange;
1100	#endif
1101	#ifdef POINTER_BLANK
1102	struct timeval lastmotion;
1103	#endif
1104		1130
1105	#if ENABLE_OVERLAY	1131	#if ENABLE_OVERLAY
1106	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions	1132	int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1107	text_t **ov_text;	1133	text_t **ov_text;
1108	rend_t **ov_rend;	1134	rend_t **ov_rend;
…		…
1123	char env_display; / environmental variable DISPLAY */	1149	char env_display; / environmental variable DISPLAY */
1124	char env_term; / environmental variable TERM */	1150	char env_term; / environmental variable TERM */
1125	char *env_colorfgbg;	1151	char *env_colorfgbg;
1126	char *locale;	1152	char *locale;
1127	char charsets[4];	1153	char charsets[4];
1128	unsigned char v_buffer; / pointer to physical buffer */	1154	char v_buffer; / pointer to physical buffer */
1129	unsigned int v_buflen; /* size of area to write */	1155	unsigned int v_buflen; /* size of area to write */
1130	stringvec argv, envv; /* if != 0, will be freed on destroy time */	1156	stringvec argv, envv; /* if != 0, will be freed on destroy time */
1131		1157
1132	#ifdef KEYSYM_RESOURCE	1158	#ifdef KEYSYM_RESOURCE
1133	keyboard_manager *keyboard;	1159	keyboard_manager *keyboard;
1134	#endif	1160	#endif
1135		1161
1136	const char *rs[NUM_RESOURCES];	1162	const char *rs[NUM_RESOURCES];
1137	/* command input buffering */	1163	/* command input buffering */
1138	unsigned char cmdbuf_ptr, cmdbuf_endp;	1164	char cmdbuf_ptr, cmdbuf_endp;
1139	unsigned char cmdbuf_base[CBUFSIZ];	1165	char cmdbuf_base[CBUFSIZ];
1140		1166
1141	rxvt_salloc *talloc; // text line allocator	1167	rxvt_salloc *talloc; // text line allocator
1142	rxvt_salloc *ralloc; // rend line allocator	1168	rxvt_salloc *ralloc; // rend line allocator
1143		1169
1144	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's	1170	static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
…		…
1153	void iso14755_54 (int x, int y);	1179	void iso14755_54 (int x, int y);
1154	# endif	1180	# endif
1155	#endif	1181	#endif
1156		1182
1157	// modifies first argument(!)	1183	// modifies first argument(!)
1158	void paste (unsigned char *data, unsigned int len);	1184	void paste (char *data, unsigned int len);
1159		1185
1160	void flush ();	1186	void flush ();
1161		1187
1162	#if TRANSPARENT	1188	#if TRANSPARENT
1163	void rootwin_cb (XEvent &xev);	1189	void rootwin_cb (XEvent &xev);
…		…
1204	void pointer_blank ();	1230	void pointer_blank ();
1205	#endif	1231	#endif
1206	void pointer_unblank ();	1232	void pointer_unblank ();
1207		1233
1208	void tt_printf (const char *fmt,...);	1234	void tt_printf (const char *fmt,...);
1209	void tt_write (const unsigned char *data, unsigned int len);	1235	void tt_write (const char *data, unsigned int len);
1210	void pty_write ();	1236	void pty_write ();
1211		1237
1212	void tt_winch ();	1238	void tt_winch ();
1213		1239
1214	rxvt_term ();	1240	rxvt_term ();
…		…
1266		1292
1267	/* autoconvert */	1293	/* autoconvert */
1268		1294
1269	// command.C	1295	// command.C
1270	void lookup_key (XKeyEvent &ev);	1296	void lookup_key (XKeyEvent &ev);
1271	unsigned int cmd_write (const unsigned char *str, unsigned int count);	1297	unsigned int cmd_write (const char *str, unsigned int count);
1272		1298
1273	unicode_t next_char ();	1299	wchar_t next_char ();
1274	unicode_t cmd_getc ();	1300	wchar_t cmd_getc ();
1275	unicode_t next_octet ();	1301	uint32_t next_octet ();
1276	unicode_t cmd_get8 ();	1302	uint32_t cmd_get8 ();
1277		1303
1278	bool cmd_parse ();	1304	bool cmd_parse ();
1279	void mouse_report (XButtonEvent &ev);	1305	void mouse_report (XButtonEvent &ev);
1280	void button_press (XButtonEvent &ev);	1306	void button_press (XButtonEvent &ev);
1281	void button_release (XButtonEvent &ev);	1307	void button_release (XButtonEvent &ev);
…		…
1290	void process_nonprinting (unicode_t ch);	1316	void process_nonprinting (unicode_t ch);
1291	void process_escape_vt52 (unicode_t ch);	1317	void process_escape_vt52 (unicode_t ch);
1292	void process_escape_seq ();	1318	void process_escape_seq ();
1293	void process_csi_seq ();	1319	void process_csi_seq ();
1294	void process_window_ops (const int *args, unsigned int nargs);	1320	void process_window_ops (const int *args, unsigned int nargs);
1295	unsigned char *get_to_st (unicode_t &ends_how);	1321	char *get_to_st (unicode_t &ends_how);
1296	void process_dcs_seq ();	1322	void process_dcs_seq ();
1297	void process_osc_seq ();	1323	void process_osc_seq ();
1298	void process_color_seq (int report, int color, const char *str, unsigned char resp);	1324	void process_color_seq (int report, int color, const char *str, char resp);
1299	void process_xterm_seq (int op, const char *str, unsigned char resp);	1325	void process_xterm_seq (int op, const char *str, char resp);
1300	int privcases (int mode, unsigned long bit);	1326	int privcases (int mode, unsigned long bit);
1301	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);	1327	void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1302	void process_sgr_mode (unsigned int nargs, const int *arg);	1328	void process_sgr_mode (unsigned int nargs, const int *arg);
1303	void process_graphics ();	1329	void process_graphics ();
1304	// init.C	1330	// init.C
…		…
1427	void scr_touch (bool refresh);	1453	void scr_touch (bool refresh);
1428	void scr_expose (int x, int y, int width, int height, bool refresh);	1454	void scr_expose (int x, int y, int width, int height, bool refresh);
1429	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1455	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430	void scr_recolour ();	1456	void scr_recolour ();
1431	void scr_remap_chars ();	1457	void scr_remap_chars ();
1432	void scr_remap_chars (const line_t &l);	1458	void scr_remap_chars (line_t &l);
1433		1459
1434	void scr_poweron ();	1460	void scr_poweron ();
1435	void scr_cursor (int mode);	1461	void scr_cursor (int mode);
1436	void scr_do_wrap ();	1462	void scr_do_wrap ();
1437	int scr_change_screen (int scrn);	1463	int scr_change_screen (int scrn);
1438	void scr_color (unsigned int color, int fgbg);	1464	void scr_color (unsigned int color, int fgbg);
1439	void scr_rendition (int set, int style);	1465	void scr_rendition (int set, int style);
1440	void scr_add_lines (const unicode_t *str, int nlines, int len);	1466	void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1441	void scr_backspace ();	1467	void scr_backspace ();
1442	void scr_tab (int count, bool ht = false);	1468	void scr_tab (int count, bool ht = false);
1443	void scr_gotorc (int row, int col, int relative);	1469	void scr_gotorc (int row, int col, int relative);
1444	void scr_index (enum page_dirn direction);	1470	void scr_index (enum page_dirn direction);
1445	void scr_erase_line (int mode);	1471	void scr_erase_line (int mode);

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.182 by root, Mon Jan 2 18:20:23 2006 UTC vs. Revision 1.188 by root, Fri Jan 6 18:33:30 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.182 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.188 by root, Fri Jan 6 18:33:30 2006 UTC