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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.174 by root, Wed Jun 6 14:34:03 2012 UTC vs.
Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC

…		…
382	}	382	}
383		383
384	rxvt_pop_locale ();	384	rxvt_pop_locale ();
385	}	385	}
386		386
387	if (perl)	387	if (perl && !term->perl.self)
388	{	388	{
389	// runs outside of perls ENV	389	// runs outside of perls ENV
390	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	390	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
391	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);	391	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
392	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);	392	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
…		…
2032	#############################################################################	2032	#############################################################################
2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034		2034
2035	# TODO: ugly	2035	# TODO: ugly
2036	void	2036	void
2037	rxvt_term::get_geometry ()	2037	rxvt_term::background_geometry (bool border = false)
2038	PPCODE:	2038	PPCODE:
2039	EXTEND (SP, 4);	2039	EXTEND (SP, 4);
2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));	2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));	2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2042	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));	2042	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));	2043	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044		2044
2045	#if HAVE_IMG	2045	#if HAVE_IMG
		2046
		2047	#if 0
2046		2048
2047	rxvt_img *	2049	rxvt_img *
2048	rxvt_term::new_img (SV *format, int width, int height)	2050	rxvt_term::new_img (SV *format, int width, int height)
2049	CODE:	2051	CODE:
2050	XRenderPictFormat *f = SvOK (format)	2052	XRenderPictFormat *f = SvOK (format)
…		…
2052	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);	2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2053	RETVAL = new rxvt_img (THIS, f, width, height);	2055	RETVAL = new rxvt_img (THIS, f, width, height);
2054	OUTPUT:	2056	OUTPUT:
2055	RETVAL	2057	RETVAL
2056		2058
		2059	#endif
		2060
2057	#if ENABLE_TRANSPARENCY	2061	#if ENABLE_TRANSPARENCY
2058		2062
2059	rxvt_img *	2063	rxvt_img *
2060	rxvt_term::new_img_from_root ()	2064	rxvt_term::new_img_from_root ()
2061	CODE:	2065	CODE:
…		…
2084	#endif	2088	#endif
2085		2089
2086	#if HAVE_BG_PIXMAP	2090	#if HAVE_BG_PIXMAP
2087		2091
2088	void	2092	void
2089	rxvt_term::set_background (rxvt_img *img)	2093	rxvt_term::set_background (rxvt_img *img, bool border = false)
2090	CODE:	2094	CODE:
2091	THIS->bg_destroy ();	2095	THIS->bg_destroy ();
2092	THIS->bg_pixmap = None;	2096	THIS->bg_pixmap = None;
2093	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;	2097	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
2094		2098
2095	if (img) // TODO: cannot be false	2099	if (img) // TODO: cannot be false
2096	{	2100	{
2097	img->unshare ();	2101	img = img->clone (); // own the img
2098	//TODO: convetr to visual, possibly precompose with colour	2102
		2103	{
		2104	rxvt_img *img2 = img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
		2105	delete img;
		2106	img = img2;
		2107	}
		2108
		2109	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2110	{
		2111	rxvt_img *img2 = img->sub_rect (0, 0,
		2112	border ? THIS->vt_width : THIS->szHint.width,
		2113	border ? THIS->vt_height : THIS->szHint.height);
		2114	delete img;
		2115	img = img2;
		2116	}
		2117
		2118	{
		2119	// just in case, should usually be a nop
		2120	rxvt_img *img2 = img->reify ();
		2121	delete img;
		2122	img = img2;
		2123	}
		2124
2099	THIS->bg_pixmap = img->steal ();	2125	THIS->bg_pixmap = img->steal ();
		2126	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2127
		2128	if (!border)
2100	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;	2129	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2101	THIS->bg_valid_since = ev::now (); // TODO: extra bloat	2130
		2131	delete img;
2102	}	2132	}
2103		2133
2104	#endif	2134	#endif
2105		2135
2106	#endif	2136	#endif
…		…
2155		2185
2156	int	2186	int
2157	rxvt_img::h ()	2187	rxvt_img::h ()
2158	CODE:	2188	CODE:
2159	RETVAL = THIS->h;	2189	RETVAL = THIS->h;
2160	OUTPUT:
2161	RETVAL
2162
2163	bool
2164	rxvt_img::shared ()
2165	CODE:
2166	RETVAL = THIS->shared;
2167	OUTPUT:	2190	OUTPUT:
2168	RETVAL	2191	RETVAL
2169		2192
2170	Pixmap	2193	Pixmap
2171	rxvt_img::pm ()	2194	rxvt_img::pm ()
…		…
2184	void	2207	void
2185	rxvt_img::DESTROY ()	2208	rxvt_img::DESTROY ()
2186	CODE:	2209	CODE:
2187	delete THIS;	2210	delete THIS;
2188		2211
		2212	void
		2213	rxvt_img::unshare ()
		2214
		2215	int
		2216	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2217	CODE:
		2218	if (items >= 2)
		2219	THIS->repeat_mode (repeat);
		2220	if (GIMME_V != G_VOID)
		2221	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2222
		2223	void
		2224	rxvt_img::move (int dx, int dy)
		2225
		2226	void
		2227	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2228
		2229	void
		2230	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2231
		2232	rxvt_img *
		2233	rxvt_img::clone ()
		2234
		2235	rxvt_img *
		2236	rxvt_img::reify ()
		2237
		2238	rxvt_img *
		2239	rxvt_img::sub_rect (int x, int y, int width, int height)
		2240
2189	rxvt_img *	2241	rxvt_img *
2190	rxvt_img::blur (int rh, int rv)	2242	rxvt_img::blur (int rh, int rv)
2191		2243
2192	void
2193	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2194
2195	void
2196	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2197
2198	void
2199	rxvt_img::unshare ()
2200
2201	rxvt_img *	2244	rxvt_img *
2202	rxvt_img::clone ()
2203
2204	rxvt_img *
2205	rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2206
2207	rxvt_img *
2208	rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, render_repeat_mode repeat = RepeatNormal)	2245	rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
2209	INIT:	2246	INIT:
2210	double matrix[9] = {	2247	double matrix[9] = {
2211	p11, p12, p13,	2248	p11, p12, p13,
2212	p21, p22, p23,	2249	p21, p22, p23,
2213	p31, p32, p33	2250	p31, p32, p33
2214	};	2251	};
2215	C_ARGS: new_width, new_height, matrix, repeat	2252	C_ARGS: new_width, new_height, matrix
2216		2253
2217	rxvt_img *	2254	rxvt_img *
2218	rxvt_img::scale (int new_width, int new_height)	2255	rxvt_img::scale (int new_width, int new_height)
2219		2256
2220	rxvt_img *	2257	rxvt_img *
2221	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)	2258	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2222		2259
2223	#endif	2260	#endif
2224		2261

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.174 by root, Wed Jun 6 14:34:03 2012 UTC vs. Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.174 by root, Wed Jun 6 14:34:03 2012 UTC vs.
Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC