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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.159 by root, Mon Jun 4 15:15:49 2012 UTC vs.
Revision 1.192 by root, Tue Jun 12 10:45:53 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 void
63	parse_color (rxvt_screen s, rxvt_color &c, SV sv)	67	parse_color (rxvt_screen s, rxvt_color &c, SV sv)
64	{	68	{
65	//TODO: support component stuff	69	//TODO: support component stuff, 0..1
66	c.set (s, SvPVbyte_nolen (sv));	70	c.set (s, SvPVbyte_nolen (sv));
67	}	71	}
68		72
69	/////////////////////////////////////////////////////////////////////////////	73	/////////////////////////////////////////////////////////////////////////////
70		74
…		…
339	PERL_SYS_TERM ();	343	PERL_SYS_TERM ();
340	}	344	}
341	}	345	}
342		346
343	void	347	void
344	rxvt_perl_interp::init (rxvt_term *term)	348	rxvt_perl_interp::init ()
345	{	349	{
346	if (!perl)	350	if (!perl)
347	{	351	{
348	rxvt_push_locale (""); // perl init destroys current locale	352	rxvt_push_locale (""); // perl init destroys current locale
349		353
…		…
379	}	383	}
380	}	384	}
381		385
382	rxvt_pop_locale ();	386	rxvt_pop_locale ();
383	}	387	}
		388	}
384		389
385	if (perl)	390	void
		391	rxvt_perl_interp::init (rxvt_term *term)
		392	{
		393	init ();
		394
		395	if (perl && !term->perl.self)
386	{	396	{
387	// runs outside of perls ENV	397	// runs outside of perls ENV
388	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	398	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);	399	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);	400	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
391	}	401	}
392	}	402	}
393		403
		404	void
		405	rxvt_perl_interp::eval (const char *str)
		406	{
		407	eval_pv (str, 1);
		408	}
		409
		410	void
		411	rxvt_perl_interp::usage (rxvt_term *term, int type)
		412	{
		413	localise_env set_environ (perl_environ);
		414
		415	ENTER;
		416	SAVETMPS;
		417
		418	dSP;
		419	PUSHMARK (SP);
		420	EXTEND (SP, 2);
		421	PUSHs (sv_2mortal (newSVterm (term)));
		422	PUSHs (sv_2mortal (newSViv (type)));
		423	PUTBACK;
		424	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
		425
		426	FREETMPS;
		427	LEAVE;
		428	}
		429
		430	uint8_t
		431	rxvt_perl_interp::parse_resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
		432	{
		433	localise_env set_environ (perl_environ);
		434
		435	ENTER;
		436	SAVETMPS;
		437
		438	dSP;
		439	PUSHMARK (SP);
		440	EXTEND (SP, 6);
		441	PUSHs (sv_2mortal (newSVterm (term)));
		442	PUSHs (sv_2mortal (newSVpv (name, 0)));
		443	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		444	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		445	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		446	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		447	PUTBACK;
		448	call_pv ("urxvt::parse_resource", G_SCALAR);
		449	SPAGAIN;
		450
		451	uint8_t ret = POPi;
		452
		453	FREETMPS;
		454	LEAVE;
		455
		456	return ret;
		457	}
		458
394	static void	459	static void
395	ungrab (rxvt_term *THIS)	460	ungrab (rxvt_term *THIS)
396	{	461	{
397	if (THIS->perl.grabtime)	462	if (THIS->perl.grabtime)
398	{	463	{
…		…
429	}	494	}
430	}	495	}
431		496
432	bool event_consumed;	497	bool event_consumed;
433		498
434	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
435	\|\| term->perl.should_invoke [htype])	499	if (term->perl.should_invoke [htype])
436	{	500	{
437	dSP;	501	dSP;
438	va_list ap;	502	va_list ap;
439		503
440	va_start (ap, htype);	504	va_start (ap, htype);
…		…
650	ENTER;	714	ENTER;
651	SAVETMPS;	715	SAVETMPS;
652		716
653	dSP;	717	dSP;
654	XPUSHs (sv_2mortal (newSVpvn (data, len)));	718	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		719	PUTBACK;
655	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);	720	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);
656		721
657	if (SvTRUE (ERRSV))	722	if (SvTRUE (ERRSV))
658	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	723	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659		724
…		…
800	const_iv (XIMSecondary),	865	const_iv (XIMSecondary),
801	const_iv (XIMTertiary),	866	const_iv (XIMTertiary),
802	const_iv (XIMVisibleToForward),	867	const_iv (XIMVisibleToForward),
803	const_iv (XIMVisibleToBackword),	868	const_iv (XIMVisibleToBackword),
804	const_iv (XIMVisibleToCenter),	869	const_iv (XIMVisibleToCenter),
805	#if HAVE_XRENDER	870	#if XRENDER
806	const_iv (PictStandardARGB32),	871	const_iv (PictStandardARGB32),
807	const_iv (PictStandardRGB24),	872	const_iv (PictStandardRGB24),
808	const_iv (PictStandardA8),	873	const_iv (PictStandardA8),
809	const_iv (PictStandardA4),	874	const_iv (PictStandardA4),
810	const_iv (PictStandardA1),	875	const_iv (PictStandardA1),
…		…
833	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	898	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
834	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	899	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
835	}	900	}
836		901
837	void	902	void
		903	log (const char *msg)
		904	CODE:
		905	rxvt_log ("%s", msg);
		906
		907	void
838	warn (const char *msg)	908	warn (const char *msg)
839	CODE:	909	CODE:
840	rxvt_warn ("%s", msg);	910	rxvt_warn ("%s", msg);
841		911
842	void	912	void
…		…
844	CODE:	914	CODE:
845	rxvt_fatal ("%s", msg);	915	rxvt_fatal ("%s", msg);
846		916
847	void	917	void
848	_exit (int status)	918	_exit (int status)
		919
		920	void
		921	catch_fatal (SV *block)
		922	PROTOTYPE: &
		923	CODE:
		924	try
		925	{
		926	PUSHMARK (SP);
		927	PUTBACK;
		928	call_sv (block, G_VOID \| G_DISCARD);
		929	SPAGAIN;
		930	}
		931	catch (const rxvt_failure_exception &e)
		932	{
		933	croak ("rxvt_fatal exception caught, trying to continue.");
		934	}
849		935
850	NV	936	NV
851	NOW ()	937	NOW ()
852	CODE:	938	CODE:
853	RETVAL = ev::now ();	939	RETVAL = ev::now ();
…		…
978	rxvt_term::destroy ()	1064	rxvt_term::destroy ()
979		1065
980	void	1066	void
981	rxvt_term::set_should_invoke (int htype, int inc)	1067	rxvt_term::set_should_invoke (int htype, int inc)
982	CODE:	1068	CODE:
983	THIS->perl.should_invoke [htype] += inc;	1069	uint8_t &count = THIS->perl.should_invoke [htype];
		1070	uint8_t prev = count;
		1071	count += inc;
		1072	if (!prev != !count)
		1073	{
		1074	// hook status changed, react
		1075	switch (htype)
		1076	{
		1077	case HOOK_POSITION_CHANGE:
		1078	if (count)
		1079	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1080	}
		1081	}
		1082
		1083	void
		1084	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1085	CODE:
		1086	XrmPutStringResource (&THIS->option_db, specifier, value);
984		1087
985	int	1088	int
986	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1089	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
987	CODE:	1090	CODE:
988	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1091	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1245	CODE:	1348	CODE:
1246	RETVAL = THIS->parent;	1349	RETVAL = THIS->parent;
1247	OUTPUT:	1350	OUTPUT:
1248	RETVAL	1351	RETVAL
1249		1352
1250	Window	1353	int
1251	rxvt_term::vt ()	1354	rxvt_term::parent_x ()
1252	CODE:	1355	CODE:
1253	RETVAL = THIS->vt;	1356	RETVAL = THIS->parent_x;
		1357	OUTPUT:
		1358	RETVAL
		1359
		1360	int
		1361	rxvt_term::parent_y ()
		1362	CODE:
		1363	RETVAL = THIS->parent_y;
1254	OUTPUT:	1364	OUTPUT:
1255	RETVAL	1365	RETVAL
1256		1366
1257	void	1367	void
1258	rxvt_term::vt_emask_add (U32 emask)	1368	rxvt_term::vt_emask_add (U32 emask)
…		…
1734		1844
1735	void	1845	void
1736	rxvt_term::scr_bell ()	1846	rxvt_term::scr_bell ()
1737		1847
1738	void	1848	void
		1849	rxvt_term::scr_recolour (bool refresh = true);
		1850
		1851	void
1739	rxvt_term::scr_change_screen (int screen)	1852	rxvt_term::scr_change_screen (int screen)
1740		1853
1741	void	1854	void
1742	rxvt_term::scr_add_lines (SV *string)	1855	rxvt_term::scr_add_lines (SV *string)
1743	CODE:	1856	CODE:
…		…
1931	}	2044	}
1932		2045
1933	#############################################################################	2046	#############################################################################
1934	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2047	# fancy bg bloatstuff (TODO: should be moved up somewhere)
1935		2048
		2049	bool
		2050	rxvt_term::has_render ()
		2051	CODE:
		2052	RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
		2053	OUTPUT:
		2054	RETVAL
		2055
		2056	void
		2057	rxvt_term::background_geometry (bool border = false)
		2058	PPCODE:
		2059	EXTEND (SP, 4);
		2060	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
		2061	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
		2062	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
		2063	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
		2064
		2065	#if HAVE_IMG
		2066
		2067	rxvt_img *
		2068	rxvt_term::new_img (SV *format, int width = 1, int height = 1)
		2069	CODE:
		2070	XRenderPictFormat *f = SvOK (format)
		2071	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2072	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2073	RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
		2074	RETVAL->alloc ();
		2075	OUTPUT:
		2076	RETVAL
		2077
1936	#ifdef ENABLE_TRANSPARENCY	2078	#if ENABLE_TRANSPARENCY
1937
1938	#if 0
1939		2079
1940	rxvt_img *	2080	rxvt_img *
1941	rxvt_term::new_img_from_root ()	2081	rxvt_term::new_img_from_root ()
1942	CODE:	2082	CODE:
1943	RETVAL = rxvt_img::new_from_root (THIS);	2083	RETVAL = rxvt_img::new_from_root (THIS);
1944	OUTPUT:	2084	OUTPUT:
1945	RETVAL	2085	RETVAL
1946		2086
1947	#endif	2087	#endif
1948		2088
1949	#endif
1950
1951	#if HAVE_PIXBUF	2089	#if HAVE_PIXBUF
1952		2090
1953	rxvt_img *	2091	rxvt_img *
1954	rxvt_term::new_img_from_file (octet_string filename)	2092	rxvt_term::new_img_from_file (octet_string filename)
1955	CODE:	2093	CODE:
…		…
1961	{	2099	{
1962	croak ("new_img_from_file failed");	2100	croak ("new_img_from_file failed");
1963	}	2101	}
1964	OUTPUT:	2102	OUTPUT:
1965	RETVAL	2103	RETVAL
		2104
		2105	#endif
		2106
		2107	#if HAVE_BG_PIXMAP
		2108
		2109	void
		2110	rxvt_term::set_background (rxvt_img *img, bool border = false)
		2111	CODE:
		2112	THIS->bg_destroy ();
		2113	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
		2114
		2115	if (img) // TODO: cannot be false
		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
		2126	img->reify ()
		2127	->replace (img);
		2128
		2129	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
		2130	->replace (img);
		2131
		2132	THIS->bg_img = img;
		2133	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2134
		2135	if (!border)
		2136	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
		2137	}
		2138
		2139	#endif
1966		2140
1967	#endif	2141	#endif
1968		2142
1969	#############################################################################	2143	#############################################################################
1970	# urxvt::overlay	2144	# urxvt::overlay
…		…
2004		2178
2005	#if HAVE_IMG	2179	#if HAVE_IMG
2006		2180
2007	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)	2181	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
2008	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);	2182	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2183
		2184	int
		2185	rxvt_img::w ()
		2186	CODE:
		2187	RETVAL = THIS->w;
		2188	OUTPUT:
		2189	RETVAL
		2190
		2191	int
		2192	rxvt_img::h ()
		2193	CODE:
		2194	RETVAL = THIS->h;
		2195	OUTPUT:
		2196	RETVAL
		2197
		2198	Pixmap
		2199	rxvt_img::pm ()
		2200	CODE:
		2201	RETVAL = THIS->pm;
		2202	OUTPUT:
		2203	RETVAL
2009		2204
2010	void	2205	void
2011	rxvt_img::fill (SV *c)	2206	rxvt_img::fill (SV *c)
2012	INIT:	2207	INIT:
2013	rxvt_color rc;	2208	rxvt_color rc;
…		…
2018	rxvt_img::DESTROY ()	2213	rxvt_img::DESTROY ()
2019	CODE:	2214	CODE:
2020	delete THIS;	2215	delete THIS;
2021		2216
2022	void	2217	void
2023	rxvt_img::blur (int rh, int rv)	2218	rxvt_img::unshare ()
		2219
		2220	int
		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)));
		2227
		2228	void
		2229	rxvt_img::move (int dx, int dy)
2024		2230
2025	void	2231	void
2026	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)	2232	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2027		2233
2028	void	2234	void
2029	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)	2235	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2030
2031	void
2032	rxvt_img::unshare ()
2033		2236
2034	rxvt_img *	2237	rxvt_img *
2035	rxvt_img::clone ()	2238	rxvt_img::clone ()
2036		2239
2037	rxvt_img *	2240	rxvt_img *
2038	rxvt_img::scale (int new_width, int new_height)	2241	rxvt_img::reify ()
2039		2242
2040	rxvt_img *	2243	rxvt_img *
2041	rxvt_img::transform (int new_width, int new_height, int repeat,	2244	rxvt_img::sub_rect (int x, int y, int width, int height)
2042	NV p11, NV p12, NV p13,	2245
2043	NV p21, NV p22, NV p23,	2246	rxvt_img *
2044	NV p31, NV p32, NV p23)	2247	rxvt_img::blur (int rh, int rv)
		2248
		2249	rxvt_img *
		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)
2045	INIT:	2251	INIT:
2046	double matrix[9] = {	2252	double matrix[9] = {
2047	p11, p12, p13,	2253	p11, p12, p13,
2048	p21, p22, p23,	2254	p21, p22, p23,
2049	p31, p32, p33	2255	p31, p32, p33
2050	};	2256	};
2051	C_ARGS: new_width, new_height, repeat, matrix	2257	C_ARGS: matrix, new_width, new_height
2052		2258
		2259	rxvt_img *
		2260	rxvt_img::scale (int new_width, int new_height)
		2261
		2262	rxvt_img *
		2263	rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0)
2053		2264
2054	#endif	2265	#endif
2055		2266

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.159 by root, Mon Jun 4 15:15:49 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.159 by root, Mon Jun 4 15:15:49 2012 UTC vs.
Revision 1.192 by root, Tue Jun 12 10:45:53 2012 UTC