[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.62 by root, Fri Jan 13 04:59:04 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 (!term->perl.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
…		…
599	# include "optinc.h"	659	# include "optinc.h"
600	# undef nodef	660	# undef nodef
601	# undef def	661	# undef def
602		662
603	HV *stash = gv_stashpv ("urxvt", 1);	663	HV *stash = gv_stashpv ("urxvt", 1);
604	# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));	664	struct {
		665	const char *name;
		666	IV iv;
		667	} *civ, const_iv[] = {
		668	# define const_iv(name) { # name, (IV)name }
605	export_const_iv (DEFAULT_RSTYLE);	669	const_iv (DEFAULT_RSTYLE),
606	export_const_iv (OVERLAY_RSTYLE);	670	const_iv (OVERLAY_RSTYLE),
607	export_const_iv (RS_Bold);	671	const_iv (RS_Bold),
608	export_const_iv (RS_Italic);	672	const_iv (RS_Italic),
609	export_const_iv (RS_Blink);	673	const_iv (RS_Blink),
610	export_const_iv (RS_RVid);	674	const_iv (RS_RVid),
611	export_const_iv (RS_Uline);	675	const_iv (RS_Uline),
612		676
613	export_const_iv (CurrentTime);	677	const_iv (CurrentTime),
614	export_const_iv (ShiftMask);	678	const_iv (ShiftMask),
615	export_const_iv (LockMask);	679	const_iv (LockMask),
616	export_const_iv (ControlMask);	680	const_iv (ControlMask),
617	export_const_iv (Mod1Mask);	681	const_iv (Mod1Mask),
618	export_const_iv (Mod2Mask);	682	const_iv (Mod2Mask),
619	export_const_iv (Mod3Mask);	683	const_iv (Mod3Mask),
620	export_const_iv (Mod4Mask);	684	const_iv (Mod4Mask),
621	export_const_iv (Mod5Mask);	685	const_iv (Mod5Mask),
622	export_const_iv (Button1Mask);	686	const_iv (Button1Mask),
623	export_const_iv (Button2Mask);	687	const_iv (Button2Mask),
624	export_const_iv (Button3Mask);	688	const_iv (Button3Mask),
625	export_const_iv (Button4Mask);	689	const_iv (Button4Mask),
626	export_const_iv (Button5Mask);	690	const_iv (Button5Mask),
627	export_const_iv (AnyModifier);	691	const_iv (AnyModifier),
		692
		693	const_iv (EVENT_NONE),
		694	const_iv (EVENT_READ),
		695	const_iv (EVENT_WRITE),
		696
		697	const_iv (NoEventMask),
		698	const_iv (KeyPressMask),
		699	const_iv (KeyReleaseMask),
		700	const_iv (ButtonPressMask),
		701	const_iv (ButtonReleaseMask),
		702	const_iv (EnterWindowMask),
		703	const_iv (LeaveWindowMask),
		704	const_iv (PointerMotionMask),
		705	const_iv (PointerMotionHintMask),
		706	const_iv (Button1MotionMask),
		707	const_iv (Button2MotionMask),
		708	const_iv (Button3MotionMask),
		709	const_iv (Button4MotionMask),
		710	const_iv (Button5MotionMask),
		711	const_iv (ButtonMotionMask),
		712	const_iv (KeymapStateMask),
		713	const_iv (ExposureMask),
		714	const_iv (VisibilityChangeMask),
		715	const_iv (StructureNotifyMask),
		716	const_iv (ResizeRedirectMask),
		717	const_iv (SubstructureNotifyMask),
		718	const_iv (SubstructureRedirectMask),
		719	const_iv (FocusChangeMask),
		720	const_iv (PropertyChangeMask),
		721	const_iv (ColormapChangeMask),
		722	const_iv (OwnerGrabButtonMask),
		723
		724	const_iv (KeyPress),
		725	const_iv (KeyRelease),
		726	const_iv (ButtonPress),
		727	const_iv (ButtonRelease),
		728	const_iv (MotionNotify),
		729	const_iv (EnterNotify),
		730	const_iv (LeaveNotify),
		731	const_iv (FocusIn),
		732	const_iv (FocusOut),
		733	const_iv (KeymapNotify),
		734	const_iv (Expose),
		735	const_iv (GraphicsExpose),
		736	const_iv (NoExpose),
		737	const_iv (VisibilityNotify),
		738	const_iv (CreateNotify),
		739	const_iv (DestroyNotify),
		740	const_iv (UnmapNotify),
		741	const_iv (MapNotify),
		742	const_iv (MapRequest),
		743	const_iv (ReparentNotify),
		744	const_iv (ConfigureNotify),
		745	const_iv (ConfigureRequest),
		746	const_iv (GravityNotify),
		747	const_iv (ResizeRequest),
		748	const_iv (CirculateNotify),
		749	const_iv (CirculateRequest),
		750	const_iv (PropertyNotify),
		751	const_iv (SelectionClear),
		752	const_iv (SelectionRequest),
		753	const_iv (SelectionNotify),
		754	const_iv (ColormapNotify),
		755	const_iv (ClientMessage),
		756	const_iv (MappingNotify),
		757	};
		758
		759	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
		760	civ-- > const_iv; )
		761	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
628	}	762	}
		763
		764	void
		765	warn (const char *msg)
		766	CODE:
		767	rxvt_warn ("%s", msg);
		768
		769	void
		770	fatal (const char *msg)
		771	CODE:
		772	rxvt_fatal ("%s", msg);
629		773
630	SV *	774	SV *
631	new (...)	775	untaint (SV *sv)
632	CODE:	776	CODE:
633	{	777	RETVAL = newSVsv (sv);
634	stringvec *argv = new stringvec;	778	SvTAINTED_off (RETVAL);
635	bool success;	779	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	780	RETVAL
659		781
660	void	782	void
661	set_should_invoke (int htype, int value)	783	_exit (int status)
662	CODE:
663	rxvt_perl.should_invoke [htype] = value;
664		784
665	void	785	bool
666	warn (const char *msg)	786	safe ()
667	CODE:	787	CODE:
668	rxvt_warn ("%s", msg);	788	RETVAL = !rxvt_tainted ();
669		789	OUTPUT:
670	void	790	RETVAL
671	fatal (const char *msg)
672	CODE:
673	rxvt_fatal ("%s", msg);
674		791
675	NV	792	NV
676	NOW ()	793	NOW ()
677	CODE:	794	CODE:
678	RETVAL = NOW;	795	RETVAL = NOW;
…		…
727	OUTPUT:	844	OUTPUT:
728	RETVAL	845	RETVAL
729		846
730	MODULE = urxvt PACKAGE = urxvt::term	847	MODULE = urxvt PACKAGE = urxvt::term
731		848
		849	SV *
		850	_new (...)
		851	CODE:
		852	{
		853	if (items < 1 \|\| !SvROK (ST (0)) \|\| SvTYPE (SvRV (ST (0))) != SVt_PVAV)
		854	croak ("first argument to urxvt::term->_new must be arrayref");
		855
		856	rxvt_term *term = new rxvt_term;
		857
		858	term->argv = new stringvec;
		859	term->envv = new stringvec;
		860
		861	for (int i = 1; i < items; i++)
		862	term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
		863
		864	AV envv = (AV )SvRV (ST (0));
		865	for (int i = av_len (envv) + 1; i--; )
		866	term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
		867
		868	term->envv->push_back (0);
		869
		870	bool success;
		871
		872	try
		873	{
		874	success = term->init (term->argv->size (), term->argv->begin ());
		875	}
		876	catch (const class rxvt_failure_exception &e)
		877	{
		878	success = false;
		879	}
		880
		881	if (!success)
		882	{
		883	term->destroy ();
		884	croak ("error while initializing new terminal instance");
		885	}
		886
		887	RETVAL = term && term->perl.self
		888	? newSVterm (term) : &PL_sv_undef;
		889	}
		890	OUTPUT:
		891	RETVAL
		892
732	void	893	void
733	rxvt_term::destroy ()	894	rxvt_term::destroy ()
		895
		896	void
		897	rxvt_term::set_should_invoke (int htype, int inc)
		898	CODE:
		899	THIS->perl.should_invoke [htype] += inc;
734		900
735	void	901	void
736	rxvt_term::grab_button (int button, U32 modifiers)	902	rxvt_term::grab_button (int button, U32 modifiers)
737	CODE:	903	CODE:
738	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,	904	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
739	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	905	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
740	GrabModeSync, GrabModeSync, None, None);	906	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
741		907
742	bool	908	bool
743	rxvt_term::grab (U32 eventtime, int sync = 0)	909	rxvt_term::grab (U32 eventtime, int sync = 0)
744	CODE:	910	CODE:
745	{	911	{
…		…
747		913
748	THIS->perl.grabtime = 0;	914	THIS->perl.grabtime = 0;
749		915
750	if (!XGrabPointer (THIS->display->display, THIS->vt, 0,	916	if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
751	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	917	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
752	mode, mode, None, None, eventtime))	918	mode, mode, None, GRAB_CURSOR, eventtime))
753	if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))	919	if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
754	THIS->perl.grabtime = eventtime;	920	THIS->perl.grabtime = eventtime;
755	else	921	else
756	XUngrabPointer (THIS->display->display, eventtime);	922	XUngrabPointer (THIS->display->display, eventtime);
757		923
…		…
759	}	925	}
760	OUTPUT:	926	OUTPUT:
761	RETVAL	927	RETVAL
762		928
763	void	929	void
764	rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)	930	rxvt_term::allow_events_async ()
765	CODE:	931	CODE:
766	XAllowEvents (THIS->display->display, AsyncBoth, eventtime);	932	XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
767		933
768	void	934	void
769	rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)	935	rxvt_term::allow_events_sync ()
770	CODE:	936	CODE:
771	XAllowEvents (THIS->display->display, SyncBoth, eventtime);	937	XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
772		938
773	void	939	void
774	rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)	940	rxvt_term::allow_events_replay ()
775	CODE:	941	CODE:
776	XAllowEvents (THIS->display->display, ReplayPointer, eventtime);	942	XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
777	XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);	943	XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
778		944
779	void	945	void
780	rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)	946	rxvt_term::ungrab ()
781	CODE:	947	CODE:
782	THIS->perl.grabtime = 0;	948	ungrab (THIS);
783	XUngrabKeyboard (THIS->display->display, eventtime);
784	XUngrabPointer (THIS->display->display, eventtime);
785		949
786	int	950	int
787	rxvt_term::strwidth (SV *str)	951	rxvt_term::strwidth (SV *str)
788	CODE:	952	CODE:
789	{	953	{
…		…
808	char *mbstr = rxvt_wcstombs (wstr);	972	char *mbstr = rxvt_wcstombs (wstr);
809	rxvt_pop_locale ();	973	rxvt_pop_locale ();
810		974
811	free (wstr);	975	free (wstr);
812		976
813	RETVAL = newSVpv (mbstr, 0);	977	RETVAL = taint_if (newSVpv (mbstr, 0), str);
814	free (mbstr);	978	free (mbstr);
815	}	979	}
816	OUTPUT:	980	OUTPUT:
817	RETVAL	981	RETVAL
818		982
…		…
825		989
826	rxvt_push_locale (THIS->locale);	990	rxvt_push_locale (THIS->locale);
827	wchar_t *wstr = rxvt_mbstowcs (data, len);	991	wchar_t *wstr = rxvt_mbstowcs (data, len);
828	rxvt_pop_locale ();	992	rxvt_pop_locale ();
829		993
830	RETVAL = wcs2sv (wstr);	994	RETVAL = taint_if (wcs2sv (wstr), octets);
831	free (wstr);	995	free (wstr);
832	}	996	}
833	OUTPUT:	997	OUTPUT:
834	RETVAL	998	RETVAL
835		999
…		…
882	case 2: RETVAL = THIS->ModNumLockMask; break;	1046	case 2: RETVAL = THIS->ModNumLockMask; break;
883	}	1047	}
884	OUTPUT:	1048	OUTPUT:
885	RETVAL	1049	RETVAL
886		1050
		1051	char *
		1052	rxvt_term::display_id ()
		1053	ALIAS:
		1054	display_id = 0
		1055	locale = 1
		1056	CODE:
		1057	switch (ix)
		1058	{
		1059	case 0: RETVAL = THIS->display->id; break;
		1060	case 1: RETVAL = THIS->locale; break;
		1061	}
		1062	OUTPUT:
		1063	RETVAL
		1064
		1065	SV *
		1066	rxvt_term::_env ()
		1067	CODE:
		1068	{
		1069	if (THIS->envv)
		1070	{
		1071	AV *av = newAV ();
		1072
		1073	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
		1074	if (*i)
		1075	av_push (av, newSVpv (*i, 0));
		1076
		1077	RETVAL = newRV_noinc ((SV *)av);
		1078	}
		1079	else
		1080	RETVAL = &PL_sv_undef;
		1081	}
		1082	OUTPUT:
		1083	RETVAL
		1084
		1085	int
		1086	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
		1087	CODE:
		1088	RETVAL = THIS->pty_ev.events;
		1089	if (events != EVENT_UNDEF)
		1090	THIS->pty_ev.set (events);
		1091	OUTPUT:
		1092	RETVAL
		1093
887	U32	1094	U32
888	rxvt_term::parent ()	1095	rxvt_term::parent ()
889	CODE:	1096	CODE:
890	RETVAL = (U32)THIS->parent [0];	1097	RETVAL = (U32)THIS->parent [0];
891	OUTPUT:	1098	OUTPUT:
…		…
896	CODE:	1103	CODE:
897	RETVAL = (U32)THIS->vt;	1104	RETVAL = (U32)THIS->vt;
898	OUTPUT:	1105	OUTPUT:
899	RETVAL	1106	RETVAL
900		1107
		1108	void
		1109	rxvt_term::vt_emask_add (U32 emask)
		1110	CODE:
		1111	THIS->vt_emask_perl \|= emask;
		1112	THIS->vt_select_input ();
		1113
901	U32	1114	U32
902	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)	1115	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
903	CODE:	1116	CODE:
904	{	1117	{
905	RETVAL = THIS->rstyle;	1118	RETVAL = THIS->rstyle;
…		…
908	OUTPUT:	1121	OUTPUT:
909	RETVAL	1122	RETVAL
910		1123
911	int	1124	int
912	rxvt_term::view_start (int newval = -1)	1125	rxvt_term::view_start (int newval = -1)
		1126	PROTOTYPE: $;$
913	CODE:	1127	CODE:
914	{	1128	{
915	RETVAL = THIS->view_start;	1129	RETVAL = THIS->view_start;
916		1130
917	if (newval >= 0)	1131	if (newval >= 0)
…		…
942	wchar_t *wstr = new wchar_t [THIS->ncol];	1156	wchar_t *wstr = new wchar_t [THIS->ncol];
943		1157
944	for (int col = 0; col < THIS->ncol; col++)	1158	for (int col = 0; col < THIS->ncol; col++)
945	wstr [col] = l.t [col];	1159	wstr [col] = l.t [col];
946		1160
947	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));	1161	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
948		1162
949	delete [] wstr;	1163	delete [] wstr;
950	}	1164	}
951		1165
952	if (new_text)	1166	if (new_text)
…		…
1073	else	1287	else
1074	r++ = s;	1288	r++ = s;
1075		1289
1076	rxvt_pop_locale ();	1290	rxvt_pop_locale ();
1077		1291
1078	RETVAL = wcs2sv (rstr, r - rstr);	1292	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1079		1293
1080	delete [] rstr;	1294	delete [] rstr;
1081	}	1295	}
1082	OUTPUT:	1296	OUTPUT:
1083	RETVAL	1297	RETVAL
…		…
1109	else if (IS_COMPOSE (*s))	1323	else if (IS_COMPOSE (*s))
1110	r += rxvt_composite.expand (*s, r);	1324	r += rxvt_composite.expand (*s, r);
1111	else	1325	else
1112	r++ = s;	1326	r++ = s;
1113		1327
1114	RETVAL = wcs2sv (rstr, r - rstr);	1328	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1115		1329
1116	delete [] rstr;	1330	delete [] rstr;
1117	}	1331	}
1118	OUTPUT:	1332	OUTPUT:
1119	RETVAL	1333	RETVAL
…		…
1141		1355
1142	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1356	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1143	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);	1357	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1144		1358
1145	if (GIMME_V != G_VOID)	1359	if (GIMME_V != G_VOID)
1146	XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);	1360	XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1147		1361
1148	if (newval)	1362	if (newval)
1149	{	1363	{
1150	if (SvOK (newval))	1364	if (SvOK (newval))
1151	{	1365	{
…		…
1156	else	1370	else
1157	THIS->rs [index] = 0;	1371	THIS->rs [index] = 0;
1158	}	1372	}
1159	}	1373	}
1160		1374
		1375	const char *
		1376	rxvt_term::x_resource (const char *name)
		1377	CLEANUP:
		1378	SvTAINTED_on (ST (0));
		1379
		1380	bool
		1381	rxvt_term::option (U32 optval, int set = -1)
		1382	CODE:
		1383	{
		1384	RETVAL = THIS->options & optval;
		1385
		1386	if (set >= 0)
		1387	{
		1388	if (set)
		1389	THIS->options \|= optval;
		1390	else
		1391	THIS->options &= ~optval;
		1392
		1393	switch (optval)
		1394	{
		1395	case Opt_skipBuiltinGlyphs:
		1396	THIS->set_fonts ();
		1397	THIS->scr_remap_chars ();
		1398	THIS->scr_touch (true);
		1399	THIS->want_refresh = 1;
		1400	break;
		1401
		1402	case Opt_cursorUnderline:
		1403	THIS->want_refresh = 1;
		1404	break;
		1405
		1406	# case Opt_scrollBar_floating:
		1407	# case Opt_scrollBar_right:
		1408	# THIS->resize_all_windows (THIS->width, THIS->height, 1);
		1409	# break;
		1410	}
		1411	}
		1412	}
		1413	OUTPUT:
		1414	RETVAL
		1415
		1416	bool
		1417	rxvt_term::parse_keysym (char keysym, char str)
		1418	CODE:
		1419	RETVAL = 0 < THIS->parse_keysym (keysym, str);
		1420	THIS->keyboard->register_done ();
		1421	OUTPUT:
		1422	RETVAL
		1423
1161	void	1424	void
1162	rxvt_term::cur (...)	1425	rxvt_term::screen_cur (...)
1163	PROTOTYPE: $;$$	1426	PROTOTYPE: $;$$
1164	ALIAS:	1427	ALIAS:
1165	screen_cur = 0	1428	screen_cur = 0
1166	selection_beg = 1	1429	selection_beg = 1
1167	selection_end = 2	1430	selection_end = 2
…		…
1188	if (ix)	1451	if (ix)
1189	THIS->want_refresh = 1;	1452	THIS->want_refresh = 1;
1190	}	1453	}
1191	}	1454	}
1192		1455
		1456	char
		1457	rxvt_term::cur_charset ()
		1458	CODE:
		1459	RETVAL = THIS->charsets [THIS->screen.charset];
		1460	OUTPUT:
		1461	RETVAL
		1462
		1463	#void
		1464	#rxvt_term::selection_clear ()
		1465
		1466	void
		1467	rxvt_term::selection_make (U32 eventtime, bool rect = false)
		1468	CODE:
		1469	THIS->selection.op = SELECTION_CONT;
		1470	THIS->selection.rect = rect;
		1471	THIS->selection_make (eventtime);
		1472
1193	int	1473	int
1194	rxvt_term::selection_grab (U32 eventtime)	1474	rxvt_term::selection_grab (U32 eventtime)
1195		1475
1196	void	1476	void
1197	rxvt_term::selection (SV *newtext = 0)	1477	rxvt_term::selection (SV *newtext = 0)
1198	PPCODE:	1478	PPCODE:
1199	{	1479	{
1200	if (GIMME_V != G_VOID)	1480	if (GIMME_V != G_VOID)
		1481	XPUSHs (THIS->selection.text
1201	XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));	1482	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
		1483	: &PL_sv_undef);
1202		1484
1203	if (newtext)	1485	if (newtext)
1204	{	1486	{
1205	free (THIS->selection.text);	1487	free (THIS->selection.text);
1206		1488
1207	THIS->selection.text = sv2wcs (newtext);	1489	THIS->selection.text = sv2wcs (newtext);
1208	THIS->selection.len = wcslen (THIS->selection.text);	1490	THIS->selection.len = wcslen (THIS->selection.text);
1209	}	1491	}
1210	}	1492	}
		1493
		1494	void
		1495	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)
		1496
		1497	void
		1498	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
		1499
		1500	void
		1501	rxvt_term::scr_bell ()
1211		1502
1212	void	1503	void
1213	rxvt_term::scr_add_lines (SV *string)	1504	rxvt_term::scr_add_lines (SV *string)
1214	CODE:	1505	CODE:
1215	{	1506	{

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.62 by root, Fri Jan 13 04:59:04 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.62 by root, Fri Jan 13 04:59:04 2006 UTC