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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.178 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.192 by root, Tue Jun 12 10:45:53 2012 UTC

…		…
54	typedef char * octet_string;	54	typedef char * octet_string;
55	typedef char * utf8_string;	55	typedef char * utf8_string;
56		56
57	typedef int render_repeat_mode;	57	typedef int render_repeat_mode;
58		58
		59	#if HAVE_PIXBUF
59	typedef GdkPixbuf * urxvt__pixbuf;	60	typedef GdkPixbuf * urxvt__pixbuf;
		61	#endif
60	typedef rxvt_img * urxvt__img;	62	typedef rxvt_img * urxvt__img;
61		63
62	/////////////////////////////////////////////////////////////////////////////	64	/////////////////////////////////////////////////////////////////////////////
63		65
64	static void	66	static void
65	parse_color (rxvt_screen s, rxvt_color &c, SV sv)	67	parse_color (rxvt_screen s, rxvt_color &c, SV sv)
66	{	68	{
67	//TODO: support component stuff	69	//TODO: support component stuff, 0..1
68	c.set (s, SvPVbyte_nolen (sv));	70	c.set (s, SvPVbyte_nolen (sv));
69	}	71	}
70		72
71	/////////////////////////////////////////////////////////////////////////////	73	/////////////////////////////////////////////////////////////////////////////
72		74
…		…
341	PERL_SYS_TERM ();	343	PERL_SYS_TERM ();
342	}	344	}
343	}	345	}
344		346
345	void	347	void
346	rxvt_perl_interp::init (rxvt_term *term)	348	rxvt_perl_interp::init ()
347	{	349	{
348	if (!perl)	350	if (!perl)
349	{	351	{
350	rxvt_push_locale (""); // perl init destroys current locale	352	rxvt_push_locale (""); // perl init destroys current locale
351		353
…		…
381	}	383	}
382	}	384	}
383		385
384	rxvt_pop_locale ();	386	rxvt_pop_locale ();
385	}	387	}
		388	}
386		389
387	if (perl)	390	void
		391	rxvt_perl_interp::init (rxvt_term *term)
		392	{
		393	init ();
		394
		395	if (perl && !term->perl.self)
388	{	396	{
389	// runs outside of perls ENV	397	// runs outside of perls ENV
390	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	398	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);	399	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);	400	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393	}	401	}
		402	}
		403
		404	void
		405	rxvt_perl_interp::eval (const char *str)
		406	{
		407	eval_pv (str, 1);
394	}	408	}
395		409
396	void	410	void
397	rxvt_perl_interp::usage (rxvt_term *term, int type)	411	rxvt_perl_interp::usage (rxvt_term *term, int type)
398	{	412	{
…		…
2030	}	2044	}
2031		2045
2032	#############################################################################	2046	#############################################################################
2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2047	# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034		2048
2035	# TODO: ugly	2049	bool
		2050	rxvt_term::has_render ()
		2051	CODE:
		2052	RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
		2053	OUTPUT:
		2054	RETVAL
		2055
2036	void	2056	void
2037	rxvt_term::get_geometry ()	2057	rxvt_term::background_geometry (bool border = false)
2038	PPCODE:	2058	PPCODE:
2039	EXTEND (SP, 4);	2059	EXTEND (SP, 4);
2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));	2060	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));	2061	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2042	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));	2062	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));	2063	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044		2064
2045	#if HAVE_IMG	2065	#if HAVE_IMG
2046		2066
2047	#if 0
2048
2049	rxvt_img *	2067	rxvt_img *
2050	rxvt_term::new_img (SV *format, int width, int height)	2068	rxvt_term::new_img (SV *format, int width = 1, int height = 1)
2051	CODE:	2069	CODE:
2052	XRenderPictFormat *f = SvOK (format)	2070	XRenderPictFormat *f = SvOK (format)
2053	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))	2071	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);	2072	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055	RETVAL = new rxvt_img (THIS, f, width, height);	2073	RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
		2074	RETVAL->alloc ();
2056	OUTPUT:	2075	OUTPUT:
2057	RETVAL	2076	RETVAL
2058
2059	#endif
2060		2077
2061	#if ENABLE_TRANSPARENCY	2078	#if ENABLE_TRANSPARENCY
2062		2079
2063	rxvt_img *	2080	rxvt_img *
2064	rxvt_term::new_img_from_root ()	2081	rxvt_term::new_img_from_root ()
…		…
2088	#endif	2105	#endif
2089		2106
2090	#if HAVE_BG_PIXMAP	2107	#if HAVE_BG_PIXMAP
2091		2108
2092	void	2109	void
2093	rxvt_term::set_background (rxvt_img *img)	2110	rxvt_term::set_background (rxvt_img *img, bool border = false)
2094	CODE:	2111	CODE:
2095	THIS->bg_destroy ();	2112	THIS->bg_destroy ();
2096	THIS->bg_pixmap = None;	2113	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
2097	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
2098		2114
2099	if (img) // TODO: cannot be false	2115	if (img) // TODO: cannot be false
2100	{	2116	{
		2117	img = img->clone (); // own the img
		2118
		2119	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2120	img->sub_rect (0, 0,
		2121	border ? THIS->vt_width : THIS->szHint.width,
		2122	border ? THIS->vt_height : THIS->szHint.height)
		2123	->replace (img);
		2124
		2125	// just in case, should usually be a nop
2101	img = img->reify ();	2126	img->reify ()
		2127	->replace (img);
		2128
2102	rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);	2129	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2103	delete img;	2130	->replace (img);
2104	THIS->bg_pixmap = img2->steal ();	2131
		2132	THIS->bg_img = img;
		2133	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2134
		2135	if (!border)
2105	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;	2136	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2106	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2107	}	2137	}
2108		2138
2109	#endif	2139	#endif
2110		2140
2111	#endif	2141	#endif
…		…
2185	delete THIS;	2215	delete THIS;
2186		2216
2187	void	2217	void
2188	rxvt_img::unshare ()	2218	rxvt_img::unshare ()
2189		2219
2190	void	2220	int
2191	rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal)	2221	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2222	CODE:
		2223	if (items >= 2)
		2224	THIS->repeat_mode (repeat);
		2225	if (GIMME_V != G_VOID)
		2226	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2192		2227
2193	void	2228	void
2194	rxvt_img::move (int dx, int dy)	2229	rxvt_img::move (int dx, int dy)
2195		2230
2196	void	2231	void
…		…
2210		2245
2211	rxvt_img *	2246	rxvt_img *
2212	rxvt_img::blur (int rh, int rv)	2247	rxvt_img::blur (int rh, int rv)
2213		2248
2214	rxvt_img *	2249	rxvt_img *
2215	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)	2250	rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, int new_width = 0, int new_height = 0)
2216	INIT:	2251	INIT:
2217	double matrix[9] = {	2252	double matrix[9] = {
2218	p11, p12, p13,	2253	p11, p12, p13,
2219	p21, p22, p23,	2254	p21, p22, p23,
2220	p31, p32, p33	2255	p31, p32, p33
2221	};	2256	};
2222	C_ARGS: new_width, new_height, matrix	2257	C_ARGS: matrix, new_width, new_height
2223		2258
2224	rxvt_img *	2259	rxvt_img *
2225	rxvt_img::scale (int new_width, int new_height)	2260	rxvt_img::scale (int new_width, int new_height)
2226		2261
2227	rxvt_img *	2262	rxvt_img *
2228	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)	2263	rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0)
2229		2264
2230	#endif	2265	#endif
2231		2266

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.178 by root, Thu Jun 7 08:12:55 2012 UTC vs. Revision 1.192 by root, Tue Jun 12 10:45:53 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.178 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.192 by root, Tue Jun 12 10:45:53 2012 UTC