[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.71 by root, Tue Jan 17 16:22:41 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",
418	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",	407	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
419	};	408	};
420		409
421	perl = perl_alloc ();	410	perl = perl_alloc ();
422	perl_construct (perl);	411	perl_construct (perl);
423		412
424	if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)	413	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
425	\|\| perl_run (perl))	414	\|\| perl_run (perl))
426	{	415	{
427	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");	416	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
428		417
429	perl_destruct (perl);	418	perl_destruct (perl);
430	perl_free (perl);	419	perl_free (perl);
431	perl = 0;	420	perl = 0;
432	}	421	}
433		422
434	swap (perl_environ, environ);	423	swap (perl_environ, environ);
		424
		425	rxvt_pop_locale ();
		426	}
		427
		428	if (perl)
		429	{
		430	// runs outside of perls ENV
		431	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
		432	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
435	}	433	}
436	}	434	}
437		435
438	static void	436	static void
439	ungrab (rxvt_term *THIS)	437	ungrab (rxvt_term *THIS)
…		…
444	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);	442	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
445	THIS->perl.grabtime = 0;	443	THIS->perl.grabtime = 0;
446	}	444	}
447	}	445	}
448		446
		447	static void
		448	swap_overlays (rxvt_term *term)
		449	{
		450	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
		451
		452	if (HvKEYS (hv))
		453	{
		454	hv_iterinit (hv);
		455
		456	while (HE *he = hv_iternext (hv))
		457	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
		458	}
		459	}
		460
449	bool	461	bool
450	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	462	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
451	{	463	{
452	if (!perl)	464	if (!perl \|\| !term->perl.self)
453	return false;	465	return false;
454		466
455	if (htype == HOOK_INIT) // first hook ever called	467	// pre-handling of some events
456	{	468	if (htype == HOOK_REFRESH_END)
457	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	469	swap_overlays (term);
458	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);	470
459	}	471	swap (perl_environ, environ);
460	else if (!term->perl.self)	472
461	return false; // perl not initialized for this instance	473	bool event_consumed;
462	else if (htype == HOOK_DESTROY)	474
463	{	475	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
464	// handled later	476	\|\| term->perl.should_invoke [htype])
465	}	477	try
466	else
467	{
468	if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
469	{	478	{
470	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	479	dSP;
		480	va_list ap;
471		481
472	if (HvKEYS (hv))	482	va_start (ap, htype);
		483
		484	ENTER;
		485	SAVETMPS;
		486
		487	PUSHMARK (SP);
		488
		489	XPUSHs (sv_2mortal (newSVterm (term)));
		490	XPUSHs (sv_2mortal (newSViv (htype)));
		491
		492	for (;;) {
		493	data_type dt = (data_type)va_arg (ap, int);
		494
		495	switch (dt)
473	{	496	{
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:	497	case DT_INT:
509	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));	498	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
510	break;	499	break;
511		500
512	case DT_LONG:	501	case DT_LONG:
513	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));	502	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
514	break;	503	break;
515		504
516	case DT_STR:	505	case DT_STR:
517	XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));	506	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
518	break;	507	break;
519		508
520	case DT_STR_LEN:	509	case DT_STR_LEN:
521	{	510	{
522	char str = va_arg (ap, char );	511	char str = va_arg (ap, char );
523	int len = va_arg (ap, int);	512	int len = va_arg (ap, int);
524		513
525	XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));	514	XPUSHs (sv_2mortal (newSVpvn (str, len)));
526	}	515	}
527	break;	516	break;
528		517
529	case DT_WCS_LEN:	518	case DT_WCS_LEN:
530	{	519	{
531	wchar_t wstr = va_arg (ap, wchar_t );	520	wchar_t wstr = va_arg (ap, wchar_t );
532	int wlen = va_arg (ap, int);	521	int wlen = va_arg (ap, int);
533		522
534	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));	523	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
535	}	524	}
536	break;	525	break;
537		526
538	case DT_XEVENT:	527	case DT_XEVENT:
539	{	528	{
540	XEvent xe = va_arg (ap, XEvent );	529	XEvent xe = va_arg (ap, XEvent );
541	HV *hv = newHV ();	530	HV *hv = newHV ();
542		531
543	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)	532	# 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)	533	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
545	# undef set	534	# undef set
546		535
547	setiv (type, xe->type);	536	setiv (type, xe->type);
548	setiv (send_event, xe->xany.send_event);	537	setiv (send_event, xe->xany.send_event);
549	setiv (serial, xe->xany.serial);	538	setiv (serial, xe->xany.serial);
550		539
551	switch (xe->type)	540	switch (xe->type)
552	{	541	{
553	case KeyPress:	542	case KeyPress:
554	case KeyRelease:	543	case KeyRelease:
555	case ButtonPress:	544	case ButtonPress:
556	case ButtonRelease:	545	case ButtonRelease:
557	case MotionNotify:	546	case MotionNotify:
558	setiv (time, xe->xmotion.time);	547	setiv (time, xe->xmotion.time);
559	setiv (x, xe->xmotion.x);	548	setiv (x, xe->xmotion.x);
560	setiv (y, xe->xmotion.y);	549	setiv (y, xe->xmotion.y);
561	setiv (row, xe->xmotion.y / term->fheight);	550	setiv (row, xe->xmotion.y / term->fheight);
562	setiv (col, xe->xmotion.x / term->fwidth);	551	setiv (col, xe->xmotion.x / term->fwidth);
563	setiv (x_root, xe->xmotion.x_root);	552	setiv (x_root, xe->xmotion.x_root);
564	setiv (y_root, xe->xmotion.y_root);	553	setiv (y_root, xe->xmotion.y_root);
565	setiv (state, xe->xmotion.state);	554	setiv (state, xe->xmotion.state);
566	break;	555	break;
567	}	556	}
568		557
569	switch (xe->type)	558	switch (xe->type)
570	{	559	{
571	case KeyPress:	560	case KeyPress:
572	case KeyRelease:	561	case KeyRelease:
573	setiv (keycode, xe->xkey.keycode);	562	setiv (keycode, xe->xkey.keycode);
574	break;	563	break;
575		564
576	case ButtonPress:	565	case ButtonPress:
577	case ButtonRelease:	566	case ButtonRelease:
578	setiv (button, xe->xbutton.button);	567	setiv (button, xe->xbutton.button);
579	break;	568	break;
580		569
581	case MotionNotify:	570	case MotionNotify:
582	setiv (is_hint, xe->xmotion.is_hint);	571	setiv (is_hint, xe->xmotion.is_hint);
583	break;	572	break;
584	}	573	}
585		574
586	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	575	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
587	}	576	}
588	break;	577	break;
589		578
590	case DT_END:	579	case DT_END:
591	{	580	goto call;
592	va_end (ap);
593		581
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:	582	default:
625	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);	583	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
626	}	584	}
		585	}
		586
		587	call:
		588	va_end (ap);
		589
		590	PUTBACK;
		591	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
		592	SPAGAIN;
		593
		594	if (count)
		595	{
		596	SV *status = POPs;
		597	count = SvTRUE (status);
		598	}
		599
		600	PUTBACK;
		601	FREETMPS;
		602	LEAVE;
		603
		604	if (SvTRUE (ERRSV))
		605	{
		606	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
		607	ungrab (term); // better lose the grab than the session
		608	}
		609
		610	event_consumed = !!count;
627	}	611	}
		612	catch (...)
		613	{
		614	swap (perl_environ, environ);
		615	throw;
		616	}
		617	else
		618	event_consumed = false;
		619
		620	// post-handling of some events
		621	if (htype == HOOK_REFRESH_BEGIN)
		622	swap_overlays (term);
		623	else if (htype == HOOK_DESTROY)
		624	{
		625	clearSVptr ((SV *)term->perl.self);
		626	SvREFCNT_dec ((SV *)term->perl.self);
628	}	627	}
629	catch (...)	628
630	{
631	swap (perl_environ, environ);	629	swap (perl_environ, environ);
632	throw;	630
633	}	631	return event_consumed;
634	}	632	}
635		633
636	/////////////////////////////////////////////////////////////////////////////	634	/////////////////////////////////////////////////////////////////////////////
637		635
638	MODULE = urxvt PACKAGE = urxvt	636	MODULE = urxvt PACKAGE = urxvt
…		…
657	# include "optinc.h"	655	# include "optinc.h"
658	# undef nodef	656	# undef nodef
659	# undef def	657	# undef def
660		658
661	HV *stash = gv_stashpv ("urxvt", 1);	659	HV *stash = gv_stashpv ("urxvt", 1);
662	# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));	660	struct {
		661	const char *name;
		662	IV iv;
		663	} *civ, const_iv[] = {
		664	# define const_iv(name) { # name, (IV)name }
663	export_const_iv (DEFAULT_RSTYLE);	665	const_iv (DEFAULT_RSTYLE),
664	export_const_iv (OVERLAY_RSTYLE);	666	const_iv (OVERLAY_RSTYLE),
665	export_const_iv (RS_Bold);	667	const_iv (RS_Bold),
666	export_const_iv (RS_Italic);	668	const_iv (RS_Italic),
667	export_const_iv (RS_Blink);	669	const_iv (RS_Blink),
668	export_const_iv (RS_RVid);	670	const_iv (RS_RVid),
669	export_const_iv (RS_Uline);	671	const_iv (RS_Uline),
670		672
671	export_const_iv (CurrentTime);	673	const_iv (CurrentTime),
672	export_const_iv (ShiftMask);	674	const_iv (ShiftMask),
673	export_const_iv (LockMask);	675	const_iv (LockMask),
674	export_const_iv (ControlMask);	676	const_iv (ControlMask),
675	export_const_iv (Mod1Mask);	677	const_iv (Mod1Mask),
676	export_const_iv (Mod2Mask);	678	const_iv (Mod2Mask),
677	export_const_iv (Mod3Mask);	679	const_iv (Mod3Mask),
678	export_const_iv (Mod4Mask);	680	const_iv (Mod4Mask),
679	export_const_iv (Mod5Mask);	681	const_iv (Mod5Mask),
680	export_const_iv (Button1Mask);	682	const_iv (Button1Mask),
681	export_const_iv (Button2Mask);	683	const_iv (Button2Mask),
682	export_const_iv (Button3Mask);	684	const_iv (Button3Mask),
683	export_const_iv (Button4Mask);	685	const_iv (Button4Mask),
684	export_const_iv (Button5Mask);	686	const_iv (Button5Mask),
685	export_const_iv (AnyModifier);	687	const_iv (AnyModifier),
686		688
687	export_const_iv (EVENT_NONE);	689	const_iv (EVENT_NONE),
688	export_const_iv (EVENT_READ);	690	const_iv (EVENT_READ),
689	export_const_iv (EVENT_WRITE);	691	const_iv (EVENT_WRITE),
690	}
691		692
692	void	693	const_iv (NoEventMask),
693	set_should_invoke (int htype, int value)	694	const_iv (KeyPressMask),
694	CODE:	695	const_iv (KeyReleaseMask),
695	rxvt_perl.should_invoke [htype] = value;	696	const_iv (ButtonPressMask),
		697	const_iv (ButtonReleaseMask),
		698	const_iv (EnterWindowMask),
		699	const_iv (LeaveWindowMask),
		700	const_iv (PointerMotionMask),
		701	const_iv (PointerMotionHintMask),
		702	const_iv (Button1MotionMask),
		703	const_iv (Button2MotionMask),
		704	const_iv (Button3MotionMask),
		705	const_iv (Button4MotionMask),
		706	const_iv (Button5MotionMask),
		707	const_iv (ButtonMotionMask),
		708	const_iv (KeymapStateMask),
		709	const_iv (ExposureMask),
		710	const_iv (VisibilityChangeMask),
		711	const_iv (StructureNotifyMask),
		712	const_iv (ResizeRedirectMask),
		713	const_iv (SubstructureNotifyMask),
		714	const_iv (SubstructureRedirectMask),
		715	const_iv (FocusChangeMask),
		716	const_iv (PropertyChangeMask),
		717	const_iv (ColormapChangeMask),
		718	const_iv (OwnerGrabButtonMask),
		719
		720	const_iv (KeyPress),
		721	const_iv (KeyRelease),
		722	const_iv (ButtonPress),
		723	const_iv (ButtonRelease),
		724	const_iv (MotionNotify),
		725	const_iv (EnterNotify),
		726	const_iv (LeaveNotify),
		727	const_iv (FocusIn),
		728	const_iv (FocusOut),
		729	const_iv (KeymapNotify),
		730	const_iv (Expose),
		731	const_iv (GraphicsExpose),
		732	const_iv (NoExpose),
		733	const_iv (VisibilityNotify),
		734	const_iv (CreateNotify),
		735	const_iv (DestroyNotify),
		736	const_iv (UnmapNotify),
		737	const_iv (MapNotify),
		738	const_iv (MapRequest),
		739	const_iv (ReparentNotify),
		740	const_iv (ConfigureNotify),
		741	const_iv (ConfigureRequest),
		742	const_iv (GravityNotify),
		743	const_iv (ResizeRequest),
		744	const_iv (CirculateNotify),
		745	const_iv (CirculateRequest),
		746	const_iv (PropertyNotify),
		747	const_iv (SelectionClear),
		748	const_iv (SelectionRequest),
		749	const_iv (SelectionNotify),
		750	const_iv (ColormapNotify),
		751	const_iv (ClientMessage),
		752	const_iv (MappingNotify),
		753	};
		754
		755	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
		756	civ-- > const_iv; )
		757	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		758	}
696		759
697	void	760	void
698	warn (const char *msg)	761	warn (const char *msg)
699	CODE:	762	CODE:
700	rxvt_warn ("%s", msg);	763	rxvt_warn ("%s", msg);
…		…
702	void	765	void
703	fatal (const char *msg)	766	fatal (const char *msg)
704	CODE:	767	CODE:
705	rxvt_fatal ("%s", msg);	768	rxvt_fatal ("%s", msg);
706		769
707	SV *	770	void
708	untaint (SV *sv)	771	_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		772
722	NV	773	NV
723	NOW ()	774	NOW ()
724	CODE:	775	CODE:
725	RETVAL = NOW;	776	RETVAL = NOW;
…		…
820	OUTPUT:	871	OUTPUT:
821	RETVAL	872	RETVAL
822		873
823	void	874	void
824	rxvt_term::destroy ()	875	rxvt_term::destroy ()
		876
		877	#if ENABLE_PERL_FRILLS
		878
		879	void
		880	rxvt_term::XListProperties (U32 window)
		881	PPCODE:
		882	{
		883	int count;
		884	Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
		885
		886	EXTEND (SP, count);
		887	while (count--)
		888	PUSHs (newSVuv ((U32)props [count]));
		889
		890	XFree (props);
		891	}
		892
		893	void
		894	rxvt_term::XGetWindowProperty (U32 window, U32 property)
		895	PPCODE:
		896	{
		897	Atom type;
		898	int format;
		899	unsigned long nitems;
		900	unsigned long bytes_after;
		901	unsigned char *prop;
		902	XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
		903	0, 1<<30, 0, AnyPropertyType,
		904	&type, &format, &nitems, &bytes_after, &prop);
		905	if (type != None)
		906	{
		907	EXTEND (SP, 3);
		908	PUSHs (newSVuv ((U32)type));
		909	PUSHs (newSViv (format));
		910	PUSHs (newSVpvn ((char )prop, nitems format / 8));
		911	XFree (prop);
		912	}
		913	}
		914
		915	void
		916	rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
		917	CODE:
		918	{
		919	STRLEN len;
		920	char *data_ = SvPVbyte (data, len);
		921
		922	XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
		923	type, format, PropModeReplace,
		924	(unsigned char )data, len 8 / format);
		925	}
		926
		927	void
		928	rxvt_term::XDeleteProperty (U32 window, U32 property)
		929	CODE:
		930	XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
		931
		932	U32
		933	rxvt_term::DefaultRootWindow ()
		934	CODE:
		935	RETVAL = (U32)THIS->display->root;
		936	OUTPUT:
		937	RETVAL
		938
		939	U32
		940	rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
		941	CODE:
		942	RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
		943	x, y, width, height, 0,
		944	THIS->pix_colors_focused[Color_border],
		945	THIS->pix_colors_focused[Color_border]);
		946	OUTPUT:
		947	RETVAL
		948
		949	void
		950	rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
		951	CODE:
		952	XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
		953
		954	void
		955	rxvt_term::XMapWindow (U32 window)
		956	CODE:
		957	XMapWindow (THIS->display->display, (Window)window);
		958
		959	void
		960	rxvt_term::XUnmapWindow (U32 window)
		961	CODE:
		962	XUnmapWindow (THIS->display->display, (Window)window);
		963
		964	#endif
		965
		966	void
		967	rxvt_term::set_should_invoke (int htype, int inc)
		968	CODE:
		969	THIS->perl.should_invoke [htype] += inc;
825		970
826	void	971	void
827	rxvt_term::grab_button (int button, U32 modifiers)	972	rxvt_term::grab_button (int button, U32 modifiers)
828	CODE:	973	CODE:
829	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,	974	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
…		…
897	char *mbstr = rxvt_wcstombs (wstr);	1042	char *mbstr = rxvt_wcstombs (wstr);
898	rxvt_pop_locale ();	1043	rxvt_pop_locale ();
899		1044
900	free (wstr);	1045	free (wstr);
901		1046
902	RETVAL = taint_if (newSVpv (mbstr, 0), str);	1047	RETVAL = newSVpv (mbstr, 0);
903	free (mbstr);	1048	free (mbstr);
904	}	1049	}
905	OUTPUT:	1050	OUTPUT:
906	RETVAL	1051	RETVAL
907		1052
…		…
914		1059
915	rxvt_push_locale (THIS->locale);	1060	rxvt_push_locale (THIS->locale);
916	wchar_t *wstr = rxvt_mbstowcs (data, len);	1061	wchar_t *wstr = rxvt_mbstowcs (data, len);
917	rxvt_pop_locale ();	1062	rxvt_pop_locale ();
918		1063
919	RETVAL = taint_if (wcs2sv (wstr), octets);	1064	RETVAL = wcs2sv (wstr);
920	free (wstr);	1065	free (wstr);
921	}	1066	}
922	OUTPUT:	1067	OUTPUT:
923	RETVAL	1068	RETVAL
924		1069
…		…
933	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)	1078	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
934	#define TERM_OFFSET_focus TERM_OFFSET(focus)	1079	#define TERM_OFFSET_focus TERM_OFFSET(focus)
935	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)	1080	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
936	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)	1081	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
937	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)	1082	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
938	#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)	1083	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
939		1084
940	int	1085	int
941	rxvt_term::width ()	1086	rxvt_term::width ()
942	ALIAS:	1087	ALIAS:
943	width = TERM_OFFSET_width	1088	width = TERM_OFFSET_width
…		…
949	ncol = TERM_OFFSET_ncol	1094	ncol = TERM_OFFSET_ncol
950	focus = TERM_OFFSET_focus	1095	focus = TERM_OFFSET_focus
951	mapped = TERM_OFFSET_mapped	1096	mapped = TERM_OFFSET_mapped
952	saveLines = TERM_OFFSET_saveLines	1097	saveLines = TERM_OFFSET_saveLines
953	total_rows = TERM_OFFSET_total_rows	1098	total_rows = TERM_OFFSET_total_rows
954	nsaved = TERM_OFFSET_nsaved	1099	top_row = TERM_OFFSET_top_row
955	CODE:	1100	CODE:
956	RETVAL = (int )((char *)THIS + ix);	1101	RETVAL = (int )((char *)THIS + ix);
957	OUTPUT:	1102	OUTPUT:
958	RETVAL	1103	RETVAL
959		1104
…		…
1028	CODE:	1173	CODE:
1029	RETVAL = (U32)THIS->vt;	1174	RETVAL = (U32)THIS->vt;
1030	OUTPUT:	1175	OUTPUT:
1031	RETVAL	1176	RETVAL
1032		1177
		1178	void
		1179	rxvt_term::vt_emask_add (U32 emask)
		1180	CODE:
		1181	THIS->vt_emask_perl \|= emask;
		1182	THIS->vt_select_input ();
		1183
1033	U32	1184	U32
1034	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)	1185	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1035	CODE:	1186	CODE:
1036	{
1037	RETVAL = THIS->rstyle;	1187	RETVAL = THIS->rstyle;
1038	THIS->rstyle = new_rstyle;	1188	THIS->rstyle = new_rstyle;
1039	}
1040	OUTPUT:	1189	OUTPUT:
1041	RETVAL	1190	RETVAL
1042		1191
1043	int	1192	int
1044	rxvt_term::view_start (int newval = -1)	1193	rxvt_term::view_start (int newval = 1)
		1194	PROTOTYPE: $;$
1045	CODE:	1195	CODE:
1046	{	1196	{
1047	RETVAL = THIS->view_start;	1197	RETVAL = THIS->view_start;
1048		1198
1049	if (newval >= 0)	1199	if (newval <= 0)
1050	{	1200	THIS->scr_changeview (max (newval, THIS->top_row));
1051	THIS->view_start = min (newval, THIS->nsaved);
1052	THIS->scr_changeview (RETVAL);
1053	}
1054	}	1201	}
1055	OUTPUT:	1202	OUTPUT:
1056	RETVAL	1203	RETVAL
1057		1204
1058	void	1205	void
…		…
1062		1209
1063	void	1210	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)	1211	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:	1212	PPCODE:
1066	{	1213	{
1067	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1214	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1068	XSRETURN_EMPTY;	1215	XSRETURN_EMPTY;
1069		1216
1070	line_t &l = ROW(row_number);	1217	line_t &l = ROW(row_number);
1071		1218
1072	if (GIMME_V != G_VOID)	1219	if (GIMME_V != G_VOID)
…		…
1074	wchar_t *wstr = new wchar_t [THIS->ncol];	1221	wchar_t *wstr = new wchar_t [THIS->ncol];
1075		1222
1076	for (int col = 0; col < THIS->ncol; col++)	1223	for (int col = 0; col < THIS->ncol; col++)
1077	wstr [col] = l.t [col];	1224	wstr [col] = l.t [col];
1078		1225
1079	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));	1226	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1080		1227
1081	delete [] wstr;	1228	delete [] wstr;
1082	}	1229	}
1083		1230
1084	if (new_text)	1231	if (new_text)
…		…
1105		1252
1106	void	1253	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)	1254	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:	1255	PPCODE:
1109	{	1256	{
1110	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1257	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1111	XSRETURN_EMPTY;	1258	XSRETURN_EMPTY;
1112		1259
1113	line_t &l = ROW(row_number);	1260	line_t &l = ROW(row_number);
1114		1261
1115	if (GIMME_V != G_VOID)	1262	if (GIMME_V != G_VOID)
…		…
1145		1292
1146	int	1293	int
1147	rxvt_term::ROW_l (int row_number, int new_length = -1)	1294	rxvt_term::ROW_l (int row_number, int new_length = -1)
1148	CODE:	1295	CODE:
1149	{	1296	{
1150	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1297	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1151	XSRETURN_EMPTY;	1298	XSRETURN_EMPTY;
1152		1299
1153	line_t &l = ROW(row_number);	1300	line_t &l = ROW(row_number);
1154	RETVAL = l.l;	1301	RETVAL = l.l;
1155		1302
…		…
1161		1308
1162	bool	1309	bool
1163	rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)	1310	rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1164	CODE:	1311	CODE:
1165	{	1312	{
1166	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1313	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1167	XSRETURN_EMPTY;	1314	XSRETURN_EMPTY;
1168		1315
1169	line_t &l = ROW(row_number);	1316	line_t &l = ROW(row_number);
1170	RETVAL = l.is_longer ();	1317	RETVAL = l.is_longer ();
1171		1318
…		…
1205	else	1352	else
1206	r++ = s;	1353	r++ = s;
1207		1354
1208	rxvt_pop_locale ();	1355	rxvt_pop_locale ();
1209		1356
1210	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);	1357	RETVAL = wcs2sv (rstr, r - rstr);
1211		1358
1212	delete [] rstr;	1359	delete [] rstr;
1213	}	1360	}
1214	OUTPUT:	1361	OUTPUT:
1215	RETVAL	1362	RETVAL
…		…
1241	else if (IS_COMPOSE (*s))	1388	else if (IS_COMPOSE (*s))
1242	r += rxvt_composite.expand (*s, r);	1389	r += rxvt_composite.expand (*s, r);
1243	else	1390	else
1244	r++ = s;	1391	r++ = s;
1245		1392
1246	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);	1393	RETVAL = wcs2sv (rstr, r - rstr);
1247		1394
1248	delete [] rstr;	1395	delete [] rstr;
1249	}	1396	}
1250	OUTPUT:	1397	OUTPUT:
1251	RETVAL	1398	RETVAL
…		…
1273		1420
1274	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1421	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1275	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);	1422	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1276		1423
1277	if (GIMME_V != G_VOID)	1424	if (GIMME_V != G_VOID)
1278	XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);	1425	XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1279		1426
1280	if (newval)	1427	if (newval)
1281	{	1428	{
1282	if (SvOK (newval))	1429	if (SvOK (newval))
1283	{	1430	{
…		…
1290	}	1437	}
1291	}	1438	}
1292		1439
1293	const char *	1440	const char *
1294	rxvt_term::x_resource (const char *name)	1441	rxvt_term::x_resource (const char *name)
1295	CLEANUP:
1296	SvTAINTED_on (ST (0));
1297		1442
1298	bool	1443	bool
1299	rxvt_term::option (U32 optval, int set = -1)	1444	rxvt_term::option (U32 optval, int set = -1)
1300	CODE:	1445	CODE:
1301	{	1446	{
…		…
1361	PUSHs (sv_2mortal (newSViv (rc.col)));	1506	PUSHs (sv_2mortal (newSViv (rc.col)));
1362	}	1507	}
1363		1508
1364	if (items == 3)	1509	if (items == 3)
1365	{	1510	{
1366	rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);	1511	rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1367	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);	1512	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1368		1513
1369	if (ix)	1514	if (ix)
1370	THIS->want_refresh = 1;	1515	THIS->want_refresh = 1;
1371	}	1516	}
…		…
1376	CODE:	1521	CODE:
1377	RETVAL = THIS->charsets [THIS->screen.charset];	1522	RETVAL = THIS->charsets [THIS->screen.charset];
1378	OUTPUT:	1523	OUTPUT:
1379	RETVAL	1524	RETVAL
1380		1525
		1526	#void
		1527	#rxvt_term::selection_clear ()
		1528
		1529	void
		1530	rxvt_term::selection_make (U32 eventtime, bool rect = false)
		1531	CODE:
		1532	THIS->selection.op = SELECTION_CONT;
		1533	THIS->selection.rect = rect;
		1534	THIS->selection_make (eventtime);
		1535
1381	int	1536	int
1382	rxvt_term::selection_grab (U32 eventtime)	1537	rxvt_term::selection_grab (U32 eventtime)
1383		1538
1384	void	1539	void
1385	rxvt_term::selection (SV *newtext = 0)	1540	rxvt_term::selection (SV *newtext = 0)
1386	PPCODE:	1541	PPCODE:
1387	{	1542	{
1388	if (GIMME_V != G_VOID)	1543	if (GIMME_V != G_VOID)
1389	XPUSHs (THIS->selection.text	1544	XPUSHs (THIS->selection.text
1390	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))	1545	? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1391	: &PL_sv_undef);	1546	: &PL_sv_undef);
1392		1547
1393	if (newtext)	1548	if (newtext)
1394	{	1549	{
1395	free (THIS->selection.text);	1550	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.71 by root, Tue Jan 17 16:22:41 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.71 by root, Tue Jan 17 16:22:41 2006 UTC