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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.161 by root, Mon Jun 4 15:43:22 2012 UTC vs.
Revision 1.196 by root, Thu Jun 14 18:13:19 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	else
		101	croak ("unable to parse colour,");
		102
		103	return c;
67	}	104	}
68		105
69	/////////////////////////////////////////////////////////////////////////////	106	/////////////////////////////////////////////////////////////////////////////
70		107
71	static wchar_t *	108	static wchar_t *
…		…
339	PERL_SYS_TERM ();	376	PERL_SYS_TERM ();
340	}	377	}
341	}	378	}
342		379
343	void	380	void
344	rxvt_perl_interp::init (rxvt_term *term)	381	rxvt_perl_interp::init ()
345	{	382	{
346	if (!perl)	383	if (!perl)
347	{	384	{
348	rxvt_push_locale (""); // perl init destroys current locale	385	rxvt_push_locale (""); // perl init destroys current locale
349		386
…		…
379	}	416	}
380	}	417	}
381		418
382	rxvt_pop_locale ();	419	rxvt_pop_locale ();
383	}	420	}
		421	}
384		422
385	if (perl)	423	void
		424	rxvt_perl_interp::init (rxvt_term *term)
		425	{
		426	init ();
		427
		428	if (perl && !term->perl.self)
386	{	429	{
387	// runs outside of perls ENV	430	// runs outside of perls ENV
388	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	431	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);	432	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);	433	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
391	}	434	}
392	}	435	}
393		436
		437	void
		438	rxvt_perl_interp::eval (const char *str)
		439	{
		440	eval_pv (str, 1);
		441	}
		442
		443	void
		444	rxvt_perl_interp::usage (rxvt_term *term, int type)
		445	{
		446	localise_env set_environ (perl_environ);
		447
		448	ENTER;
		449	SAVETMPS;
		450
		451	dSP;
		452	PUSHMARK (SP);
		453	EXTEND (SP, 2);
		454	PUSHs (sv_2mortal (newSVterm (term)));
		455	PUSHs (sv_2mortal (newSViv (type)));
		456	PUTBACK;
		457	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
		458
		459	FREETMPS;
		460	LEAVE;
		461	}
		462
		463	uint8_t
		464	rxvt_perl_interp::parse_resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
		465	{
		466	localise_env set_environ (perl_environ);
		467
		468	ENTER;
		469	SAVETMPS;
		470
		471	dSP;
		472	PUSHMARK (SP);
		473	EXTEND (SP, 6);
		474	PUSHs (sv_2mortal (newSVterm (term)));
		475	PUSHs (sv_2mortal (newSVpv (name, 0)));
		476	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		477	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		478	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		479	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		480	PUTBACK;
		481	call_pv ("urxvt::parse_resource", G_SCALAR);
		482	SPAGAIN;
		483
		484	uint8_t ret = POPi;
		485
		486	FREETMPS;
		487	LEAVE;
		488
		489	return ret;
		490	}
		491
394	static void	492	static void
395	ungrab (rxvt_term *THIS)	493	ungrab (rxvt_term *THIS)
396	{	494	{
397	if (THIS->perl.grabtime)	495	if (THIS->perl.grabtime)
398	{	496	{
…		…
429	}	527	}
430	}	528	}
431		529
432	bool event_consumed;	530	bool event_consumed;
433		531
434	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
435	\|\| term->perl.should_invoke [htype])	532	if (term->perl.should_invoke [htype])
436	{	533	{
437	dSP;	534	dSP;
438	va_list ap;	535	va_list ap;
439		536
440	va_start (ap, htype);	537	va_start (ap, htype);
…		…
650	ENTER;	747	ENTER;
651	SAVETMPS;	748	SAVETMPS;
652		749
653	dSP;	750	dSP;
654	XPUSHs (sv_2mortal (newSVpvn (data, len)));	751	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		752	PUTBACK;
655	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);	753	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);
656		754
657	if (SvTRUE (ERRSV))	755	if (SvTRUE (ERRSV))
658	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	756	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659		757
…		…
800	const_iv (XIMSecondary),	898	const_iv (XIMSecondary),
801	const_iv (XIMTertiary),	899	const_iv (XIMTertiary),
802	const_iv (XIMVisibleToForward),	900	const_iv (XIMVisibleToForward),
803	const_iv (XIMVisibleToBackword),	901	const_iv (XIMVisibleToBackword),
804	const_iv (XIMVisibleToCenter),	902	const_iv (XIMVisibleToCenter),
805	#if HAVE_XRENDER	903	#if XRENDER
806	const_iv (PictStandardARGB32),	904	const_iv (PictStandardARGB32),
807	const_iv (PictStandardRGB24),	905	const_iv (PictStandardRGB24),
808	const_iv (PictStandardA8),	906	const_iv (PictStandardA8),
809	const_iv (PictStandardA4),	907	const_iv (PictStandardA4),
810	const_iv (PictStandardA1),	908	const_iv (PictStandardA1),
…		…
833	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	931	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
834	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	932	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
835	}	933	}
836		934
837	void	935	void
		936	log (const char *msg)
		937	CODE:
		938	rxvt_log ("%s", msg);
		939
		940	void
838	warn (const char *msg)	941	warn (const char *msg)
839	CODE:	942	CODE:
840	rxvt_warn ("%s", msg);	943	rxvt_warn ("%s", msg);
841		944
842	void	945	void
…		…
844	CODE:	947	CODE:
845	rxvt_fatal ("%s", msg);	948	rxvt_fatal ("%s", msg);
846		949
847	void	950	void
848	_exit (int status)	951	_exit (int status)
		952
		953	void
		954	catch_fatal (SV *block)
		955	PROTOTYPE: &
		956	CODE:
		957	try
		958	{
		959	PUSHMARK (SP);
		960	PUTBACK;
		961	call_sv (block, G_VOID \| G_DISCARD);
		962	SPAGAIN;
		963	}
		964	catch (const rxvt_failure_exception &e)
		965	{
		966	croak ("rxvt_fatal exception caught, trying to continue.");
		967	}
849		968
850	NV	969	NV
851	NOW ()	970	NOW ()
852	CODE:	971	CODE:
853	RETVAL = ev::now ();	972	RETVAL = ev::now ();
…		…
978	rxvt_term::destroy ()	1097	rxvt_term::destroy ()
979		1098
980	void	1099	void
981	rxvt_term::set_should_invoke (int htype, int inc)	1100	rxvt_term::set_should_invoke (int htype, int inc)
982	CODE:	1101	CODE:
983	THIS->perl.should_invoke [htype] += inc;	1102	uint8_t &count = THIS->perl.should_invoke [htype];
		1103	uint8_t prev = count;
		1104	count += inc;
		1105	if (!prev != !count)
		1106	{
		1107	// hook status changed, react
		1108	switch (htype)
		1109	{
		1110	case HOOK_POSITION_CHANGE:
		1111	if (count)
		1112	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1113	}
		1114	}
		1115
		1116	void
		1117	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1118	CODE:
		1119	XrmPutStringResource (&THIS->option_db, specifier, value);
984		1120
985	int	1121	int
986	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1122	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
987	CODE:	1123	CODE:
988	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1124	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1245	CODE:	1381	CODE:
1246	RETVAL = THIS->parent;	1382	RETVAL = THIS->parent;
1247	OUTPUT:	1383	OUTPUT:
1248	RETVAL	1384	RETVAL
1249		1385
1250	Window	1386	int
1251	rxvt_term::vt ()	1387	rxvt_term::parent_x ()
1252	CODE:	1388	CODE:
1253	RETVAL = THIS->vt;	1389	RETVAL = THIS->parent_x;
		1390	OUTPUT:
		1391	RETVAL
		1392
		1393	int
		1394	rxvt_term::parent_y ()
		1395	CODE:
		1396	RETVAL = THIS->parent_y;
1254	OUTPUT:	1397	OUTPUT:
1255	RETVAL	1398	RETVAL
1256		1399
1257	void	1400	void
1258	rxvt_term::vt_emask_add (U32 emask)	1401	rxvt_term::vt_emask_add (U32 emask)
…		…
1934	}	2077	}
1935		2078
1936	#############################################################################	2079	#############################################################################
1937	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2080	# fancy bg bloatstuff (TODO: should be moved up somewhere)
1938		2081
		2082	bool
		2083	rxvt_term::has_render ()
		2084	CODE:
		2085	RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
		2086	OUTPUT:
		2087	RETVAL
		2088
		2089	void
		2090	rxvt_term::background_geometry (bool border = false)
		2091	PPCODE:
		2092	EXTEND (SP, 4);
		2093	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
		2094	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
		2095	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
		2096	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
		2097
		2098	#if HAVE_IMG
		2099
		2100	rxvt_img *
		2101	rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1)
		2102	CODE:
		2103	XRenderPictFormat *f = SvOK (format)
		2104	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2105	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2106	RETVAL = new rxvt_img (THIS, f, x, y, width, height);
		2107	RETVAL->alloc ();
		2108	OUTPUT:
		2109	RETVAL
		2110
1939	#if ENABLE_TRANSPARENCY	2111	#if ENABLE_TRANSPARENCY
1940
1941	#if 0
1942		2112
1943	rxvt_img *	2113	rxvt_img *
1944	rxvt_term::new_img_from_root ()	2114	rxvt_term::new_img_from_root ()
1945	CODE:	2115	CODE:
1946	RETVAL = rxvt_img::new_from_root (THIS);	2116	RETVAL = rxvt_img::new_from_root (THIS);
1947	OUTPUT:	2117	OUTPUT:
1948	RETVAL	2118	RETVAL
1949		2119
1950	#endif	2120	#endif
1951		2121
1952	#endif
1953
1954	#if HAVE_PIXBUF	2122	#if HAVE_PIXBUF
1955		2123
1956	rxvt_img *	2124	rxvt_img *
1957	rxvt_term::new_img_from_file (octet_string filename)	2125	rxvt_term::new_img_from_file (octet_string filename)
1958	CODE:	2126	CODE:
…		…
1970	#endif	2138	#endif
1971		2139
1972	#if HAVE_BG_PIXMAP	2140	#if HAVE_BG_PIXMAP
1973		2141
1974	void	2142	void
1975	rxvt_term::set_background (rxvt_img *img)	2143	rxvt_term::set_background (rxvt_img *img, bool border = false)
1976	CODE:	2144	CODE:
1977	THIS->bg_destroy ();	2145	THIS->bg_destroy ();
1978	THIS->bg_pixmap = None;	2146	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
1979	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
1980		2147
1981	if (img) // TODO: cannot be false	2148	if (img) // TODO: cannot be false
1982	{	2149	{
		2150	img = img->clone (); // own the img
		2151
		2152	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2153	img->sub_rect (0, 0,
		2154	border ? THIS->vt_width : THIS->szHint.width,
		2155	border ? THIS->vt_height : THIS->szHint.height)
		2156	->replace (img);
		2157
		2158	// just in case, should usually be a nop
1983	img->unshare ();	2159	img->reify ()
1984	THIS->bg_pixmap = img->steal ();	2160	->replace (img);
		2161
		2162	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
		2163	->replace (img);
		2164
		2165	THIS->bg_img = img;
		2166	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2167
		2168	if (!border)
1985	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;	2169	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
1986	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
1987	}	2170	}
		2171
		2172	#endif
1988		2173
1989	#endif	2174	#endif
1990		2175
1991	#############################################################################	2176	#############################################################################
1992	# urxvt::overlay	2177	# urxvt::overlay
…		…
2028		2213
2029	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)	2214	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
2030	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);	2215	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2031		2216
2032	void	2217	void
		2218	rxvt_img::geometry ()
		2219	PPCODE:
		2220	EXTEND (SP, 4);
		2221	PUSHs (sv_2mortal (newSViv (THIS->x)));
		2222	PUSHs (sv_2mortal (newSViv (THIS->y)));
		2223	PUSHs (sv_2mortal (newSViv (THIS->w)));
		2224	PUSHs (sv_2mortal (newSViv (THIS->h)));
		2225
		2226	int
		2227	rxvt_img::x ()
		2228	CODE:
		2229	RETVAL = THIS->x;
		2230	OUTPUT:
		2231	RETVAL
		2232
		2233	int
		2234	rxvt_img::y ()
		2235	CODE:
		2236	RETVAL = THIS->y;
		2237	OUTPUT:
		2238	RETVAL
		2239
		2240	int
		2241	rxvt_img::w ()
		2242	CODE:
		2243	RETVAL = THIS->w;
		2244	OUTPUT:
		2245	RETVAL
		2246
		2247	int
		2248	rxvt_img::h ()
		2249	CODE:
		2250	RETVAL = THIS->h;
		2251	OUTPUT:
		2252	RETVAL
		2253
		2254	Pixmap
		2255	rxvt_img::pm ()
		2256	CODE:
		2257	RETVAL = THIS->pm;
		2258	OUTPUT:
		2259	RETVAL
		2260
		2261	void
2033	rxvt_img::fill (SV *c)	2262	rxvt_img::fill (SV *c)
2034	INIT:	2263	INIT:
2035	rxvt_color rc;	2264	rgba cc = parse_rgba (c, THIS->s);
2036	parse_color (THIS->s, rc, c);
2037	C_ARGS: rc	2265	C_ARGS: cc
2038		2266
2039	void	2267	void
2040	rxvt_img::DESTROY ()	2268	rxvt_img::DESTROY ()
2041	CODE:	2269	CODE:
2042	delete THIS;	2270	delete THIS;
2043		2271
2044	void	2272	void
2045	rxvt_img::blur (int rh, int rv)	2273	rxvt_img::unshare ()
		2274
		2275	int
		2276	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2277	CODE:
		2278	if (items >= 2)
		2279	THIS->repeat_mode (repeat);
		2280	if (GIMME_V != G_VOID)
		2281	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2282
		2283	void
		2284	rxvt_img::move (int dx, int dy)
2046		2285
2047	void	2286	void
2048	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)	2287	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2049		2288
2050	void	2289	void
2051	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)	2290	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2052
2053	void
2054	rxvt_img::unshare ()
2055		2291
2056	rxvt_img *	2292	rxvt_img *
2057	rxvt_img::clone ()	2293	rxvt_img::clone ()
2058		2294
2059	rxvt_img *	2295	rxvt_img *
		2296	rxvt_img::reify ()
		2297
		2298	rxvt_img *
		2299	rxvt_img::sub_rect (int x, int y, int width, int height)
		2300
		2301	rxvt_img *
		2302	rxvt_img::blur (int rh, int rv)
		2303
		2304	rxvt_img *
		2305	rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
		2306	INIT:
		2307	double matrix[3][3] = {
		2308	{ p11, p12, p13 },
		2309	{ p21, p22, p23 },
		2310	{ p31, p32, p33 }
		2311	};
		2312	C_ARGS: matrix
		2313
		2314	rxvt_img *
2060	rxvt_img::scale (int new_width, int new_height)	2315	rxvt_img::scale (int new_width, int new_height)
2061		2316
2062	rxvt_img *	2317	rxvt_img *
2063	rxvt_img::transform (int new_width, int new_height, int repeat, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)	2318	rxvt_img::rotate (int x, int y, NV phi)
2064	INIT:
2065	double matrix[9] = {
2066	p11, p12, p13,
2067	p21, p22, p23,
2068	p31, p32, p33
2069	};
2070	C_ARGS: new_width, new_height, repeat, matrix
2071		2319
2072	#endif	2320	#endif
2073		2321

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.161 by root, Mon Jun 4 15:43:22 2012 UTC vs. Revision 1.196 by root, Thu Jun 14 18:13:19 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.161 by root, Mon Jun 4 15:43:22 2012 UTC vs.
Revision 1.196 by root, Thu Jun 14 18:13:19 2012 UTC