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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.100 by root, Mon Feb 20 20:44:22 2006 UTC vs.
Revision 1.113 by ayin, Tue May 1 21:10:04 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	{
…		…
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	#define IOM_WARN rxvt_warn
		308	#include <iom_perl.h>
430		309
431	/////////////////////////////////////////////////////////////////////////////	310	/////////////////////////////////////////////////////////////////////////////
432		311
433	struct rxvt_perl_interp rxvt_perl;	312	struct rxvt_perl_interp rxvt_perl;
434		313
…		…
791	const_iv (Button3Mask),	670	const_iv (Button3Mask),
792	const_iv (Button4Mask),	671	const_iv (Button4Mask),
793	const_iv (Button5Mask),	672	const_iv (Button5Mask),
794	const_iv (AnyModifier),	673	const_iv (AnyModifier),
795		674
796	const_iv (EVENT_NONE),	675	const_iv (NoSymbol),
797	const_iv (EVENT_READ),	676	const_iv (GrabModeSync),
798	const_iv (EVENT_WRITE),	677	const_iv (GrabModeAsync),
799		678
800	const_iv (NoEventMask),	679	const_iv (NoEventMask),
801	const_iv (KeyPressMask),	680	const_iv (KeyPressMask),
802	const_iv (KeyReleaseMask),	681	const_iv (KeyReleaseMask),
803	const_iv (ButtonPressMask),	682	const_iv (ButtonPressMask),
…		…
937	RETVAL	816	RETVAL
938		817
939	int	818	int
940	GET_CUSTOM (int rend)	819	GET_CUSTOM (int rend)
941	CODE:	820	CODE:
942	RETVAL = (rend && RS_customMask) >> RS_customShift;	821	RETVAL = (rend & RS_customMask) >> RS_customShift;
943	OUTPUT:	822	OUTPUT:
944	RETVAL	823	RETVAL
945		824
946	int	825	int
947	SET_CUSTOM (int rend, int new_value)	826	SET_CUSTOM (int rend, int new_value)
…		…
1015	void	894	void
1016	rxvt_term::set_should_invoke (int htype, int inc)	895	rxvt_term::set_should_invoke (int htype, int inc)
1017	CODE:	896	CODE:
1018	THIS->perl.should_invoke [htype] += inc;	897	THIS->perl.should_invoke [htype] += inc;
1019		898
1020	void	899	int
1021	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	900	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1022	CODE:	901	CODE:
1023	XGrabButton (THIS->dpy, button, modifiers, window, 1,	902	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1024	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	903	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
1025	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);	904	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
		905	OUTPUT: RETVAL
1026		906
1027	void	907	int
1028	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)	908	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029	CODE:	909	CODE:
1030	XUngrabButton (THIS->dpy, button, modifiers, window);	910	RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
		911	OUTPUT: RETVAL
1031		912
1032	#if 0
1033
1034	void	913	void
1035	XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	914	rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1036	C_ARGS:	915	int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1037	THIS->dpy, keycode, modifiers, window, 1,	916	CODE:
1038	GrabModeSync, GrabModeSync	917	XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1039		918
1040	void	919	void
1041	XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	920	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
		921	CODE:
1042	C_ARGS: THIS->dpy, keycode, modifiers, window	922	XUngrabKey (THIS->dpy, keycode, modifiers, window);
1043		923
1044	#endif	924	void
		925	rxvt_term::XUngrabKeyboard (Time eventtime)
		926	CODE:
		927	XUngrabKeyboard (THIS->dpy, eventtime);
1045		928
1046	bool	929	bool
1047	rxvt_term::grab (Time eventtime, int sync = 0)	930	rxvt_term::grab (Time eventtime, int sync = 0)
1048	CODE:	931	CODE:
1049	{	932	{
…		…
1084	rxvt_term::ungrab ()	967	rxvt_term::ungrab ()
1085	CODE:	968	CODE:
1086	ungrab (THIS);	969	ungrab (THIS);
1087		970
1088	int	971	int
		972	rxvt_term::XStringToKeysym (char *string)
		973	CODE:
		974	RETVAL = XStringToKeysym (string);
		975	OUTPUT: RETVAL
		976
		977	char *
		978	rxvt_term::XKeysymToString (int sym)
		979	CODE:
		980	RETVAL = XKeysymToString (sym);
		981	OUTPUT: RETVAL
		982
		983	int
		984	rxvt_term::XKeysymToKeycode (int sym)
		985	CODE:
		986	RETVAL = XKeysymToKeycode (THIS->dpy, sym);
		987	OUTPUT: RETVAL
		988
		989	int
		990	rxvt_term::XKeycodeToKeysym (int code, int index)
		991	CODE:
		992	RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
		993	OUTPUT: RETVAL
		994
		995	int
1089	rxvt_term::strwidth (SV *str)	996	rxvt_term::strwidth (SV *str)
1090	CODE:	997	CODE:
1091	{	998	{
1092	wchar_t *wstr = sv2wcs (str);	999	wchar_t *wstr = sv2wcs (str);
1093		1000
1094	rxvt_push_locale (THIS->locale);	1001	rxvt_push_locale (THIS->locale);
1095	RETVAL = wcswidth (wstr, wcslen (wstr));	1002	RETVAL = 0;
		1003	for (wchar_t wc = wstr; wc; wc++)
		1004	{
		1005	int w = WCWIDTH (*wc);
		1006
		1007	if (w)
		1008	RETVAL += max (w, 1);
		1009	}
1096	rxvt_pop_locale ();	1010	rxvt_pop_locale ();
1097		1011
1098	free (wstr);	1012	free (wstr);
1099	}	1013	}
1100	OUTPUT:	1014	OUTPUT:
…		…
1130	rxvt_pop_locale ();	1044	rxvt_pop_locale ();
1131		1045
1132	RETVAL = wcs2sv (wstr);	1046	RETVAL = wcs2sv (wstr);
1133	free (wstr);	1047	free (wstr);
1134	}	1048	}
		1049	OUTPUT:
		1050	RETVAL
		1051
		1052	char *
		1053	rxvt_term::locale ()
		1054	CODE:
		1055	RETVAL = THIS->locale;
1135	OUTPUT:	1056	OUTPUT:
1136	RETVAL	1057	RETVAL
1137		1058
1138	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1059	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1139		1060
…		…
1553		1474
1554	const char *	1475	const char *
1555	rxvt_term::x_resource (const char *name)	1476	rxvt_term::x_resource (const char *name)
1556		1477
1557	bool	1478	bool
1558	rxvt_term::option (U32 optval, int set = -1)	1479	rxvt_term::option (U8 optval, int set = -1)
1559	CODE:	1480	CODE:
1560	{	1481	{
1561	RETVAL = THIS->options & optval;	1482	RETVAL = THIS->option (optval);
1562		1483
1563	if (set >= 0)	1484	if (set >= 0)
1564	{	1485	{
1565	if (set)
1566	THIS->options \|= optval;	1486	THIS->set_option (optval, set);
1567	else
1568	THIS->options &= ~optval;
1569		1487
1570	if (THIS->check_ev.is_active ()) // avoid doing this before START	1488	if (THIS->check_ev.is_active ()) // avoid doing this before START
1571	switch (optval)	1489	switch (optval)
1572	{	1490	{
1573	case Opt_skipBuiltinGlyphs:	1491	case Opt_skipBuiltinGlyphs:
…		…
1900	overlay::hide ()	1818	overlay::hide ()
1901		1819
1902	void	1820	void
1903	overlay::DESTROY ()	1821	overlay::DESTROY ()
1904		1822
1905	#############################################################################	1823	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1906	# urxvt::watcher
1907	#############################################################################
1908		1824
1909	MODULE = urxvt PACKAGE = urxvt::watcher
1910
1911	CHAINED
1912	perl_watcher::cb (SV *cb)
1913	CODE:
1914	THIS->cb (cb);
1915	OUTPUT:
1916	RETVAL
1917
1918	#############################################################################
1919	# urxvt::timer
1920	#############################################################################
1921
1922	MODULE = urxvt PACKAGE = urxvt::timer
1923
1924	SV *
1925	timer::new ()
1926	CODE:
1927	timer *w = new timer;
1928	w->start (NOW);
1929	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::timer");
1930	w->self = (HV *)SvRV (RETVAL);
1931	OUTPUT:
1932	RETVAL
1933
1934	NV
1935	timer::at ()
1936	CODE:
1937	RETVAL = THIS->at;
1938	OUTPUT:
1939	RETVAL
1940
1941	CHAINED
1942	timer::interval (NV interval)
1943	CODE:
1944	THIS->interval = interval;
1945	OUTPUT:
1946	RETVAL
1947
1948	CHAINED
1949	timer::set (NV tstamp)
1950	CODE:
1951	THIS->set (tstamp);
1952	OUTPUT:
1953	RETVAL
1954
1955	CHAINED
1956	timer::start (NV tstamp = THIS->at)
1957	CODE:
1958	THIS->start (tstamp);
1959	OUTPUT:
1960	RETVAL
1961
1962	CHAINED
1963	timer::after (NV delay)
1964	CODE:
1965	THIS->start (NOW + delay);
1966	OUTPUT:
1967	RETVAL
1968
1969	CHAINED
1970	timer::stop ()
1971	CODE:
1972	THIS->stop ();
1973	OUTPUT:
1974	RETVAL
1975
1976	void
1977	timer::DESTROY ()
1978
1979	#############################################################################
1980	# urxvt::iow
1981	#############################################################################
1982
1983	MODULE = urxvt PACKAGE = urxvt::iow
1984
1985	SV *
1986	iow::new ()
1987	CODE:
1988	iow *w = new iow;
1989	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iow");
1990	w->self = (HV *)SvRV (RETVAL);
1991	OUTPUT:
1992	RETVAL
1993
1994	CHAINED
1995	iow::fd (int fd)
1996	CODE:
1997	THIS->fd = fd;
1998	OUTPUT:
1999	RETVAL
2000
2001	CHAINED
2002	iow::events (short events)
2003	CODE:
2004	THIS->events = events;
2005	OUTPUT:
2006	RETVAL
2007
2008	CHAINED
2009	iow::start ()
2010	CODE:
2011	THIS->start ();
2012	OUTPUT:
2013	RETVAL
2014
2015	CHAINED
2016	iow::stop ()
2017	CODE:
2018	THIS->stop ();
2019	OUTPUT:
2020	RETVAL
2021
2022	void
2023	iow::DESTROY ()
2024
2025	#############################################################################
2026	# urxvt::iw
2027	#############################################################################
2028
2029	MODULE = urxvt PACKAGE = urxvt::iw
2030
2031	SV *
2032	iw::new ()
2033	CODE:
2034	iw *w = new iw;
2035	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iw");
2036	w->self = (HV *)SvRV (RETVAL);
2037	OUTPUT:
2038	RETVAL
2039
2040	CHAINED
2041	iw::start ()
2042	CODE:
2043	THIS->start ();
2044	OUTPUT:
2045	RETVAL
2046
2047	CHAINED
2048	iw::stop ()
2049	CODE:
2050	THIS->stop ();
2051	OUTPUT:
2052	RETVAL
2053
2054	void
2055	iw::DESTROY ()
2056
2057	#############################################################################
2058	# urxvt::pw
2059	#############################################################################
2060
2061	MODULE = urxvt PACKAGE = urxvt::pw
2062
2063	SV *
2064	pw::new ()
2065	CODE:
2066	pw *w = new pw;
2067	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::pw");
2068	w->self = (HV *)SvRV (RETVAL);
2069	OUTPUT:
2070	RETVAL
2071
2072	CHAINED
2073	pw::start (int pid)
2074	CODE:
2075	THIS->start (pid);
2076	OUTPUT:
2077	RETVAL
2078
2079	CHAINED
2080	pw::stop ()
2081	CODE:
2082	THIS->stop ();
2083	OUTPUT:
2084	RETVAL
2085
2086	void
2087	pw::DESTROY ()
2088
2089

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.100 by root, Mon Feb 20 20:44:22 2006 UTC vs. Revision 1.113 by ayin, Tue May 1 21:10:04 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.100 by root, Mon Feb 20 20:44:22 2006 UTC vs.
Revision 1.113 by ayin, Tue May 1 21:10:04 2007 UTC