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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.98 by root, Mon Feb 6 05:40:15 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;
…		…
268	};	144	};
269		145
270	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)	146	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)	147	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
272	{	148	{
		149	if (w < 0) w = 0;
		150	if (h < 0) h = 0;
		151
273	if (border == 2)	152	if (border == 2)
274	{	153	{
275	w += 2;	154	w += 2;
276	h += 2;	155	h += 2;
277	}	156	}
…		…
355		234
356	int i;	235	int i;
357		236
358	for (i = AvFILL (overlay_av); i >= 0; i--)	237	for (i = AvFILL (overlay_av); i >= 0; i--)
359	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)	238	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
360	{
361	av_delete (overlay_av, i, G_DISCARD);
362	break;	239	break;
363	}
364		240
365	for (; i < AvFILL (overlay_av); i++)	241	for (; i < AvFILL (overlay_av); i++)
366	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));	242	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
367		243
368	av_pop (overlay_av);	244	av_pop (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
…		…
790	const_iv (Button2Mask),	670	const_iv (Button2Mask),
791	const_iv (Button3Mask),	671	const_iv (Button3Mask),
792	const_iv (Button4Mask),	672	const_iv (Button4Mask),
793	const_iv (Button5Mask),	673	const_iv (Button5Mask),
794	const_iv (AnyModifier),	674	const_iv (AnyModifier),
		675
		676	const_iv (NoSymbol),
		677	const_iv (GrabModeSync),
		678	const_iv (GrabModeAsync),
795		679
796	const_iv (EVENT_NONE),	680	const_iv (EVENT_NONE),
797	const_iv (EVENT_READ),	681	const_iv (EVENT_READ),
798	const_iv (EVENT_WRITE),	682	const_iv (EVENT_WRITE),
799		683
…		…
937	RETVAL	821	RETVAL
938		822
939	int	823	int
940	GET_CUSTOM (int rend)	824	GET_CUSTOM (int rend)
941	CODE:	825	CODE:
942	RETVAL = (rend && RS_customMask) >> RS_customShift;	826	RETVAL = (rend & RS_customMask) >> RS_customShift;
943	OUTPUT:	827	OUTPUT:
944	RETVAL	828	RETVAL
945		829
946	int	830	int
947	SET_CUSTOM (int rend, int new_value)	831	SET_CUSTOM (int rend, int new_value)
…		…
1015	void	899	void
1016	rxvt_term::set_should_invoke (int htype, int inc)	900	rxvt_term::set_should_invoke (int htype, int inc)
1017	CODE:	901	CODE:
1018	THIS->perl.should_invoke [htype] += inc;	902	THIS->perl.should_invoke [htype] += inc;
1019		903
1020	void	904	int
1021	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	905	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1022	CODE:	906	CODE:
1023	XGrabButton (THIS->dpy, button, modifiers, window, 1,	907	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1024	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	908	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
1025	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);	909	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
		910	OUTPUT: RETVAL
1026		911
1027	void	912	int
1028	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)	913	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029	CODE:	914	CODE:
1030	XUngrabButton (THIS->dpy, button, modifiers, window);	915	RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
		916	OUTPUT: RETVAL
1031		917
1032	#if 0
1033
1034	void	918	void
1035	XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	919	rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1036	C_ARGS:	920	int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1037	THIS->dpy, keycode, modifiers, window, 1,	921	CODE:
1038	GrabModeSync, GrabModeSync	922	XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1039		923
1040	void	924	void
1041	XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	925	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
		926	CODE:
1042	C_ARGS: THIS->dpy, keycode, modifiers, window	927	XUngrabKey (THIS->dpy, keycode, modifiers, window);
1043		928
1044	#endif	929	void
		930	rxvt_term::XUngrabKeyboard (Time eventtime)
		931	CODE:
		932	XUngrabKeyboard (THIS->dpy, eventtime);
1045		933
1046	bool	934	bool
1047	rxvt_term::grab (Time eventtime, int sync = 0)	935	rxvt_term::grab (Time eventtime, int sync = 0)
1048	CODE:	936	CODE:
1049	{	937	{
…		…
1084	rxvt_term::ungrab ()	972	rxvt_term::ungrab ()
1085	CODE:	973	CODE:
1086	ungrab (THIS);	974	ungrab (THIS);
1087		975
1088	int	976	int
		977	rxvt_term::XStringToKeysym (char *string)
		978	CODE:
		979	RETVAL = XStringToKeysym (string);
		980	OUTPUT: RETVAL
		981
		982	char *
		983	rxvt_term::XKeysymToString (int sym)
		984	CODE:
		985	RETVAL = XKeysymToString (sym);
		986	OUTPUT: RETVAL
		987
		988	int
		989	rxvt_term::XKeysymToKeycode (int sym)
		990	CODE:
		991	RETVAL = XKeysymToKeycode (THIS->dpy, sym);
		992	OUTPUT: RETVAL
		993
		994	int
		995	rxvt_term::XKeycodeToKeysym (int code, int index)
		996	CODE:
		997	RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
		998	OUTPUT: RETVAL
		999
		1000	int
1089	rxvt_term::strwidth (SV *str)	1001	rxvt_term::strwidth (SV *str)
1090	CODE:	1002	CODE:
1091	{	1003	{
1092	wchar_t *wstr = sv2wcs (str);	1004	wchar_t *wstr = sv2wcs (str);
1093		1005
1094	rxvt_push_locale (THIS->locale);	1006	rxvt_push_locale (THIS->locale);
1095	RETVAL = wcswidth (wstr, wcslen (wstr));	1007	RETVAL = 0;
		1008	for (wchar_t wc = wstr; wc; wc++)
		1009	{
		1010	int w = WCWIDTH (*wc);
		1011
		1012	if (w)
		1013	RETVAL += max (w, 1);
		1014	}
1096	rxvt_pop_locale ();	1015	rxvt_pop_locale ();
1097		1016
1098	free (wstr);	1017	free (wstr);
1099	}	1018	}
1100	OUTPUT:	1019	OUTPUT:
…		…
1130	rxvt_pop_locale ();	1049	rxvt_pop_locale ();
1131		1050
1132	RETVAL = wcs2sv (wstr);	1051	RETVAL = wcs2sv (wstr);
1133	free (wstr);	1052	free (wstr);
1134	}	1053	}
		1054	OUTPUT:
		1055	RETVAL
		1056
		1057	char *
		1058	rxvt_term::locale ()
		1059	CODE:
		1060	RETVAL = THIS->locale;
1135	OUTPUT:	1061	OUTPUT:
1136	RETVAL	1062	RETVAL
1137		1063
1138	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1064	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1139		1065
…		…
1209	}	1135	}
1210	OUTPUT:	1136	OUTPUT:
1211	RETVAL	1137	RETVAL
1212		1138
1213	SV *	1139	SV *
1214	rxvt_term::_env ()	1140	rxvt_term::envv ()
		1141	ALIAS:
		1142	argv = 1
1215	CODE:	1143	PPCODE:
1216	{	1144	{
1217	if (THIS->envv)	1145	stringvec *vec = ix ? THIS->argv : THIS->envv;
1218	{
1219	AV *av = newAV ();
1220		1146
		1147	EXTEND (SP, vec->size ());
		1148
1221	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)	1149	for (char **i = vec->begin (); i != vec->end (); ++i)
1222	if (*i)	1150	if (*i)
1223	av_push (av, newSVpv (*i, 0));	1151	PUSHs (sv_2mortal (newSVpv (*i, 0)));
1224
1225	RETVAL = newRV_noinc ((SV *)av);
1226	}
1227	else
1228	RETVAL = &PL_sv_undef;
1229	}	1152	}
1230	OUTPUT:
1231	RETVAL
1232		1153
1233	int	1154	int
1234	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)	1155	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1235	CODE:	1156	CODE:
1236	RETVAL = THIS->pty_ev.events;	1157	RETVAL = THIS->pty_ev.events;
…		…
1812	: 1;	1733	: 1;
1813		1734
1814	XChangeProperty (THIS->dpy, window, property,	1735	XChangeProperty (THIS->dpy, window, property,
1815	type, format, PropModeReplace,	1736	type, format, PropModeReplace,
1816	(unsigned char *)data_, len / elemsize);	1737	(unsigned char *)data_, len / elemsize);
1817	XSync (THIS->dpy, 0);
1818	}	1738	}
1819		1739
1820	Atom	1740	Atom
1821	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1741	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)
1822	C_ARGS: term->dpy, atom_name, only_if_exists	1742	C_ARGS: term->dpy, atom_name, only_if_exists
…		…
1906	overlay::hide ()	1826	overlay::hide ()
1907		1827
1908	void	1828	void
1909	overlay::DESTROY ()	1829	overlay::DESTROY ()
1910		1830
1911	#############################################################################	1831	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1912	# urxvt::watcher
1913	#############################################################################
1914		1832
1915	MODULE = urxvt PACKAGE = urxvt::watcher
1916
1917	CHAINED
1918	perl_watcher::cb (SV *cb)
1919	CODE:
1920	THIS->cb (cb);
1921	OUTPUT:
1922	RETVAL
1923
1924	#############################################################################
1925	# urxvt::timer
1926	#############################################################################
1927
1928	MODULE = urxvt PACKAGE = urxvt::timer
1929
1930	SV *
1931	timer::new ()
1932	CODE:
1933	timer *w = new timer;
1934	w->start (NOW);
1935	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::timer");
1936	w->self = (HV *)SvRV (RETVAL);
1937	OUTPUT:
1938	RETVAL
1939
1940	NV
1941	timer::at ()
1942	CODE:
1943	RETVAL = THIS->at;
1944	OUTPUT:
1945	RETVAL
1946
1947	CHAINED
1948	timer::interval (NV interval)
1949	CODE:
1950	THIS->interval = interval;
1951	OUTPUT:
1952	RETVAL
1953
1954	CHAINED
1955	timer::set (NV tstamp)
1956	CODE:
1957	THIS->set (tstamp);
1958	OUTPUT:
1959	RETVAL
1960
1961	CHAINED
1962	timer::start (NV tstamp = THIS->at)
1963	CODE:
1964	THIS->start (tstamp);
1965	OUTPUT:
1966	RETVAL
1967
1968	CHAINED
1969	timer::after (NV delay)
1970	CODE:
1971	THIS->start (NOW + delay);
1972	OUTPUT:
1973	RETVAL
1974
1975	CHAINED
1976	timer::stop ()
1977	CODE:
1978	THIS->stop ();
1979	OUTPUT:
1980	RETVAL
1981
1982	void
1983	timer::DESTROY ()
1984
1985	#############################################################################
1986	# urxvt::iow
1987	#############################################################################
1988
1989	MODULE = urxvt PACKAGE = urxvt::iow
1990
1991	SV *
1992	iow::new ()
1993	CODE:
1994	iow *w = new iow;
1995	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iow");
1996	w->self = (HV *)SvRV (RETVAL);
1997	OUTPUT:
1998	RETVAL
1999
2000	CHAINED
2001	iow::fd (int fd)
2002	CODE:
2003	THIS->fd = fd;
2004	OUTPUT:
2005	RETVAL
2006
2007	CHAINED
2008	iow::events (short events)
2009	CODE:
2010	THIS->events = events;
2011	OUTPUT:
2012	RETVAL
2013
2014	CHAINED
2015	iow::start ()
2016	CODE:
2017	THIS->start ();
2018	OUTPUT:
2019	RETVAL
2020
2021	CHAINED
2022	iow::stop ()
2023	CODE:
2024	THIS->stop ();
2025	OUTPUT:
2026	RETVAL
2027
2028	void
2029	iow::DESTROY ()
2030
2031	#############################################################################
2032	# urxvt::iw
2033	#############################################################################
2034
2035	MODULE = urxvt PACKAGE = urxvt::iw
2036
2037	SV *
2038	iw::new ()
2039	CODE:
2040	iw *w = new iw;
2041	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iw");
2042	w->self = (HV *)SvRV (RETVAL);
2043	OUTPUT:
2044	RETVAL
2045
2046	CHAINED
2047	iw::start ()
2048	CODE:
2049	THIS->start ();
2050	OUTPUT:
2051	RETVAL
2052
2053	CHAINED
2054	iw::stop ()
2055	CODE:
2056	THIS->stop ();
2057	OUTPUT:
2058	RETVAL
2059
2060	void
2061	iw::DESTROY ()
2062
2063	#############################################################################
2064	# urxvt::pw
2065	#############################################################################
2066
2067	MODULE = urxvt PACKAGE = urxvt::pw
2068
2069	SV *
2070	pw::new ()
2071	CODE:
2072	pw *w = new pw;
2073	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::pw");
2074	w->self = (HV *)SvRV (RETVAL);
2075	OUTPUT:
2076	RETVAL
2077
2078	CHAINED
2079	pw::start (int pid)
2080	CODE:
2081	THIS->start (pid);
2082	OUTPUT:
2083	RETVAL
2084
2085	CHAINED
2086	pw::stop ()
2087	CODE:
2088	THIS->stop ();
2089	OUTPUT:
2090	RETVAL
2091
2092	void
2093	pw::DESTROY ()
2094
2095

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.98 by root, Mon Feb 6 05:40:15 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.98 by root, Mon Feb 6 05:40:15 2006 UTC vs.
Revision 1.109 by root, Thu Dec 14 15:19:31 2006 UTC