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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.101 by root, Wed Jul 5 23:34:14 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	}
…		…
422	}	299	}
423		300
424	THIS->want_refresh = 1;	301	THIS->want_refresh = 1;
425	}	302	}
426		303
		304	/////////////////////////////////////////////////////////////////////////////
		305
		306	#define IOM_CLASS "urxvt"
		307	#include <iom_perl.h>
427		308
428	/////////////////////////////////////////////////////////////////////////////	309	/////////////////////////////////////////////////////////////////////////////
429		310
430	struct rxvt_perl_interp rxvt_perl;	311	struct rxvt_perl_interp rxvt_perl;
431		312
…		…
788	const_iv (Button3Mask),	669	const_iv (Button3Mask),
789	const_iv (Button4Mask),	670	const_iv (Button4Mask),
790	const_iv (Button5Mask),	671	const_iv (Button5Mask),
791	const_iv (AnyModifier),	672	const_iv (AnyModifier),
792		673
793	const_iv (EVENT_NONE),	674	const_iv (NoSymbol),
794	const_iv (EVENT_READ),	675	const_iv (GrabModeSync),
795	const_iv (EVENT_WRITE),	676	const_iv (GrabModeAsync),
796		677
797	const_iv (NoEventMask),	678	const_iv (NoEventMask),
798	const_iv (KeyPressMask),	679	const_iv (KeyPressMask),
799	const_iv (KeyReleaseMask),	680	const_iv (KeyReleaseMask),
800	const_iv (ButtonPressMask),	681	const_iv (ButtonPressMask),
…		…
934	RETVAL	815	RETVAL
935		816
936	int	817	int
937	GET_CUSTOM (int rend)	818	GET_CUSTOM (int rend)
938	CODE:	819	CODE:
939	RETVAL = (rend && RS_customMask) >> RS_customShift;	820	RETVAL = (rend & RS_customMask) >> RS_customShift;
940	OUTPUT:	821	OUTPUT:
941	RETVAL	822	RETVAL
942		823
943	int	824	int
944	SET_CUSTOM (int rend, int new_value)	825	SET_CUSTOM (int rend, int new_value)
…		…
1012	void	893	void
1013	rxvt_term::set_should_invoke (int htype, int inc)	894	rxvt_term::set_should_invoke (int htype, int inc)
1014	CODE:	895	CODE:
1015	THIS->perl.should_invoke [htype] += inc;	896	THIS->perl.should_invoke [htype] += inc;
1016		897
1017	void	898	int
1018	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)
1019	CODE:	900	CODE:
1020	XGrabButton (THIS->dpy, button, modifiers, window, 1,	901	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1021	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	902	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
1022	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);	903	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
		904	OUTPUT: RETVAL
1023		905
1024	void	906	int
1025	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)
1026	CODE:	908	CODE:
1027	XUngrabButton (THIS->dpy, button, modifiers, window);	909	RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
		910	OUTPUT: RETVAL
1028		911
1029	#if 0
1030
1031	void	912	void
1032	XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	913	rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1033	C_ARGS:	914	int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1034	THIS->dpy, keycode, modifiers, window, 1,	915	CODE:
1035	GrabModeSync, GrabModeSync	916	XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1036		917
1037	void	918	void
1038	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:
1039	C_ARGS: THIS->dpy, keycode, modifiers, window	921	XUngrabKey (THIS->dpy, keycode, modifiers, window);
1040		922
1041	#endif	923	void
		924	rxvt_term::XUngrabKeyboard (Time eventtime)
		925	CODE:
		926	XUngrabKeyboard (THIS->dpy, eventtime);
1042		927
1043	bool	928	bool
1044	rxvt_term::grab (Time eventtime, int sync = 0)	929	rxvt_term::grab (Time eventtime, int sync = 0)
1045	CODE:	930	CODE:
1046	{	931	{
…		…
1081	rxvt_term::ungrab ()	966	rxvt_term::ungrab ()
1082	CODE:	967	CODE:
1083	ungrab (THIS);	968	ungrab (THIS);
1084		969
1085	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
1086	rxvt_term::strwidth (SV *str)	995	rxvt_term::strwidth (SV *str)
1087	CODE:	996	CODE:
1088	{	997	{
1089	wchar_t *wstr = sv2wcs (str);	998	wchar_t *wstr = sv2wcs (str);
1090		999
1091	rxvt_push_locale (THIS->locale);	1000	rxvt_push_locale (THIS->locale);
1092	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	}
1093	rxvt_pop_locale ();	1009	rxvt_pop_locale ();
1094		1010
1095	free (wstr);	1011	free (wstr);
1096	}	1012	}
1097	OUTPUT:	1013	OUTPUT:
…		…
1127	rxvt_pop_locale ();	1043	rxvt_pop_locale ();
1128		1044
1129	RETVAL = wcs2sv (wstr);	1045	RETVAL = wcs2sv (wstr);
1130	free (wstr);	1046	free (wstr);
1131	}	1047	}
		1048	OUTPUT:
		1049	RETVAL
		1050
		1051	char *
		1052	rxvt_term::locale ()
		1053	CODE:
		1054	RETVAL = THIS->locale;
1132	OUTPUT:	1055	OUTPUT:
1133	RETVAL	1056	RETVAL
1134		1057
1135	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1058	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1136		1059
…		…
1897	overlay::hide ()	1820	overlay::hide ()
1898		1821
1899	void	1822	void
1900	overlay::DESTROY ()	1823	overlay::DESTROY ()
1901		1824
1902	#############################################################################	1825	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1903	# urxvt::watcher
1904	#############################################################################
1905		1826
1906	MODULE = urxvt PACKAGE = urxvt::watcher
1907
1908	CHAINED
1909	perl_watcher::cb (SV *cb)
1910	CODE:
1911	THIS->cb (cb);
1912	OUTPUT:
1913	RETVAL
1914
1915	#############################################################################
1916	# urxvt::timer
1917	#############################################################################
1918
1919	MODULE = urxvt PACKAGE = urxvt::timer
1920
1921	SV *
1922	timer::new ()
1923	CODE:
1924	timer *w = new timer;
1925	w->start (NOW);
1926	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::timer");
1927	w->self = (HV *)SvRV (RETVAL);
1928	OUTPUT:
1929	RETVAL
1930
1931	NV
1932	timer::at ()
1933	CODE:
1934	RETVAL = THIS->at;
1935	OUTPUT:
1936	RETVAL
1937
1938	CHAINED
1939	timer::interval (NV interval)
1940	CODE:
1941	THIS->interval = interval;
1942	OUTPUT:
1943	RETVAL
1944
1945	CHAINED
1946	timer::set (NV tstamp)
1947	CODE:
1948	THIS->set (tstamp);
1949	OUTPUT:
1950	RETVAL
1951
1952	CHAINED
1953	timer::start (NV tstamp = THIS->at)
1954	CODE:
1955	THIS->start (tstamp);
1956	OUTPUT:
1957	RETVAL
1958
1959	CHAINED
1960	timer::after (NV delay)
1961	CODE:
1962	THIS->start (NOW + delay);
1963	OUTPUT:
1964	RETVAL
1965
1966	CHAINED
1967	timer::stop ()
1968	CODE:
1969	THIS->stop ();
1970	OUTPUT:
1971	RETVAL
1972
1973	void
1974	timer::DESTROY ()
1975
1976	#############################################################################
1977	# urxvt::iow
1978	#############################################################################
1979
1980	MODULE = urxvt PACKAGE = urxvt::iow
1981
1982	SV *
1983	iow::new ()
1984	CODE:
1985	iow *w = new iow;
1986	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iow");
1987	w->self = (HV *)SvRV (RETVAL);
1988	OUTPUT:
1989	RETVAL
1990
1991	CHAINED
1992	iow::fd (int fd)
1993	CODE:
1994	THIS->fd = fd;
1995	OUTPUT:
1996	RETVAL
1997
1998	CHAINED
1999	iow::events (short events)
2000	CODE:
2001	THIS->events = events;
2002	OUTPUT:
2003	RETVAL
2004
2005	CHAINED
2006	iow::start ()
2007	CODE:
2008	THIS->start ();
2009	OUTPUT:
2010	RETVAL
2011
2012	CHAINED
2013	iow::stop ()
2014	CODE:
2015	THIS->stop ();
2016	OUTPUT:
2017	RETVAL
2018
2019	void
2020	iow::DESTROY ()
2021
2022	#############################################################################
2023	# urxvt::iw
2024	#############################################################################
2025
2026	MODULE = urxvt PACKAGE = urxvt::iw
2027
2028	SV *
2029	iw::new ()
2030	CODE:
2031	iw *w = new iw;
2032	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::iw");
2033	w->self = (HV *)SvRV (RETVAL);
2034	OUTPUT:
2035	RETVAL
2036
2037	CHAINED
2038	iw::start ()
2039	CODE:
2040	THIS->start ();
2041	OUTPUT:
2042	RETVAL
2043
2044	CHAINED
2045	iw::stop ()
2046	CODE:
2047	THIS->stop ();
2048	OUTPUT:
2049	RETVAL
2050
2051	void
2052	iw::DESTROY ()
2053
2054	#############################################################################
2055	# urxvt::pw
2056	#############################################################################
2057
2058	MODULE = urxvt PACKAGE = urxvt::pw
2059
2060	SV *
2061	pw::new ()
2062	CODE:
2063	pw *w = new pw;
2064	RETVAL = newSVptr ((void )(perl_watcher )w, "urxvt::pw");
2065	w->self = (HV *)SvRV (RETVAL);
2066	OUTPUT:
2067	RETVAL
2068
2069	CHAINED
2070	pw::start (int pid)
2071	CODE:
2072	THIS->start (pid);
2073	OUTPUT:
2074	RETVAL
2075
2076	CHAINED
2077	pw::stop ()
2078	CODE:
2079	THIS->stop ();
2080	OUTPUT:
2081	RETVAL
2082
2083	void
2084	pw::DESTROY ()
2085
2086

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.101 by root, Wed Jul 5 23:34:14 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.101 by root, Wed Jul 5 23:34:14 2006 UTC vs.
Revision 1.111 by root, Thu Dec 14 17:33:53 2006 UTC