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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.65 by root, Fri Jan 13 15:45:44 2006 UTC vs.
Revision 1.78 by root, Thu Jan 19 20:30:36 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 0	55	#define ENABLE_PERL_FRILLS 1
56		56
57	/////////////////////////////////////////////////////////////////////////////	57	/////////////////////////////////////////////////////////////////////////////
58
59	static SV *
60	taint (SV *sv)
61	{
62	SvTAINT (sv);
63	return sv;
64	}
65
66	static SV *
67	taint_if (SV sv, SV src)
68	{
69	if (SvTAINTED (src))
70	SvTAINT (sv);
71
72	return sv;
73	}
74		58
75	static wchar_t *	59	static wchar_t *
76	sv2wcs (SV *sv)	60	sv2wcs (SV *sv)
77	{	61	{
78	STRLEN len;	62	STRLEN len;
…		…
227		211
228	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")	212	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
229		213
230	struct overlay {	214	struct overlay {
231	HV *self;	215	HV *self;
		216	bool visible;
232	rxvt_term *THIS;	217	rxvt_term *THIS;
233	int x, y, w, h;	218	int x, y, w, h;
234	int border;	219	int border;
235	text_t **text;	220	text_t **text;
236	rend_t **rend;	221	rend_t **rend;
…		…
245		230
246	void set (int x, int y, SV str, SV rend);	231	void set (int x, int y, SV str, SV rend);
247	};	232	};
248		233
249	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)	234	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
250	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2)	235	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false)
251	{	236	{
252	if (border == 2)	237	if (border == 2)
253	{	238	{
254	w += 2;	239	w += 2;
255	h += 2;	240	h += 2;
…		…
316	}	301	}
317		302
318	void	303	void
319	overlay::show ()	304	overlay::show ()
320	{	305	{
321	char key[33]; sprintf (key, "%32lx", (long)this);	306	if (visible)
		307	return;
322		308
		309	visible = true;
		310
323	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));	311	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
324	hv_store (hv, key, 32, newSViv ((long)this), 0);	312	av_push (av, newSViv ((long)this));
325	}	313	}
326		314
327	void	315	void
328	overlay::hide ()	316	overlay::hide ()
329	{	317	{
		318	if (!visible)
		319	return;
		320
		321	visible = false;
		322
330	SV *ovs = hv_fetch ((HV )SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);	323	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
331		324
332	if (ovs)	325	int i;
		326
		327	for (i = AvFILL (av); i >= 0; i--)
		328	if (SvIV (*av_fetch (av, i, 1)) == (long)this)
333	{	329	{
334	char key[33]; sprintf (key, "%32lx", (long)this);
335
336	HV hv = (HV )SvRV (*ovs);
337	hv_delete (hv, key, 32, G_DISCARD);	330	av_delete (av, i, G_DISCARD);
		331	break;
338	}	332	}
		333
		334	for (; i < AvFILL (av); i++)
		335	av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
		336
		337	av_pop (av);
339	}	338	}
340		339
341	void overlay::swap ()	340	void overlay::swap ()
342	{	341	{
343	int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));	342	int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
…		…
349	for (int y = ov_h; y--; )	348	for (int y = ov_h; y--; )
350	{	349	{
351	text_t *t1 = text [y];	350	text_t *t1 = text [y];
352	rend_t *r1 = rend [y];	351	rend_t *r1 = rend [y];
353		352
354	text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;	353	text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
355	rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;	354	rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
356		355
357	for (int x = ov_w; x--; )	356	for (int x = ov_w; x--; )
358	{	357	{
359	text_t t = t1; t1++ = t2; t2++ = t;	358	text_t t = t1; t1++ = t2; t2++ = t;
360	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));	359	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
…		…
383	if (!SvROK (rend) \|\| SvTYPE (SvRV (rend)) != SVt_PVAV)	382	if (!SvROK (rend) \|\| SvTYPE (SvRV (rend)) != SVt_PVAV)
384	croak ("rend must be arrayref");	383	croak ("rend must be arrayref");
385		384
386	AV av = (AV )SvRV (rend);	385	AV av = (AV )SvRV (rend);
387		386
388	for (int col = min (av_len (av) + 1, w - x - border); col--; )	387	for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
389	this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));	388	this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
390	}	389	}
391		390
392	THIS->want_refresh = 1;	391	THIS->want_refresh = 1;
393	}	392	}
…		…
407	perl_free (perl);	406	perl_free (perl);
408	}	407	}
409	}	408	}
410		409
411	void	410	void
412	rxvt_perl_interp::init ()	411	rxvt_perl_interp::init (rxvt_term *term)
413	{	412	{
414	if (!perl)	413	if (!perl)
415	{	414	{
		415	rxvt_push_locale (""); // perl init destroys current locale
		416
416	perl_environ = rxvt_environ;	417	perl_environ = rxvt_environ;
417	swap (perl_environ, environ);	418	swap (perl_environ, environ);
418		419
419	char *argv[] = {	420	char *argv[] = {
420	"",	421	"",
421	"-T",	422	"-e"
422	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",	423	"BEGIN {"
		424	" urxvt->bootstrap;"
		425	" unshift @INC, '" LIBDIR "';"
		426	"}"
		427	""
		428	"use urxvt;"
423	};	429	};
424		430
425	perl = perl_alloc ();	431	perl = perl_alloc ();
426	perl_construct (perl);	432	perl_construct (perl);
427		433
428	if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)	434	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
429	\|\| perl_run (perl))	435	\|\| perl_run (perl))
430	{	436	{
431	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");	437	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
432		438
433	perl_destruct (perl);	439	perl_destruct (perl);
434	perl_free (perl);	440	perl_free (perl);
435	perl = 0;	441	perl = 0;
436	}	442	}
437		443
438	swap (perl_environ, environ);	444	swap (perl_environ, environ);
		445
		446	rxvt_pop_locale ();
		447	}
		448
		449	if (perl)
		450	{
		451	// runs outside of perls ENV
		452	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
		453	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
439	}	454	}
440	}	455	}
441		456
442	static void	457	static void
443	ungrab (rxvt_term *THIS)	458	ungrab (rxvt_term *THIS)
…		…
451	}	466	}
452		467
453	bool	468	bool
454	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	469	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
455	{	470	{
456	if (!perl)	471	if (!perl \|\| !term->perl.self)
457	return false;	472	return false;
458		473
459	if (htype == HOOK_INIT) // first hook ever called	474	// pre-handling of some events
		475	if (htype == HOOK_REFRESH_END)
460	{	476	{
461	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	477	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
462	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);	478
		479	for (int i = 0; i <= AvFILL (av); i++)
		480	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();
463	}	481	}
464	else if (!term->perl.self)	482
465	return false; // perl not initialized for this instance	483	swap (perl_environ, environ);
		484
		485	bool event_consumed;
		486
		487	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
		488	\|\| term->perl.should_invoke [htype])
		489	try
		490	{
		491	dSP;
		492	va_list ap;
		493
		494	va_start (ap, htype);
		495
		496	ENTER;
		497	SAVETMPS;
		498
		499	PUSHMARK (SP);
		500
		501	XPUSHs (sv_2mortal (newSVterm (term)));
		502	XPUSHs (sv_2mortal (newSViv (htype)));
		503
		504	for (;;) {
		505	data_type dt = (data_type)va_arg (ap, int);
		506
		507	switch (dt)
		508	{
		509	case DT_INT:
		510	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
		511	break;
		512
		513	case DT_LONG:
		514	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
		515	break;
		516
		517	case DT_STR:
		518	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
		519	break;
		520
		521	case DT_STR_LEN:
		522	{
		523	char str = va_arg (ap, char );
		524	int len = va_arg (ap, int);
		525
		526	XPUSHs (sv_2mortal (newSVpvn (str, len)));
		527	}
		528	break;
		529
		530	case DT_WCS_LEN:
		531	{
		532	wchar_t wstr = va_arg (ap, wchar_t );
		533	int wlen = va_arg (ap, int);
		534
		535	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
		536	}
		537	break;
		538
		539	case DT_XEVENT:
		540	{
		541	XEvent xe = va_arg (ap, XEvent );
		542	HV *hv = newHV ();
		543
		544	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
		545	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
		546	# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
		547	# undef set
		548
		549	setiv (type, xe->type);
		550	setiv (send_event, xe->xany.send_event);
		551	setiv (serial, xe->xany.serial);
		552
		553	switch (xe->type)
		554	{
		555	case KeyPress:
		556	case KeyRelease:
		557	case ButtonPress:
		558	case ButtonRelease:
		559	case MotionNotify:
		560	setuv (window, xe->xmotion.window);
		561	setuv (root, xe->xmotion.root);
		562	setuv (subwindow, xe->xmotion.subwindow);
		563	setuv (time, xe->xmotion.time);
		564	setiv (x, xe->xmotion.x);
		565	setiv (y, xe->xmotion.y);
		566	setiv (row, xe->xmotion.y / term->fheight);
		567	setiv (col, xe->xmotion.x / term->fwidth);
		568	setiv (x_root, xe->xmotion.x_root);
		569	setiv (y_root, xe->xmotion.y_root);
		570	setuv (state, xe->xmotion.state);
		571
		572	switch (xe->type)
		573	{
		574	case KeyPress:
		575	case KeyRelease:
		576	setuv (keycode, xe->xkey.keycode);
		577	break;
		578
		579	case ButtonPress:
		580	case ButtonRelease:
		581	setuv (button, xe->xbutton.button);
		582	break;
		583
		584	case MotionNotify:
		585	setiv (is_hint, xe->xmotion.is_hint);
		586	break;
		587	}
		588
		589	break;
		590
		591	case MapNotify:
		592	case UnmapNotify:
		593	case ConfigureNotify:
		594	setuv (event, xe->xconfigure.event);
		595	setuv (window, xe->xconfigure.window);
		596
		597	switch (xe->type)
		598	{
		599	case ConfigureNotify:
		600	setiv (x, xe->xconfigure.x);
		601	setiv (y, xe->xconfigure.y);
		602	setiv (width, xe->xconfigure.width);
		603	setiv (height, xe->xconfigure.height);
		604	setuv (above, xe->xconfigure.above);
		605	break;
		606	}
		607
		608	break;
		609	}
		610
		611	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		612	}
		613	break;
		614
		615	case DT_END:
		616	goto call;
		617
		618	default:
		619	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
		620	}
		621	}
		622
		623	call:
		624	va_end (ap);
		625
		626	PUTBACK;
		627	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
		628	SPAGAIN;
		629
		630	if (count)
		631	{
		632	SV *status = POPs;
		633	count = SvTRUE (status);
		634	}
		635
		636	PUTBACK;
		637	FREETMPS;
		638	LEAVE;
		639
		640	if (SvTRUE (ERRSV))
		641	{
		642	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
		643	ungrab (term); // better lose the grab than the session
		644	}
		645
		646	event_consumed = !!count;
		647	}
		648	catch (...)
		649	{
		650	swap (perl_environ, environ);
		651	throw;
		652	}
		653	else
		654	event_consumed = false;
		655
		656	// post-handling of some events
		657	if (htype == HOOK_REFRESH_BEGIN)
		658	{
		659	AV av = (AV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
		660
		661	for (int i = AvFILL (av); i >= 0; i--)
		662	((overlay )SvIV (av_fetch (av, i, 0)))->swap ();
		663	}
466	else if (htype == HOOK_DESTROY)	664	else if (htype == HOOK_DESTROY)
467	{	665	{
468	// handled later	666	clearSVptr ((SV *)term->perl.self);
		667	SvREFCNT_dec ((SV *)term->perl.self);
469	}	668	}
470	else
471	{
472	if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
473	{
474	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
475
476	if (HvKEYS (hv))
477	{
478	hv_iterinit (hv);
479
480	while (HE *he = hv_iternext (hv))
481	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482	}
483
484	}
485
486	if (!term->perl.should_invoke [htype])
487	return false;
488	}
489		669
490	swap (perl_environ, environ);	670	swap (perl_environ, environ);
491		671
492	try	672	return event_consumed;
493	{
494	dSP;
495	va_list ap;
496
497	va_start (ap, htype);
498
499	ENTER;
500	SAVETMPS;
501
502	PUSHMARK (SP);
503
504	XPUSHs (sv_2mortal (newSVterm (term)));
505	XPUSHs (sv_2mortal (newSViv (htype)));
506
507	for (;;) {
508	data_type dt = (data_type)va_arg (ap, int);
509
510	switch (dt)
511	{
512	case DT_INT:
513	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514	break;
515
516	case DT_LONG:
517	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518	break;
519
520	case DT_STR:
521	XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
522	break;
523
524	case DT_STR_LEN:
525	{
526	char str = va_arg (ap, char );
527	int len = va_arg (ap, int);
528
529	XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
530	}
531	break;
532
533	case DT_WCS_LEN:
534	{
535	wchar_t wstr = va_arg (ap, wchar_t );
536	int wlen = va_arg (ap, int);
537
538	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
539	}
540	break;
541
542	case DT_XEVENT:
543	{
544	XEvent xe = va_arg (ap, XEvent );
545	HV *hv = newHV ();
546
547	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
548	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549	# undef set
550
551	setiv (type, xe->type);
552	setiv (send_event, xe->xany.send_event);
553	setiv (serial, xe->xany.serial);
554
555	switch (xe->type)
556	{
557	case KeyPress:
558	case KeyRelease:
559	case ButtonPress:
560	case ButtonRelease:
561	case MotionNotify:
562	setiv (time, xe->xmotion.time);
563	setiv (x, xe->xmotion.x);
564	setiv (y, xe->xmotion.y);
565	setiv (row, xe->xmotion.y / term->fheight);
566	setiv (col, xe->xmotion.x / term->fwidth);
567	setiv (x_root, xe->xmotion.x_root);
568	setiv (y_root, xe->xmotion.y_root);
569	setiv (state, xe->xmotion.state);
570	break;
571	}
572
573	switch (xe->type)
574	{
575	case KeyPress:
576	case KeyRelease:
577	setiv (keycode, xe->xkey.keycode);
578	break;
579
580	case ButtonPress:
581	case ButtonRelease:
582	setiv (button, xe->xbutton.button);
583	break;
584
585	case MotionNotify:
586	setiv (is_hint, xe->xmotion.is_hint);
587	break;
588	}
589
590	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591	}
592	break;
593
594	case DT_END:
595	{
596	va_end (ap);
597
598	PUTBACK;
599	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
600	SPAGAIN;
601
602	if (count)
603	{
604	SV *status = POPs;
605	count = SvTRUE (status);
606	}
607
608	PUTBACK;
609	FREETMPS;
610	LEAVE;
611
612	if (SvTRUE (ERRSV))
613	{
614	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
615	ungrab (term); // better lose the grab than the session
616	}
617
618	if (htype == HOOK_DESTROY)
619	{
620	clearSVptr ((SV *)term->perl.self);
621	SvREFCNT_dec ((SV *)term->perl.self);
622	}
623
624	swap (perl_environ, environ);
625	return count;
626	}
627
628	default:
629	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630	}
631	}
632	}
633	catch (...)
634	{
635	swap (perl_environ, environ);
636	throw;
637	}
638	}	673	}
639		674
640	/////////////////////////////////////////////////////////////////////////////	675	/////////////////////////////////////////////////////////////////////////////
641		676
642	MODULE = urxvt PACKAGE = urxvt	677	MODULE = urxvt PACKAGE = urxvt
…		…
771	void	806	void
772	fatal (const char *msg)	807	fatal (const char *msg)
773	CODE:	808	CODE:
774	rxvt_fatal ("%s", msg);	809	rxvt_fatal ("%s", msg);
775		810
776	SV *
777	untaint (SV *sv)
778	CODE:
779	RETVAL = newSVsv (sv);
780	SvTAINTED_off (RETVAL);
781	OUTPUT:
782	RETVAL
783
784	void	811	void
785	_exit (int status)	812	_exit (int status)
786
787	bool
788	safe ()
789	CODE:
790	RETVAL = !rxvt_tainted ();
791	OUTPUT:
792	RETVAL
793		813
794	NV	814	NV
795	NOW ()	815	NOW ()
796	CODE:	816	CODE:
797	RETVAL = NOW;	817	RETVAL = NOW;
…		…
862		882
863	for (int i = 1; i < items; i++)	883	for (int i = 1; i < items; i++)
864	term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));	884	term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
865		885
866	AV envv = (AV )SvRV (ST (0));	886	AV envv = (AV )SvRV (ST (0));
867	for (int i = av_len (envv) + 1; i--; )	887	for (int i = AvFILL (envv) + 1; i--; )
868	term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));	888	term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
869		889
870	term->envv->push_back (0);	890	term->envv->push_back (0);
871		891
872	bool success;	892	bool success;
…		…
968	RETVAL	988	RETVAL
969		989
970	void	990	void
971	rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)	991	rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
972	CODE:	992	CODE:
973	XReparentWindow (THIS->display->display, window, parent, x, y);	993	XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
		994
		995	void
		996	rxvt_term::XMapWindow (U32 window)
		997	CODE:
		998	XMapWindow (THIS->display->display, (Window)window);
		999
		1000	void
		1001	rxvt_term::XUnmapWindow (U32 window)
		1002	CODE:
		1003	XUnmapWindow (THIS->display->display, (Window)window);
974		1004
975	#endif	1005	#endif
976		1006
977	void	1007	void
978	rxvt_term::set_should_invoke (int htype, int inc)	1008	rxvt_term::set_should_invoke (int htype, int inc)
…		…
1053	char *mbstr = rxvt_wcstombs (wstr);	1083	char *mbstr = rxvt_wcstombs (wstr);
1054	rxvt_pop_locale ();	1084	rxvt_pop_locale ();
1055		1085
1056	free (wstr);	1086	free (wstr);
1057		1087
1058	RETVAL = taint_if (newSVpv (mbstr, 0), str);	1088	RETVAL = newSVpv (mbstr, 0);
1059	free (mbstr);	1089	free (mbstr);
1060	}	1090	}
1061	OUTPUT:	1091	OUTPUT:
1062	RETVAL	1092	RETVAL
1063		1093
…		…
1070		1100
1071	rxvt_push_locale (THIS->locale);	1101	rxvt_push_locale (THIS->locale);
1072	wchar_t *wstr = rxvt_mbstowcs (data, len);	1102	wchar_t *wstr = rxvt_mbstowcs (data, len);
1073	rxvt_pop_locale ();	1103	rxvt_pop_locale ();
1074		1104
1075	RETVAL = taint_if (wcs2sv (wstr), octets);	1105	RETVAL = wcs2sv (wstr);
1076	free (wstr);	1106	free (wstr);
1077	}	1107	}
1078	OUTPUT:	1108	OUTPUT:
1079	RETVAL	1109	RETVAL
1080		1110
…		…
1089	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)	1119	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1090	#define TERM_OFFSET_focus TERM_OFFSET(focus)	1120	#define TERM_OFFSET_focus TERM_OFFSET(focus)
1091	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)	1121	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1092	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)	1122	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1093	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)	1123	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1094	#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)	1124	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1095		1125
1096	int	1126	int
1097	rxvt_term::width ()	1127	rxvt_term::width ()
1098	ALIAS:	1128	ALIAS:
1099	width = TERM_OFFSET_width	1129	width = TERM_OFFSET_width
…		…
1105	ncol = TERM_OFFSET_ncol	1135	ncol = TERM_OFFSET_ncol
1106	focus = TERM_OFFSET_focus	1136	focus = TERM_OFFSET_focus
1107	mapped = TERM_OFFSET_mapped	1137	mapped = TERM_OFFSET_mapped
1108	saveLines = TERM_OFFSET_saveLines	1138	saveLines = TERM_OFFSET_saveLines
1109	total_rows = TERM_OFFSET_total_rows	1139	total_rows = TERM_OFFSET_total_rows
1110	nsaved = TERM_OFFSET_nsaved	1140	top_row = TERM_OFFSET_top_row
1111	CODE:	1141	CODE:
1112	RETVAL = (int )((char *)THIS + ix);	1142	RETVAL = (int )((char *)THIS + ix);
1113	OUTPUT:	1143	OUTPUT:
1114	RETVAL	1144	RETVAL
1115		1145
…		…
1199	THIS->rstyle = new_rstyle;	1229	THIS->rstyle = new_rstyle;
1200	OUTPUT:	1230	OUTPUT:
1201	RETVAL	1231	RETVAL
1202		1232
1203	int	1233	int
1204	rxvt_term::view_start (int newval = -1)	1234	rxvt_term::view_start (int newval = 1)
1205	PROTOTYPE: $;$	1235	PROTOTYPE: $;$
1206	CODE:	1236	CODE:
1207	{	1237	{
1208	RETVAL = THIS->view_start;	1238	RETVAL = THIS->view_start;
1209		1239
1210	if (newval >= 0)	1240	if (newval <= 0)
1211	{	1241	THIS->scr_changeview (max (newval, THIS->top_row));
1212	THIS->view_start = min (newval, THIS->nsaved);
1213	THIS->scr_changeview (RETVAL);
1214	}
1215	}	1242	}
1216	OUTPUT:	1243	OUTPUT:
1217	RETVAL	1244	RETVAL
1218		1245
1219	void	1246	void
…		…
1223		1250
1224	void	1251	void
1225	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)	1252	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1226	PPCODE:	1253	PPCODE:
1227	{	1254	{
1228	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1255	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1229	XSRETURN_EMPTY;	1256	XSRETURN_EMPTY;
1230		1257
1231	line_t &l = ROW(row_number);	1258	line_t &l = ROW(row_number);
1232		1259
1233	if (GIMME_V != G_VOID)	1260	if (GIMME_V != G_VOID)
…		…
1235	wchar_t *wstr = new wchar_t [THIS->ncol];	1262	wchar_t *wstr = new wchar_t [THIS->ncol];
1236		1263
1237	for (int col = 0; col < THIS->ncol; col++)	1264	for (int col = 0; col < THIS->ncol; col++)
1238	wstr [col] = l.t [col];	1265	wstr [col] = l.t [col];
1239		1266
1240	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));	1267	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1241		1268
1242	delete [] wstr;	1269	delete [] wstr;
1243	}	1270	}
1244		1271
1245	if (new_text)	1272	if (new_text)
…		…
1266		1293
1267	void	1294	void
1268	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)	1295	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1269	PPCODE:	1296	PPCODE:
1270	{	1297	{
1271	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1298	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1272	XSRETURN_EMPTY;	1299	XSRETURN_EMPTY;
1273		1300
1274	line_t &l = ROW(row_number);	1301	line_t &l = ROW(row_number);
1275		1302
1276	if (GIMME_V != G_VOID)	1303	if (GIMME_V != G_VOID)
…		…
1288	{	1315	{
1289	if (!SvROK (new_rend) \|\| SvTYPE (SvRV (new_rend)) != SVt_PVAV)	1316	if (!SvROK (new_rend) \|\| SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1290	croak ("new_rend must be arrayref");	1317	croak ("new_rend must be arrayref");
1291		1318
1292	AV av = (AV )SvRV (new_rend);	1319	AV av = (AV )SvRV (new_rend);
1293	int len = min (av_len (av) + 1 - start_ofs, max_len);	1320	int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1294		1321
1295	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))	1322	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
1296	croak ("new_rend array extends beyond horizontal margins");	1323	croak ("new_rend array extends beyond horizontal margins");
1297		1324
1298	for (int col = start_col; col < start_col + len; col++)	1325	for (int col = start_col; col < start_col + len; col++)
…		…
1306		1333
1307	int	1334	int
1308	rxvt_term::ROW_l (int row_number, int new_length = -1)	1335	rxvt_term::ROW_l (int row_number, int new_length = -1)
1309	CODE:	1336	CODE:
1310	{	1337	{
1311	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1338	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1312	XSRETURN_EMPTY;	1339	XSRETURN_EMPTY;
1313		1340
1314	line_t &l = ROW(row_number);	1341	line_t &l = ROW(row_number);
1315	RETVAL = l.l;	1342	RETVAL = l.l;
1316		1343
…		…
1322		1349
1323	bool	1350	bool
1324	rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)	1351	rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1325	CODE:	1352	CODE:
1326	{	1353	{
1327	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1354	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1328	XSRETURN_EMPTY;	1355	XSRETURN_EMPTY;
1329		1356
1330	line_t &l = ROW(row_number);	1357	line_t &l = ROW(row_number);
1331	RETVAL = l.is_longer ();	1358	RETVAL = l.is_longer ();
1332		1359
…		…
1366	else	1393	else
1367	r++ = s;	1394	r++ = s;
1368		1395
1369	rxvt_pop_locale ();	1396	rxvt_pop_locale ();
1370		1397
1371	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);	1398	RETVAL = wcs2sv (rstr, r - rstr);
1372		1399
1373	delete [] rstr;	1400	delete [] rstr;
1374	}	1401	}
1375	OUTPUT:	1402	OUTPUT:
1376	RETVAL	1403	RETVAL
…		…
1402	else if (IS_COMPOSE (*s))	1429	else if (IS_COMPOSE (*s))
1403	r += rxvt_composite.expand (*s, r);	1430	r += rxvt_composite.expand (*s, r);
1404	else	1431	else
1405	r++ = s;	1432	r++ = s;
1406		1433
1407	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);	1434	RETVAL = wcs2sv (rstr, r - rstr);
1408		1435
1409	delete [] rstr;	1436	delete [] rstr;
1410	}	1437	}
1411	OUTPUT:	1438	OUTPUT:
1412	RETVAL	1439	RETVAL
…		…
1434		1461
1435	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1462	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1436	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);	1463	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1437		1464
1438	if (GIMME_V != G_VOID)	1465	if (GIMME_V != G_VOID)
1439	XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);	1466	XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1440		1467
1441	if (newval)	1468	if (newval)
1442	{	1469	{
1443	if (SvOK (newval))	1470	if (SvOK (newval))
1444	{	1471	{
…		…
1451	}	1478	}
1452	}	1479	}
1453		1480
1454	const char *	1481	const char *
1455	rxvt_term::x_resource (const char *name)	1482	rxvt_term::x_resource (const char *name)
1456	CLEANUP:
1457	SvTAINTED_on (ST (0));
1458		1483
1459	bool	1484	bool
1460	rxvt_term::option (U32 optval, int set = -1)	1485	rxvt_term::option (U32 optval, int set = -1)
1461	CODE:	1486	CODE:
1462	{	1487	{
…		…
1467	if (set)	1492	if (set)
1468	THIS->options \|= optval;	1493	THIS->options \|= optval;
1469	else	1494	else
1470	THIS->options &= ~optval;	1495	THIS->options &= ~optval;
1471		1496
		1497	if (THIS->check_ev.is_active ()) // avoid doing this before START
1472	switch (optval)	1498	switch (optval)
1473	{	1499	{
1474	case Opt_skipBuiltinGlyphs:	1500	case Opt_skipBuiltinGlyphs:
1475	THIS->set_fonts ();	1501	THIS->set_fonts ();
1476	THIS->scr_remap_chars ();	1502	THIS->scr_remap_chars ();
1477	THIS->scr_touch (true);	1503	THIS->scr_touch (true);
1478	THIS->want_refresh = 1;	1504	THIS->want_refresh = 1;
1479	break;	1505	break;
1480		1506
1481	case Opt_cursorUnderline:	1507	case Opt_cursorUnderline:
1482	THIS->want_refresh = 1;	1508	THIS->want_refresh = 1;
1483	break;	1509	break;
1484		1510
1485	# case Opt_scrollBar_floating:	1511	# case Opt_scrollBar_floating:
1486	# case Opt_scrollBar_right:	1512	# case Opt_scrollBar_right:
1487	# THIS->resize_all_windows (THIS->width, THIS->height, 1);	1513	# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1488	# break;	1514	# break;
1489	}	1515	}
1490	}	1516	}
1491	}	1517	}
1492	OUTPUT:	1518	OUTPUT:
1493	RETVAL	1519	RETVAL
1494		1520
…		…
1522	PUSHs (sv_2mortal (newSViv (rc.col)));	1548	PUSHs (sv_2mortal (newSViv (rc.col)));
1523	}	1549	}
1524		1550
1525	if (items == 3)	1551	if (items == 3)
1526	{	1552	{
1527	rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);	1553	rc.row = SvIV (ST (1));
1528	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);	1554	rc.col = SvIV (ST (2));
		1555
		1556	if (ix == 2 && rc.col == 0)
		1557	{
		1558	rc.row--;
		1559	rc.col = THIS->ncol;
		1560	}
		1561
		1562	clamp_it (rc.col, 0, THIS->ncol);
		1563	clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1529		1564
1530	if (ix)	1565	if (ix)
1531	THIS->want_refresh = 1;	1566	THIS->want_refresh = 1;
1532	}	1567	}
1533	}	1568	}
…		…
1556	rxvt_term::selection (SV *newtext = 0)	1591	rxvt_term::selection (SV *newtext = 0)
1557	PPCODE:	1592	PPCODE:
1558	{	1593	{
1559	if (GIMME_V != G_VOID)	1594	if (GIMME_V != G_VOID)
1560	XPUSHs (THIS->selection.text	1595	XPUSHs (THIS->selection.text
1561	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))	1596	? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1562	: &PL_sv_undef);	1597	: &PL_sv_undef);
1563		1598
1564	if (newtext)	1599	if (newtext)
1565	{	1600	{
1566	free (THIS->selection.text);	1601	free (THIS->selection.text);
…		…
1692	RETVAL = THIS;	1727	RETVAL = THIS;
1693	OUTPUT:	1728	OUTPUT:
1694	RETVAL	1729	RETVAL
1695		1730
1696	timer *	1731	timer *
		1732	timer::after (NV delay)
		1733	CODE:
		1734	THIS->start (NOW + delay);
		1735	RETVAL = THIS;
		1736	OUTPUT:
		1737	RETVAL
		1738
		1739	timer *
1697	timer::stop ()	1740	timer::stop ()
1698	CODE:	1741	CODE:
1699	THIS->stop ();	1742	THIS->stop ();
1700	RETVAL = THIS;	1743	RETVAL = THIS;
1701	OUTPUT:	1744	OUTPUT:

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.65 by root, Fri Jan 13 15:45:44 2006 UTC vs. Revision 1.78 by root, Thu Jan 19 20:30:36 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.65 by root, Fri Jan 13 15:45:44 2006 UTC vs.
Revision 1.78 by root, Thu Jan 19 20:30:36 2006 UTC