[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.170 by root, Tue Jun 5 19:32:29 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
…		…
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 (int type)
		398	{
		399	localise_env set_environ (perl_environ);
		400
		401	ENTER;
		402	SAVETMPS;
		403
		404	dSP;
		405	XPUSHs (sv_2mortal (newSViv (type)));
		406	PUTBACK;
		407	call_pv ("urxvt::usage", G_VOID \| G_DISCARD \| G_EVAL);
		408
		409	FREETMPS;
		410	LEAVE;
		411	}
		412
		413	uint8_t
		414	rxvt_perl_interp::resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
		415	{
		416	localise_env set_environ (perl_environ);
		417
		418	ENTER;
		419	SAVETMPS;
		420
		421	dSP;
		422	EXTEND (SP, 6);
		423	PUSHs (sv_2mortal (newSVterm (term)));
		424	PUSHs (sv_2mortal (newSVpv (name, 0)));
		425	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		426	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		427	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		428	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		429	PUTBACK;
		430	call_pv ("urxvt::resource", G_SCALAR \| G_EVAL);
		431
		432	uint8_t ret = POPi;
		433
		434	FREETMPS;
		435	LEAVE;
		436
		437	return ret;
		438	}
		439
394	static void	440	static void
395	ungrab (rxvt_term *THIS)	441	ungrab (rxvt_term *THIS)
396	{	442	{
397	if (THIS->perl.grabtime)	443	if (THIS->perl.grabtime)
398	{	444	{
…		…
429	}	475	}
430	}	476	}
431		477
432	bool event_consumed;	478	bool event_consumed;
433		479
434	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
435	\|\| term->perl.should_invoke [htype])	480	if (term->perl.should_invoke [htype])
436	{	481	{
437	dSP;	482	dSP;
438	va_list ap;	483	va_list ap;
439		484
440	va_start (ap, htype);	485	va_start (ap, htype);
…		…
650	ENTER;	695	ENTER;
651	SAVETMPS;	696	SAVETMPS;
652		697
653	dSP;	698	dSP;
654	XPUSHs (sv_2mortal (newSVpvn (data, len)));	699	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		700	PUTBACK;
655	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);	701	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);
656		702
657	if (SvTRUE (ERRSV))	703	if (SvTRUE (ERRSV))
658	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	704	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659		705
…		…
800	const_iv (XIMSecondary),	846	const_iv (XIMSecondary),
801	const_iv (XIMTertiary),	847	const_iv (XIMTertiary),
802	const_iv (XIMVisibleToForward),	848	const_iv (XIMVisibleToForward),
803	const_iv (XIMVisibleToBackword),	849	const_iv (XIMVisibleToBackword),
804	const_iv (XIMVisibleToCenter),	850	const_iv (XIMVisibleToCenter),
		851	#if XRENDER
		852	const_iv (PictStandardARGB32),
		853	const_iv (PictStandardRGB24),
		854	const_iv (PictStandardA8),
		855	const_iv (PictStandardA4),
		856	const_iv (PictStandardA1),
		857	const_iv (RepeatNone),
		858	const_iv (RepeatNormal),
		859	const_iv (RepeatPad),
		860	const_iv (RepeatReflect),
		861	#endif
805	# if 0	862	# if 0
806	const_iv (XIMForwardChar),	863	const_iv (XIMForwardChar),
807	const_iv (XIMBackwardChar),	864	const_iv (XIMBackwardChar),
808	const_iv (XIMForwardWord),	865	const_iv (XIMForwardWord),
809	const_iv (XIMBackwardWord),	866	const_iv (XIMBackwardWord),
…		…
834	rxvt_fatal ("%s", msg);	891	rxvt_fatal ("%s", msg);
835		892
836	void	893	void
837	_exit (int status)	894	_exit (int status)
838		895
		896	void
		897	catch_fatal (SV *block)
		898	PROTOTYPE: &
		899	CODE:
		900	try
		901	{
		902	PUSHMARK (SP);
		903	PUTBACK;
		904	call_sv (block, G_VOID \| G_DISCARD);
		905	SPAGAIN;
		906	}
		907	catch (const rxvt_failure_exception &e)
		908	{
		909	croak ("rxvt_fatal exception caught, trying to continue.");
		910	}
		911
839	NV	912	NV
840	NOW ()	913	NOW ()
841	CODE:	914	CODE:
842	RETVAL = ev::now ();	915	RETVAL = ev::now ();
843	OUTPUT:	916	OUTPUT:
…		…
967	rxvt_term::destroy ()	1040	rxvt_term::destroy ()
968		1041
969	void	1042	void
970	rxvt_term::set_should_invoke (int htype, int inc)	1043	rxvt_term::set_should_invoke (int htype, int inc)
971	CODE:	1044	CODE:
972	THIS->perl.should_invoke [htype] += inc;	1045	uint8_t &count = THIS->perl.should_invoke [htype];
		1046	uint8_t prev = count;
		1047	count += inc;
		1048	if (!prev != !count)
		1049	{
		1050	// hook status changed, react
		1051	switch (htype)
		1052	{
		1053	case HOOK_POSITION_CHANGE:
		1054	if (count)
		1055	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1056	}
		1057	}
973		1058
974	int	1059	int
975	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1060	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
976	CODE:	1061	CODE:
977	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1062	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1234	CODE:	1319	CODE:
1235	RETVAL = THIS->parent;	1320	RETVAL = THIS->parent;
1236	OUTPUT:	1321	OUTPUT:
1237	RETVAL	1322	RETVAL
1238		1323
1239	Window	1324	int
1240	rxvt_term::vt ()	1325	rxvt_term::parent_x ()
1241	CODE:	1326	CODE:
1242	RETVAL = THIS->vt;	1327	RETVAL = THIS->parent_x;
		1328	OUTPUT:
		1329	RETVAL
		1330
		1331	int
		1332	rxvt_term::parent_y ()
		1333	CODE:
		1334	RETVAL = THIS->parent_y;
1243	OUTPUT:	1335	OUTPUT:
1244	RETVAL	1336	RETVAL
1245		1337
1246	void	1338	void
1247	rxvt_term::vt_emask_add (U32 emask)	1339	rxvt_term::vt_emask_add (U32 emask)
…		…
1723		1815
1724	void	1816	void
1725	rxvt_term::scr_bell ()	1817	rxvt_term::scr_bell ()
1726		1818
1727	void	1819	void
		1820	rxvt_term::scr_recolour (bool refresh = true);
		1821
		1822	void
1728	rxvt_term::scr_change_screen (int screen)	1823	rxvt_term::scr_change_screen (int screen)
1729		1824
1730	void	1825	void
1731	rxvt_term::scr_add_lines (SV *string)	1826	rxvt_term::scr_add_lines (SV *string)
1732	CODE:	1827	CODE:
…		…
1845	type, format, PropModeReplace,	1940	type, format, PropModeReplace,
1846	(unsigned char *)data_, len / elemsize);	1941	(unsigned char *)data_, len / elemsize);
1847	}	1942	}
1848		1943
1849	Atom	1944	Atom
1850	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1945	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1851	C_ARGS: term->dpy, atom_name, only_if_exists	1946	C_ARGS: term->dpy, atom_name, only_if_exists
1852		1947
1853	char *	1948	char *
1854	XGetAtomName (rxvt_term *term, Atom atom)	1949	XGetAtomName (rxvt_term *term, Atom atom)
1855	C_ARGS: term->dpy, atom	1950	C_ARGS: term->dpy, atom
1856	CLEANUP:	1951	CLEANUP:
1857	XFree (RETVAL);	1952	XFree (RETVAL);
1858		1953
1859	void	1954	void
1860	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1955	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1861	C_ARGS: term->dpy, window, property	1956	C_ARGS: term->dpy, window, property
1862		1957
1863	Window	1958	Window
1864	rxvt_term::DefaultRootWindow ()	1959	rxvt_term::DefaultRootWindow ()
1865	CODE:	1960	CODE:
1866	RETVAL = THIS->display->root;	1961	RETVAL = THIS->display->root;
…		…
1918	PUSHs (newSVuv (child));	2013	PUSHs (newSVuv (child));
1919	}	2014	}
1920	}	2015	}
1921		2016
1922	#############################################################################	2017	#############################################################################
		2018	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		2019
		2020	# TODO: ugly
		2021	void
		2022	rxvt_term::get_geometry ()
		2023	PPCODE:
		2024	EXTEND (SP, 4);
		2025	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));
		2026	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));
		2027	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));
		2028	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));
		2029
		2030	#if HAVE_IMG
		2031
		2032	rxvt_img *
		2033	rxvt_term::new_img (SV *format, int width, int height)
		2034	CODE:
		2035	XRenderPictFormat *f = SvOK (format)
		2036	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2037	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2038	RETVAL = new rxvt_img (THIS, f, width, height);
		2039	OUTPUT:
		2040	RETVAL
		2041
		2042	#if ENABLE_TRANSPARENCY
		2043
		2044	#if 0
		2045
		2046	rxvt_img *
		2047	rxvt_term::new_img_from_root ()
		2048	CODE:
		2049	RETVAL = rxvt_img::new_from_root (THIS);
		2050	OUTPUT:
		2051	RETVAL
		2052
		2053	#endif
		2054
		2055	#endif
		2056
		2057	#if HAVE_PIXBUF
		2058
		2059	rxvt_img *
		2060	rxvt_term::new_img_from_file (octet_string filename)
		2061	CODE:
		2062	try
		2063	{
		2064	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2065	}
		2066	catch (const class rxvt_failure_exception &e)
		2067	{
		2068	croak ("new_img_from_file failed");
		2069	}
		2070	OUTPUT:
		2071	RETVAL
		2072
		2073	#endif
		2074
		2075	#if HAVE_BG_PIXMAP
		2076
		2077	void
		2078	rxvt_term::set_background (rxvt_img *img)
		2079	CODE:
		2080	THIS->bg_destroy ();
		2081	THIS->bg_pixmap = None;
		2082	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
		2083
		2084	if (img) // TODO: cannot be false
		2085	{
		2086	img->unshare ();
		2087	THIS->bg_pixmap = img->steal ();
		2088	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;
		2089	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
		2090	}
		2091
		2092	#endif
		2093
		2094	#endif
		2095
		2096	#############################################################################
1923	# urxvt::overlay	2097	# urxvt::overlay
1924	#############################################################################	2098	#############################################################################
1925		2099
1926	MODULE = urxvt PACKAGE = urxvt::overlay	2100	MODULE = urxvt PACKAGE = urxvt::overlay
1927		2101
…		…
1955		2129
1956	MODULE = urxvt PACKAGE = urxvt::img	2130	MODULE = urxvt PACKAGE = urxvt::img
1957		2131
1958	#if HAVE_IMG	2132	#if HAVE_IMG
1959		2133
1960	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height);	2134	# 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);	2135	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1962		2136
1963	void fill (urxvt::img self, SV *c)	2137	int
		2138	rxvt_img::w ()
1964	CODE:	2139	CODE:
		2140	RETVAL = THIS->w;
		2141	OUTPUT:
		2142	RETVAL
		2143
		2144	int
		2145	rxvt_img::h ()
		2146	CODE:
		2147	RETVAL = THIS->h;
		2148	OUTPUT:
		2149	RETVAL
		2150
		2151	bool
		2152	rxvt_img::shared ()
		2153	CODE:
		2154	RETVAL = THIS->shared;
		2155	OUTPUT:
		2156	RETVAL
		2157
		2158	Pixmap
		2159	rxvt_img::pm ()
		2160	CODE:
		2161	RETVAL = THIS->pm;
		2162	OUTPUT:
		2163	RETVAL
		2164
		2165	void
		2166	rxvt_img::fill (SV *c)
		2167	INIT:
1965	rxvt_color rc;	2168	rxvt_color rc;
1966	parse_color (self->s, rc, c);	2169	parse_color (THIS->s, rc, c);
1967	self->fill (rc);	2170	C_ARGS: rc
1968		2171
1969	void blur (urxvt::img self, int rh, int rv)	2172	void
		2173	rxvt_img::DESTROY ()
1970	CODE:	2174	CODE:
1971	self->blur (rh, rv);	2175	delete THIS;
1972		2176
1973	void brightness (urxvt::img self, double r, double g, double b, double a = 1.)	2177	rxvt_img *
1974	CODE:	2178	rxvt_img::blur (int rh, int rv)
1975	self->brightness (r, g, b, a);
1976		2179
1977	void contrast (urxvt::img self, double r, double g, double b, double a = 1.)	2180	void
1978	CODE:	2181	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
1979	self->contrast (r, g, b, a);
1980		2182
1981	urxvt::img copy (urxvt::img self)	2183	void
1982	CODE:	2184	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
1983	RETVAL = self->copy ();
1984	OUTPUT:
1985	RETVAL
1986		2185
		2186	void
		2187	rxvt_img::unshare ()
		2188
		2189	rxvt_img *
		2190	rxvt_img::clone ()
		2191
		2192	rxvt_img *
		2193	rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
		2194
		2195	rxvt_img *
		2196	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)
		2197	INIT:
		2198	double matrix[9] = {
		2199	p11, p12, p13,
		2200	p21, p22, p23,
		2201	p31, p32, p33
		2202	};
		2203	C_ARGS: new_width, new_height, matrix, repeat
		2204
		2205	rxvt_img *
1987	urxvt::img scale (urxvt::img self, int new_width, int new_height)	2206	rxvt_img::scale (int new_width, int new_height)
1988	CODE:
1989	RETVAL = self->scale (new_width, new_height);
1990	OUTPUT:
1991	RETVAL
1992		2207
1993	# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);	2208	rxvt_img *
		2209	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)
1994		2210
1995	#endif	2211	#endif
1996		2212

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.170 by root, Tue Jun 5 19:32:29 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.170 by root, Tue Jun 5 19:32:29 2012 UTC