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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.283 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.294 by sasha, Fri Aug 17 22:01:33 2007 UTC

…		…
173	#endif	173	#endif
174		174
175	#if defined(XPM_BACKGROUND) \|\| defined(ENABLE_TRANSPARENCY)	175	#if defined(XPM_BACKGROUND) \|\| defined(ENABLE_TRANSPARENCY)
176	# define HAVE_BG_PIXMAP 1/* to simplify further usage */	176	# define HAVE_BG_PIXMAP 1/* to simplify further usage */
177	struct bgPixmap_t {	177	struct bgPixmap_t {
		178
		179	enum {
		180	geometrySet = (1UL<<0),
		181	propScale = (1UL<<1),
		182	geometryFlags = (geometrySet\|propScale),
		183
		184	tintSet = (1UL<<8),
		185	tintNeeded = (1UL<<9),
		186	tintServerSide = (1UL<<10),
		187	tintFlags = (tintSet\|tintServerSide\|tintNeeded),
		188	blurNeeded = (1UL<<11),
		189
		190	isTransparent = (1UL<<16),
		191	isInvalid = (1UL<<17)
		192	};
		193
		194	unsigned long flags;
		195
		196	enum {
		197	transpPmapTiled = (1UL<<0),
		198	transpPmapTinted = tintNeeded,
		199	transpPmapBlured = blurNeeded,
		200	transpTransformations = (tintNeeded\|blurNeeded)
		201	}; /* this flags are returned by make_transparency_pixmap if called */
		202
178	# ifdef XPM_BACKGROUND	203	# ifdef XPM_BACKGROUND
179
180	# ifdef HAVE_AFTERIMAGE	204	# ifdef HAVE_AFTERIMAGE
181	ASImage *original_asim;	205	ASImage *original_asim;
		206	bool render_asim (ASImage *background, ARGB32 background_tint);
182	# endif	207	# endif
		208
		209	enum { defaultScale = 100, defaultAlign = 50 };
183		210
184	unsigned int h_scale, v_scale;/* percents of the window size */	211	unsigned int h_scale, v_scale;/* percents of the window size */
185	int h_align, v_align; /* percents of the window size:	212	int h_align, v_align; /* percents of the window size:
186	0 - left align, 50 - center, 100 - right */	213	0 - left align, 50 - center, 100 - right */
187		214	void unset_geometry () { flags = flags & ~geometryFlags; };
188	bool handle_geometry (const char *geom);	215	bool set_geometry (const char *geom);
		216	void set_defaultGeometry ()
		217	{
		218	h_scale = v_scale = defaultScale;
		219	h_align = v_align = defaultAlign;
		220	flags \|= geometrySet;
		221	};
189		222
		223	bool set_file (const char *file);
		224	# endif /* XPM_BACKGROUND */
		225
		226	rxvt_term *target;
		227	bool set_target (rxvt_term *new_target);
		228
		229	# ifdef ENABLE_TRANSPARENCY
		230	int root_depth; /* obtained when target is set */
		231	Pixmap root_pixmap; /* current root pixmap set */
		232	rxvt_color tint;
		233	int shade;
		234	int h_blurRadius, v_blurRadius;
		235
		236	bool set_transparent ();
		237	bool set_blur_radius (const char *geom);
		238	bool set_tint (rxvt_color &new_tint);
		239	bool unset_tint ();
		240	bool set_shade (const char *shade_str);
		241	bool set_root_pixmap ();
		242
		243	unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */
190	# endif	244	# endif
191		245	double invalid_since;
192	# define bgPmap_geometrySet (1UL<<0)
193	# define bgPmap_hScale (1UL<<1)
194	# define bgPmap_vScale (1UL<<2)
195	# define bgPmap_Scale (bgPmap_hScale\|bgPmap_vScale)
196	# define bgPmap_propScale (1UL<<3)
197	# define bgPmap_geometryFlags (bgPmap_geometrySet\|bgPmap_Scale\|bgPmap_propScale)
198
199	# define bgPmap_Transparent (1UL<<16)
200	unsigned long flags;
201		246
202	Pixmap pixmap;	247	Pixmap pixmap;
203	unsigned int pmap_width, pmap_height;	248	unsigned int pmap_width, pmap_height;
204	unsigned int pmap_depth;	249	unsigned int pmap_depth;
205		250
206	bool window_size_sensitive();	251	bool window_size_sensitive ();
207		252	bool need_client_side_rendering ();
		253	void apply ();
		254	bool render ();
		255	void invalidate () {
		256	if (!(flags & isInvalid))
		257	{
		258	flags \|= isInvalid;
		259	invalid_since = NOW;
		260	}
		261	};
208	};	262	};
209	#else	263	#else
210	# undef HAVE_BG_PIXMAP	264	# undef HAVE_BG_PIXMAP
211	#endif	265	#endif
212		266
…		…
589	#endif	643	#endif
590	#ifdef KEEP_SCROLLCOLOR	644	#ifdef KEEP_SCROLLCOLOR
591	Color_scroll,	645	Color_scroll,
592	Color_trough,	646	Color_trough,
593	#endif	647	#endif
594	#if TINTING	648	#if ENABLE_TRANSPARENCY
595	Color_tint,	649	Color_tint,
596	#endif	650	#endif
597	#if OFF_FOCUS_FADING	651	#if OFF_FOCUS_FADING
598	Color_fade,	652	Color_fade,
599	#endif	653	#endif
…		…
917	struct mbstate mbstate; // current input multibyte state	971	struct mbstate mbstate; // current input multibyte state
918		972
919	unsigned char want_refresh:1,	973	unsigned char want_refresh:1,
920	#ifdef ENABLE_TRANSPARENCY	974	#ifdef ENABLE_TRANSPARENCY
921	want_full_refresh:1, /* awaiting full screen refresh */	975	want_full_refresh:1, /* awaiting full screen refresh */
922	am_transparent:1, /* is a transparent term */
923	am_pixmap_trans:1, /* transparency w/known root pixmap */
924	#endif	976	#endif
925	current_screen:1, /* primary or secondary */	977	current_screen:1, /* primary or secondary */
926	num_scr_allow:1,	978	num_scr_allow:1,
927	bypass_keystate:1,	979	bypass_keystate:1,
928	#ifdef CURSOR_BLINK	980	#ifdef CURSOR_BLINK
…		…
1111		1163
1112	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1164	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1113	void rootwin_cb (XEvent &xev);	1165	void rootwin_cb (XEvent &xev);
1114	xevent_watcher rootwin_ev;	1166	xevent_watcher rootwin_ev;
1115	#endif	1167	#endif
1116	#if ENABLE_TRANSPARENCY	1168	#ifdef HAVE_BG_PIXMAP
1117	int check_our_parents ();	1169	int update_background ();
1118	void check_our_parents_cb (time_watcher &w);	1170	void update_background_cb (time_watcher &w);
1119	time_watcher check_our_parents_ev;	1171	time_watcher update_background_ev;
1120	#endif	1172	#endif
1121		1173
1122	void x_cb (XEvent &xev);	1174	void x_cb (XEvent &xev);
1123	void flush ();	1175	void flush ();
1124	xevent_watcher termwin_ev;	1176	xevent_watcher termwin_ev;
…		…
1460	void get_options (int argc, const char const argv);	1512	void get_options (int argc, const char const argv);
1461	int parse_keysym (const char str, const char arg);	1513	int parse_keysym (const char str, const char arg);
1462	void get_xdefaults (FILE stream, const char name);	1514	void get_xdefaults (FILE stream, const char name);
1463	void extract_resources ();	1515	void extract_resources ();
1464	// xpm.C	1516	// xpm.C
1465	//int scale_pixmap (const char *geom);	1517	void get_window_origin (int &x, int &y);
1466	void resize_pixmap ();	1518	Pixmap get_pixmap_property (int prop_id);
1467	void set_bgPixmap (const char *file);
1468	};	1519	};
1469		1520
1470	/*	1521	/*
1471	*****************************************************************************	1522	*****************************************************************************
1472	* PROTOTYPES	1523	* PROTOTYPES

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.283 by sasha, Fri Aug 3 22:40:10 2007 UTC vs. Revision 1.294 by sasha, Fri Aug 17 22:01:33 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.283 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.294 by sasha, Fri Aug 17 22:01:33 2007 UTC