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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.41 by root, Sun Jan 8 03:07:05 2006 UTC vs.
Revision 1.64 by root, Fri Jan 13 15:42:50 2006 UTC

…		…
29	#include "../config.h"	29	#include "../config.h"
30		30
31	#include <cstddef>	31	#include <cstddef>
32	#include <cstdarg>	32	#include <cstdarg>
33		33
		34	#include "unistd.h"
		35
		36	#include "iom.h"
34	#include "rxvt.h"	37	#include "rxvt.h"
35	#include "iom.h"	38	#include "keyboard.h"
36	#include "rxvtutil.h"	39	#include "rxvtutil.h"
37	#include "rxvtperl.h"	40	#include "rxvtperl.h"
38		41
39	#include "perlxsi.c"	42	#include "perlxsi.c"
40		43
…		…
47	#undef LINENO	50	#undef LINENO
48	#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)
49	#undef ROW	52	#undef ROW
50	#define ROW(n) THIS->row_buf [LINENO (n)]	53	#define ROW(n) THIS->row_buf [LINENO (n)]
51		54
		55	#define ENABLE_PERL_FRILLS 1
		56
52	/////////////////////////////////////////////////////////////////////////////	57	/////////////////////////////////////////////////////////////////////////////
		58
		59	static SV *
		60	taint (SV *sv)
		61	{
		62	SvTAINT (sv);
		63	return sv;
		64	}
		65
		66	static SV *
		67	taint_if (SV sv, SV src)
		68	{
		69	if (SvTAINTED (src))
		70	SvTAINT (sv);
		71
		72	return sv;
		73	}
53		74
54	static wchar_t *	75	static wchar_t *
55	sv2wcs (SV *sv)	76	sv2wcs (SV *sv)
56	{	77	{
57	STRLEN len;	78	STRLEN len;
…		…
376		397
377	struct rxvt_perl_interp rxvt_perl;	398	struct rxvt_perl_interp rxvt_perl;
378		399
379	static PerlInterpreter *perl;	400	static PerlInterpreter *perl;
380		401
381	rxvt_perl_interp::rxvt_perl_interp ()
382	{
383	}
384
385	rxvt_perl_interp::~rxvt_perl_interp ()	402	rxvt_perl_interp::~rxvt_perl_interp ()
386	{	403	{
387	if (perl)	404	if (perl)
388	{	405	{
389	perl_destruct (perl);	406	perl_destruct (perl);
…		…
394	void	411	void
395	rxvt_perl_interp::init ()	412	rxvt_perl_interp::init ()
396	{	413	{
397	if (!perl)	414	if (!perl)
398	{	415	{
		416	perl_environ = rxvt_environ;
		417	swap (perl_environ, environ);
		418
399	char *argv[] = {	419	char *argv[] = {
400	"",	420	"",
		421	"-T",
401	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",	422	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
402	};	423	};
403		424
404	perl = perl_alloc ();	425	perl = perl_alloc ();
405	perl_construct (perl);	426	perl_construct (perl);
406		427
407	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)	428	if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
408	\|\| perl_run (perl))	429	\|\| perl_run (perl))
409	{	430	{
410	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");	431	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
411		432
412	perl_destruct (perl);	433	perl_destruct (perl);
413	perl_free (perl);	434	perl_free (perl);
414	perl = 0;	435	perl = 0;
415	}	436	}
		437
		438	swap (perl_environ, environ);
		439	}
		440	}
		441
		442	static void
		443	ungrab (rxvt_term *THIS)
		444	{
		445	if (THIS->perl.grabtime)
		446	{
		447	XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
		448	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
		449	THIS->perl.grabtime = 0;
416	}	450	}
417	}	451	}
418		452
419	bool	453	bool
420	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	454	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
…		…
431	return false; // perl not initialized for this instance	465	return false; // perl not initialized for this instance
432	else if (htype == HOOK_DESTROY)	466	else if (htype == HOOK_DESTROY)
433	{	467	{
434	// handled later	468	// handled later
435	}	469	}
436	else if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)	470	else
437	{	471	{
438	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	472	if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
439
440	if (HvKEYS (hv))
441	{	473	{
		474	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
		475
		476	if (HvKEYS (hv))
		477	{
442	hv_iterinit (hv);	478	hv_iterinit (hv);
443		479
444	while (HE *he = hv_iternext (hv))	480	while (HE *he = hv_iternext (hv))
445	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();	481	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
		482	}
		483
446	}	484	}
		485
		486	if (!term->perl.should_invoke [htype])
		487	return false;
447	}	488	}
448	else if (!should_invoke [htype])
449	return false;
450		489
		490	swap (perl_environ, environ);
		491
		492	try
		493	{
451	dSP;	494	dSP;
452	va_list ap;	495	va_list ap;
453		496
454	va_start (ap, htype);	497	va_start (ap, htype);
455		498
456	ENTER;	499	ENTER;
457	SAVETMPS;	500	SAVETMPS;
458		501
459	PUSHMARK (SP);	502	PUSHMARK (SP);
460		503
461	XPUSHs (sv_2mortal (newSVterm (term)));	504	XPUSHs (sv_2mortal (newSVterm (term)));
462	XPUSHs (sv_2mortal (newSViv (htype)));	505	XPUSHs (sv_2mortal (newSViv (htype)));
463		506
464	for (;;) {	507	for (;;) {
465	data_type dt = (data_type)va_arg (ap, int);	508	data_type dt = (data_type)va_arg (ap, int);
466		509
467	switch (dt)	510	switch (dt)
468	{	511	{
469	case DT_INT:	512	case DT_INT:
470	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));	513	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
471	break;	514	break;
472		515
473	case DT_LONG:	516	case DT_LONG:
474	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));	517	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
475	break;	518	break;
476		519
477	case DT_STR:	520	case DT_STR:
478	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));	521	XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
479	break;	522	break;
480		523
481	case DT_STR_LEN:	524	case DT_STR_LEN:
482	{	525	{
483	char str = va_arg (ap, char );	526	char str = va_arg (ap, char );
484	int len = va_arg (ap, int);	527	int len = va_arg (ap, int);
485		528
486	XPUSHs (sv_2mortal (newSVpvn (str, len)));	529	XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
487	}	530	}
488	break;	531	break;
489		532
490	case DT_WCS_LEN:	533	case DT_WCS_LEN:
491	{	534	{
492	wchar_t wstr = va_arg (ap, wchar_t );	535	wchar_t wstr = va_arg (ap, wchar_t );
493	int wlen = va_arg (ap, int);	536	int wlen = va_arg (ap, int);
494		537
495	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));	538	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
496	}	539	}
497	break;	540	break;
498		541
499	case DT_XEVENT:	542	case DT_XEVENT:
500	{	543	{
501	XEvent xe = va_arg (ap, XEvent );	544	XEvent xe = va_arg (ap, XEvent );
502	HV *hv = newHV ();	545	HV *hv = newHV ();
503		546
504	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)	547	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
505	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)	548	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
506	# undef set	549	# undef set
507		550
508	setiv (type, xe->type);	551	setiv (type, xe->type);
509	setiv (send_event, xe->xany.send_event);	552	setiv (send_event, xe->xany.send_event);
510	setiv (serial, xe->xany.serial);	553	setiv (serial, xe->xany.serial);
511		554
512	switch (xe->type)	555	switch (xe->type)
		556	{
		557	case KeyPress:
		558	case KeyRelease:
		559	case ButtonPress:
		560	case ButtonRelease:
		561	case MotionNotify:
		562	setiv (time, xe->xmotion.time);
		563	setiv (x, xe->xmotion.x);
		564	setiv (y, xe->xmotion.y);
		565	setiv (row, xe->xmotion.y / term->fheight);
		566	setiv (col, xe->xmotion.x / term->fwidth);
		567	setiv (x_root, xe->xmotion.x_root);
		568	setiv (y_root, xe->xmotion.y_root);
		569	setiv (state, xe->xmotion.state);
		570	break;
		571	}
		572
		573	switch (xe->type)
		574	{
		575	case KeyPress:
		576	case KeyRelease:
		577	setiv (keycode, xe->xkey.keycode);
		578	break;
		579
		580	case ButtonPress:
		581	case ButtonRelease:
		582	setiv (button, xe->xbutton.button);
		583	break;
		584
		585	case MotionNotify:
		586	setiv (is_hint, xe->xmotion.is_hint);
		587	break;
		588	}
		589
		590	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		591	}
		592	break;
		593
		594	case DT_END:
513	{	595	{
514	case KeyPress:	596	va_end (ap);
515	case KeyRelease:	597
516	case ButtonPress:	598	PUTBACK;
517	case ButtonRelease:	599	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
518	case MotionNotify:	600	SPAGAIN;
519	setiv (time, xe->xmotion.time);	601
520	setiv (x, xe->xmotion.x);	602	if (count)
521	setiv (y, xe->xmotion.y);
522	setiv (row, xe->xmotion.y / term->fheight);
523	setiv (col, xe->xmotion.x / term->fwidth);
524	setiv (x_root, xe->xmotion.x_root);
525	setiv (y_root, xe->xmotion.y_root);
526	setiv (state, xe->xmotion.state);
527	break;	603	{
		604	SV *status = POPs;
		605	count = SvTRUE (status);
		606	}
		607
		608	PUTBACK;
		609	FREETMPS;
		610	LEAVE;
		611
		612	if (SvTRUE (ERRSV))
		613	{
		614	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
		615	ungrab (term); // better lose the grab than the session
		616	}
		617
		618	if (htype == HOOK_DESTROY)
		619	{
		620	clearSVptr ((SV *)term->perl.self);
		621	SvREFCNT_dec ((SV *)term->perl.self);
		622	}
		623
		624	swap (perl_environ, environ);
		625	return count;
528	}	626	}
529		627
530	switch (xe->type)
531	{
532	case KeyPress:
533	case KeyRelease:
534	setiv (keycode, xe->xkey.keycode);
535	break;
536
537	case ButtonPress:
538	case ButtonRelease:
539	setiv (button, xe->xbutton.button);
540	break;
541
542	case MotionNotify:
543	setiv (is_hint, xe->xmotion.is_hint);
544	break;
545	}
546
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
548	}
549	break;
550
551	case DT_END:
552	{
553	va_end (ap);
554
555	PUTBACK;
556	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
557	SPAGAIN;
558
559	if (count)
560	{
561	SV *status = POPs;
562	count = SvTRUE (status);
563	}
564
565	PUTBACK;
566	FREETMPS;
567	LEAVE;
568
569	if (SvTRUE (ERRSV))
570	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
571
572	if (htype == HOOK_DESTROY)
573	{
574	clearSVptr ((SV *)term->perl.self);
575	SvREFCNT_dec ((SV *)term->perl.self);
576	}
577
578	return count;
579	}
580
581	default:	628	default:
582	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);	629	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
		630	}
583	}	631	}
584	}	632	}
		633	catch (...)
		634	{
		635	swap (perl_environ, environ);
		636	throw;
		637	}
585	}	638	}
586		639
587	/////////////////////////////////////////////////////////////////////////////	640	/////////////////////////////////////////////////////////////////////////////
588		641
589	MODULE = urxvt PACKAGE = urxvt	642	MODULE = urxvt PACKAGE = urxvt
590		643
591	PROTOTYPES: ENABLE	644	PROTOTYPES: ENABLE
592		645
593	BOOT:	646	BOOT:
594	{	647	{
595	sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));	648	sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
		649	sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
		650	sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
		651	sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
596		652
597	AV *hookname = get_av ("urxvt::HOOKNAME", 1);	653	AV *hookname = get_av ("urxvt::HOOKNAME", 1);
598	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));	654	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
599	# include "hookinc.h"	655	# include "hookinc.h"
600	# undef def	656	# undef def
…		…
605	# include "optinc.h"	661	# include "optinc.h"
606	# undef nodef	662	# undef nodef
607	# undef def	663	# undef def
608		664
609	HV *stash = gv_stashpv ("urxvt", 1);	665	HV *stash = gv_stashpv ("urxvt", 1);
610	# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));	666	struct {
		667	const char *name;
		668	IV iv;
		669	} *civ, const_iv[] = {
		670	# define const_iv(name) { # name, (IV)name }
611	export_const_iv (DEFAULT_RSTYLE);	671	const_iv (DEFAULT_RSTYLE),
612	export_const_iv (OVERLAY_RSTYLE);	672	const_iv (OVERLAY_RSTYLE),
613	export_const_iv (RS_Bold);	673	const_iv (RS_Bold),
614	export_const_iv (RS_Italic);	674	const_iv (RS_Italic),
615	export_const_iv (RS_Blink);	675	const_iv (RS_Blink),
616	export_const_iv (RS_RVid);	676	const_iv (RS_RVid),
617	export_const_iv (RS_Uline);	677	const_iv (RS_Uline),
618		678
619	export_const_iv (CurrentTime);	679	const_iv (CurrentTime),
620	export_const_iv (ShiftMask);	680	const_iv (ShiftMask),
621	export_const_iv (LockMask);	681	const_iv (LockMask),
622	export_const_iv (ControlMask);	682	const_iv (ControlMask),
623	export_const_iv (Mod1Mask);	683	const_iv (Mod1Mask),
624	export_const_iv (Mod2Mask);	684	const_iv (Mod2Mask),
625	export_const_iv (Mod3Mask);	685	const_iv (Mod3Mask),
626	export_const_iv (Mod4Mask);	686	const_iv (Mod4Mask),
627	export_const_iv (Mod5Mask);	687	const_iv (Mod5Mask),
628	export_const_iv (Button1Mask);	688	const_iv (Button1Mask),
629	export_const_iv (Button2Mask);	689	const_iv (Button2Mask),
630	export_const_iv (Button3Mask);	690	const_iv (Button3Mask),
631	export_const_iv (Button4Mask);	691	const_iv (Button4Mask),
632	export_const_iv (Button5Mask);	692	const_iv (Button5Mask),
633	export_const_iv (AnyModifier);	693	const_iv (AnyModifier),
		694
		695	const_iv (EVENT_NONE),
		696	const_iv (EVENT_READ),
		697	const_iv (EVENT_WRITE),
		698
		699	const_iv (NoEventMask),
		700	const_iv (KeyPressMask),
		701	const_iv (KeyReleaseMask),
		702	const_iv (ButtonPressMask),
		703	const_iv (ButtonReleaseMask),
		704	const_iv (EnterWindowMask),
		705	const_iv (LeaveWindowMask),
		706	const_iv (PointerMotionMask),
		707	const_iv (PointerMotionHintMask),
		708	const_iv (Button1MotionMask),
		709	const_iv (Button2MotionMask),
		710	const_iv (Button3MotionMask),
		711	const_iv (Button4MotionMask),
		712	const_iv (Button5MotionMask),
		713	const_iv (ButtonMotionMask),
		714	const_iv (KeymapStateMask),
		715	const_iv (ExposureMask),
		716	const_iv (VisibilityChangeMask),
		717	const_iv (StructureNotifyMask),
		718	const_iv (ResizeRedirectMask),
		719	const_iv (SubstructureNotifyMask),
		720	const_iv (SubstructureRedirectMask),
		721	const_iv (FocusChangeMask),
		722	const_iv (PropertyChangeMask),
		723	const_iv (ColormapChangeMask),
		724	const_iv (OwnerGrabButtonMask),
		725
		726	const_iv (KeyPress),
		727	const_iv (KeyRelease),
		728	const_iv (ButtonPress),
		729	const_iv (ButtonRelease),
		730	const_iv (MotionNotify),
		731	const_iv (EnterNotify),
		732	const_iv (LeaveNotify),
		733	const_iv (FocusIn),
		734	const_iv (FocusOut),
		735	const_iv (KeymapNotify),
		736	const_iv (Expose),
		737	const_iv (GraphicsExpose),
		738	const_iv (NoExpose),
		739	const_iv (VisibilityNotify),
		740	const_iv (CreateNotify),
		741	const_iv (DestroyNotify),
		742	const_iv (UnmapNotify),
		743	const_iv (MapNotify),
		744	const_iv (MapRequest),
		745	const_iv (ReparentNotify),
		746	const_iv (ConfigureNotify),
		747	const_iv (ConfigureRequest),
		748	const_iv (GravityNotify),
		749	const_iv (ResizeRequest),
		750	const_iv (CirculateNotify),
		751	const_iv (CirculateRequest),
		752	const_iv (PropertyNotify),
		753	const_iv (SelectionClear),
		754	const_iv (SelectionRequest),
		755	const_iv (SelectionNotify),
		756	const_iv (ColormapNotify),
		757	const_iv (ClientMessage),
		758	const_iv (MappingNotify),
		759	};
		760
		761	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
		762	civ-- > const_iv; )
		763	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
634	}	764	}
		765
		766	void
		767	warn (const char *msg)
		768	CODE:
		769	rxvt_warn ("%s", msg);
		770
		771	void
		772	fatal (const char *msg)
		773	CODE:
		774	rxvt_fatal ("%s", msg);
635		775
636	SV *	776	SV *
637	new (...)	777	untaint (SV *sv)
638	CODE:	778	CODE:
639	{	779	RETVAL = newSVsv (sv);
640	stringvec *argv = new stringvec;	780	SvTAINTED_off (RETVAL);
641	bool success;	781	OUTPUT:
642
643	for (int i = 0; i < items ;i++)
644	argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
645
646	rxvt_term *term = new rxvt_term;
647
648	term->argv = argv;
649
650	try
651	{
652	if (!term->init (argv->size (), argv->begin ()))
653	term = 0;
654	}
655	catch (const class rxvt_failure_exception &e)
656	{
657	term->destroy ();
658	croak ("exception caught while initializing new terminal instance");
659	}
660
661	RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
662	}
663	OUTPUT:
664	RETVAL	782	RETVAL
665		783
666	void	784	void
667	set_should_invoke (int htype, int value)	785	_exit (int status)
668	CODE:
669	rxvt_perl.should_invoke [htype] = value;
670		786
671	void	787	bool
672	warn (const char *msg)	788	safe ()
673	CODE:	789	CODE:
674	rxvt_warn ("%s", msg);	790	RETVAL = !rxvt_tainted ();
675		791	OUTPUT:
676	void	792	RETVAL
677	fatal (const char *msg)
678	CODE:
679	rxvt_fatal ("%s", msg);
680		793
681	NV	794	NV
682	NOW ()	795	NOW ()
683	CODE:	796	CODE:
684	RETVAL = NOW;	797	RETVAL = NOW;
…		…
733	OUTPUT:	846	OUTPUT:
734	RETVAL	847	RETVAL
735		848
736	MODULE = urxvt PACKAGE = urxvt::term	849	MODULE = urxvt PACKAGE = urxvt::term
737		850
		851	SV *
		852	_new (...)
		853	CODE:
		854	{
		855	if (items < 1 \|\| !SvROK (ST (0)) \|\| SvTYPE (SvRV (ST (0))) != SVt_PVAV)
		856	croak ("first argument to urxvt::term->_new must be arrayref");
		857
		858	rxvt_term *term = new rxvt_term;
		859
		860	term->argv = new stringvec;
		861	term->envv = new stringvec;
		862
		863	for (int i = 1; i < items; i++)
		864	term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
		865
		866	AV envv = (AV )SvRV (ST (0));
		867	for (int i = av_len (envv) + 1; i--; )
		868	term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
		869
		870	term->envv->push_back (0);
		871
		872	bool success;
		873
		874	try
		875	{
		876	success = term->init (term->argv->size (), term->argv->begin ());
		877	}
		878	catch (const class rxvt_failure_exception &e)
		879	{
		880	success = false;
		881	}
		882
		883	if (!success)
		884	{
		885	term->destroy ();
		886	croak ("error while initializing new terminal instance");
		887	}
		888
		889	RETVAL = term && term->perl.self
		890	? newSVterm (term) : &PL_sv_undef;
		891	}
		892	OUTPUT:
		893	RETVAL
		894
738	void	895	void
739	rxvt_term::destroy ()	896	rxvt_term::destroy ()
		897
		898	#if ENABLE_PERL_FRILLS
		899
		900	void
		901	rxvt_term::XListProperties (U32 window)
		902	PPCODE:
		903	{
		904	int count;
		905	Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
		906
		907	EXTEND (SP, count);
		908	while (count--)
		909	PUSHs (newSVuv ((U32)props [count]));
		910
		911	XFree (props);
		912	}
		913
		914	void
		915	rxvt_term::XGetWindowProperty (U32 window, U32 property)
		916	PPCODE:
		917	{
		918	Atom type;
		919	int format;
		920	unsigned long nitems;
		921	unsigned long bytes_after;
		922	unsigned char *prop;
		923	XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
		924	0, 1<<30, 0, AnyPropertyType,
		925	&type, &format, &nitems, &bytes_after, &prop);
		926	if (type != None)
		927	{
		928	EXTEND (SP, 3);
		929	PUSHs (newSVuv ((U32)type));
		930	PUSHs (newSViv (format));
		931	PUSHs (newSVpvn ((char )prop, nitems format / 8));
		932	XFree (prop);
		933	}
		934	}
		935
		936	void
		937	rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
		938	CODE:
		939	{
		940	STRLEN len;
		941	char *data_ = SvPVbyte (data, len);
		942
		943	XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
		944	type, format, PropModeReplace,
		945	(unsigned char )data, len 8 / format);
		946	}
		947
		948	void
		949	rxvt_term::XDeleteProperty (U32 window, U32 property)
		950	CODE:
		951	XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
		952
		953	U32
		954	rxvt_term::DefaultRootWindow ()
		955	CODE:
		956	RETVAL = (U32)THIS->display->root;
		957	OUTPUT:
		958	RETVAL
		959
		960	U32
		961	rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
		962	CODE:
		963	RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
		964	x, y, width, height, 0,
		965	THIS->pix_colors_focused[Color_border],
		966	THIS->pix_colors_focused[Color_border]);
		967	OUTPUT:
		968	RETVAL
		969
		970	void
		971	rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
		972	CODE:
		973	XReparentWindow (THIS->display->display, window, parent, x, y);
		974
		975	#endif
		976
		977	void
		978	rxvt_term::set_should_invoke (int htype, int inc)
		979	CODE:
		980	THIS->perl.should_invoke [htype] += inc;
740		981
741	void	982	void
742	rxvt_term::grab_button (int button, U32 modifiers)	983	rxvt_term::grab_button (int button, U32 modifiers)
743	CODE:	984	CODE:
744	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,	985	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
…		…
765	}	1006	}
766	OUTPUT:	1007	OUTPUT:
767	RETVAL	1008	RETVAL
768		1009
769	void	1010	void
770	rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)	1011	rxvt_term::allow_events_async ()
771	CODE:	1012	CODE:
772	XAllowEvents (THIS->display->display, AsyncBoth, eventtime);	1013	XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
773		1014
774	void	1015	void
775	rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)	1016	rxvt_term::allow_events_sync ()
776	CODE:	1017	CODE:
777	XAllowEvents (THIS->display->display, SyncBoth, eventtime);	1018	XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
778		1019
779	void	1020	void
780	rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)	1021	rxvt_term::allow_events_replay ()
781	CODE:	1022	CODE:
782	XAllowEvents (THIS->display->display, ReplayPointer, eventtime);	1023	XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
783	XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);	1024	XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
784		1025
785	void	1026	void
786	rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)	1027	rxvt_term::ungrab ()
787	CODE:	1028	CODE:
788	THIS->perl.grabtime = 0;	1029	ungrab (THIS);
789	XUngrabKeyboard (THIS->display->display, eventtime);
790	XUngrabPointer (THIS->display->display, eventtime);
791		1030
792	int	1031	int
793	rxvt_term::strwidth (SV *str)	1032	rxvt_term::strwidth (SV *str)
794	CODE:	1033	CODE:
795	{	1034	{
…		…
814	char *mbstr = rxvt_wcstombs (wstr);	1053	char *mbstr = rxvt_wcstombs (wstr);
815	rxvt_pop_locale ();	1054	rxvt_pop_locale ();
816		1055
817	free (wstr);	1056	free (wstr);
818		1057
819	RETVAL = newSVpv (mbstr, 0);	1058	RETVAL = taint_if (newSVpv (mbstr, 0), str);
820	free (mbstr);	1059	free (mbstr);
821	}	1060	}
822	OUTPUT:	1061	OUTPUT:
823	RETVAL	1062	RETVAL
824		1063
…		…
831		1070
832	rxvt_push_locale (THIS->locale);	1071	rxvt_push_locale (THIS->locale);
833	wchar_t *wstr = rxvt_mbstowcs (data, len);	1072	wchar_t *wstr = rxvt_mbstowcs (data, len);
834	rxvt_pop_locale ();	1073	rxvt_pop_locale ();
835		1074
836	RETVAL = wcs2sv (wstr);	1075	RETVAL = taint_if (wcs2sv (wstr), octets);
837	free (wstr);	1076	free (wstr);
838	}	1077	}
839	OUTPUT:	1078	OUTPUT:
840	RETVAL	1079	RETVAL
841		1080
…		…
888	case 2: RETVAL = THIS->ModNumLockMask; break;	1127	case 2: RETVAL = THIS->ModNumLockMask; break;
889	}	1128	}
890	OUTPUT:	1129	OUTPUT:
891	RETVAL	1130	RETVAL
892		1131
		1132	char *
		1133	rxvt_term::display_id ()
		1134	ALIAS:
		1135	display_id = 0
		1136	locale = 1
		1137	CODE:
		1138	switch (ix)
		1139	{
		1140	case 0: RETVAL = THIS->display->id; break;
		1141	case 1: RETVAL = THIS->locale; break;
		1142	}
		1143	OUTPUT:
		1144	RETVAL
		1145
		1146	SV *
		1147	rxvt_term::_env ()
		1148	CODE:
		1149	{
		1150	if (THIS->envv)
		1151	{
		1152	AV *av = newAV ();
		1153
		1154	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
		1155	if (*i)
		1156	av_push (av, newSVpv (*i, 0));
		1157
		1158	RETVAL = newRV_noinc ((SV *)av);
		1159	}
		1160	else
		1161	RETVAL = &PL_sv_undef;
		1162	}
		1163	OUTPUT:
		1164	RETVAL
		1165
		1166	int
		1167	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
		1168	CODE:
		1169	RETVAL = THIS->pty_ev.events;
		1170	if (events != EVENT_UNDEF)
		1171	THIS->pty_ev.set (events);
		1172	OUTPUT:
		1173	RETVAL
		1174
893	U32	1175	U32
894	rxvt_term::parent ()	1176	rxvt_term::parent ()
895	CODE:	1177	CODE:
896	RETVAL = (U32)THIS->parent [0];	1178	RETVAL = (U32)THIS->parent [0];
897	OUTPUT:	1179	OUTPUT:
…		…
902	CODE:	1184	CODE:
903	RETVAL = (U32)THIS->vt;	1185	RETVAL = (U32)THIS->vt;
904	OUTPUT:	1186	OUTPUT:
905	RETVAL	1187	RETVAL
906		1188
		1189	void
		1190	rxvt_term::vt_emask_add (U32 emask)
		1191	CODE:
		1192	THIS->vt_emask_perl \|= emask;
		1193	THIS->vt_select_input ();
		1194
907	U32	1195	U32
908	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)	1196	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
909	CODE:	1197	CODE:
910	{
911	RETVAL = THIS->rstyle;	1198	RETVAL = THIS->rstyle;
912	THIS->rstyle = new_rstyle;	1199	THIS->rstyle = new_rstyle;
913	}
914	OUTPUT:	1200	OUTPUT:
915	RETVAL	1201	RETVAL
916		1202
917	int	1203	int
918	rxvt_term::view_start (int newval = -1)	1204	rxvt_term::view_start (int newval = -1)
		1205	PROTOTYPE: $;$
919	CODE:	1206	CODE:
920	{	1207	{
921	RETVAL = THIS->view_start;	1208	RETVAL = THIS->view_start;
922		1209
923	if (newval >= 0)	1210	if (newval >= 0)
…		…
948	wchar_t *wstr = new wchar_t [THIS->ncol];	1235	wchar_t *wstr = new wchar_t [THIS->ncol];
949		1236
950	for (int col = 0; col < THIS->ncol; col++)	1237	for (int col = 0; col < THIS->ncol; col++)
951	wstr [col] = l.t [col];	1238	wstr [col] = l.t [col];
952		1239
953	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));	1240	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
954		1241
955	delete [] wstr;	1242	delete [] wstr;
956	}	1243	}
957		1244
958	if (new_text)	1245	if (new_text)
…		…
1079	else	1366	else
1080	r++ = s;	1367	r++ = s;
1081		1368
1082	rxvt_pop_locale ();	1369	rxvt_pop_locale ();
1083		1370
1084	RETVAL = wcs2sv (rstr, r - rstr);	1371	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1085		1372
1086	delete [] rstr;	1373	delete [] rstr;
1087	}	1374	}
1088	OUTPUT:	1375	OUTPUT:
1089	RETVAL	1376	RETVAL
…		…
1115	else if (IS_COMPOSE (*s))	1402	else if (IS_COMPOSE (*s))
1116	r += rxvt_composite.expand (*s, r);	1403	r += rxvt_composite.expand (*s, r);
1117	else	1404	else
1118	r++ = s;	1405	r++ = s;
1119		1406
1120	RETVAL = wcs2sv (rstr, r - rstr);	1407	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1121		1408
1122	delete [] rstr;	1409	delete [] rstr;
1123	}	1410	}
1124	OUTPUT:	1411	OUTPUT:
1125	RETVAL	1412	RETVAL
…		…
1147		1434
1148	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1435	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1149	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);	1436	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1150		1437
1151	if (GIMME_V != G_VOID)	1438	if (GIMME_V != G_VOID)
1152	XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);	1439	XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1153		1440
1154	if (newval)	1441	if (newval)
1155	{	1442	{
1156	if (SvOK (newval))	1443	if (SvOK (newval))
1157	{	1444	{
…		…
1162	else	1449	else
1163	THIS->rs [index] = 0;	1450	THIS->rs [index] = 0;
1164	}	1451	}
1165	}	1452	}
1166		1453
		1454	const char *
		1455	rxvt_term::x_resource (const char *name)
		1456	CLEANUP:
		1457	SvTAINTED_on (ST (0));
		1458
1167	bool	1459	bool
1168	rxvt_term::option (U32 optval, int set = -1)	1460	rxvt_term::option (U32 optval, int set = -1)
1169	CODE:	1461	CODE:
1170	{	1462	{
1171	RETVAL = THIS->options & optval;	1463	RETVAL = THIS->options & optval;
…		…
1198	}	1490	}
1199	}	1491	}
1200	OUTPUT:	1492	OUTPUT:
1201	RETVAL	1493	RETVAL
1202		1494
		1495	bool
		1496	rxvt_term::parse_keysym (char keysym, char str)
		1497	CODE:
		1498	RETVAL = 0 < THIS->parse_keysym (keysym, str);
		1499	THIS->keyboard->register_done ();
		1500	OUTPUT:
		1501	RETVAL
		1502
1203	void	1503	void
1204	rxvt_term::cur (...)	1504	rxvt_term::screen_cur (...)
1205	PROTOTYPE: $;$$	1505	PROTOTYPE: $;$$
1206	ALIAS:	1506	ALIAS:
1207	screen_cur = 0	1507	screen_cur = 0
1208	selection_beg = 1	1508	selection_beg = 1
1209	selection_end = 2	1509	selection_end = 2
…		…
1230	if (ix)	1530	if (ix)
1231	THIS->want_refresh = 1;	1531	THIS->want_refresh = 1;
1232	}	1532	}
1233	}	1533	}
1234		1534
		1535	char
		1536	rxvt_term::cur_charset ()
		1537	CODE:
		1538	RETVAL = THIS->charsets [THIS->screen.charset];
		1539	OUTPUT:
		1540	RETVAL
		1541
		1542	#void
		1543	#rxvt_term::selection_clear ()
		1544
		1545	void
		1546	rxvt_term::selection_make (U32 eventtime, bool rect = false)
		1547	CODE:
		1548	THIS->selection.op = SELECTION_CONT;
		1549	THIS->selection.rect = rect;
		1550	THIS->selection_make (eventtime);
		1551
1235	int	1552	int
1236	rxvt_term::selection_grab (U32 eventtime)	1553	rxvt_term::selection_grab (U32 eventtime)
1237		1554
1238	void	1555	void
1239	rxvt_term::selection (SV *newtext = 0)	1556	rxvt_term::selection (SV *newtext = 0)
1240	PPCODE:	1557	PPCODE:
1241	{	1558	{
1242	if (GIMME_V != G_VOID)	1559	if (GIMME_V != G_VOID)
		1560	XPUSHs (THIS->selection.text
1243	XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));	1561	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
		1562	: &PL_sv_undef);
1244		1563
1245	if (newtext)	1564	if (newtext)
1246	{	1565	{
1247	free (THIS->selection.text);	1566	free (THIS->selection.text);
1248		1567
1249	THIS->selection.text = sv2wcs (newtext);	1568	THIS->selection.text = sv2wcs (newtext);
1250	THIS->selection.len = wcslen (THIS->selection.text);	1569	THIS->selection.len = wcslen (THIS->selection.text);
1251	}	1570	}
1252	}	1571	}
		1572
		1573	void
		1574	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid \| RS_Uline)
		1575
		1576	void
		1577	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
		1578
		1579	void
		1580	rxvt_term::scr_bell ()
1253		1581
1254	void	1582	void
1255	rxvt_term::scr_add_lines (SV *string)	1583	rxvt_term::scr_add_lines (SV *string)
1256	CODE:	1584	CODE:
1257	{	1585	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.41 by root, Sun Jan 8 03:07:05 2006 UTC vs. Revision 1.64 by root, Fri Jan 13 15:42:50 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.41 by root, Sun Jan 8 03:07:05 2006 UTC vs.
Revision 1.64 by root, Fri Jan 13 15:42:50 2006 UTC