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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.58 by root, Thu Jan 12 01:38:37 2006 UTC vs.
Revision 1.73 by root, Wed Jan 18 09:40: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 "unistd.h"
		35
34	#include "iom.h"	36	#include "iom.h"
35	#include "rxvt.h"	37	#include "rxvt.h"
36	#include "keyboard.h"	38	#include "keyboard.h"
37	#include "rxvtutil.h"	39	#include "rxvtutil.h"
38	#include "rxvtperl.h"	40	#include "rxvtperl.h"
39		41
40	#include "perlxsi.c"	42	#include "perlxsi.c"
41		43
42	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	44	#ifdef HAVE_SCROLLBARS
43	# define GRAB_CURSOR THIS->leftptr_cursor	45	# define GRAB_CURSOR THIS->leftptr_cursor
44	#else	46	#else
45	# define GRAB_CURSOR None	47	# define GRAB_CURSOR None
46	#endif	48	#endif
47		49
48	#undef LINENO	50	#undef LINENO
49	#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)
50	#undef ROW	52	#undef ROW
51	#define ROW(n) THIS->row_buf [LINENO (n)]	53	#define ROW(n) THIS->row_buf [LINENO (n)]
52		54
		55	#define ENABLE_PERL_FRILLS 1
		56
53	/////////////////////////////////////////////////////////////////////////////	57	/////////////////////////////////////////////////////////////////////////////
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	}
70		58
71	static wchar_t *	59	static wchar_t *
72	sv2wcs (SV *sv)	60	sv2wcs (SV *sv)
73	{	61	{
74	STRLEN len;	62	STRLEN len;
…		…
345	for (int y = ov_h; y--; )	333	for (int y = ov_h; y--; )
346	{	334	{
347	text_t *t1 = text [y];	335	text_t *t1 = text [y];
348	rend_t *r1 = rend [y];	336	rend_t *r1 = rend [y];
349		337
350	text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;	338	text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
351	rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;	339	rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
352		340
353	for (int x = ov_w; x--; )	341	for (int x = ov_w; x--; )
354	{	342	{
355	text_t t = t1; t1++ = t2; t2++ = t;	343	text_t t = t1; t1++ = t2; t2++ = t;
356	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));	344	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
…		…
403	perl_free (perl);	391	perl_free (perl);
404	}	392	}
405	}	393	}
406		394
407	void	395	void
408	rxvt_perl_interp::init ()	396	rxvt_perl_interp::init (rxvt_term *term)
409	{	397	{
410	if (!perl)	398	if (!perl)
411	{	399	{
		400	rxvt_push_locale (""); // perl init destroys current locale
		401
412	perl_environ = rxvt_environ;	402	perl_environ = rxvt_environ;
413	swap (perl_environ, environ);	403	swap (perl_environ, environ);
414		404
415	char *argv[] = {	405	char *argv[] = {
416	"",	406	"",
417	"-T",	407	"-e"
418	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",	408	"BEGIN {"
		409	" urxvt->bootstrap;"
		410	" unshift @INC, '" LIBDIR "';"
		411	"}"
		412	""
		413	"use urxvt;"
419	};	414	};
420		415
421	perl = perl_alloc ();	416	perl = perl_alloc ();
422	perl_construct (perl);	417	perl_construct (perl);
423		418
424	if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)	419	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
425	\|\| perl_run (perl))	420	\|\| perl_run (perl))
426	{	421	{
427	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");	422	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
428		423
429	perl_destruct (perl);	424	perl_destruct (perl);
430	perl_free (perl);	425	perl_free (perl);
431	perl = 0;	426	perl = 0;
432	}	427	}
433		428
434	swap (perl_environ, environ);	429	swap (perl_environ, environ);
		430
		431	rxvt_pop_locale ();
		432	}
		433
		434	if (perl)
		435	{
		436	// runs outside of perls ENV
		437	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
		438	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
435	}	439	}
436	}	440	}
437		441
438	static void	442	static void
439	ungrab (rxvt_term *THIS)	443	ungrab (rxvt_term *THIS)
…		…
444	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);	448	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
445	THIS->perl.grabtime = 0;	449	THIS->perl.grabtime = 0;
446	}	450	}
447	}	451	}
448		452
		453	static void
		454	swap_overlays (rxvt_term *term)
		455	{
		456	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
		457
		458	if (HvKEYS (hv))
		459	{
		460	hv_iterinit (hv);
		461
		462	while (HE *he = hv_iternext (hv))
		463	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
		464	}
		465	}
		466
449	bool	467	bool
450	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	468	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
451	{	469	{
452	if (!perl)	470	if (!perl \|\| !term->perl.self)
453	return false;	471	return false;
454		472
455	if (htype == HOOK_INIT) // first hook ever called	473	// pre-handling of some events
456	{	474	if (htype == HOOK_REFRESH_END)
457	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	475	swap_overlays (term);
458	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);	476
459	}	477	swap (perl_environ, environ);
460	else if (!term->perl.self)	478
461	return false; // perl not initialized for this instance	479	bool event_consumed;
462	else if (htype == HOOK_DESTROY)	480
463	{	481	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
464	// handled later	482	\|\| term->perl.should_invoke [htype])
465	}	483	try
466	else
467	{
468	if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
469	{	484	{
470	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	485	dSP;
		486	va_list ap;
471		487
472	if (HvKEYS (hv))	488	va_start (ap, htype);
		489
		490	ENTER;
		491	SAVETMPS;
		492
		493	PUSHMARK (SP);
		494
		495	XPUSHs (sv_2mortal (newSVterm (term)));
		496	XPUSHs (sv_2mortal (newSViv (htype)));
		497
		498	for (;;) {
		499	data_type dt = (data_type)va_arg (ap, int);
		500
		501	switch (dt)
473	{	502	{
474	hv_iterinit (hv);
475
476	while (HE *he = hv_iternext (hv))
477	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
478	}
479
480	}
481
482	if (!should_invoke [htype])
483	return false;
484	}
485
486	swap (perl_environ, environ);
487
488	try
489	{
490	dSP;
491	va_list ap;
492
493	va_start (ap, htype);
494
495	ENTER;
496	SAVETMPS;
497
498	PUSHMARK (SP);
499
500	XPUSHs (sv_2mortal (newSVterm (term)));
501	XPUSHs (sv_2mortal (newSViv (htype)));
502
503	for (;;) {
504	data_type dt = (data_type)va_arg (ap, int);
505
506	switch (dt)
507	{
508	case DT_INT:	503	case DT_INT:
509	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));	504	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
510	break;	505	break;
511		506
512	case DT_LONG:	507	case DT_LONG:
513	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));	508	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
514	break;	509	break;
515		510
516	case DT_STR:	511	case DT_STR:
517	XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));	512	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
518	break;	513	break;
519		514
520	case DT_STR_LEN:	515	case DT_STR_LEN:
521	{	516	{
522	char str = va_arg (ap, char );	517	char str = va_arg (ap, char );
523	int len = va_arg (ap, int);	518	int len = va_arg (ap, int);
524		519
525	XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));	520	XPUSHs (sv_2mortal (newSVpvn (str, len)));
526	}	521	}
527	break;	522	break;
528		523
529	case DT_WCS_LEN:	524	case DT_WCS_LEN:
530	{	525	{
531	wchar_t wstr = va_arg (ap, wchar_t );	526	wchar_t wstr = va_arg (ap, wchar_t );
532	int wlen = va_arg (ap, int);	527	int wlen = va_arg (ap, int);
533		528
534	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));	529	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
535	}	530	}
536	break;	531	break;
537		532
538	case DT_XEVENT:	533	case DT_XEVENT:
539	{	534	{
540	XEvent xe = va_arg (ap, XEvent );	535	XEvent xe = va_arg (ap, XEvent );
541	HV *hv = newHV ();	536	HV *hv = newHV ();
542		537
543	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)	538	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
544	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)	539	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
545	# undef set	540	# undef set
546		541
547	setiv (type, xe->type);	542	setiv (type, xe->type);
548	setiv (send_event, xe->xany.send_event);	543	setiv (send_event, xe->xany.send_event);
549	setiv (serial, xe->xany.serial);	544	setiv (serial, xe->xany.serial);
550		545
551	switch (xe->type)	546	switch (xe->type)
552	{	547	{
553	case KeyPress:	548	case KeyPress:
554	case KeyRelease:	549	case KeyRelease:
555	case ButtonPress:	550	case ButtonPress:
556	case ButtonRelease:	551	case ButtonRelease:
557	case MotionNotify:	552	case MotionNotify:
558	setiv (time, xe->xmotion.time);	553	setiv (time, xe->xmotion.time);
559	setiv (x, xe->xmotion.x);	554	setiv (x, xe->xmotion.x);
560	setiv (y, xe->xmotion.y);	555	setiv (y, xe->xmotion.y);
561	setiv (row, xe->xmotion.y / term->fheight);	556	setiv (row, xe->xmotion.y / term->fheight);
562	setiv (col, xe->xmotion.x / term->fwidth);	557	setiv (col, xe->xmotion.x / term->fwidth);
563	setiv (x_root, xe->xmotion.x_root);	558	setiv (x_root, xe->xmotion.x_root);
564	setiv (y_root, xe->xmotion.y_root);	559	setiv (y_root, xe->xmotion.y_root);
565	setiv (state, xe->xmotion.state);	560	setiv (state, xe->xmotion.state);
566	break;	561	break;
567	}	562	}
568		563
569	switch (xe->type)	564	switch (xe->type)
570	{	565	{
571	case KeyPress:	566	case KeyPress:
572	case KeyRelease:	567	case KeyRelease:
573	setiv (keycode, xe->xkey.keycode);	568	setiv (keycode, xe->xkey.keycode);
574	break;	569	break;
575		570
576	case ButtonPress:	571	case ButtonPress:
577	case ButtonRelease:	572	case ButtonRelease:
578	setiv (button, xe->xbutton.button);	573	setiv (button, xe->xbutton.button);
579	break;	574	break;
580		575
581	case MotionNotify:	576	case MotionNotify:
582	setiv (is_hint, xe->xmotion.is_hint);	577	setiv (is_hint, xe->xmotion.is_hint);
583	break;	578	break;
584	}	579	}
585		580
586	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	581	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
587	}	582	}
588	break;	583	break;
589		584
590	case DT_END:	585	case DT_END:
591	{	586	goto call;
592	va_end (ap);
593		587
594	PUTBACK;
595	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
596	SPAGAIN;
597
598	if (count)
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;
622	}
623
624	default:	588	default:
625	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);	589	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
626	}	590	}
		591	}
		592
		593	call:
		594	va_end (ap);
		595
		596	PUTBACK;
		597	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
		598	SPAGAIN;
		599
		600	if (count)
		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	event_consumed = !!count;
627	}	617	}
		618	catch (...)
		619	{
		620	swap (perl_environ, environ);
		621	throw;
		622	}
		623	else
		624	event_consumed = false;
		625
		626	// post-handling of some events
		627	if (htype == HOOK_REFRESH_BEGIN)
		628	swap_overlays (term);
		629	else if (htype == HOOK_DESTROY)
		630	{
		631	clearSVptr ((SV *)term->perl.self);
		632	SvREFCNT_dec ((SV *)term->perl.self);
628	}	633	}
629	catch (...)	634
630	{
631	swap (perl_environ, environ);	635	swap (perl_environ, environ);
632	throw;	636
633	}	637	return event_consumed;
634	}	638	}
635		639
636	/////////////////////////////////////////////////////////////////////////////	640	/////////////////////////////////////////////////////////////////////////////
637		641
638	MODULE = urxvt PACKAGE = urxvt	642	MODULE = urxvt PACKAGE = urxvt
…		…
657	# include "optinc.h"	661	# include "optinc.h"
658	# undef nodef	662	# undef nodef
659	# undef def	663	# undef def
660		664
661	HV *stash = gv_stashpv ("urxvt", 1);	665	HV *stash = gv_stashpv ("urxvt", 1);
662	# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));	666	struct {
		667	const char *name;
		668	IV iv;
		669	} *civ, const_iv[] = {
		670	# define const_iv(name) { # name, (IV)name }
663	export_const_iv (DEFAULT_RSTYLE);	671	const_iv (DEFAULT_RSTYLE),
664	export_const_iv (OVERLAY_RSTYLE);	672	const_iv (OVERLAY_RSTYLE),
665	export_const_iv (RS_Bold);	673	const_iv (RS_Bold),
666	export_const_iv (RS_Italic);	674	const_iv (RS_Italic),
667	export_const_iv (RS_Blink);	675	const_iv (RS_Blink),
668	export_const_iv (RS_RVid);	676	const_iv (RS_RVid),
669	export_const_iv (RS_Uline);	677	const_iv (RS_Uline),
670		678
671	export_const_iv (CurrentTime);	679	const_iv (CurrentTime),
672	export_const_iv (ShiftMask);	680	const_iv (ShiftMask),
673	export_const_iv (LockMask);	681	const_iv (LockMask),
674	export_const_iv (ControlMask);	682	const_iv (ControlMask),
675	export_const_iv (Mod1Mask);	683	const_iv (Mod1Mask),
676	export_const_iv (Mod2Mask);	684	const_iv (Mod2Mask),
677	export_const_iv (Mod3Mask);	685	const_iv (Mod3Mask),
678	export_const_iv (Mod4Mask);	686	const_iv (Mod4Mask),
679	export_const_iv (Mod5Mask);	687	const_iv (Mod5Mask),
680	export_const_iv (Button1Mask);	688	const_iv (Button1Mask),
681	export_const_iv (Button2Mask);	689	const_iv (Button2Mask),
682	export_const_iv (Button3Mask);	690	const_iv (Button3Mask),
683	export_const_iv (Button4Mask);	691	const_iv (Button4Mask),
684	export_const_iv (Button5Mask);	692	const_iv (Button5Mask),
685	export_const_iv (AnyModifier);	693	const_iv (AnyModifier),
686		694
687	export_const_iv (EVENT_NONE);	695	const_iv (EVENT_NONE),
688	export_const_iv (EVENT_READ);	696	const_iv (EVENT_READ),
689	export_const_iv (EVENT_WRITE);	697	const_iv (EVENT_WRITE),
690	}
691		698
692	void	699	const_iv (NoEventMask),
693	set_should_invoke (int htype, int value)	700	const_iv (KeyPressMask),
694	CODE:	701	const_iv (KeyReleaseMask),
695	rxvt_perl.should_invoke [htype] = value;	702	const_iv (ButtonPressMask),
		703	const_iv (ButtonReleaseMask),
		704	const_iv (EnterWindowMask),
		705	const_iv (LeaveWindowMask),
		706	const_iv (PointerMotionMask),
		707	const_iv (PointerMotionHintMask),
		708	const_iv (Button1MotionMask),
		709	const_iv (Button2MotionMask),
		710	const_iv (Button3MotionMask),
		711	const_iv (Button4MotionMask),
		712	const_iv (Button5MotionMask),
		713	const_iv (ButtonMotionMask),
		714	const_iv (KeymapStateMask),
		715	const_iv (ExposureMask),
		716	const_iv (VisibilityChangeMask),
		717	const_iv (StructureNotifyMask),
		718	const_iv (ResizeRedirectMask),
		719	const_iv (SubstructureNotifyMask),
		720	const_iv (SubstructureRedirectMask),
		721	const_iv (FocusChangeMask),
		722	const_iv (PropertyChangeMask),
		723	const_iv (ColormapChangeMask),
		724	const_iv (OwnerGrabButtonMask),
		725
		726	const_iv (KeyPress),
		727	const_iv (KeyRelease),
		728	const_iv (ButtonPress),
		729	const_iv (ButtonRelease),
		730	const_iv (MotionNotify),
		731	const_iv (EnterNotify),
		732	const_iv (LeaveNotify),
		733	const_iv (FocusIn),
		734	const_iv (FocusOut),
		735	const_iv (KeymapNotify),
		736	const_iv (Expose),
		737	const_iv (GraphicsExpose),
		738	const_iv (NoExpose),
		739	const_iv (VisibilityNotify),
		740	const_iv (CreateNotify),
		741	const_iv (DestroyNotify),
		742	const_iv (UnmapNotify),
		743	const_iv (MapNotify),
		744	const_iv (MapRequest),
		745	const_iv (ReparentNotify),
		746	const_iv (ConfigureNotify),
		747	const_iv (ConfigureRequest),
		748	const_iv (GravityNotify),
		749	const_iv (ResizeRequest),
		750	const_iv (CirculateNotify),
		751	const_iv (CirculateRequest),
		752	const_iv (PropertyNotify),
		753	const_iv (SelectionClear),
		754	const_iv (SelectionRequest),
		755	const_iv (SelectionNotify),
		756	const_iv (ColormapNotify),
		757	const_iv (ClientMessage),
		758	const_iv (MappingNotify),
		759	};
		760
		761	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
		762	civ-- > const_iv; )
		763	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		764	}
696		765
697	void	766	void
698	warn (const char *msg)	767	warn (const char *msg)
699	CODE:	768	CODE:
700	rxvt_warn ("%s", msg);	769	rxvt_warn ("%s", msg);
…		…
702	void	771	void
703	fatal (const char *msg)	772	fatal (const char *msg)
704	CODE:	773	CODE:
705	rxvt_fatal ("%s", msg);	774	rxvt_fatal ("%s", msg);
706		775
707	SV *	776	void
708	untaint (SV *sv)	777	_exit (int status)
709	CODE:
710	RETVAL = newSVsv (sv);
711	SvTAINTED_off (RETVAL);
712	OUTPUT:
713	RETVAL
714
715	bool
716	safe ()
717	CODE:
718	RETVAL = !rxvt_tainted ();
719	OUTPUT:
720	RETVAL
721		778
722	NV	779	NV
723	NOW ()	780	NOW ()
724	CODE:	781	CODE:
725	RETVAL = NOW;	782	RETVAL = NOW;
…		…
820	OUTPUT:	877	OUTPUT:
821	RETVAL	878	RETVAL
822		879
823	void	880	void
824	rxvt_term::destroy ()	881	rxvt_term::destroy ()
		882
		883	#if ENABLE_PERL_FRILLS
		884
		885	void
		886	rxvt_term::XListProperties (U32 window)
		887	PPCODE:
		888	{
		889	int count;
		890	Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
		891
		892	EXTEND (SP, count);
		893	while (count--)
		894	PUSHs (newSVuv ((U32)props [count]));
		895
		896	XFree (props);
		897	}
		898
		899	void
		900	rxvt_term::XGetWindowProperty (U32 window, U32 property)
		901	PPCODE:
		902	{
		903	Atom type;
		904	int format;
		905	unsigned long nitems;
		906	unsigned long bytes_after;
		907	unsigned char *prop;
		908	XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
		909	0, 1<<30, 0, AnyPropertyType,
		910	&type, &format, &nitems, &bytes_after, &prop);
		911	if (type != None)
		912	{
		913	EXTEND (SP, 3);
		914	PUSHs (newSVuv ((U32)type));
		915	PUSHs (newSViv (format));
		916	PUSHs (newSVpvn ((char )prop, nitems format / 8));
		917	XFree (prop);
		918	}
		919	}
		920
		921	void
		922	rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
		923	CODE:
		924	{
		925	STRLEN len;
		926	char *data_ = SvPVbyte (data, len);
		927
		928	XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
		929	type, format, PropModeReplace,
		930	(unsigned char )data, len 8 / format);
		931	}
		932
		933	void
		934	rxvt_term::XDeleteProperty (U32 window, U32 property)
		935	CODE:
		936	XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
		937
		938	U32
		939	rxvt_term::DefaultRootWindow ()
		940	CODE:
		941	RETVAL = (U32)THIS->display->root;
		942	OUTPUT:
		943	RETVAL
		944
		945	U32
		946	rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
		947	CODE:
		948	RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
		949	x, y, width, height, 0,
		950	THIS->pix_colors_focused[Color_border],
		951	THIS->pix_colors_focused[Color_border]);
		952	OUTPUT:
		953	RETVAL
		954
		955	void
		956	rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
		957	CODE:
		958	XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
		959
		960	void
		961	rxvt_term::XMapWindow (U32 window)
		962	CODE:
		963	XMapWindow (THIS->display->display, (Window)window);
		964
		965	void
		966	rxvt_term::XUnmapWindow (U32 window)
		967	CODE:
		968	XUnmapWindow (THIS->display->display, (Window)window);
		969
		970	#endif
		971
		972	void
		973	rxvt_term::set_should_invoke (int htype, int inc)
		974	CODE:
		975	THIS->perl.should_invoke [htype] += inc;
825		976
826	void	977	void
827	rxvt_term::grab_button (int button, U32 modifiers)	978	rxvt_term::grab_button (int button, U32 modifiers)
828	CODE:	979	CODE:
829	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,	980	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
…		…
897	char *mbstr = rxvt_wcstombs (wstr);	1048	char *mbstr = rxvt_wcstombs (wstr);
898	rxvt_pop_locale ();	1049	rxvt_pop_locale ();
899		1050
900	free (wstr);	1051	free (wstr);
901		1052
902	RETVAL = taint_if (newSVpv (mbstr, 0), str);	1053	RETVAL = newSVpv (mbstr, 0);
903	free (mbstr);	1054	free (mbstr);
904	}	1055	}
905	OUTPUT:	1056	OUTPUT:
906	RETVAL	1057	RETVAL
907		1058
…		…
914		1065
915	rxvt_push_locale (THIS->locale);	1066	rxvt_push_locale (THIS->locale);
916	wchar_t *wstr = rxvt_mbstowcs (data, len);	1067	wchar_t *wstr = rxvt_mbstowcs (data, len);
917	rxvt_pop_locale ();	1068	rxvt_pop_locale ();
918		1069
919	RETVAL = taint_if (wcs2sv (wstr), octets);	1070	RETVAL = wcs2sv (wstr);
920	free (wstr);	1071	free (wstr);
921	}	1072	}
922	OUTPUT:	1073	OUTPUT:
923	RETVAL	1074	RETVAL
924		1075
…		…
933	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)	1084	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
934	#define TERM_OFFSET_focus TERM_OFFSET(focus)	1085	#define TERM_OFFSET_focus TERM_OFFSET(focus)
935	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)	1086	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
936	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)	1087	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
937	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)	1088	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
938	#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)	1089	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
939		1090
940	int	1091	int
941	rxvt_term::width ()	1092	rxvt_term::width ()
942	ALIAS:	1093	ALIAS:
943	width = TERM_OFFSET_width	1094	width = TERM_OFFSET_width
…		…
949	ncol = TERM_OFFSET_ncol	1100	ncol = TERM_OFFSET_ncol
950	focus = TERM_OFFSET_focus	1101	focus = TERM_OFFSET_focus
951	mapped = TERM_OFFSET_mapped	1102	mapped = TERM_OFFSET_mapped
952	saveLines = TERM_OFFSET_saveLines	1103	saveLines = TERM_OFFSET_saveLines
953	total_rows = TERM_OFFSET_total_rows	1104	total_rows = TERM_OFFSET_total_rows
954	nsaved = TERM_OFFSET_nsaved	1105	top_row = TERM_OFFSET_top_row
955	CODE:	1106	CODE:
956	RETVAL = (int )((char *)THIS + ix);	1107	RETVAL = (int )((char *)THIS + ix);
957	OUTPUT:	1108	OUTPUT:
958	RETVAL	1109	RETVAL
959		1110
…		…
1028	CODE:	1179	CODE:
1029	RETVAL = (U32)THIS->vt;	1180	RETVAL = (U32)THIS->vt;
1030	OUTPUT:	1181	OUTPUT:
1031	RETVAL	1182	RETVAL
1032		1183
		1184	void
		1185	rxvt_term::vt_emask_add (U32 emask)
		1186	CODE:
		1187	THIS->vt_emask_perl \|= emask;
		1188	THIS->vt_select_input ();
		1189
1033	U32	1190	U32
1034	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)	1191	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1035	CODE:	1192	CODE:
1036	{
1037	RETVAL = THIS->rstyle;	1193	RETVAL = THIS->rstyle;
1038	THIS->rstyle = new_rstyle;	1194	THIS->rstyle = new_rstyle;
1039	}
1040	OUTPUT:	1195	OUTPUT:
1041	RETVAL	1196	RETVAL
1042		1197
1043	int	1198	int
1044	rxvt_term::view_start (int newval = -1)	1199	rxvt_term::view_start (int newval = 1)
		1200	PROTOTYPE: $;$
1045	CODE:	1201	CODE:
1046	{	1202	{
1047	RETVAL = THIS->view_start;	1203	RETVAL = THIS->view_start;
1048		1204
1049	if (newval >= 0)	1205	if (newval <= 0)
1050	{	1206	THIS->scr_changeview (max (newval, THIS->top_row));
1051	THIS->view_start = min (newval, THIS->nsaved);
1052	THIS->scr_changeview (RETVAL);
1053	}
1054	}	1207	}
1055	OUTPUT:	1208	OUTPUT:
1056	RETVAL	1209	RETVAL
1057		1210
1058	void	1211	void
…		…
1062		1215
1063	void	1216	void
1064	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)	1217	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1065	PPCODE:	1218	PPCODE:
1066	{	1219	{
1067	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1220	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1068	XSRETURN_EMPTY;	1221	XSRETURN_EMPTY;
1069		1222
1070	line_t &l = ROW(row_number);	1223	line_t &l = ROW(row_number);
1071		1224
1072	if (GIMME_V != G_VOID)	1225	if (GIMME_V != G_VOID)
…		…
1074	wchar_t *wstr = new wchar_t [THIS->ncol];	1227	wchar_t *wstr = new wchar_t [THIS->ncol];
1075		1228
1076	for (int col = 0; col < THIS->ncol; col++)	1229	for (int col = 0; col < THIS->ncol; col++)
1077	wstr [col] = l.t [col];	1230	wstr [col] = l.t [col];
1078		1231
1079	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));	1232	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1080		1233
1081	delete [] wstr;	1234	delete [] wstr;
1082	}	1235	}
1083		1236
1084	if (new_text)	1237	if (new_text)
…		…
1105		1258
1106	void	1259	void
1107	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)	1260	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1108	PPCODE:	1261	PPCODE:
1109	{	1262	{
1110	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1263	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1111	XSRETURN_EMPTY;	1264	XSRETURN_EMPTY;
1112		1265
1113	line_t &l = ROW(row_number);	1266	line_t &l = ROW(row_number);
1114		1267
1115	if (GIMME_V != G_VOID)	1268	if (GIMME_V != G_VOID)
…		…
1145		1298
1146	int	1299	int
1147	rxvt_term::ROW_l (int row_number, int new_length = -1)	1300	rxvt_term::ROW_l (int row_number, int new_length = -1)
1148	CODE:	1301	CODE:
1149	{	1302	{
1150	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1303	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1151	XSRETURN_EMPTY;	1304	XSRETURN_EMPTY;
1152		1305
1153	line_t &l = ROW(row_number);	1306	line_t &l = ROW(row_number);
1154	RETVAL = l.l;	1307	RETVAL = l.l;
1155		1308
…		…
1161		1314
1162	bool	1315	bool
1163	rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)	1316	rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1164	CODE:	1317	CODE:
1165	{	1318	{
1166	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1319	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1167	XSRETURN_EMPTY;	1320	XSRETURN_EMPTY;
1168		1321
1169	line_t &l = ROW(row_number);	1322	line_t &l = ROW(row_number);
1170	RETVAL = l.is_longer ();	1323	RETVAL = l.is_longer ();
1171		1324
…		…
1205	else	1358	else
1206	r++ = s;	1359	r++ = s;
1207		1360
1208	rxvt_pop_locale ();	1361	rxvt_pop_locale ();
1209		1362
1210	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);	1363	RETVAL = wcs2sv (rstr, r - rstr);
1211		1364
1212	delete [] rstr;	1365	delete [] rstr;
1213	}	1366	}
1214	OUTPUT:	1367	OUTPUT:
1215	RETVAL	1368	RETVAL
…		…
1241	else if (IS_COMPOSE (*s))	1394	else if (IS_COMPOSE (*s))
1242	r += rxvt_composite.expand (*s, r);	1395	r += rxvt_composite.expand (*s, r);
1243	else	1396	else
1244	r++ = s;	1397	r++ = s;
1245		1398
1246	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);	1399	RETVAL = wcs2sv (rstr, r - rstr);
1247		1400
1248	delete [] rstr;	1401	delete [] rstr;
1249	}	1402	}
1250	OUTPUT:	1403	OUTPUT:
1251	RETVAL	1404	RETVAL
…		…
1273		1426
1274	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1427	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1275	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);	1428	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1276		1429
1277	if (GIMME_V != G_VOID)	1430	if (GIMME_V != G_VOID)
1278	XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);	1431	XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1279		1432
1280	if (newval)	1433	if (newval)
1281	{	1434	{
1282	if (SvOK (newval))	1435	if (SvOK (newval))
1283	{	1436	{
…		…
1290	}	1443	}
1291	}	1444	}
1292		1445
1293	const char *	1446	const char *
1294	rxvt_term::x_resource (const char *name)	1447	rxvt_term::x_resource (const char *name)
1295	CLEANUP:
1296	SvTAINTED_on (ST (0));
1297		1448
1298	bool	1449	bool
1299	rxvt_term::option (U32 optval, int set = -1)	1450	rxvt_term::option (U32 optval, int set = -1)
1300	CODE:	1451	CODE:
1301	{	1452	{
…		…
1361	PUSHs (sv_2mortal (newSViv (rc.col)));	1512	PUSHs (sv_2mortal (newSViv (rc.col)));
1362	}	1513	}
1363		1514
1364	if (items == 3)	1515	if (items == 3)
1365	{	1516	{
1366	rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);	1517	rc.row = SvIV (ST (1));
1367	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);	1518	rc.col = SvIV (ST (2));
		1519
		1520	if (ix == 2 && rc.col == 0)
		1521	{
		1522	rc.row--;
		1523	rc.col = THIS->ncol;
		1524	}
		1525
		1526	clamp_it (rc.col, 0, THIS->ncol);
		1527	clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1368		1528
1369	if (ix)	1529	if (ix)
1370	THIS->want_refresh = 1;	1530	THIS->want_refresh = 1;
1371	}	1531	}
1372	}	1532	}
…		…
1376	CODE:	1536	CODE:
1377	RETVAL = THIS->charsets [THIS->screen.charset];	1537	RETVAL = THIS->charsets [THIS->screen.charset];
1378	OUTPUT:	1538	OUTPUT:
1379	RETVAL	1539	RETVAL
1380		1540
		1541	#void
		1542	#rxvt_term::selection_clear ()
		1543
		1544	void
		1545	rxvt_term::selection_make (U32 eventtime, bool rect = false)
		1546	CODE:
		1547	THIS->selection.op = SELECTION_CONT;
		1548	THIS->selection.rect = rect;
		1549	THIS->selection_make (eventtime);
		1550
1381	int	1551	int
1382	rxvt_term::selection_grab (U32 eventtime)	1552	rxvt_term::selection_grab (U32 eventtime)
1383		1553
1384	void	1554	void
1385	rxvt_term::selection (SV *newtext = 0)	1555	rxvt_term::selection (SV *newtext = 0)
1386	PPCODE:	1556	PPCODE:
1387	{	1557	{
1388	if (GIMME_V != G_VOID)	1558	if (GIMME_V != G_VOID)
1389	XPUSHs (THIS->selection.text	1559	XPUSHs (THIS->selection.text
1390	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))	1560	? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1391	: &PL_sv_undef);	1561	: &PL_sv_undef);
1392		1562
1393	if (newtext)	1563	if (newtext)
1394	{	1564	{
1395	free (THIS->selection.text);	1565	free (THIS->selection.text);

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.58 by root, Thu Jan 12 01:38:37 2006 UTC vs. Revision 1.73 by root, Wed Jan 18 09:40:53 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.58 by root, Thu Jan 12 01:38:37 2006 UTC vs.
Revision 1.73 by root, Wed Jan 18 09:40:53 2006 UTC