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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.61 by root, Thu Jan 12 10:02:20 2006 UTC vs.
Revision 1.71 by root, Tue Jan 17 16:22:41 2006 UTC

…		…
39	#include "rxvtutil.h"	39	#include "rxvtutil.h"
40	#include "rxvtperl.h"	40	#include "rxvtperl.h"
41		41
42	#include "perlxsi.c"	42	#include "perlxsi.c"
43		43
44	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	44	#ifdef HAVE_SCROLLBARS
45	# define GRAB_CURSOR THIS->leftptr_cursor	45	# define GRAB_CURSOR THIS->leftptr_cursor
46	#else	46	#else
47	# define GRAB_CURSOR None	47	# define GRAB_CURSOR None
48	#endif	48	#endif
49		49
50	#undef LINENO	50	#undef LINENO
51	#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)
52	#undef ROW	52	#undef ROW
53	#define ROW(n) THIS->row_buf [LINENO (n)]	53	#define ROW(n) THIS->row_buf [LINENO (n)]
54		54
		55	#define ENABLE_PERL_FRILLS 1
		56
55	/////////////////////////////////////////////////////////////////////////////	57	/////////////////////////////////////////////////////////////////////////////
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	}
72		58
73	static wchar_t *	59	static wchar_t *
74	sv2wcs (SV *sv)	60	sv2wcs (SV *sv)
75	{	61	{
76	STRLEN len;	62	STRLEN len;
…		…
347	for (int y = ov_h; y--; )	333	for (int y = ov_h; y--; )
348	{	334	{
349	text_t *t1 = text [y];	335	text_t *t1 = text [y];
350	rend_t *r1 = rend [y];	336	rend_t *r1 = rend [y];
351		337
352	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;
353	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;
354		340
355	for (int x = ov_w; x--; )	341	for (int x = ov_w; x--; )
356	{	342	{
357	text_t t = t1; t1++ = t2; t2++ = t;	343	text_t t = t1; t1++ = t2; t2++ = t;
358	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));
…		…
405	perl_free (perl);	391	perl_free (perl);
406	}	392	}
407	}	393	}
408		394
409	void	395	void
410	rxvt_perl_interp::init ()	396	rxvt_perl_interp::init (rxvt_term *term)
411	{	397	{
412	if (!perl)	398	if (!perl)
413	{	399	{
		400	rxvt_push_locale (""); // perl init destroys current locale
		401
414	perl_environ = rxvt_environ;	402	perl_environ = rxvt_environ;
415	swap (perl_environ, environ);	403	swap (perl_environ, environ);
416		404
417	char *argv[] = {	405	char *argv[] = {
418	"",	406	"",
419	"-T",
420	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",	407	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
421	};	408	};
422		409
423	perl = perl_alloc ();	410	perl = perl_alloc ();
424	perl_construct (perl);	411	perl_construct (perl);
425		412
426	if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)	413	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
427	\|\| perl_run (perl))	414	\|\| perl_run (perl))
428	{	415	{
429	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");	416	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
430		417
431	perl_destruct (perl);	418	perl_destruct (perl);
432	perl_free (perl);	419	perl_free (perl);
433	perl = 0;	420	perl = 0;
434	}	421	}
435		422
436	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);
437	}	433	}
438	}	434	}
439		435
440	static void	436	static void
441	ungrab (rxvt_term *THIS)	437	ungrab (rxvt_term *THIS)
…		…
446	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);	442	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
447	THIS->perl.grabtime = 0;	443	THIS->perl.grabtime = 0;
448	}	444	}
449	}	445	}
450		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
451	bool	461	bool
452	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	462	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
453	{	463	{
454	if (!perl)	464	if (!perl \|\| !term->perl.self)
455	return false;	465	return false;
456		466
457	if (htype == HOOK_INIT) // first hook ever called	467	// pre-handling of some events
458	{	468	if (htype == HOOK_REFRESH_END)
459	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	469	swap_overlays (term);
460	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);	470
461	}	471	swap (perl_environ, environ);
462	else if (!term->perl.self)	472
463	return false; // perl not initialized for this instance	473	bool event_consumed;
464	else if (htype == HOOK_DESTROY)	474
465	{	475	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
466	// handled later	476	\|\| term->perl.should_invoke [htype])
467	}	477	try
468	else
469	{
470	if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
471	{	478	{
472	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	479	dSP;
		480	va_list ap;
473		481
474	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)
475	{	496	{
476	hv_iterinit (hv);
477
478	while (HE *he = hv_iternext (hv))
479	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480	}
481
482	}
483
484	if (!should_invoke [htype])
485	return false;
486	}
487
488	swap (perl_environ, environ);
489
490	try
491	{
492	dSP;
493	va_list ap;
494
495	va_start (ap, htype);
496
497	ENTER;
498	SAVETMPS;
499
500	PUSHMARK (SP);
501
502	XPUSHs (sv_2mortal (newSVterm (term)));
503	XPUSHs (sv_2mortal (newSViv (htype)));
504
505	for (;;) {
506	data_type dt = (data_type)va_arg (ap, int);
507
508	switch (dt)
509	{
510	case DT_INT:	497	case DT_INT:
511	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));	498	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
512	break;	499	break;
513		500
514	case DT_LONG:	501	case DT_LONG:
515	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));	502	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
516	break;	503	break;
517		504
518	case DT_STR:	505	case DT_STR:
519	XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));	506	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
520	break;	507	break;
521		508
522	case DT_STR_LEN:	509	case DT_STR_LEN:
523	{	510	{
524	char str = va_arg (ap, char );	511	char str = va_arg (ap, char );
525	int len = va_arg (ap, int);	512	int len = va_arg (ap, int);
526		513
527	XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));	514	XPUSHs (sv_2mortal (newSVpvn (str, len)));
528	}	515	}
529	break;	516	break;
530		517
531	case DT_WCS_LEN:	518	case DT_WCS_LEN:
532	{	519	{
533	wchar_t wstr = va_arg (ap, wchar_t );	520	wchar_t wstr = va_arg (ap, wchar_t );
534	int wlen = va_arg (ap, int);	521	int wlen = va_arg (ap, int);
535		522
536	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));	523	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
537	}	524	}
538	break;	525	break;
539		526
540	case DT_XEVENT:	527	case DT_XEVENT:
541	{	528	{
542	XEvent xe = va_arg (ap, XEvent );	529	XEvent xe = va_arg (ap, XEvent );
543	HV *hv = newHV ();	530	HV *hv = newHV ();
544		531
545	# 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)
546	# 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)
547	# undef set	534	# undef set
548		535
549	setiv (type, xe->type);	536	setiv (type, xe->type);
550	setiv (send_event, xe->xany.send_event);	537	setiv (send_event, xe->xany.send_event);
551	setiv (serial, xe->xany.serial);	538	setiv (serial, xe->xany.serial);
552		539
553	switch (xe->type)	540	switch (xe->type)
554	{	541	{
555	case KeyPress:	542	case KeyPress:
556	case KeyRelease:	543	case KeyRelease:
557	case ButtonPress:	544	case ButtonPress:
558	case ButtonRelease:	545	case ButtonRelease:
559	case MotionNotify:	546	case MotionNotify:
560	setiv (time, xe->xmotion.time);	547	setiv (time, xe->xmotion.time);
561	setiv (x, xe->xmotion.x);	548	setiv (x, xe->xmotion.x);
562	setiv (y, xe->xmotion.y);	549	setiv (y, xe->xmotion.y);
563	setiv (row, xe->xmotion.y / term->fheight);	550	setiv (row, xe->xmotion.y / term->fheight);
564	setiv (col, xe->xmotion.x / term->fwidth);	551	setiv (col, xe->xmotion.x / term->fwidth);
565	setiv (x_root, xe->xmotion.x_root);	552	setiv (x_root, xe->xmotion.x_root);
566	setiv (y_root, xe->xmotion.y_root);	553	setiv (y_root, xe->xmotion.y_root);
567	setiv (state, xe->xmotion.state);	554	setiv (state, xe->xmotion.state);
568	break;	555	break;
569	}	556	}
570		557
571	switch (xe->type)	558	switch (xe->type)
572	{	559	{
573	case KeyPress:	560	case KeyPress:
574	case KeyRelease:	561	case KeyRelease:
575	setiv (keycode, xe->xkey.keycode);	562	setiv (keycode, xe->xkey.keycode);
576	break;	563	break;
577		564
578	case ButtonPress:	565	case ButtonPress:
579	case ButtonRelease:	566	case ButtonRelease:
580	setiv (button, xe->xbutton.button);	567	setiv (button, xe->xbutton.button);
581	break;	568	break;
582		569
583	case MotionNotify:	570	case MotionNotify:
584	setiv (is_hint, xe->xmotion.is_hint);	571	setiv (is_hint, xe->xmotion.is_hint);
585	break;	572	break;
586	}	573	}
587		574
588	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	575	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
589	}	576	}
590	break;	577	break;
591		578
592	case DT_END:	579	case DT_END:
593	{	580	goto call;
594	va_end (ap);
595		581
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	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;
624	}
625
626	default:	582	default:
627	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);	583	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628	}	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;
629	}	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);
630	}	627	}
631	catch (...)	628
632	{
633	swap (perl_environ, environ);	629	swap (perl_environ, environ);
634	throw;	630
635	}	631	return event_consumed;
636	}	632	}
637		633
638	/////////////////////////////////////////////////////////////////////////////	634	/////////////////////////////////////////////////////////////////////////////
639		635
640	MODULE = urxvt PACKAGE = urxvt	636	MODULE = urxvt PACKAGE = urxvt
…		…
659	# include "optinc.h"	655	# include "optinc.h"
660	# undef nodef	656	# undef nodef
661	# undef def	657	# undef def
662		658
663	HV *stash = gv_stashpv ("urxvt", 1);	659	HV *stash = gv_stashpv ("urxvt", 1);
664	# 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 }
665	export_const_iv (DEFAULT_RSTYLE);	665	const_iv (DEFAULT_RSTYLE),
666	export_const_iv (OVERLAY_RSTYLE);	666	const_iv (OVERLAY_RSTYLE),
667	export_const_iv (RS_Bold);	667	const_iv (RS_Bold),
668	export_const_iv (RS_Italic);	668	const_iv (RS_Italic),
669	export_const_iv (RS_Blink);	669	const_iv (RS_Blink),
670	export_const_iv (RS_RVid);	670	const_iv (RS_RVid),
671	export_const_iv (RS_Uline);	671	const_iv (RS_Uline),
672		672
673	export_const_iv (CurrentTime);	673	const_iv (CurrentTime),
674	export_const_iv (ShiftMask);	674	const_iv (ShiftMask),
675	export_const_iv (LockMask);	675	const_iv (LockMask),
676	export_const_iv (ControlMask);	676	const_iv (ControlMask),
677	export_const_iv (Mod1Mask);	677	const_iv (Mod1Mask),
678	export_const_iv (Mod2Mask);	678	const_iv (Mod2Mask),
679	export_const_iv (Mod3Mask);	679	const_iv (Mod3Mask),
680	export_const_iv (Mod4Mask);	680	const_iv (Mod4Mask),
681	export_const_iv (Mod5Mask);	681	const_iv (Mod5Mask),
682	export_const_iv (Button1Mask);	682	const_iv (Button1Mask),
683	export_const_iv (Button2Mask);	683	const_iv (Button2Mask),
684	export_const_iv (Button3Mask);	684	const_iv (Button3Mask),
685	export_const_iv (Button4Mask);	685	const_iv (Button4Mask),
686	export_const_iv (Button5Mask);	686	const_iv (Button5Mask),
687	export_const_iv (AnyModifier);	687	const_iv (AnyModifier),
688		688
689	export_const_iv (EVENT_NONE);	689	const_iv (EVENT_NONE),
690	export_const_iv (EVENT_READ);	690	const_iv (EVENT_READ),
691	export_const_iv (EVENT_WRITE);	691	const_iv (EVENT_WRITE),
692	}
693		692
694	void	693	const_iv (NoEventMask),
695	set_should_invoke (int htype, int value)	694	const_iv (KeyPressMask),
696	CODE:	695	const_iv (KeyReleaseMask),
697	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	}
698		759
699	void	760	void
700	warn (const char *msg)	761	warn (const char *msg)
701	CODE:	762	CODE:
702	rxvt_warn ("%s", msg);	763	rxvt_warn ("%s", msg);
…		…
704	void	765	void
705	fatal (const char *msg)	766	fatal (const char *msg)
706	CODE:	767	CODE:
707	rxvt_fatal ("%s", msg);	768	rxvt_fatal ("%s", msg);
708		769
709	SV *
710	untaint (SV *sv)
711	CODE:
712	RETVAL = newSVsv (sv);
713	SvTAINTED_off (RETVAL);
714	OUTPUT:
715	RETVAL
716
717	void	770	void
718	_exit (int status)	771	_exit (int status)
719
720	bool
721	safe ()
722	CODE:
723	RETVAL = !rxvt_tainted ();
724	OUTPUT:
725	RETVAL
726		772
727	NV	773	NV
728	NOW ()	774	NOW ()
729	CODE:	775	CODE:
730	RETVAL = NOW;	776	RETVAL = NOW;
…		…
825	OUTPUT:	871	OUTPUT:
826	RETVAL	872	RETVAL
827		873
828	void	874	void
829	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;
830		970
831	void	971	void
832	rxvt_term::grab_button (int button, U32 modifiers)	972	rxvt_term::grab_button (int button, U32 modifiers)
833	CODE:	973	CODE:
834	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,	974	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
…		…
902	char *mbstr = rxvt_wcstombs (wstr);	1042	char *mbstr = rxvt_wcstombs (wstr);
903	rxvt_pop_locale ();	1043	rxvt_pop_locale ();
904		1044
905	free (wstr);	1045	free (wstr);
906		1046
907	RETVAL = taint_if (newSVpv (mbstr, 0), str);	1047	RETVAL = newSVpv (mbstr, 0);
908	free (mbstr);	1048	free (mbstr);
909	}	1049	}
910	OUTPUT:	1050	OUTPUT:
911	RETVAL	1051	RETVAL
912		1052
…		…
919		1059
920	rxvt_push_locale (THIS->locale);	1060	rxvt_push_locale (THIS->locale);
921	wchar_t *wstr = rxvt_mbstowcs (data, len);	1061	wchar_t *wstr = rxvt_mbstowcs (data, len);
922	rxvt_pop_locale ();	1062	rxvt_pop_locale ();
923		1063
924	RETVAL = taint_if (wcs2sv (wstr), octets);	1064	RETVAL = wcs2sv (wstr);
925	free (wstr);	1065	free (wstr);
926	}	1066	}
927	OUTPUT:	1067	OUTPUT:
928	RETVAL	1068	RETVAL
929		1069
…		…
938	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)	1078	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
939	#define TERM_OFFSET_focus TERM_OFFSET(focus)	1079	#define TERM_OFFSET_focus TERM_OFFSET(focus)
940	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)	1080	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
941	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)	1081	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
942	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)	1082	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
943	#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)	1083	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
944		1084
945	int	1085	int
946	rxvt_term::width ()	1086	rxvt_term::width ()
947	ALIAS:	1087	ALIAS:
948	width = TERM_OFFSET_width	1088	width = TERM_OFFSET_width
…		…
954	ncol = TERM_OFFSET_ncol	1094	ncol = TERM_OFFSET_ncol
955	focus = TERM_OFFSET_focus	1095	focus = TERM_OFFSET_focus
956	mapped = TERM_OFFSET_mapped	1096	mapped = TERM_OFFSET_mapped
957	saveLines = TERM_OFFSET_saveLines	1097	saveLines = TERM_OFFSET_saveLines
958	total_rows = TERM_OFFSET_total_rows	1098	total_rows = TERM_OFFSET_total_rows
959	nsaved = TERM_OFFSET_nsaved	1099	top_row = TERM_OFFSET_top_row
960	CODE:	1100	CODE:
961	RETVAL = (int )((char *)THIS + ix);	1101	RETVAL = (int )((char *)THIS + ix);
962	OUTPUT:	1102	OUTPUT:
963	RETVAL	1103	RETVAL
964		1104
…		…
1033	CODE:	1173	CODE:
1034	RETVAL = (U32)THIS->vt;	1174	RETVAL = (U32)THIS->vt;
1035	OUTPUT:	1175	OUTPUT:
1036	RETVAL	1176	RETVAL
1037		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
1038	U32	1184	U32
1039	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)	1185	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1040	CODE:	1186	CODE:
1041	{
1042	RETVAL = THIS->rstyle;	1187	RETVAL = THIS->rstyle;
1043	THIS->rstyle = new_rstyle;	1188	THIS->rstyle = new_rstyle;
1044	}
1045	OUTPUT:	1189	OUTPUT:
1046	RETVAL	1190	RETVAL
1047		1191
1048	int	1192	int
1049	rxvt_term::view_start (int newval = -1)	1193	rxvt_term::view_start (int newval = 1)
1050	PROTOTYPE: $;$	1194	PROTOTYPE: $;$
1051	CODE:	1195	CODE:
1052	{	1196	{
1053	RETVAL = THIS->view_start;	1197	RETVAL = THIS->view_start;
1054		1198
1055	if (newval >= 0)	1199	if (newval <= 0)
1056	{	1200	THIS->scr_changeview (max (newval, THIS->top_row));
1057	THIS->view_start = min (newval, THIS->nsaved);
1058	THIS->scr_changeview (RETVAL);
1059	}
1060	}	1201	}
1061	OUTPUT:	1202	OUTPUT:
1062	RETVAL	1203	RETVAL
1063		1204
1064	void	1205	void
…		…
1068		1209
1069	void	1210	void
1070	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)
1071	PPCODE:	1212	PPCODE:
1072	{	1213	{
1073	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1214	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1074	XSRETURN_EMPTY;	1215	XSRETURN_EMPTY;
1075		1216
1076	line_t &l = ROW(row_number);	1217	line_t &l = ROW(row_number);
1077		1218
1078	if (GIMME_V != G_VOID)	1219	if (GIMME_V != G_VOID)
…		…
1080	wchar_t *wstr = new wchar_t [THIS->ncol];	1221	wchar_t *wstr = new wchar_t [THIS->ncol];
1081		1222
1082	for (int col = 0; col < THIS->ncol; col++)	1223	for (int col = 0; col < THIS->ncol; col++)
1083	wstr [col] = l.t [col];	1224	wstr [col] = l.t [col];
1084		1225
1085	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));	1226	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1086		1227
1087	delete [] wstr;	1228	delete [] wstr;
1088	}	1229	}
1089		1230
1090	if (new_text)	1231	if (new_text)
…		…
1111		1252
1112	void	1253	void
1113	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)
1114	PPCODE:	1255	PPCODE:
1115	{	1256	{
1116	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1257	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1117	XSRETURN_EMPTY;	1258	XSRETURN_EMPTY;
1118		1259
1119	line_t &l = ROW(row_number);	1260	line_t &l = ROW(row_number);
1120		1261
1121	if (GIMME_V != G_VOID)	1262	if (GIMME_V != G_VOID)
…		…
1151		1292
1152	int	1293	int
1153	rxvt_term::ROW_l (int row_number, int new_length = -1)	1294	rxvt_term::ROW_l (int row_number, int new_length = -1)
1154	CODE:	1295	CODE:
1155	{	1296	{
1156	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1297	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1157	XSRETURN_EMPTY;	1298	XSRETURN_EMPTY;
1158		1299
1159	line_t &l = ROW(row_number);	1300	line_t &l = ROW(row_number);
1160	RETVAL = l.l;	1301	RETVAL = l.l;
1161		1302
…		…
1167		1308
1168	bool	1309	bool
1169	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)
1170	CODE:	1311	CODE:
1171	{	1312	{
1172	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1313	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1173	XSRETURN_EMPTY;	1314	XSRETURN_EMPTY;
1174		1315
1175	line_t &l = ROW(row_number);	1316	line_t &l = ROW(row_number);
1176	RETVAL = l.is_longer ();	1317	RETVAL = l.is_longer ();
1177		1318
…		…
1211	else	1352	else
1212	r++ = s;	1353	r++ = s;
1213		1354
1214	rxvt_pop_locale ();	1355	rxvt_pop_locale ();
1215		1356
1216	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);	1357	RETVAL = wcs2sv (rstr, r - rstr);
1217		1358
1218	delete [] rstr;	1359	delete [] rstr;
1219	}	1360	}
1220	OUTPUT:	1361	OUTPUT:
1221	RETVAL	1362	RETVAL
…		…
1247	else if (IS_COMPOSE (*s))	1388	else if (IS_COMPOSE (*s))
1248	r += rxvt_composite.expand (*s, r);	1389	r += rxvt_composite.expand (*s, r);
1249	else	1390	else
1250	r++ = s;	1391	r++ = s;
1251		1392
1252	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);	1393	RETVAL = wcs2sv (rstr, r - rstr);
1253		1394
1254	delete [] rstr;	1395	delete [] rstr;
1255	}	1396	}
1256	OUTPUT:	1397	OUTPUT:
1257	RETVAL	1398	RETVAL
…		…
1279		1420
1280	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1421	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1281	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);
1282		1423
1283	if (GIMME_V != G_VOID)	1424	if (GIMME_V != G_VOID)
1284	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);
1285		1426
1286	if (newval)	1427	if (newval)
1287	{	1428	{
1288	if (SvOK (newval))	1429	if (SvOK (newval))
1289	{	1430	{
…		…
1296	}	1437	}
1297	}	1438	}
1298		1439
1299	const char *	1440	const char *
1300	rxvt_term::x_resource (const char *name)	1441	rxvt_term::x_resource (const char *name)
1301	CLEANUP:
1302	SvTAINTED_on (ST (0));
1303		1442
1304	bool	1443	bool
1305	rxvt_term::option (U32 optval, int set = -1)	1444	rxvt_term::option (U32 optval, int set = -1)
1306	CODE:	1445	CODE:
1307	{	1446	{
…		…
1367	PUSHs (sv_2mortal (newSViv (rc.col)));	1506	PUSHs (sv_2mortal (newSViv (rc.col)));
1368	}	1507	}
1369		1508
1370	if (items == 3)	1509	if (items == 3)
1371	{	1510	{
1372	rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);	1511	rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1373	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);	1512	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1374		1513
1375	if (ix)	1514	if (ix)
1376	THIS->want_refresh = 1;	1515	THIS->want_refresh = 1;
1377	}	1516	}
…		…
1401	rxvt_term::selection (SV *newtext = 0)	1540	rxvt_term::selection (SV *newtext = 0)
1402	PPCODE:	1541	PPCODE:
1403	{	1542	{
1404	if (GIMME_V != G_VOID)	1543	if (GIMME_V != G_VOID)
1405	XPUSHs (THIS->selection.text	1544	XPUSHs (THIS->selection.text
1406	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))	1545	? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1407	: &PL_sv_undef);	1546	: &PL_sv_undef);
1408		1547
1409	if (newtext)	1548	if (newtext)
1410	{	1549	{
1411	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.61 by root, Thu Jan 12 10:02:20 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.61 by root, Thu Jan 12 10:02:20 2006 UTC vs.
Revision 1.71 by root, Tue Jan 17 16:22:41 2006 UTC