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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.108 by root, Sun Dec 10 15:14:05 2006 UTC vs.
Revision 1.115 by ayin, Wed Oct 31 09:55:24 2007 UTC

…		…
50	#undef LINENO	50	#undef LINENO
51	#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)	51	#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52	#undef ROW	52	#undef ROW
53	#define ROW(n) THIS->row_buf [LINENO (n)]	53	#define ROW(n) THIS->row_buf [LINENO (n)]
54		54
55	typedef int CHAINED UNUSED;
56
57	/////////////////////////////////////////////////////////////////////////////	55	/////////////////////////////////////////////////////////////////////////////
58		56
59	static wchar_t *	57	static wchar_t *
60	sv2wcs (SV *sv)	58	sv2wcs (SV *sv)
61	{	59	{
…		…
75		73
76	return sv;	74	return sv;
77	}	75	}
78		76
79	static SV *	77	static SV *
80	new_ref (HV hv, const char klass)
81	{
82	return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83	}
84
85	static SV *
86	newSVptr (void ptr, const char klass)	78	newSVptr (void ptr, const char klass)
87	{	79	{
88	HV *hv = newHV ();	80	HV *hv = newHV ();
89	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);	81	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);
90	return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	82	return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
…		…
114	return (long)mg->mg_ptr;	106	return (long)mg->mg_ptr;
115	}	107	}
116		108
117	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)	109	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
118	#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")	110	#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
119
120	/////////////////////////////////////////////////////////////////////////////
121
122	#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
123
124	struct perl_watcher
125	{
126	SV *cbsv;
127	HV *self;
128
129	perl_watcher ()
130	: cbsv (0)
131	{
132	}
133
134	~perl_watcher ()
135	{
136	SvREFCNT_dec (cbsv);
137	}
138
139	void cb (SV *cb)
140	{
141	SvREFCNT_dec (cbsv);
142	cbsv = newSVsv (cb);
143	}
144
145	void invoke (const char type, SV self, int arg = -1);
146	};
147
148	void
149	perl_watcher::invoke (const char type, SV self, int arg)
150	{
151	dSP;
152
153	ENTER;
154	SAVETMPS;
155
156	PUSHMARK (SP);
157
158	XPUSHs (sv_2mortal (self));
159
160	if (arg >= 0)
161	XPUSHs (sv_2mortal (newSViv (arg)));
162
163	PUTBACK;
164	call_sv (cbsv, G_VOID \| G_EVAL \| G_DISCARD);
165	SPAGAIN;
166
167	PUTBACK;
168	FREETMPS;
169	LEAVE;
170
171	if (SvTRUE (ERRSV))
172	rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
173	}
174
175	#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
176	#define SvTIMER(sv) (timer )(perl_watcher )SvPTR ((sv), "urxvt::timer")
177
178	struct timer : perl_watcher, time_watcher
179	{
180	tstamp interval;
181
182	timer ()
183	: time_watcher (this, &timer::execute)
184	{
185	}
186
187	void execute (time_watcher &w)
188	{
189	if (interval)
190	start (at + interval);
191
192	invoke ("urxvt::timer", newSVtimer (this));
193	}
194	};
195
196	#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
197	#define SvIOW(sv) (iow )(perl_watcher )SvPTR ((sv), "urxvt::iow")
198
199	struct iow : perl_watcher, io_watcher
200	{
201	iow ()
202	: io_watcher (this, &iow::execute)
203	{
204	}
205
206	void execute (io_watcher &w, short revents)
207	{
208	invoke ("urxvt::iow", newSViow (this), revents);
209	}
210	};
211
212	#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
213	#define SvIW(sv) (iw )(perl_watcher )SvPTR ((sv), "urxvt::iw")
214
215	struct iw : perl_watcher, idle_watcher
216	{
217	iw ()
218	: idle_watcher (this, &iw::execute)
219	{
220	}
221
222	void execute (idle_watcher &w)
223	{
224	invoke ("urxvt::iw", newSViw (this));
225	}
226	};
227
228	#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
229	#define SvPW(sv) (pw )(perl_watcher )SvPTR ((sv), "urxvt::pw")
230
231	struct pw : perl_watcher, child_watcher
232	{
233	pw ()
234	: child_watcher (this, &pw::execute)
235	{
236	}
237
238	void execute (child_watcher &w, int status)
239	{
240	invoke ("urxvt::pw", newSVpw (this), status);
241	}
242	};
243		111
244	/////////////////////////////////////////////////////////////////////////////	112	/////////////////////////////////////////////////////////////////////////////
245		113
246	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")	114	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
247		115
…		…
425	}	293	}
426		294
427	THIS->want_refresh = 1;	295	THIS->want_refresh = 1;
428	}	296	}
429		297
		298	/////////////////////////////////////////////////////////////////////////////
		299
		300	#define IOM_CLASS "urxvt"
		301	#define IOM_WARN rxvt_warn
		302	#include <iom_perl.h>
430		303
431	/////////////////////////////////////////////////////////////////////////////	304	/////////////////////////////////////////////////////////////////////////////
432		305
433	struct rxvt_perl_interp rxvt_perl;	306	struct rxvt_perl_interp rxvt_perl;
434		307
…		…
509		382
510	// pre-handling of some events	383	// pre-handling of some events
511	if (htype == HOOK_REFRESH_END)	384	if (htype == HOOK_REFRESH_END)
512	{	385	{
513	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	386	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
514		387
515	for (int i = 0; i <= AvFILL (av); i++)	388	for (int i = 0; i <= AvFILL (av); i++)
516	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();	389	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();
517	}	390	}
518		391
519	swap (perl_environ, environ);	392	swap (perl_environ, environ);
…		…
718		591
719	// post-handling of some events	592	// post-handling of some events
720	if (htype == HOOK_REFRESH_BEGIN)	593	if (htype == HOOK_REFRESH_BEGIN)
721	{	594	{
722	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	595	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
723		596
724	for (int i = AvFILL (av); i >= 0; i--)	597	for (int i = AvFILL (av); i >= 0; i--)
725	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();	598	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();
726	}	599	}
727	else if (htype == HOOK_DESTROY)	600	else if (htype == HOOK_DESTROY)
728	{	601	{
729	clearSVptr ((SV *)term->perl.self);	602	clearSVptr ((SV *)term->perl.self);
730	SvREFCNT_dec ((SV *)term->perl.self);	603	SvREFCNT_dec ((SV *)term->perl.self);
731		604
732	// don't allow further calls	605	// don't allow further calls
733	term->perl.self = 0;	606	term->perl.self = 0;
734	}	607	}
735		608
736	swap (perl_environ, environ);	609	swap (perl_environ, environ);
…		…
794	const_iv (AnyModifier),	667	const_iv (AnyModifier),
795		668
796	const_iv (NoSymbol),	669	const_iv (NoSymbol),
797	const_iv (GrabModeSync),	670	const_iv (GrabModeSync),
798	const_iv (GrabModeAsync),	671	const_iv (GrabModeAsync),
799
800	const_iv (EVENT_NONE),
801	const_iv (EVENT_READ),
802	const_iv (EVENT_WRITE),
803		672
804	const_iv (NoEventMask),	673	const_iv (NoEventMask),
805	const_iv (KeyPressMask),	674	const_iv (KeyPressMask),
806	const_iv (KeyReleaseMask),	675	const_iv (KeyReleaseMask),
807	const_iv (ButtonPressMask),	676	const_iv (ButtonPressMask),
…		…
1526	SV *	1395	SV *
1527	rxvt_term::special_decode (SV *text)	1396	rxvt_term::special_decode (SV *text)
1528	CODE:	1397	CODE:
1529	{	1398	{
1530	wchar_t *wstr = sv2wcs (text);	1399	wchar_t *wstr = sv2wcs (text);
1531	int wlen = wcslen (wstr);
1532	int dlen = 0;	1400	int dlen = 0;
1533		1401
1534	// find length	1402	// find length
1535	for (wchar_t s = wstr; s; s++)	1403	for (wchar_t s = wstr; s; s++)
1536	if (*s == NOCHAR)	1404	if (*s == NOCHAR)
…		…
1599		1467
1600	const char *	1468	const char *
1601	rxvt_term::x_resource (const char *name)	1469	rxvt_term::x_resource (const char *name)
1602		1470
1603	bool	1471	bool
1604	rxvt_term::option (U32 optval, int set = -1)	1472	rxvt_term::option (U8 optval, int set = -1)
1605	CODE:	1473	CODE:
1606	{	1474	{
1607	RETVAL = THIS->options & optval;	1475	RETVAL = THIS->option (optval);
1608		1476
1609	if (set >= 0)	1477	if (set >= 0)
1610	{	1478	{
1611	if (set)
1612	THIS->options \|= optval;	1479	THIS->set_option (optval, set);
1613	else
1614	THIS->options &= ~optval;
1615		1480
1616	if (THIS->check_ev.is_active ()) // avoid doing this before START	1481	if (THIS->check_ev.is_active ()) // avoid doing this before START
1617	switch (optval)	1482	switch (optval)
1618	{	1483	{
1619	case Opt_skipBuiltinGlyphs:	1484	case Opt_skipBuiltinGlyphs:
…		…
1807	Atom *props = XListProperties (THIS->dpy, window, &count);	1672	Atom *props = XListProperties (THIS->dpy, window, &count);
1808		1673
1809	EXTEND (SP, count);	1674	EXTEND (SP, count);
1810	while (count--)	1675	while (count--)
1811	PUSHs (newSVuv ((U32)props [count]));	1676	PUSHs (newSVuv ((U32)props [count]));
1812		1677
1813	XFree (props);	1678	XFree (props);
1814	}	1679	}
1815		1680
1816	void	1681	void
1817	rxvt_term::XGetWindowProperty (Window window, Atom property)	1682	rxvt_term::XGetWindowProperty (Window window, Atom property)
…		…
1946	overlay::hide ()	1811	overlay::hide ()
1947		1812
1948	void	1813	void
1949	overlay::DESTROY ()	1814	overlay::DESTROY ()
1950		1815
1951	#############################################################################	1816	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1952	# urxvt::watcher
1953	#############################################################################
1954		1817
1955	MODULE = urxvt PACKAGE = urxvt::watcher
1956
1957	CHAINED
1958	perl_watcher::cb (SV *cb)
1959	CODE:
1960	THIS->cb (cb);
1961	OUTPUT:
1962	RETVAL
1963
1964	#############################################################################
1965	# urxvt::timer
1966	#############################################################################
1967
1968	MODULE = urxvt PACKAGE = urxvt::timer
1969
1970	SV *
1971	timer::new ()
1972	CODE:
1973	timer *w = new timer;
1974	w->start (NOW);
1975	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::timer");
1976	w->self = (HV *)SvRV (RETVAL);
1977	OUTPUT:
1978	RETVAL
1979
1980	NV
1981	timer::at ()
1982	CODE:
1983	RETVAL = THIS->at;
1984	OUTPUT:
1985	RETVAL
1986
1987	CHAINED
1988	timer::interval (NV interval)
1989	CODE:
1990	THIS->interval = interval;
1991	OUTPUT:
1992	RETVAL
1993
1994	CHAINED
1995	timer::set (NV tstamp)
1996	CODE:
1997	THIS->set (tstamp);
1998	OUTPUT:
1999	RETVAL
2000
2001	CHAINED
2002	timer::start (NV tstamp = THIS->at)
2003	CODE:
2004	THIS->start (tstamp);
2005	OUTPUT:
2006	RETVAL
2007
2008	CHAINED
2009	timer::after (NV delay)
2010	CODE:
2011	THIS->start (NOW + delay);
2012	OUTPUT:
2013	RETVAL
2014
2015	CHAINED
2016	timer::stop ()
2017	CODE:
2018	THIS->stop ();
2019	OUTPUT:
2020	RETVAL
2021
2022	void
2023	timer::DESTROY ()
2024
2025	#############################################################################
2026	# urxvt::iow
2027	#############################################################################
2028
2029	MODULE = urxvt PACKAGE = urxvt::iow
2030
2031	SV *
2032	iow::new ()
2033	CODE:
2034	iow *w = new iow;
2035	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iow");
2036	w->self = (HV *)SvRV (RETVAL);
2037	OUTPUT:
2038	RETVAL
2039
2040	CHAINED
2041	iow::fd (int fd)
2042	CODE:
2043	THIS->fd = fd;
2044	OUTPUT:
2045	RETVAL
2046
2047	CHAINED
2048	iow::events (short events)
2049	CODE:
2050	THIS->events = events;
2051	OUTPUT:
2052	RETVAL
2053
2054	CHAINED
2055	iow::start ()
2056	CODE:
2057	THIS->start ();
2058	OUTPUT:
2059	RETVAL
2060
2061	CHAINED
2062	iow::stop ()
2063	CODE:
2064	THIS->stop ();
2065	OUTPUT:
2066	RETVAL
2067
2068	void
2069	iow::DESTROY ()
2070
2071	#############################################################################
2072	# urxvt::iw
2073	#############################################################################
2074
2075	MODULE = urxvt PACKAGE = urxvt::iw
2076
2077	SV *
2078	iw::new ()
2079	CODE:
2080	iw *w = new iw;
2081	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iw");
2082	w->self = (HV *)SvRV (RETVAL);
2083	OUTPUT:
2084	RETVAL
2085
2086	CHAINED
2087	iw::start ()
2088	CODE:
2089	THIS->start ();
2090	OUTPUT:
2091	RETVAL
2092
2093	CHAINED
2094	iw::stop ()
2095	CODE:
2096	THIS->stop ();
2097	OUTPUT:
2098	RETVAL
2099
2100	void
2101	iw::DESTROY ()
2102
2103	#############################################################################
2104	# urxvt::pw
2105	#############################################################################
2106
2107	MODULE = urxvt PACKAGE = urxvt::pw
2108
2109	SV *
2110	pw::new ()
2111	CODE:
2112	pw *w = new pw;
2113	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::pw");
2114	w->self = (HV *)SvRV (RETVAL);
2115	OUTPUT:
2116	RETVAL
2117
2118	CHAINED
2119	pw::start (int pid)
2120	CODE:
2121	THIS->start (pid);
2122	OUTPUT:
2123	RETVAL
2124
2125	CHAINED
2126	pw::stop ()
2127	CODE:
2128	THIS->stop ();
2129	OUTPUT:
2130	RETVAL
2131
2132	void
2133	pw::DESTROY ()
2134
2135

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.108 by root, Sun Dec 10 15:14:05 2006 UTC vs. Revision 1.115 by ayin, Wed Oct 31 09:55:24 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.108 by root, Sun Dec 10 15:14:05 2006 UTC vs.
Revision 1.115 by ayin, Wed Oct 31 09:55:24 2007 UTC