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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.97 by root, Sat Feb 4 16:12:48 2006 UTC vs.
Revision 1.110 by root, Thu Dec 14 17:22:04 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
…		…
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),
795		675
796	const_iv (EVENT_NONE),	676	const_iv (NoSymbol),
797	const_iv (EVENT_READ),	677	const_iv (GrabModeSync),
798	const_iv (EVENT_WRITE),	678	const_iv (GrabModeAsync),
799		679
800	const_iv (NoEventMask),	680	const_iv (NoEventMask),
801	const_iv (KeyPressMask),	681	const_iv (KeyPressMask),
802	const_iv (KeyReleaseMask),	682	const_iv (KeyReleaseMask),
803	const_iv (ButtonPressMask),	683	const_iv (ButtonPressMask),
…		…
923	RETVAL	803	RETVAL
924		804
925	int	805	int
926	SET_FGCOLOR (int rend, int new_color)	806	SET_FGCOLOR (int rend, int new_color)
927	CODE:	807	CODE:
928	RETVAL = SET_FGCOLOR (rend, new_color);	808	RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
929	OUTPUT:	809	OUTPUT:
930	RETVAL	810	RETVAL
931		811
932	int	812	int
933	SET_BGCOLOR (int rend, int new_color)	813	SET_BGCOLOR (int rend, int new_color)
934	CODE:	814	CODE:
935	RETVAL = SET_BGCOLOR (rend, new_color);	815	RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
936	OUTPUT:	816	OUTPUT:
937	RETVAL	817	RETVAL
938		818
939	int	819	int
940	GET_CUSTOM (int rend)	820	GET_CUSTOM (int rend)
941	CODE:	821	CODE:
942	RETVAL = (rend && RS_customMask) >> RS_customShift;	822	RETVAL = (rend & RS_customMask) >> RS_customShift;
943	OUTPUT:	823	OUTPUT:
944	RETVAL	824	RETVAL
945		825
946	int	826	int
947	SET_CUSTOM (int rend, int new_value)	827	SET_CUSTOM (int rend, int new_value)
…		…
1015	void	895	void
1016	rxvt_term::set_should_invoke (int htype, int inc)	896	rxvt_term::set_should_invoke (int htype, int inc)
1017	CODE:	897	CODE:
1018	THIS->perl.should_invoke [htype] += inc;	898	THIS->perl.should_invoke [htype] += inc;
1019		899
1020	void	900	int
1021	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	901	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1022	CODE:	902	CODE:
1023	XGrabButton (THIS->dpy, button, modifiers, window, 1,	903	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1024	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	904	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
1025	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);	905	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
		906	OUTPUT: RETVAL
1026		907
1027	void	908	int
1028	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)	909	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029	CODE:	910	CODE:
1030	XUngrabButton (THIS->dpy, button, modifiers, window);	911	RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
		912	OUTPUT: RETVAL
1031		913
1032	#if 0
1033
1034	void	914	void
1035	XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	915	rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1036	C_ARGS:	916	int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1037	THIS->dpy, keycode, modifiers, window, 1,	917	CODE:
1038	GrabModeSync, GrabModeSync	918	XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1039		919
1040	void	920	void
1041	XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	921	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
		922	CODE:
1042	C_ARGS: THIS->dpy, keycode, modifiers, window	923	XUngrabKey (THIS->dpy, keycode, modifiers, window);
1043		924
1044	#endif	925	void
		926	rxvt_term::XUngrabKeyboard (Time eventtime)
		927	CODE:
		928	XUngrabKeyboard (THIS->dpy, eventtime);
1045		929
1046	bool	930	bool
1047	rxvt_term::grab (Time eventtime, int sync = 0)	931	rxvt_term::grab (Time eventtime, int sync = 0)
1048	CODE:	932	CODE:
1049	{	933	{
…		…
1084	rxvt_term::ungrab ()	968	rxvt_term::ungrab ()
1085	CODE:	969	CODE:
1086	ungrab (THIS);	970	ungrab (THIS);
1087		971
1088	int	972	int
		973	rxvt_term::XStringToKeysym (char *string)
		974	CODE:
		975	RETVAL = XStringToKeysym (string);
		976	OUTPUT: RETVAL
		977
		978	char *
		979	rxvt_term::XKeysymToString (int sym)
		980	CODE:
		981	RETVAL = XKeysymToString (sym);
		982	OUTPUT: RETVAL
		983
		984	int
		985	rxvt_term::XKeysymToKeycode (int sym)
		986	CODE:
		987	RETVAL = XKeysymToKeycode (THIS->dpy, sym);
		988	OUTPUT: RETVAL
		989
		990	int
		991	rxvt_term::XKeycodeToKeysym (int code, int index)
		992	CODE:
		993	RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
		994	OUTPUT: RETVAL
		995
		996	int
1089	rxvt_term::strwidth (SV *str)	997	rxvt_term::strwidth (SV *str)
1090	CODE:	998	CODE:
1091	{	999	{
1092	wchar_t *wstr = sv2wcs (str);	1000	wchar_t *wstr = sv2wcs (str);
1093		1001
1094	rxvt_push_locale (THIS->locale);	1002	rxvt_push_locale (THIS->locale);
1095	RETVAL = wcswidth (wstr, wcslen (wstr));	1003	RETVAL = 0;
		1004	for (wchar_t wc = wstr; wc; wc++)
		1005	{
		1006	int w = WCWIDTH (*wc);
		1007
		1008	if (w)
		1009	RETVAL += max (w, 1);
		1010	}
1096	rxvt_pop_locale ();	1011	rxvt_pop_locale ();
1097		1012
1098	free (wstr);	1013	free (wstr);
1099	}	1014	}
1100	OUTPUT:	1015	OUTPUT:
…		…
1130	rxvt_pop_locale ();	1045	rxvt_pop_locale ();
1131		1046
1132	RETVAL = wcs2sv (wstr);	1047	RETVAL = wcs2sv (wstr);
1133	free (wstr);	1048	free (wstr);
1134	}	1049	}
		1050	OUTPUT:
		1051	RETVAL
		1052
		1053	char *
		1054	rxvt_term::locale ()
		1055	CODE:
		1056	RETVAL = THIS->locale;
1135	OUTPUT:	1057	OUTPUT:
1136	RETVAL	1058	RETVAL
1137		1059
1138	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1060	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1139		1061
…		…
1209	}	1131	}
1210	OUTPUT:	1132	OUTPUT:
1211	RETVAL	1133	RETVAL
1212		1134
1213	SV *	1135	SV *
1214	rxvt_term::_env ()	1136	rxvt_term::envv ()
		1137	ALIAS:
		1138	argv = 1
1215	CODE:	1139	PPCODE:
1216	{	1140	{
1217	if (THIS->envv)	1141	stringvec *vec = ix ? THIS->argv : THIS->envv;
1218	{
1219	AV *av = newAV ();
1220		1142
		1143	EXTEND (SP, vec->size ());
		1144
1221	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)	1145	for (char **i = vec->begin (); i != vec->end (); ++i)
1222	if (*i)	1146	if (*i)
1223	av_push (av, newSVpv (*i, 0));	1147	PUSHs (sv_2mortal (newSVpv (*i, 0)));
1224
1225	RETVAL = newRV_noinc ((SV *)av);
1226	}
1227	else
1228	RETVAL = &PL_sv_undef;
1229	}	1148	}
1230	OUTPUT:
1231	RETVAL
1232		1149
1233	int	1150	int
1234	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)	1151	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1235	CODE:	1152	CODE:
1236	RETVAL = THIS->pty_ev.events;	1153	RETVAL = THIS->pty_ev.events;
…		…
1290	void	1207	void
1291	rxvt_term::focus_in ()	1208	rxvt_term::focus_in ()
1292		1209
1293	void	1210	void
1294	rxvt_term::focus_out ()	1211	rxvt_term::focus_out ()
		1212
		1213	void
		1214	rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
		1215	ALIAS:
		1216	key_release = 1
		1217	CODE:
		1218	{
		1219	XKeyEvent xkey;
		1220
		1221	memset (&xkey, 0, sizeof (xkey));
		1222
		1223	xkey.time = time;
		1224	xkey.state = state;
		1225	xkey.keycode = keycode;
		1226
		1227	xkey.type = ix ? KeyRelease : KeyPress;
		1228	xkey.display = THIS->dpy;
		1229	xkey.window = THIS->vt;
		1230	xkey.root = THIS->display->root;
		1231	xkey.subwindow = THIS->vt;
		1232
		1233	if (ix)
		1234	THIS->key_release (xkey);
		1235	else
		1236	THIS->key_press (xkey);
		1237	}
1295		1238
1296	void	1239	void
1297	rxvt_term::want_refresh ()	1240	rxvt_term::want_refresh ()
1298	CODE:	1241	CODE:
1299	THIS->want_refresh = 1;	1242	THIS->want_refresh = 1;
…		…
1786	: 1;	1729	: 1;
1787		1730
1788	XChangeProperty (THIS->dpy, window, property,	1731	XChangeProperty (THIS->dpy, window, property,
1789	type, format, PropModeReplace,	1732	type, format, PropModeReplace,
1790	(unsigned char *)data_, len / elemsize);	1733	(unsigned char *)data_, len / elemsize);
1791	XSync (THIS->dpy, 0);
1792	}	1734	}
1793		1735
1794	Atom	1736	Atom
1795	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1737	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)
1796	C_ARGS: term->dpy, atom_name, only_if_exists	1738	C_ARGS: term->dpy, atom_name, only_if_exists
…		…
1880	overlay::hide ()	1822	overlay::hide ()
1881		1823
1882	void	1824	void
1883	overlay::DESTROY ()	1825	overlay::DESTROY ()
1884		1826
1885	#############################################################################	1827	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1886	# urxvt::watcher
1887	#############################################################################
1888		1828
1889	MODULE = urxvt PACKAGE = urxvt::watcher
1890
1891	CHAINED
1892	perl_watcher::cb (SV *cb)
1893	CODE:
1894	THIS->cb (cb);
1895	OUTPUT:
1896	RETVAL
1897
1898	#############################################################################
1899	# urxvt::timer
1900	#############################################################################
1901
1902	MODULE = urxvt PACKAGE = urxvt::timer
1903
1904	SV *
1905	timer::new ()
1906	CODE:
1907	timer *w = new timer;
1908	w->start (NOW);
1909	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::timer");
1910	w->self = (HV *)SvRV (RETVAL);
1911	OUTPUT:
1912	RETVAL
1913
1914	NV
1915	timer::at ()
1916	CODE:
1917	RETVAL = THIS->at;
1918	OUTPUT:
1919	RETVAL
1920
1921	CHAINED
1922	timer::interval (NV interval)
1923	CODE:
1924	THIS->interval = interval;
1925	OUTPUT:
1926	RETVAL
1927
1928	CHAINED
1929	timer::set (NV tstamp)
1930	CODE:
1931	THIS->set (tstamp);
1932	OUTPUT:
1933	RETVAL
1934
1935	CHAINED
1936	timer::start (NV tstamp = THIS->at)
1937	CODE:
1938	THIS->start (tstamp);
1939	OUTPUT:
1940	RETVAL
1941
1942	CHAINED
1943	timer::after (NV delay)
1944	CODE:
1945	THIS->start (NOW + delay);
1946	OUTPUT:
1947	RETVAL
1948
1949	CHAINED
1950	timer::stop ()
1951	CODE:
1952	THIS->stop ();
1953	OUTPUT:
1954	RETVAL
1955
1956	void
1957	timer::DESTROY ()
1958
1959	#############################################################################
1960	# urxvt::iow
1961	#############################################################################
1962
1963	MODULE = urxvt PACKAGE = urxvt::iow
1964
1965	SV *
1966	iow::new ()
1967	CODE:
1968	iow *w = new iow;
1969	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iow");
1970	w->self = (HV *)SvRV (RETVAL);
1971	OUTPUT:
1972	RETVAL
1973
1974	CHAINED
1975	iow::fd (int fd)
1976	CODE:
1977	THIS->fd = fd;
1978	OUTPUT:
1979	RETVAL
1980
1981	CHAINED
1982	iow::events (short events)
1983	CODE:
1984	THIS->events = events;
1985	OUTPUT:
1986	RETVAL
1987
1988	CHAINED
1989	iow::start ()
1990	CODE:
1991	THIS->start ();
1992	OUTPUT:
1993	RETVAL
1994
1995	CHAINED
1996	iow::stop ()
1997	CODE:
1998	THIS->stop ();
1999	OUTPUT:
2000	RETVAL
2001
2002	void
2003	iow::DESTROY ()
2004
2005	#############################################################################
2006	# urxvt::iw
2007	#############################################################################
2008
2009	MODULE = urxvt PACKAGE = urxvt::iw
2010
2011	SV *
2012	iw::new ()
2013	CODE:
2014	iw *w = new iw;
2015	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iw");
2016	w->self = (HV *)SvRV (RETVAL);
2017	OUTPUT:
2018	RETVAL
2019
2020	CHAINED
2021	iw::start ()
2022	CODE:
2023	THIS->start ();
2024	OUTPUT:
2025	RETVAL
2026
2027	CHAINED
2028	iw::stop ()
2029	CODE:
2030	THIS->stop ();
2031	OUTPUT:
2032	RETVAL
2033
2034	void
2035	iw::DESTROY ()
2036
2037	#############################################################################
2038	# urxvt::pw
2039	#############################################################################
2040
2041	MODULE = urxvt PACKAGE = urxvt::pw
2042
2043	SV *
2044	pw::new ()
2045	CODE:
2046	pw *w = new pw;
2047	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::pw");
2048	w->self = (HV *)SvRV (RETVAL);
2049	OUTPUT:
2050	RETVAL
2051
2052	CHAINED
2053	pw::start (int pid)
2054	CODE:
2055	THIS->start (pid);
2056	OUTPUT:
2057	RETVAL
2058
2059	CHAINED
2060	pw::stop ()
2061	CODE:
2062	THIS->stop ();
2063	OUTPUT:
2064	RETVAL
2065
2066	void
2067	pw::DESTROY ()
2068
2069

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.97 by root, Sat Feb 4 16:12:48 2006 UTC vs. Revision 1.110 by root, Thu Dec 14 17:22:04 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.97 by root, Sat Feb 4 16:12:48 2006 UTC vs.
Revision 1.110 by root, Thu Dec 14 17:22:04 2006 UTC