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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.153 by sf-exg, Wed Apr 11 10:20:00 2012 UTC vs.
Revision 1.186 by root, Thu Jun 7 18:07:42 2012 UTC

…		…
49	#undef ROW	49	#undef ROW
50	#define ROW(n) THIS->row_buf [LINENO (n)]	50	#define ROW(n) THIS->row_buf [LINENO (n)]
51		51
52	/////////////////////////////////////////////////////////////////////////////	52	/////////////////////////////////////////////////////////////////////////////
53		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	}
		70
		71	/////////////////////////////////////////////////////////////////////////////
		72
54	static wchar_t *	73	static wchar_t *
55	sv2wcs (SV *sv)	74	sv2wcs (SV *sv)
56	{	75	{
57	STRLEN len;	76	STRLEN len;
58	char *str = SvPVutf8 (sv, len);	77	char *str = SvPVutf8 (sv, len);
…		…
363	}	382	}
364		383
365	rxvt_pop_locale ();	384	rxvt_pop_locale ();
366	}	385	}
367		386
368	if (perl)	387	if (perl && !term->perl.self)
369	{	388	{
370	// runs outside of perls ENV	389	// runs outside of perls ENV
371	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	390	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
372	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);
373	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);
374	}	393	}
375	}	394	}
376		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
377	static void	445	static void
378	ungrab (rxvt_term *THIS)	446	ungrab (rxvt_term *THIS)
379	{	447	{
380	if (THIS->perl.grabtime)	448	if (THIS->perl.grabtime)
381	{	449	{
…		…
412	}	480	}
413	}	481	}
414		482
415	bool event_consumed;	483	bool event_consumed;
416		484
417	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
418	\|\| term->perl.should_invoke [htype])	485	if (term->perl.should_invoke [htype])
419	{	486	{
420	dSP;	487	dSP;
421	va_list ap;	488	va_list ap;
422		489
423	va_start (ap, htype);	490	va_start (ap, htype);
…		…
633	ENTER;	700	ENTER;
634	SAVETMPS;	701	SAVETMPS;
635		702
636	dSP;	703	dSP;
637	XPUSHs (sv_2mortal (newSVpvn (data, len)));	704	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		705	PUTBACK;
638	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);
639		707
640	if (SvTRUE (ERRSV))	708	if (SvTRUE (ERRSV))
641	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	709	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
642		710
…		…
783	const_iv (XIMSecondary),	851	const_iv (XIMSecondary),
784	const_iv (XIMTertiary),	852	const_iv (XIMTertiary),
785	const_iv (XIMVisibleToForward),	853	const_iv (XIMVisibleToForward),
786	const_iv (XIMVisibleToBackword),	854	const_iv (XIMVisibleToBackword),
787	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
788	# if 0	867	# if 0
789	const_iv (XIMForwardChar),	868	const_iv (XIMForwardChar),
790	const_iv (XIMBackwardChar),	869	const_iv (XIMBackwardChar),
791	const_iv (XIMForwardWord),	870	const_iv (XIMForwardWord),
792	const_iv (XIMBackwardWord),	871	const_iv (XIMBackwardWord),
…		…
805	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--)
806	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	885	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
807	}	886	}
808		887
809	void	888	void
		889	log (const char *msg)
		890	CODE:
		891	rxvt_log ("%s", msg);
		892
		893	void
810	warn (const char *msg)	894	warn (const char *msg)
811	CODE:	895	CODE:
812	rxvt_warn ("%s", msg);	896	rxvt_warn ("%s", msg);
813		897
814	void	898	void
…		…
816	CODE:	900	CODE:
817	rxvt_fatal ("%s", msg);	901	rxvt_fatal ("%s", msg);
818		902
819	void	903	void
820	_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	}
821		921
822	NV	922	NV
823	NOW ()	923	NOW ()
824	CODE:	924	CODE:
825	RETVAL = ev::now ();	925	RETVAL = ev::now ();
…		…
950	rxvt_term::destroy ()	1050	rxvt_term::destroy ()
951		1051
952	void	1052	void
953	rxvt_term::set_should_invoke (int htype, int inc)	1053	rxvt_term::set_should_invoke (int htype, int inc)
954	CODE:	1054	CODE:
955	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);
956		1073
957	int	1074	int
958	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)
959	CODE:	1076	CODE:
960	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1077	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1217	CODE:	1334	CODE:
1218	RETVAL = THIS->parent;	1335	RETVAL = THIS->parent;
1219	OUTPUT:	1336	OUTPUT:
1220	RETVAL	1337	RETVAL
1221		1338
1222	Window	1339	int
1223	rxvt_term::vt ()	1340	rxvt_term::parent_x ()
1224	CODE:	1341	CODE:
1225	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;
1226	OUTPUT:	1350	OUTPUT:
1227	RETVAL	1351	RETVAL
1228		1352
1229	void	1353	void
1230	rxvt_term::vt_emask_add (U32 emask)	1354	rxvt_term::vt_emask_add (U32 emask)
…		…
1554	THIS->scr_remap_chars ();	1678	THIS->scr_remap_chars ();
1555	THIS->scr_touch (true);	1679	THIS->scr_touch (true);
1556	THIS->want_refresh = 1;	1680	THIS->want_refresh = 1;
1557	THIS->refresh_check ();	1681	THIS->refresh_check ();
1558	break;	1682	break;
1559
1560	#ifdef CURSOR_BLINK	1683	#ifdef CURSOR_BLINK
1561	case Opt_cursorBlink:	1684	case Opt_cursorBlink:
1562	THIS->cursor_blink_reset ();	1685	THIS->cursor_blink_reset ();
1563	break;	1686	break;
1564	#endif	1687	#endif
…		…
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::background_geometry (bool border = false)
		2038	PPCODE:
		2039	EXTEND (SP, 4);
		2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
		2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
		2042	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
		2043	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
		2044
		2045	#if HAVE_IMG
		2046
		2047	#if 0
		2048
		2049	rxvt_img *
		2050	rxvt_term::new_img (SV *format, int width, int height)
		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, width, height);
		2056	OUTPUT:
		2057	RETVAL
		2058
		2059	#endif
		2060
		2061	#if ENABLE_TRANSPARENCY
		2062
		2063	rxvt_img *
		2064	rxvt_term::new_img_from_root ()
		2065	CODE:
		2066	RETVAL = rxvt_img::new_from_root (THIS);
		2067	OUTPUT:
		2068	RETVAL
		2069
		2070	#endif
		2071
		2072	#if HAVE_PIXBUF
		2073
		2074	rxvt_img *
		2075	rxvt_term::new_img_from_file (octet_string filename)
		2076	CODE:
		2077	try
		2078	{
		2079	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2080	}
		2081	catch (const class rxvt_failure_exception &e)
		2082	{
		2083	croak ("new_img_from_file failed");
		2084	}
		2085	OUTPUT:
		2086	RETVAL
		2087
		2088	#endif
		2089
		2090	#if HAVE_BG_PIXMAP
		2091
		2092	void
		2093	rxvt_term::set_background (rxvt_img *img, bool border = false)
		2094	CODE:
		2095	THIS->bg_destroy ();
		2096	THIS->bg_pixmap = None;
		2097	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
		2098
		2099	if (img) // TODO: cannot be false
		2100	{
		2101	img = img->clone (); // own the img
		2102
		2103	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2104	{
		2105	rxvt_img *img2 = img->sub_rect (0, 0,
		2106	border ? THIS->vt_width : THIS->szHint.width,
		2107	border ? THIS->vt_height : THIS->szHint.height);
		2108	delete img;
		2109	img = img2;
		2110	}
		2111
		2112	{
		2113	// just in case, should usually be a nop
		2114	rxvt_img *img2 = img->reify ();
		2115	delete img;
		2116	img = img2;
		2117	}
		2118
		2119	{
		2120	rxvt_img *img2 = img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
		2121	delete img;
		2122	img = img2;
		2123	}
		2124
		2125	THIS->bg_pixmap = img->steal ();
		2126	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2127
		2128	if (!border)
		2129	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
		2130
		2131	delete img;
		2132	}
		2133
		2134	#endif
		2135
		2136	#endif
		2137
		2138	#############################################################################
1907	# urxvt::overlay	2139	# urxvt::overlay
1908	#############################################################################	2140	#############################################################################
1909		2141
1910	MODULE = urxvt PACKAGE = urxvt::overlay	2142	MODULE = urxvt PACKAGE = urxvt::overlay
1911		2143
…		…
1921	void	2153	void
1922	overlay::DESTROY ()	2154	overlay::DESTROY ()
1923		2155
1924	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|	2156	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1925		2157
		2158	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
		2159
		2160	#if HAVE_PIXBUF
		2161
		2162	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
		2163	C_ARGS: filename, 0
		2164
		2165	void
		2166	DESTROY (urxvt::pixbuf self)
		2167	CODE:
		2168	gdk_pixbuf_unref (self);
		2169
		2170	#endif
		2171
		2172	MODULE = urxvt PACKAGE = urxvt::img
		2173
		2174	#if HAVE_IMG
		2175
		2176	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
		2177	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2178
		2179	int
		2180	rxvt_img::w ()
		2181	CODE:
		2182	RETVAL = THIS->w;
		2183	OUTPUT:
		2184	RETVAL
		2185
		2186	int
		2187	rxvt_img::h ()
		2188	CODE:
		2189	RETVAL = THIS->h;
		2190	OUTPUT:
		2191	RETVAL
		2192
		2193	Pixmap
		2194	rxvt_img::pm ()
		2195	CODE:
		2196	RETVAL = THIS->pm;
		2197	OUTPUT:
		2198	RETVAL
		2199
		2200	void
		2201	rxvt_img::fill (SV *c)
		2202	INIT:
		2203	rxvt_color rc;
		2204	parse_color (THIS->s, rc, c);
		2205	C_ARGS: rc
		2206
		2207	void
		2208	rxvt_img::DESTROY ()
		2209	CODE:
		2210	delete THIS;
		2211
		2212	void
		2213	rxvt_img::unshare ()
		2214
		2215	int
		2216	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2217	CODE:
		2218	if (items >= 2)
		2219	THIS->repeat_mode (repeat);
		2220	if (GIMME_V != G_VOID)
		2221	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2222
		2223	void
		2224	rxvt_img::move (int dx, int dy)
		2225
		2226	void
		2227	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2228
		2229	void
		2230	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2231
		2232	rxvt_img *
		2233	rxvt_img::clone ()
		2234
		2235	rxvt_img *
		2236	rxvt_img::reify ()
		2237
		2238	rxvt_img *
		2239	rxvt_img::sub_rect (int x, int y, int width, int height)
		2240
		2241	rxvt_img *
		2242	rxvt_img::blur (int rh, int rv)
		2243
		2244	rxvt_img *
		2245	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)
		2246	INIT:
		2247	double matrix[9] = {
		2248	p11, p12, p13,
		2249	p21, p22, p23,
		2250	p31, p32, p33
		2251	};
		2252	C_ARGS: new_width, new_height, matrix
		2253
		2254	rxvt_img *
		2255	rxvt_img::scale (int new_width, int new_height)
		2256
		2257	rxvt_img *
		2258	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
		2259
		2260	#endif
		2261

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.153 by sf-exg, Wed Apr 11 10:20:00 2012 UTC vs. Revision 1.186 by root, Thu Jun 7 18:07:42 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.153 by sf-exg, Wed Apr 11 10:20:00 2012 UTC vs.
Revision 1.186 by root, Thu Jun 7 18:07:42 2012 UTC