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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.148 by root, Sat Dec 17 23:17:33 2011 UTC vs.
Revision 1.176 by root, Wed Jun 6 22:01:44 2012 UTC

…		…
23	#define line_t perl_line_t	23	#define line_t perl_line_t
24	#include <EXTERN.h>	24	#include <EXTERN.h>
25	#include <perl.h>	25	#include <perl.h>
26	#include <XSUB.h>	26	#include <XSUB.h>
27	#undef line_t	27	#undef line_t
		28	#undef bool // perl defines it's own bool type, except with g++... what a trap
28		29
29	#include "../config.h"	30	#include "../config.h"
30		31
31	#include <cstddef>	32	#include <stddef.h>
32	#include <cstdarg>	33	#include <stdarg.h>
33		34
34	#include "unistd.h"	35	#include "unistd.h"
35		36
36	#include "ev_cpp.h"	37	#include "ev_cpp.h"
37	#include "rxvt.h"	38	#include "rxvt.h"
…		…
45		46
46	#undef LINENO	47	#undef LINENO
47	#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)	48	#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
48	#undef ROW	49	#undef ROW
49	#define ROW(n) THIS->row_buf [LINENO (n)]	50	#define ROW(n) THIS->row_buf [LINENO (n)]
		51
		52	/////////////////////////////////////////////////////////////////////////////
		53
		54	typedef char * octet_string;
		55	typedef char * utf8_string;
		56
		57	typedef int render_repeat_mode;
		58
		59	typedef GdkPixbuf * urxvt__pixbuf;
		60	typedef rxvt_img * urxvt__img;
		61
		62	/////////////////////////////////////////////////////////////////////////////
		63
		64	static void
		65	parse_color (rxvt_screen s, rxvt_color &c, SV sv)
		66	{
		67	//TODO: support component stuff
		68	c.set (s, SvPVbyte_nolen (sv));
		69	}
50		70
51	/////////////////////////////////////////////////////////////////////////////	71	/////////////////////////////////////////////////////////////////////////////
52		72
53	static wchar_t *	73	static wchar_t *
54	sv2wcs (SV *sv)	74	sv2wcs (SV *sv)
…		…
371	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);
372	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);
373	}	393	}
374	}	394	}
375		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
376	static void	445	static void
377	ungrab (rxvt_term *THIS)	446	ungrab (rxvt_term *THIS)
378	{	447	{
379	if (THIS->perl.grabtime)	448	if (THIS->perl.grabtime)
380	{	449	{
…		…
411	}	480	}
412	}	481	}
413		482
414	bool event_consumed;	483	bool event_consumed;
415		484
416	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
417	\|\| term->perl.should_invoke [htype])	485	if (term->perl.should_invoke [htype])
418	{	486	{
419	dSP;	487	dSP;
420	va_list ap;	488	va_list ap;
421		489
422	va_start (ap, htype);	490	va_start (ap, htype);
…		…
632	ENTER;	700	ENTER;
633	SAVETMPS;	701	SAVETMPS;
634		702
635	dSP;	703	dSP;
636	XPUSHs (sv_2mortal (newSVpvn (data, len)));	704	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		705	PUTBACK;
637	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);
638		707
639	if (SvTRUE (ERRSV))	708	if (SvTRUE (ERRSV))
640	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	709	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
641		710
…		…
782	const_iv (XIMSecondary),	851	const_iv (XIMSecondary),
783	const_iv (XIMTertiary),	852	const_iv (XIMTertiary),
784	const_iv (XIMVisibleToForward),	853	const_iv (XIMVisibleToForward),
785	const_iv (XIMVisibleToBackword),	854	const_iv (XIMVisibleToBackword),
786	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
787	# if 0	867	# if 0
788	const_iv (XIMForwardChar),	868	const_iv (XIMForwardChar),
789	const_iv (XIMBackwardChar),	869	const_iv (XIMBackwardChar),
790	const_iv (XIMForwardWord),	870	const_iv (XIMForwardWord),
791	const_iv (XIMBackwardWord),	871	const_iv (XIMBackwardWord),
…		…
804	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--)
805	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	885	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
806	}	886	}
807		887
808	void	888	void
		889	log (const char *msg)
		890	CODE:
		891	rxvt_log ("%s", msg);
		892
		893	void
809	warn (const char *msg)	894	warn (const char *msg)
810	CODE:	895	CODE:
811	rxvt_warn ("%s", msg);	896	rxvt_warn ("%s", msg);
812		897
813	void	898	void
…		…
815	CODE:	900	CODE:
816	rxvt_fatal ("%s", msg);	901	rxvt_fatal ("%s", msg);
817		902
818	void	903	void
819	_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	}
820		921
821	NV	922	NV
822	NOW ()	923	NOW ()
823	CODE:	924	CODE:
824	RETVAL = ev::now ();	925	RETVAL = ev::now ();
…		…
949	rxvt_term::destroy ()	1050	rxvt_term::destroy ()
950		1051
951	void	1052	void
952	rxvt_term::set_should_invoke (int htype, int inc)	1053	rxvt_term::set_should_invoke (int htype, int inc)
953	CODE:	1054	CODE:
954	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);
955		1073
956	int	1074	int
957	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)
958	CODE:	1076	CODE:
959	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1077	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1096	rxvt_pop_locale ();	1214	rxvt_pop_locale ();
1097		1215
1098	RETVAL = wcs2sv (wstr);	1216	RETVAL = wcs2sv (wstr);
1099	free (wstr);	1217	free (wstr);
1100	}	1218	}
1101	OUTPUT:
1102	RETVAL
1103
1104	char *
1105	rxvt_term::locale ()
1106	CODE:
1107	RETVAL = THIS->locale;
1108	OUTPUT:	1219	OUTPUT:
1109	RETVAL	1220	RETVAL
1110		1221
1111	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1222	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1112		1223
…		…
1223	CODE:	1334	CODE:
1224	RETVAL = THIS->parent;	1335	RETVAL = THIS->parent;
1225	OUTPUT:	1336	OUTPUT:
1226	RETVAL	1337	RETVAL
1227		1338
1228	Window	1339	int
1229	rxvt_term::vt ()	1340	rxvt_term::parent_x ()
1230	CODE:	1341	CODE:
1231	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;
1232	OUTPUT:	1350	OUTPUT:
1233	RETVAL	1351	RETVAL
1234		1352
1235	void	1353	void
1236	rxvt_term::vt_emask_add (U32 emask)	1354	rxvt_term::vt_emask_add (U32 emask)
…		…
1550		1668
1551	if (set >= 0)	1669	if (set >= 0)
1552	{	1670	{
1553	THIS->set_option (optval, set);	1671	THIS->set_option (optval, set);
1554		1672
1555	if (THIS->env_colorfgbg [0]) // avoid doing this before START	1673	if (THIS->init_done) // avoid doing this before START
1556	switch (optval)	1674	switch (optval)
1557	{	1675	{
1558	case Opt_skipBuiltinGlyphs:	1676	case Opt_skipBuiltinGlyphs:
1559	THIS->set_fonts ();	1677	THIS->set_fonts ();
1560	THIS->scr_remap_chars ();	1678	THIS->scr_remap_chars ();
1561	THIS->scr_touch (true);	1679	THIS->scr_touch (true);
1562	THIS->want_refresh = 1;	1680	THIS->want_refresh = 1;
1563	THIS->refresh_check ();	1681	THIS->refresh_check ();
1564	break;	1682	break;
		1683	#ifdef CURSOR_BLINK
		1684	case Opt_cursorBlink:
		1685	THIS->cursor_blink_reset ();
		1686	break;
		1687	#endif
1565		1688
1566	case Opt_cursorUnderline:	1689	case Opt_cursorUnderline:
1567	THIS->want_refresh = 1;	1690	THIS->want_refresh = 1;
1568	THIS->refresh_check ();	1691	THIS->refresh_check ();
1569	break;	1692	break;
…		…
1707		1830
1708	void	1831	void
1709	rxvt_term::scr_bell ()	1832	rxvt_term::scr_bell ()
1710		1833
1711	void	1834	void
		1835	rxvt_term::scr_recolour (bool refresh = true);
		1836
		1837	void
1712	rxvt_term::scr_change_screen (int screen)	1838	rxvt_term::scr_change_screen (int screen)
1713		1839
1714	void	1840	void
1715	rxvt_term::scr_add_lines (SV *string)	1841	rxvt_term::scr_add_lines (SV *string)
1716	CODE:	1842	CODE:
…		…
1829	type, format, PropModeReplace,	1955	type, format, PropModeReplace,
1830	(unsigned char *)data_, len / elemsize);	1956	(unsigned char *)data_, len / elemsize);
1831	}	1957	}
1832		1958
1833	Atom	1959	Atom
1834	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)
1835	C_ARGS: term->dpy, atom_name, only_if_exists	1961	C_ARGS: term->dpy, atom_name, only_if_exists
1836		1962
1837	char *	1963	char *
1838	XGetAtomName (rxvt_term *term, Atom atom)	1964	XGetAtomName (rxvt_term *term, Atom atom)
1839	C_ARGS: term->dpy, atom	1965	C_ARGS: term->dpy, atom
1840	CLEANUP:	1966	CLEANUP:
1841	XFree (RETVAL);	1967	XFree (RETVAL);
1842		1968
1843	void	1969	void
1844	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1970	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1845	C_ARGS: term->dpy, window, property	1971	C_ARGS: term->dpy, window, property
1846		1972
1847	Window	1973	Window
1848	rxvt_term::DefaultRootWindow ()	1974	rxvt_term::DefaultRootWindow ()
1849	CODE:	1975	CODE:
1850	RETVAL = THIS->display->root;	1976	RETVAL = THIS->display->root;
…		…
1902	PUSHs (newSVuv (child));	2028	PUSHs (newSVuv (child));
1903	}	2029	}
1904	}	2030	}
1905		2031
1906	#############################################################################	2032	#############################################################################
		2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		2034
		2035	# TODO: ugly
		2036	void
		2037	rxvt_term::get_geometry ()
		2038	PPCODE:
		2039	EXTEND (SP, 4);
		2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));
		2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));
		2042	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));
		2043	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));
		2044
		2045	#if HAVE_IMG
		2046
		2047	rxvt_img *
		2048	rxvt_term::new_img (SV *format, int width, int height)
		2049	CODE:
		2050	XRenderPictFormat *f = SvOK (format)
		2051	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2052	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2053	RETVAL = new rxvt_img (THIS, f, width, height);
		2054	OUTPUT:
		2055	RETVAL
		2056
		2057	#if ENABLE_TRANSPARENCY
		2058
		2059	rxvt_img *
		2060	rxvt_term::new_img_from_root ()
		2061	CODE:
		2062	RETVAL = rxvt_img::new_from_root (THIS);
		2063	OUTPUT:
		2064	RETVAL
		2065
		2066	#endif
		2067
		2068	#if HAVE_PIXBUF
		2069
		2070	rxvt_img *
		2071	rxvt_term::new_img_from_file (octet_string filename)
		2072	CODE:
		2073	try
		2074	{
		2075	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2076	}
		2077	catch (const class rxvt_failure_exception &e)
		2078	{
		2079	croak ("new_img_from_file failed");
		2080	}
		2081	OUTPUT:
		2082	RETVAL
		2083
		2084	#endif
		2085
		2086	#if HAVE_BG_PIXMAP
		2087
		2088	void
		2089	rxvt_term::set_background (rxvt_img *img)
		2090	CODE:
		2091	THIS->bg_destroy ();
		2092	THIS->bg_pixmap = None;
		2093	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
		2094
		2095	if (img) // TODO: cannot be false
		2096	{
		2097	XRenderPictFormat *f = XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2098	rxvt_img *img2 = 0;
		2099	rxvt_img *img3 = 0;
		2100
		2101	if (f != img->format)
		2102	img = img2 = img->convert_to (f, THIS->pix_colors [Color_bg]);
		2103
		2104	img->unshare ();
		2105	THIS->bg_pixmap = img->steal ();
		2106	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;
		2107	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
		2108
		2109	delete img2;
		2110	}
		2111
		2112	#endif
		2113
		2114	#endif
		2115
		2116	#############################################################################
1907	# urxvt::overlay	2117	# urxvt::overlay
1908	#############################################################################	2118	#############################################################################
1909		2119
1910	MODULE = urxvt PACKAGE = urxvt::overlay	2120	MODULE = urxvt PACKAGE = urxvt::overlay
1911		2121
…		…
1921	void	2131	void
1922	overlay::DESTROY ()	2132	overlay::DESTROY ()
1923		2133
1924	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|	2134	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1925		2135
		2136	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
		2137
		2138	#if HAVE_PIXBUF
		2139
		2140	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
		2141	C_ARGS: filename, 0
		2142
		2143	void
		2144	DESTROY (urxvt::pixbuf self)
		2145	CODE:
		2146	gdk_pixbuf_unref (self);
		2147
		2148	#endif
		2149
		2150	MODULE = urxvt PACKAGE = urxvt::img
		2151
		2152	#if HAVE_IMG
		2153
		2154	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
		2155	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2156
		2157	int
		2158	rxvt_img::w ()
		2159	CODE:
		2160	RETVAL = THIS->w;
		2161	OUTPUT:
		2162	RETVAL
		2163
		2164	int
		2165	rxvt_img::h ()
		2166	CODE:
		2167	RETVAL = THIS->h;
		2168	OUTPUT:
		2169	RETVAL
		2170
		2171	bool
		2172	rxvt_img::shared ()
		2173	CODE:
		2174	RETVAL = THIS->shared;
		2175	OUTPUT:
		2176	RETVAL
		2177
		2178	Pixmap
		2179	rxvt_img::pm ()
		2180	CODE:
		2181	RETVAL = THIS->pm;
		2182	OUTPUT:
		2183	RETVAL
		2184
		2185	void
		2186	rxvt_img::fill (SV *c)
		2187	INIT:
		2188	rxvt_color rc;
		2189	parse_color (THIS->s, rc, c);
		2190	C_ARGS: rc
		2191
		2192	void
		2193	rxvt_img::DESTROY ()
		2194	CODE:
		2195	delete THIS;
		2196
		2197	void
		2198	rxvt_img::unshare ()
		2199
		2200	void
		2201	rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal)
		2202
		2203	void
		2204	rxvt_img::move (int dx, int dy)
		2205
		2206	void
		2207	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2208
		2209	void
		2210	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2211
		2212	rxvt_img *
		2213	rxvt_img::clone ()
		2214
		2215	rxvt_img *
		2216	rxvt_img::sub_rect (int x, int y, int width, int height)
		2217
		2218	rxvt_img *
		2219	rxvt_img::blur (int rh, int rv)
		2220
		2221	rxvt_img *
		2222	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)
		2223	INIT:
		2224	double matrix[9] = {
		2225	p11, p12, p13,
		2226	p21, p22, p23,
		2227	p31, p32, p33
		2228	};
		2229	C_ARGS: new_width, new_height, matrix
		2230
		2231	rxvt_img *
		2232	rxvt_img::scale (int new_width, int new_height)
		2233
		2234	rxvt_img *
		2235	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
		2236
		2237	#endif
		2238

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.148 by root, Sat Dec 17 23:17:33 2011 UTC vs. Revision 1.176 by root, Wed Jun 6 22:01:44 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.148 by root, Sat Dec 17 23:17:33 2011 UTC vs.
Revision 1.176 by root, Wed Jun 6 22:01:44 2012 UTC