[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.206 by root, Sat Jul 7 07:00:17 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 (SvROK (sv))
		73	{
		74	AV av = (AV )SvRV (sv);
		75
		76	if (SvTYPE ((SV *)av) != SVt_PVAV)
		77	croak ("colour must be either a colour string, or an array,");
		78
		79	int len = av_len (av) + 1;
		80
		81	if (len != 1 && len != 3 && len != 4)
		82	croak ("component colour array must have 1, 3 or 4 components,");
		83
		84	c.a = rgba::MAX_CC;
		85
		86	c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
		87
		88	if (len >= 3)
		89	{
		90	c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
		91	c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
		92
		93	if (len >= 4)
		94	c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
		95	}
		96	}
		97	else if (s)
		98	{
		99	rxvt_color rc;
68	c.set (s, SvPVbyte_nolen (sv));	100	rc.set (s, SvPVbyte_nolen (sv));
		101	rc.get (c);
		102	}
		103	else
		104	croak ("unable to parse colour,");
		105
		106	return c;
69	}	107	}
70		108
71	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
72		110
73	static wchar_t *	111	static wchar_t *
…		…
341	PERL_SYS_TERM ();	379	PERL_SYS_TERM ();
342	}	380	}
343	}	381	}
344		382
345	void	383	void
346	rxvt_perl_interp::init (rxvt_term *term)	384	rxvt_perl_interp::init ()
347	{	385	{
348	if (!perl)	386	if (!perl)
349	{	387	{
350	rxvt_push_locale (""); // perl init destroys current locale	388	rxvt_push_locale (""); // perl init destroys current locale
351		389
…		…
381	}	419	}
382	}	420	}
383		421
384	rxvt_pop_locale ();	422	rxvt_pop_locale ();
385	}	423	}
		424	}
386		425
387	if (perl)	426	void
		427	rxvt_perl_interp::init (rxvt_term *term)
		428	{
		429	init ();
		430
		431	if (perl && !term->perl.self)
388	{	432	{
389	// runs outside of perls ENV	433	// runs outside of perls ENV
390	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	434	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);	435	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);	436	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393	}	437	}
		438	}
		439
		440	void
		441	rxvt_perl_interp::eval (const char *str)
		442	{
		443	eval_pv (str, 1);
394	}	444	}
395		445
396	void	446	void
397	rxvt_perl_interp::usage (rxvt_term *term, int type)	447	rxvt_perl_interp::usage (rxvt_term *term, int type)
398	{	448	{
…		…
861	const_iv (PictStandardA1),	911	const_iv (PictStandardA1),
862	const_iv (RepeatNone),	912	const_iv (RepeatNone),
863	const_iv (RepeatNormal),	913	const_iv (RepeatNormal),
864	const_iv (RepeatPad),	914	const_iv (RepeatPad),
865	const_iv (RepeatReflect),	915	const_iv (RepeatReflect),
		916	// all versions
		917	const_iv (PictOpClear),
		918	const_iv (PictOpSrc),
		919	const_iv (PictOpDst),
		920	const_iv (PictOpOver),
		921	const_iv (PictOpOverReverse),
		922	const_iv (PictOpIn),
		923	const_iv (PictOpInReverse),
		924	const_iv (PictOpOut),
		925	const_iv (PictOpOutReverse),
		926	const_iv (PictOpAtop),
		927	const_iv (PictOpAtopReverse),
		928	const_iv (PictOpXor),
		929	const_iv (PictOpAdd),
		930	const_iv (PictOpSaturate),
		931	// 0.2+
		932	const_iv (PictOpDisjointClear),
		933	const_iv (PictOpDisjointSrc),
		934	const_iv (PictOpDisjointDst),
		935	const_iv (PictOpDisjointOver),
		936	const_iv (PictOpDisjointOverReverse),
		937	const_iv (PictOpDisjointIn),
		938	const_iv (PictOpDisjointInReverse),
		939	const_iv (PictOpDisjointOut),
		940	const_iv (PictOpDisjointOutReverse),
		941	const_iv (PictOpDisjointAtop),
		942	const_iv (PictOpDisjointAtopReverse),
		943	const_iv (PictOpDisjointXor),
		944	const_iv (PictOpConjointClear),
		945	const_iv (PictOpConjointSrc),
		946	const_iv (PictOpConjointDst),
		947	const_iv (PictOpConjointOver),
		948	const_iv (PictOpConjointOverReverse),
		949	const_iv (PictOpConjointIn),
		950	const_iv (PictOpConjointInReverse),
		951	const_iv (PictOpConjointOut),
		952	const_iv (PictOpConjointOutReverse),
		953	const_iv (PictOpConjointAtop),
		954	const_iv (PictOpConjointAtopReverse),
		955	const_iv (PictOpConjointXor),
		956	// 0.11+
		957	const_iv (PictOpMultiply),
		958	const_iv (PictOpScreen),
		959	const_iv (PictOpOverlay),
		960	const_iv (PictOpDarken),
		961	const_iv (PictOpLighten),
		962	const_iv (PictOpColorDodge),
		963	const_iv (PictOpColorBurn),
		964	const_iv (PictOpHardLight),
		965	const_iv (PictOpSoftLight),
		966	const_iv (PictOpDifference),
		967	const_iv (PictOpExclusion),
		968	const_iv (PictOpHSLHue),
		969	const_iv (PictOpHSLSaturation),
		970	const_iv (PictOpHSLColor),
		971	const_iv (PictOpHSLLuminosity),
866	#endif	972	#endif
867	# if 0	973	# if 0
868	const_iv (XIMForwardChar),	974	const_iv (XIMForwardChar),
869	const_iv (XIMBackwardChar),	975	const_iv (XIMBackwardChar),
870	const_iv (XIMForwardWord),	976	const_iv (XIMForwardWord),
…		…
1348	CODE:	1454	CODE:
1349	RETVAL = THIS->parent_y;	1455	RETVAL = THIS->parent_y;
1350	OUTPUT:	1456	OUTPUT:
1351	RETVAL	1457	RETVAL
1352		1458
		1459	Window
		1460	rxvt_term::vt ()
		1461	CODE:
		1462	RETVAL = THIS->vt;
		1463	OUTPUT:
		1464	RETVAL
		1465
1353	void	1466	void
1354	rxvt_term::vt_emask_add (U32 emask)	1467	rxvt_term::vt_emask_add (U32 emask)
1355	CODE:	1468	CODE:
1356	THIS->vt_emask_perl \|= emask;	1469	THIS->vt_emask_perl \|= emask;
1357	THIS->vt_select_input ();	1470	THIS->vt_select_input ();
…		…
2030	}	2143	}
2031		2144
2032	#############################################################################	2145	#############################################################################
2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2146	# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034		2147
2035	# TODO: ugly	2148	bool
		2149	rxvt_term::has_render ()
		2150	CODE:
		2151	RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
		2152	OUTPUT:
		2153	RETVAL
		2154
2036	void	2155	void
2037	rxvt_term::get_geometry ()	2156	rxvt_term::background_geometry (bool border = false)
2038	PPCODE:	2157	PPCODE:
2039	EXTEND (SP, 4);	2158	EXTEND (SP, 4);
2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));	2159	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));	2160	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2042	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));	2161	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));	2162	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044		2163
2045	#if HAVE_IMG	2164	#if HAVE_IMG
2046		2165
2047	#if 0
2048
2049	rxvt_img *	2166	rxvt_img *
2050	rxvt_term::new_img (SV *format, int width, int height)	2167	rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2051	CODE:	2168	CODE:
2052	XRenderPictFormat *f = SvOK (format)	2169	XRenderPictFormat *f = SvOK (format)
2053	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))	2170	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);	2171	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055	RETVAL = new rxvt_img (THIS, f, width, height);	2172	RETVAL = new rxvt_img (THIS, f, x, y, width, height);
		2173	RETVAL->alloc ();
2056	OUTPUT:	2174	OUTPUT:
2057	RETVAL	2175	RETVAL
2058
2059	#endif
2060		2176
2061	#if ENABLE_TRANSPARENCY	2177	#if ENABLE_TRANSPARENCY
2062		2178
2063	rxvt_img *	2179	rxvt_img *
2064	rxvt_term::new_img_from_root ()	2180	rxvt_term::new_img_from_root ()
…		…
2088	#endif	2204	#endif
2089		2205
2090	#if HAVE_BG_PIXMAP	2206	#if HAVE_BG_PIXMAP
2091		2207
2092	void	2208	void
2093	rxvt_term::set_background (rxvt_img *img)	2209	rxvt_term::set_background (rxvt_img *img, bool border = false)
2094	CODE:	2210	CODE:
2095	THIS->bg_destroy ();	2211	THIS->bg_destroy ();
2096	THIS->bg_pixmap = None;
2097	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER);	2212	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
2098		2213
2099	if (img) // TODO: cannot be false	2214	if (img) // TODO: cannot be false
2100	{	2215	{
		2216	img = img->clone (); // own the img
		2217
		2218	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2219	img->sub_rect (0, 0,
		2220	border ? THIS->vt_width : THIS->szHint.width,
		2221	border ? THIS->vt_height : THIS->szHint.height)
		2222	->replace (img);
		2223
		2224	// just in case, should usually be a nop
2101	img = img->reify ();	2225	img->reify ()
		2226	->replace (img);
		2227
2102	rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);	2228	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2103	delete img;	2229	->replace (img);
2104	THIS->bg_pixmap = img2->steal ();	2230
		2231	THIS->bg_img = img;
2105	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;	2232	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
2106	THIS->bg_valid_since = ev::now (); // TODO: extra bloat	2233
		2234	if (!border)
		2235	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2107	}	2236	}
2108		2237
2109	#endif	2238	#endif
2110		2239
2111	#endif	2240	#endif
…		…
2138	C_ARGS: filename, 0	2267	C_ARGS: filename, 0
2139		2268
2140	void	2269	void
2141	DESTROY (urxvt::pixbuf self)	2270	DESTROY (urxvt::pixbuf self)
2142	CODE:	2271	CODE:
2143	gdk_pixbuf_unref (self);	2272	g_object_unref (self);
2144		2273
2145	#endif	2274	#endif
2146		2275
2147	MODULE = urxvt PACKAGE = urxvt::img	2276	MODULE = urxvt PACKAGE = urxvt::img
2148		2277
2149	#if HAVE_IMG	2278	#if HAVE_IMG
2150		2279
2151	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)	2280	# 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);	2281	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2153		2282
		2283	void
		2284	rxvt_img::geometry ()
		2285	PPCODE:
		2286	EXTEND (SP, 4);
		2287	PUSHs (sv_2mortal (newSViv (THIS->x)));
		2288	PUSHs (sv_2mortal (newSViv (THIS->y)));
		2289	PUSHs (sv_2mortal (newSViv (THIS->w)));
		2290	PUSHs (sv_2mortal (newSViv (THIS->h)));
		2291
2154	int	2292	int
2155	rxvt_img::w ()	2293	rxvt_img::x ()
		2294	ALIAS:
		2295	x = 0
		2296	y = 1
		2297	w = 2
		2298	h = 3
2156	CODE:	2299	CODE:
2157	RETVAL = THIS->w;	2300	switch (ix)
2158	OUTPUT:	2301	{
2159	RETVAL	2302	case 0: RETVAL = THIS->x; break;
2160		2303	case 1: RETVAL = THIS->y; break;
2161	int	2304	case 2: RETVAL = THIS->w; break;
2162	rxvt_img::h ()	2305	case 3: RETVAL = THIS->h; break;
2163	CODE:	2306	}
2164	RETVAL = THIS->h;
2165	OUTPUT:	2307	OUTPUT:
2166	RETVAL	2308	RETVAL
2167		2309
2168	Pixmap	2310	Pixmap
2169	rxvt_img::pm ()	2311	rxvt_img::pm ()
…		…
2171	RETVAL = THIS->pm;	2313	RETVAL = THIS->pm;
2172	OUTPUT:	2314	OUTPUT:
2173	RETVAL	2315	RETVAL
2174		2316
2175	void	2317	void
2176	rxvt_img::fill (SV *c)	2318	rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
		2319	PROTOTYPE: $;$$$$
2177	INIT:	2320	INIT:
2178	rxvt_color rc;	2321	rgba cc = parse_rgba (c, THIS->s);
2179	parse_color (THIS->s, rc, c);	2322	C_ARGS: cc, x, y, w, h
2180	C_ARGS: rc
2181		2323
2182	void	2324	void
2183	rxvt_img::DESTROY ()	2325	rxvt_img::DESTROY ()
2184	CODE:	2326	CODE:
2185	delete THIS;	2327	delete THIS;
2186		2328
2187	void	2329	void
		2330	rxvt_img::add_alpha ()
		2331
		2332	void
2188	rxvt_img::unshare ()	2333	rxvt_img::unshare ()
2189		2334
2190	void	2335	void
2191	rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal)	2336	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2337	PPCODE:
		2338	if (items >= 2)
		2339	THIS->repeat_mode (repeat);
		2340	if (GIMME_V != G_VOID)
		2341	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2192		2342
2193	void	2343	void
2194	rxvt_img::move (int dx, int dy)	2344	rxvt_img::move (int dx, int dy)
2195		2345
2196	void	2346	void
2197	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)	2347	rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2198		2348
2199	void	2349	void
2200	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)	2350	rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
		2351
		2352	void
		2353	rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2201		2354
2202	rxvt_img *	2355	rxvt_img *
2203	rxvt_img::clone ()	2356	rxvt_img::clone ()
2204		2357
2205	rxvt_img *	2358	rxvt_img *
…		…
2210		2363
2211	rxvt_img *	2364	rxvt_img *
2212	rxvt_img::blur (int rh, int rv)	2365	rxvt_img::blur (int rh, int rv)
2213		2366
2214	rxvt_img *	2367	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)	2368	rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
		2369
		2370	rxvt_img *
		2371	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:	2372	INIT:
2217	double matrix[9] = {	2373	rxvt_img::nv matrix[3][3] = {
2218	p11, p12, p13,	2374	{ p11, p12, p13 },
2219	p21, p22, p23,	2375	{ p21, p22, p23 },
2220	p31, p32, p33	2376	{ p31, p32, p33 }
2221	};	2377	};
2222	C_ARGS: new_width, new_height, matrix	2378	C_ARGS: matrix
2223		2379
2224	rxvt_img *	2380	rxvt_img *
2225	rxvt_img::scale (int new_width, int new_height)	2381	rxvt_img::scale (int new_width, int new_height)
2226		2382
2227	rxvt_img *	2383	rxvt_img *
2228	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)	2384	rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
		2385
		2386	rxvt_img *
		2387	rxvt_img::tint (SV *c)
		2388	INIT:
		2389	rgba cc = parse_rgba (c, THIS->s);
		2390	C_ARGS: cc
		2391
		2392	rxvt_img *
		2393	rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
		2394	CODE:
		2395	rxvt_img::nv *vparams = 0;
		2396	int nparams = 0;
		2397
		2398	if (SvOK (params))
		2399	{
		2400	// we overlay rxvt_temp_buf, what a hack
		2401	assert (sizeof (rxvt_img::nv) >= sizeof (int));
		2402
		2403	if (!SvROK (params) \|\| SvTYPE (SvRV (params)) != SVt_PVAV)
		2404	croak ("rxvt_img::filter: params must be an array reference with parameter values");
		2405
		2406	nparams = av_len ((AV *)SvRV (params)) + 1;
		2407	vparams = rxvt_temp_buf<rxvt_img::nv> (nparams);
		2408
		2409	for (int i = 0; i < nparams; ++i)
		2410	vparams [i] = SvNV (av_fetch ((AV )SvRV (params), i, 1));
		2411	}
		2412
		2413	RETVAL = THIS->filter (name, nparams, vparams);
		2414	OUTPUT:
		2415	RETVAL
2229		2416
2230	#endif	2417	#endif
2231		2418

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.206 by root, Sat Jul 7 07:00:17 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.206 by root, Sat Jul 7 07:00:17 2012 UTC