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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.104 by root, Mon Aug 7 22:28:18 2006 UTC vs.
Revision 1.109 by root, Thu Dec 14 15:19:31 2006 UTC

…		…
117	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)	117	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
118	#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")	118	#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
119		119
120	/////////////////////////////////////////////////////////////////////////////	120	/////////////////////////////////////////////////////////////////////////////
121		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
244	/////////////////////////////////////////////////////////////////////////////
245
246	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")	122	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
247		123
248	class overlay {	124	class overlay {
249	rxvt_term *THIS;	125	rxvt_term *THIS;
250	AV *overlay_av;	126	AV *overlay_av;
…		…
425	}	301	}
426		302
427	THIS->want_refresh = 1;	303	THIS->want_refresh = 1;
428	}	304	}
429		305
		306	/////////////////////////////////////////////////////////////////////////////
		307
		308	#define IOM_CLASS "urxvt"
		309	#include <iom_perl.h>
430		310
431	/////////////////////////////////////////////////////////////////////////////	311	/////////////////////////////////////////////////////////////////////////////
432		312
433	struct rxvt_perl_interp rxvt_perl;	313	struct rxvt_perl_interp rxvt_perl;
434		314
…		…
941	RETVAL	821	RETVAL
942		822
943	int	823	int
944	GET_CUSTOM (int rend)	824	GET_CUSTOM (int rend)
945	CODE:	825	CODE:
946	RETVAL = (rend && RS_customMask) >> RS_customShift;	826	RETVAL = (rend & RS_customMask) >> RS_customShift;
947	OUTPUT:	827	OUTPUT:
948	RETVAL	828	RETVAL
949		829
950	int	830	int
951	SET_CUSTOM (int rend, int new_value)	831	SET_CUSTOM (int rend, int new_value)
…		…
1122	CODE:	1002	CODE:
1123	{	1003	{
1124	wchar_t *wstr = sv2wcs (str);	1004	wchar_t *wstr = sv2wcs (str);
1125		1005
1126	rxvt_push_locale (THIS->locale);	1006	rxvt_push_locale (THIS->locale);
1127	//TODO: use same algorithm as screen.C	1007	RETVAL = 0;
1128	RETVAL = wcswidth (wstr, wcslen (wstr));	1008	for (wchar_t wc = wstr; wc; wc++)
		1009	{
		1010	int w = WCWIDTH (*wc);
		1011
		1012	if (w)
		1013	RETVAL += max (w, 1);
		1014	}
1129	rxvt_pop_locale ();	1015	rxvt_pop_locale ();
1130		1016
1131	free (wstr);	1017	free (wstr);
1132	}	1018	}
1133	OUTPUT:	1019	OUTPUT:
…		…
1163	rxvt_pop_locale ();	1049	rxvt_pop_locale ();
1164		1050
1165	RETVAL = wcs2sv (wstr);	1051	RETVAL = wcs2sv (wstr);
1166	free (wstr);	1052	free (wstr);
1167	}	1053	}
		1054	OUTPUT:
		1055	RETVAL
		1056
		1057	char *
		1058	rxvt_term::locale ()
		1059	CODE:
		1060	RETVAL = THIS->locale;
1168	OUTPUT:	1061	OUTPUT:
1169	RETVAL	1062	RETVAL
1170		1063
1171	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1064	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1172		1065
…		…
1933	overlay::hide ()	1826	overlay::hide ()
1934		1827
1935	void	1828	void
1936	overlay::DESTROY ()	1829	overlay::DESTROY ()
1937		1830
1938	#############################################################################	1831	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1939	# urxvt::watcher
1940	#############################################################################
1941		1832
1942	MODULE = urxvt PACKAGE = urxvt::watcher
1943
1944	CHAINED
1945	perl_watcher::cb (SV *cb)
1946	CODE:
1947	THIS->cb (cb);
1948	OUTPUT:
1949	RETVAL
1950
1951	#############################################################################
1952	# urxvt::timer
1953	#############################################################################
1954
1955	MODULE = urxvt PACKAGE = urxvt::timer
1956
1957	SV *
1958	timer::new ()
1959	CODE:
1960	timer *w = new timer;
1961	w->start (NOW);
1962	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::timer");
1963	w->self = (HV *)SvRV (RETVAL);
1964	OUTPUT:
1965	RETVAL
1966
1967	NV
1968	timer::at ()
1969	CODE:
1970	RETVAL = THIS->at;
1971	OUTPUT:
1972	RETVAL
1973
1974	CHAINED
1975	timer::interval (NV interval)
1976	CODE:
1977	THIS->interval = interval;
1978	OUTPUT:
1979	RETVAL
1980
1981	CHAINED
1982	timer::set (NV tstamp)
1983	CODE:
1984	THIS->set (tstamp);
1985	OUTPUT:
1986	RETVAL
1987
1988	CHAINED
1989	timer::start (NV tstamp = THIS->at)
1990	CODE:
1991	THIS->start (tstamp);
1992	OUTPUT:
1993	RETVAL
1994
1995	CHAINED
1996	timer::after (NV delay)
1997	CODE:
1998	THIS->start (NOW + delay);
1999	OUTPUT:
2000	RETVAL
2001
2002	CHAINED
2003	timer::stop ()
2004	CODE:
2005	THIS->stop ();
2006	OUTPUT:
2007	RETVAL
2008
2009	void
2010	timer::DESTROY ()
2011
2012	#############################################################################
2013	# urxvt::iow
2014	#############################################################################
2015
2016	MODULE = urxvt PACKAGE = urxvt::iow
2017
2018	SV *
2019	iow::new ()
2020	CODE:
2021	iow *w = new iow;
2022	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iow");
2023	w->self = (HV *)SvRV (RETVAL);
2024	OUTPUT:
2025	RETVAL
2026
2027	CHAINED
2028	iow::fd (int fd)
2029	CODE:
2030	THIS->fd = fd;
2031	OUTPUT:
2032	RETVAL
2033
2034	CHAINED
2035	iow::events (short events)
2036	CODE:
2037	THIS->events = events;
2038	OUTPUT:
2039	RETVAL
2040
2041	CHAINED
2042	iow::start ()
2043	CODE:
2044	THIS->start ();
2045	OUTPUT:
2046	RETVAL
2047
2048	CHAINED
2049	iow::stop ()
2050	CODE:
2051	THIS->stop ();
2052	OUTPUT:
2053	RETVAL
2054
2055	void
2056	iow::DESTROY ()
2057
2058	#############################################################################
2059	# urxvt::iw
2060	#############################################################################
2061
2062	MODULE = urxvt PACKAGE = urxvt::iw
2063
2064	SV *
2065	iw::new ()
2066	CODE:
2067	iw *w = new iw;
2068	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iw");
2069	w->self = (HV *)SvRV (RETVAL);
2070	OUTPUT:
2071	RETVAL
2072
2073	CHAINED
2074	iw::start ()
2075	CODE:
2076	THIS->start ();
2077	OUTPUT:
2078	RETVAL
2079
2080	CHAINED
2081	iw::stop ()
2082	CODE:
2083	THIS->stop ();
2084	OUTPUT:
2085	RETVAL
2086
2087	void
2088	iw::DESTROY ()
2089
2090	#############################################################################
2091	# urxvt::pw
2092	#############################################################################
2093
2094	MODULE = urxvt PACKAGE = urxvt::pw
2095
2096	SV *
2097	pw::new ()
2098	CODE:
2099	pw *w = new pw;
2100	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::pw");
2101	w->self = (HV *)SvRV (RETVAL);
2102	OUTPUT:
2103	RETVAL
2104
2105	CHAINED
2106	pw::start (int pid)
2107	CODE:
2108	THIS->start (pid);
2109	OUTPUT:
2110	RETVAL
2111
2112	CHAINED
2113	pw::stop ()
2114	CODE:
2115	THIS->stop ();
2116	OUTPUT:
2117	RETVAL
2118
2119	void
2120	pw::DESTROY ()
2121
2122

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.104 by root, Mon Aug 7 22:28:18 2006 UTC vs. Revision 1.109 by root, Thu Dec 14 15:19:31 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.104 by root, Mon Aug 7 22:28:18 2006 UTC vs.
Revision 1.109 by root, Thu Dec 14 15:19:31 2006 UTC