[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.114 by ayin, Mon Aug 27 18:31:00 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	{
…		…
75		73
76	return sv;	74	return sv;
77	}	75	}
78		76
79	static SV *	77	static SV *
80	new_ref (HV hv, const char klass)
81	{
82	return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83	}
84
85	static SV *
86	newSVptr (void ptr, const char klass)	78	newSVptr (void ptr, const char klass)
87	{	79	{
88	HV *hv = newHV ();	80	HV *hv = newHV ();
89	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);	81	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);
90	return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	82	return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
…		…
114	return (long)mg->mg_ptr;	106	return (long)mg->mg_ptr;
115	}	107	}
116		108
117	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)	109	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
118	#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")	110	#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		111
244	/////////////////////////////////////////////////////////////////////////////	112	/////////////////////////////////////////////////////////////////////////////
245		113
246	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")	114	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
247		115
…		…
268	};	136	};
269		137
270	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)	138	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)	139	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
272	{	140	{
		141	if (w < 0) w = 0;
		142	if (h < 0) h = 0;
		143
273	if (border == 2)	144	if (border == 2)
274	{	145	{
275	w += 2;	146	w += 2;
276	h += 2;	147	h += 2;
277	}	148	}
…		…
355		226
356	int i;	227	int i;
357		228
358	for (i = AvFILL (overlay_av); i >= 0; i--)	229	for (i = AvFILL (overlay_av); i >= 0; i--)
359	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)	230	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
360	{
361	av_delete (overlay_av, i, G_DISCARD);
362	break;	231	break;
363	}
364		232
365	for (; i < AvFILL (overlay_av); i++)	233	for (; i < AvFILL (overlay_av); i++)
366	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));	234	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
367		235
368	av_pop (overlay_av);	236	av_pop (overlay_av);
…		…
425	}	293	}
426		294
427	THIS->want_refresh = 1;	295	THIS->want_refresh = 1;
428	}	296	}
429		297
		298	/////////////////////////////////////////////////////////////////////////////
		299
		300	#define IOM_CLASS "urxvt"
		301	#define IOM_WARN rxvt_warn
		302	#include <iom_perl.h>
430		303
431	/////////////////////////////////////////////////////////////////////////////	304	/////////////////////////////////////////////////////////////////////////////
432		305
433	struct rxvt_perl_interp rxvt_perl;	306	struct rxvt_perl_interp rxvt_perl;
434		307
…		…
791	const_iv (Button3Mask),	664	const_iv (Button3Mask),
792	const_iv (Button4Mask),	665	const_iv (Button4Mask),
793	const_iv (Button5Mask),	666	const_iv (Button5Mask),
794	const_iv (AnyModifier),	667	const_iv (AnyModifier),
795		668
796	const_iv (EVENT_NONE),	669	const_iv (NoSymbol),
797	const_iv (EVENT_READ),	670	const_iv (GrabModeSync),
798	const_iv (EVENT_WRITE),	671	const_iv (GrabModeAsync),
799		672
800	const_iv (NoEventMask),	673	const_iv (NoEventMask),
801	const_iv (KeyPressMask),	674	const_iv (KeyPressMask),
802	const_iv (KeyReleaseMask),	675	const_iv (KeyReleaseMask),
803	const_iv (ButtonPressMask),	676	const_iv (ButtonPressMask),
…		…
937	RETVAL	810	RETVAL
938		811
939	int	812	int
940	GET_CUSTOM (int rend)	813	GET_CUSTOM (int rend)
941	CODE:	814	CODE:
942	RETVAL = (rend && RS_customMask) >> RS_customShift;	815	RETVAL = (rend & RS_customMask) >> RS_customShift;
943	OUTPUT:	816	OUTPUT:
944	RETVAL	817	RETVAL
945		818
946	int	819	int
947	SET_CUSTOM (int rend, int new_value)	820	SET_CUSTOM (int rend, int new_value)
…		…
1015	void	888	void
1016	rxvt_term::set_should_invoke (int htype, int inc)	889	rxvt_term::set_should_invoke (int htype, int inc)
1017	CODE:	890	CODE:
1018	THIS->perl.should_invoke [htype] += inc;	891	THIS->perl.should_invoke [htype] += inc;
1019		892
1020	void	893	int
1021	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	894	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1022	CODE:	895	CODE:
1023	XGrabButton (THIS->dpy, button, modifiers, window, 1,	896	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1024	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	897	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
1025	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);	898	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
		899	OUTPUT: RETVAL
1026		900
1027	void	901	int
1028	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)	902	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029	CODE:	903	CODE:
1030	XUngrabButton (THIS->dpy, button, modifiers, window);	904	RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
		905	OUTPUT: RETVAL
1031		906
1032	#if 0
1033
1034	void	907	void
1035	XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	908	rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1036	C_ARGS:	909	int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1037	THIS->dpy, keycode, modifiers, window, 1,	910	CODE:
1038	GrabModeSync, GrabModeSync	911	XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1039		912
1040	void	913	void
1041	XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)	914	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
		915	CODE:
1042	C_ARGS: THIS->dpy, keycode, modifiers, window	916	XUngrabKey (THIS->dpy, keycode, modifiers, window);
1043		917
1044	#endif	918	void
		919	rxvt_term::XUngrabKeyboard (Time eventtime)
		920	CODE:
		921	XUngrabKeyboard (THIS->dpy, eventtime);
1045		922
1046	bool	923	bool
1047	rxvt_term::grab (Time eventtime, int sync = 0)	924	rxvt_term::grab (Time eventtime, int sync = 0)
1048	CODE:	925	CODE:
1049	{	926	{
…		…
1084	rxvt_term::ungrab ()	961	rxvt_term::ungrab ()
1085	CODE:	962	CODE:
1086	ungrab (THIS);	963	ungrab (THIS);
1087		964
1088	int	965	int
		966	rxvt_term::XStringToKeysym (char *string)
		967	CODE:
		968	RETVAL = XStringToKeysym (string);
		969	OUTPUT: RETVAL
		970
		971	char *
		972	rxvt_term::XKeysymToString (int sym)
		973	CODE:
		974	RETVAL = XKeysymToString (sym);
		975	OUTPUT: RETVAL
		976
		977	int
		978	rxvt_term::XKeysymToKeycode (int sym)
		979	CODE:
		980	RETVAL = XKeysymToKeycode (THIS->dpy, sym);
		981	OUTPUT: RETVAL
		982
		983	int
		984	rxvt_term::XKeycodeToKeysym (int code, int index)
		985	CODE:
		986	RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
		987	OUTPUT: RETVAL
		988
		989	int
1089	rxvt_term::strwidth (SV *str)	990	rxvt_term::strwidth (SV *str)
1090	CODE:	991	CODE:
1091	{	992	{
1092	wchar_t *wstr = sv2wcs (str);	993	wchar_t *wstr = sv2wcs (str);
1093		994
1094	rxvt_push_locale (THIS->locale);	995	rxvt_push_locale (THIS->locale);
1095	RETVAL = wcswidth (wstr, wcslen (wstr));	996	RETVAL = 0;
		997	for (wchar_t wc = wstr; wc; wc++)
		998	{
		999	int w = WCWIDTH (*wc);
		1000
		1001	if (w)
		1002	RETVAL += max (w, 1);
		1003	}
1096	rxvt_pop_locale ();	1004	rxvt_pop_locale ();
1097		1005
1098	free (wstr);	1006	free (wstr);
1099	}	1007	}
1100	OUTPUT:	1008	OUTPUT:
…		…
1130	rxvt_pop_locale ();	1038	rxvt_pop_locale ();
1131		1039
1132	RETVAL = wcs2sv (wstr);	1040	RETVAL = wcs2sv (wstr);
1133	free (wstr);	1041	free (wstr);
1134	}	1042	}
		1043	OUTPUT:
		1044	RETVAL
		1045
		1046	char *
		1047	rxvt_term::locale ()
		1048	CODE:
		1049	RETVAL = THIS->locale;
1135	OUTPUT:	1050	OUTPUT:
1136	RETVAL	1051	RETVAL
1137		1052
1138	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1053	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1139		1054
…		…
1480	SV *	1395	SV *
1481	rxvt_term::special_decode (SV *text)	1396	rxvt_term::special_decode (SV *text)
1482	CODE:	1397	CODE:
1483	{	1398	{
1484	wchar_t *wstr = sv2wcs (text);	1399	wchar_t *wstr = sv2wcs (text);
1485	int wlen = wcslen (wstr);
1486	int dlen = 0;	1400	int dlen = 0;
1487		1401
1488	// find length	1402	// find length
1489	for (wchar_t s = wstr; s; s++)	1403	for (wchar_t s = wstr; s; s++)
1490	if (*s == NOCHAR)	1404	if (*s == NOCHAR)
…		…
1553		1467
1554	const char *	1468	const char *
1555	rxvt_term::x_resource (const char *name)	1469	rxvt_term::x_resource (const char *name)
1556		1470
1557	bool	1471	bool
1558	rxvt_term::option (U32 optval, int set = -1)	1472	rxvt_term::option (U8 optval, int set = -1)
1559	CODE:	1473	CODE:
1560	{	1474	{
1561	RETVAL = THIS->options & optval;	1475	RETVAL = THIS->option (optval);
1562		1476
1563	if (set >= 0)	1477	if (set >= 0)
1564	{	1478	{
1565	if (set)
1566	THIS->options \|= optval;	1479	THIS->set_option (optval, set);
1567	else
1568	THIS->options &= ~optval;
1569		1480
1570	if (THIS->check_ev.is_active ()) // avoid doing this before START	1481	if (THIS->check_ev.is_active ()) // avoid doing this before START
1571	switch (optval)	1482	switch (optval)
1572	{	1483	{
1573	case Opt_skipBuiltinGlyphs:	1484	case Opt_skipBuiltinGlyphs:
…		…
1900	overlay::hide ()	1811	overlay::hide ()
1901		1812
1902	void	1813	void
1903	overlay::DESTROY ()	1814	overlay::DESTROY ()
1904		1815
1905	#############################################################################	1816	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1906	# urxvt::watcher
1907	#############################################################################
1908		1817
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.114 by ayin, Mon Aug 27 18:31:00 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.114 by ayin, Mon Aug 27 18:31:00 2007 UTC