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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.179 by sf-exg, Thu Jun 7 09:34:51 2012 UTC vs.
Revision 1.197 by root, Thu Jun 14 18:19:11 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;
		63	typedef rxvt_img::nv rxvt_img__nv;
61		64
62	/////////////////////////////////////////////////////////////////////////////	65	/////////////////////////////////////////////////////////////////////////////
63		66
64	static void	67	static rgba
65	parse_color (rxvt_screen s, rxvt_color &c, SV sv)	68	parse_rgba (SV sv, rxvt_screen s = 0)
66	{	69	{
67	//TODO: support component stuff	70	rgba c;
		71
		72	if (AV av = (AV )SvRV (sv))
		73	{
		74	if (SvTYPE ((SV *)av) != SVt_PVAV)
		75	croak ("colour must be either a colour string, or an array,");
		76
		77	int len = av_len (av) + 1;
		78
		79	if (len != 1 && len != 3 && len != 4)
		80	croak ("component colour array must have 1, 3 or 4 components,");
		81
		82	c.a = rgba::MAX_CC;
		83
		84	c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
		85
		86	if (len >= 3)
		87	{
		88	c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
		89	c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
		90
		91	if (len >= 4)
		92	c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
		93	}
		94	}
		95	else if (s)
		96	{
		97	rxvt_color rc;
68	c.set (s, SvPVbyte_nolen (sv));	98	rc.set (s, SvPVbyte_nolen (sv));
		99	rc.get (c);
		100	}
		101	else
		102	croak ("unable to parse colour,");
		103
		104	return c;
69	}	105	}
70		106
71	/////////////////////////////////////////////////////////////////////////////	107	/////////////////////////////////////////////////////////////////////////////
72		108
73	static wchar_t *	109	static wchar_t *
…		…
341	PERL_SYS_TERM ();	377	PERL_SYS_TERM ();
342	}	378	}
343	}	379	}
344		380
345	void	381	void
346	rxvt_perl_interp::init (rxvt_term *term)	382	rxvt_perl_interp::init ()
347	{	383	{
348	if (!perl)	384	if (!perl)
349	{	385	{
350	rxvt_push_locale (""); // perl init destroys current locale	386	rxvt_push_locale (""); // perl init destroys current locale
351		387
…		…
381	}	417	}
382	}	418	}
383		419
384	rxvt_pop_locale ();	420	rxvt_pop_locale ();
385	}	421	}
		422	}
386		423
387	if (perl)	424	void
		425	rxvt_perl_interp::init (rxvt_term *term)
		426	{
		427	init ();
		428
		429	if (perl && !term->perl.self)
388	{	430	{
389	// runs outside of perls ENV	431	// runs outside of perls ENV
390	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	432	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);	433	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);	434	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393	}	435	}
		436	}
		437
		438	void
		439	rxvt_perl_interp::eval (const char *str)
		440	{
		441	eval_pv (str, 1);
394	}	442	}
395		443
396	void	444	void
397	rxvt_perl_interp::usage (rxvt_term *term, int type)	445	rxvt_perl_interp::usage (rxvt_term *term, int type)
398	{	446	{
…		…
2030	}	2078	}
2031		2079
2032	#############################################################################	2080	#############################################################################
2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2081	# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034		2082
2035	# TODO: ugly	2083	bool
		2084	rxvt_term::has_render ()
		2085	CODE:
		2086	RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
		2087	OUTPUT:
		2088	RETVAL
		2089
2036	void	2090	void
2037	rxvt_term::get_geometry ()	2091	rxvt_term::background_geometry (bool border = false)
2038	PPCODE:	2092	PPCODE:
2039	EXTEND (SP, 4);	2093	EXTEND (SP, 4);
2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));	2094	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));	2095	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2042	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));	2096	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));	2097	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044		2098
2045	#if HAVE_IMG	2099	#if HAVE_IMG
2046		2100
2047	#if 0
2048
2049	rxvt_img *	2101	rxvt_img *
2050	rxvt_term::new_img (SV *format, int width, int height)	2102	rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1)
2051	CODE:	2103	CODE:
2052	XRenderPictFormat *f = SvOK (format)	2104	XRenderPictFormat *f = SvOK (format)
2053	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))	2105	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);	2106	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055	RETVAL = new rxvt_img (THIS, f, width, height);	2107	RETVAL = new rxvt_img (THIS, f, x, y, width, height);
		2108	RETVAL->alloc ();
2056	OUTPUT:	2109	OUTPUT:
2057	RETVAL	2110	RETVAL
2058
2059	#endif
2060		2111
2061	#if ENABLE_TRANSPARENCY	2112	#if ENABLE_TRANSPARENCY
2062		2113
2063	rxvt_img *	2114	rxvt_img *
2064	rxvt_term::new_img_from_root ()	2115	rxvt_term::new_img_from_root ()
…		…
2088	#endif	2139	#endif
2089		2140
2090	#if HAVE_BG_PIXMAP	2141	#if HAVE_BG_PIXMAP
2091		2142
2092	void	2143	void
2093	rxvt_term::set_background (rxvt_img *img)	2144	rxvt_term::set_background (rxvt_img *img, bool border = false)
2094	CODE:	2145	CODE:
2095	THIS->bg_destroy ();	2146	THIS->bg_destroy ();
2096	THIS->bg_pixmap = None;
2097	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER);	2147	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
2098		2148
2099	if (img) // TODO: cannot be false	2149	if (img) // TODO: cannot be false
2100	{	2150	{
		2151	img = img->clone (); // own the img
		2152
		2153	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2154	img->sub_rect (0, 0,
		2155	border ? THIS->vt_width : THIS->szHint.width,
		2156	border ? THIS->vt_height : THIS->szHint.height)
		2157	->replace (img);
		2158
		2159	// just in case, should usually be a nop
2101	img = img->reify ();	2160	img->reify ()
		2161	->replace (img);
		2162
2102	rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);	2163	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2103	delete img;	2164	->replace (img);
2104	THIS->bg_pixmap = img2->steal ();	2165
		2166	THIS->bg_img = img;
2105	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;	2167	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
2106	THIS->bg_valid_since = ev::now (); // TODO: extra bloat	2168
		2169	if (!border)
		2170	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2107	}	2171	}
2108		2172
2109	#endif	2173	#endif
2110		2174
2111	#endif	2175	#endif
…		…
2149	#if HAVE_IMG	2213	#if HAVE_IMG
2150		2214
2151	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)	2215	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
2152	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);	2216	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2153		2217
		2218	void
		2219	rxvt_img::geometry ()
		2220	PPCODE:
		2221	EXTEND (SP, 4);
		2222	PUSHs (sv_2mortal (newSViv (THIS->x)));
		2223	PUSHs (sv_2mortal (newSViv (THIS->y)));
		2224	PUSHs (sv_2mortal (newSViv (THIS->w)));
		2225	PUSHs (sv_2mortal (newSViv (THIS->h)));
		2226
		2227	int
		2228	rxvt_img::x ()
		2229	CODE:
		2230	RETVAL = THIS->x;
		2231	OUTPUT:
		2232	RETVAL
		2233
		2234	int
		2235	rxvt_img::y ()
		2236	CODE:
		2237	RETVAL = THIS->y;
		2238	OUTPUT:
		2239	RETVAL
		2240
2154	int	2241	int
2155	rxvt_img::w ()	2242	rxvt_img::w ()
2156	CODE:	2243	CODE:
2157	RETVAL = THIS->w;	2244	RETVAL = THIS->w;
2158	OUTPUT:	2245	OUTPUT:
…		…
2173	RETVAL	2260	RETVAL
2174		2261
2175	void	2262	void
2176	rxvt_img::fill (SV *c)	2263	rxvt_img::fill (SV *c)
2177	INIT:	2264	INIT:
2178	rxvt_color rc;	2265	rgba cc = parse_rgba (c, THIS->s);
2179	parse_color (THIS->s, rc, c);
2180	C_ARGS: rc	2266	C_ARGS: cc
2181		2267
2182	void	2268	void
2183	rxvt_img::DESTROY ()	2269	rxvt_img::DESTROY ()
2184	CODE:	2270	CODE:
2185	delete THIS;	2271	delete THIS;
2186		2272
2187	void	2273	void
2188	rxvt_img::unshare ()	2274	rxvt_img::unshare ()
2189		2275
2190	void	2276	int
2191	rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal)	2277	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2278	CODE:
		2279	if (items >= 2)
		2280	THIS->repeat_mode (repeat);
		2281	if (GIMME_V != G_VOID)
		2282	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2192		2283
2193	void	2284	void
2194	rxvt_img::move (int dx, int dy)	2285	rxvt_img::move (int dx, int dy)
2195		2286
2196	void	2287	void
2197	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)	2288	rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2198		2289
2199	void	2290	void
2200	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)	2291	rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2201		2292
2202	rxvt_img *	2293	rxvt_img *
2203	rxvt_img::clone ()	2294	rxvt_img::clone ()
2204		2295
2205	rxvt_img *	2296	rxvt_img *
…		…
2210		2301
2211	rxvt_img *	2302	rxvt_img *
2212	rxvt_img::blur (int rh, int rv)	2303	rxvt_img::blur (int rh, int rv)
2213		2304
2214	rxvt_img *	2305	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)	2306	rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33)
2216	INIT:	2307	INIT:
2217	double matrix[9] = {	2308	rxvt_img::nv matrix[3][3] = {
2218	p11, p12, p13,	2309	{ p11, p12, p13 },
2219	p21, p22, p23,	2310	{ p21, p22, p23 },
2220	p31, p32, p33	2311	{ p31, p32, p33 }
2221	};	2312	};
2222	C_ARGS: new_width, new_height, matrix	2313	C_ARGS: matrix
2223		2314
2224	rxvt_img *	2315	rxvt_img *
2225	rxvt_img::scale (int new_width, int new_height)	2316	rxvt_img::scale (int new_width, int new_height)
2226		2317
2227	rxvt_img *	2318	rxvt_img *
2228	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)	2319	rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2229		2320
2230	#endif	2321	#endif
2231		2322

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.179 by sf-exg, Thu Jun 7 09:34:51 2012 UTC vs. Revision 1.197 by root, Thu Jun 14 18:19:11 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.179 by sf-exg, Thu Jun 7 09:34:51 2012 UTC vs.
Revision 1.197 by root, Thu Jun 14 18:19:11 2012 UTC