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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.91 by root, Wed Jan 25 00:42:21 2006 UTC vs.
Revision 1.101 by root, Wed Jul 5 23:34:14 2006 UTC

…		…
80	new_ref (HV hv, const char klass)	80	new_ref (HV hv, const char klass)
81	{	81	{
82	return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));	82	return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83	}	83	}
84		84
85	//TODO: use magic
86	static SV *	85	static SV *
87	newSVptr (void ptr, const char klass)	86	newSVptr (void ptr, const char klass)
88	{	87	{
89	HV *hv = newHV ();	88	HV *hv = newHV ();
90	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);	89	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);
…		…
113	croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);	112	croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114		113
115	return (long)mg->mg_ptr;	114	return (long)mg->mg_ptr;
116	}	115	}
117		116
118	#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)	117	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119	#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")	118	#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120		119
121	/////////////////////////////////////////////////////////////////////////////	120	/////////////////////////////////////////////////////////////////////////////
122		121
123	#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")	122	#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124		123
…		…
171		170
172	if (SvTRUE (ERRSV))	171	if (SvTRUE (ERRSV))
173	rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));	172	rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174	}	173	}
175		174
176	#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")	175	#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
177	#define SvTIMER(sv) (timer )(perl_watcher )SvPTR (sv, "urxvt::timer")	176	#define SvTIMER(sv) (timer )(perl_watcher )SvPTR ((sv), "urxvt::timer")
178		177
179	struct timer : perl_watcher, time_watcher	178	struct timer : perl_watcher, time_watcher
180	{	179	{
181	tstamp interval;	180	tstamp interval;
182		181
…		…
192		191
193	invoke ("urxvt::timer", newSVtimer (this));	192	invoke ("urxvt::timer", newSVtimer (this));
194	}	193	}
195	};	194	};
196		195
197	#define newSViow(iow) new_ref (iow->self, "urxvt::iow")	196	#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
198	#define SvIOW(sv) (iow )(perl_watcher )SvPTR (sv, "urxvt::iow")	197	#define SvIOW(sv) (iow )(perl_watcher )SvPTR ((sv), "urxvt::iow")
199		198
200	struct iow : perl_watcher, io_watcher	199	struct iow : perl_watcher, io_watcher
201	{	200	{
202	iow ()	201	iow ()
203	: io_watcher (this, &iow::execute)	202	: io_watcher (this, &iow::execute)
…		…
208	{	207	{
209	invoke ("urxvt::iow", newSViow (this), revents);	208	invoke ("urxvt::iow", newSViow (this), revents);
210	}	209	}
211	};	210	};
212		211
213	#define newSViw(iw) new_ref (iw->self, "urxvt::iw")	212	#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
214	#define SvIW(sv) (iw )(perl_watcher )SvPTR (sv, "urxvt::iw")	213	#define SvIW(sv) (iw )(perl_watcher )SvPTR ((sv), "urxvt::iw")
215		214
216	struct iw : perl_watcher, idle_watcher	215	struct iw : perl_watcher, idle_watcher
217	{	216	{
218	iw ()	217	iw ()
219	: idle_watcher (this, &iw::execute)	218	: idle_watcher (this, &iw::execute)
…		…
224	{	223	{
225	invoke ("urxvt::iw", newSViw (this));	224	invoke ("urxvt::iw", newSViw (this));
226	}	225	}
227	};	226	};
228		227
229	#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")	228	#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
230	#define SvPW(sv) (pw )(perl_watcher )SvPTR (sv, "urxvt::pw")	229	#define SvPW(sv) (pw )(perl_watcher )SvPTR ((sv), "urxvt::pw")
231		230
232	struct pw : perl_watcher, child_watcher	231	struct pw : perl_watcher, child_watcher
233	{	232	{
234	pw ()	233	pw ()
235	: child_watcher (this, &pw::execute)	234	: child_watcher (this, &pw::execute)
…		…
244		243
245	/////////////////////////////////////////////////////////////////////////////	244	/////////////////////////////////////////////////////////////////////////////
246		245
247	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")	246	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248		247
249	struct overlay {	248	class overlay {
250	HV *self;
251	bool visible;
252	rxvt_term *THIS;	249	rxvt_term *THIS;
		250	AV *overlay_av;
253	int x, y, w, h;	251	int x, y, w, h;
254	int border;	252	int border;
255	text_t **text;	253	text_t **text;
256	rend_t **rend;	254	rend_t **rend;
257		255
		256	public:
		257	HV *self;
		258
258	overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);	259	overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259	~overlay ();	260	~overlay ();
260		261
261	void show ();	262	void show ();
262	void hide ();	263	void hide ();
…		…
265		266
266	void set (int x, int y, SV str, SV rend);	267	void set (int x, int y, SV str, SV rend);
267	};	268	};
268		269
269	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)	270	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
270	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false)	271	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
271	{	272	{
272	if (border == 2)	273	if (border == 2)
273	{	274	{
274	w += 2;	275	w += 2;
275	h += 2;	276	h += 2;
…		…
314	*rp++ = r;	315	*rp++ = r;
315	}	316	}
316	}	317	}
317		318
318	show ();	319	show ();
319	THIS->want_refresh = 1;
320	}	320	}
321		321
322	overlay::~overlay ()	322	overlay::~overlay ()
323	{	323	{
324	hide ();	324	hide ();
…		…
329	delete [] rend[y];	329	delete [] rend[y];
330	}	330	}
331		331
332	delete [] text;	332	delete [] text;
333	delete [] rend;	333	delete [] rend;
		334	}
		335
		336	void
		337	overlay::show ()
		338	{
		339	if (overlay_av)
		340	return;
		341
		342	overlay_av = (AV *)SvREFCNT_inc (SvRV (
		343	hv_fetch ((HV )SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
		344	));
		345	av_push (overlay_av, newSViv ((long)this));
334		346
335	THIS->want_refresh = 1;	347	THIS->want_refresh = 1;
336	}	348	}
337		349
338	void	350	void
339	overlay::show ()	351	overlay::hide ()
340	{	352	{
341	if (visible)	353	if (!overlay_av)
342	return;	354	return;
343		355
344	visible = true;
345
346	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
347	av_push (av, newSViv ((long)this));
348	}
349
350	void
351	overlay::hide ()
352	{
353	if (!visible)
354	return;
355
356	visible = false;
357
358	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
359
360	int i;	356	int i;
361		357
362	for (i = AvFILL (av); i >= 0; i--)	358	for (i = AvFILL (overlay_av); i >= 0; i--)
363	if (SvIV (*av_fetch (av, i, 1)) == (long)this)	359	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364	{
365	av_delete (av, i, G_DISCARD);
366	break;	360	break;
367	}
368		361
369	for (; i < AvFILL (av); i++)	362	for (; i < AvFILL (overlay_av); i++)
370	av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));	363	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371		364
372	av_pop (av);	365	av_pop (overlay_av);
		366
		367	SvREFCNT_dec (overlay_av);
		368	overlay_av = 0;
		369
		370	THIS->want_refresh = 1;
373	}	371	}
374		372
375	void overlay::swap ()	373	void overlay::swap ()
376	{	374	{
377	int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));	375	int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
…		…
492	static void	490	static void
493	ungrab (rxvt_term *THIS)	491	ungrab (rxvt_term *THIS)
494	{	492	{
495	if (THIS->perl.grabtime)	493	if (THIS->perl.grabtime)
496	{	494	{
497	XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);	495	XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);	496	XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499	THIS->perl.grabtime = 0;	497	THIS->perl.grabtime = 0;
500	}	498	}
501	}	499	}
502		500
503	bool	501	bool
…		…
556	case DT_STR_LEN:	554	case DT_STR_LEN:
557	{	555	{
558	char str = va_arg (ap, char );	556	char str = va_arg (ap, char );
559	int len = va_arg (ap, int);	557	int len = va_arg (ap, int);
560		558
561	printf ("pushing str %p:%d\n", str,len);//D
562	XPUSHs (sv_2mortal (newSVpvn (str, len)));	559	XPUSHs (sv_2mortal (newSVpvn (str, len)));
563	}	560	}
564	break;	561	break;
565		562
566	case DT_WCS_LEN:	563	case DT_WCS_LEN:
…		…
762	# include "optinc.h"	759	# include "optinc.h"
763	# undef nodef	760	# undef nodef
764	# undef def	761	# undef def
765		762
766	HV *stash = gv_stashpv ("urxvt", 1);	763	HV *stash = gv_stashpv ("urxvt", 1);
767	struct {	764	static const struct {
768	const char *name;	765	const char *name;
769	IV iv;	766	IV iv;
770	} *civ, const_iv[] = {	767	} *civ, const_iv[] = {
771	# define const_iv(name) { # name, (IV)name }	768	# define const_iv(name) { # name, (IV)name }
772	const_iv (DEFAULT_RSTYLE),	769	const_iv (DEFAULT_RSTYLE),
…		…
865	const_iv (XIMSecondary),	862	const_iv (XIMSecondary),
866	const_iv (XIMTertiary),	863	const_iv (XIMTertiary),
867	const_iv (XIMVisibleToForward),	864	const_iv (XIMVisibleToForward),
868	const_iv (XIMVisibleToBackword),	865	const_iv (XIMVisibleToBackword),
869	const_iv (XIMVisibleToCenter),	866	const_iv (XIMVisibleToCenter),
870		867	# if 0
871	const_iv (XIMForwardChar),	868	const_iv (XIMForwardChar),
872	const_iv (XIMBackwardChar),	869	const_iv (XIMBackwardChar),
873	const_iv (XIMForwardWord),	870	const_iv (XIMForwardWord),
874	const_iv (XIMBackwardWord),	871	const_iv (XIMBackwardWord),
875	const_iv (XIMCaretUp),	872	const_iv (XIMCaretUp),
…		…
879	const_iv (XIMLineStart),	876	const_iv (XIMLineStart),
880	const_iv (XIMLineEnd),	877	const_iv (XIMLineEnd),
881	const_iv (XIMAbsolutePosition),	878	const_iv (XIMAbsolutePosition),
882	const_iv (XIMDontChange),	879	const_iv (XIMDontChange),
883	# endif	880	# endif
		881	# endif
884	};	882	};
885		883
886	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);	884	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
887	civ-- > const_iv; )
888	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	885	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
889	}	886	}
890		887
891	void	888	void
892	warn (const char *msg)	889	warn (const char *msg)
…		…
923	RETVAL	920	RETVAL
924		921
925	int	922	int
926	SET_FGCOLOR (int rend, int new_color)	923	SET_FGCOLOR (int rend, int new_color)
927	CODE:	924	CODE:
928	RETVAL = SET_FGCOLOR (rend, new_color);	925	RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
929	OUTPUT:	926	OUTPUT:
930	RETVAL	927	RETVAL
931		928
932	int	929	int
933	SET_BGCOLOR (int rend, int new_color)	930	SET_BGCOLOR (int rend, int new_color)
934	CODE:	931	CODE:
935	RETVAL = SET_BGCOLOR (rend, new_color);	932	RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
936	OUTPUT:	933	OUTPUT:
937	RETVAL	934	RETVAL
938		935
939	int	936	int
940	GET_CUSTOM (int rend)	937	GET_CUSTOM (int rend)
…		…
954	\| ((new_value << RS_customShift) & RS_customMask);	951	\| ((new_value << RS_customShift) & RS_customMask);
955	}	952	}
956	OUTPUT:	953	OUTPUT:
957	RETVAL	954	RETVAL
958		955
		956	void
		957	termlist ()
		958	PPCODE:
		959	{
		960	EXTEND (SP, rxvt_term::termlist.size ());
		961
		962	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		963	if ((*t)->perl.self)
		964	PUSHs (sv_2mortal (newSVterm (*t)));
		965	}
		966
959	MODULE = urxvt PACKAGE = urxvt::term	967	MODULE = urxvt PACKAGE = urxvt::term
960		968
961	SV *	969	SV *
962	_new (...)	970	_new (AV env, AV arg)
963	CODE:	971	CODE:
964	{	972	{
965	if (items < 1 \|\| !SvROK (ST (0)) \|\| SvTYPE (SvRV (ST (0))) != SVt_PVAV)
966	croak ("first argument to urxvt::term->_new must be arrayref");
967
968	rxvt_term *term = new rxvt_term;	973	rxvt_term *term = new rxvt_term;
969		974
970	stringvec *argv = new stringvec;	975	stringvec *argv = new stringvec;
971	stringvec *envv = new stringvec;	976	stringvec *envv = new stringvec;
972		977
973	for (int i = 1; i < items; i++)	978	for (int i = 0; i <= AvFILL (arg); i++)
974	argv->push_back (strdup (SvPVbyte_nolen (ST (i))));	979	argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
975		980
976	AV env = (AV )SvRV (ST (0));
977	for (int i = AvFILL (env) + 1; i--; )	981	for (int i = AvFILL (env) + 1; i--; )
978	envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));	982	envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
979		983
980	envv->push_back (0);	984	envv->push_back (0);
981		985
…		…
1009	rxvt_term::set_should_invoke (int htype, int inc)	1013	rxvt_term::set_should_invoke (int htype, int inc)
1010	CODE:	1014	CODE:
1011	THIS->perl.should_invoke [htype] += inc;	1015	THIS->perl.should_invoke [htype] += inc;
1012		1016
1013	void	1017	void
1014	rxvt_term::grab_button (int button, U32 modifiers)	1018	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1015	CODE:	1019	CODE:
1016	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,	1020	XGrabButton (THIS->dpy, button, modifiers, window, 1,
1017	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	1021	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
1018	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);	1022	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1019		1023
		1024	void
		1025	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
		1026	CODE:
		1027	XUngrabButton (THIS->dpy, button, modifiers, window);
		1028
		1029	#if 0
		1030
		1031	void
		1032	XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
		1033	C_ARGS:
		1034	THIS->dpy, keycode, modifiers, window, 1,
		1035	GrabModeSync, GrabModeSync
		1036
		1037	void
		1038	XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
		1039	C_ARGS: THIS->dpy, keycode, modifiers, window
		1040
		1041	#endif
		1042
1020	bool	1043	bool
1021	rxvt_term::grab (Time eventtime, int sync = 0)	1044	rxvt_term::grab (Time eventtime, int sync = 0)
1022	CODE:	1045	CODE:
1023	{	1046	{
1024	int mode = sync ? GrabModeSync : GrabModeAsync;	1047	int mode = sync ? GrabModeSync : GrabModeAsync;
1025		1048
1026	THIS->perl.grabtime = 0;	1049	THIS->perl.grabtime = 0;
1027		1050
1028	if (!XGrabPointer (THIS->display->display, THIS->vt, 0,	1051	if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1029	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	1052	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
1030	mode, mode, None, GRAB_CURSOR, eventtime))	1053	mode, mode, None, GRAB_CURSOR, eventtime))
1031	if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))	1054	if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1032	THIS->perl.grabtime = eventtime;	1055	THIS->perl.grabtime = eventtime;
1033	else	1056	else
1034	XUngrabPointer (THIS->display->display, eventtime);	1057	XUngrabPointer (THIS->dpy, eventtime);
1035		1058
1036	RETVAL = !!THIS->perl.grabtime;	1059	RETVAL = !!THIS->perl.grabtime;
1037	}	1060	}
1038	OUTPUT:	1061	OUTPUT:
1039	RETVAL	1062	RETVAL
1040		1063
1041	void	1064	void
1042	rxvt_term::allow_events_async ()	1065	rxvt_term::allow_events_async ()
1043	CODE:	1066	CODE:
1044	XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);	1067	XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1045		1068
1046	void	1069	void
1047	rxvt_term::allow_events_sync ()	1070	rxvt_term::allow_events_sync ()
1048	CODE:	1071	CODE:
1049	XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);	1072	XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1050		1073
1051	void	1074	void
1052	rxvt_term::allow_events_replay ()	1075	rxvt_term::allow_events_replay ()
1053	CODE:	1076	CODE:
1054	XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);	1077	XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1055	XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);	1078	XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1056		1079
1057	void	1080	void
1058	rxvt_term::ungrab ()	1081	rxvt_term::ungrab ()
1059	CODE:	1082	CODE:
1060	ungrab (THIS);	1083	ungrab (THIS);
…		…
1183	}	1206	}
1184	OUTPUT:	1207	OUTPUT:
1185	RETVAL	1208	RETVAL
1186		1209
1187	SV *	1210	SV *
1188	rxvt_term::_env ()	1211	rxvt_term::envv ()
		1212	ALIAS:
		1213	argv = 1
1189	CODE:	1214	PPCODE:
1190	{	1215	{
1191	if (THIS->envv)	1216	stringvec *vec = ix ? THIS->argv : THIS->envv;
1192	{
1193	AV *av = newAV ();
1194		1217
		1218	EXTEND (SP, vec->size ());
		1219
1195	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)	1220	for (char **i = vec->begin (); i != vec->end (); ++i)
1196	if (*i)	1221	if (*i)
1197	av_push (av, newSVpv (*i, 0));	1222	PUSHs (sv_2mortal (newSVpv (*i, 0)));
1198
1199	RETVAL = newRV_noinc ((SV *)av);
1200	}
1201	else
1202	RETVAL = &PL_sv_undef;
1203	}	1223	}
1204	OUTPUT:
1205	RETVAL
1206		1224
1207	int	1225	int
1208	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)	1226	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1209	CODE:	1227	CODE:
1210	RETVAL = THIS->pty_ev.events;	1228	RETVAL = THIS->pty_ev.events;
…		…
1264	void	1282	void
1265	rxvt_term::focus_in ()	1283	rxvt_term::focus_in ()
1266		1284
1267	void	1285	void
1268	rxvt_term::focus_out ()	1286	rxvt_term::focus_out ()
		1287
		1288	void
		1289	rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
		1290	ALIAS:
		1291	key_release = 1
		1292	CODE:
		1293	{
		1294	XKeyEvent xkey;
		1295
		1296	memset (&xkey, 0, sizeof (xkey));
		1297
		1298	xkey.time = time;
		1299	xkey.state = state;
		1300	xkey.keycode = keycode;
		1301
		1302	xkey.type = ix ? KeyRelease : KeyPress;
		1303	xkey.display = THIS->dpy;
		1304	xkey.window = THIS->vt;
		1305	xkey.root = THIS->display->root;
		1306	xkey.subwindow = THIS->vt;
		1307
		1308	if (ix)
		1309	THIS->key_release (xkey);
		1310	else
		1311	THIS->key_press (xkey);
		1312	}
1269		1313
1270	void	1314	void
1271	rxvt_term::want_refresh ()	1315	rxvt_term::want_refresh ()
1272	CODE:	1316	CODE:
1273	THIS->want_refresh = 1;	1317	THIS->want_refresh = 1;
…		…
1466		1510
1467	void	1511	void
1468	rxvt_term::_resource (char name, int index, SV newval = 0)	1512	rxvt_term::_resource (char name, int index, SV newval = 0)
1469	PPCODE:	1513	PPCODE:
1470	{	1514	{
1471	struct resval { const char *name; int value; } rslist [] = {	1515	static const struct resval { const char name; int value; } rs, rslist [] = {
1472	# define def(name) { # name, Rs_ ## name },	1516	# define def(name) { # name, Rs_ ## name },
1473	# define reserve(name,count)	1517	# define reserve(name,count)
1474	# include "rsinc.h"	1518	# include "rsinc.h"
1475	# undef def	1519	# undef def
1476	# undef reserve	1520	# undef reserve
1477	};	1521	};
1478		1522
1479	struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);	1523	rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1480		1524
1481	do {	1525	do {
1482	if (rs-- == rslist)	1526	if (rs-- == rslist)
1483	croak ("no such resource '%s', requested", name);	1527	croak ("no such resource '%s', requested", name);
1484	} while (strcmp (name, rs->name));	1528	} while (strcmp (name, rs->name));
…		…
1608	CODE:	1652	CODE:
1609	RETVAL = THIS->charsets [THIS->screen.charset];	1653	RETVAL = THIS->charsets [THIS->screen.charset];
1610	OUTPUT:	1654	OUTPUT:
1611	RETVAL	1655	RETVAL
1612		1656
1613	#void	1657	void
1614	#rxvt_term::selection_clear ()	1658	rxvt_term::selection_clear ()
1615		1659
1616	void	1660	void
1617	rxvt_term::selection_make (Time eventtime, bool rect = false)	1661	rxvt_term::selection_make (Time eventtime, bool rect = false)
1618	CODE:	1662	CODE:
1619	THIS->selection.op = SELECTION_CONT;	1663	THIS->selection.op = SELECTION_CONT;
…		…
1709	void	1753	void
1710	rxvt_term::XListProperties (Window window)	1754	rxvt_term::XListProperties (Window window)
1711	PPCODE:	1755	PPCODE:
1712	{	1756	{
1713	int count;	1757	int count;
1714	Atom *props = XListProperties (THIS->display->display, window, &count);	1758	Atom *props = XListProperties (THIS->dpy, window, &count);
1715		1759
1716	EXTEND (SP, count);	1760	EXTEND (SP, count);
1717	while (count--)	1761	while (count--)
1718	PUSHs (newSVuv ((U32)props [count]));	1762	PUSHs (newSVuv ((U32)props [count]));
1719		1763
…		…
1728	int format;	1772	int format;
1729	unsigned long nitems;	1773	unsigned long nitems;
1730	unsigned long bytes_after;	1774	unsigned long bytes_after;
1731	unsigned char *prop;	1775	unsigned char *prop;
1732		1776
1733	XGetWindowProperty (THIS->display->display, window, property,	1777	XGetWindowProperty (THIS->dpy, window, property,
1734	0, 1<<24, 0, AnyPropertyType,	1778	0, 1<<24, 0, AnyPropertyType,
1735	&type, &format, &nitems, &bytes_after, &prop);	1779	&type, &format, &nitems, &bytes_after, &prop);
1736		1780
1737	if (type != None)	1781	if (type != None)
1738	{	1782	{
…		…
1757		1801
1758	int elemsize = format == 16 ? sizeof (short)	1802	int elemsize = format == 16 ? sizeof (short)
1759	: format == 32 ? sizeof (long)	1803	: format == 32 ? sizeof (long)
1760	: 1;	1804	: 1;
1761		1805
1762	XChangeProperty (THIS->display->display, window, property,	1806	XChangeProperty (THIS->dpy, window, property,
1763	type, format, PropModeReplace,	1807	type, format, PropModeReplace,
1764	(unsigned char *)data_, len / elemsize);	1808	(unsigned char *)data_, len / elemsize);
1765	XSync (THIS->display->display, 0);
1766	}	1809	}
1767		1810
1768	Atom	1811	Atom
1769	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1812	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)
1770	C_ARGS: term->display->display, atom_name, only_if_exists	1813	C_ARGS: term->dpy, atom_name, only_if_exists
1771		1814
1772	char *	1815	char *
1773	XGetAtomName (rxvt_term *term, Atom atom)	1816	XGetAtomName (rxvt_term *term, Atom atom)
1774	C_ARGS: term->display->display, atom	1817	C_ARGS: term->dpy, atom
1775	CLEANUP:	1818	CLEANUP:
1776	XFree (RETVAL);	1819	XFree (RETVAL);
1777		1820
1778	void	1821	void
1779	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1822	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1780	C_ARGS: term->display->display, window, property	1823	C_ARGS: term->dpy, window, property
1781		1824
1782	Window	1825	Window
1783	rxvt_term::DefaultRootWindow ()	1826	rxvt_term::DefaultRootWindow ()
1784	CODE:	1827	CODE:
1785	RETVAL = THIS->display->root;	1828	RETVAL = THIS->display->root;
…		…
1788		1831
1789	#if 0	1832	#if 0
1790		1833
1791	Window	1834	Window
1792	XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)	1835	XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1793	C_ARGS: term->display->display, (Window)parent,	1836	C_ARGS: term->dpy, (Window)parent,
1794	x, y, width, height, 0,	1837	x, y, width, height, 0,
1795	term->pix_colors_focused[Color_border],	1838	term->pix_colors_focused[Color_border],
1796	term->pix_colors_focused[Color_border]	1839	term->pix_colors_focused[Color_border]
1797		1840
1798	#endif	1841	#endif
1799		1842
1800	void	1843	void
1801	XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)	1844	XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1802	C_ARGS: term->display->display, window, parent, x, y	1845	C_ARGS: term->dpy, window, parent, x, y
1803		1846
1804	void	1847	void
1805	XMapWindow (rxvt_term *term, Window window)	1848	XMapWindow (rxvt_term *term, Window window)
1806	C_ARGS: term->display->display, window	1849	C_ARGS: term->dpy, window
1807		1850
1808	void	1851	void
1809	XUnmapWindow (rxvt_term *term, Window window)	1852	XUnmapWindow (rxvt_term *term, Window window)
1810	C_ARGS: term->display->display, window	1853	C_ARGS: term->dpy, window
1811		1854
1812	void	1855	void
1813	XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)	1856	XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1814	C_ARGS: term->display->display, window, x, y, width, height	1857	C_ARGS: term->dpy, window, x, y, width, height
1815		1858
1816	void	1859	void
1817	rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)	1860	rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1818	CODE:	1861	CODE:
1819	{	1862	{
1820	XWindowAttributes attr;	1863	XWindowAttributes attr;
1821	XGetWindowAttributes (THIS->display->display, window, &attr);	1864	XGetWindowAttributes (THIS->dpy, window, &attr);
1822	XSelectInput (THIS->display->display, window, attr.your_event_mask \| add_events & ~del_events);	1865	XSelectInput (THIS->dpy, window, attr.your_event_mask \| add_events & ~del_events);
1823	}	1866	}
1824		1867
1825	void	1868	void
1826	rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)	1869	rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1827	PPCODE:	1870	PPCODE:
1828	{	1871	{
1829	int dx, dy;	1872	int dx, dy;
1830	Window child;	1873	Window child;
1831		1874
1832	if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))	1875	if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1833	{	1876	{
1834	EXTEND (SP, 3);	1877	EXTEND (SP, 3);
1835	PUSHs (newSViv (dx));	1878	PUSHs (newSViv (dx));
1836	PUSHs (newSViv (dy));	1879	PUSHs (newSViv (dy));
1837	PUSHs (newSVuv (child));	1880	PUSHs (newSVuv (child));

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.91 by root, Wed Jan 25 00:42:21 2006 UTC vs. Revision 1.101 by root, Wed Jul 5 23:34:14 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.91 by root, Wed Jan 25 00:42:21 2006 UTC vs.
Revision 1.101 by root, Wed Jul 5 23:34:14 2006 UTC