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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.152 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.164 by root, Tue Dec 20 20:58:31 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	*****************************************************************************
32	* SYSTEM HACKS	32	* SYSTEM HACKS
33	*****************************************************************************	33	*****************************************************************************
…		…
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	*****************************************************************************
…		…
137	#endif	138	#endif
138		139
139	/* 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
140	* scrollColor resource.	141	* scrollColor resource.
141	*/	142	*/
142	#if defined(RXVT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)	143	#if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(MENUBAR) \|\| defined(PLAIN_SCROLLBAR)
143	# define KEEP_SCROLLCOLOR 1	144	# define KEEP_SCROLLCOLOR 1
144	#else	145	#else
145	# undef KEEP_SCROLLCOLOR	146	# undef KEEP_SCROLLCOLOR
146	#endif	147	#endif
147		148
…		…
267		268
268	#define R_SB_ALIGN_CENTRE 0	269	#define R_SB_ALIGN_CENTRE 0
269	#define R_SB_ALIGN_TOP 1	270	#define R_SB_ALIGN_TOP 1
270	#define R_SB_ALIGN_BOTTOM 2	271	#define R_SB_ALIGN_BOTTOM 2
271		272
272	#define R_SB_RXVT 0
273	#define R_SB_NEXT 1	273	#define R_SB_NEXT 1
274	#define R_SB_XTERM 2	274	#define R_SB_XTERM 2
275	#define R_SB_PLAIN 4	275	#define R_SB_PLAIN 4
		276	#define R_SB_RXVT 8
276		277
277	#define SB_WIDTH_NEXT 19	278	#define SB_WIDTH_NEXT 19
278	#define SB_WIDTH_XTERM 15	279	#define SB_WIDTH_XTERM 15
279	#define SB_WIDTH_PLAIN 7	280	#define SB_WIDTH_PLAIN 7
280	#ifndef SB_WIDTH_RXVT	281	#ifndef SB_WIDTH_RXVT
…		…
473	XTerm_Color_UL = 19, // change actual 'Underline' color	474	XTerm_Color_UL = 19, // change actual 'Underline' color
474	XTerm_Pixmap = 20, // new bg pixmap	475	XTerm_Pixmap = 20, // new bg pixmap
475	XTerm_restoreFG = 39, // change default fg color	476	XTerm_restoreFG = 39, // change default fg color
476	XTerm_restoreBG = 49, // change default bg color	477	XTerm_restoreBG = 49, // change default bg color
477	XTerm_dumpscreen = 55, // dump scrollback and all of screen	478	XTerm_dumpscreen = 55, // dump scrollback and all of screen
		479
478	XTerm_locale = 701, // change locale	480	URxvt_locale = 701, // change locale
479	XTerm_Menu = 703, // set menu item	481	URxvt_Menu = 703, // set menu item
480	XTerm_Color_IT = 704, // change actual 'Italic' colour	482	URxvt_Color_IT = 704, // change actual 'Italic' colour
481	XTerm_Color_tint = 705, // change actual tint colour	483	URxvt_Color_tint = 705, // change actual tint colour
482		484
483	URxvt_font = 710,	485	URxvt_font = 710,
484	URxvt_boldFont = 711,	486	URxvt_boldFont = 711,
485	URxvt_italicFont = 712,	487	URxvt_italicFont = 712,
486	URxvt_boldItalicFont = 713,	488	URxvt_boldItalicFont = 713,
		489
		490	URxvt_view_up = 720,
		491	URxvt_view_down = 721,
487	};	492	};
488		493
489	/* Words starting with `Color_' are colours. Others are counts */	494	/* Words starting with `Color_' are colours. Others are counts */
490	/*	495	/*
491	* The following comment is mostly obsolete since pixcolor_set was expanded:
492	* We're currently upto 29 colours. Only 3 more available. The
493	* PixColor and rendition colour usage should probably be decoupled	496	* The PixColor and rendition colour usage should probably be decoupled
494	* 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
495	* 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
496	*/	499	*/
497		500
498	enum colour_list {	501	enum colour_list {
…		…
548	Color_trough,	551	Color_trough,
549	#endif	552	#endif
550	#if TINTING	553	#if TINTING
551	Color_tint,	554	Color_tint,
552	#endif	555	#endif
		556	#if OFF_FOCUS_FADING
		557	Color_fade,
		558	#endif
553	NRS_COLORS, /* */	559	NRS_COLORS, /* */
554	#ifdef KEEP_SCROLLCOLOR	560	#ifdef KEEP_SCROLLCOLOR
555	Color_topShadow = NRS_COLORS,	561	Color_topShadow = NRS_COLORS,
556	Color_bottomShadow,	562	Color_bottomShadow,
557	TOTAL_COLORS	563	TOTAL_COLORS
…		…
640	Rs_ext_bwidth,	646	Rs_ext_bwidth,
641	Rs_int_bwidth,	647	Rs_int_bwidth,
642	Rs_borderLess,	648	Rs_borderLess,
643	Rs_lineSpace,	649	Rs_lineSpace,
644	Rs_pty_fd,	650	Rs_pty_fd,
		651	Rs_cursorUnderline,
		652	#endif
		653	#if CURSOR_BLINK
		654	Rs_cursorBlink,
645	#endif	655	#endif
646	#if ENABLE_XEMBED	656	#if ENABLE_XEMBED
647	Rs_embed,	657	Rs_embed,
648	#endif	658	#endif
649	Rs_cutchars,	659	Rs_cutchars,
650	Rs_modifier,	660	Rs_modifier,
651	Rs_answerbackstring,	661	Rs_answerbackstring,
652	Rs_tripleclickwords,	662	Rs_tripleclickwords,
653	Rs_insecure,	663	Rs_insecure,
654	Rs_cursorBlink,
655	Rs_pointerBlank,	664	Rs_pointerBlank,
656	Rs_pointerBlankDelay,	665	Rs_pointerBlankDelay,
657	Rs_imLocale,	666	Rs_imLocale,
658	Rs_imFont,	667	Rs_imFont,
659	Rs_pastableTabs,	668	Rs_pastableTabs,
…		…
809	#define dDisp Display *disp = display->display	818	#define dDisp Display *disp = display->display
810		819
811	/* convert pixel dimensions to row/column values. Everything as int32_t */	820	/* convert pixel dimensions to row/column values. Everything as int32_t */
812	#define Pixel2Col(x) Pixel2Width((int32_t)(x))	821	#define Pixel2Col(x) Pixel2Width((int32_t)(x))
813	#define Pixel2Row(y) Pixel2Height((int32_t)(y))	822	#define Pixel2Row(y) Pixel2Height((int32_t)(y))
814	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)	823	#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
815	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)	824	#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
816	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))	825	#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
817	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))	826	#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
818	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)	827	#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
819	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)	828	#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
820		829
821	#define TermWin_TotalWidth() ((int32_t)TermWin.width)	830	#define TermWin_TotalWidth() ((int32_t)width)
822	#define TermWin_TotalHeight() ((int32_t)TermWin.height)	831	#define TermWin_TotalHeight() ((int32_t)height)
823		832
824	/* how to build & extract colors and attributes */	833	/* how to build & extract colors and attributes */
825	#define GET_BASEFG(x) (((x) & RS_fgMask))	834	#define GET_BASEFG(x) (((x) & RS_fgMask))
826	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)	835	#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
827	#ifndef NO_BRIGHTCOLOR	836	#ifndef NO_BRIGHTCOLOR
…		…
861		870
862	#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)))
863	#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)))
864		873
865	#if ENABLE_STYLES	874	#if ENABLE_STYLES
866	# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]	875	# define FONTSET(style) fontset[GET_STYLE (style)]
867	#else	876	#else
868	# define FONTSET(style) TermWin.fontset[0]	877	# define FONTSET(style) fontset[0]
869	#endif	878	#endif
870		879
871	#ifdef HAVE_SCROLLBARS	880	#ifdef HAVE_SCROLLBARS
872	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)	881	# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
873	#else	882	#else
…		…
898	#define scrollbar_size() (scrollBar.end - scrollBar.beg \	907	#define scrollbar_size() (scrollBar.end - scrollBar.beg \
899	- scrollbar_minheight ())	908	- scrollbar_minheight ())
900		909
901	#if (MENUBAR_MAX > 1)	910	#if (MENUBAR_MAX > 1)
902	/* rendition style flags */	911	/* rendition style flags */
903	# define menuBar_height() (TermWin.fheight + SHADOW)	912	# define menuBar_height() (fheight + SHADOW)
904	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)	913	# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
905	# define isMenuBarWindow(w) ((w) == menuBar.win)	914	# define isMenuBarWindow(w) ((w) == menuBar.win)
906	#else	915	#else
907	# define menuBar_height() (0)	916	# define menuBar_height() (0)
908	# define menuBar_TotalHeight() (0)	917	# define menuBar_TotalHeight() (0)
…		…
1220	void scr_overlay_off ();	1229	void scr_overlay_off ();
1221	void scr_overlay_set (int x, int y,	1230	void scr_overlay_set (int x, int y,
1222	text_t text,	1231	text_t text,
1223	rend_t rend = OVERLAY_RSTYLE);	1232	rend_t rend = OVERLAY_RSTYLE);
1224	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);
1225	#endif	1235	#endif
1226		1236
1227	vector<void *> allocated; // free these memory blocks with free()	1237	vector<void *> allocated; // free these memory blocks with free()
1228		1238
1229	char env_windowid; / environmental variable WINDOWID */	1239	char env_windowid; / environmental variable WINDOWID */
…		…
1269	#if TRANSPARENT	1279	#if TRANSPARENT
1270	void rootwin_cb (XEvent &xev);	1280	void rootwin_cb (XEvent &xev);
1271	xevent_watcher rootwin_ev;	1281	xevent_watcher rootwin_ev;
1272	#endif	1282	#endif
1273		1283
1274
1275	void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1276	void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1277
1278	void x_cb (XEvent &xev);	1284	void x_cb (XEvent &xev);
1279	xevent_watcher termwin_ev;	1285	xevent_watcher termwin_ev;
1280	xevent_watcher vt_ev;	1286	xevent_watcher vt_ev;
1281	#ifdef HAVE_SCROLLBARS	1287	#ifdef HAVE_SCROLLBARS
1282	xevent_watcher scrollbar_ev;	1288	xevent_watcher scrollbar_ev;
…		…
1342	int run_child (const char const argv);	1348	int run_child (const char const argv);
1343		1349
1344	void color_aliases (int idx);	1350	void color_aliases (int idx);
1345	void recolour_cursor ();	1351	void recolour_cursor ();
1346	void create_windows (int argc, const char const argv);	1352	void create_windows (int argc, const char const argv);
1347	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);
1348	void window_calc (unsigned int width, unsigned int height);	1354	void window_calc (unsigned int newwidth, unsigned int newheight);
1349		1355
1350	#if USE_XIM	1356	#if USE_XIM
1351	rxvt_xim *input_method;	1357	rxvt_xim *input_method;
1352	XIC Input_Context;	1358	XIC Input_Context;
1353	XIMStyle input_style;	1359	XIMStyle input_style;
…		…
1425	void set_title (const char *str);	1431	void set_title (const char *str);
1426	void set_icon_name (const char *str);	1432	void set_icon_name (const char *str);
1427	void set_window_color (int idx, const char *color);	1433	void set_window_color (int idx, const char *color);
1428	void set_colorfgbg ();	1434	void set_colorfgbg ();
1429	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);	1435	int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1430	void set_widthheight (unsigned int width, unsigned int height);	1436	void set_widthheight (unsigned int newwidth, unsigned int newheight);
1431		1437
1432	#ifdef MENUBAR	1438	#ifdef MENUBAR
1433	// menubar.C	1439	// menubar.C
1434	void menuitem_free (menu_t menu, menuitem_t item);	1440	void menuitem_free (menu_t menu, menuitem_t item);
1435	int action_dispatch (action_t *action);	1441	int action_dispatch (action_t *action);
…		…
1461	void menubar_control (XButtonEvent &ev);	1467	void menubar_control (XButtonEvent &ev);
1462	void map_menuBar (int map);	1468	void map_menuBar (int map);
1463	#endif	1469	#endif
1464		1470
1465	// screen.C	1471	// screen.C
1466	void scr_blank_line (text_t et, rend_t er, unsigned int width, rend_t efs);	1472
1467	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_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
		1500	void scr_blank_screen_mem (line_t &l, rend_t efs);
1468	int scr_scroll_text (int row1, int row2, int count, int spec);	1501	int scr_scroll_text (int row1, int row2, int count);
1469	void scr_reset ();	1502	void scr_reset ();
1470	void scr_reset_realloc ();	1503	void scr_reset_realloc ();
1471	void scr_release ();	1504	void scr_release ();
1472	void scr_clear (bool really = false);	1505	void scr_clear (bool really = false);
1473	void scr_refresh (unsigned char refresh_type);	1506	void scr_refresh (unsigned char refresh_type);
1474	bool scr_refresh_rend (rend_t mask, rend_t value);	1507	bool scr_refresh_rend (rend_t mask, rend_t value);
1475	void scr_erase_screen (int mode);	1508	void scr_erase_screen (int mode);
		1509	#if ENABLE_FRILLS
		1510	void scr_erase_savelines ();
		1511	void scr_backindex ();
		1512	void scr_forwardindex ();
		1513	#endif
1476	void scr_touch (bool refresh);	1514	void scr_touch (bool refresh);
1477	void scr_expose (int x, int y, int width, int height, bool refresh);	1515	void scr_expose (int x, int y, int width, int height, bool refresh);
1478	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);	1516	rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1479	void scr_recolour ();	1517	void scr_recolour ();
1480	void scr_remap_chars ();	1518	void scr_remap_chars ();
1481	void scr_remap_chars (text_t tp, rend_t rp);	1519	void scr_remap_chars (const line_t &l);
1482		1520
1483	void scr_poweron ();	1521	void scr_poweron ();
1484	void scr_cursor (int mode);	1522	void scr_cursor (int mode);
1485	void scr_do_wrap ();	1523	void scr_do_wrap ();
1486	int scr_change_screen (int scrn);	1524	int scr_change_screen (int scrn);
1487	void scr_color (unsigned int color, int fgbg);	1525	void scr_color (unsigned int color, int fgbg);
1488	void scr_rendition (int set, int style);	1526	void scr_rendition (int set, int style);
1489	void scr_add_lines (const unicode_t *str, int nlines, int len);	1527	void scr_add_lines (const unicode_t *str, int nlines, int len);
1490	void scr_backspace ();	1528	void scr_backspace ();
1491	void scr_tab (int count, bool ht = false);	1529	void scr_tab (int count, bool ht = false);
1492	void scr_backindex ();
1493	void scr_forwardindex ();
1494	void scr_gotorc (int row, int col, int relative);	1530	void scr_gotorc (int row, int col, int relative);
1495	void scr_index (enum page_dirn direction);	1531	void scr_index (enum page_dirn direction);
1496	void scr_erase_line (int mode);	1532	void scr_erase_line (int mode);
1497	void scr_E ();	1533	void scr_E ();
1498	void scr_insdel_lines (int count, int insdel);	1534	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.152 by root, Sun Feb 20 19:45:30 2005 UTC vs. Revision 1.164 by root, Tue Dec 20 20:58:31 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.152 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.164 by root, Tue Dec 20 20:58:31 2005 UTC