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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.102 by root, Thu Jul 6 23:48:11 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
…		…
268	};	136	};
269		137
270	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)	138	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
271	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)	139	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
272	{	140	{
		141	if (w < 0) w = 0;
		142	if (h < 0) h = 0;
		143
273	if (border == 2)	144	if (border == 2)
274	{	145	{
275	w += 2;	146	w += 2;
276	h += 2;	147	h += 2;
277	}	148	}
…		…
422	}	293	}
423		294
424	THIS->want_refresh = 1;	295	THIS->want_refresh = 1;
425	}	296	}
426		297
		298	/////////////////////////////////////////////////////////////////////////////
		299
		300	#define IOM_CLASS "urxvt"
		301	#define IOM_WARN rxvt_warn
		302	#include <iom_perl.h>
427		303
428	/////////////////////////////////////////////////////////////////////////////	304	/////////////////////////////////////////////////////////////////////////////
429		305
430	struct rxvt_perl_interp rxvt_perl;	306	struct rxvt_perl_interp rxvt_perl;
431		307
…		…
506		382
507	// pre-handling of some events	383	// pre-handling of some events
508	if (htype == HOOK_REFRESH_END)	384	if (htype == HOOK_REFRESH_END)
509	{	385	{
510	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));
511		387
512	for (int i = 0; i <= AvFILL (av); i++)	388	for (int i = 0; i <= AvFILL (av); i++)
513	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();	389	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();
514	}	390	}
515		391
516	swap (perl_environ, environ);	392	swap (perl_environ, environ);
…		…
715		591
716	// post-handling of some events	592	// post-handling of some events
717	if (htype == HOOK_REFRESH_BEGIN)	593	if (htype == HOOK_REFRESH_BEGIN)
718	{	594	{
719	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));
720		596
721	for (int i = AvFILL (av); i >= 0; i--)	597	for (int i = AvFILL (av); i >= 0; i--)
722	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();	598	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();
723	}	599	}
724	else if (htype == HOOK_DESTROY)	600	else if (htype == HOOK_DESTROY)
725	{	601	{
726	clearSVptr ((SV *)term->perl.self);	602	clearSVptr ((SV *)term->perl.self);
727	SvREFCNT_dec ((SV *)term->perl.self);	603	SvREFCNT_dec ((SV *)term->perl.self);
728		604
729	// don't allow further calls	605	// don't allow further calls
730	term->perl.self = 0;	606	term->perl.self = 0;
731	}	607	}
732		608
733	swap (perl_environ, environ);	609	swap (perl_environ, environ);
…		…
791	const_iv (AnyModifier),	667	const_iv (AnyModifier),
792		668
793	const_iv (NoSymbol),	669	const_iv (NoSymbol),
794	const_iv (GrabModeSync),	670	const_iv (GrabModeSync),
795	const_iv (GrabModeAsync),	671	const_iv (GrabModeAsync),
796
797	const_iv (EVENT_NONE),
798	const_iv (EVENT_READ),
799	const_iv (EVENT_WRITE),
800		672
801	const_iv (NoEventMask),	673	const_iv (NoEventMask),
802	const_iv (KeyPressMask),	674	const_iv (KeyPressMask),
803	const_iv (KeyReleaseMask),	675	const_iv (KeyReleaseMask),
804	const_iv (ButtonPressMask),	676	const_iv (ButtonPressMask),
…		…
938	RETVAL	810	RETVAL
939		811
940	int	812	int
941	GET_CUSTOM (int rend)	813	GET_CUSTOM (int rend)
942	CODE:	814	CODE:
943	RETVAL = (rend && RS_customMask) >> RS_customShift;	815	RETVAL = (rend & RS_customMask) >> RS_customShift;
944	OUTPUT:	816	OUTPUT:
945	RETVAL	817	RETVAL
946		818
947	int	819	int
948	SET_CUSTOM (int rend, int new_value)	820	SET_CUSTOM (int rend, int new_value)
…		…
1119	CODE:	991	CODE:
1120	{	992	{
1121	wchar_t *wstr = sv2wcs (str);	993	wchar_t *wstr = sv2wcs (str);
1122		994
1123	rxvt_push_locale (THIS->locale);	995	rxvt_push_locale (THIS->locale);
1124	RETVAL = wcswidth (wstr, wcslen (wstr));	996	RETVAL = 0;
		997	for (wchar_t wc = wstr; wc; wc++)
		998	{
		999	int w = WCWIDTH (*wc);
		1000
		1001	if (w)
		1002	RETVAL += max (w, 1);
		1003	}
1125	rxvt_pop_locale ();	1004	rxvt_pop_locale ();
1126		1005
1127	free (wstr);	1006	free (wstr);
1128	}	1007	}
1129	OUTPUT:	1008	OUTPUT:
…		…
1159	rxvt_pop_locale ();	1038	rxvt_pop_locale ();
1160		1039
1161	RETVAL = wcs2sv (wstr);	1040	RETVAL = wcs2sv (wstr);
1162	free (wstr);	1041	free (wstr);
1163	}	1042	}
		1043	OUTPUT:
		1044	RETVAL
		1045
		1046	char *
		1047	rxvt_term::locale ()
		1048	CODE:
		1049	RETVAL = THIS->locale;
1164	OUTPUT:	1050	OUTPUT:
1165	RETVAL	1051	RETVAL
1166		1052
1167	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1053	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1168		1054
…		…
1509	SV *	1395	SV *
1510	rxvt_term::special_decode (SV *text)	1396	rxvt_term::special_decode (SV *text)
1511	CODE:	1397	CODE:
1512	{	1398	{
1513	wchar_t *wstr = sv2wcs (text);	1399	wchar_t *wstr = sv2wcs (text);
1514	int wlen = wcslen (wstr);
1515	int dlen = 0;	1400	int dlen = 0;
1516		1401
1517	// find length	1402	// find length
1518	for (wchar_t s = wstr; s; s++)	1403	for (wchar_t s = wstr; s; s++)
1519	if (*s == NOCHAR)	1404	if (*s == NOCHAR)
…		…
1582		1467
1583	const char *	1468	const char *
1584	rxvt_term::x_resource (const char *name)	1469	rxvt_term::x_resource (const char *name)
1585		1470
1586	bool	1471	bool
1587	rxvt_term::option (U32 optval, int set = -1)	1472	rxvt_term::option (U8 optval, int set = -1)
1588	CODE:	1473	CODE:
1589	{	1474	{
1590	RETVAL = THIS->options & optval;	1475	RETVAL = THIS->option (optval);
1591		1476
1592	if (set >= 0)	1477	if (set >= 0)
1593	{	1478	{
1594	if (set)
1595	THIS->options \|= optval;	1479	THIS->set_option (optval, set);
1596	else
1597	THIS->options &= ~optval;
1598		1480
1599	if (THIS->check_ev.is_active ()) // avoid doing this before START	1481	if (THIS->check_ev.is_active ()) // avoid doing this before START
1600	switch (optval)	1482	switch (optval)
1601	{	1483	{
1602	case Opt_skipBuiltinGlyphs:	1484	case Opt_skipBuiltinGlyphs:
…		…
1790	Atom *props = XListProperties (THIS->dpy, window, &count);	1672	Atom *props = XListProperties (THIS->dpy, window, &count);
1791		1673
1792	EXTEND (SP, count);	1674	EXTEND (SP, count);
1793	while (count--)	1675	while (count--)
1794	PUSHs (newSVuv ((U32)props [count]));	1676	PUSHs (newSVuv ((U32)props [count]));
1795		1677
1796	XFree (props);	1678	XFree (props);
1797	}	1679	}
1798		1680
1799	void	1681	void
1800	rxvt_term::XGetWindowProperty (Window window, Atom property)	1682	rxvt_term::XGetWindowProperty (Window window, Atom property)
…		…
1929	overlay::hide ()	1811	overlay::hide ()
1930		1812
1931	void	1813	void
1932	overlay::DESTROY ()	1814	overlay::DESTROY ()
1933		1815
1934	#############################################################################	1816	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1935	# urxvt::watcher
1936	#############################################################################
1937		1817
1938	MODULE = urxvt PACKAGE = urxvt::watcher
1939
1940	CHAINED
1941	perl_watcher::cb (SV *cb)
1942	CODE:
1943	THIS->cb (cb);
1944	OUTPUT:
1945	RETVAL
1946
1947	#############################################################################
1948	# urxvt::timer
1949	#############################################################################
1950
1951	MODULE = urxvt PACKAGE = urxvt::timer
1952
1953	SV *
1954	timer::new ()
1955	CODE:
1956	timer *w = new timer;
1957	w->start (NOW);
1958	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::timer");
1959	w->self = (HV *)SvRV (RETVAL);
1960	OUTPUT:
1961	RETVAL
1962
1963	NV
1964	timer::at ()
1965	CODE:
1966	RETVAL = THIS->at;
1967	OUTPUT:
1968	RETVAL
1969
1970	CHAINED
1971	timer::interval (NV interval)
1972	CODE:
1973	THIS->interval = interval;
1974	OUTPUT:
1975	RETVAL
1976
1977	CHAINED
1978	timer::set (NV tstamp)
1979	CODE:
1980	THIS->set (tstamp);
1981	OUTPUT:
1982	RETVAL
1983
1984	CHAINED
1985	timer::start (NV tstamp = THIS->at)
1986	CODE:
1987	THIS->start (tstamp);
1988	OUTPUT:
1989	RETVAL
1990
1991	CHAINED
1992	timer::after (NV delay)
1993	CODE:
1994	THIS->start (NOW + delay);
1995	OUTPUT:
1996	RETVAL
1997
1998	CHAINED
1999	timer::stop ()
2000	CODE:
2001	THIS->stop ();
2002	OUTPUT:
2003	RETVAL
2004
2005	void
2006	timer::DESTROY ()
2007
2008	#############################################################################
2009	# urxvt::iow
2010	#############################################################################
2011
2012	MODULE = urxvt PACKAGE = urxvt::iow
2013
2014	SV *
2015	iow::new ()
2016	CODE:
2017	iow *w = new iow;
2018	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iow");
2019	w->self = (HV *)SvRV (RETVAL);
2020	OUTPUT:
2021	RETVAL
2022
2023	CHAINED
2024	iow::fd (int fd)
2025	CODE:
2026	THIS->fd = fd;
2027	OUTPUT:
2028	RETVAL
2029
2030	CHAINED
2031	iow::events (short events)
2032	CODE:
2033	THIS->events = events;
2034	OUTPUT:
2035	RETVAL
2036
2037	CHAINED
2038	iow::start ()
2039	CODE:
2040	THIS->start ();
2041	OUTPUT:
2042	RETVAL
2043
2044	CHAINED
2045	iow::stop ()
2046	CODE:
2047	THIS->stop ();
2048	OUTPUT:
2049	RETVAL
2050
2051	void
2052	iow::DESTROY ()
2053
2054	#############################################################################
2055	# urxvt::iw
2056	#############################################################################
2057
2058	MODULE = urxvt PACKAGE = urxvt::iw
2059
2060	SV *
2061	iw::new ()
2062	CODE:
2063	iw *w = new iw;
2064	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iw");
2065	w->self = (HV *)SvRV (RETVAL);
2066	OUTPUT:
2067	RETVAL
2068
2069	CHAINED
2070	iw::start ()
2071	CODE:
2072	THIS->start ();
2073	OUTPUT:
2074	RETVAL
2075
2076	CHAINED
2077	iw::stop ()
2078	CODE:
2079	THIS->stop ();
2080	OUTPUT:
2081	RETVAL
2082
2083	void
2084	iw::DESTROY ()
2085
2086	#############################################################################
2087	# urxvt::pw
2088	#############################################################################
2089
2090	MODULE = urxvt PACKAGE = urxvt::pw
2091
2092	SV *
2093	pw::new ()
2094	CODE:
2095	pw *w = new pw;
2096	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::pw");
2097	w->self = (HV *)SvRV (RETVAL);
2098	OUTPUT:
2099	RETVAL
2100
2101	CHAINED
2102	pw::start (int pid)
2103	CODE:
2104	THIS->start (pid);
2105	OUTPUT:
2106	RETVAL
2107
2108	CHAINED
2109	pw::stop ()
2110	CODE:
2111	THIS->stop ();
2112	OUTPUT:
2113	RETVAL
2114
2115	void
2116	pw::DESTROY ()
2117
2118

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.102 by root, Thu Jul 6 23:48:11 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.102 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.115 by ayin, Wed Oct 31 09:55:24 2007 UTC