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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.156 by root, Sun Jun 3 15:54:05 2012 UTC vs.
Revision 1.173 by root, Wed Jun 6 11:46:11 2012 UTC

…		…
51		51
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	typedef SV * urxvt_color;	56
		57	typedef int render_repeat_mode;
57		58
58	typedef GdkPixbuf * urxvt__pixbuf;	59	typedef GdkPixbuf * urxvt__pixbuf;
59	typedef rxvt_img * urxvt__img;	60	typedef rxvt_img * urxvt__img;
60		61
61	/////////////////////////////////////////////////////////////////////////////	62	/////////////////////////////////////////////////////////////////////////////
…		…
390	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);
391	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);
392	}	393	}
393	}	394	}
394		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	EXTEND (SP, 2);
		406	PUSHs (sv_2mortal (newSVterm (term)));
		407	PUSHs (sv_2mortal (newSViv (type)));
		408	PUTBACK;
		409	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
		410
		411	FREETMPS;
		412	LEAVE;
		413	}
		414
		415	uint8_t
		416	rxvt_perl_interp::parse_resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
		417	{
		418	localise_env set_environ (perl_environ);
		419
		420	ENTER;
		421	SAVETMPS;
		422
		423	dSP;
		424	EXTEND (SP, 6);
		425	PUSHs (sv_2mortal (newSVterm (term)));
		426	PUSHs (sv_2mortal (newSVpv (name, 0)));
		427	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		428	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		429	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		430	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		431	PUTBACK;
		432	call_pv ("urxvt::parse_resource", G_SCALAR);
		433	SPAGAIN;
		434
		435	uint8_t ret = POPi;
		436
		437	FREETMPS;
		438	LEAVE;
		439
		440	return ret;
		441	}
		442
395	static void	443	static void
396	ungrab (rxvt_term *THIS)	444	ungrab (rxvt_term *THIS)
397	{	445	{
398	if (THIS->perl.grabtime)	446	if (THIS->perl.grabtime)
399	{	447	{
…		…
430	}	478	}
431	}	479	}
432		480
433	bool event_consumed;	481	bool event_consumed;
434		482
435	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
436	\|\| term->perl.should_invoke [htype])	483	if (term->perl.should_invoke [htype])
437	{	484	{
438	dSP;	485	dSP;
439	va_list ap;	486	va_list ap;
440		487
441	va_start (ap, htype);	488	va_start (ap, htype);
…		…
651	ENTER;	698	ENTER;
652	SAVETMPS;	699	SAVETMPS;
653		700
654	dSP;	701	dSP;
655	XPUSHs (sv_2mortal (newSVpvn (data, len)));	702	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		703	PUTBACK;
656	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);	704	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);
657		705
658	if (SvTRUE (ERRSV))	706	if (SvTRUE (ERRSV))
659	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	707	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
660		708
…		…
801	const_iv (XIMSecondary),	849	const_iv (XIMSecondary),
802	const_iv (XIMTertiary),	850	const_iv (XIMTertiary),
803	const_iv (XIMVisibleToForward),	851	const_iv (XIMVisibleToForward),
804	const_iv (XIMVisibleToBackword),	852	const_iv (XIMVisibleToBackword),
805	const_iv (XIMVisibleToCenter),	853	const_iv (XIMVisibleToCenter),
		854	#if XRENDER
		855	const_iv (PictStandardARGB32),
		856	const_iv (PictStandardRGB24),
		857	const_iv (PictStandardA8),
		858	const_iv (PictStandardA4),
		859	const_iv (PictStandardA1),
		860	const_iv (RepeatNone),
		861	const_iv (RepeatNormal),
		862	const_iv (RepeatPad),
		863	const_iv (RepeatReflect),
		864	#endif
806	# if 0	865	# if 0
807	const_iv (XIMForwardChar),	866	const_iv (XIMForwardChar),
808	const_iv (XIMBackwardChar),	867	const_iv (XIMBackwardChar),
809	const_iv (XIMForwardWord),	868	const_iv (XIMForwardWord),
810	const_iv (XIMBackwardWord),	869	const_iv (XIMBackwardWord),
…		…
823	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	882	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
824	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	883	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
825	}	884	}
826		885
827	void	886	void
		887	log (const char *msg)
		888	CODE:
		889	rxvt_log ("%s", msg);
		890
		891	void
828	warn (const char *msg)	892	warn (const char *msg)
829	CODE:	893	CODE:
830	rxvt_warn ("%s", msg);	894	rxvt_warn ("%s", msg);
831		895
832	void	896	void
…		…
834	CODE:	898	CODE:
835	rxvt_fatal ("%s", msg);	899	rxvt_fatal ("%s", msg);
836		900
837	void	901	void
838	_exit (int status)	902	_exit (int status)
		903
		904	void
		905	catch_fatal (SV *block)
		906	PROTOTYPE: &
		907	CODE:
		908	try
		909	{
		910	PUSHMARK (SP);
		911	PUTBACK;
		912	call_sv (block, G_VOID \| G_DISCARD);
		913	SPAGAIN;
		914	}
		915	catch (const rxvt_failure_exception &e)
		916	{
		917	croak ("rxvt_fatal exception caught, trying to continue.");
		918	}
839		919
840	NV	920	NV
841	NOW ()	921	NOW ()
842	CODE:	922	CODE:
843	RETVAL = ev::now ();	923	RETVAL = ev::now ();
…		…
968	rxvt_term::destroy ()	1048	rxvt_term::destroy ()
969		1049
970	void	1050	void
971	rxvt_term::set_should_invoke (int htype, int inc)	1051	rxvt_term::set_should_invoke (int htype, int inc)
972	CODE:	1052	CODE:
973	THIS->perl.should_invoke [htype] += inc;	1053	uint8_t &count = THIS->perl.should_invoke [htype];
		1054	uint8_t prev = count;
		1055	count += inc;
		1056	if (!prev != !count)
		1057	{
		1058	// hook status changed, react
		1059	switch (htype)
		1060	{
		1061	case HOOK_POSITION_CHANGE:
		1062	if (count)
		1063	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1064	}
		1065	}
		1066
		1067	void
		1068	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1069	CODE:
		1070	XrmPutStringResource (&THIS->option_db, specifier, value);
974		1071
975	int	1072	int
976	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1073	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
977	CODE:	1074	CODE:
978	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1075	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1235	CODE:	1332	CODE:
1236	RETVAL = THIS->parent;	1333	RETVAL = THIS->parent;
1237	OUTPUT:	1334	OUTPUT:
1238	RETVAL	1335	RETVAL
1239		1336
1240	Window	1337	int
1241	rxvt_term::vt ()	1338	rxvt_term::parent_x ()
1242	CODE:	1339	CODE:
1243	RETVAL = THIS->vt;	1340	RETVAL = THIS->parent_x;
		1341	OUTPUT:
		1342	RETVAL
		1343
		1344	int
		1345	rxvt_term::parent_y ()
		1346	CODE:
		1347	RETVAL = THIS->parent_y;
1244	OUTPUT:	1348	OUTPUT:
1245	RETVAL	1349	RETVAL
1246		1350
1247	void	1351	void
1248	rxvt_term::vt_emask_add (U32 emask)	1352	rxvt_term::vt_emask_add (U32 emask)
…		…
1724		1828
1725	void	1829	void
1726	rxvt_term::scr_bell ()	1830	rxvt_term::scr_bell ()
1727		1831
1728	void	1832	void
		1833	rxvt_term::scr_recolour (bool refresh = true);
		1834
		1835	void
1729	rxvt_term::scr_change_screen (int screen)	1836	rxvt_term::scr_change_screen (int screen)
1730		1837
1731	void	1838	void
1732	rxvt_term::scr_add_lines (SV *string)	1839	rxvt_term::scr_add_lines (SV *string)
1733	CODE:	1840	CODE:
…		…
1846	type, format, PropModeReplace,	1953	type, format, PropModeReplace,
1847	(unsigned char *)data_, len / elemsize);	1954	(unsigned char *)data_, len / elemsize);
1848	}	1955	}
1849		1956
1850	Atom	1957	Atom
1851	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1958	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1852	C_ARGS: term->dpy, atom_name, only_if_exists	1959	C_ARGS: term->dpy, atom_name, only_if_exists
1853		1960
1854	char *	1961	char *
1855	XGetAtomName (rxvt_term *term, Atom atom)	1962	XGetAtomName (rxvt_term *term, Atom atom)
1856	C_ARGS: term->dpy, atom	1963	C_ARGS: term->dpy, atom
1857	CLEANUP:	1964	CLEANUP:
1858	XFree (RETVAL);	1965	XFree (RETVAL);
1859		1966
1860	void	1967	void
1861	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1968	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1862	C_ARGS: term->dpy, window, property	1969	C_ARGS: term->dpy, window, property
1863		1970
1864	Window	1971	Window
1865	rxvt_term::DefaultRootWindow ()	1972	rxvt_term::DefaultRootWindow ()
1866	CODE:	1973	CODE:
1867	RETVAL = THIS->display->root;	1974	RETVAL = THIS->display->root;
…		…
1919	PUSHs (newSVuv (child));	2026	PUSHs (newSVuv (child));
1920	}	2027	}
1921	}	2028	}
1922		2029
1923	#############################################################################	2030	#############################################################################
		2031	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		2032
		2033	# TODO: ugly
		2034	void
		2035	rxvt_term::get_geometry ()
		2036	PPCODE:
		2037	EXTEND (SP, 4);
		2038	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));
		2039	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));
		2040	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));
		2041	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));
		2042
		2043	#if HAVE_IMG
		2044
		2045	rxvt_img *
		2046	rxvt_term::new_img (SV *format, int width, int height)
		2047	CODE:
		2048	XRenderPictFormat *f = SvOK (format)
		2049	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2050	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2051	RETVAL = new rxvt_img (THIS, f, width, height);
		2052	OUTPUT:
		2053	RETVAL
		2054
		2055	#if ENABLE_TRANSPARENCY
		2056
		2057	rxvt_img *
		2058	rxvt_term::new_img_from_root ()
		2059	CODE:
		2060	RETVAL = rxvt_img::new_from_root (THIS);
		2061	OUTPUT:
		2062	RETVAL
		2063
		2064	#endif
		2065
		2066	#if HAVE_PIXBUF
		2067
		2068	rxvt_img *
		2069	rxvt_term::new_img_from_file (octet_string filename)
		2070	CODE:
		2071	try
		2072	{
		2073	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2074	}
		2075	catch (const class rxvt_failure_exception &e)
		2076	{
		2077	croak ("new_img_from_file failed");
		2078	}
		2079	OUTPUT:
		2080	RETVAL
		2081
		2082	#endif
		2083
		2084	#if HAVE_BG_PIXMAP
		2085
		2086	void
		2087	rxvt_term::set_background (rxvt_img *img)
		2088	CODE:
		2089	THIS->bg_destroy ();
		2090	THIS->bg_pixmap = None;
		2091	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
		2092
		2093	if (img) // TODO: cannot be false
		2094	{
		2095	img->unshare ();
		2096	//TODO: convetr to visual, possibly precompose with colour
		2097	THIS->bg_pixmap = img->steal ();
		2098	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;
		2099	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
		2100	}
		2101
		2102	#endif
		2103
		2104	#endif
		2105
		2106	#############################################################################
1924	# urxvt::overlay	2107	# urxvt::overlay
1925	#############################################################################	2108	#############################################################################
1926		2109
1927	MODULE = urxvt PACKAGE = urxvt::overlay	2110	MODULE = urxvt PACKAGE = urxvt::overlay
1928		2111
…		…
1956		2139
1957	MODULE = urxvt PACKAGE = urxvt::img	2140	MODULE = urxvt PACKAGE = urxvt::img
1958		2141
1959	#if HAVE_IMG	2142	#if HAVE_IMG
1960		2143
1961	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height);	2144	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
1962	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap);	2145	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1963		2146
1964	void fill (urxvt::img self, SV *c)	2147	int
		2148	rxvt_img::w ()
1965	CODE:	2149	CODE:
		2150	RETVAL = THIS->w;
		2151	OUTPUT:
		2152	RETVAL
		2153
		2154	int
		2155	rxvt_img::h ()
		2156	CODE:
		2157	RETVAL = THIS->h;
		2158	OUTPUT:
		2159	RETVAL
		2160
		2161	bool
		2162	rxvt_img::shared ()
		2163	CODE:
		2164	RETVAL = THIS->shared;
		2165	OUTPUT:
		2166	RETVAL
		2167
		2168	Pixmap
		2169	rxvt_img::pm ()
		2170	CODE:
		2171	RETVAL = THIS->pm;
		2172	OUTPUT:
		2173	RETVAL
		2174
		2175	void
		2176	rxvt_img::fill (SV *c)
		2177	INIT:
1966	rxvt_color rc;	2178	rxvt_color rc;
1967	parse_color (self->s, rc, c);	2179	parse_color (THIS->s, rc, c);
1968	self->fill (rc);	2180	C_ARGS: rc
1969		2181
1970	void blur (urxvt::img self, int rh, int rv)	2182	void
		2183	rxvt_img::DESTROY ()
1971	CODE:	2184	CODE:
1972	self->blur (rh, rv);	2185	delete THIS;
1973		2186
1974	void brightness (urxvt::img self, double r, double g, double b, double a = 1.)	2187	rxvt_img *
1975	CODE:	2188	rxvt_img::blur (int rh, int rv)
1976	self->brightness (r, g, b, a);
1977		2189
1978	void contrast (urxvt::img self, double r, double g, double b, double a = 1.)	2190	void
1979	CODE:	2191	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
1980	self->contrast (r, g, b, a);
1981		2192
1982	urxvt::img copy (urxvt::img self)	2193	void
1983	CODE:	2194	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
1984	RETVAL = self->copy ();
1985	OUTPUT:
1986	RETVAL
1987		2195
		2196	void
		2197	rxvt_img::unshare ()
		2198
		2199	rxvt_img *
		2200	rxvt_img::clone ()
		2201
		2202	rxvt_img *
		2203	rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
		2204
		2205	rxvt_img *
		2206	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, render_repeat_mode repeat = RepeatNormal)
		2207	INIT:
		2208	double matrix[9] = {
		2209	p11, p12, p13,
		2210	p21, p22, p23,
		2211	p31, p32, p33
		2212	};
		2213	C_ARGS: new_width, new_height, matrix, repeat
		2214
		2215	rxvt_img *
1988	urxvt::img scale (urxvt::img self, int new_width, int new_height)	2216	rxvt_img::scale (int new_width, int new_height)
1989	CODE:
1990	RETVAL = self->scale (new_width, new_height);
1991	OUTPUT:
1992	RETVAL
1993		2217
1994	# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);	2218	rxvt_img *
		2219	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)
1995		2220
1996	#endif	2221	#endif
1997		2222

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.156 by root, Sun Jun 3 15:54:05 2012 UTC vs. Revision 1.173 by root, Wed Jun 6 11:46:11 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.156 by root, Sun Jun 3 15:54:05 2012 UTC vs.
Revision 1.173 by root, Wed Jun 6 11:46:11 2012 UTC