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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.153 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.166 by root, Wed Dec 21 14:19:19 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)	167	#define MAX_POSITIVE_INT16 (((uint16_t)-1)>>1) // TODO: configure/limits
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		168
177	#if ENABLE_FRILLS	169	#if ENABLE_FRILLS
178	typedef struct _mwmhints {	170	typedef struct _mwmhints {
179	CARD32 flags;	171	CARD32 flags;
180	CARD32 functions;	172	CARD32 functions;
…		…
266		258
267	#define R_SB_ALIGN_CENTRE 0	259	#define R_SB_ALIGN_CENTRE 0
268	#define R_SB_ALIGN_TOP 1	260	#define R_SB_ALIGN_TOP 1
269	#define R_SB_ALIGN_BOTTOM 2	261	#define R_SB_ALIGN_BOTTOM 2
270		262
271	#define R_SB_RXVT 0
272	#define R_SB_NEXT 1	263	#define R_SB_NEXT 1
273	#define R_SB_XTERM 2	264	#define R_SB_XTERM 2
274	#define R_SB_PLAIN 4	265	#define R_SB_PLAIN 4
		266	#define R_SB_RXVT 8
275		267
276	#define SB_WIDTH_NEXT 19	268	#define SB_WIDTH_NEXT 19
277	#define SB_WIDTH_XTERM 15	269	#define SB_WIDTH_XTERM 15
278	#define SB_WIDTH_PLAIN 7	270	#define SB_WIDTH_PLAIN 7
279	#ifndef SB_WIDTH_RXVT	271	#ifndef SB_WIDTH_RXVT
…		…
489	URxvt_view_down = 721,	481	URxvt_view_down = 721,
490	};	482	};
491		483
492	/* Words starting with `Color_' are colours. Others are counts */	484	/* Words starting with `Color_' are colours. Others are counts */
493	/*	485	/*
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	486	* The PixColor and rendition colour usage should probably be decoupled
497	* 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
498	* 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
499	*/	489	*/
500		490
501	enum colour_list {	491	enum colour_list {
…		…
551	Color_trough,	541	Color_trough,
552	#endif	542	#endif
553	#if TINTING	543	#if TINTING
554	Color_tint,	544	Color_tint,
555	#endif	545	#endif
		546	#if OFF_FOCUS_FADING
		547	Color_fade,
		548	#endif
556	NRS_COLORS, /* */	549	NRS_COLORS, /* */
557	#ifdef KEEP_SCROLLCOLOR	550	#ifdef KEEP_SCROLLCOLOR
558	Color_topShadow = NRS_COLORS,	551	Color_topShadow = NRS_COLORS,
559	Color_bottomShadow,	552	Color_bottomShadow,
560	TOTAL_COLORS	553	TOTAL_COLORS
…		…
643	Rs_ext_bwidth,	636	Rs_ext_bwidth,
644	Rs_int_bwidth,	637	Rs_int_bwidth,
645	Rs_borderLess,	638	Rs_borderLess,
646	Rs_lineSpace,	639	Rs_lineSpace,
647	Rs_pty_fd,	640	Rs_pty_fd,
		641	Rs_cursorUnderline,
		642	#endif
		643	#if CURSOR_BLINK
		644	Rs_cursorBlink,
648	#endif	645	#endif
649	#if ENABLE_XEMBED	646	#if ENABLE_XEMBED
650	Rs_embed,	647	Rs_embed,
651	#endif	648	#endif
652	Rs_cutchars,	649	Rs_cutchars,
653	Rs_modifier,	650	Rs_modifier,
654	Rs_answerbackstring,	651	Rs_answerbackstring,
655	Rs_tripleclickwords,	652	Rs_tripleclickwords,
656	Rs_insecure,	653	Rs_insecure,
657	Rs_cursorBlink,
658	Rs_pointerBlank,	654	Rs_pointerBlank,
659	Rs_pointerBlankDelay,	655	Rs_pointerBlankDelay,
660	Rs_imLocale,	656	Rs_imLocale,
661	Rs_imFont,	657	Rs_imFont,
662	Rs_pastableTabs,	658	Rs_pastableTabs,
…		…
812	#define dDisp Display *disp = display->display	808	#define dDisp Display *disp = display->display
813		809
814	/* convert pixel dimensions to row/column values. Everything as int32_t */	810	/* convert pixel dimensions to row/column values. Everything as int32_t */
815	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	811	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
816	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	812	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
817	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)	813	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
818	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)	814	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
819	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	815	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
820	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	816	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
821	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)	817	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
822	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)	818	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
823		819
824	#define TermWin_TotalWidth() ((int32_t)TermWin.width)	820	#define TermWin_TotalWidth() ((int32_t)this->width)
825	#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)])
826		825
827	/* how to build & extract colors and attributes */	826	/* how to build & extract colors and attributes */
828	#define GET_BASEFG(x) (((x) & RS_fgMask))	827	#define GET_BASEFG(x) (((x) & RS_fgMask))
829	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	828	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
830	#ifndef NO_BRIGHTCOLOR	829	#ifndef NO_BRIGHTCOLOR
…		…
864		863
865	#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)))
866	#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)))
867		866
868	#if ENABLE_STYLES	867	#if ENABLE_STYLES
869	# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]	868	# define FONTSET(style) fontset[GET_STYLE (style)]
870	#else	869	#else
871	# define FONTSET(style) TermWin.fontset[0]	870	# define FONTSET(style) fontset[0]
872	#endif	871	#endif
873		872
874	#ifdef HAVE_SCROLLBARS	873	#ifdef HAVE_SCROLLBARS
875	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)	874	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
876	#else	875	#else
…		…
901	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	900	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
902	- scrollbar_minheight ())	901	- scrollbar_minheight ())
903		902
904	#if (MENUBAR_MAX > 1)	903	#if (MENUBAR_MAX > 1)
905	/* rendition style flags */	904	/* rendition style flags */
906	# define menuBar_height() (TermWin.fheight + SHADOW)	905	# define menuBar_height() (fheight + SHADOW)
907	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	906	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
908	# define isMenuBarWindow(w) ((w) == menuBar.win)	907	# define isMenuBarWindow(w) ((w) == menuBar.win)
909	#else	908	#else
910	# define menuBar_height() (0)	909	# define menuBar_height() (0)
911	# define menuBar_TotalHeight() (0)	910	# define menuBar_TotalHeight() (0)
…		…
1223	void scr_overlay_off ();	1222	void scr_overlay_off ();
1224	void scr_overlay_set (int x, int y,	1223	void scr_overlay_set (int x, int y,
1225	text_t text,	1224	text_t text,
1226	rend_t rend = OVERLAY_RSTYLE);	1225	rend_t rend = OVERLAY_RSTYLE);
1227	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);
1228	#endif	1228	#endif
1229		1229
1230	vector<void *> allocated; // free these memory blocks with free()	1230	vector<void *> allocated; // free these memory blocks with free()
1231		1231
1232	char env_windowid; / environmental variable WINDOWID */	1232	char env_windowid; / environmental variable WINDOWID */
…		…
1272	#if TRANSPARENT	1272	#if TRANSPARENT
1273	void rootwin_cb (XEvent &xev);	1273	void rootwin_cb (XEvent &xev);
1274	xevent_watcher rootwin_ev;	1274	xevent_watcher rootwin_ev;
1275	#endif	1275	#endif
1276		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
1281	void x_cb (XEvent &xev);	1277	void x_cb (XEvent &xev);
1282	xevent_watcher termwin_ev;	1278	xevent_watcher termwin_ev;
1283	xevent_watcher vt_ev;	1279	xevent_watcher vt_ev;
1284	#ifdef HAVE_SCROLLBARS	1280	#ifdef HAVE_SCROLLBARS
1285	xevent_watcher scrollbar_ev;	1281	xevent_watcher scrollbar_ev;
…		…
1345	int run_child (const char const argv);	1341	int run_child (const char const argv);
1346		1342
1347	void color_aliases (int idx);	1343	void color_aliases (int idx);
1348	void recolour_cursor ();	1344	void recolour_cursor ();
1349	void create_windows (int argc, const char const argv);	1345	void create_windows (int argc, const char const argv);
1350	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);
1351	void window_calc (unsigned int width, unsigned int height);	1347	void window_calc (unsigned int newwidth, unsigned int newheight);
1352		1348
1353	#if USE_XIM	1349	#if USE_XIM
1354	rxvt_xim *input_method;	1350	rxvt_xim *input_method;
1355	XIC Input_Context;	1351	XIC Input_Context;
1356	XIMStyle input_style;	1352	XIMStyle input_style;
…		…
1428	void set_title (const char *str);	1424	void set_title (const char *str);
1429	void set_icon_name (const char *str);	1425	void set_icon_name (const char *str);
1430	void set_window_color (int idx, const char *color);	1426	void set_window_color (int idx, const char *color);
1431	void set_colorfgbg ();	1427	void set_colorfgbg ();
1432	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1428	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1433	void set_widthheight (unsigned int width, unsigned int height);	1429	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1434		1430
1435	#ifdef MENUBAR	1431	#ifdef MENUBAR
1436	// menubar.C	1432	// menubar.C
1437	void menuitem_free (menu_t menu, menuitem_t item);	1433	void menuitem_free (menu_t menu, menuitem_t item);
1438	int action_dispatch (action_t *action);	1434	int action_dispatch (action_t *action);
…		…
1464	void menubar_control (XButtonEvent &ev);	1460	void menubar_control (XButtonEvent &ev);
1465	void map_menuBar (int map);	1461	void map_menuBar (int map);
1466	#endif	1462	#endif
1467		1463
1468	// screen.C	1464	// screen.C
1469	void scr_blank_line (text_t et, rend_t er, unsigned int width, rend_t efs);	1465
1470	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);
1471	int scr_scroll_text (int row1, int row2, int count, int spec);	1494	int scr_scroll_text (int row1, int row2, int count);
1472	void scr_reset ();	1495	void scr_reset ();
1473	void scr_reset_realloc ();	1496	void scr_reset_realloc ();
1474	void scr_release ();	1497	void scr_release ();
1475	void scr_clear (bool really = false);	1498	void scr_clear (bool really = false);
1476	void scr_refresh (unsigned char refresh_type);	1499	void scr_refresh (unsigned char refresh_type);
1477	bool scr_refresh_rend (rend_t mask, rend_t value);	1500	bool scr_refresh_rend (rend_t mask, rend_t value);
1478	void scr_erase_screen (int mode);	1501	void scr_erase_screen (int mode);
		1502	#if ENABLE_FRILLS
1479	void scr_erase_savelines ();	1503	void scr_erase_savelines ();
		1504	void scr_backindex ();
		1505	void scr_forwardindex ();
		1506	#endif
1480	void scr_touch (bool refresh);	1507	void scr_touch (bool refresh);
1481	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);
1482	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1509	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1483	void scr_recolour ();	1510	void scr_recolour ();
1484	void scr_remap_chars ();	1511	void scr_remap_chars ();
1485	void scr_remap_chars (text_t tp, rend_t rp);	1512	void scr_remap_chars (const line_t &l);
1486		1513
1487	void scr_poweron ();	1514	void scr_poweron ();
1488	void scr_cursor (int mode);	1515	void scr_cursor (int mode);
1489	void scr_do_wrap ();	1516	void scr_do_wrap ();
1490	int scr_change_screen (int scrn);	1517	int scr_change_screen (int scrn);
1491	void scr_color (unsigned int color, int fgbg);	1518	void scr_color (unsigned int color, int fgbg);
1492	void scr_rendition (int set, int style);	1519	void scr_rendition (int set, int style);
1493	void scr_add_lines (const unicode_t *str, int nlines, int len);	1520	void scr_add_lines (const unicode_t *str, int nlines, int len);
1494	void scr_backspace ();	1521	void scr_backspace ();
1495	void scr_tab (int count, bool ht = false);	1522	void scr_tab (int count, bool ht = false);
1496	void scr_backindex ();
1497	void scr_forwardindex ();
1498	void scr_gotorc (int row, int col, int relative);	1523	void scr_gotorc (int row, int col, int relative);
1499	void scr_index (enum page_dirn direction);	1524	void scr_index (enum page_dirn direction);
1500	void scr_erase_line (int mode);	1525	void scr_erase_line (int mode);
1501	void scr_E ();	1526	void scr_E ();
1502	void scr_insdel_lines (int count, int insdel);	1527	void scr_insdel_lines (int count, int insdel);

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.153 by root, Mon Feb 21 19:26:07 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.153 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.166 by root, Wed Dec 21 14:19:19 2005 UTC