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

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.171 by root, Tue Jun 5 22:23:07 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.171 by root, Tue Jun 5 22:23:07 2012 UTC