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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.40 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.58 by root, Thu Jan 12 01:38:37 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 "iom.h"
34	#include "rxvt.h"	35	#include "rxvt.h"
35	#include "iom.h"	36	#include "keyboard.h"
36	#include "rxvtutil.h"	37	#include "rxvtutil.h"
37	#include "rxvtperl.h"	38	#include "rxvtperl.h"
38		39
39	#include "perlxsi.c"	40	#include "perlxsi.c"
		41
		42	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)
		43	# define GRAB_CURSOR THIS->leftptr_cursor
		44	#else
		45	# define GRAB_CURSOR None
		46	#endif
40		47
41	#undef LINENO	48	#undef LINENO
42	#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)	49	#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
43	#undef ROW	50	#undef ROW
44	#define ROW(n) THIS->row_buf [LINENO (n)]	51	#define ROW(n) THIS->row_buf [LINENO (n)]
45		52
46	/////////////////////////////////////////////////////////////////////////////	53	/////////////////////////////////////////////////////////////////////////////
		54
		55	static SV *
		56	taint (SV *sv)
		57	{
		58	SvTAINT (sv);
		59	return sv;
		60	}
		61
		62	static SV *
		63	taint_if (SV sv, SV src)
		64	{
		65	if (SvTAINTED (src))
		66	SvTAINT (sv);
		67
		68	return sv;
		69	}
47		70
48	static wchar_t *	71	static wchar_t *
49	sv2wcs (SV *sv)	72	sv2wcs (SV *sv)
50	{	73	{
51	STRLEN len;	74	STRLEN len;
…		…
370		393
371	struct rxvt_perl_interp rxvt_perl;	394	struct rxvt_perl_interp rxvt_perl;
372		395
373	static PerlInterpreter *perl;	396	static PerlInterpreter *perl;
374		397
375	rxvt_perl_interp::rxvt_perl_interp ()
376	{
377	}
378
379	rxvt_perl_interp::~rxvt_perl_interp ()	398	rxvt_perl_interp::~rxvt_perl_interp ()
380	{	399	{
381	if (perl)	400	if (perl)
382	{	401	{
383	perl_destruct (perl);	402	perl_destruct (perl);
…		…
388	void	407	void
389	rxvt_perl_interp::init ()	408	rxvt_perl_interp::init ()
390	{	409	{
391	if (!perl)	410	if (!perl)
392	{	411	{
		412	perl_environ = rxvt_environ;
		413	swap (perl_environ, environ);
		414
393	char *argv[] = {	415	char *argv[] = {
394	"",	416	"",
		417	"-T",
395	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",	418	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
396	};	419	};
397		420
398	perl = perl_alloc ();	421	perl = perl_alloc ();
399	perl_construct (perl);	422	perl_construct (perl);
400		423
401	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)	424	if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
402	\|\| perl_run (perl))	425	\|\| perl_run (perl))
403	{	426	{
404	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");	427	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
405		428
406	perl_destruct (perl);	429	perl_destruct (perl);
407	perl_free (perl);	430	perl_free (perl);
408	perl = 0;	431	perl = 0;
409	}	432	}
		433
		434	swap (perl_environ, environ);
		435	}
		436	}
		437
		438	static void
		439	ungrab (rxvt_term *THIS)
		440	{
		441	if (THIS->perl.grabtime)
		442	{
		443	XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
		444	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
		445	THIS->perl.grabtime = 0;
410	}	446	}
411	}	447	}
412		448
413	bool	449	bool
414	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	450	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
…		…
425	return false; // perl not initialized for this instance	461	return false; // perl not initialized for this instance
426	else if (htype == HOOK_DESTROY)	462	else if (htype == HOOK_DESTROY)
427	{	463	{
428	// handled later	464	// handled later
429	}	465	}
430	else if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)	466	else
431	{	467	{
432	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	468	if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
433
434	if (HvKEYS (hv))
435	{	469	{
		470	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
		471
		472	if (HvKEYS (hv))
		473	{
436	hv_iterinit (hv);	474	hv_iterinit (hv);
437		475
438	while (HE *he = hv_iternext (hv))	476	while (HE *he = hv_iternext (hv))
439	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();	477	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
		478	}
		479
440	}	480	}
		481
		482	if (!should_invoke [htype])
		483	return false;
441	}	484	}
442	else if (!should_invoke [htype])
443	return false;
444		485
		486	swap (perl_environ, environ);
		487
		488	try
		489	{
445	dSP;	490	dSP;
446	va_list ap;	491	va_list ap;
447		492
448	va_start (ap, htype);	493	va_start (ap, htype);
449		494
450	ENTER;	495	ENTER;
451	SAVETMPS;	496	SAVETMPS;
452		497
453	PUSHMARK (SP);	498	PUSHMARK (SP);
454		499
455	XPUSHs (sv_2mortal (newSVterm (term)));	500	XPUSHs (sv_2mortal (newSVterm (term)));
456	XPUSHs (sv_2mortal (newSViv (htype)));	501	XPUSHs (sv_2mortal (newSViv (htype)));
457		502
458	for (;;) {	503	for (;;) {
459	data_type dt = (data_type)va_arg (ap, int);	504	data_type dt = (data_type)va_arg (ap, int);
460		505
461	switch (dt)	506	switch (dt)
462	{	507	{
463	case DT_INT:	508	case DT_INT:
464	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));	509	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
465	break;	510	break;
466		511
467	case DT_LONG:	512	case DT_LONG:
468	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));	513	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
469	break;	514	break;
470		515
471	case DT_STR:	516	case DT_STR:
472	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));	517	XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
473	break;	518	break;
474		519
475	case DT_STR_LEN:	520	case DT_STR_LEN:
476	{	521	{
477	char str = va_arg (ap, char );	522	char str = va_arg (ap, char );
478	int len = va_arg (ap, int);	523	int len = va_arg (ap, int);
479		524
480	XPUSHs (sv_2mortal (newSVpvn (str, len)));	525	XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
481	}	526	}
482	break;	527	break;
483		528
484	case DT_WCS_LEN:	529	case DT_WCS_LEN:
485	{	530	{
486	wchar_t wstr = va_arg (ap, wchar_t );	531	wchar_t wstr = va_arg (ap, wchar_t );
487	int wlen = va_arg (ap, int);	532	int wlen = va_arg (ap, int);
488		533
489	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));	534	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
490	}	535	}
491	break;	536	break;
492		537
493	case DT_XEVENT:	538	case DT_XEVENT:
494	{	539	{
495	XEvent xe = va_arg (ap, XEvent );	540	XEvent xe = va_arg (ap, XEvent );
496	HV *hv = newHV ();	541	HV *hv = newHV ();
497		542
498	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)	543	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
499	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)	544	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
500	# undef set	545	# undef set
501		546
502	setiv (type, xe->type);	547	setiv (type, xe->type);
503	setiv (send_event, xe->xany.send_event);	548	setiv (send_event, xe->xany.send_event);
504	setiv (serial, xe->xany.serial);	549	setiv (serial, xe->xany.serial);
505		550
506	switch (xe->type)	551	switch (xe->type)
		552	{
		553	case KeyPress:
		554	case KeyRelease:
		555	case ButtonPress:
		556	case ButtonRelease:
		557	case MotionNotify:
		558	setiv (time, xe->xmotion.time);
		559	setiv (x, xe->xmotion.x);
		560	setiv (y, xe->xmotion.y);
		561	setiv (row, xe->xmotion.y / term->fheight);
		562	setiv (col, xe->xmotion.x / term->fwidth);
		563	setiv (x_root, xe->xmotion.x_root);
		564	setiv (y_root, xe->xmotion.y_root);
		565	setiv (state, xe->xmotion.state);
		566	break;
		567	}
		568
		569	switch (xe->type)
		570	{
		571	case KeyPress:
		572	case KeyRelease:
		573	setiv (keycode, xe->xkey.keycode);
		574	break;
		575
		576	case ButtonPress:
		577	case ButtonRelease:
		578	setiv (button, xe->xbutton.button);
		579	break;
		580
		581	case MotionNotify:
		582	setiv (is_hint, xe->xmotion.is_hint);
		583	break;
		584	}
		585
		586	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		587	}
		588	break;
		589
		590	case DT_END:
507	{	591	{
508	case KeyPress:	592	va_end (ap);
509	case KeyRelease:	593
510	case ButtonPress:	594	PUTBACK;
511	case ButtonRelease:	595	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
512	case MotionNotify:	596	SPAGAIN;
513	setiv (time, xe->xmotion.time);	597
514	setiv (x, xe->xmotion.x);	598	if (count)
515	setiv (y, xe->xmotion.y);
516	setiv (row, xe->xmotion.y / term->fheight);
517	setiv (col, xe->xmotion.x / term->fwidth);
518	setiv (x_root, xe->xmotion.x_root);
519	setiv (y_root, xe->xmotion.y_root);
520	setiv (state, xe->xmotion.state);
521	break;	599	{
		600	SV *status = POPs;
		601	count = SvTRUE (status);
		602	}
		603
		604	PUTBACK;
		605	FREETMPS;
		606	LEAVE;
		607
		608	if (SvTRUE (ERRSV))
		609	{
		610	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
		611	ungrab (term); // better lose the grab than the session
		612	}
		613
		614	if (htype == HOOK_DESTROY)
		615	{
		616	clearSVptr ((SV *)term->perl.self);
		617	SvREFCNT_dec ((SV *)term->perl.self);
		618	}
		619
		620	swap (perl_environ, environ);
		621	return count;
522	}	622	}
523		623
524	switch (xe->type)
525	{
526	case KeyPress:
527	case KeyRelease:
528	setiv (keycode, xe->xkey.keycode);
529	break;
530
531	case ButtonPress:
532	case ButtonRelease:
533	setiv (button, xe->xbutton.button);
534	break;
535
536	case MotionNotify:
537	setiv (is_hint, xe->xmotion.is_hint);
538	break;
539	}
540
541	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
542	}
543	break;
544
545	case DT_END:
546	{
547	va_end (ap);
548
549	PUTBACK;
550	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
551	SPAGAIN;
552
553	if (count)
554	{
555	SV *status = POPs;
556	count = SvTRUE (status);
557	}
558
559	PUTBACK;
560	FREETMPS;
561	LEAVE;
562
563	if (SvTRUE (ERRSV))
564	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
565
566	if (htype == HOOK_DESTROY)
567	{
568	clearSVptr ((SV *)term->perl.self);
569	SvREFCNT_dec ((SV *)term->perl.self);
570	}
571
572	return count;
573	}
574
575	default:	624	default:
576	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);	625	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
		626	}
577	}	627	}
578	}	628	}
		629	catch (...)
		630	{
		631	swap (perl_environ, environ);
		632	throw;
		633	}
579	}	634	}
580		635
581	/////////////////////////////////////////////////////////////////////////////	636	/////////////////////////////////////////////////////////////////////////////
582		637
583	MODULE = urxvt PACKAGE = urxvt	638	MODULE = urxvt PACKAGE = urxvt
584		639
585	PROTOTYPES: ENABLE	640	PROTOTYPES: ENABLE
586		641
587	BOOT:	642	BOOT:
588	{	643	{
589	sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));	644	sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
		645	sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
		646	sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
		647	sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
590		648
591	AV *hookname = get_av ("urxvt::HOOKNAME", 1);	649	AV *hookname = get_av ("urxvt::HOOKNAME", 1);
592	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));	650	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
593	# include "hookinc.h"	651	# include "hookinc.h"
594	# undef def	652	# undef def
…		…
623	export_const_iv (Button2Mask);	681	export_const_iv (Button2Mask);
624	export_const_iv (Button3Mask);	682	export_const_iv (Button3Mask);
625	export_const_iv (Button4Mask);	683	export_const_iv (Button4Mask);
626	export_const_iv (Button5Mask);	684	export_const_iv (Button5Mask);
627	export_const_iv (AnyModifier);	685	export_const_iv (AnyModifier);
		686
		687	export_const_iv (EVENT_NONE);
		688	export_const_iv (EVENT_READ);
		689	export_const_iv (EVENT_WRITE);
628	}	690	}
		691
		692	void
		693	set_should_invoke (int htype, int value)
		694	CODE:
		695	rxvt_perl.should_invoke [htype] = value;
		696
		697	void
		698	warn (const char *msg)
		699	CODE:
		700	rxvt_warn ("%s", msg);
		701
		702	void
		703	fatal (const char *msg)
		704	CODE:
		705	rxvt_fatal ("%s", msg);
629		706
630	SV *	707	SV *
631	new (...)	708	untaint (SV *sv)
632	CODE:	709	CODE:
633	{	710	RETVAL = newSVsv (sv);
634	stringvec *argv = new stringvec;	711	SvTAINTED_off (RETVAL);
635	bool success;	712	OUTPUT:
636
637	for (int i = 0; i < items ;i++)
638	argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
639
640	rxvt_term *term = new rxvt_term;
641
642	term->argv = argv;
643
644	try
645	{
646	if (!term->init (argv->size (), argv->begin ()))
647	term = 0;
648	}
649	catch (const class rxvt_failure_exception &e)
650	{
651	term->destroy ();
652	croak ("exception caught while initializing new terminal instance");
653	}
654
655	RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
656	}
657	OUTPUT:
658	RETVAL	713	RETVAL
659		714
660	void	715	bool
661	set_should_invoke (int htype, int value)	716	safe ()
662	CODE:	717	CODE:
663	rxvt_perl.should_invoke [htype] = value;	718	RETVAL = !rxvt_tainted ();
664		719	OUTPUT:
665	void	720	RETVAL
666	warn (const char *msg)
667	CODE:
668	rxvt_warn ("%s", msg);
669
670	void
671	fatal (const char *msg)
672	CODE:
673	rxvt_fatal ("%s", msg);
674		721
675	NV	722	NV
676	NOW ()	723	NOW ()
677	CODE:	724	CODE:
678	RETVAL = NOW;	725	RETVAL = NOW;
…		…
727	OUTPUT:	774	OUTPUT:
728	RETVAL	775	RETVAL
729		776
730	MODULE = urxvt PACKAGE = urxvt::term	777	MODULE = urxvt PACKAGE = urxvt::term
731		778
		779	SV *
		780	_new (...)
		781	CODE:
		782	{
		783	if (items < 1 \|\| !SvROK (ST (0)) \|\| SvTYPE (SvRV (ST (0))) != SVt_PVAV)
		784	croak ("first argument to urxvt::term->_new must be arrayref");
		785
		786	rxvt_term *term = new rxvt_term;
		787
		788	term->argv = new stringvec;
		789	term->envv = new stringvec;
		790
		791	for (int i = 1; i < items; i++)
		792	term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
		793
		794	AV envv = (AV )SvRV (ST (0));
		795	for (int i = av_len (envv) + 1; i--; )
		796	term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
		797
		798	term->envv->push_back (0);
		799
		800	bool success;
		801
		802	try
		803	{
		804	success = term->init (term->argv->size (), term->argv->begin ());
		805	}
		806	catch (const class rxvt_failure_exception &e)
		807	{
		808	success = false;
		809	}
		810
		811	if (!success)
		812	{
		813	term->destroy ();
		814	croak ("error while initializing new terminal instance");
		815	}
		816
		817	RETVAL = term && term->perl.self
		818	? newSVterm (term) : &PL_sv_undef;
		819	}
		820	OUTPUT:
		821	RETVAL
		822
732	void	823	void
733	rxvt_term::destroy ()	824	rxvt_term::destroy ()
734		825
735	void	826	void
736	rxvt_term::grab_button (int button, U32 modifiers)	827	rxvt_term::grab_button (int button, U32 modifiers)
737	CODE:	828	CODE:
738	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,	829	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
739	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	830	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
740	GrabModeSync, GrabModeSync, None, None);	831	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
741		832
742	bool	833	bool
743	rxvt_term::grab (U32 eventtime, int sync = 0)	834	rxvt_term::grab (U32 eventtime, int sync = 0)
744	CODE:	835	CODE:
745	{	836	{
…		…
747		838
748	THIS->perl.grabtime = 0;	839	THIS->perl.grabtime = 0;
749		840
750	if (!XGrabPointer (THIS->display->display, THIS->vt, 0,	841	if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
751	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	842	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
752	mode, mode, None, None, eventtime))	843	mode, mode, None, GRAB_CURSOR, eventtime))
753	if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))	844	if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
754	THIS->perl.grabtime = eventtime;	845	THIS->perl.grabtime = eventtime;
755	else	846	else
756	XUngrabPointer (THIS->display->display, eventtime);	847	XUngrabPointer (THIS->display->display, eventtime);
757		848
…		…
759	}	850	}
760	OUTPUT:	851	OUTPUT:
761	RETVAL	852	RETVAL
762		853
763	void	854	void
764	rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)	855	rxvt_term::allow_events_async ()
765	CODE:	856	CODE:
766	XAllowEvents (THIS->display->display, AsyncBoth, eventtime);	857	XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
767		858
768	void	859	void
769	rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)	860	rxvt_term::allow_events_sync ()
770	CODE:	861	CODE:
771	XAllowEvents (THIS->display->display, SyncBoth, eventtime);	862	XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
772		863
773	void	864	void
774	rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)	865	rxvt_term::allow_events_replay ()
775	CODE:	866	CODE:
776	XAllowEvents (THIS->display->display, ReplayPointer, eventtime);	867	XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
777	XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);	868	XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
778		869
779	void	870	void
780	rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)	871	rxvt_term::ungrab ()
781	CODE:	872	CODE:
782	THIS->perl.grabtime = 0;	873	ungrab (THIS);
783	XUngrabKeyboard (THIS->display->display, eventtime);
784	XUngrabPointer (THIS->display->display, eventtime);
785		874
786	int	875	int
787	rxvt_term::strwidth (SV *str)	876	rxvt_term::strwidth (SV *str)
788	CODE:	877	CODE:
789	{	878	{
…		…
808	char *mbstr = rxvt_wcstombs (wstr);	897	char *mbstr = rxvt_wcstombs (wstr);
809	rxvt_pop_locale ();	898	rxvt_pop_locale ();
810		899
811	free (wstr);	900	free (wstr);
812		901
813	RETVAL = newSVpv (mbstr, 0);	902	RETVAL = taint_if (newSVpv (mbstr, 0), str);
814	free (mbstr);	903	free (mbstr);
815	}	904	}
816	OUTPUT:	905	OUTPUT:
817	RETVAL	906	RETVAL
818		907
…		…
825		914
826	rxvt_push_locale (THIS->locale);	915	rxvt_push_locale (THIS->locale);
827	wchar_t *wstr = rxvt_mbstowcs (data, len);	916	wchar_t *wstr = rxvt_mbstowcs (data, len);
828	rxvt_pop_locale ();	917	rxvt_pop_locale ();
829		918
830	RETVAL = wcs2sv (wstr);	919	RETVAL = taint_if (wcs2sv (wstr), octets);
831	free (wstr);	920	free (wstr);
832	}	921	}
833	OUTPUT:	922	OUTPUT:
834	RETVAL	923	RETVAL
835		924
…		…
882	case 2: RETVAL = THIS->ModNumLockMask; break;	971	case 2: RETVAL = THIS->ModNumLockMask; break;
883	}	972	}
884	OUTPUT:	973	OUTPUT:
885	RETVAL	974	RETVAL
886		975
		976	char *
		977	rxvt_term::display_id ()
		978	ALIAS:
		979	display_id = 0
		980	locale = 1
		981	CODE:
		982	switch (ix)
		983	{
		984	case 0: RETVAL = THIS->display->id; break;
		985	case 1: RETVAL = THIS->locale; break;
		986	}
		987	OUTPUT:
		988	RETVAL
		989
		990	SV *
		991	rxvt_term::_env ()
		992	CODE:
		993	{
		994	if (THIS->envv)
		995	{
		996	AV *av = newAV ();
		997
		998	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
		999	if (*i)
		1000	av_push (av, newSVpv (*i, 0));
		1001
		1002	RETVAL = newRV_noinc ((SV *)av);
		1003	}
		1004	else
		1005	RETVAL = &PL_sv_undef;
		1006	}
		1007	OUTPUT:
		1008	RETVAL
		1009
		1010	int
		1011	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
		1012	CODE:
		1013	RETVAL = THIS->pty_ev.events;
		1014	if (events != EVENT_UNDEF)
		1015	THIS->pty_ev.set (events);
		1016	OUTPUT:
		1017	RETVAL
		1018
887	U32	1019	U32
888	rxvt_term::parent ()	1020	rxvt_term::parent ()
889	CODE:	1021	CODE:
890	RETVAL = (U32)THIS->parent [0];	1022	RETVAL = (U32)THIS->parent [0];
891	OUTPUT:	1023	OUTPUT:
…		…
942	wchar_t *wstr = new wchar_t [THIS->ncol];	1074	wchar_t *wstr = new wchar_t [THIS->ncol];
943		1075
944	for (int col = 0; col < THIS->ncol; col++)	1076	for (int col = 0; col < THIS->ncol; col++)
945	wstr [col] = l.t [col];	1077	wstr [col] = l.t [col];
946		1078
947	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));	1079	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
948		1080
949	delete [] wstr;	1081	delete [] wstr;
950	}	1082	}
951		1083
952	if (new_text)	1084	if (new_text)
…		…
1073	else	1205	else
1074	r++ = s;	1206	r++ = s;
1075		1207
1076	rxvt_pop_locale ();	1208	rxvt_pop_locale ();
1077		1209
1078	RETVAL = wcs2sv (rstr, r - rstr);	1210	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1079		1211
1080	delete [] rstr;	1212	delete [] rstr;
1081	}	1213	}
1082	OUTPUT:	1214	OUTPUT:
1083	RETVAL	1215	RETVAL
…		…
1109	else if (IS_COMPOSE (*s))	1241	else if (IS_COMPOSE (*s))
1110	r += rxvt_composite.expand (*s, r);	1242	r += rxvt_composite.expand (*s, r);
1111	else	1243	else
1112	r++ = s;	1244	r++ = s;
1113		1245
1114	RETVAL = wcs2sv (rstr, r - rstr);	1246	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1115		1247
1116	delete [] rstr;	1248	delete [] rstr;
1117	}	1249	}
1118	OUTPUT:	1250	OUTPUT:
1119	RETVAL	1251	RETVAL
…		…
1141		1273
1142	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1274	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1143	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);	1275	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1144		1276
1145	if (GIMME_V != G_VOID)	1277	if (GIMME_V != G_VOID)
1146	XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);	1278	XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1147		1279
1148	if (newval)	1280	if (newval)
1149	{	1281	{
1150	if (SvOK (newval))	1282	if (SvOK (newval))
1151	{	1283	{
…		…
1156	else	1288	else
1157	THIS->rs [index] = 0;	1289	THIS->rs [index] = 0;
1158	}	1290	}
1159	}	1291	}
1160		1292
		1293	const char *
		1294	rxvt_term::x_resource (const char *name)
		1295	CLEANUP:
		1296	SvTAINTED_on (ST (0));
		1297
1161	bool	1298	bool
1162	rxvt_term::option (U32 optval, int set = -1)	1299	rxvt_term::option (U32 optval, int set = -1)
1163	CODE:	1300	CODE:
1164	{	1301	{
1165	RETVAL = THIS->options & optval;	1302	RETVAL = THIS->options & optval;
…		…
1192	}	1329	}
1193	}	1330	}
1194	OUTPUT:	1331	OUTPUT:
1195	RETVAL	1332	RETVAL
1196		1333
		1334	bool
		1335	rxvt_term::parse_keysym (char keysym, char str)
		1336	CODE:
		1337	RETVAL = 0 < THIS->parse_keysym (keysym, str);
		1338	THIS->keyboard->register_done ();
		1339	OUTPUT:
		1340	RETVAL
		1341
1197	void	1342	void
1198	rxvt_term::cur (...)	1343	rxvt_term::screen_cur (...)
1199	PROTOTYPE: $;$$	1344	PROTOTYPE: $;$$
1200	ALIAS:	1345	ALIAS:
1201	screen_cur = 0	1346	screen_cur = 0
1202	selection_beg = 1	1347	selection_beg = 1
1203	selection_end = 2	1348	selection_end = 2
…		…
1224	if (ix)	1369	if (ix)
1225	THIS->want_refresh = 1;	1370	THIS->want_refresh = 1;
1226	}	1371	}
1227	}	1372	}
1228		1373
		1374	char
		1375	rxvt_term::cur_charset ()
		1376	CODE:
		1377	RETVAL = THIS->charsets [THIS->screen.charset];
		1378	OUTPUT:
		1379	RETVAL
		1380
1229	int	1381	int
1230	rxvt_term::selection_grab (U32 eventtime)	1382	rxvt_term::selection_grab (U32 eventtime)
1231		1383
1232	void	1384	void
1233	rxvt_term::selection (SV *newtext = 0)	1385	rxvt_term::selection (SV *newtext = 0)
1234	PPCODE:	1386	PPCODE:
1235	{	1387	{
1236	if (GIMME_V != G_VOID)	1388	if (GIMME_V != G_VOID)
		1389	XPUSHs (THIS->selection.text
1237	XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));	1390	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
		1391	: &PL_sv_undef);
1238		1392
1239	if (newtext)	1393	if (newtext)
1240	{	1394	{
1241	free (THIS->selection.text);	1395	free (THIS->selection.text);
1242		1396
1243	THIS->selection.text = sv2wcs (newtext);	1397	THIS->selection.text = sv2wcs (newtext);
1244	THIS->selection.len = wcslen (THIS->selection.text);	1398	THIS->selection.len = wcslen (THIS->selection.text);
1245	}	1399	}
1246	}	1400	}
		1401
		1402	void
		1403	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)
		1404
		1405	void
		1406	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
		1407
		1408	void
		1409	rxvt_term::scr_bell ()
1247		1410
1248	void	1411	void
1249	rxvt_term::scr_add_lines (SV *string)	1412	rxvt_term::scr_add_lines (SV *string)
1250	CODE:	1413	CODE:
1251	{	1414	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.40 by root, Sun Jan 8 00:07:18 2006 UTC vs. Revision 1.58 by root, Thu Jan 12 01:38:37 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.40 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.58 by root, Thu Jan 12 01:38:37 2006 UTC