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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.38 by root, Sat Jan 7 21:22:02 2006 UTC vs. Revision 1.57 by root, Thu Jan 12 01:30:53 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.38 by root, Sat Jan 7 21:22:02 2006 UTC vs.
Revision 1.57 by root, Thu Jan 12 01:30:53 2006 UTC