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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.155 by root, Sun Jun 3 10:38:22 2012 UTC vs.
Revision 1.189 by root, Sun Jun 10 10:29:26 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;
		63
		64	/////////////////////////////////////////////////////////////////////////////
		65
		66	static void
		67	parse_color (rxvt_screen s, rxvt_color &c, SV sv)
		68	{
		69	//TODO: support component stuff, 0..1
		70	c.set (s, SvPVbyte_nolen (sv));
		71	}
59		72
60	/////////////////////////////////////////////////////////////////////////////	73	/////////////////////////////////////////////////////////////////////////////
61		74
62	static wchar_t *	75	static wchar_t *
63	sv2wcs (SV *sv)	76	sv2wcs (SV *sv)
…		…
371	}	384	}
372		385
373	rxvt_pop_locale ();	386	rxvt_pop_locale ();
374	}	387	}
375		388
376	if (perl)	389	if (perl && !term->perl.self)
377	{	390	{
378	// runs outside of perls ENV	391	// runs outside of perls ENV
379	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	392	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
380	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);
381	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);
382	}	395	}
383	}	396	}
384		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
385	static void	447	static void
386	ungrab (rxvt_term *THIS)	448	ungrab (rxvt_term *THIS)
387	{	449	{
388	if (THIS->perl.grabtime)	450	if (THIS->perl.grabtime)
389	{	451	{
…		…
420	}	482	}
421	}	483	}
422		484
423	bool event_consumed;	485	bool event_consumed;
424		486
425	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
426	\|\| term->perl.should_invoke [htype])	487	if (term->perl.should_invoke [htype])
427	{	488	{
428	dSP;	489	dSP;
429	va_list ap;	490	va_list ap;
430		491
431	va_start (ap, htype);	492	va_start (ap, htype);
…		…
641	ENTER;	702	ENTER;
642	SAVETMPS;	703	SAVETMPS;
643		704
644	dSP;	705	dSP;
645	XPUSHs (sv_2mortal (newSVpvn (data, len)));	706	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		707	PUTBACK;
646	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);
647		709
648	if (SvTRUE (ERRSV))	710	if (SvTRUE (ERRSV))
649	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	711	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
650		712
…		…
791	const_iv (XIMSecondary),	853	const_iv (XIMSecondary),
792	const_iv (XIMTertiary),	854	const_iv (XIMTertiary),
793	const_iv (XIMVisibleToForward),	855	const_iv (XIMVisibleToForward),
794	const_iv (XIMVisibleToBackword),	856	const_iv (XIMVisibleToBackword),
795	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
796	# if 0	869	# if 0
797	const_iv (XIMForwardChar),	870	const_iv (XIMForwardChar),
798	const_iv (XIMBackwardChar),	871	const_iv (XIMBackwardChar),
799	const_iv (XIMForwardWord),	872	const_iv (XIMForwardWord),
800	const_iv (XIMBackwardWord),	873	const_iv (XIMBackwardWord),
…		…
813	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--)
814	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	887	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
815	}	888	}
816		889
817	void	890	void
		891	log (const char *msg)
		892	CODE:
		893	rxvt_log ("%s", msg);
		894
		895	void
818	warn (const char *msg)	896	warn (const char *msg)
819	CODE:	897	CODE:
820	rxvt_warn ("%s", msg);	898	rxvt_warn ("%s", msg);
821		899
822	void	900	void
…		…
824	CODE:	902	CODE:
825	rxvt_fatal ("%s", msg);	903	rxvt_fatal ("%s", msg);
826		904
827	void	905	void
828	_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	}
829		923
830	NV	924	NV
831	NOW ()	925	NOW ()
832	CODE:	926	CODE:
833	RETVAL = ev::now ();	927	RETVAL = ev::now ();
…		…
958	rxvt_term::destroy ()	1052	rxvt_term::destroy ()
959		1053
960	void	1054	void
961	rxvt_term::set_should_invoke (int htype, int inc)	1055	rxvt_term::set_should_invoke (int htype, int inc)
962	CODE:	1056	CODE:
963	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);
964		1075
965	int	1076	int
966	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)
967	CODE:	1078	CODE:
968	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1079	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1225	CODE:	1336	CODE:
1226	RETVAL = THIS->parent;	1337	RETVAL = THIS->parent;
1227	OUTPUT:	1338	OUTPUT:
1228	RETVAL	1339	RETVAL
1229		1340
1230	Window	1341	int
1231	rxvt_term::vt ()	1342	rxvt_term::parent_x ()
1232	CODE:	1343	CODE:
1233	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;
1234	OUTPUT:	1352	OUTPUT:
1235	RETVAL	1353	RETVAL
1236		1354
1237	void	1355	void
1238	rxvt_term::vt_emask_add (U32 emask)	1356	rxvt_term::vt_emask_add (U32 emask)
…		…
1714		1832
1715	void	1833	void
1716	rxvt_term::scr_bell ()	1834	rxvt_term::scr_bell ()
1717		1835
1718	void	1836	void
		1837	rxvt_term::scr_recolour (bool refresh = true);
		1838
		1839	void
1719	rxvt_term::scr_change_screen (int screen)	1840	rxvt_term::scr_change_screen (int screen)
1720		1841
1721	void	1842	void
1722	rxvt_term::scr_add_lines (SV *string)	1843	rxvt_term::scr_add_lines (SV *string)
1723	CODE:	1844	CODE:
…		…
1836	type, format, PropModeReplace,	1957	type, format, PropModeReplace,
1837	(unsigned char *)data_, len / elemsize);	1958	(unsigned char *)data_, len / elemsize);
1838	}	1959	}
1839		1960
1840	Atom	1961	Atom
1841	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)
1842	C_ARGS: term->dpy, atom_name, only_if_exists	1963	C_ARGS: term->dpy, atom_name, only_if_exists
1843		1964
1844	char *	1965	char *
1845	XGetAtomName (rxvt_term *term, Atom atom)	1966	XGetAtomName (rxvt_term *term, Atom atom)
1846	C_ARGS: term->dpy, atom	1967	C_ARGS: term->dpy, atom
1847	CLEANUP:	1968	CLEANUP:
1848	XFree (RETVAL);	1969	XFree (RETVAL);
1849		1970
1850	void	1971	void
1851	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1972	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1852	C_ARGS: term->dpy, window, property	1973	C_ARGS: term->dpy, window, property
1853		1974
1854	Window	1975	Window
1855	rxvt_term::DefaultRootWindow ()	1976	rxvt_term::DefaultRootWindow ()
1856	CODE:	1977	CODE:
1857	RETVAL = THIS->display->root;	1978	RETVAL = THIS->display->root;
…		…
1909	PUSHs (newSVuv (child));	2030	PUSHs (newSVuv (child));
1910	}	2031	}
1911	}	2032	}
1912		2033
1913	#############################################################################	2034	#############################################################################
		2035	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		2036
		2037	# TODO: ugly
		2038	void
		2039	rxvt_term::background_geometry (bool border = false)
		2040	PPCODE:
		2041	EXTEND (SP, 4);
		2042	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
		2043	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
		2044	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
		2045	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
		2046
		2047	#if HAVE_IMG
		2048
		2049	rxvt_img *
		2050	rxvt_term::new_img (SV *format, int width = 1, int height = 1)
		2051	CODE:
		2052	XRenderPictFormat *f = SvOK (format)
		2053	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2055	RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
		2056	RETVAL->alloc ();
		2057	OUTPUT:
		2058	RETVAL
		2059
		2060	#if ENABLE_TRANSPARENCY
		2061
		2062	rxvt_img *
		2063	rxvt_term::new_img_from_root ()
		2064	CODE:
		2065	RETVAL = rxvt_img::new_from_root (THIS);
		2066	OUTPUT:
		2067	RETVAL
		2068
		2069	#endif
		2070
		2071	#if HAVE_PIXBUF
		2072
		2073	rxvt_img *
		2074	rxvt_term::new_img_from_file (octet_string filename)
		2075	CODE:
		2076	try
		2077	{
		2078	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2079	}
		2080	catch (const class rxvt_failure_exception &e)
		2081	{
		2082	croak ("new_img_from_file failed");
		2083	}
		2084	OUTPUT:
		2085	RETVAL
		2086
		2087	#endif
		2088
		2089	#if HAVE_BG_PIXMAP
		2090
		2091	void
		2092	rxvt_term::set_background (rxvt_img *img, bool border = false)
		2093	CODE:
		2094	THIS->bg_destroy ();
		2095	THIS->bg_pixmap = None;
		2096	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
		2097
		2098	if (img) // TODO: cannot be false
		2099	{
		2100	img = img->clone (); // own the img
		2101
		2102	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2103	img->sub_rect (0, 0,
		2104	border ? THIS->vt_width : THIS->szHint.width,
		2105	border ? THIS->vt_height : THIS->szHint.height)
		2106	->replace (img);
		2107
		2108	// just in case, should usually be a nop
		2109	img->reify ()
		2110	->replace (img);
		2111
		2112	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
		2113	->replace (img);
		2114
		2115	THIS->bg_pixmap = img->steal ();
		2116	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2117
		2118	if (!border)
		2119	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
		2120
		2121	delete img;
		2122	}
		2123
		2124	#endif
		2125
		2126	#endif
		2127
		2128	#############################################################################
1914	# urxvt::overlay	2129	# urxvt::overlay
1915	#############################################################################	2130	#############################################################################
1916		2131
1917	MODULE = urxvt PACKAGE = urxvt::overlay	2132	MODULE = urxvt PACKAGE = urxvt::overlay
1918		2133
…		…
1930		2145
1931	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|	2146	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1932		2147
1933	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_	2148	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1934		2149
		2150	#if HAVE_PIXBUF
		2151
1935	urxvt::pixbuf gdk_pixbuf_new_from_file (octet_string filename, GError **error = 0)	2152	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
		2153	C_ARGS: filename, 0
1936		2154
1937	void	2155	void
1938	DESTROY (urxvt::pixbuf self)	2156	DESTROY (urxvt::pixbuf self)
1939	CODE:	2157	CODE:
1940	gdk_pixbuf_unref (self);	2158	gdk_pixbuf_unref (self);
1941		2159
		2160	#endif
		2161
		2162	MODULE = urxvt PACKAGE = urxvt::img
		2163
		2164	#if HAVE_IMG
		2165
		2166	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
		2167	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2168
		2169	int
		2170	rxvt_img::w ()
		2171	CODE:
		2172	RETVAL = THIS->w;
		2173	OUTPUT:
		2174	RETVAL
		2175
		2176	int
		2177	rxvt_img::h ()
		2178	CODE:
		2179	RETVAL = THIS->h;
		2180	OUTPUT:
		2181	RETVAL
		2182
		2183	Pixmap
		2184	rxvt_img::pm ()
		2185	CODE:
		2186	RETVAL = THIS->pm;
		2187	OUTPUT:
		2188	RETVAL
		2189
		2190	void
		2191	rxvt_img::fill (SV *c)
		2192	INIT:
		2193	rxvt_color rc;
		2194	parse_color (THIS->s, rc, c);
		2195	C_ARGS: rc
		2196
		2197	void
		2198	rxvt_img::DESTROY ()
		2199	CODE:
		2200	delete THIS;
		2201
		2202	void
		2203	rxvt_img::unshare ()
		2204
		2205	int
		2206	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2207	CODE:
		2208	if (items >= 2)
		2209	THIS->repeat_mode (repeat);
		2210	if (GIMME_V != G_VOID)
		2211	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2212
		2213	void
		2214	rxvt_img::move (int dx, int dy)
		2215
		2216	void
		2217	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2218
		2219	void
		2220	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2221
		2222	rxvt_img *
		2223	rxvt_img::clone ()
		2224
		2225	rxvt_img *
		2226	rxvt_img::reify ()
		2227
		2228	rxvt_img *
		2229	rxvt_img::sub_rect (int x, int y, int width, int height)
		2230
		2231	rxvt_img *
		2232	rxvt_img::blur (int rh, int rv)
		2233
		2234	rxvt_img *
		2235	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)
		2236	INIT:
		2237	double matrix[9] = {
		2238	p11, p12, p13,
		2239	p21, p22, p23,
		2240	p31, p32, p33
		2241	};
		2242	C_ARGS: new_width, new_height, matrix
		2243
		2244	rxvt_img *
		2245	rxvt_img::scale (int new_width, int new_height)
		2246
		2247	rxvt_img *
		2248	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
		2249
		2250	#endif
		2251

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.155 by root, Sun Jun 3 10:38:22 2012 UTC vs. Revision 1.189 by root, Sun Jun 10 10:29:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.155 by root, Sun Jun 3 10:38:22 2012 UTC vs.
Revision 1.189 by root, Sun Jun 10 10:29:26 2012 UTC