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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.427 by sf-exg, Mon Jan 10 14:07:19 2011 UTC vs.
Revision 1.434 by sf-exg, Sun Feb 6 11:42:28 2011 UTC

…		…
74	#include <X11/cursorfont.h>	74	#include <X11/cursorfont.h>
75	#include <X11/keysym.h>	75	#include <X11/keysym.h>
76	#include <X11/keysymdef.h>	76	#include <X11/keysymdef.h>
77	#include <X11/Xatom.h>	77	#include <X11/Xatom.h>
78		78
		79	#ifdef HAVE_AFTERIMAGE
		80	# include <afterimage.h>
		81	# undef min
		82	# undef max
		83	#endif
		84
		85	#ifdef HAVE_PIXBUF
		86	# include <gdk-pixbuf/gdk-pixbuf.h>
		87	#endif
		88
		89	#if defined(BG_IMAGE_FROM_FILE) \|\| defined(ENABLE_TRANSPARENCY)
		90	# define HAVE_BG_PIXMAP 1
		91	#endif
		92
79	#include "encoding.h"	93	#include "encoding.h"
80	#include "rxvtutil.h"	94	#include "rxvtutil.h"
81	#include "rxvtfont.h"	95	#include "rxvtfont.h"
82	#include "rxvttoolkit.h"	96	#include "rxvttoolkit.h"
83	#include "scrollbar.h"	97	#include "scrollbar.h"
…		…
101	* SYSTEM HACKS	115	* SYSTEM HACKS
102	*****************************************************************************	116	*****************************************************************************
103	*/	117	*/
104		118
105	#include <termios.h>	119	#include <termios.h>
106
107	#include "background.h"
108		120
109	#ifndef STDIN_FILENO	121	#ifndef STDIN_FILENO
110	# define STDIN_FILENO 0	122	# define STDIN_FILENO 0
111	# define STDOUT_FILENO 1	123	# define STDOUT_FILENO 1
112	# define STDERR_FILENO 2	124	# define STDERR_FILENO 2
…		…
378	#define OVERLAY_RSTYLE (RS_None \| (Color_Black << RS_fgShift) \| (Color_Yellow << RS_bgShift))	390	#define OVERLAY_RSTYLE (RS_None \| (Color_Black << RS_fgShift) \| (Color_Yellow << RS_bgShift))
379		391
380	#define Sel_none 0 /* Not waiting */	392	#define Sel_none 0 /* Not waiting */
381	#define Sel_normal 0x01 /* normal selection */	393	#define Sel_normal 0x01 /* normal selection */
382	#define Sel_incr 0x02 /* incremental selection */	394	#define Sel_incr 0x02 /* incremental selection */
383	#define Sel_direct 0x00
384	#define Sel_Primary 0x01	395	#define Sel_Primary 0x01
385	#define Sel_Secondary 0x02	396	#define Sel_Secondary 0x02
386	#define Sel_Clipboard 0x03	397	#define Sel_Clipboard 0x03
387	#define Sel_whereMask 0x0f	398	#define Sel_whereMask 0x0f
388	#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */	399	#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
…		…
1100	struct mouse_event MEvent;	1111	struct mouse_event MEvent;
1101	XComposeStatus compose;	1112	XComposeStatus compose;
1102	static struct termios def_tio;	1113	static struct termios def_tio;
1103	row_col_t oldcursor;	1114	row_col_t oldcursor;
1104	#ifdef HAVE_BG_PIXMAP	1115	#ifdef HAVE_BG_PIXMAP
1105	bgPixmap_t bgPixmap;	1116	void bg_init ();
		1117	void bg_destroy ();
		1118
		1119	enum {
		1120	//subset returned by make_transparency_pixmap
		1121	BG_IS_VALID = 1 << 0,
		1122	BG_NEEDS_TINT = 1 << 1,
		1123	BG_NEEDS_BLUR = 1 << 2,
		1124
		1125	BG_EFFECTS_FLAGS = BG_NEEDS_TINT \| BG_NEEDS_BLUR,
		1126
		1127	BG_PROP_SCALE = 1 << 3,
		1128	BG_ROOT_ALIGN = 1 << 4,
		1129	BG_GEOMETRY_FLAGS = BG_PROP_SCALE \| BG_ROOT_ALIGN,
		1130
		1131	BG_TINT_SET = 1 << 5,
		1132	BG_TINT_BITAND = 1 << 6,
		1133	BG_TINT_FLAGS = BG_NEEDS_TINT \| BG_TINT_BITAND,
		1134
		1135	BG_HAS_RENDER = 1 << 7,
		1136	BG_HAS_RENDER_CONV = 1 << 8,
		1137	BG_CLIENT_RENDER = 1 << 9,
		1138
		1139	BG_IS_TRANSPARENT = 1 << 10,
		1140	BG_NEEDS_REFRESH = 1 << 11,
		1141	BG_IS_SIZE_SENSITIVE = 1 << 12,
		1142	BG_IS_FROM_FILE = 1 << 13,
		1143	};
		1144
		1145	unsigned int bg_flags;
		1146
		1147	# ifdef BG_IMAGE_FROM_FILE
		1148	void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
		1149	bool render_image (unsigned long tr_flags);
		1150
		1151	enum {
		1152	noScale = 0,
		1153	windowScale = 100,
		1154	defaultScale = windowScale,
		1155	centerAlign = 50,
		1156	defaultAlign = centerAlign,
		1157	};
		1158
		1159	unsigned int h_scale, v_scale; /* percents of the window size */
		1160	int h_align, v_align; /* percents of the window size:
		1161	0 - left align, 50 - center, 100 - right */
		1162
		1163	bool bg_set_geometry (const char *geom, bool update = false);
		1164	void bg_set_default_geometry ()
		1165	{
		1166	h_scale = v_scale = defaultScale;
		1167	h_align = v_align = defaultAlign;
		1168	}
		1169
		1170	bool bg_set_file (const char *file);
		1171	# endif
		1172
		1173	# ifdef ENABLE_TRANSPARENCY
		1174	Pixmap root_pixmap; /* current root pixmap set */
		1175	rxvt_color tint;
		1176	int shade;
		1177	int h_blurRadius, v_blurRadius;
		1178
		1179	bool bg_set_transparent ();
		1180	void bg_set_root_pixmap ();
		1181	void set_tint_shade_flags ();
		1182	bool bg_set_tint (rxvt_color &new_tint);
		1183	bool bg_set_shade (const char *shade_str);
		1184	bool bg_set_blur (const char *geom);
		1185
		1186	bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
		1187	bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
		1188	unsigned long make_transparency_pixmap ();
		1189	# endif
		1190
		1191	ev_tstamp bg_valid_since;
		1192
		1193	Pixmap bg_pixmap;
		1194	unsigned int bg_pmap_width, bg_pmap_height;
		1195
		1196	int target_x;
		1197	int target_y;
		1198	bool bg_set_position (int x, int y);
		1199	bool bg_window_size_sensitive ();
		1200	bool bg_window_position_sensitive ();
		1201
		1202	bool bg_render ();
		1203	void bg_invalidate ()
		1204	{
		1205	bg_flags &= ~BG_IS_VALID;
		1206	}
1106	#endif	1207	#endif
1107	#ifdef HAVE_AFTERIMAGE	1208	#ifdef HAVE_AFTERIMAGE
		1209	ASImage *original_asim;
1108	ASVisual *asv;	1210	ASVisual *asv;
1109	ASImageManager *asimman;	1211	ASImageManager *asimman;
1110		1212
1111	void init_asv ()	1213	void init_asv ()
1112	{	1214	{
1113	if (!asv)	1215	if (!asv)
1114	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);	1216	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1115	}	1217	}
		1218	#endif
		1219	#ifdef HAVE_PIXBUF
		1220	GdkPixbuf *pixbuf;
		1221	bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
		1222	int src_x, int src_y, int dst_x, int dst_y,
		1223	unsigned int width, unsigned int height);
1116	#endif	1224	#endif
1117		1225
1118	#if ENABLE_OVERLAY	1226	#if ENABLE_OVERLAY
1119	overlay_base ov;	1227	overlay_base ov;
1120		1228
…		…
1433	void scr_backindex () NOTHROW;	1541	void scr_backindex () NOTHROW;
1434	void scr_forwardindex () NOTHROW;	1542	void scr_forwardindex () NOTHROW;
1435	#endif	1543	#endif
1436	void scr_touch (bool refresh) NOTHROW;	1544	void scr_touch (bool refresh) NOTHROW;
1437	void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;	1545	void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1438	void scr_recolour () NOTHROW;	1546	void scr_recolour (bool refresh = true) NOTHROW;
1439	void scr_remap_chars () NOTHROW;	1547	void scr_remap_chars () NOTHROW;
1440	void scr_remap_chars (line_t &l) NOTHROW;	1548	void scr_remap_chars (line_t &l) NOTHROW;
1441		1549
1442	enum cursor_mode { SAVE, RESTORE };	1550	enum cursor_mode { SAVE, RESTORE };
1443		1551

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.427 by sf-exg, Mon Jan 10 14:07:19 2011 UTC vs. Revision 1.434 by sf-exg, Sun Feb 6 11:42:28 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.427 by sf-exg, Mon Jan 10 14:07:19 2011 UTC vs.
Revision 1.434 by sf-exg, Sun Feb 6 11:42:28 2011 UTC