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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.63 by root, Fri Jan 13 05:06:44 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 (!term->perl.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
…		…
769	void	765	void
770	fatal (const char *msg)	766	fatal (const char *msg)
771	CODE:	767	CODE:
772	rxvt_fatal ("%s", msg);	768	rxvt_fatal ("%s", msg);
773		769
774	SV *
775	untaint (SV *sv)
776	CODE:
777	RETVAL = newSVsv (sv);
778	SvTAINTED_off (RETVAL);
779	OUTPUT:
780	RETVAL
781
782	void	770	void
783	_exit (int status)	771	_exit (int status)
784
785	bool
786	safe ()
787	CODE:
788	RETVAL = !rxvt_tainted ();
789	OUTPUT:
790	RETVAL
791		772
792	NV	773	NV
793	NOW ()	774	NOW ()
794	CODE:	775	CODE:
795	RETVAL = NOW;	776	RETVAL = NOW;
…		…
890	OUTPUT:	871	OUTPUT:
891	RETVAL	872	RETVAL
892		873
893	void	874	void
894	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
895		965
896	void	966	void
897	rxvt_term::set_should_invoke (int htype, int inc)	967	rxvt_term::set_should_invoke (int htype, int inc)
898	CODE:	968	CODE:
899	THIS->perl.should_invoke [htype] += inc;	969	THIS->perl.should_invoke [htype] += inc;
…		…
972	char *mbstr = rxvt_wcstombs (wstr);	1042	char *mbstr = rxvt_wcstombs (wstr);
973	rxvt_pop_locale ();	1043	rxvt_pop_locale ();
974		1044
975	free (wstr);	1045	free (wstr);
976		1046
977	RETVAL = taint_if (newSVpv (mbstr, 0), str);	1047	RETVAL = newSVpv (mbstr, 0);
978	free (mbstr);	1048	free (mbstr);
979	}	1049	}
980	OUTPUT:	1050	OUTPUT:
981	RETVAL	1051	RETVAL
982		1052
…		…
989		1059
990	rxvt_push_locale (THIS->locale);	1060	rxvt_push_locale (THIS->locale);
991	wchar_t *wstr = rxvt_mbstowcs (data, len);	1061	wchar_t *wstr = rxvt_mbstowcs (data, len);
992	rxvt_pop_locale ();	1062	rxvt_pop_locale ();
993		1063
994	RETVAL = taint_if (wcs2sv (wstr), octets);	1064	RETVAL = wcs2sv (wstr);
995	free (wstr);	1065	free (wstr);
996	}	1066	}
997	OUTPUT:	1067	OUTPUT:
998	RETVAL	1068	RETVAL
999		1069
…		…
1008	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)	1078	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1009	#define TERM_OFFSET_focus TERM_OFFSET(focus)	1079	#define TERM_OFFSET_focus TERM_OFFSET(focus)
1010	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)	1080	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1011	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)	1081	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1012	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)	1082	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1013	#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)	1083	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1014		1084
1015	int	1085	int
1016	rxvt_term::width ()	1086	rxvt_term::width ()
1017	ALIAS:	1087	ALIAS:
1018	width = TERM_OFFSET_width	1088	width = TERM_OFFSET_width
…		…
1024	ncol = TERM_OFFSET_ncol	1094	ncol = TERM_OFFSET_ncol
1025	focus = TERM_OFFSET_focus	1095	focus = TERM_OFFSET_focus
1026	mapped = TERM_OFFSET_mapped	1096	mapped = TERM_OFFSET_mapped
1027	saveLines = TERM_OFFSET_saveLines	1097	saveLines = TERM_OFFSET_saveLines
1028	total_rows = TERM_OFFSET_total_rows	1098	total_rows = TERM_OFFSET_total_rows
1029	nsaved = TERM_OFFSET_nsaved	1099	top_row = TERM_OFFSET_top_row
1030	CODE:	1100	CODE:
1031	RETVAL = (int )((char *)THIS + ix);	1101	RETVAL = (int )((char *)THIS + ix);
1032	OUTPUT:	1102	OUTPUT:
1033	RETVAL	1103	RETVAL
1034		1104
…		…
1118	THIS->rstyle = new_rstyle;	1188	THIS->rstyle = new_rstyle;
1119	OUTPUT:	1189	OUTPUT:
1120	RETVAL	1190	RETVAL
1121		1191
1122	int	1192	int
1123	rxvt_term::view_start (int newval = -1)	1193	rxvt_term::view_start (int newval = 1)
1124	PROTOTYPE: $;$	1194	PROTOTYPE: $;$
1125	CODE:	1195	CODE:
1126	{	1196	{
1127	RETVAL = THIS->view_start;	1197	RETVAL = THIS->view_start;
1128		1198
1129	if (newval >= 0)	1199	if (newval <= 0)
1130	{	1200	THIS->scr_changeview (max (newval, THIS->top_row));
1131	THIS->view_start = min (newval, THIS->nsaved);
1132	THIS->scr_changeview (RETVAL);
1133	}
1134	}	1201	}
1135	OUTPUT:	1202	OUTPUT:
1136	RETVAL	1203	RETVAL
1137		1204
1138	void	1205	void
…		…
1142		1209
1143	void	1210	void
1144	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)
1145	PPCODE:	1212	PPCODE:
1146	{	1213	{
1147	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1214	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1148	XSRETURN_EMPTY;	1215	XSRETURN_EMPTY;
1149		1216
1150	line_t &l = ROW(row_number);	1217	line_t &l = ROW(row_number);
1151		1218
1152	if (GIMME_V != G_VOID)	1219	if (GIMME_V != G_VOID)
…		…
1154	wchar_t *wstr = new wchar_t [THIS->ncol];	1221	wchar_t *wstr = new wchar_t [THIS->ncol];
1155		1222
1156	for (int col = 0; col < THIS->ncol; col++)	1223	for (int col = 0; col < THIS->ncol; col++)
1157	wstr [col] = l.t [col];	1224	wstr [col] = l.t [col];
1158		1225
1159	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));	1226	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1160		1227
1161	delete [] wstr;	1228	delete [] wstr;
1162	}	1229	}
1163		1230
1164	if (new_text)	1231	if (new_text)
…		…
1185		1252
1186	void	1253	void
1187	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)
1188	PPCODE:	1255	PPCODE:
1189	{	1256	{
1190	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1257	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1191	XSRETURN_EMPTY;	1258	XSRETURN_EMPTY;
1192		1259
1193	line_t &l = ROW(row_number);	1260	line_t &l = ROW(row_number);
1194		1261
1195	if (GIMME_V != G_VOID)	1262	if (GIMME_V != G_VOID)
…		…
1225		1292
1226	int	1293	int
1227	rxvt_term::ROW_l (int row_number, int new_length = -1)	1294	rxvt_term::ROW_l (int row_number, int new_length = -1)
1228	CODE:	1295	CODE:
1229	{	1296	{
1230	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1297	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1231	XSRETURN_EMPTY;	1298	XSRETURN_EMPTY;
1232		1299
1233	line_t &l = ROW(row_number);	1300	line_t &l = ROW(row_number);
1234	RETVAL = l.l;	1301	RETVAL = l.l;
1235		1302
…		…
1241		1308
1242	bool	1309	bool
1243	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)
1244	CODE:	1311	CODE:
1245	{	1312	{
1246	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1313	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1247	XSRETURN_EMPTY;	1314	XSRETURN_EMPTY;
1248		1315
1249	line_t &l = ROW(row_number);	1316	line_t &l = ROW(row_number);
1250	RETVAL = l.is_longer ();	1317	RETVAL = l.is_longer ();
1251		1318
…		…
1285	else	1352	else
1286	r++ = s;	1353	r++ = s;
1287		1354
1288	rxvt_pop_locale ();	1355	rxvt_pop_locale ();
1289		1356
1290	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);	1357	RETVAL = wcs2sv (rstr, r - rstr);
1291		1358
1292	delete [] rstr;	1359	delete [] rstr;
1293	}	1360	}
1294	OUTPUT:	1361	OUTPUT:
1295	RETVAL	1362	RETVAL
…		…
1321	else if (IS_COMPOSE (*s))	1388	else if (IS_COMPOSE (*s))
1322	r += rxvt_composite.expand (*s, r);	1389	r += rxvt_composite.expand (*s, r);
1323	else	1390	else
1324	r++ = s;	1391	r++ = s;
1325		1392
1326	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);	1393	RETVAL = wcs2sv (rstr, r - rstr);
1327		1394
1328	delete [] rstr;	1395	delete [] rstr;
1329	}	1396	}
1330	OUTPUT:	1397	OUTPUT:
1331	RETVAL	1398	RETVAL
…		…
1353		1420
1354	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1421	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1355	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);
1356		1423
1357	if (GIMME_V != G_VOID)	1424	if (GIMME_V != G_VOID)
1358	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);
1359		1426
1360	if (newval)	1427	if (newval)
1361	{	1428	{
1362	if (SvOK (newval))	1429	if (SvOK (newval))
1363	{	1430	{
…		…
1370	}	1437	}
1371	}	1438	}
1372		1439
1373	const char *	1440	const char *
1374	rxvt_term::x_resource (const char *name)	1441	rxvt_term::x_resource (const char *name)
1375	CLEANUP:
1376	SvTAINTED_on (ST (0));
1377		1442
1378	bool	1443	bool
1379	rxvt_term::option (U32 optval, int set = -1)	1444	rxvt_term::option (U32 optval, int set = -1)
1380	CODE:	1445	CODE:
1381	{	1446	{
…		…
1441	PUSHs (sv_2mortal (newSViv (rc.col)));	1506	PUSHs (sv_2mortal (newSViv (rc.col)));
1442	}	1507	}
1443		1508
1444	if (items == 3)	1509	if (items == 3)
1445	{	1510	{
1446	rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);	1511	rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1447	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);	1512	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1448		1513
1449	if (ix)	1514	if (ix)
1450	THIS->want_refresh = 1;	1515	THIS->want_refresh = 1;
1451	}	1516	}
…		…
1475	rxvt_term::selection (SV *newtext = 0)	1540	rxvt_term::selection (SV *newtext = 0)
1476	PPCODE:	1541	PPCODE:
1477	{	1542	{
1478	if (GIMME_V != G_VOID)	1543	if (GIMME_V != G_VOID)
1479	XPUSHs (THIS->selection.text	1544	XPUSHs (THIS->selection.text
1480	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))	1545	? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1481	: &PL_sv_undef);	1546	: &PL_sv_undef);
1482		1547
1483	if (newtext)	1548	if (newtext)
1484	{	1549	{
1485	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.63 by root, Fri Jan 13 05:06:44 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.63 by root, Fri Jan 13 05:06:44 2006 UTC vs.
Revision 1.71 by root, Tue Jan 17 16:22:41 2006 UTC