[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.191 by root, Sun Jun 10 15:01:14 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
…		…
380	}	384	}
381		385
382	rxvt_pop_locale ();	386	rxvt_pop_locale ();
383	}	387	}
384		388
385	if (perl)	389	if (perl && !term->perl.self)
386	{	390	{
387	// runs outside of perls ENV	391	// runs outside of perls ENV
388	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	392	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);	393	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);	394	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
391	}	395	}
392	}	396	}
393		397
		398	void
		399	rxvt_perl_interp::usage (rxvt_term *term, int type)
		400	{
		401	localise_env set_environ (perl_environ);
		402
		403	ENTER;
		404	SAVETMPS;
		405
		406	dSP;
		407	PUSHMARK (SP);
		408	EXTEND (SP, 2);
		409	PUSHs (sv_2mortal (newSVterm (term)));
		410	PUSHs (sv_2mortal (newSViv (type)));
		411	PUTBACK;
		412	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
		413
		414	FREETMPS;
		415	LEAVE;
		416	}
		417
		418	uint8_t
		419	rxvt_perl_interp::parse_resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
		420	{
		421	localise_env set_environ (perl_environ);
		422
		423	ENTER;
		424	SAVETMPS;
		425
		426	dSP;
		427	PUSHMARK (SP);
		428	EXTEND (SP, 6);
		429	PUSHs (sv_2mortal (newSVterm (term)));
		430	PUSHs (sv_2mortal (newSVpv (name, 0)));
		431	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		432	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		433	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		434	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		435	PUTBACK;
		436	call_pv ("urxvt::parse_resource", G_SCALAR);
		437	SPAGAIN;
		438
		439	uint8_t ret = POPi;
		440
		441	FREETMPS;
		442	LEAVE;
		443
		444	return ret;
		445	}
		446
394	static void	447	static void
395	ungrab (rxvt_term *THIS)	448	ungrab (rxvt_term *THIS)
396	{	449	{
397	if (THIS->perl.grabtime)	450	if (THIS->perl.grabtime)
398	{	451	{
…		…
429	}	482	}
430	}	483	}
431		484
432	bool event_consumed;	485	bool event_consumed;
433		486
434	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
435	\|\| term->perl.should_invoke [htype])	487	if (term->perl.should_invoke [htype])
436	{	488	{
437	dSP;	489	dSP;
438	va_list ap;	490	va_list ap;
439		491
440	va_start (ap, htype);	492	va_start (ap, htype);
…		…
650	ENTER;	702	ENTER;
651	SAVETMPS;	703	SAVETMPS;
652		704
653	dSP;	705	dSP;
654	XPUSHs (sv_2mortal (newSVpvn (data, len)));	706	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		707	PUTBACK;
655	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);	708	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);
656		709
657	if (SvTRUE (ERRSV))	710	if (SvTRUE (ERRSV))
658	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	711	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659		712
…		…
800	const_iv (XIMSecondary),	853	const_iv (XIMSecondary),
801	const_iv (XIMTertiary),	854	const_iv (XIMTertiary),
802	const_iv (XIMVisibleToForward),	855	const_iv (XIMVisibleToForward),
803	const_iv (XIMVisibleToBackword),	856	const_iv (XIMVisibleToBackword),
804	const_iv (XIMVisibleToCenter),	857	const_iv (XIMVisibleToCenter),
		858	#if XRENDER
		859	const_iv (PictStandardARGB32),
		860	const_iv (PictStandardRGB24),
		861	const_iv (PictStandardA8),
		862	const_iv (PictStandardA4),
		863	const_iv (PictStandardA1),
		864	const_iv (RepeatNone),
		865	const_iv (RepeatNormal),
		866	const_iv (RepeatPad),
		867	const_iv (RepeatReflect),
		868	#endif
805	# if 0	869	# if 0
806	const_iv (XIMForwardChar),	870	const_iv (XIMForwardChar),
807	const_iv (XIMBackwardChar),	871	const_iv (XIMBackwardChar),
808	const_iv (XIMForwardWord),	872	const_iv (XIMForwardWord),
809	const_iv (XIMBackwardWord),	873	const_iv (XIMBackwardWord),
…		…
822	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	886	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
823	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	887	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
824	}	888	}
825		889
826	void	890	void
		891	log (const char *msg)
		892	CODE:
		893	rxvt_log ("%s", msg);
		894
		895	void
827	warn (const char *msg)	896	warn (const char *msg)
828	CODE:	897	CODE:
829	rxvt_warn ("%s", msg);	898	rxvt_warn ("%s", msg);
830		899
831	void	900	void
…		…
833	CODE:	902	CODE:
834	rxvt_fatal ("%s", msg);	903	rxvt_fatal ("%s", msg);
835		904
836	void	905	void
837	_exit (int status)	906	_exit (int status)
		907
		908	void
		909	catch_fatal (SV *block)
		910	PROTOTYPE: &
		911	CODE:
		912	try
		913	{
		914	PUSHMARK (SP);
		915	PUTBACK;
		916	call_sv (block, G_VOID \| G_DISCARD);
		917	SPAGAIN;
		918	}
		919	catch (const rxvt_failure_exception &e)
		920	{
		921	croak ("rxvt_fatal exception caught, trying to continue.");
		922	}
838		923
839	NV	924	NV
840	NOW ()	925	NOW ()
841	CODE:	926	CODE:
842	RETVAL = ev::now ();	927	RETVAL = ev::now ();
…		…
967	rxvt_term::destroy ()	1052	rxvt_term::destroy ()
968		1053
969	void	1054	void
970	rxvt_term::set_should_invoke (int htype, int inc)	1055	rxvt_term::set_should_invoke (int htype, int inc)
971	CODE:	1056	CODE:
972	THIS->perl.should_invoke [htype] += inc;	1057	uint8_t &count = THIS->perl.should_invoke [htype];
		1058	uint8_t prev = count;
		1059	count += inc;
		1060	if (!prev != !count)
		1061	{
		1062	// hook status changed, react
		1063	switch (htype)
		1064	{
		1065	case HOOK_POSITION_CHANGE:
		1066	if (count)
		1067	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1068	}
		1069	}
		1070
		1071	void
		1072	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1073	CODE:
		1074	XrmPutStringResource (&THIS->option_db, specifier, value);
973		1075
974	int	1076	int
975	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1077	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
976	CODE:	1078	CODE:
977	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1079	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1234	CODE:	1336	CODE:
1235	RETVAL = THIS->parent;	1337	RETVAL = THIS->parent;
1236	OUTPUT:	1338	OUTPUT:
1237	RETVAL	1339	RETVAL
1238		1340
1239	Window	1341	int
1240	rxvt_term::vt ()	1342	rxvt_term::parent_x ()
1241	CODE:	1343	CODE:
1242	RETVAL = THIS->vt;	1344	RETVAL = THIS->parent_x;
		1345	OUTPUT:
		1346	RETVAL
		1347
		1348	int
		1349	rxvt_term::parent_y ()
		1350	CODE:
		1351	RETVAL = THIS->parent_y;
1243	OUTPUT:	1352	OUTPUT:
1244	RETVAL	1353	RETVAL
1245		1354
1246	void	1355	void
1247	rxvt_term::vt_emask_add (U32 emask)	1356	rxvt_term::vt_emask_add (U32 emask)
…		…
1723		1832
1724	void	1833	void
1725	rxvt_term::scr_bell ()	1834	rxvt_term::scr_bell ()
1726		1835
1727	void	1836	void
		1837	rxvt_term::scr_recolour (bool refresh = true);
		1838
		1839	void
1728	rxvt_term::scr_change_screen (int screen)	1840	rxvt_term::scr_change_screen (int screen)
1729		1841
1730	void	1842	void
1731	rxvt_term::scr_add_lines (SV *string)	1843	rxvt_term::scr_add_lines (SV *string)
1732	CODE:	1844	CODE:
…		…
1845	type, format, PropModeReplace,	1957	type, format, PropModeReplace,
1846	(unsigned char *)data_, len / elemsize);	1958	(unsigned char *)data_, len / elemsize);
1847	}	1959	}
1848		1960
1849	Atom	1961	Atom
1850	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1962	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1851	C_ARGS: term->dpy, atom_name, only_if_exists	1963	C_ARGS: term->dpy, atom_name, only_if_exists
1852		1964
1853	char *	1965	char *
1854	XGetAtomName (rxvt_term *term, Atom atom)	1966	XGetAtomName (rxvt_term *term, Atom atom)
1855	C_ARGS: term->dpy, atom	1967	C_ARGS: term->dpy, atom
1856	CLEANUP:	1968	CLEANUP:
1857	XFree (RETVAL);	1969	XFree (RETVAL);
1858		1970
1859	void	1971	void
1860	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1972	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1861	C_ARGS: term->dpy, window, property	1973	C_ARGS: term->dpy, window, property
1862		1974
1863	Window	1975	Window
1864	rxvt_term::DefaultRootWindow ()	1976	rxvt_term::DefaultRootWindow ()
1865	CODE:	1977	CODE:
1866	RETVAL = THIS->display->root;	1978	RETVAL = THIS->display->root;
…		…
1918	PUSHs (newSVuv (child));	2030	PUSHs (newSVuv (child));
1919	}	2031	}
1920	}	2032	}
1921		2033
1922	#############################################################################	2034	#############################################################################
		2035	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		2036
		2037	bool
		2038	rxvt_term::has_render ()
		2039	CODE:
		2040	RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
		2041	OUTPUT:
		2042	RETVAL
		2043
		2044	# TODO: ugly
		2045	void
		2046	rxvt_term::background_geometry (bool border = false)
		2047	PPCODE:
		2048	EXTEND (SP, 4);
		2049	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
		2050	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
		2051	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
		2052	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
		2053
		2054	#if HAVE_IMG
		2055
		2056	rxvt_img *
		2057	rxvt_term::new_img (SV *format, int width = 1, int height = 1)
		2058	CODE:
		2059	XRenderPictFormat *f = SvOK (format)
		2060	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2061	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2062	RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
		2063	RETVAL->alloc ();
		2064	OUTPUT:
		2065	RETVAL
		2066
		2067	#if ENABLE_TRANSPARENCY
		2068
		2069	rxvt_img *
		2070	rxvt_term::new_img_from_root ()
		2071	CODE:
		2072	RETVAL = rxvt_img::new_from_root (THIS);
		2073	OUTPUT:
		2074	RETVAL
		2075
		2076	#endif
		2077
		2078	#if HAVE_PIXBUF
		2079
		2080	rxvt_img *
		2081	rxvt_term::new_img_from_file (octet_string filename)
		2082	CODE:
		2083	try
		2084	{
		2085	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2086	}
		2087	catch (const class rxvt_failure_exception &e)
		2088	{
		2089	croak ("new_img_from_file failed");
		2090	}
		2091	OUTPUT:
		2092	RETVAL
		2093
		2094	#endif
		2095
		2096	#if HAVE_BG_PIXMAP
		2097
		2098	void
		2099	rxvt_term::set_background (rxvt_img *img, bool border = false)
		2100	CODE:
		2101	THIS->bg_destroy ();
		2102	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
		2103
		2104	if (img) // TODO: cannot be false
		2105	{
		2106	img = img->clone (); // own the img
		2107
		2108	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2109	img->sub_rect (0, 0,
		2110	border ? THIS->vt_width : THIS->szHint.width,
		2111	border ? THIS->vt_height : THIS->szHint.height)
		2112	->replace (img);
		2113
		2114	// just in case, should usually be a nop
		2115	img->reify ()
		2116	->replace (img);
		2117
		2118	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
		2119	->replace (img);
		2120
		2121	THIS->bg_img = img;
		2122	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2123
		2124	if (!border)
		2125	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
		2126	}
		2127
		2128	#endif
		2129
		2130	#endif
		2131
		2132	#############################################################################
1923	# urxvt::overlay	2133	# urxvt::overlay
1924	#############################################################################	2134	#############################################################################
1925		2135
1926	MODULE = urxvt PACKAGE = urxvt::overlay	2136	MODULE = urxvt PACKAGE = urxvt::overlay
1927		2137
…		…
1955		2165
1956	MODULE = urxvt PACKAGE = urxvt::img	2166	MODULE = urxvt PACKAGE = urxvt::img
1957		2167
1958	#if HAVE_IMG	2168	#if HAVE_IMG
1959		2169
1960	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height);	2170	# 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);	2171	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1962		2172
1963	void fill (urxvt::img self, SV *c)	2173	int
		2174	rxvt_img::w ()
1964	CODE:	2175	CODE:
		2176	RETVAL = THIS->w;
		2177	OUTPUT:
		2178	RETVAL
		2179
		2180	int
		2181	rxvt_img::h ()
		2182	CODE:
		2183	RETVAL = THIS->h;
		2184	OUTPUT:
		2185	RETVAL
		2186
		2187	Pixmap
		2188	rxvt_img::pm ()
		2189	CODE:
		2190	RETVAL = THIS->pm;
		2191	OUTPUT:
		2192	RETVAL
		2193
		2194	void
		2195	rxvt_img::fill (SV *c)
		2196	INIT:
1965	rxvt_color rc;	2197	rxvt_color rc;
1966	parse_color (self->s, rc, c);	2198	parse_color (THIS->s, rc, c);
1967	self->fill (rc);	2199	C_ARGS: rc
1968		2200
1969	void blur (urxvt::img self, int rh, int rv)	2201	void
		2202	rxvt_img::DESTROY ()
1970	CODE:	2203	CODE:
1971	self->blur (rh, rv);	2204	delete THIS;
1972		2205
1973	void brightness (urxvt::img self, double r, double g, double b, double a = 1.)	2206	void
1974	CODE:	2207	rxvt_img::unshare ()
1975	self->brightness (r, g, b, a);
1976		2208
1977	void contrast (urxvt::img self, double r, double g, double b, double a = 1.)	2209	int
		2210	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
1978	CODE:	2211	CODE:
1979	self->contrast (r, g, b, a);	2212	if (items >= 2)
		2213	THIS->repeat_mode (repeat);
		2214	if (GIMME_V != G_VOID)
		2215	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
1980		2216
1981	urxvt::img copy (urxvt::img self)	2217	void
1982	CODE:	2218	rxvt_img::move (int dx, int dy)
1983	RETVAL = self->copy ();
1984	OUTPUT:
1985	RETVAL
1986		2219
		2220	void
		2221	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2222
		2223	void
		2224	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2225
		2226	rxvt_img *
		2227	rxvt_img::clone ()
		2228
		2229	rxvt_img *
		2230	rxvt_img::reify ()
		2231
		2232	rxvt_img *
		2233	rxvt_img::sub_rect (int x, int y, int width, int height)
		2234
		2235	rxvt_img *
		2236	rxvt_img::blur (int rh, int rv)
		2237
		2238	rxvt_img *
		2239	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)
		2240	INIT:
		2241	double matrix[9] = {
		2242	p11, p12, p13,
		2243	p21, p22, p23,
		2244	p31, p32, p33
		2245	};
		2246	C_ARGS: new_width, new_height, matrix
		2247
		2248	rxvt_img *
1987	urxvt::img scale (urxvt::img self, int new_width, int new_height)	2249	rxvt_img::scale (int new_width, int new_height)
1988	CODE:
1989	RETVAL = self->scale (new_width, new_height);
1990	OUTPUT:
1991	RETVAL
1992		2250
1993	# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);	2251	rxvt_img *
		2252	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
1994		2253
1995	#endif	2254	#endif
1996		2255

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.191 by root, Sun Jun 10 15:01:14 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.191 by root, Sun Jun 10 15:01:14 2012 UTC