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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.157 by root, Sun Jun 3 15:54:15 2012 UTC vs.
Revision 1.194 by root, Thu Jun 14 17:06:57 2012 UTC

…		…
52	/////////////////////////////////////////////////////////////////////////////	52	/////////////////////////////////////////////////////////////////////////////
53		53
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;
		58
		59	#if HAVE_PIXBUF
57	typedef GdkPixbuf * urxvt__pixbuf;	60	typedef GdkPixbuf * urxvt__pixbuf;
		61	#endif
58	typedef rxvt_img * urxvt__img;	62	typedef rxvt_img * urxvt__img;
59		63
60	/////////////////////////////////////////////////////////////////////////////	64	/////////////////////////////////////////////////////////////////////////////
61		65
62	static void	66	static rgba
63	parse_color (rxvt_screen s, rxvt_color &c, SV sv)	67	parse_rgba (SV sv, rxvt_screen s = 0)
64	{	68	{
65	//TODO: support component stuff	69	rgba c;
		70
		71	if (AV av = (AV )SvRV (sv))
		72	{
		73	if (SvTYPE ((SV *)av) != SVt_PVAV)
		74	croak ("colour must be either a colour string, or an array,");
		75
		76	int len = av_len (av) + 1;
		77
		78	if (len != 1 && len != 3 && len != 4)
		79	croak ("component colour array must have 1, 3 or 4 components,");
		80
		81	c.a = rgba::MAX_CC;
		82
		83	c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
		84
		85	if (len >= 3)
		86	{
		87	c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
		88	c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
		89
		90	if (len >= 4)
		91	c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
		92	}
		93	}
		94	else if (s)
		95	{
		96	rxvt_color rc;
66	c.set (s, SvPVbyte_nolen (sv));	97	rc.set (s, SvPVbyte_nolen (sv));
		98	rc.get (c);
		99	}
		100
		101	return c;
67	}	102	}
68		103
69	/////////////////////////////////////////////////////////////////////////////	104	/////////////////////////////////////////////////////////////////////////////
70		105
71	static wchar_t *	106	static wchar_t *
…		…
339	PERL_SYS_TERM ();	374	PERL_SYS_TERM ();
340	}	375	}
341	}	376	}
342		377
343	void	378	void
344	rxvt_perl_interp::init (rxvt_term *term)	379	rxvt_perl_interp::init ()
345	{	380	{
346	if (!perl)	381	if (!perl)
347	{	382	{
348	rxvt_push_locale (""); // perl init destroys current locale	383	rxvt_push_locale (""); // perl init destroys current locale
349		384
…		…
379	}	414	}
380	}	415	}
381		416
382	rxvt_pop_locale ();	417	rxvt_pop_locale ();
383	}	418	}
		419	}
384		420
385	if (perl)	421	void
		422	rxvt_perl_interp::init (rxvt_term *term)
		423	{
		424	init ();
		425
		426	if (perl && !term->perl.self)
386	{	427	{
387	// runs outside of perls ENV	428	// runs outside of perls ENV
388	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	429	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
389	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);	430	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
390	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);	431	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
391	}	432	}
392	}	433	}
393		434
		435	void
		436	rxvt_perl_interp::eval (const char *str)
		437	{
		438	eval_pv (str, 1);
		439	}
		440
		441	void
		442	rxvt_perl_interp::usage (rxvt_term *term, int type)
		443	{
		444	localise_env set_environ (perl_environ);
		445
		446	ENTER;
		447	SAVETMPS;
		448
		449	dSP;
		450	PUSHMARK (SP);
		451	EXTEND (SP, 2);
		452	PUSHs (sv_2mortal (newSVterm (term)));
		453	PUSHs (sv_2mortal (newSViv (type)));
		454	PUTBACK;
		455	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
		456
		457	FREETMPS;
		458	LEAVE;
		459	}
		460
		461	uint8_t
		462	rxvt_perl_interp::parse_resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
		463	{
		464	localise_env set_environ (perl_environ);
		465
		466	ENTER;
		467	SAVETMPS;
		468
		469	dSP;
		470	PUSHMARK (SP);
		471	EXTEND (SP, 6);
		472	PUSHs (sv_2mortal (newSVterm (term)));
		473	PUSHs (sv_2mortal (newSVpv (name, 0)));
		474	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		475	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		476	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		477	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		478	PUTBACK;
		479	call_pv ("urxvt::parse_resource", G_SCALAR);
		480	SPAGAIN;
		481
		482	uint8_t ret = POPi;
		483
		484	FREETMPS;
		485	LEAVE;
		486
		487	return ret;
		488	}
		489
394	static void	490	static void
395	ungrab (rxvt_term *THIS)	491	ungrab (rxvt_term *THIS)
396	{	492	{
397	if (THIS->perl.grabtime)	493	if (THIS->perl.grabtime)
398	{	494	{
…		…
429	}	525	}
430	}	526	}
431		527
432	bool event_consumed;	528	bool event_consumed;
433		529
434	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
435	\|\| term->perl.should_invoke [htype])	530	if (term->perl.should_invoke [htype])
436	{	531	{
437	dSP;	532	dSP;
438	va_list ap;	533	va_list ap;
439		534
440	va_start (ap, htype);	535	va_start (ap, htype);
…		…
650	ENTER;	745	ENTER;
651	SAVETMPS;	746	SAVETMPS;
652		747
653	dSP;	748	dSP;
654	XPUSHs (sv_2mortal (newSVpvn (data, len)));	749	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		750	PUTBACK;
655	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);	751	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);
656		752
657	if (SvTRUE (ERRSV))	753	if (SvTRUE (ERRSV))
658	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	754	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659		755
…		…
800	const_iv (XIMSecondary),	896	const_iv (XIMSecondary),
801	const_iv (XIMTertiary),	897	const_iv (XIMTertiary),
802	const_iv (XIMVisibleToForward),	898	const_iv (XIMVisibleToForward),
803	const_iv (XIMVisibleToBackword),	899	const_iv (XIMVisibleToBackword),
804	const_iv (XIMVisibleToCenter),	900	const_iv (XIMVisibleToCenter),
		901	#if XRENDER
		902	const_iv (PictStandardARGB32),
		903	const_iv (PictStandardRGB24),
		904	const_iv (PictStandardA8),
		905	const_iv (PictStandardA4),
		906	const_iv (PictStandardA1),
		907	const_iv (RepeatNone),
		908	const_iv (RepeatNormal),
		909	const_iv (RepeatPad),
		910	const_iv (RepeatReflect),
		911	#endif
805	# if 0	912	# if 0
806	const_iv (XIMForwardChar),	913	const_iv (XIMForwardChar),
807	const_iv (XIMBackwardChar),	914	const_iv (XIMBackwardChar),
808	const_iv (XIMForwardWord),	915	const_iv (XIMForwardWord),
809	const_iv (XIMBackwardWord),	916	const_iv (XIMBackwardWord),
…		…
822	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	929	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
823	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	930	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
824	}	931	}
825		932
826	void	933	void
		934	log (const char *msg)
		935	CODE:
		936	rxvt_log ("%s", msg);
		937
		938	void
827	warn (const char *msg)	939	warn (const char *msg)
828	CODE:	940	CODE:
829	rxvt_warn ("%s", msg);	941	rxvt_warn ("%s", msg);
830		942
831	void	943	void
…		…
833	CODE:	945	CODE:
834	rxvt_fatal ("%s", msg);	946	rxvt_fatal ("%s", msg);
835		947
836	void	948	void
837	_exit (int status)	949	_exit (int status)
		950
		951	void
		952	catch_fatal (SV *block)
		953	PROTOTYPE: &
		954	CODE:
		955	try
		956	{
		957	PUSHMARK (SP);
		958	PUTBACK;
		959	call_sv (block, G_VOID \| G_DISCARD);
		960	SPAGAIN;
		961	}
		962	catch (const rxvt_failure_exception &e)
		963	{
		964	croak ("rxvt_fatal exception caught, trying to continue.");
		965	}
838		966
839	NV	967	NV
840	NOW ()	968	NOW ()
841	CODE:	969	CODE:
842	RETVAL = ev::now ();	970	RETVAL = ev::now ();
…		…
967	rxvt_term::destroy ()	1095	rxvt_term::destroy ()
968		1096
969	void	1097	void
970	rxvt_term::set_should_invoke (int htype, int inc)	1098	rxvt_term::set_should_invoke (int htype, int inc)
971	CODE:	1099	CODE:
972	THIS->perl.should_invoke [htype] += inc;	1100	uint8_t &count = THIS->perl.should_invoke [htype];
		1101	uint8_t prev = count;
		1102	count += inc;
		1103	if (!prev != !count)
		1104	{
		1105	// hook status changed, react
		1106	switch (htype)
		1107	{
		1108	case HOOK_POSITION_CHANGE:
		1109	if (count)
		1110	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1111	}
		1112	}
		1113
		1114	void
		1115	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1116	CODE:
		1117	XrmPutStringResource (&THIS->option_db, specifier, value);
973		1118
974	int	1119	int
975	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1120	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
976	CODE:	1121	CODE:
977	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1122	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1234	CODE:	1379	CODE:
1235	RETVAL = THIS->parent;	1380	RETVAL = THIS->parent;
1236	OUTPUT:	1381	OUTPUT:
1237	RETVAL	1382	RETVAL
1238		1383
1239	Window	1384	int
1240	rxvt_term::vt ()	1385	rxvt_term::parent_x ()
1241	CODE:	1386	CODE:
1242	RETVAL = THIS->vt;	1387	RETVAL = THIS->parent_x;
		1388	OUTPUT:
		1389	RETVAL
		1390
		1391	int
		1392	rxvt_term::parent_y ()
		1393	CODE:
		1394	RETVAL = THIS->parent_y;
1243	OUTPUT:	1395	OUTPUT:
1244	RETVAL	1396	RETVAL
1245		1397
1246	void	1398	void
1247	rxvt_term::vt_emask_add (U32 emask)	1399	rxvt_term::vt_emask_add (U32 emask)
…		…
1723		1875
1724	void	1876	void
1725	rxvt_term::scr_bell ()	1877	rxvt_term::scr_bell ()
1726		1878
1727	void	1879	void
		1880	rxvt_term::scr_recolour (bool refresh = true);
		1881
		1882	void
1728	rxvt_term::scr_change_screen (int screen)	1883	rxvt_term::scr_change_screen (int screen)
1729		1884
1730	void	1885	void
1731	rxvt_term::scr_add_lines (SV *string)	1886	rxvt_term::scr_add_lines (SV *string)
1732	CODE:	1887	CODE:
…		…
1845	type, format, PropModeReplace,	2000	type, format, PropModeReplace,
1846	(unsigned char *)data_, len / elemsize);	2001	(unsigned char *)data_, len / elemsize);
1847	}	2002	}
1848		2003
1849	Atom	2004	Atom
1850	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	2005	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1851	C_ARGS: term->dpy, atom_name, only_if_exists	2006	C_ARGS: term->dpy, atom_name, only_if_exists
1852		2007
1853	char *	2008	char *
1854	XGetAtomName (rxvt_term *term, Atom atom)	2009	XGetAtomName (rxvt_term *term, Atom atom)
1855	C_ARGS: term->dpy, atom	2010	C_ARGS: term->dpy, atom
1856	CLEANUP:	2011	CLEANUP:
1857	XFree (RETVAL);	2012	XFree (RETVAL);
1858		2013
1859	void	2014	void
1860	XDeleteProperty (rxvt_term *term, Window window, Atom property)	2015	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1861	C_ARGS: term->dpy, window, property	2016	C_ARGS: term->dpy, window, property
1862		2017
1863	Window	2018	Window
1864	rxvt_term::DefaultRootWindow ()	2019	rxvt_term::DefaultRootWindow ()
1865	CODE:	2020	CODE:
1866	RETVAL = THIS->display->root;	2021	RETVAL = THIS->display->root;
…		…
1918	PUSHs (newSVuv (child));	2073	PUSHs (newSVuv (child));
1919	}	2074	}
1920	}	2075	}
1921		2076
1922	#############################################################################	2077	#############################################################################
		2078	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		2079
		2080	bool
		2081	rxvt_term::has_render ()
		2082	CODE:
		2083	RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
		2084	OUTPUT:
		2085	RETVAL
		2086
		2087	void
		2088	rxvt_term::background_geometry (bool border = false)
		2089	PPCODE:
		2090	EXTEND (SP, 4);
		2091	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
		2092	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
		2093	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
		2094	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
		2095
		2096	#if HAVE_IMG
		2097
		2098	rxvt_img *
		2099	rxvt_term::new_img (SV *format, int width = 1, int height = 1)
		2100	CODE:
		2101	XRenderPictFormat *f = SvOK (format)
		2102	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2103	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2104	RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
		2105	RETVAL->alloc ();
		2106	OUTPUT:
		2107	RETVAL
		2108
		2109	#if ENABLE_TRANSPARENCY
		2110
		2111	rxvt_img *
		2112	rxvt_term::new_img_from_root ()
		2113	CODE:
		2114	RETVAL = rxvt_img::new_from_root (THIS);
		2115	OUTPUT:
		2116	RETVAL
		2117
		2118	#endif
		2119
		2120	#if HAVE_PIXBUF
		2121
		2122	rxvt_img *
		2123	rxvt_term::new_img_from_file (octet_string filename)
		2124	CODE:
		2125	try
		2126	{
		2127	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2128	}
		2129	catch (const class rxvt_failure_exception &e)
		2130	{
		2131	croak ("new_img_from_file failed");
		2132	}
		2133	OUTPUT:
		2134	RETVAL
		2135
		2136	#endif
		2137
		2138	#if HAVE_BG_PIXMAP
		2139
		2140	void
		2141	rxvt_term::set_background (rxvt_img *img, bool border = false)
		2142	CODE:
		2143	THIS->bg_destroy ();
		2144	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
		2145
		2146	if (img) // TODO: cannot be false
		2147	{
		2148	img = img->clone (); // own the img
		2149
		2150	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2151	img->sub_rect (0, 0,
		2152	border ? THIS->vt_width : THIS->szHint.width,
		2153	border ? THIS->vt_height : THIS->szHint.height)
		2154	->replace (img);
		2155
		2156	// just in case, should usually be a nop
		2157	img->reify ()
		2158	->replace (img);
		2159
		2160	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
		2161	->replace (img);
		2162
		2163	THIS->bg_img = img;
		2164	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2165
		2166	if (!border)
		2167	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
		2168	}
		2169
		2170	#endif
		2171
		2172	#endif
		2173
		2174	#############################################################################
1923	# urxvt::overlay	2175	# urxvt::overlay
1924	#############################################################################	2176	#############################################################################
1925		2177
1926	MODULE = urxvt PACKAGE = urxvt::overlay	2178	MODULE = urxvt PACKAGE = urxvt::overlay
1927		2179
…		…
1955		2207
1956	MODULE = urxvt PACKAGE = urxvt::img	2208	MODULE = urxvt PACKAGE = urxvt::img
1957		2209
1958	#if HAVE_IMG	2210	#if HAVE_IMG
1959		2211
1960	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height);	2212	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
1961	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap);	2213	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1962		2214
1963	void fill (urxvt::img self, SV *c)	2215	int
		2216	rxvt_img::w ()
1964	CODE:	2217	CODE:
1965	rxvt_color rc;	2218	RETVAL = THIS->w;
1966	parse_color (self->s, rc, c);
1967	self->fill (rc);
1968
1969	void blur (urxvt::img self, int rh, int rv)
1970	CODE:
1971	self->blur (rh, rv);
1972
1973	void brightness (urxvt::img self, double r, double g, double b, double a = 1.)
1974	CODE:
1975	self->brightness (r, g, b, a);
1976
1977	void contrast (urxvt::img self, double r, double g, double b, double a = 1.)
1978	CODE:
1979	self->contrast (r, g, b, a);
1980
1981	urxvt::img copy (urxvt::img self)
1982	CODE:
1983	RETVAL = self->copy ();
1984	OUTPUT:	2219	OUTPUT:
1985	RETVAL	2220	RETVAL
1986		2221
		2222	int
		2223	rxvt_img::h ()
		2224	CODE:
		2225	RETVAL = THIS->h;
		2226	OUTPUT:
		2227	RETVAL
		2228
		2229	Pixmap
		2230	rxvt_img::pm ()
		2231	CODE:
		2232	RETVAL = THIS->pm;
		2233	OUTPUT:
		2234	RETVAL
		2235
		2236	void
		2237	rxvt_img::fill (SV *c)
		2238	INIT:
		2239	rgba cc = parse_rgba (c, THIS->s);
		2240	C_ARGS: cc
		2241
		2242	void
		2243	rxvt_img::DESTROY ()
		2244	CODE:
		2245	delete THIS;
		2246
		2247	void
		2248	rxvt_img::unshare ()
		2249
		2250	int
		2251	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2252	CODE:
		2253	if (items >= 2)
		2254	THIS->repeat_mode (repeat);
		2255	if (GIMME_V != G_VOID)
		2256	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2257
		2258	void
		2259	rxvt_img::move (int dx, int dy)
		2260
		2261	void
		2262	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2263
		2264	void
		2265	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2266
		2267	rxvt_img *
		2268	rxvt_img::clone ()
		2269
		2270	rxvt_img *
		2271	rxvt_img::reify ()
		2272
		2273	rxvt_img *
		2274	rxvt_img::sub_rect (int x, int y, int width, int height)
		2275
		2276	rxvt_img *
		2277	rxvt_img::blur (int rh, int rv)
		2278
		2279	rxvt_img *
		2280	rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
		2281	INIT:
		2282	double matrix[3][3] = {
		2283	{ p11, p12, p13 },
		2284	{ p21, p22, p23 },
		2285	{ p31, p32, p33 }
		2286	};
		2287	C_ARGS: matrix
		2288
		2289	rxvt_img *
1987	urxvt::img scale (urxvt::img self, int new_width, int new_height)	2290	rxvt_img::scale (int new_width, int new_height)
1988	CODE:
1989	RETVAL = self->scale (new_width, new_height);
1990	OUTPUT:
1991	RETVAL
1992		2291
1993	# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);	2292	rxvt_img *
		2293	rxvt_img::rotate (int x, int y, NV phi)
1994		2294
1995	#endif	2295	#endif
1996		2296

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.157 by root, Sun Jun 3 15:54:15 2012 UTC vs. Revision 1.194 by root, Thu Jun 14 17:06:57 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.157 by root, Sun Jun 3 15:54:15 2012 UTC vs.
Revision 1.194 by root, Thu Jun 14 17:06:57 2012 UTC