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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.99 by root, Sat Feb 11 02:28:19 2006 UTC vs.
Revision 1.111 by root, Thu Dec 14 17:33:53 2006 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	{
…		…
114	return (long)mg->mg_ptr;	112	return (long)mg->mg_ptr;
115	}	113	}
116		114
117	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)	115	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
118	#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")	116	#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		117
244	/////////////////////////////////////////////////////////////////////////////	118	/////////////////////////////////////////////////////////////////////////////
245		119
246	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")	120	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
247		121
…		…
268	};	142	};
269		143
270	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)	144	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)	145	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
272	{	146	{
		147	if (w < 0) w = 0;
		148	if (h < 0) h = 0;
		149
273	if (border == 2)	150	if (border == 2)
274	{	151	{
275	w += 2;	152	w += 2;
276	h += 2;	153	h += 2;
277	}	154	}
…		…
355		232
356	int i;	233	int i;
357		234
358	for (i = AvFILL (overlay_av); i >= 0; i--)	235	for (i = AvFILL (overlay_av); i >= 0; i--)
359	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)	236	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
360	{
361	av_delete (overlay_av, i, G_DISCARD);
362	break;	237	break;
363	}
364		238
365	for (; i < AvFILL (overlay_av); i++)	239	for (; i < AvFILL (overlay_av); i++)
366	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));	240	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
367		241
368	av_pop (overlay_av);	242	av_pop (overlay_av);
…		…
425	}	299	}
426		300
427	THIS->want_refresh = 1;	301	THIS->want_refresh = 1;
428	}	302	}
429		303
		304	/////////////////////////////////////////////////////////////////////////////
		305
		306	#define IOM_CLASS "urxvt"
		307	#include <iom_perl.h>
430		308
431	/////////////////////////////////////////////////////////////////////////////	309	/////////////////////////////////////////////////////////////////////////////
432		310
433	struct rxvt_perl_interp rxvt_perl;	311	struct rxvt_perl_interp rxvt_perl;
434		312
…		…
791	const_iv (Button3Mask),	669	const_iv (Button3Mask),
792	const_iv (Button4Mask),	670	const_iv (Button4Mask),
793	const_iv (Button5Mask),	671	const_iv (Button5Mask),
794	const_iv (AnyModifier),	672	const_iv (AnyModifier),
795		673
796	const_iv (EVENT_NONE),	674	const_iv (NoSymbol),
797	const_iv (EVENT_READ),	675	const_iv (GrabModeSync),
798	const_iv (EVENT_WRITE),	676	const_iv (GrabModeAsync),
799		677
800	const_iv (NoEventMask),	678	const_iv (NoEventMask),
801	const_iv (KeyPressMask),	679	const_iv (KeyPressMask),
802	const_iv (KeyReleaseMask),	680	const_iv (KeyReleaseMask),
803	const_iv (ButtonPressMask),	681	const_iv (ButtonPressMask),
…		…
937	RETVAL	815	RETVAL
938		816
939	int	817	int
940	GET_CUSTOM (int rend)	818	GET_CUSTOM (int rend)
941	CODE:	819	CODE:
942	RETVAL = (rend && RS_customMask) >> RS_customShift;	820	RETVAL = (rend & RS_customMask) >> RS_customShift;
943	OUTPUT:	821	OUTPUT:
944	RETVAL	822	RETVAL
945		823
946	int	824	int
947	SET_CUSTOM (int rend, int new_value)	825	SET_CUSTOM (int rend, int new_value)
…		…
1015	void	893	void
1016	rxvt_term::set_should_invoke (int htype, int inc)	894	rxvt_term::set_should_invoke (int htype, int inc)
1017	CODE:	895	CODE:
1018	THIS->perl.should_invoke [htype] += inc;	896	THIS->perl.should_invoke [htype] += inc;
1019		897
1020	void	898	int
1021	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	899	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1022	CODE:	900	CODE:
1023	XGrabButton (THIS->dpy, button, modifiers, window, 1,	901	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1024	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	902	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
1025	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);	903	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
		904	OUTPUT: RETVAL
1026		905
1027	void	906	int
1028	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)	907	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029	CODE:	908	CODE:
1030	XUngrabButton (THIS->dpy, button, modifiers, window);	909	RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
		910	OUTPUT: RETVAL
1031		911
1032	#if 0
1033
1034	void	912	void
1035	XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	913	rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1036	C_ARGS:	914	int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1037	THIS->dpy, keycode, modifiers, window, 1,	915	CODE:
1038	GrabModeSync, GrabModeSync	916	XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1039		917
1040	void	918	void
1041	XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	919	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
		920	CODE:
1042	C_ARGS: THIS->dpy, keycode, modifiers, window	921	XUngrabKey (THIS->dpy, keycode, modifiers, window);
1043		922
1044	#endif	923	void
		924	rxvt_term::XUngrabKeyboard (Time eventtime)
		925	CODE:
		926	XUngrabKeyboard (THIS->dpy, eventtime);
1045		927
1046	bool	928	bool
1047	rxvt_term::grab (Time eventtime, int sync = 0)	929	rxvt_term::grab (Time eventtime, int sync = 0)
1048	CODE:	930	CODE:
1049	{	931	{
…		…
1084	rxvt_term::ungrab ()	966	rxvt_term::ungrab ()
1085	CODE:	967	CODE:
1086	ungrab (THIS);	968	ungrab (THIS);
1087		969
1088	int	970	int
		971	rxvt_term::XStringToKeysym (char *string)
		972	CODE:
		973	RETVAL = XStringToKeysym (string);
		974	OUTPUT: RETVAL
		975
		976	char *
		977	rxvt_term::XKeysymToString (int sym)
		978	CODE:
		979	RETVAL = XKeysymToString (sym);
		980	OUTPUT: RETVAL
		981
		982	int
		983	rxvt_term::XKeysymToKeycode (int sym)
		984	CODE:
		985	RETVAL = XKeysymToKeycode (THIS->dpy, sym);
		986	OUTPUT: RETVAL
		987
		988	int
		989	rxvt_term::XKeycodeToKeysym (int code, int index)
		990	CODE:
		991	RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
		992	OUTPUT: RETVAL
		993
		994	int
1089	rxvt_term::strwidth (SV *str)	995	rxvt_term::strwidth (SV *str)
1090	CODE:	996	CODE:
1091	{	997	{
1092	wchar_t *wstr = sv2wcs (str);	998	wchar_t *wstr = sv2wcs (str);
1093		999
1094	rxvt_push_locale (THIS->locale);	1000	rxvt_push_locale (THIS->locale);
1095	RETVAL = wcswidth (wstr, wcslen (wstr));	1001	RETVAL = 0;
		1002	for (wchar_t wc = wstr; wc; wc++)
		1003	{
		1004	int w = WCWIDTH (*wc);
		1005
		1006	if (w)
		1007	RETVAL += max (w, 1);
		1008	}
1096	rxvt_pop_locale ();	1009	rxvt_pop_locale ();
1097		1010
1098	free (wstr);	1011	free (wstr);
1099	}	1012	}
1100	OUTPUT:	1013	OUTPUT:
…		…
1130	rxvt_pop_locale ();	1043	rxvt_pop_locale ();
1131		1044
1132	RETVAL = wcs2sv (wstr);	1045	RETVAL = wcs2sv (wstr);
1133	free (wstr);	1046	free (wstr);
1134	}	1047	}
		1048	OUTPUT:
		1049	RETVAL
		1050
		1051	char *
		1052	rxvt_term::locale ()
		1053	CODE:
		1054	RETVAL = THIS->locale;
1135	OUTPUT:	1055	OUTPUT:
1136	RETVAL	1056	RETVAL
1137		1057
1138	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1058	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1139		1059
…		…
1209	}	1129	}
1210	OUTPUT:	1130	OUTPUT:
1211	RETVAL	1131	RETVAL
1212		1132
1213	SV *	1133	SV *
1214	rxvt_term::_env ()	1134	rxvt_term::envv ()
		1135	ALIAS:
		1136	argv = 1
1215	CODE:	1137	PPCODE:
1216	{	1138	{
1217	if (THIS->envv)	1139	stringvec *vec = ix ? THIS->argv : THIS->envv;
1218	{
1219	AV *av = newAV ();
1220		1140
		1141	EXTEND (SP, vec->size ());
		1142
1221	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)	1143	for (char **i = vec->begin (); i != vec->end (); ++i)
1222	if (*i)	1144	if (*i)
1223	av_push (av, newSVpv (*i, 0));	1145	PUSHs (sv_2mortal (newSVpv (*i, 0)));
1224
1225	RETVAL = newRV_noinc ((SV *)av);
1226	}
1227	else
1228	RETVAL = &PL_sv_undef;
1229	}	1146	}
1230	OUTPUT:
1231	RETVAL
1232		1147
1233	int	1148	int
1234	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)	1149	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1235	CODE:	1150	CODE:
1236	RETVAL = THIS->pty_ev.events;	1151	RETVAL = THIS->pty_ev.events;
…		…
1905	overlay::hide ()	1820	overlay::hide ()
1906		1821
1907	void	1822	void
1908	overlay::DESTROY ()	1823	overlay::DESTROY ()
1909		1824
1910	#############################################################################	1825	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1911	# urxvt::watcher
1912	#############################################################################
1913		1826
1914	MODULE = urxvt PACKAGE = urxvt::watcher
1915
1916	CHAINED
1917	perl_watcher::cb (SV *cb)
1918	CODE:
1919	THIS->cb (cb);
1920	OUTPUT:
1921	RETVAL
1922
1923	#############################################################################
1924	# urxvt::timer
1925	#############################################################################
1926
1927	MODULE = urxvt PACKAGE = urxvt::timer
1928
1929	SV *
1930	timer::new ()
1931	CODE:
1932	timer *w = new timer;
1933	w->start (NOW);
1934	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::timer");
1935	w->self = (HV *)SvRV (RETVAL);
1936	OUTPUT:
1937	RETVAL
1938
1939	NV
1940	timer::at ()
1941	CODE:
1942	RETVAL = THIS->at;
1943	OUTPUT:
1944	RETVAL
1945
1946	CHAINED
1947	timer::interval (NV interval)
1948	CODE:
1949	THIS->interval = interval;
1950	OUTPUT:
1951	RETVAL
1952
1953	CHAINED
1954	timer::set (NV tstamp)
1955	CODE:
1956	THIS->set (tstamp);
1957	OUTPUT:
1958	RETVAL
1959
1960	CHAINED
1961	timer::start (NV tstamp = THIS->at)
1962	CODE:
1963	THIS->start (tstamp);
1964	OUTPUT:
1965	RETVAL
1966
1967	CHAINED
1968	timer::after (NV delay)
1969	CODE:
1970	THIS->start (NOW + delay);
1971	OUTPUT:
1972	RETVAL
1973
1974	CHAINED
1975	timer::stop ()
1976	CODE:
1977	THIS->stop ();
1978	OUTPUT:
1979	RETVAL
1980
1981	void
1982	timer::DESTROY ()
1983
1984	#############################################################################
1985	# urxvt::iow
1986	#############################################################################
1987
1988	MODULE = urxvt PACKAGE = urxvt::iow
1989
1990	SV *
1991	iow::new ()
1992	CODE:
1993	iow *w = new iow;
1994	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iow");
1995	w->self = (HV *)SvRV (RETVAL);
1996	OUTPUT:
1997	RETVAL
1998
1999	CHAINED
2000	iow::fd (int fd)
2001	CODE:
2002	THIS->fd = fd;
2003	OUTPUT:
2004	RETVAL
2005
2006	CHAINED
2007	iow::events (short events)
2008	CODE:
2009	THIS->events = events;
2010	OUTPUT:
2011	RETVAL
2012
2013	CHAINED
2014	iow::start ()
2015	CODE:
2016	THIS->start ();
2017	OUTPUT:
2018	RETVAL
2019
2020	CHAINED
2021	iow::stop ()
2022	CODE:
2023	THIS->stop ();
2024	OUTPUT:
2025	RETVAL
2026
2027	void
2028	iow::DESTROY ()
2029
2030	#############################################################################
2031	# urxvt::iw
2032	#############################################################################
2033
2034	MODULE = urxvt PACKAGE = urxvt::iw
2035
2036	SV *
2037	iw::new ()
2038	CODE:
2039	iw *w = new iw;
2040	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iw");
2041	w->self = (HV *)SvRV (RETVAL);
2042	OUTPUT:
2043	RETVAL
2044
2045	CHAINED
2046	iw::start ()
2047	CODE:
2048	THIS->start ();
2049	OUTPUT:
2050	RETVAL
2051
2052	CHAINED
2053	iw::stop ()
2054	CODE:
2055	THIS->stop ();
2056	OUTPUT:
2057	RETVAL
2058
2059	void
2060	iw::DESTROY ()
2061
2062	#############################################################################
2063	# urxvt::pw
2064	#############################################################################
2065
2066	MODULE = urxvt PACKAGE = urxvt::pw
2067
2068	SV *
2069	pw::new ()
2070	CODE:
2071	pw *w = new pw;
2072	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::pw");
2073	w->self = (HV *)SvRV (RETVAL);
2074	OUTPUT:
2075	RETVAL
2076
2077	CHAINED
2078	pw::start (int pid)
2079	CODE:
2080	THIS->start (pid);
2081	OUTPUT:
2082	RETVAL
2083
2084	CHAINED
2085	pw::stop ()
2086	CODE:
2087	THIS->stop ();
2088	OUTPUT:
2089	RETVAL
2090
2091	void
2092	pw::DESTROY ()
2093
2094

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.99 by root, Sat Feb 11 02:28:19 2006 UTC vs. Revision 1.111 by root, Thu Dec 14 17:33:53 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.99 by root, Sat Feb 11 02:28:19 2006 UTC vs.
Revision 1.111 by root, Thu Dec 14 17:33:53 2006 UTC