[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.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),
…		…
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
…		…
1900	overlay::hide ()	1822	overlay::hide ()
1901		1823
1902	void	1824	void
1903	overlay::DESTROY ()	1825	overlay::DESTROY ()
1904		1826
1905	#############################################################################	1827	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1906	# urxvt::watcher
1907	#############################################################################
1908		1828
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.110 by root, Thu Dec 14 17:22:04 2006 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.110 by root, Thu Dec 14 17:22:04 2006 UTC