[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.182 by root, Thu Jun 7 16:30:58 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
…		…
800	const_iv (XIMSecondary),	851	const_iv (XIMSecondary),
801	const_iv (XIMTertiary),	852	const_iv (XIMTertiary),
802	const_iv (XIMVisibleToForward),	853	const_iv (XIMVisibleToForward),
803	const_iv (XIMVisibleToBackword),	854	const_iv (XIMVisibleToBackword),
804	const_iv (XIMVisibleToCenter),	855	const_iv (XIMVisibleToCenter),
		856	#if XRENDER
		857	const_iv (PictStandardARGB32),
		858	const_iv (PictStandardRGB24),
		859	const_iv (PictStandardA8),
		860	const_iv (PictStandardA4),
		861	const_iv (PictStandardA1),
		862	const_iv (RepeatNone),
		863	const_iv (RepeatNormal),
		864	const_iv (RepeatPad),
		865	const_iv (RepeatReflect),
		866	#endif
805	# if 0	867	# if 0
806	const_iv (XIMForwardChar),	868	const_iv (XIMForwardChar),
807	const_iv (XIMBackwardChar),	869	const_iv (XIMBackwardChar),
808	const_iv (XIMForwardWord),	870	const_iv (XIMForwardWord),
809	const_iv (XIMBackwardWord),	871	const_iv (XIMBackwardWord),
…		…
822	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--)
823	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	885	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
824	}	886	}
825		887
826	void	888	void
		889	log (const char *msg)
		890	CODE:
		891	rxvt_log ("%s", msg);
		892
		893	void
827	warn (const char *msg)	894	warn (const char *msg)
828	CODE:	895	CODE:
829	rxvt_warn ("%s", msg);	896	rxvt_warn ("%s", msg);
830		897
831	void	898	void
…		…
833	CODE:	900	CODE:
834	rxvt_fatal ("%s", msg);	901	rxvt_fatal ("%s", msg);
835		902
836	void	903	void
837	_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	}
838		921
839	NV	922	NV
840	NOW ()	923	NOW ()
841	CODE:	924	CODE:
842	RETVAL = ev::now ();	925	RETVAL = ev::now ();
…		…
967	rxvt_term::destroy ()	1050	rxvt_term::destroy ()
968		1051
969	void	1052	void
970	rxvt_term::set_should_invoke (int htype, int inc)	1053	rxvt_term::set_should_invoke (int htype, int inc)
971	CODE:	1054	CODE:
972	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);
973		1073
974	int	1074	int
975	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)
976	CODE:	1076	CODE:
977	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1077	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1234	CODE:	1334	CODE:
1235	RETVAL = THIS->parent;	1335	RETVAL = THIS->parent;
1236	OUTPUT:	1336	OUTPUT:
1237	RETVAL	1337	RETVAL
1238		1338
1239	Window	1339	int
1240	rxvt_term::vt ()	1340	rxvt_term::parent_x ()
1241	CODE:	1341	CODE:
1242	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;
1243	OUTPUT:	1350	OUTPUT:
1244	RETVAL	1351	RETVAL
1245		1352
1246	void	1353	void
1247	rxvt_term::vt_emask_add (U32 emask)	1354	rxvt_term::vt_emask_add (U32 emask)
…		…
1723		1830
1724	void	1831	void
1725	rxvt_term::scr_bell ()	1832	rxvt_term::scr_bell ()
1726		1833
1727	void	1834	void
		1835	rxvt_term::scr_recolour (bool refresh = true);
		1836
		1837	void
1728	rxvt_term::scr_change_screen (int screen)	1838	rxvt_term::scr_change_screen (int screen)
1729		1839
1730	void	1840	void
1731	rxvt_term::scr_add_lines (SV *string)	1841	rxvt_term::scr_add_lines (SV *string)
1732	CODE:	1842	CODE:
…		…
1845	type, format, PropModeReplace,	1955	type, format, PropModeReplace,
1846	(unsigned char *)data_, len / elemsize);	1956	(unsigned char *)data_, len / elemsize);
1847	}	1957	}
1848		1958
1849	Atom	1959	Atom
1850	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1960	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1851	C_ARGS: term->dpy, atom_name, only_if_exists	1961	C_ARGS: term->dpy, atom_name, only_if_exists
1852		1962
1853	char *	1963	char *
1854	XGetAtomName (rxvt_term *term, Atom atom)	1964	XGetAtomName (rxvt_term *term, Atom atom)
1855	C_ARGS: term->dpy, atom	1965	C_ARGS: term->dpy, atom
1856	CLEANUP:	1966	CLEANUP:
1857	XFree (RETVAL);	1967	XFree (RETVAL);
1858		1968
1859	void	1969	void
1860	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1970	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1861	C_ARGS: term->dpy, window, property	1971	C_ARGS: term->dpy, window, property
1862		1972
1863	Window	1973	Window
1864	rxvt_term::DefaultRootWindow ()	1974	rxvt_term::DefaultRootWindow ()
1865	CODE:	1975	CODE:
1866	RETVAL = THIS->display->root;	1976	RETVAL = THIS->display->root;
…		…
1918	PUSHs (newSVuv (child));	2028	PUSHs (newSVuv (child));
1919	}	2029	}
1920	}	2030	}
1921		2031
1922	#############################################################################	2032	#############################################################################
		2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		2034
		2035	# TODO: ugly
		2036	void
		2037	rxvt_term::background_geometry (bool border = false)
		2038	PPCODE:
		2039	EXTEND (SP, 4);
		2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
		2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
		2042	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
		2043	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
		2044
		2045	#if HAVE_IMG
		2046
		2047	#if 0
		2048
		2049	rxvt_img *
		2050	rxvt_term::new_img (SV *format, int width, int height)
		2051	CODE:
		2052	XRenderPictFormat *f = SvOK (format)
		2053	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2055	RETVAL = new rxvt_img (THIS, f, width, height);
		2056	OUTPUT:
		2057	RETVAL
		2058
		2059	#endif
		2060
		2061	#if ENABLE_TRANSPARENCY
		2062
		2063	rxvt_img *
		2064	rxvt_term::new_img_from_root ()
		2065	CODE:
		2066	RETVAL = rxvt_img::new_from_root (THIS);
		2067	OUTPUT:
		2068	RETVAL
		2069
		2070	#endif
		2071
		2072	#if HAVE_PIXBUF
		2073
		2074	rxvt_img *
		2075	rxvt_term::new_img_from_file (octet_string filename)
		2076	CODE:
		2077	try
		2078	{
		2079	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2080	}
		2081	catch (const class rxvt_failure_exception &e)
		2082	{
		2083	croak ("new_img_from_file failed");
		2084	}
		2085	OUTPUT:
		2086	RETVAL
		2087
		2088	#endif
		2089
		2090	#if HAVE_BG_PIXMAP
		2091
		2092	void
		2093	rxvt_term::set_background (rxvt_img *img, bool border = false)
		2094	CODE:
		2095	THIS->bg_destroy ();
		2096	THIS->bg_pixmap = None;
		2097	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
		2098
		2099	if (img) // TODO: cannot be false
		2100	{
		2101	img = img->reify ();
		2102	rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
		2103	delete img;
		2104	THIS->bg_pixmap = img2->steal ();
		2105	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2106
		2107	if (!border)
		2108	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
		2109
		2110	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
		2111	}
		2112
		2113	#endif
		2114
		2115	#endif
		2116
		2117	#############################################################################
1923	# urxvt::overlay	2118	# urxvt::overlay
1924	#############################################################################	2119	#############################################################################
1925		2120
1926	MODULE = urxvt PACKAGE = urxvt::overlay	2121	MODULE = urxvt PACKAGE = urxvt::overlay
1927		2122
…		…
1955		2150
1956	MODULE = urxvt PACKAGE = urxvt::img	2151	MODULE = urxvt PACKAGE = urxvt::img
1957		2152
1958	#if HAVE_IMG	2153	#if HAVE_IMG
1959		2154
1960	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height);	2155	# 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);	2156	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1962		2157
1963	void fill (urxvt::img self, SV *c)	2158	int
		2159	rxvt_img::w ()
1964	CODE:	2160	CODE:
		2161	RETVAL = THIS->w;
		2162	OUTPUT:
		2163	RETVAL
		2164
		2165	int
		2166	rxvt_img::h ()
		2167	CODE:
		2168	RETVAL = THIS->h;
		2169	OUTPUT:
		2170	RETVAL
		2171
		2172	Pixmap
		2173	rxvt_img::pm ()
		2174	CODE:
		2175	RETVAL = THIS->pm;
		2176	OUTPUT:
		2177	RETVAL
		2178
		2179	void
		2180	rxvt_img::fill (SV *c)
		2181	INIT:
1965	rxvt_color rc;	2182	rxvt_color rc;
1966	parse_color (self->s, rc, c);	2183	parse_color (THIS->s, rc, c);
1967	self->fill (rc);	2184	C_ARGS: rc
1968		2185
1969	void blur (urxvt::img self, int rh, int rv)	2186	void
		2187	rxvt_img::DESTROY ()
1970	CODE:	2188	CODE:
1971	self->blur (rh, rv);	2189	delete THIS;
1972		2190
1973	void brightness (urxvt::img self, double r, double g, double b, double a = 1.)	2191	void
1974	CODE:	2192	rxvt_img::unshare ()
1975	self->brightness (r, g, b, a);
1976		2193
1977	void contrast (urxvt::img self, double r, double g, double b, double a = 1.)	2194	void
1978	CODE:	2195	rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal)
1979	self->contrast (r, g, b, a);
1980		2196
1981	urxvt::img copy (urxvt::img self)	2197	void
1982	CODE:	2198	rxvt_img::move (int dx, int dy)
1983	RETVAL = self->copy ();
1984	OUTPUT:
1985	RETVAL
1986		2199
		2200	void
		2201	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2202
		2203	void
		2204	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2205
		2206	rxvt_img *
		2207	rxvt_img::clone ()
		2208
		2209	rxvt_img *
		2210	rxvt_img::reify ()
		2211
		2212	rxvt_img *
		2213	rxvt_img::sub_rect (int x, int y, int width, int height)
		2214
		2215	rxvt_img *
		2216	rxvt_img::blur (int rh, int rv)
		2217
		2218	rxvt_img *
		2219	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)
		2220	INIT:
		2221	double matrix[9] = {
		2222	p11, p12, p13,
		2223	p21, p22, p23,
		2224	p31, p32, p33
		2225	};
		2226	C_ARGS: new_width, new_height, matrix
		2227
		2228	rxvt_img *
1987	urxvt::img scale (urxvt::img self, int new_width, int new_height)	2229	rxvt_img::scale (int new_width, int new_height)
1988	CODE:
1989	RETVAL = self->scale (new_width, new_height);
1990	OUTPUT:
1991	RETVAL
1992		2230
1993	# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);	2231	rxvt_img *
		2232	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
1994		2233
1995	#endif	2234	#endif
1996		2235

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.182 by root, Thu Jun 7 16:30:58 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.182 by root, Thu Jun 7 16:30:58 2012 UTC