[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.170 by root, Tue Jun 5 19:32:29 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);
…		…
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 (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
377	static void	440	static void
378	ungrab (rxvt_term *THIS)	441	ungrab (rxvt_term *THIS)
379	{	442	{
380	if (THIS->perl.grabtime)	443	if (THIS->perl.grabtime)
381	{	444	{
…		…
412	}	475	}
413	}	476	}
414		477
415	bool event_consumed;	478	bool event_consumed;
416		479
417	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
418	\|\| term->perl.should_invoke [htype])	480	if (term->perl.should_invoke [htype])
419	{	481	{
420	dSP;	482	dSP;
421	va_list ap;	483	va_list ap;
422		484
423	va_start (ap, htype);	485	va_start (ap, htype);
…		…
633	ENTER;	695	ENTER;
634	SAVETMPS;	696	SAVETMPS;
635		697
636	dSP;	698	dSP;
637	XPUSHs (sv_2mortal (newSVpvn (data, len)));	699	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		700	PUTBACK;
638	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);
639		702
640	if (SvTRUE (ERRSV))	703	if (SvTRUE (ERRSV))
641	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	704	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
642		705
…		…
783	const_iv (XIMSecondary),	846	const_iv (XIMSecondary),
784	const_iv (XIMTertiary),	847	const_iv (XIMTertiary),
785	const_iv (XIMVisibleToForward),	848	const_iv (XIMVisibleToForward),
786	const_iv (XIMVisibleToBackword),	849	const_iv (XIMVisibleToBackword),
787	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
788	# if 0	862	# if 0
789	const_iv (XIMForwardChar),	863	const_iv (XIMForwardChar),
790	const_iv (XIMBackwardChar),	864	const_iv (XIMBackwardChar),
791	const_iv (XIMForwardWord),	865	const_iv (XIMForwardWord),
792	const_iv (XIMBackwardWord),	866	const_iv (XIMBackwardWord),
…		…
817	rxvt_fatal ("%s", msg);	891	rxvt_fatal ("%s", msg);
818		892
819	void	893	void
820	_exit (int status)	894	_exit (int status)
821		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
822	NV	912	NV
823	NOW ()	913	NOW ()
824	CODE:	914	CODE:
825	RETVAL = ev::now ();	915	RETVAL = ev::now ();
826	OUTPUT:	916	OUTPUT:
…		…
950	rxvt_term::destroy ()	1040	rxvt_term::destroy ()
951		1041
952	void	1042	void
953	rxvt_term::set_should_invoke (int htype, int inc)	1043	rxvt_term::set_should_invoke (int htype, int inc)
954	CODE:	1044	CODE:
955	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	}
956		1058
957	int	1059	int
958	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)
959	CODE:	1061	CODE:
960	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1062	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1217	CODE:	1319	CODE:
1218	RETVAL = THIS->parent;	1320	RETVAL = THIS->parent;
1219	OUTPUT:	1321	OUTPUT:
1220	RETVAL	1322	RETVAL
1221		1323
1222	Window	1324	int
1223	rxvt_term::vt ()	1325	rxvt_term::parent_x ()
1224	CODE:	1326	CODE:
1225	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;
1226	OUTPUT:	1335	OUTPUT:
1227	RETVAL	1336	RETVAL
1228		1337
1229	void	1338	void
1230	rxvt_term::vt_emask_add (U32 emask)	1339	rxvt_term::vt_emask_add (U32 emask)
…		…
1554	THIS->scr_remap_chars ();	1663	THIS->scr_remap_chars ();
1555	THIS->scr_touch (true);	1664	THIS->scr_touch (true);
1556	THIS->want_refresh = 1;	1665	THIS->want_refresh = 1;
1557	THIS->refresh_check ();	1666	THIS->refresh_check ();
1558	break;	1667	break;
1559
1560	#ifdef CURSOR_BLINK	1668	#ifdef CURSOR_BLINK
1561	case Opt_cursorBlink:	1669	case Opt_cursorBlink:
1562	THIS->cursor_blink_reset ();	1670	THIS->cursor_blink_reset ();
1563	break;	1671	break;
1564	#endif	1672	#endif
…		…
1707		1815
1708	void	1816	void
1709	rxvt_term::scr_bell ()	1817	rxvt_term::scr_bell ()
1710		1818
1711	void	1819	void
		1820	rxvt_term::scr_recolour (bool refresh = true);
		1821
		1822	void
1712	rxvt_term::scr_change_screen (int screen)	1823	rxvt_term::scr_change_screen (int screen)
1713		1824
1714	void	1825	void
1715	rxvt_term::scr_add_lines (SV *string)	1826	rxvt_term::scr_add_lines (SV *string)
1716	CODE:	1827	CODE:
…		…
1829	type, format, PropModeReplace,	1940	type, format, PropModeReplace,
1830	(unsigned char *)data_, len / elemsize);	1941	(unsigned char *)data_, len / elemsize);
1831	}	1942	}
1832		1943
1833	Atom	1944	Atom
1834	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)
1835	C_ARGS: term->dpy, atom_name, only_if_exists	1946	C_ARGS: term->dpy, atom_name, only_if_exists
1836		1947
1837	char *	1948	char *
1838	XGetAtomName (rxvt_term *term, Atom atom)	1949	XGetAtomName (rxvt_term *term, Atom atom)
1839	C_ARGS: term->dpy, atom	1950	C_ARGS: term->dpy, atom
1840	CLEANUP:	1951	CLEANUP:
1841	XFree (RETVAL);	1952	XFree (RETVAL);
1842		1953
1843	void	1954	void
1844	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1955	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1845	C_ARGS: term->dpy, window, property	1956	C_ARGS: term->dpy, window, property
1846		1957
1847	Window	1958	Window
1848	rxvt_term::DefaultRootWindow ()	1959	rxvt_term::DefaultRootWindow ()
1849	CODE:	1960	CODE:
1850	RETVAL = THIS->display->root;	1961	RETVAL = THIS->display->root;
…		…
1902	PUSHs (newSVuv (child));	2013	PUSHs (newSVuv (child));
1903	}	2014	}
1904	}	2015	}
1905		2016
1906	#############################################################################	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	#############################################################################
1907	# urxvt::overlay	2097	# urxvt::overlay
1908	#############################################################################	2098	#############################################################################
1909		2099
1910	MODULE = urxvt PACKAGE = urxvt::overlay	2100	MODULE = urxvt PACKAGE = urxvt::overlay
1911		2101
…		…
1921	void	2111	void
1922	overlay::DESTROY ()	2112	overlay::DESTROY ()
1923		2113
1924	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|	2114	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1925		2115
		2116	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
		2117
		2118	#if HAVE_PIXBUF
		2119
		2120	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
		2121	C_ARGS: filename, 0
		2122
		2123	void
		2124	DESTROY (urxvt::pixbuf self)
		2125	CODE:
		2126	gdk_pixbuf_unref (self);
		2127
		2128	#endif
		2129
		2130	MODULE = urxvt PACKAGE = urxvt::img
		2131
		2132	#if HAVE_IMG
		2133
		2134	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
		2135	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2136
		2137	int
		2138	rxvt_img::w ()
		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:
		2168	rxvt_color rc;
		2169	parse_color (THIS->s, rc, c);
		2170	C_ARGS: rc
		2171
		2172	void
		2173	rxvt_img::DESTROY ()
		2174	CODE:
		2175	delete THIS;
		2176
		2177	rxvt_img *
		2178	rxvt_img::blur (int rh, int rv)
		2179
		2180	void
		2181	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2182
		2183	void
		2184	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		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 *
		2206	rxvt_img::scale (int new_width, int new_height)
		2207
		2208	rxvt_img *
		2209	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)
		2210
		2211	#endif
		2212

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