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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.18 by root, Tue Jan 3 19:10:54 2006 UTC vs.
Revision 1.29 by root, Fri Jan 6 03:40:19 2006 UTC

…		…
51	char *str = SvPVutf8 (sv, len);	51	char *str = SvPVutf8 (sv, len);
52	return rxvt_utf8towcs (str, len);	52	return rxvt_utf8towcs (str, len);
53	}	53	}
54		54
55	static SV *	55	static SV *
		56	wcs2sv (wchar_t *wstr, int len = -1)
		57	{
		58	char *str = rxvt_wcstoutf8 (wstr, len);
		59
		60	SV *sv = newSVpv (str, 0);
		61	SvUTF8_on (sv);
		62	free (str);
		63
		64	return sv;
		65	}
		66
		67	static SV *
56	new_ref (HV hv, const char klass)	68	new_ref (HV hv, const char klass)
57	{	69	{
58	return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));	70	return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59	}	71	}
60		72
…		…
215	h += 2;	227	h += 2;
216	}	228	}
217		229
218	text = new text_t *[h];	230	text = new text_t *[h];
219	rend = new rend_t *[h];	231	rend = new rend_t *[h];
220		232
221	for (int y = 0; y < h; y++)	233	for (int y = 0; y < h; y++)
222	{	234	{
223	text_t *tp = text[y] = new text_t[w];	235	text_t *tp = text[y] = new text_t[w];
224	rend_t *rp = rend[y] = new rend_t[w];	236	rend_t *rp = rend[y] = new rend_t[w];
225		237
226	text_t t0, t1, t2;	238	text_t t0, t1, t2;
227	rend_t r = rstyle;	239	rend_t r = rstyle;
228		240
229	if (border == 2)	241	if (border == 2)
230	{	242	{
231	if (y == 0)	243	if (y == 0)
232	t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;	244	t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
233	else if (y < h - 1)	245	else if (y < h - 1)
234	t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;	246	t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
235	else	247	else
236	t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;	248	t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
237		249
238	*tp++ = t0;	250	*tp++ = t0;
239	*rp++ = r;	251	*rp++ = r;
240		252
241	for (int x = w - 2; x-- > 0; )	253	for (int x = w - 2; x-- > 0; )
242	{	254	{
243	*tp++ = t1;	255	*tp++ = t1;
244	*rp++ = r;	256	*rp++ = r;
245	}	257	}
246		258
247	*tp = t2;	259	*tp = t2;
248	*rp = r;	260	*rp = r;
249	}	261	}
250	else	262	else
251	for (int x = w; x-- > 0; )	263	for (int x = w; x-- > 0; )
252	{	264	{
253	*tp++ = 0x0020;	265	*tp++ = 0x0020;
254	*rp++ = r;	266	*rp++ = r;
255	}	267	}
256	}	268	}
257		269
258	show ();	270	show ();
259	THIS->want_refresh = 1;	271	THIS->want_refresh = 1;
260	}	272	}
261		273
…		…
308		320
309	for (int y = ov_h; y--; )	321	for (int y = ov_h; y--; )
310	{	322	{
311	text_t *t1 = text [y];	323	text_t *t1 = text [y];
312	rend_t *r1 = rend [y];	324	rend_t *r1 = rend [y];
313		325
314	text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;	326	text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;
315	rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;	327	rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
316		328
317	for (int x = ov_w; x--; )	329	for (int x = ov_w; x--; )
318	{	330	{
319	text_t t = t1; t1++ = t2; t2++ = t;	331	text_t t = t1; t1++ = t2; t2++ = t;
320	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));	332	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
321	}	333	}
322	}	334	}
323		335
…		…
333		345
334	wchar_t *wtext = sv2wcs (text);	346	wchar_t *wtext = sv2wcs (text);
335		347
336	for (int col = min (wcslen (wtext), w - x - border); col--; )	348	for (int col = min (wcslen (wtext), w - x - border); col--; )
337	this->text [y][x + col] = wtext [col];	349	this->text [y][x + col] = wtext [col];
338		350
339	free (wtext);	351	free (wtext);
340		352
341	if (rend)	353	if (rend)
342	{	354	{
343	if (!SvROK (rend) \|\| SvTYPE (SvRV (rend)) != SVt_PVAV)	355	if (!SvROK (rend) \|\| SvTYPE (SvRV (rend)) != SVt_PVAV)
…		…
400	bool	412	bool
401	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	413	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
402	{	414	{
403	if (!perl)	415	if (!perl)
404	return false;	416	return false;
405		417
406	if (htype == HOOK_INIT) // first hook ever called	418	if (htype == HOOK_INIT) // first hook ever called
407	{	419	{
408	term->self = (void )newSVptr ((void )term, "urxvt::term");	420	term->self = (void )newSVptr ((void )term, "urxvt::term");
409	hv_store ((HV )SvRV ((SV )term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);	421	hv_store ((HV )SvRV ((SV )term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410	}	422	}
…		…
457		469
458	case DT_STRING:	470	case DT_STRING:
459	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));	471	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
460	break;	472	break;
461		473
		474	case DT_STRING_LEN:
		475	{
		476	char str = va_arg (ap, char );
		477	int len = va_arg (ap, int);
		478
		479	XPUSHs (sv_2mortal (newSVpvn (str, len)));
		480	}
		481	break;
		482
		483	case DT_XEVENT:
		484	{
		485	XEvent xe = va_arg (ap, XEvent );
		486	HV *hv = newHV ();
		487
		488	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
		489	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
		490	# undef set
		491
		492	setiv (type, xe->type);
		493	setiv (send_event, xe->xany.send_event);
		494	setiv (serial, xe->xany.serial);
		495
		496	switch (xe->type)
		497	{
		498	case KeyPress:
		499	case KeyRelease:
		500	case ButtonPress:
		501	case ButtonRelease:
		502	case MotionNotify:
		503	setiv (time, xe->xmotion.time);
		504	setiv (x, xe->xmotion.x);
		505	setiv (y, xe->xmotion.y);
		506	setiv (x_root, xe->xmotion.x_root);
		507	setiv (y_root, xe->xmotion.y_root);
		508	setiv (state, xe->xmotion.state);
		509	break;
		510	}
		511
		512	switch (xe->type)
		513	{
		514	case KeyPress:
		515	case KeyRelease:
		516	setiv (keycode, xe->xkey.keycode);
		517	break;
		518
		519	case ButtonPress:
		520	case ButtonRelease:
		521	setiv (button, xe->xbutton.button);
		522	break;
		523
		524	case MotionNotify:
		525	setiv (is_hint, xe->xmotion.is_hint);
		526	break;
		527	}
		528
		529	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		530	}
		531	break;
		532
		533	case DT_USTRING_LEN:
		534	{
		535	unicode_t ustr = va_arg (ap, unicode_t );
		536	int ulen = va_arg (ap, int);
		537	wchar_t *wstr = new wchar_t [ulen];
		538
		539	for (int i = ulen; i--; )
		540	wstr [i] = ustr [i];
		541
		542	XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
		543
		544	delete [] wstr;
		545	}
		546
462	case DT_END:	547	case DT_END:
463	{	548	{
464	va_end (ap);	549	va_end (ap);
465		550
466	PUTBACK;	551	PUTBACK;
…		…
501		586
502	PROTOTYPES: ENABLE	587	PROTOTYPES: ENABLE
503		588
504	BOOT:	589	BOOT:
505	{	590	{
506	# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))
507	# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name));	591	# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
508	AV *hookname = get_av ("urxvt::HOOKNAME", 1);	592	AV *hookname = get_av ("urxvt::HOOKNAME", 1);
509	set_hookname (INIT);	593	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
510	set_hookname (RESET);	594	# include "hookinc.h"
511	set_hookname (START);	595	# undef def
512	set_hookname (DESTROY);
513	set_hookname (SEL_BEGIN);
514	set_hookname (SEL_EXTEND);
515	set_hookname (SEL_MAKE);
516	set_hookname (SEL_GRAB);
517	set_hookname (FOCUS_IN);
518	set_hookname (FOCUS_OUT);
519	set_hookname (VIEW_CHANGE);
520	set_hookname (SCROLL_BACK);
521	set_hookname (TTY_ACTIVITY);
522	set_hookname (REFRESH_BEGIN);
523	set_hookname (REFRESH_END);
524	set_hookname (KEYBOARD_COMMAND);
525		596
526	export_const (DEFAULT_RSTYLE);	597	export_const (DEFAULT_RSTYLE);
527	export_const (OVERLAY_RSTYLE);	598	export_const (OVERLAY_RSTYLE);
528	export_const (RS_Bold);	599	export_const (RS_Bold);
529	export_const (RS_Italic);	600	export_const (RS_Italic);
…		…
532	export_const (RS_Uline);	603	export_const (RS_Uline);
533		604
534	sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);	605	sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
535	}	606	}
536		607
		608	SV *
		609	new (...)
		610	CODE:
		611	{
		612	stringvec *argv = new stringvec;
		613	bool success;
		614
		615	for (int i = 0; i < items ;i++)
		616	argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
		617
		618	rxvt_term *term = new rxvt_term;
		619
		620	term->argv = argv;
		621
		622	try
		623	{
		624	if (!term->init (argv->size (), argv->begin ()))
		625	term = 0;
		626	}
		627	catch (const class rxvt_failure_exception &e)
		628	{
		629	term->destroy ();
		630	croak ("exception caught while initializing new terminal instance");
		631	}
		632
		633	RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
		634	}
		635	OUTPUT:
		636	RETVAL
		637
537	void	638	void
538	set_should_invoke (int htype, int value)	639	set_should_invoke (int htype, int value)
539	CODE:	640	CODE:
540	rxvt_perl.should_invoke [htype] = value;	641	rxvt_perl.should_invoke [htype] = value;
541		642
…		…
603	}	704	}
604	OUTPUT:	705	OUTPUT:
605	RETVAL	706	RETVAL
606		707
607	MODULE = urxvt PACKAGE = urxvt::term	708	MODULE = urxvt PACKAGE = urxvt::term
		709
		710	void
		711	rxvt_term::destroy ()
608		712
609	int	713	int
610	rxvt_term::strwidth (SV *str)	714	rxvt_term::strwidth (SV *str)
611	CODE:	715	CODE:
612	{	716	{
…		…
648		752
649	rxvt_push_locale (THIS->locale);	753	rxvt_push_locale (THIS->locale);
650	wchar_t *wstr = rxvt_mbstowcs (data, len);	754	wchar_t *wstr = rxvt_mbstowcs (data, len);
651	rxvt_pop_locale ();	755	rxvt_pop_locale ();
652		756
653	char *str = rxvt_wcstoutf8 (wstr);	757	RETVAL = wcs2sv (wstr);
654	free (wstr);	758	free (wstr);
655
656	RETVAL = newSVpv (str, 0);
657	SvUTF8_on (RETVAL);
658	free (str);
659	}	759	}
660	OUTPUT:	760	OUTPUT:
661	RETVAL	761	RETVAL
662		762
		763	# very portable, especially on objects as opposed to pods
		764	#define TERM_OFFSET(sym) (((char )&((TermWin_t )0)->sym) - (char )(TermWin_t )0)
		765
		766	#define TERM_OFFSET_width TERM_OFFSET(width)
		767	#define TERM_OFFSET_height TERM_OFFSET(height)
		768	#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
		769	#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
		770	#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
		771	#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
		772	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
		773	#define TERM_OFFSET_focus TERM_OFFSET(focus)
		774	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
		775	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
		776	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
		777	#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
		778
663	int	779	int
664	rxvt_term::nsaved ()	780	rxvt_term::width ()
		781	ALIAS:
		782	width = TERM_OFFSET_width
		783	height = TERM_OFFSET_height
		784	fwidth = TERM_OFFSET_fwidth
		785	fheight = TERM_OFFSET_fheight
		786	fbase = TERM_OFFSET_fbase
		787	nrow = TERM_OFFSET_nrow
		788	ncol = TERM_OFFSET_ncol
		789	focus = TERM_OFFSET_focus
		790	mapped = TERM_OFFSET_mapped
		791	saveLines = TERM_OFFSET_saveLines
		792	total_rows = TERM_OFFSET_total_rows
		793	nsaved = TERM_OFFSET_nsaved
665	CODE:	794	CODE:
		795	RETVAL = (int )((char *)THIS + ix);
		796	OUTPUT:
		797	RETVAL
		798
		799	U32
		800	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
		801	CODE:
		802	{
666	RETVAL = THIS->nsaved;	803	RETVAL = THIS->rstyle;
		804	THIS->rstyle = new_rstyle;
		805	}
667	OUTPUT:	806	OUTPUT:
668	RETVAL	807	RETVAL
669		808
670	int	809	int
671	rxvt_term::view_start (int newval = -1)	810	rxvt_term::view_start (int newval = -1)
672	CODE:	811	CODE:
673	{	812	{
…		…
680	}	819	}
681	}	820	}
682	OUTPUT:	821	OUTPUT:
683	RETVAL	822	RETVAL
684		823
685	int
686	rxvt_term::nrow ()
687	CODE:
688	RETVAL = THIS->nrow;
689	OUTPUT:
690	RETVAL
691
692	int
693	rxvt_term::ncol ()
694	CODE:
695	RETVAL = THIS->ncol;
696	OUTPUT:
697	RETVAL
698
699	void	824	void
700	rxvt_term::want_refresh ()	825	rxvt_term::want_refresh ()
701	CODE:	826	CODE:
702	THIS->want_refresh = 1;	827	THIS->want_refresh = 1;
703		828
704	void	829	void
705	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)	830	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
706	PPCODE:	831	PPCODE:
707	{	832	{
708	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	833	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
709	croak ("row_number number of out range");	834	XSRETURN_EMPTY;
710		835
711	line_t &l = ROW(row_number);	836	line_t &l = ROW(row_number);
712		837
713	if (GIMME_V != G_VOID)	838	if (GIMME_V != G_VOID)
714	{	839	{
715	wchar_t *wstr = new wchar_t [THIS->ncol];	840	wchar_t *wstr = new wchar_t [THIS->ncol];
716		841
717	for (int col = 0; col <THIS->ncol; col++)	842	for (int col = 0; col <THIS->ncol; col++)
718	wstr [col] = l.t [col];	843	wstr [col] = l.t [col];
719		844
720	char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
721	free (wstr);
722
723	SV *sv = newSVpv (str, 0);
724	SvUTF8_on (sv);
725	XPUSHs (sv_2mortal (sv));	845	XPUSHs (sv_2mortal (wcs2sv (wstr)));
726	free (str);	846
		847	delete [] wstr;
727	}	848	}
728		849
729	if (new_text)	850	if (new_text)
730	{	851	{
731	wchar_t *wstr = sv2wcs (new_text);	852	wchar_t *wstr = sv2wcs (new_text);
732		853
733	int len = wcslen (wstr);	854	int len = min (wcslen (wstr) - start_ofs, max_len);
734		855
735	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))	856	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
736	{	857	{
737	free (wstr);	858	free (wstr);
738	croak ("new_text extends beyond horizontal margins");	859	croak ("new_text extends beyond horizontal margins");
739	}	860	}
740		861
741	for (int col = start_col; col < start_col + len; col++)	862	for (int col = start_col; col < start_col + len; col++)
742	{	863	{
743	l.t [col] = wstr [col - start_col];	864	l.t [col] = wstr [start_ofs + col - start_col];
744	l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));	865	l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
745	}	866	}
746		867
747	free (wstr);	868	free (wstr);
748	}	869	}
749	}	870	}
750		871
751	void	872	void
752	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)	873	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
753	PPCODE:	874	PPCODE:
754	{	875	{
755	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	876	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
756	croak ("row_number number of out range");	877	XSRETURN_EMPTY;
757		878
758	line_t &l = ROW(row_number);	879	line_t &l = ROW(row_number);
759		880
760	if (GIMME_V != G_VOID)	881	if (GIMME_V != G_VOID)
761	{	882	{
…		…
772	{	893	{
773	if (!SvROK (new_rend) \|\| SvTYPE (SvRV (new_rend)) != SVt_PVAV)	894	if (!SvROK (new_rend) \|\| SvTYPE (SvRV (new_rend)) != SVt_PVAV)
774	croak ("new_rend must be arrayref");	895	croak ("new_rend must be arrayref");
775		896
776	AV av = (AV )SvRV (new_rend);	897	AV av = (AV )SvRV (new_rend);
777	int len = av_len (av) + 1;	898	int len = min (av_len (av) + 1 - start_ofs, max_len);
778		899
779	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))	900	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
780	croak ("new_rend array extends beyond horizontal margins");	901	croak ("new_rend array extends beyond horizontal margins");
781		902
782	for (int col = start_col; col < start_col + len; col++)	903	for (int col = start_col; col < start_col + len; col++)
783	{	904	{
784	rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask;	905	rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
785		906
786	l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));	907	l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
787	}	908	}
788	}	909	}
789	}	910	}
790		911
791	int	912	int
792	rxvt_term::ROW_l (int row_number, int new_length = -2)	913	rxvt_term::ROW_l (int row_number, int new_length = -1)
793	CODE:	914	CODE:
794	{	915	{
795	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	916	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
796	croak ("row_number number of out range");	917	XSRETURN_EMPTY;
797		918
798	line_t &l = ROW(row_number);	919	line_t &l = ROW(row_number);
799	RETVAL = l.l;	920	RETVAL = l.l;
800		921
801	if (new_length >= -1)	922	if (new_length >= 0)
802	l.l = new_length;	923	l.l = new_length;
		924	}
		925	OUTPUT:
		926	RETVAL
		927
		928	bool
		929	rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
		930	CODE:
		931	{
		932	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
		933	XSRETURN_EMPTY;
		934
		935	line_t &l = ROW(row_number);
		936	RETVAL = l.is_longer ();
		937
		938	if (new_is_longer >= 0)
		939	l.is_longer (new_is_longer);
803	}	940	}
804	OUTPUT:	941	OUTPUT:
805	RETVAL	942	RETVAL
806		943
807	SV *	944	SV *
…		…
817	void	954	void
818	rxvt_term::_resource (char name, int index, SV newval = 0)	955	rxvt_term::_resource (char name, int index, SV newval = 0)
819	PPCODE:	956	PPCODE:
820	{	957	{
821	struct resval { const char *name; int value; } rslist [] = {	958	struct resval { const char *name; int value; } rslist [] = {
822	# define Rs_def(name) { # name, Rs_ ## name },	959	# define def(name) { # name, Rs_ ## name },
823	# define Rs_reserve(name,count)	960	# define reserve(name,count)
824	# include "rsinc.h"	961	# include "rsinc.h"
825	# undef Rs_def	962	# undef def
826	# undef Rs_reserve	963	# undef reserve
827	};	964	};
828		965
829	struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);	966	struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
830		967
831	do {	968	do {
…		…
853	THIS->rs [index] = 0;	990	THIS->rs [index] = 0;
854	}	991	}
855	}	992	}
856		993
857	void	994	void
858	rxvt_term::selection_mark (...)	995	rxvt_term::cur (...)
859	PROTOTYPE: $;$$	996	PROTOTYPE: $;$$
860	ALIAS:	997	ALIAS:
		998	screen_cur = 0
861	selection_beg = 1	999	selection_beg = 1
862	selection_end = 2	1000	selection_end = 2
		1001	selection_mark = 3
863	PPCODE:	1002	PPCODE:
864	{	1003	{
865	row_col_t &sel = ix == 1 ? THIS->selection.beg	1004	row_col_t &rc = ix == 0 ? THIS->screen.cur
		1005	: ix == 1 ? THIS->selection.beg
866	: ix == 2 ? THIS->selection.end	1006	: ix == 2 ? THIS->selection.end
867	: THIS->selection.mark;	1007	: THIS->selection.mark;
868		1008
869	if (GIMME_V != G_VOID)	1009	if (GIMME_V != G_VOID)
870	{	1010	{
871	EXTEND (SP, 2);	1011	EXTEND (SP, 2);
872	PUSHs (sv_2mortal (newSViv (sel.row)));	1012	PUSHs (sv_2mortal (newSViv (rc.row)));
873	PUSHs (sv_2mortal (newSViv (sel.col)));	1013	PUSHs (sv_2mortal (newSViv (rc.col)));
874	}	1014	}
875		1015
876	if (items == 3)	1016	if (items == 3)
877	{	1017	{
878	sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);	1018	rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
879	sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);	1019	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
880		1020
881	if (ix)	1021	if (ix)
882	THIS->want_refresh = 1;	1022	THIS->want_refresh = 1;
883	}	1023	}
884	}	1024	}
…		…
889	void	1029	void
890	rxvt_term::selection (SV *newtext = 0)	1030	rxvt_term::selection (SV *newtext = 0)
891	PPCODE:	1031	PPCODE:
892	{	1032	{
893	if (GIMME_V != G_VOID)	1033	if (GIMME_V != G_VOID)
894	{	1034	XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
895	char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
896	SV *sv = newSVpv (sel, 0);
897	SvUTF8_on (sv);
898	free (sel);
899	XPUSHs (sv_2mortal (sv));
900	}
901		1035
902	if (newtext)	1036	if (newtext)
903	{	1037	{
904	free (THIS->selection.text);	1038	free (THIS->selection.text);
905		1039
906	THIS->selection.text = sv2wcs (newtext);	1040	THIS->selection.text = sv2wcs (newtext);
907	THIS->selection.len = wcslen (THIS->selection.text);	1041	THIS->selection.len = wcslen (THIS->selection.text);
908	}	1042	}
909	}	1043	}
		1044
		1045	void
		1046	rxvt_term::scr_add_lines (SV *string)
		1047	CODE:
		1048	{
		1049	wchar_t *wstr = sv2wcs (string);
		1050	int wlen = wcslen (wstr);
		1051	unicode_t *ustr = new unicode_t [wlen];
		1052	int nlines = 0;
		1053
		1054	for (int i = wlen; i--; )
910		1055	{
		1056	ustr [i] = wstr [i];
		1057	nlines += ustr [i] == '\012';
		1058	}
		1059
		1060	THIS->scr_add_lines (ustr, nlines, wlen);
		1061
		1062	free (wstr);
		1063	delete [] ustr;
		1064	}
		1065
911	void	1066	void
912	rxvt_term::tt_write (SV *octets)	1067	rxvt_term::tt_write (SV *octets)
913	INIT:	1068	INIT:
914	STRLEN len;	1069	STRLEN len;
915	char *str = SvPVbyte (octets, len);	1070	char *str = SvPVbyte (octets, len);
916	C_ARGS:	1071	C_ARGS:
917	(unsigned char *)str, len	1072	str, len
		1073
		1074	void
		1075	rxvt_term::cmd_parse (SV *octets)
		1076	CODE:
		1077	{
		1078	STRLEN len;
		1079	char *str = SvPVbyte (octets, len);
		1080
		1081	char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
		1082	char *old_cmdbuf_endp = THIS->cmdbuf_endp;
		1083
		1084	THIS->cmdbuf_ptr = str;
		1085	THIS->cmdbuf_endp = str + len;
		1086
		1087	THIS->cmd_parse ();
		1088
		1089	THIS->cmdbuf_ptr = old_cmdbuf_ptr;
		1090	THIS->cmdbuf_endp = old_cmdbuf_endp;
		1091	}
918		1092
919	SV *	1093	SV *
920	rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)	1094	rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
921	CODE:	1095	CODE:
922	{	1096	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.18 by root, Tue Jan 3 19:10:54 2006 UTC vs. Revision 1.29 by root, Fri Jan 6 03:40:19 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.18 by root, Tue Jan 3 19:10:54 2006 UTC vs.
Revision 1.29 by root, Fri Jan 6 03:40:19 2006 UTC