[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.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 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;
…		…
225		211
226	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")	212	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
227		213
228	struct overlay {	214	struct overlay {
229	HV *self;	215	HV *self;
		216	bool visible;
230	rxvt_term *THIS;	217	rxvt_term *THIS;
231	int x, y, w, h;	218	int x, y, w, h;
232	int border;	219	int border;
233	text_t **text;	220	text_t **text;
234	rend_t **rend;	221	rend_t **rend;
…		…
243		230
244	void set (int x, int y, SV str, SV rend);	231	void set (int x, int y, SV str, SV rend);
245	};	232	};
246		233
247	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)
248	: 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)
249	{	236	{
250	if (border == 2)	237	if (border == 2)
251	{	238	{
252	w += 2;	239	w += 2;
253	h += 2;	240	h += 2;
…		…
314	}	301	}
315		302
316	void	303	void
317	overlay::show ()	304	overlay::show ()
318	{	305	{
319	char key[33]; sprintf (key, "%32lx", (long)this);	306	if (visible)
		307	return;
320		308
		309	visible = true;
		310
321	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));
322	hv_store (hv, key, 32, newSViv ((long)this), 0);	312	av_push (av, newSViv ((long)this));
323	}	313	}
324		314
325	void	315	void
326	overlay::hide ()	316	overlay::hide ()
327	{	317	{
		318	if (!visible)
		319	return;
		320
		321	visible = false;
		322
328	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));
329		324
330	if (ovs)	325	int i;
		326
		327	for (i = AvFILL (av); i >= 0; i--)
		328	if (SvIV (*av_fetch (av, i, 1)) == (long)this)
331	{	329	{
332	char key[33]; sprintf (key, "%32lx", (long)this);
333
334	HV hv = (HV )SvRV (*ovs);
335	hv_delete (hv, key, 32, G_DISCARD);	330	av_delete (av, i, G_DISCARD);
		331	break;
336	}	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);
337	}	338	}
338		339
339	void overlay::swap ()	340	void overlay::swap ()
340	{	341	{
341	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));
…		…
347	for (int y = ov_h; y--; )	348	for (int y = ov_h; y--; )
348	{	349	{
349	text_t *t1 = text [y];	350	text_t *t1 = text [y];
350	rend_t *r1 = rend [y];	351	rend_t *r1 = rend [y];
351		352
352	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;
353	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;
354		355
355	for (int x = ov_w; x--; )	356	for (int x = ov_w; x--; )
356	{	357	{
357	text_t t = t1; t1++ = t2; t2++ = t;	358	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));	359	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
…		…
381	if (!SvROK (rend) \|\| SvTYPE (SvRV (rend)) != SVt_PVAV)	382	if (!SvROK (rend) \|\| SvTYPE (SvRV (rend)) != SVt_PVAV)
382	croak ("rend must be arrayref");	383	croak ("rend must be arrayref");
383		384
384	AV av = (AV )SvRV (rend);	385	AV av = (AV )SvRV (rend);
385		386
386	for (int col = min (av_len (av) + 1, w - x - border); col--; )	387	for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
387	this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));	388	this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
388	}	389	}
389		390
390	THIS->want_refresh = 1;	391	THIS->want_refresh = 1;
391	}	392	}
…		…
405	perl_free (perl);	406	perl_free (perl);
406	}	407	}
407	}	408	}
408		409
409	void	410	void
410	rxvt_perl_interp::init ()	411	rxvt_perl_interp::init (rxvt_term *term)
411	{	412	{
412	if (!perl)	413	if (!perl)
413	{	414	{
		415	rxvt_push_locale (""); // perl init destroys current locale
		416
414	perl_environ = rxvt_environ;	417	perl_environ = rxvt_environ;
415	swap (perl_environ, environ);	418	swap (perl_environ, environ);
416		419
417	char *argv[] = {	420	char *argv[] = {
418	"",	421	"",
419	"-T",	422	"-e"
420	"-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",	423	"BEGIN {"
		424	" urxvt->bootstrap;"
		425	" unshift @INC, '" LIBDIR "';"
		426	"}"
		427	""
		428	"use urxvt;"
421	};	429	};
422		430
423	perl = perl_alloc ();	431	perl = perl_alloc ();
424	perl_construct (perl);	432	perl_construct (perl);
425		433
426	if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)	434	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
427	\|\| perl_run (perl))	435	\|\| perl_run (perl))
428	{	436	{
429	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");	437	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
430		438
431	perl_destruct (perl);	439	perl_destruct (perl);
432	perl_free (perl);	440	perl_free (perl);
433	perl = 0;	441	perl = 0;
434	}	442	}
435		443
436	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);
437	}	454	}
438	}	455	}
439		456
440	static void	457	static void
441	ungrab (rxvt_term *THIS)	458	ungrab (rxvt_term *THIS)
…		…
449	}	466	}
450		467
451	bool	468	bool
452	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	469	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
453	{	470	{
454	if (!perl)	471	if (!perl \|\| !term->perl.self)
455	return false;	472	return false;
456		473
457	if (htype == HOOK_INIT) // first hook ever called	474	// pre-handling of some events
		475	if (htype == HOOK_REFRESH_END)
458	{	476	{
459	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));
460	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 ();
461	}	481	}
462	else if (!term->perl.self)	482
463	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	}
464	else if (htype == HOOK_DESTROY)	664	else if (htype == HOOK_DESTROY)
465	{	665	{
466	// handled later	666	clearSVptr ((SV *)term->perl.self);
		667	SvREFCNT_dec ((SV *)term->perl.self);
467	}	668	}
468	else
469	{
470	if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
471	{
472	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473
474	if (HvKEYS (hv))
475	{
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		669
488	swap (perl_environ, environ);	670	swap (perl_environ, environ);
489		671
490	try	672	return event_consumed;
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:
511	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
512	break;
513
514	case DT_LONG:
515	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
516	break;
517
518	case DT_STR:
519	XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
520	break;
521
522	case DT_STR_LEN:
523	{
524	char str = va_arg (ap, char );
525	int len = va_arg (ap, int);
526
527	XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
528	}
529	break;
530
531	case DT_WCS_LEN:
532	{
533	wchar_t wstr = va_arg (ap, wchar_t );
534	int wlen = va_arg (ap, int);
535
536	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
537	}
538	break;
539
540	case DT_XEVENT:
541	{
542	XEvent xe = va_arg (ap, XEvent );
543	HV *hv = newHV ();
544
545	# 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)
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	setiv (time, xe->xmotion.time);
561	setiv (x, xe->xmotion.x);
562	setiv (y, xe->xmotion.y);
563	setiv (row, xe->xmotion.y / term->fheight);
564	setiv (col, xe->xmotion.x / term->fwidth);
565	setiv (x_root, xe->xmotion.x_root);
566	setiv (y_root, xe->xmotion.y_root);
567	setiv (state, xe->xmotion.state);
568	break;
569	}
570
571	switch (xe->type)
572	{
573	case KeyPress:
574	case KeyRelease:
575	setiv (keycode, xe->xkey.keycode);
576	break;
577
578	case ButtonPress:
579	case ButtonRelease:
580	setiv (button, xe->xbutton.button);
581	break;
582
583	case MotionNotify:
584	setiv (is_hint, xe->xmotion.is_hint);
585	break;
586	}
587
588	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
589	}
590	break;
591
592	case DT_END:
593	{
594	va_end (ap);
595
596	PUTBACK;
597	int count = call_pv ("urxvt::invoke", G_ARRAY \| G_EVAL);
598	SPAGAIN;
599
600	if (count)
601	{
602	SV *status = POPs;
603	count = SvTRUE (status);
604	}
605
606	PUTBACK;
607	FREETMPS;
608	LEAVE;
609
610	if (SvTRUE (ERRSV))
611	{
612	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
613	ungrab (term); // better lose the grab than the session
614	}
615
616	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:
627	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628	}
629	}
630	}
631	catch (...)
632	{
633	swap (perl_environ, environ);
634	throw;
635	}
636	}	673	}
637		674
638	/////////////////////////////////////////////////////////////////////////////	675	/////////////////////////////////////////////////////////////////////////////
639		676
640	MODULE = urxvt PACKAGE = urxvt	677	MODULE = urxvt PACKAGE = urxvt
…		…
769	void	806	void
770	fatal (const char *msg)	807	fatal (const char *msg)
771	CODE:	808	CODE:
772	rxvt_fatal ("%s", msg);	809	rxvt_fatal ("%s", msg);
773		810
774	SV *
775	untaint (SV *sv)
776	CODE:
777	RETVAL = newSVsv (sv);
778	SvTAINTED_off (RETVAL);
779	OUTPUT:
780	RETVAL
781
782	void	811	void
783	_exit (int status)	812	_exit (int status)
784
785	bool
786	safe ()
787	CODE:
788	RETVAL = !rxvt_tainted ();
789	OUTPUT:
790	RETVAL
791		813
792	NV	814	NV
793	NOW ()	815	NOW ()
794	CODE:	816	CODE:
795	RETVAL = NOW;	817	RETVAL = NOW;
…		…
860		882
861	for (int i = 1; i < items; i++)	883	for (int i = 1; i < items; i++)
862	term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));	884	term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
863		885
864	AV envv = (AV )SvRV (ST (0));	886	AV envv = (AV )SvRV (ST (0));
865	for (int i = av_len (envv) + 1; i--; )	887	for (int i = AvFILL (envv) + 1; i--; )
866	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))));
867		889
868	term->envv->push_back (0);	890	term->envv->push_back (0);
869		891
870	bool success;	892	bool success;
…		…
891	RETVAL	913	RETVAL
892		914
893	void	915	void
894	rxvt_term::destroy ()	916	rxvt_term::destroy ()
895		917
		918	#if ENABLE_PERL_FRILLS
		919
		920	void
		921	rxvt_term::XListProperties (U32 window)
		922	PPCODE:
		923	{
		924	int count;
		925	Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
		926
		927	EXTEND (SP, count);
		928	while (count--)
		929	PUSHs (newSVuv ((U32)props [count]));
		930
		931	XFree (props);
		932	}
		933
		934	void
		935	rxvt_term::XGetWindowProperty (U32 window, U32 property)
		936	PPCODE:
		937	{
		938	Atom type;
		939	int format;
		940	unsigned long nitems;
		941	unsigned long bytes_after;
		942	unsigned char *prop;
		943	XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
		944	0, 1<<30, 0, AnyPropertyType,
		945	&type, &format, &nitems, &bytes_after, &prop);
		946	if (type != None)
		947	{
		948	EXTEND (SP, 3);
		949	PUSHs (newSVuv ((U32)type));
		950	PUSHs (newSViv (format));
		951	PUSHs (newSVpvn ((char )prop, nitems format / 8));
		952	XFree (prop);
		953	}
		954	}
		955
		956	void
		957	rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
		958	CODE:
		959	{
		960	STRLEN len;
		961	char *data_ = SvPVbyte (data, len);
		962
		963	XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
		964	type, format, PropModeReplace,
		965	(unsigned char )data, len 8 / format);
		966	}
		967
		968	void
		969	rxvt_term::XDeleteProperty (U32 window, U32 property)
		970	CODE:
		971	XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
		972
		973	U32
		974	rxvt_term::DefaultRootWindow ()
		975	CODE:
		976	RETVAL = (U32)THIS->display->root;
		977	OUTPUT:
		978	RETVAL
		979
		980	U32
		981	rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
		982	CODE:
		983	RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
		984	x, y, width, height, 0,
		985	THIS->pix_colors_focused[Color_border],
		986	THIS->pix_colors_focused[Color_border]);
		987	OUTPUT:
		988	RETVAL
		989
		990	void
		991	rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
		992	CODE:
		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);
		1004
		1005	#endif
		1006
896	void	1007	void
897	rxvt_term::set_should_invoke (int htype, int inc)	1008	rxvt_term::set_should_invoke (int htype, int inc)
898	CODE:	1009	CODE:
899	THIS->perl.should_invoke [htype] += inc;	1010	THIS->perl.should_invoke [htype] += inc;
900		1011
…		…
972	char *mbstr = rxvt_wcstombs (wstr);	1083	char *mbstr = rxvt_wcstombs (wstr);
973	rxvt_pop_locale ();	1084	rxvt_pop_locale ();
974		1085
975	free (wstr);	1086	free (wstr);
976		1087
977	RETVAL = taint_if (newSVpv (mbstr, 0), str);	1088	RETVAL = newSVpv (mbstr, 0);
978	free (mbstr);	1089	free (mbstr);
979	}	1090	}
980	OUTPUT:	1091	OUTPUT:
981	RETVAL	1092	RETVAL
982		1093
…		…
989		1100
990	rxvt_push_locale (THIS->locale);	1101	rxvt_push_locale (THIS->locale);
991	wchar_t *wstr = rxvt_mbstowcs (data, len);	1102	wchar_t *wstr = rxvt_mbstowcs (data, len);
992	rxvt_pop_locale ();	1103	rxvt_pop_locale ();
993		1104
994	RETVAL = taint_if (wcs2sv (wstr), octets);	1105	RETVAL = wcs2sv (wstr);
995	free (wstr);	1106	free (wstr);
996	}	1107	}
997	OUTPUT:	1108	OUTPUT:
998	RETVAL	1109	RETVAL
999		1110
…		…
1008	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)	1119	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1009	#define TERM_OFFSET_focus TERM_OFFSET(focus)	1120	#define TERM_OFFSET_focus TERM_OFFSET(focus)
1010	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)	1121	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1011	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)	1122	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1012	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)	1123	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1013	#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)	1124	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1014		1125
1015	int	1126	int
1016	rxvt_term::width ()	1127	rxvt_term::width ()
1017	ALIAS:	1128	ALIAS:
1018	width = TERM_OFFSET_width	1129	width = TERM_OFFSET_width
…		…
1024	ncol = TERM_OFFSET_ncol	1135	ncol = TERM_OFFSET_ncol
1025	focus = TERM_OFFSET_focus	1136	focus = TERM_OFFSET_focus
1026	mapped = TERM_OFFSET_mapped	1137	mapped = TERM_OFFSET_mapped
1027	saveLines = TERM_OFFSET_saveLines	1138	saveLines = TERM_OFFSET_saveLines
1028	total_rows = TERM_OFFSET_total_rows	1139	total_rows = TERM_OFFSET_total_rows
1029	nsaved = TERM_OFFSET_nsaved	1140	top_row = TERM_OFFSET_top_row
1030	CODE:	1141	CODE:
1031	RETVAL = (int )((char *)THIS + ix);	1142	RETVAL = (int )((char *)THIS + ix);
1032	OUTPUT:	1143	OUTPUT:
1033	RETVAL	1144	RETVAL
1034		1145
…		…
1118	THIS->rstyle = new_rstyle;	1229	THIS->rstyle = new_rstyle;
1119	OUTPUT:	1230	OUTPUT:
1120	RETVAL	1231	RETVAL
1121		1232
1122	int	1233	int
1123	rxvt_term::view_start (int newval = -1)	1234	rxvt_term::view_start (int newval = 1)
1124	PROTOTYPE: $;$	1235	PROTOTYPE: $;$
1125	CODE:	1236	CODE:
1126	{	1237	{
1127	RETVAL = THIS->view_start;	1238	RETVAL = THIS->view_start;
1128		1239
1129	if (newval >= 0)	1240	if (newval <= 0)
1130	{	1241	THIS->scr_changeview (max (newval, THIS->top_row));
1131	THIS->view_start = min (newval, THIS->nsaved);
1132	THIS->scr_changeview (RETVAL);
1133	}
1134	}	1242	}
1135	OUTPUT:	1243	OUTPUT:
1136	RETVAL	1244	RETVAL
1137		1245
1138	void	1246	void
…		…
1142		1250
1143	void	1251	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)	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)
1145	PPCODE:	1253	PPCODE:
1146	{	1254	{
1147	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1255	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1148	XSRETURN_EMPTY;	1256	XSRETURN_EMPTY;
1149		1257
1150	line_t &l = ROW(row_number);	1258	line_t &l = ROW(row_number);
1151		1259
1152	if (GIMME_V != G_VOID)	1260	if (GIMME_V != G_VOID)
…		…
1154	wchar_t *wstr = new wchar_t [THIS->ncol];	1262	wchar_t *wstr = new wchar_t [THIS->ncol];
1155		1263
1156	for (int col = 0; col < THIS->ncol; col++)	1264	for (int col = 0; col < THIS->ncol; col++)
1157	wstr [col] = l.t [col];	1265	wstr [col] = l.t [col];
1158		1266
1159	XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));	1267	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1160		1268
1161	delete [] wstr;	1269	delete [] wstr;
1162	}	1270	}
1163		1271
1164	if (new_text)	1272	if (new_text)
…		…
1185		1293
1186	void	1294	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)	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)
1188	PPCODE:	1296	PPCODE:
1189	{	1297	{
1190	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1298	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1191	XSRETURN_EMPTY;	1299	XSRETURN_EMPTY;
1192		1300
1193	line_t &l = ROW(row_number);	1301	line_t &l = ROW(row_number);
1194		1302
1195	if (GIMME_V != G_VOID)	1303	if (GIMME_V != G_VOID)
…		…
1207	{	1315	{
1208	if (!SvROK (new_rend) \|\| SvTYPE (SvRV (new_rend)) != SVt_PVAV)	1316	if (!SvROK (new_rend) \|\| SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1209	croak ("new_rend must be arrayref");	1317	croak ("new_rend must be arrayref");
1210		1318
1211	AV av = (AV )SvRV (new_rend);	1319	AV av = (AV )SvRV (new_rend);
1212	int len = min (av_len (av) + 1 - start_ofs, max_len);	1320	int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1213		1321
1214	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))	1322	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
1215	croak ("new_rend array extends beyond horizontal margins");	1323	croak ("new_rend array extends beyond horizontal margins");
1216		1324
1217	for (int col = start_col; col < start_col + len; col++)	1325	for (int col = start_col; col < start_col + len; col++)
…		…
1225		1333
1226	int	1334	int
1227	rxvt_term::ROW_l (int row_number, int new_length = -1)	1335	rxvt_term::ROW_l (int row_number, int new_length = -1)
1228	CODE:	1336	CODE:
1229	{	1337	{
1230	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1338	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1231	XSRETURN_EMPTY;	1339	XSRETURN_EMPTY;
1232		1340
1233	line_t &l = ROW(row_number);	1341	line_t &l = ROW(row_number);
1234	RETVAL = l.l;	1342	RETVAL = l.l;
1235		1343
…		…
1241		1349
1242	bool	1350	bool
1243	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)
1244	CODE:	1352	CODE:
1245	{	1353	{
1246	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	1354	if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1247	XSRETURN_EMPTY;	1355	XSRETURN_EMPTY;
1248		1356
1249	line_t &l = ROW(row_number);	1357	line_t &l = ROW(row_number);
1250	RETVAL = l.is_longer ();	1358	RETVAL = l.is_longer ();
1251		1359
…		…
1285	else	1393	else
1286	r++ = s;	1394	r++ = s;
1287		1395
1288	rxvt_pop_locale ();	1396	rxvt_pop_locale ();
1289		1397
1290	RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);	1398	RETVAL = wcs2sv (rstr, r - rstr);
1291		1399
1292	delete [] rstr;	1400	delete [] rstr;
1293	}	1401	}
1294	OUTPUT:	1402	OUTPUT:
1295	RETVAL	1403	RETVAL
…		…
1321	else if (IS_COMPOSE (*s))	1429	else if (IS_COMPOSE (*s))
1322	r += rxvt_composite.expand (*s, r);	1430	r += rxvt_composite.expand (*s, r);
1323	else	1431	else
1324	r++ = s;	1432	r++ = s;
1325		1433
1326	RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);	1434	RETVAL = wcs2sv (rstr, r - rstr);
1327		1435
1328	delete [] rstr;	1436	delete [] rstr;
1329	}	1437	}
1330	OUTPUT:	1438	OUTPUT:
1331	RETVAL	1439	RETVAL
…		…
1353		1461
1354	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1462	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1355	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);
1356		1464
1357	if (GIMME_V != G_VOID)	1465	if (GIMME_V != G_VOID)
1358	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);
1359		1467
1360	if (newval)	1468	if (newval)
1361	{	1469	{
1362	if (SvOK (newval))	1470	if (SvOK (newval))
1363	{	1471	{
…		…
1370	}	1478	}
1371	}	1479	}
1372		1480
1373	const char *	1481	const char *
1374	rxvt_term::x_resource (const char *name)	1482	rxvt_term::x_resource (const char *name)
1375	CLEANUP:
1376	SvTAINTED_on (ST (0));
1377		1483
1378	bool	1484	bool
1379	rxvt_term::option (U32 optval, int set = -1)	1485	rxvt_term::option (U32 optval, int set = -1)
1380	CODE:	1486	CODE:
1381	{	1487	{
…		…
1386	if (set)	1492	if (set)
1387	THIS->options \|= optval;	1493	THIS->options \|= optval;
1388	else	1494	else
1389	THIS->options &= ~optval;	1495	THIS->options &= ~optval;
1390		1496
		1497	if (THIS->check_ev.is_active ()) // avoid doing this before START
1391	switch (optval)	1498	switch (optval)
1392	{	1499	{
1393	case Opt_skipBuiltinGlyphs:	1500	case Opt_skipBuiltinGlyphs:
1394	THIS->set_fonts ();	1501	THIS->set_fonts ();
1395	THIS->scr_remap_chars ();	1502	THIS->scr_remap_chars ();
1396	THIS->scr_touch (true);	1503	THIS->scr_touch (true);
1397	THIS->want_refresh = 1;	1504	THIS->want_refresh = 1;
1398	break;	1505	break;
1399		1506
1400	case Opt_cursorUnderline:	1507	case Opt_cursorUnderline:
1401	THIS->want_refresh = 1;	1508	THIS->want_refresh = 1;
1402	break;	1509	break;
1403		1510
1404	# case Opt_scrollBar_floating:	1511	# case Opt_scrollBar_floating:
1405	# case Opt_scrollBar_right:	1512	# case Opt_scrollBar_right:
1406	# THIS->resize_all_windows (THIS->width, THIS->height, 1);	1513	# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1407	# break;	1514	# break;
1408	}	1515	}
1409	}	1516	}
1410	}	1517	}
1411	OUTPUT:	1518	OUTPUT:
1412	RETVAL	1519	RETVAL
1413		1520
…		…
1441	PUSHs (sv_2mortal (newSViv (rc.col)));	1548	PUSHs (sv_2mortal (newSViv (rc.col)));
1442	}	1549	}
1443		1550
1444	if (items == 3)	1551	if (items == 3)
1445	{	1552	{
1446	rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);	1553	rc.row = SvIV (ST (1));
1447	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);
1448		1564
1449	if (ix)	1565	if (ix)
1450	THIS->want_refresh = 1;	1566	THIS->want_refresh = 1;
1451	}	1567	}
1452	}	1568	}
…		…
1475	rxvt_term::selection (SV *newtext = 0)	1591	rxvt_term::selection (SV *newtext = 0)
1476	PPCODE:	1592	PPCODE:
1477	{	1593	{
1478	if (GIMME_V != G_VOID)	1594	if (GIMME_V != G_VOID)
1479	XPUSHs (THIS->selection.text	1595	XPUSHs (THIS->selection.text
1480	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))	1596	? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1481	: &PL_sv_undef);	1597	: &PL_sv_undef);
1482		1598
1483	if (newtext)	1599	if (newtext)
1484	{	1600	{
1485	free (THIS->selection.text);	1601	free (THIS->selection.text);
…		…
1611	RETVAL = THIS;	1727	RETVAL = THIS;
1612	OUTPUT:	1728	OUTPUT:
1613	RETVAL	1729	RETVAL
1614		1730
1615	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 *
1616	timer::stop ()	1740	timer::stop ()
1617	CODE:	1741	CODE:
1618	THIS->stop ();	1742	THIS->stop ();
1619	RETVAL = THIS;	1743	RETVAL = THIS;
1620	OUTPUT:	1744	OUTPUT:

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.78 by root, Thu Jan 19 20:30:36 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.78 by root, Thu Jan 19 20:30:36 2006 UTC