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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.156 by root, Fri Apr 22 12:52:28 2005 UTC vs.
Revision 1.166 by root, Wed Dec 21 14:19:19 2005 UTC

…		…
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	*****************************************************************************
…		…
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 MAX_POSITIVE_INT16 (((uint16_t)-1)>>1) // TODO: configure/limits
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		168
178	#if ENABLE_FRILLS	169	#if ENABLE_FRILLS
179	typedef struct _mwmhints {	170	typedef struct _mwmhints {
180	CARD32 flags;	171	CARD32 flags;
181	CARD32 functions;	172	CARD32 functions;
…		…
267		258
268	#define R_SB_ALIGN_CENTRE 0	259	#define R_SB_ALIGN_CENTRE 0
269	#define R_SB_ALIGN_TOP 1	260	#define R_SB_ALIGN_TOP 1
270	#define R_SB_ALIGN_BOTTOM 2	261	#define R_SB_ALIGN_BOTTOM 2
271		262
272	#define R_SB_RXVT 0
273	#define R_SB_NEXT 1	263	#define R_SB_NEXT 1
274	#define R_SB_XTERM 2	264	#define R_SB_XTERM 2
275	#define R_SB_PLAIN 4	265	#define R_SB_PLAIN 4
		266	#define R_SB_RXVT 8
276		267
277	#define SB_WIDTH_NEXT 19	268	#define SB_WIDTH_NEXT 19
278	#define SB_WIDTH_XTERM 15	269	#define SB_WIDTH_XTERM 15
279	#define SB_WIDTH_PLAIN 7	270	#define SB_WIDTH_PLAIN 7
280	#ifndef SB_WIDTH_RXVT	271	#ifndef SB_WIDTH_RXVT
…		…
490	URxvt_view_down = 721,	481	URxvt_view_down = 721,
491	};	482	};
492		483
493	/* Words starting with `Color_' are colours. Others are counts */	484	/* Words starting with `Color_' are colours. Others are counts */
494	/*	485	/*
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	486	* The PixColor and rendition colour usage should probably be decoupled
498	* on the unnecessary items, e.g. Color_pointer, but won't bother	487	* 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	488	* until we need to. Also, be aware of usage in pixcolor_set
500	*/	489	*/
501		490
502	enum colour_list {	491	enum colour_list {
…		…
551	Color_scroll,	540	Color_scroll,
552	Color_trough,	541	Color_trough,
553	#endif	542	#endif
554	#if TINTING	543	#if TINTING
555	Color_tint,	544	Color_tint,
		545	#endif
		546	#if OFF_FOCUS_FADING
		547	Color_fade,
556	#endif	548	#endif
557	NRS_COLORS, /* */	549	NRS_COLORS, /* */
558	#ifdef KEEP_SCROLLCOLOR	550	#ifdef KEEP_SCROLLCOLOR
559	Color_topShadow = NRS_COLORS,	551	Color_topShadow = NRS_COLORS,
560	Color_bottomShadow,	552	Color_bottomShadow,
…		…
816	#define dDisp Display *disp = display->display	808	#define dDisp Display *disp = display->display
817		809
818	/* convert pixel dimensions to row/column values. Everything as int32_t */	810	/* convert pixel dimensions to row/column values. Everything as int32_t */
819	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	811	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
820	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	812	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
821	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)	813	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
822	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)	814	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
823	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	815	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
824	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	816	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
825	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)	817	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
826	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)	818	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
827		819
828	#define TermWin_TotalWidth() ((int32_t)TermWin.width)	820	#define TermWin_TotalWidth() ((int32_t)this->width)
829	#define TermWin_TotalHeight() ((int32_t)TermWin.height)	821	#define TermWin_TotalHeight() ((int32_t)this->height)
		822
		823	#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
		824	#define ROW(n) (save [LINENO (n)])
830		825
831	/* how to build & extract colors and attributes */	826	/* how to build & extract colors and attributes */
832	#define GET_BASEFG(x) (((x) & RS_fgMask))	827	#define GET_BASEFG(x) (((x) & RS_fgMask))
833	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	828	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
834	#ifndef NO_BRIGHTCOLOR	829	#ifndef NO_BRIGHTCOLOR
…		…
868		863
869	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))	864	#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)))	865	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
871		866
872	#if ENABLE_STYLES	867	#if ENABLE_STYLES
873	# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]	868	# define FONTSET(style) fontset[GET_STYLE (style)]
874	#else	869	#else
875	# define FONTSET(style) TermWin.fontset[0]	870	# define FONTSET(style) fontset[0]
876	#endif	871	#endif
877		872
878	#ifdef HAVE_SCROLLBARS	873	#ifdef HAVE_SCROLLBARS
879	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)	874	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
880	#else	875	#else
…		…
905	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	900	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
906	- scrollbar_minheight ())	901	- scrollbar_minheight ())
907		902
908	#if (MENUBAR_MAX > 1)	903	#if (MENUBAR_MAX > 1)
909	/* rendition style flags */	904	/* rendition style flags */
910	# define menuBar_height() (TermWin.fheight + SHADOW)	905	# define menuBar_height() (fheight + SHADOW)
911	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	906	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
912	# define isMenuBarWindow(w) ((w) == menuBar.win)	907	# define isMenuBarWindow(w) ((w) == menuBar.win)
913	#else	908	#else
914	# define menuBar_height() (0)	909	# define menuBar_height() (0)
915	# define menuBar_TotalHeight() (0)	910	# define menuBar_TotalHeight() (0)
…		…
1227	void scr_overlay_off ();	1222	void scr_overlay_off ();
1228	void scr_overlay_set (int x, int y,	1223	void scr_overlay_set (int x, int y,
1229	text_t text,	1224	text_t text,
1230	rend_t rend = OVERLAY_RSTYLE);	1225	rend_t rend = OVERLAY_RSTYLE);
1231	void scr_overlay_set (int x, int y, const char *s);	1226	void scr_overlay_set (int x, int y, const char *s);
		1227	void scr_overlay_set (int x, int y, const wchar_t *s);
1232	#endif	1228	#endif
1233		1229
1234	vector<void *> allocated; // free these memory blocks with free()	1230	vector<void *> allocated; // free these memory blocks with free()
1235		1231
1236	char env_windowid; / environmental variable WINDOWID */	1232	char env_windowid; / environmental variable WINDOWID */
…		…
1276	#if TRANSPARENT	1272	#if TRANSPARENT
1277	void rootwin_cb (XEvent &xev);	1273	void rootwin_cb (XEvent &xev);
1278	xevent_watcher rootwin_ev;	1274	xevent_watcher rootwin_ev;
1279	#endif	1275	#endif
1280		1276
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
1285	void x_cb (XEvent &xev);	1277	void x_cb (XEvent &xev);
1286	xevent_watcher termwin_ev;	1278	xevent_watcher termwin_ev;
1287	xevent_watcher vt_ev;	1279	xevent_watcher vt_ev;
1288	#ifdef HAVE_SCROLLBARS	1280	#ifdef HAVE_SCROLLBARS
1289	xevent_watcher scrollbar_ev;	1281	xevent_watcher scrollbar_ev;
…		…
1349	int run_child (const char const argv);	1341	int run_child (const char const argv);
1350		1342
1351	void color_aliases (int idx);	1343	void color_aliases (int idx);
1352	void recolour_cursor ();	1344	void recolour_cursor ();
1353	void create_windows (int argc, const char const argv);	1345	void create_windows (int argc, const char const argv);
1354	void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);	1346	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1355	void window_calc (unsigned int width, unsigned int height);	1347	void window_calc (unsigned int newwidth, unsigned int newheight);
1356		1348
1357	#if USE_XIM	1349	#if USE_XIM
1358	rxvt_xim *input_method;	1350	rxvt_xim *input_method;
1359	XIC Input_Context;	1351	XIC Input_Context;
1360	XIMStyle input_style;	1352	XIMStyle input_style;
…		…
1432	void set_title (const char *str);	1424	void set_title (const char *str);
1433	void set_icon_name (const char *str);	1425	void set_icon_name (const char *str);
1434	void set_window_color (int idx, const char *color);	1426	void set_window_color (int idx, const char *color);
1435	void set_colorfgbg ();	1427	void set_colorfgbg ();
1436	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1428	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1437	void set_widthheight (unsigned int width, unsigned int height);	1429	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1438		1430
1439	#ifdef MENUBAR	1431	#ifdef MENUBAR
1440	// menubar.C	1432	// menubar.C
1441	void menuitem_free (menu_t menu, menuitem_t item);	1433	void menuitem_free (menu_t menu, menuitem_t item);
1442	int action_dispatch (action_t *action);	1434	int action_dispatch (action_t *action);
…		…
1468	void menubar_control (XButtonEvent &ev);	1460	void menubar_control (XButtonEvent &ev);
1469	void map_menuBar (int map);	1461	void map_menuBar (int map);
1470	#endif	1462	#endif
1471		1463
1472	// screen.C	1464	// screen.C
1473	void scr_blank_line (text_t et, rend_t er, unsigned int width, rend_t efs);	1465
1474	void scr_blank_screen_mem (text_t tp, rend_t rp, unsigned int row, rend_t efs);	1466	void lalloc (line_t &l)
		1467	{
		1468	l.t = (text_t *)talloc->alloc ();
		1469	l.r = (rend_t *)ralloc->alloc ();
		1470	}
		1471
		1472	void lfree (line_t &l)
		1473	{
		1474	talloc->free (l.t);
		1475	ralloc->free (l.r);
		1476	}
		1477
		1478	void lresize (line_t &l)
		1479	{
		1480	if (!l.t)
		1481	return;
		1482
		1483	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
		1484	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
		1485
		1486	l.l = min (l.l, ncol);
		1487
		1488	if (ncol > prev_ncol)
		1489	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
		1490	}
		1491
		1492	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
		1493	void scr_blank_screen_mem (line_t &l, rend_t efs);
1475	int scr_scroll_text (int row1, int row2, int count, int spec);	1494	int scr_scroll_text (int row1, int row2, int count);
1476	void scr_reset ();	1495	void scr_reset ();
1477	void scr_reset_realloc ();	1496	void scr_reset_realloc ();
1478	void scr_release ();	1497	void scr_release ();
1479	void scr_clear (bool really = false);	1498	void scr_clear (bool really = false);
1480	void scr_refresh (unsigned char refresh_type);	1499	void scr_refresh (unsigned char refresh_type);
…		…
1488	void scr_touch (bool refresh);	1507	void scr_touch (bool refresh);
1489	void scr_expose (int x, int y, int width, int height, bool refresh);	1508	void scr_expose (int x, int y, int width, int height, bool refresh);
1490	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1509	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1491	void scr_recolour ();	1510	void scr_recolour ();
1492	void scr_remap_chars ();	1511	void scr_remap_chars ();
1493	void scr_remap_chars (text_t tp, rend_t rp);	1512	void scr_remap_chars (const line_t &l);
1494		1513
1495	void scr_poweron ();	1514	void scr_poweron ();
1496	void scr_cursor (int mode);	1515	void scr_cursor (int mode);
1497	void scr_do_wrap ();	1516	void scr_do_wrap ();
1498	int scr_change_screen (int scrn);	1517	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.156 by root, Fri Apr 22 12:52:28 2005 UTC vs. Revision 1.166 by root, Wed Dec 21 14:19:19 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.156 by root, Fri Apr 22 12:52:28 2005 UTC vs.
Revision 1.166 by root, Wed Dec 21 14:19:19 2005 UTC