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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.165 by root, Mon Jun 4 21:33:47 2012 UTC vs.
Revision 1.187 by root, Sat Jun 9 10:21: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
57	typedef GdkPixbuf * urxvt__pixbuf;	59	typedef GdkPixbuf * urxvt__pixbuf;
58	typedef rxvt_img * urxvt__img;	60	typedef rxvt_img * urxvt__img;
59		61
60	/////////////////////////////////////////////////////////////////////////////	62	/////////////////////////////////////////////////////////////////////////////
61		63
…		…
380	}	382	}
381		383
382	rxvt_pop_locale ();	384	rxvt_pop_locale ();
383	}	385	}
384		386
385	if (perl)	387	if (perl && !term->perl.self)
386	{	388	{
387	// runs outside of perls ENV	389	// runs outside of perls ENV
388	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	390	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);	391	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);	392	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
391	}	393	}
392	}	394	}
393		395
		396	void
		397	rxvt_perl_interp::usage (rxvt_term *term, int type)
		398	{
		399	localise_env set_environ (perl_environ);
		400
		401	ENTER;
		402	SAVETMPS;
		403
		404	dSP;
		405	PUSHMARK (SP);
		406	EXTEND (SP, 2);
		407	PUSHs (sv_2mortal (newSVterm (term)));
		408	PUSHs (sv_2mortal (newSViv (type)));
		409	PUTBACK;
		410	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
		411
		412	FREETMPS;
		413	LEAVE;
		414	}
		415
		416	uint8_t
		417	rxvt_perl_interp::parse_resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
		418	{
		419	localise_env set_environ (perl_environ);
		420
		421	ENTER;
		422	SAVETMPS;
		423
		424	dSP;
		425	PUSHMARK (SP);
		426	EXTEND (SP, 6);
		427	PUSHs (sv_2mortal (newSVterm (term)));
		428	PUSHs (sv_2mortal (newSVpv (name, 0)));
		429	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		430	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		431	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		432	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		433	PUTBACK;
		434	call_pv ("urxvt::parse_resource", G_SCALAR);
		435	SPAGAIN;
		436
		437	uint8_t ret = POPi;
		438
		439	FREETMPS;
		440	LEAVE;
		441
		442	return ret;
		443	}
		444
394	static void	445	static void
395	ungrab (rxvt_term *THIS)	446	ungrab (rxvt_term *THIS)
396	{	447	{
397	if (THIS->perl.grabtime)	448	if (THIS->perl.grabtime)
398	{	449	{
…		…
429	}	480	}
430	}	481	}
431		482
432	bool event_consumed;	483	bool event_consumed;
433		484
434	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
435	\|\| term->perl.should_invoke [htype])	485	if (term->perl.should_invoke [htype])
436	{	486	{
437	dSP;	487	dSP;
438	va_list ap;	488	va_list ap;
439		489
440	va_start (ap, htype);	490	va_start (ap, htype);
…		…
650	ENTER;	700	ENTER;
651	SAVETMPS;	701	SAVETMPS;
652		702
653	dSP;	703	dSP;
654	XPUSHs (sv_2mortal (newSVpvn (data, len)));	704	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		705	PUTBACK;
655	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);	706	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);
656		707
657	if (SvTRUE (ERRSV))	708	if (SvTRUE (ERRSV))
658	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	709	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659		710
…		…
833	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	884	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
834	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	885	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
835	}	886	}
836		887
837	void	888	void
		889	log (const char *msg)
		890	CODE:
		891	rxvt_log ("%s", msg);
		892
		893	void
838	warn (const char *msg)	894	warn (const char *msg)
839	CODE:	895	CODE:
840	rxvt_warn ("%s", msg);	896	rxvt_warn ("%s", msg);
841		897
842	void	898	void
…		…
844	CODE:	900	CODE:
845	rxvt_fatal ("%s", msg);	901	rxvt_fatal ("%s", msg);
846		902
847	void	903	void
848	_exit (int status)	904	_exit (int status)
		905
		906	void
		907	catch_fatal (SV *block)
		908	PROTOTYPE: &
		909	CODE:
		910	try
		911	{
		912	PUSHMARK (SP);
		913	PUTBACK;
		914	call_sv (block, G_VOID \| G_DISCARD);
		915	SPAGAIN;
		916	}
		917	catch (const rxvt_failure_exception &e)
		918	{
		919	croak ("rxvt_fatal exception caught, trying to continue.");
		920	}
849		921
850	NV	922	NV
851	NOW ()	923	NOW ()
852	CODE:	924	CODE:
853	RETVAL = ev::now ();	925	RETVAL = ev::now ();
…		…
978	rxvt_term::destroy ()	1050	rxvt_term::destroy ()
979		1051
980	void	1052	void
981	rxvt_term::set_should_invoke (int htype, int inc)	1053	rxvt_term::set_should_invoke (int htype, int inc)
982	CODE:	1054	CODE:
983	THIS->perl.should_invoke [htype] += inc;	1055	uint8_t &count = THIS->perl.should_invoke [htype];
		1056	uint8_t prev = count;
		1057	count += inc;
		1058	if (!prev != !count)
		1059	{
		1060	// hook status changed, react
		1061	switch (htype)
		1062	{
		1063	case HOOK_POSITION_CHANGE:
		1064	if (count)
		1065	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1066	}
		1067	}
		1068
		1069	void
		1070	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1071	CODE:
		1072	XrmPutStringResource (&THIS->option_db, specifier, value);
984		1073
985	int	1074	int
986	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1075	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
987	CODE:	1076	CODE:
988	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1077	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1245	CODE:	1334	CODE:
1246	RETVAL = THIS->parent;	1335	RETVAL = THIS->parent;
1247	OUTPUT:	1336	OUTPUT:
1248	RETVAL	1337	RETVAL
1249		1338
1250	Window	1339	int
1251	rxvt_term::vt ()	1340	rxvt_term::parent_x ()
1252	CODE:	1341	CODE:
1253	RETVAL = THIS->vt;	1342	RETVAL = THIS->parent_x;
		1343	OUTPUT:
		1344	RETVAL
		1345
		1346	int
		1347	rxvt_term::parent_y ()
		1348	CODE:
		1349	RETVAL = THIS->parent_y;
1254	OUTPUT:	1350	OUTPUT:
1255	RETVAL	1351	RETVAL
1256		1352
1257	void	1353	void
1258	rxvt_term::vt_emask_add (U32 emask)	1354	rxvt_term::vt_emask_add (U32 emask)
…		…
1936	#############################################################################	2032	#############################################################################
1937	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)
1938		2034
1939	# TODO: ugly	2035	# TODO: ugly
1940	void	2036	void
1941	rxvt_term::get_geometry ()	2037	rxvt_term::background_geometry (bool border = false)
1942	PPCODE:	2038	PPCODE:
1943	Window wdummy;
1944	int x, y;
1945	XWindowAttributes wattr;
1946	XGetWindowAttributes (THIS->dpy, THIS->parent, &wattr);
1947	XTranslateCoordinates (THIS->dpy, THIS->parent, wattr.root,
1948	-wattr.border_width, -wattr.border_width,
1949	&x, &y, &wdummy);
1950	EXTEND (SP, 4);	2039	EXTEND (SP, 4);
1951	PUSHs (sv_2mortal (newSViv (x)));	2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
1952	PUSHs (sv_2mortal (newSViv (y)));	2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
1953	PUSHs (sv_2mortal (newSViv (wattr.width)));	2042	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
1954	PUSHs (sv_2mortal (newSViv (wattr.height)));	2043	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
1955		2044
1956	#if HAVE_IMG	2045	#if HAVE_IMG
		2046
		2047	#if 0
1957		2048
1958	rxvt_img *	2049	rxvt_img *
1959	rxvt_term::new_img (SV *format, int width, int height)	2050	rxvt_term::new_img (SV *format, int width, int height)
1960	CODE:	2051	CODE:
1961	XRenderPictFormat *f = SvOK (format)	2052	XRenderPictFormat *f = SvOK (format)
1962	? XRenderFindVisualFormat (THIS->dpy, THIS->visual)
1963	: XRenderFindStandardFormat (THIS->dpy, SvIV (format));	2053	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
1964	RETVAL = new rxvt_img (THIS, f, width, height);	2055	RETVAL = new rxvt_img (THIS, f, width, height);
1965	OUTPUT:	2056	OUTPUT:
1966	RETVAL	2057	RETVAL
1967		2058
		2059	#endif
		2060
1968	#if ENABLE_TRANSPARENCY	2061	#if ENABLE_TRANSPARENCY
1969
1970	#if 0
1971		2062
1972	rxvt_img *	2063	rxvt_img *
1973	rxvt_term::new_img_from_root ()	2064	rxvt_term::new_img_from_root ()
1974	CODE:	2065	CODE:
1975	RETVAL = rxvt_img::new_from_root (THIS);	2066	RETVAL = rxvt_img::new_from_root (THIS);
1976	OUTPUT:	2067	OUTPUT:
1977	RETVAL	2068	RETVAL
1978		2069
1979	#endif	2070	#endif
1980		2071
1981	#endif
1982
1983	#if HAVE_PIXBUF	2072	#if HAVE_PIXBUF
1984		2073
1985	rxvt_img *	2074	rxvt_img *
1986	rxvt_term::new_img_from_file (octet_string filename)	2075	rxvt_term::new_img_from_file (octet_string filename)
1987	CODE:	2076	CODE:
…		…
1999	#endif	2088	#endif
2000		2089
2001	#if HAVE_BG_PIXMAP	2090	#if HAVE_BG_PIXMAP
2002		2091
2003	void	2092	void
2004	rxvt_term::set_background (rxvt_img *img)	2093	rxvt_term::set_background (rxvt_img *img, bool border = false)
2005	CODE:	2094	CODE:
2006	THIS->bg_destroy ();	2095	THIS->bg_destroy ();
2007	THIS->bg_pixmap = None;	2096	THIS->bg_pixmap = None;
2008	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;	2097	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
2009		2098
2010	if (img) // TODO: cannot be false	2099	if (img) // TODO: cannot be false
2011	{	2100	{
		2101	img = img->clone (); // own the img
		2102
		2103	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2104	img->sub_rect (0, 0,
		2105	border ? THIS->vt_width : THIS->szHint.width,
		2106	border ? THIS->vt_height : THIS->szHint.height)
		2107	->replace (img);
		2108
		2109	// just in case, should usually be a nop
2012	img->unshare ();	2110	img->reify ()
		2111	->replace (img);
		2112
		2113	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
		2114	->replace (img);
		2115
2013	THIS->bg_pixmap = img->steal ();	2116	THIS->bg_pixmap = img->steal ();
		2117	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2118
		2119	if (!border)
2014	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;	2120	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2015	THIS->bg_valid_since = ev::now (); // TODO: extra bloat	2121
		2122	delete img;
2016	}	2123	}
2017		2124
2018	#endif	2125	#endif
2019		2126
2020	#endif	2127	#endif
…		…
2069		2176
2070	int	2177	int
2071	rxvt_img::h ()	2178	rxvt_img::h ()
2072	CODE:	2179	CODE:
2073	RETVAL = THIS->h;	2180	RETVAL = THIS->h;
2074	OUTPUT:
2075	RETVAL
2076
2077	bool
2078	rxvt_img::shared ()
2079	CODE:
2080	RETVAL = THIS->shared;
2081	OUTPUT:	2181	OUTPUT:
2082	RETVAL	2182	RETVAL
2083		2183
2084	Pixmap	2184	Pixmap
2085	rxvt_img::pm ()	2185	rxvt_img::pm ()
…		…
2099	rxvt_img::DESTROY ()	2199	rxvt_img::DESTROY ()
2100	CODE:	2200	CODE:
2101	delete THIS;	2201	delete THIS;
2102		2202
2103	void	2203	void
2104	rxvt_img::blur (int rh, int rv)	2204	rxvt_img::unshare ()
		2205
		2206	int
		2207	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2208	CODE:
		2209	if (items >= 2)
		2210	THIS->repeat_mode (repeat);
		2211	if (GIMME_V != G_VOID)
		2212	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2213
		2214	void
		2215	rxvt_img::move (int dx, int dy)
2105		2216
2106	void	2217	void
2107	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)	2218	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2108		2219
2109	void	2220	void
2110	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)	2221	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2111
2112	void
2113	rxvt_img::unshare ()
2114		2222
2115	rxvt_img *	2223	rxvt_img *
2116	rxvt_img::clone ()	2224	rxvt_img::clone ()
2117		2225
2118	rxvt_img *	2226	rxvt_img *
		2227	rxvt_img::reify ()
		2228
		2229	rxvt_img *
		2230	rxvt_img::sub_rect (int x, int y, int width, int height)
		2231
		2232	rxvt_img *
		2233	rxvt_img::blur (int rh, int rv)
		2234
		2235	rxvt_img *
2119	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)	2236	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)
2120	INIT:	2237	INIT:
2121	double matrix[9] = {	2238	double matrix[9] = {
2122	p11, p12, p13,	2239	p11, p12, p13,
2123	p21, p22, p23,	2240	p21, p22, p23,
2124	p31, p32, p33	2241	p31, p32, p33
2125	};	2242	};
2126	C_ARGS: new_width, new_height, repeat, matrix	2243	C_ARGS: new_width, new_height, matrix
2127		2244
2128	rxvt_img *	2245	rxvt_img *
2129	rxvt_img::scale (int new_width, int new_height)	2246	rxvt_img::scale (int new_width, int new_height)
2130		2247
2131	rxvt_img *	2248	rxvt_img *
2132	rxvt_img::rotate (int new_width, int new_height, int repeat, int x, int y, NV phi)	2249	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2133		2250
2134	#endif	2251	#endif
2135		2252

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.165 by root, Mon Jun 4 21:33:47 2012 UTC vs. Revision 1.187 by root, Sat Jun 9 10:21:19 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.165 by root, Mon Jun 4 21:33:47 2012 UTC vs.
Revision 1.187 by root, Sat Jun 9 10:21:19 2012 UTC