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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.39 by root, Sat Jan 7 23:18:56 2006 UTC vs. Revision 1.60 by root, Thu Jan 12 05:22:47 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.39 by root, Sat Jan 7 23:18:56 2006 UTC vs.
Revision 1.60 by root, Thu Jan 12 05:22:47 2006 UTC