[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.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),
…		…
941	RETVAL	810	RETVAL
942		811
943	int	812	int
944	GET_CUSTOM (int rend)	813	GET_CUSTOM (int rend)
945	CODE:	814	CODE:
946	RETVAL = (rend && RS_customMask) >> RS_customShift;	815	RETVAL = (rend & RS_customMask) >> RS_customShift;
947	OUTPUT:	816	OUTPUT:
948	RETVAL	817	RETVAL
949		818
950	int	819	int
951	SET_CUSTOM (int rend, int new_value)	820	SET_CUSTOM (int rend, int new_value)
…		…
1122	CODE:	991	CODE:
1123	{	992	{
1124	wchar_t *wstr = sv2wcs (str);	993	wchar_t *wstr = sv2wcs (str);
1125		994
1126	rxvt_push_locale (THIS->locale);	995	rxvt_push_locale (THIS->locale);
1127	//TODO: use same algorithm as screen.C	996	RETVAL = 0;
1128	RETVAL = wcswidth (wstr, wcslen (wstr));	997	for (wchar_t wc = wstr; wc; wc++)
		998	{
		999	int w = WCWIDTH (*wc);
		1000
		1001	if (w)
		1002	RETVAL += max (w, 1);
		1003	}
1129	rxvt_pop_locale ();	1004	rxvt_pop_locale ();
1130		1005
1131	free (wstr);	1006	free (wstr);
1132	}	1007	}
1133	OUTPUT:	1008	OUTPUT:
…		…
1163	rxvt_pop_locale ();	1038	rxvt_pop_locale ();
1164		1039
1165	RETVAL = wcs2sv (wstr);	1040	RETVAL = wcs2sv (wstr);
1166	free (wstr);	1041	free (wstr);
1167	}	1042	}
		1043	OUTPUT:
		1044	RETVAL
		1045
		1046	char *
		1047	rxvt_term::locale ()
		1048	CODE:
		1049	RETVAL = THIS->locale;
1168	OUTPUT:	1050	OUTPUT:
1169	RETVAL	1051	RETVAL
1170		1052
1171	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1053	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1172		1054
…		…
1513	SV *	1395	SV *
1514	rxvt_term::special_decode (SV *text)	1396	rxvt_term::special_decode (SV *text)
1515	CODE:	1397	CODE:
1516	{	1398	{
1517	wchar_t *wstr = sv2wcs (text);	1399	wchar_t *wstr = sv2wcs (text);
1518	int wlen = wcslen (wstr);
1519	int dlen = 0;	1400	int dlen = 0;
1520		1401
1521	// find length	1402	// find length
1522	for (wchar_t s = wstr; s; s++)	1403	for (wchar_t s = wstr; s; s++)
1523	if (*s == NOCHAR)	1404	if (*s == NOCHAR)
…		…
1586		1467
1587	const char *	1468	const char *
1588	rxvt_term::x_resource (const char *name)	1469	rxvt_term::x_resource (const char *name)
1589		1470
1590	bool	1471	bool
1591	rxvt_term::option (U32 optval, int set = -1)	1472	rxvt_term::option (U8 optval, int set = -1)
1592	CODE:	1473	CODE:
1593	{	1474	{
1594	RETVAL = THIS->options & optval;	1475	RETVAL = THIS->option (optval);
1595		1476
1596	if (set >= 0)	1477	if (set >= 0)
1597	{	1478	{
1598	if (set)
1599	THIS->options \|= optval;	1479	THIS->set_option (optval, set);
1600	else
1601	THIS->options &= ~optval;
1602		1480
1603	if (THIS->check_ev.is_active ()) // avoid doing this before START	1481	if (THIS->check_ev.is_active ()) // avoid doing this before START
1604	switch (optval)	1482	switch (optval)
1605	{	1483	{
1606	case Opt_skipBuiltinGlyphs:	1484	case Opt_skipBuiltinGlyphs:
…		…
1794	Atom *props = XListProperties (THIS->dpy, window, &count);	1672	Atom *props = XListProperties (THIS->dpy, window, &count);
1795		1673
1796	EXTEND (SP, count);	1674	EXTEND (SP, count);
1797	while (count--)	1675	while (count--)
1798	PUSHs (newSVuv ((U32)props [count]));	1676	PUSHs (newSVuv ((U32)props [count]));
1799		1677
1800	XFree (props);	1678	XFree (props);
1801	}	1679	}
1802		1680
1803	void	1681	void
1804	rxvt_term::XGetWindowProperty (Window window, Atom property)	1682	rxvt_term::XGetWindowProperty (Window window, Atom property)
…		…
1933	overlay::hide ()	1811	overlay::hide ()
1934		1812
1935	void	1813	void
1936	overlay::DESTROY ()	1814	overlay::DESTROY ()
1937		1815
1938	#############################################################################	1816	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1939	# urxvt::watcher
1940	#############################################################################
1941		1817
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.115 by ayin, Wed Oct 31 09:55:24 2007 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.115 by ayin, Wed Oct 31 09:55:24 2007 UTC