[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.162 by root, Sun Dec 18 00:59:42 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
…		…
266		268
267	#define R_SB_ALIGN_CENTRE 0	269	#define R_SB_ALIGN_CENTRE 0
268	#define R_SB_ALIGN_TOP 1	270	#define R_SB_ALIGN_TOP 1
269	#define R_SB_ALIGN_BOTTOM 2	271	#define R_SB_ALIGN_BOTTOM 2
270		272
271	#define R_SB_RXVT 0
272	#define R_SB_NEXT 1	273	#define R_SB_NEXT 1
273	#define R_SB_XTERM 2	274	#define R_SB_XTERM 2
274	#define R_SB_PLAIN 4	275	#define R_SB_PLAIN 4
		276	#define R_SB_RXVT 8
275		277
276	#define SB_WIDTH_NEXT 19	278	#define SB_WIDTH_NEXT 19
277	#define SB_WIDTH_XTERM 15	279	#define SB_WIDTH_XTERM 15
278	#define SB_WIDTH_PLAIN 7	280	#define SB_WIDTH_PLAIN 7
279	#ifndef SB_WIDTH_RXVT	281	#ifndef SB_WIDTH_RXVT
…		…
489	URxvt_view_down = 721,	491	URxvt_view_down = 721,
490	};	492	};
491		493
492	/* Words starting with `Color_' are colours. Others are counts */	494	/* Words starting with `Color_' are colours. Others are counts */
493	/*	495	/*
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	496	* The PixColor and rendition colour usage should probably be decoupled
497	* on the unnecessary items, e.g. Color_pointer, but won't bother	497	* 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	498	* until we need to. Also, be aware of usage in pixcolor_set
499	*/	499	*/
500		500
501	enum colour_list {	501	enum colour_list {
…		…
551	Color_trough,	551	Color_trough,
552	#endif	552	#endif
553	#if TINTING	553	#if TINTING
554	Color_tint,	554	Color_tint,
555	#endif	555	#endif
		556	#if OFF_FOCUS_FADING
		557	Color_fade,
		558	#endif
556	NRS_COLORS, /* */	559	NRS_COLORS, /* */
557	#ifdef KEEP_SCROLLCOLOR	560	#ifdef KEEP_SCROLLCOLOR
558	Color_topShadow = NRS_COLORS,	561	Color_topShadow = NRS_COLORS,
559	Color_bottomShadow,	562	Color_bottomShadow,
560	TOTAL_COLORS	563	TOTAL_COLORS
…		…
643	Rs_ext_bwidth,	646	Rs_ext_bwidth,
644	Rs_int_bwidth,	647	Rs_int_bwidth,
645	Rs_borderLess,	648	Rs_borderLess,
646	Rs_lineSpace,	649	Rs_lineSpace,
647	Rs_pty_fd,	650	Rs_pty_fd,
		651	Rs_cursorUnderline,
		652	#endif
		653	#if CURSOR_BLINK
		654	Rs_cursorBlink,
648	#endif	655	#endif
649	#if ENABLE_XEMBED	656	#if ENABLE_XEMBED
650	Rs_embed,	657	Rs_embed,
651	#endif	658	#endif
652	Rs_cutchars,	659	Rs_cutchars,
653	Rs_modifier,	660	Rs_modifier,
654	Rs_answerbackstring,	661	Rs_answerbackstring,
655	Rs_tripleclickwords,	662	Rs_tripleclickwords,
656	Rs_insecure,	663	Rs_insecure,
657	Rs_cursorBlink,
658	Rs_pointerBlank,	664	Rs_pointerBlank,
659	Rs_pointerBlankDelay,	665	Rs_pointerBlankDelay,
660	Rs_imLocale,	666	Rs_imLocale,
661	Rs_imFont,	667	Rs_imFont,
662	Rs_pastableTabs,	668	Rs_pastableTabs,
…		…
812	#define dDisp Display *disp = display->display	818	#define dDisp Display *disp = display->display
813		819
814	/* convert pixel dimensions to row/column values. Everything as int32_t */	820	/* convert pixel dimensions to row/column values. Everything as int32_t */
815	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	821	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
816	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	822	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
817	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)	823	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
818	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)	824	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
819	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	825	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
820	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	826	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
821	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)	827	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
822	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)	828	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
823		829
824	#define TermWin_TotalWidth() ((int32_t)TermWin.width)	830	#define TermWin_TotalWidth() ((int32_t)width)
825	#define TermWin_TotalHeight() ((int32_t)TermWin.height)	831	#define TermWin_TotalHeight() ((int32_t)height)
826		832
827	/* how to build & extract colors and attributes */	833	/* how to build & extract colors and attributes */
828	#define GET_BASEFG(x) (((x) & RS_fgMask))	834	#define GET_BASEFG(x) (((x) & RS_fgMask))
829	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	835	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
830	#ifndef NO_BRIGHTCOLOR	836	#ifndef NO_BRIGHTCOLOR
…		…
864		870
865	#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] \|= (1 << ((x) % NPIXCLR_BITS)))	871	#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)))	872	#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
867		873
868	#if ENABLE_STYLES	874	#if ENABLE_STYLES
869	# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]	875	# define FONTSET(style) fontset[GET_STYLE (style)]
870	#else	876	#else
871	# define FONTSET(style) TermWin.fontset[0]	877	# define FONTSET(style) fontset[0]
872	#endif	878	#endif
873		879
874	#ifdef HAVE_SCROLLBARS	880	#ifdef HAVE_SCROLLBARS
875	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)	881	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
876	#else	882	#else
…		…
901	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	907	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
902	- scrollbar_minheight ())	908	- scrollbar_minheight ())
903		909
904	#if (MENUBAR_MAX > 1)	910	#if (MENUBAR_MAX > 1)
905	/* rendition style flags */	911	/* rendition style flags */
906	# define menuBar_height() (TermWin.fheight + SHADOW)	912	# define menuBar_height() (fheight + SHADOW)
907	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	913	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
908	# define isMenuBarWindow(w) ((w) == menuBar.win)	914	# define isMenuBarWindow(w) ((w) == menuBar.win)
909	#else	915	#else
910	# define menuBar_height() (0)	916	# define menuBar_height() (0)
911	# define menuBar_TotalHeight() (0)	917	# define menuBar_TotalHeight() (0)
…		…
1223	void scr_overlay_off ();	1229	void scr_overlay_off ();
1224	void scr_overlay_set (int x, int y,	1230	void scr_overlay_set (int x, int y,
1225	text_t text,	1231	text_t text,
1226	rend_t rend = OVERLAY_RSTYLE);	1232	rend_t rend = OVERLAY_RSTYLE);
1227	void scr_overlay_set (int x, int y, const char *s);	1233	void scr_overlay_set (int x, int y, const char *s);
		1234	void scr_overlay_set (int x, int y, const wchar_t *s);
1228	#endif	1235	#endif
1229		1236
1230	vector<void *> allocated; // free these memory blocks with free()	1237	vector<void *> allocated; // free these memory blocks with free()
1231		1238
1232	char env_windowid; / environmental variable WINDOWID */	1239	char env_windowid; / environmental variable WINDOWID */
…		…
1272	#if TRANSPARENT	1279	#if TRANSPARENT
1273	void rootwin_cb (XEvent &xev);	1280	void rootwin_cb (XEvent &xev);
1274	xevent_watcher rootwin_ev;	1281	xevent_watcher rootwin_ev;
1275	#endif	1282	#endif
1276		1283
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
1281	void x_cb (XEvent &xev);	1284	void x_cb (XEvent &xev);
1282	xevent_watcher termwin_ev;	1285	xevent_watcher termwin_ev;
1283	xevent_watcher vt_ev;	1286	xevent_watcher vt_ev;
1284	#ifdef HAVE_SCROLLBARS	1287	#ifdef HAVE_SCROLLBARS
1285	xevent_watcher scrollbar_ev;	1288	xevent_watcher scrollbar_ev;
…		…
1345	int run_child (const char const argv);	1348	int run_child (const char const argv);
1346		1349
1347	void color_aliases (int idx);	1350	void color_aliases (int idx);
1348	void recolour_cursor ();	1351	void recolour_cursor ();
1349	void create_windows (int argc, const char const argv);	1352	void create_windows (int argc, const char const argv);
1350	void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);	1353	void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1351	void window_calc (unsigned int width, unsigned int height);	1354	void window_calc (unsigned int newwidth, unsigned int newheight);
1352		1355
1353	#if USE_XIM	1356	#if USE_XIM
1354	rxvt_xim *input_method;	1357	rxvt_xim *input_method;
1355	XIC Input_Context;	1358	XIC Input_Context;
1356	XIMStyle input_style;	1359	XIMStyle input_style;
…		…
1428	void set_title (const char *str);	1431	void set_title (const char *str);
1429	void set_icon_name (const char *str);	1432	void set_icon_name (const char *str);
1430	void set_window_color (int idx, const char *color);	1433	void set_window_color (int idx, const char *color);
1431	void set_colorfgbg ();	1434	void set_colorfgbg ();
1432	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1435	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1433	void set_widthheight (unsigned int width, unsigned int height);	1436	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1434		1437
1435	#ifdef MENUBAR	1438	#ifdef MENUBAR
1436	// menubar.C	1439	// menubar.C
1437	void menuitem_free (menu_t menu, menuitem_t item);	1440	void menuitem_free (menu_t menu, menuitem_t item);
1438	int action_dispatch (action_t *action);	1441	int action_dispatch (action_t *action);
…		…
1464	void menubar_control (XButtonEvent &ev);	1467	void menubar_control (XButtonEvent &ev);
1465	void map_menuBar (int map);	1468	void map_menuBar (int map);
1466	#endif	1469	#endif
1467		1470
1468	// screen.C	1471	// screen.C
1469	void scr_blank_line (text_t et, rend_t er, unsigned int width, rend_t efs);	1472
1470	void scr_blank_screen_mem (text_t tp, rend_t rp, unsigned int row, rend_t efs);	1473	void lalloc (line_t &l)
		1474	{
		1475	l.t = (text_t *)talloc->alloc ();
		1476	l.r = (rend_t *)ralloc->alloc ();
		1477	}
		1478
		1479	void lfree (line_t &l)
		1480	{
		1481	talloc->free (l.t);
		1482	ralloc->free (l.r);
		1483	}
		1484
		1485	void lresize (line_t &l)
		1486	{
		1487	if (!l.t)
		1488	return;
		1489
		1490	l.t = (text_t )talloc->alloc (l.t, prev_ncol sizeof (text_t));
		1491	l.r = (rend_t )ralloc->alloc (l.r, prev_ncol sizeof (rend_t));
		1492
		1493	MIN_IT (l.l, (int16_t)ncol);
		1494
		1495	if (ncol > prev_ncol)
		1496	scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
		1497	}
		1498
		1499	void scr_update_term ();
		1500	void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
		1501	void scr_blank_screen_mem (line_t &l, rend_t efs);
1471	int scr_scroll_text (int row1, int row2, int count, int spec);	1502	int scr_scroll_text (int row1, int row2, int count, int spec);
1472	void scr_reset ();	1503	void scr_reset ();
1473	void scr_reset_realloc ();	1504	void scr_reset_realloc ();
1474	void scr_release ();	1505	void scr_release ();
1475	void scr_clear (bool really = false);	1506	void scr_clear (bool really = false);
…		…
1484	void scr_touch (bool refresh);	1515	void scr_touch (bool refresh);
1485	void scr_expose (int x, int y, int width, int height, bool refresh);	1516	void scr_expose (int x, int y, int width, int height, bool refresh);
1486	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1517	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1487	void scr_recolour ();	1518	void scr_recolour ();
1488	void scr_remap_chars ();	1519	void scr_remap_chars ();
1489	void scr_remap_chars (text_t tp, rend_t rp);	1520	void scr_remap_chars (const line_t &l);
1490		1521
1491	void scr_poweron ();	1522	void scr_poweron ();
1492	void scr_cursor (int mode);	1523	void scr_cursor (int mode);
1493	void scr_do_wrap ();	1524	void scr_do_wrap ();
1494	int scr_change_screen (int scrn);	1525	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.162 by root, Sun Dec 18 00:59:42 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.162 by root, Sun Dec 18 00:59:42 2005 UTC