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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.19 by root, Tue Jan 3 20:47:36 2006 UTC vs.
Revision 1.30 by root, Fri Jan 6 05:28:55 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 (row, xe->xmotion.y / term->fheight);
		507	setiv (col, xe->xmotion.x / term->fwidth);
		508	setiv (x_root, xe->xmotion.x_root);
		509	setiv (y_root, xe->xmotion.y_root);
		510	setiv (state, xe->xmotion.state);
		511	break;
		512	}
		513
		514	switch (xe->type)
		515	{
		516	case KeyPress:
		517	case KeyRelease:
		518	setiv (keycode, xe->xkey.keycode);
		519	break;
		520
		521	case ButtonPress:
		522	case ButtonRelease:
		523	setiv (button, xe->xbutton.button);
		524	break;
		525
		526	case MotionNotify:
		527	setiv (is_hint, xe->xmotion.is_hint);
		528	break;
		529	}
		530
		531	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		532	}
		533	break;
		534
		535	case DT_USTRING_LEN:
		536	{
		537	unicode_t ustr = va_arg (ap, unicode_t );
		538	int ulen = va_arg (ap, int);
		539	wchar_t *wstr = new wchar_t [ulen];
		540
		541	for (int i = ulen; i--; )
		542	wstr [i] = ustr [i];
		543
		544	XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
		545
		546	delete [] wstr;
		547	}
		548
462	case DT_END:	549	case DT_END:
463	{	550	{
464	va_end (ap);	551	va_end (ap);
465		552
466	PUTBACK;	553	PUTBACK;
…		…
501		588
502	PROTOTYPES: ENABLE	589	PROTOTYPES: ENABLE
503		590
504	BOOT:	591	BOOT:
505	{	592	{
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));	593	# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
508	AV *hookname = get_av ("urxvt::HOOKNAME", 1);	594	AV *hookname = get_av ("urxvt::HOOKNAME", 1);
509	set_hookname (INIT);	595	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
510	set_hookname (RESET);	596	# include "hookinc.h"
511	set_hookname (START);	597	# 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		598
526	export_const (DEFAULT_RSTYLE);	599	export_const (DEFAULT_RSTYLE);
527	export_const (OVERLAY_RSTYLE);	600	export_const (OVERLAY_RSTYLE);
528	export_const (RS_Bold);	601	export_const (RS_Bold);
529	export_const (RS_Italic);	602	export_const (RS_Italic);
…		…
532	export_const (RS_Uline);	605	export_const (RS_Uline);
533		606
534	sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);	607	sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
535	}	608	}
536		609
		610	SV *
		611	new (...)
		612	CODE:
		613	{
		614	stringvec *argv = new stringvec;
		615	bool success;
		616
		617	for (int i = 0; i < items ;i++)
		618	argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
		619
		620	rxvt_term *term = new rxvt_term;
		621
		622	term->argv = argv;
		623
		624	try
		625	{
		626	if (!term->init (argv->size (), argv->begin ()))
		627	term = 0;
		628	}
		629	catch (const class rxvt_failure_exception &e)
		630	{
		631	term->destroy ();
		632	croak ("exception caught while initializing new terminal instance");
		633	}
		634
		635	RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
		636	}
		637	OUTPUT:
		638	RETVAL
		639
537	void	640	void
538	set_should_invoke (int htype, int value)	641	set_should_invoke (int htype, int value)
539	CODE:	642	CODE:
540	rxvt_perl.should_invoke [htype] = value;	643	rxvt_perl.should_invoke [htype] = value;
541		644
…		…
603	}	706	}
604	OUTPUT:	707	OUTPUT:
605	RETVAL	708	RETVAL
606		709
607	MODULE = urxvt PACKAGE = urxvt::term	710	MODULE = urxvt PACKAGE = urxvt::term
		711
		712	void
		713	rxvt_term::destroy ()
608		714
609	int	715	int
610	rxvt_term::strwidth (SV *str)	716	rxvt_term::strwidth (SV *str)
611	CODE:	717	CODE:
612	{	718	{
…		…
648		754
649	rxvt_push_locale (THIS->locale);	755	rxvt_push_locale (THIS->locale);
650	wchar_t *wstr = rxvt_mbstowcs (data, len);	756	wchar_t *wstr = rxvt_mbstowcs (data, len);
651	rxvt_pop_locale ();	757	rxvt_pop_locale ();
652		758
653	char *str = rxvt_wcstoutf8 (wstr);	759	RETVAL = wcs2sv (wstr);
654	free (wstr);	760	free (wstr);
655
656	RETVAL = newSVpv (str, 0);
657	SvUTF8_on (RETVAL);
658	free (str);
659	}	761	}
660	OUTPUT:	762	OUTPUT:
661	RETVAL	763	RETVAL
662		764
		765	# very portable, especially on objects as opposed to pods
		766	#define TERM_OFFSET(sym) (((char )&((TermWin_t )0)->sym) - (char )(TermWin_t )0)
		767
		768	#define TERM_OFFSET_width TERM_OFFSET(width)
		769	#define TERM_OFFSET_height TERM_OFFSET(height)
		770	#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
		771	#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
		772	#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
		773	#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
		774	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
		775	#define TERM_OFFSET_focus TERM_OFFSET(focus)
		776	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
		777	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
		778	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
		779	#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
		780
663	int	781	int
		782	rxvt_term::width ()
		783	ALIAS:
		784	width = TERM_OFFSET_width
		785	height = TERM_OFFSET_height
		786	fwidth = TERM_OFFSET_fwidth
		787	fheight = TERM_OFFSET_fheight
		788	fbase = TERM_OFFSET_fbase
		789	nrow = TERM_OFFSET_nrow
		790	ncol = TERM_OFFSET_ncol
		791	focus = TERM_OFFSET_focus
		792	mapped = TERM_OFFSET_mapped
		793	saveLines = TERM_OFFSET_saveLines
		794	total_rows = TERM_OFFSET_total_rows
		795	nsaved = TERM_OFFSET_nsaved
		796	CODE:
		797	RETVAL = (int )((char *)THIS + ix);
		798	OUTPUT:
		799	RETVAL
		800
		801	U32
664	rxvt_term::nsaved ()	802	rxvt_term::vt ()
665	CODE:	803	CODE:
666	RETVAL = THIS->nsaved;	804	RETVAL = THIS->vt;
667	OUTPUT:	805	OUTPUT:
668	RETVAL	806	RETVAL
		807
		808	U32
		809	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
		810	CODE:
		811	{
		812	RETVAL = THIS->rstyle;
		813	THIS->rstyle = new_rstyle;
		814	}
		815	OUTPUT:
		816	RETVAL
669		817
670	int	818	int
671	rxvt_term::view_start (int newval = -1)	819	rxvt_term::view_start (int newval = -1)
672	CODE:	820	CODE:
673	{	821	{
…		…
680	}	828	}
681	}	829	}
682	OUTPUT:	830	OUTPUT:
683	RETVAL	831	RETVAL
684		832
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	833	void
700	rxvt_term::want_refresh ()	834	rxvt_term::want_refresh ()
701	CODE:	835	CODE:
702	THIS->want_refresh = 1;	836	THIS->want_refresh = 1;
703		837
704	void	838	void
705	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)	839	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:	840	PPCODE:
707	{	841	{
708	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	842	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
709	XSRETURN_EMPTY;	843	XSRETURN_EMPTY;
710		844
…		…
715	wchar_t *wstr = new wchar_t [THIS->ncol];	849	wchar_t *wstr = new wchar_t [THIS->ncol];
716		850
717	for (int col = 0; col <THIS->ncol; col++)	851	for (int col = 0; col <THIS->ncol; col++)
718	wstr [col] = l.t [col];	852	wstr [col] = l.t [col];
719		853
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));	854	XPUSHs (sv_2mortal (wcs2sv (wstr)));
726	free (str);	855
		856	delete [] wstr;
727	}	857	}
728		858
729	if (new_text)	859	if (new_text)
730	{	860	{
731	wchar_t *wstr = sv2wcs (new_text);	861	wchar_t *wstr = sv2wcs (new_text);
732		862
733	int len = wcslen (wstr);	863	int len = min (wcslen (wstr) - start_ofs, max_len);
734		864
735	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))	865	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
736	{	866	{
737	free (wstr);	867	free (wstr);
738	croak ("new_text extends beyond horizontal margins");	868	croak ("new_text extends beyond horizontal margins");
739	}	869	}
740		870
741	for (int col = start_col; col < start_col + len; col++)	871	for (int col = start_col; col < start_col + len; col++)
742	{	872	{
743	l.t [col] = wstr [col - start_col];	873	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]));	874	l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
745	}	875	}
746		876
747	free (wstr);	877	free (wstr);
748	}	878	}
749	}	879	}
750		880
751	void	881	void
752	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)	882	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:	883	PPCODE:
754	{	884	{
755	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	885	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
756	XSRETURN_EMPTY;	886	XSRETURN_EMPTY;
757		887
…		…
772	{	902	{
773	if (!SvROK (new_rend) \|\| SvTYPE (SvRV (new_rend)) != SVt_PVAV)	903	if (!SvROK (new_rend) \|\| SvTYPE (SvRV (new_rend)) != SVt_PVAV)
774	croak ("new_rend must be arrayref");	904	croak ("new_rend must be arrayref");
775		905
776	AV av = (AV )SvRV (new_rend);	906	AV av = (AV )SvRV (new_rend);
777	int len = av_len (av) + 1;	907	int len = min (av_len (av) + 1 - start_ofs, max_len);
778		908
779	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))	909	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
780	croak ("new_rend array extends beyond horizontal margins");	910	croak ("new_rend array extends beyond horizontal margins");
781		911
782	for (int col = start_col; col < start_col + len; col++)	912	for (int col = start_col; col < start_col + len; col++)
783	{	913	{
784	rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask;	914	rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
785		915
786	l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));	916	l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
787	}	917	}
788	}	918	}
789	}	919	}
790		920
791	int	921	int
792	rxvt_term::ROW_l (int row_number, int new_length = -2)	922	rxvt_term::ROW_l (int row_number, int new_length = -1)
793	CODE:	923	CODE:
794	{	924	{
795	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	925	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
796	XSRETURN_EMPTY;	926	XSRETURN_EMPTY;
797		927
798	line_t &l = ROW(row_number);	928	line_t &l = ROW(row_number);
799	RETVAL = l.l < 0 ? THIS->ncol : l.l;	929	RETVAL = l.l;
800		930
801	if (new_length >= -1)	931	if (new_length >= 0)
802	l.l = new_length;	932	l.l = new_length;
803	}	933	}
804	OUTPUT:	934	OUTPUT:
805	RETVAL	935	RETVAL
806		936
807	bool	937	bool
808	rxvt_term::ROW_is_longer (int row_number)	938	rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
809	CODE:	939	CODE:
810	{	940	{
811	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))	941	if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
812	XSRETURN_EMPTY;	942	XSRETURN_EMPTY;
813		943
814	line_t &l = ROW(row_number);	944	line_t &l = ROW(row_number);
815	RETVAL = l.l < 0;	945	RETVAL = l.is_longer ();
		946
		947	if (new_is_longer >= 0)
		948	l.is_longer (new_is_longer);
816	}	949	}
817	OUTPUT:	950	OUTPUT:
818	RETVAL	951	RETVAL
819		952
820	SV *	953	SV *
…		…
830	void	963	void
831	rxvt_term::_resource (char name, int index, SV newval = 0)	964	rxvt_term::_resource (char name, int index, SV newval = 0)
832	PPCODE:	965	PPCODE:
833	{	966	{
834	struct resval { const char *name; int value; } rslist [] = {	967	struct resval { const char *name; int value; } rslist [] = {
835	# define Rs_def(name) { # name, Rs_ ## name },	968	# define def(name) { # name, Rs_ ## name },
836	# define Rs_reserve(name,count)	969	# define reserve(name,count)
837	# include "rsinc.h"	970	# include "rsinc.h"
838	# undef Rs_def	971	# undef def
839	# undef Rs_reserve	972	# undef reserve
840	};	973	};
841		974
842	struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);	975	struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
843		976
844	do {	977	do {
…		…
866	THIS->rs [index] = 0;	999	THIS->rs [index] = 0;
867	}	1000	}
868	}	1001	}
869		1002
870	void	1003	void
871	rxvt_term::selection_mark (...)	1004	rxvt_term::cur (...)
872	PROTOTYPE: $;$$	1005	PROTOTYPE: $;$$
873	ALIAS:	1006	ALIAS:
		1007	screen_cur = 0
874	selection_beg = 1	1008	selection_beg = 1
875	selection_end = 2	1009	selection_end = 2
		1010	selection_mark = 3
876	PPCODE:	1011	PPCODE:
877	{	1012	{
878	row_col_t &sel = ix == 1 ? THIS->selection.beg	1013	row_col_t &rc = ix == 0 ? THIS->screen.cur
		1014	: ix == 1 ? THIS->selection.beg
879	: ix == 2 ? THIS->selection.end	1015	: ix == 2 ? THIS->selection.end
880	: THIS->selection.mark;	1016	: THIS->selection.mark;
881		1017
882	if (GIMME_V != G_VOID)	1018	if (GIMME_V != G_VOID)
883	{	1019	{
884	EXTEND (SP, 2);	1020	EXTEND (SP, 2);
885	PUSHs (sv_2mortal (newSViv (sel.row)));	1021	PUSHs (sv_2mortal (newSViv (rc.row)));
886	PUSHs (sv_2mortal (newSViv (sel.col)));	1022	PUSHs (sv_2mortal (newSViv (rc.col)));
887	}	1023	}
888		1024
889	if (items == 3)	1025	if (items == 3)
890	{	1026	{
891	sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);	1027	rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
892	sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);	1028	rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
893		1029
894	if (ix)	1030	if (ix)
895	THIS->want_refresh = 1;	1031	THIS->want_refresh = 1;
896	}	1032	}
897	}	1033	}
…		…
902	void	1038	void
903	rxvt_term::selection (SV *newtext = 0)	1039	rxvt_term::selection (SV *newtext = 0)
904	PPCODE:	1040	PPCODE:
905	{	1041	{
906	if (GIMME_V != G_VOID)	1042	if (GIMME_V != G_VOID)
907	{	1043	XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
908	char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
909	SV *sv = newSVpv (sel, 0);
910	SvUTF8_on (sv);
911	free (sel);
912	XPUSHs (sv_2mortal (sv));
913	}
914		1044
915	if (newtext)	1045	if (newtext)
916	{	1046	{
917	free (THIS->selection.text);	1047	free (THIS->selection.text);
918		1048
919	THIS->selection.text = sv2wcs (newtext);	1049	THIS->selection.text = sv2wcs (newtext);
920	THIS->selection.len = wcslen (THIS->selection.text);	1050	THIS->selection.len = wcslen (THIS->selection.text);
921	}	1051	}
922	}	1052	}
		1053
		1054	void
		1055	rxvt_term::scr_add_lines (SV *string)
		1056	CODE:
		1057	{
		1058	wchar_t *wstr = sv2wcs (string);
		1059	int wlen = wcslen (wstr);
		1060	unicode_t *ustr = new unicode_t [wlen];
		1061	int nlines = 0;
		1062
		1063	for (int i = wlen; i--; )
923		1064	{
		1065	ustr [i] = wstr [i];
		1066	nlines += ustr [i] == '\012';
		1067	}
		1068
		1069	THIS->scr_add_lines (ustr, nlines, wlen);
		1070
		1071	free (wstr);
		1072	delete [] ustr;
		1073	}
		1074
924	void	1075	void
925	rxvt_term::tt_write (SV *octets)	1076	rxvt_term::tt_write (SV *octets)
926	INIT:	1077	INIT:
927	STRLEN len;	1078	STRLEN len;
928	char *str = SvPVbyte (octets, len);	1079	char *str = SvPVbyte (octets, len);
929	C_ARGS:	1080	C_ARGS:
930	(unsigned char *)str, len	1081	str, len
		1082
		1083	void
		1084	rxvt_term::cmd_parse (SV *octets)
		1085	CODE:
		1086	{
		1087	STRLEN len;
		1088	char *str = SvPVbyte (octets, len);
		1089
		1090	char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
		1091	char *old_cmdbuf_endp = THIS->cmdbuf_endp;
		1092
		1093	THIS->cmdbuf_ptr = str;
		1094	THIS->cmdbuf_endp = str + len;
		1095
		1096	THIS->cmd_parse ();
		1097
		1098	THIS->cmdbuf_ptr = old_cmdbuf_ptr;
		1099	THIS->cmdbuf_endp = old_cmdbuf_endp;
		1100	}
931		1101
932	SV *	1102	SV *
933	rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)	1103	rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
934	CODE:	1104	CODE:
935	{	1105	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.19 by root, Tue Jan 3 20:47:36 2006 UTC vs. Revision 1.30 by root, Fri Jan 6 05:28:55 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.19 by root, Tue Jan 3 20:47:36 2006 UTC vs.
Revision 1.30 by root, Fri Jan 6 05:28:55 2006 UTC