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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.173 by root, Wed Jun 6 11:46:11 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);
…		…
400		400
401	ENTER;	401	ENTER;
402	SAVETMPS;	402	SAVETMPS;
403		403
404	dSP;	404	dSP;
		405	PUSHMARK (SP);
405	EXTEND (SP, 2);	406	EXTEND (SP, 2);
406	PUSHs (sv_2mortal (newSVterm (term)));	407	PUSHs (sv_2mortal (newSVterm (term)));
407	PUSHs (sv_2mortal (newSViv (type)));	408	PUSHs (sv_2mortal (newSViv (type)));
408	PUTBACK;	409	PUTBACK;
409	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);	410	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
…		…
419		420
420	ENTER;	421	ENTER;
421	SAVETMPS;	422	SAVETMPS;
422		423
423	dSP;	424	dSP;
		425	PUSHMARK (SP);
424	EXTEND (SP, 6);	426	EXTEND (SP, 6);
425	PUSHs (sv_2mortal (newSVterm (term)));	427	PUSHs (sv_2mortal (newSVterm (term)));
426	PUSHs (sv_2mortal (newSVpv (name, 0)));	428	PUSHs (sv_2mortal (newSVpv (name, 0)));
427	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);	429	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);	430	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
…		…
2030	#############################################################################	2032	#############################################################################
2031	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)
2032		2034
2033	# TODO: ugly	2035	# TODO: ugly
2034	void	2036	void
2035	rxvt_term::get_geometry ()	2037	rxvt_term::background_geometry (bool border = false)
2036	PPCODE:	2038	PPCODE:
2037	EXTEND (SP, 4);	2039	EXTEND (SP, 4);
2038	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));	2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2039	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));	2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2040	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));	2042	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2041	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));	2043	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2042		2044
2043	#if HAVE_IMG	2045	#if HAVE_IMG
		2046
		2047	#if 0
2044		2048
2045	rxvt_img *	2049	rxvt_img *
2046	rxvt_term::new_img (SV *format, int width, int height)	2050	rxvt_term::new_img (SV *format, int width, int height)
2047	CODE:	2051	CODE:
2048	XRenderPictFormat *f = SvOK (format)	2052	XRenderPictFormat *f = SvOK (format)
…		…
2050	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);	2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2051	RETVAL = new rxvt_img (THIS, f, width, height);	2055	RETVAL = new rxvt_img (THIS, f, width, height);
2052	OUTPUT:	2056	OUTPUT:
2053	RETVAL	2057	RETVAL
2054		2058
		2059	#endif
		2060
2055	#if ENABLE_TRANSPARENCY	2061	#if ENABLE_TRANSPARENCY
2056		2062
2057	rxvt_img *	2063	rxvt_img *
2058	rxvt_term::new_img_from_root ()	2064	rxvt_term::new_img_from_root ()
2059	CODE:	2065	CODE:
…		…
2082	#endif	2088	#endif
2083		2089
2084	#if HAVE_BG_PIXMAP	2090	#if HAVE_BG_PIXMAP
2085		2091
2086	void	2092	void
2087	rxvt_term::set_background (rxvt_img *img)	2093	rxvt_term::set_background (rxvt_img *img, bool border = false)
2088	CODE:	2094	CODE:
2089	THIS->bg_destroy ();	2095	THIS->bg_destroy ();
2090	THIS->bg_pixmap = None;	2096	THIS->bg_pixmap = None;
2091	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);
2092		2098
2093	if (img) // TODO: cannot be false	2099	if (img) // TODO: cannot be false
2094	{	2100	{
2095	img->unshare ();	2101	img = img->clone (); // own the img
2096	//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
2097	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)
2098	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;	2129	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2099	THIS->bg_valid_since = ev::now (); // TODO: extra bloat	2130
		2131	delete img;
2100	}	2132	}
2101		2133
2102	#endif	2134	#endif
2103		2135
2104	#endif	2136	#endif
…		…
2153		2185
2154	int	2186	int
2155	rxvt_img::h ()	2187	rxvt_img::h ()
2156	CODE:	2188	CODE:
2157	RETVAL = THIS->h;	2189	RETVAL = THIS->h;
2158	OUTPUT:
2159	RETVAL
2160
2161	bool
2162	rxvt_img::shared ()
2163	CODE:
2164	RETVAL = THIS->shared;
2165	OUTPUT:	2190	OUTPUT:
2166	RETVAL	2191	RETVAL
2167		2192
2168	Pixmap	2193	Pixmap
2169	rxvt_img::pm ()	2194	rxvt_img::pm ()
…		…
2182	void	2207	void
2183	rxvt_img::DESTROY ()	2208	rxvt_img::DESTROY ()
2184	CODE:	2209	CODE:
2185	delete THIS;	2210	delete THIS;
2186		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
2187	rxvt_img *	2241	rxvt_img *
2188	rxvt_img::blur (int rh, int rv)	2242	rxvt_img::blur (int rh, int rv)
2189		2243
2190	void
2191	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2192
2193	void
2194	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2195
2196	void
2197	rxvt_img::unshare ()
2198
2199	rxvt_img *	2244	rxvt_img *
2200	rxvt_img::clone ()
2201
2202	rxvt_img *
2203	rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2204
2205	rxvt_img *
2206	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)
2207	INIT:	2246	INIT:
2208	double matrix[9] = {	2247	double matrix[9] = {
2209	p11, p12, p13,	2248	p11, p12, p13,
2210	p21, p22, p23,	2249	p21, p22, p23,
2211	p31, p32, p33	2250	p31, p32, p33
2212	};	2251	};
2213	C_ARGS: new_width, new_height, matrix, repeat	2252	C_ARGS: new_width, new_height, matrix
2214		2253
2215	rxvt_img *	2254	rxvt_img *
2216	rxvt_img::scale (int new_width, int new_height)	2255	rxvt_img::scale (int new_width, int new_height)
2217		2256
2218	rxvt_img *	2257	rxvt_img *
2219	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)
2220		2259
2221	#endif	2260	#endif
2222		2261

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.173 by root, Wed Jun 6 11:46:11 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.173 by root, Wed Jun 6 11:46:11 2012 UTC vs.
Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC