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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.8 by root, Tue Jan 3 00:06:57 2006 UTC vs.
Revision 1.14 by root, Tue Jan 3 04:45:03 2006 UTC

…		…
139	#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")	139	#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
140	#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")	140	#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
141		141
142	struct timer : time_watcher, perl_watcher	142	struct timer : time_watcher, perl_watcher
143	{	143	{
		144	tstamp interval;
		145
144	timer ()	146	timer ()
145	: time_watcher (this, &timer::execute)	147	: time_watcher (this, &timer::execute)
146	{	148	{
147	}	149	}
148		150
149	void execute (time_watcher &w)	151	void execute (time_watcher &w)
150	{	152	{
		153	if (interval)
		154	start (at + interval);
		155
151	invoke ("urxvt::timer", newSVtimer (this));	156	invoke ("urxvt::timer", newSVtimer (this));
152	}	157	}
153	};	158	};
154		159
155	#define newSViow(iow) new_ref (iow->self, "urxvt::iow")	160	#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
…		…
165	void execute (io_watcher &w, short revents)	170	void execute (io_watcher &w, short revents)
166	{	171	{
167	invoke ("urxvt::iow", newSViow (this), revents);	172	invoke ("urxvt::iow", newSViow (this), revents);
168	}	173	}
169	};	174	};
		175
		176	/////////////////////////////////////////////////////////////////////////////
		177
		178	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
		179
		180	struct overlay {
		181	HV *self;
		182	rxvt_term *THIS;
		183	int x, y, w, h;
		184	int border;
		185	text_t **text;
		186	rend_t **rend;
		187
		188	overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
		189	~overlay ();
		190
		191	void swap ();
		192
		193	void set (int x, int y, SV str, SV rend);
		194	};
		195
		196	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
		197	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2)
		198	{
		199	if (border == 2)
		200	{
		201	w += 2;
		202	h += 2;
		203	}
		204
		205	text = new text_t *[h];
		206	rend = new rend_t *[h];
		207
		208	for (int y = 0; y < h; y++)
		209	{
		210	text_t *tp = text[y] = new text_t[w];
		211	rend_t *rp = rend[y] = new rend_t[w];
		212
		213	text_t t0, t1, t2;
		214	rend_t r = rstyle;
		215
		216	if (border == 2)
		217	{
		218	if (y == 0)
		219	t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
		220	else if (y < h - 1)
		221	t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
		222	else
		223	t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
		224
		225	*tp++ = t0;
		226	*rp++ = r;
		227
		228	for (int x = w - 2; x-- > 0; )
		229	{
		230	*tp++ = t1;
		231	*rp++ = r;
		232	}
		233
		234	*tp = t2;
		235	*rp = r;
		236	}
		237	else
		238	for (int x = w; x-- > 0; )
		239	{
		240	*tp++ = 0x0020;
		241	*rp++ = r;
		242	}
		243	}
		244
		245	THIS->want_refresh = 1;
		246	}
		247
		248	overlay::~overlay ()
		249	{
		250	for (int y = h; y--; )
		251	{
		252	delete [] text[y];
		253	delete [] rend[y];
		254	}
		255
		256	delete [] text;
		257	delete [] rend;
		258
		259	THIS->want_refresh = 1;
		260	}
		261
		262	void overlay::swap ()
		263	{
		264	int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
		265	int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
		266
		267	int ov_w = min (w, THIS->ncol - ov_x);
		268	int ov_h = min (h, THIS->nrow - ov_y);
		269
		270	for (int y = ov_h; y--; )
		271	{
		272	text_t *t1 = text [y];
		273	rend_t *r1 = rend [y];
		274
		275	text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;
		276	rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
		277
		278	for (int x = ov_w; x--; )
		279	{
		280	text_t t = t1; t1++ = t2; t2++ = t;
		281	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
		282	}
		283	}
		284
		285	}
		286
		287	void overlay::set (int x, int y, SV text, SV rend)
		288	{
		289	x += border;
		290	y += border;
		291
		292	if (!IN_RANGE_EXC (y, 0, h - border))
		293	return;
		294
		295	wchar_t *wtext = sv2wcs (text);
		296
		297	for (int col = min (wcslen (wtext), w - x - border); col--; )
		298	this->text [y][x + col] = wtext [col];
		299
		300	free (wtext);
		301
		302	if (rend)
		303	{
		304	if (!SvROK (rend) \|\| SvTYPE (SvRV (rend)) != SVt_PVAV)
		305	croak ("rend must be arrayref");
		306
		307	AV av = (AV )SvRV (rend);
		308
		309	for (int col = min (av_len (av) + 1, w - x - border); col--; )
		310	this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
		311	}
		312
		313	THIS->want_refresh = 1;
		314	}
		315
170		316
171	/////////////////////////////////////////////////////////////////////////////	317	/////////////////////////////////////////////////////////////////////////////
172		318
173	struct rxvt_perl_interp rxvt_perl;	319	struct rxvt_perl_interp rxvt_perl;
174		320
…		…
213	}	359	}
214		360
215	bool	361	bool
216	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	362	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
217	{	363	{
218	if (!perl	364	if (!perl)
219	\|\| (!should_invoke [htype] && htype != HOOK_INIT && htype != HOOK_DESTROY))
220	return false;	365	return false;
221		366
222	if (htype == HOOK_INIT) // first hook ever called	367	if (htype == HOOK_INIT) // first hook ever called
		368	{
223	term->self = (void )newSVptr ((void )term, "urxvt::term");	369	term->self = (void )newSVptr ((void )term, "urxvt::term");
		370	hv_store ((HV )SvRV ((SV )term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
		371	}
		372	else if (htype == HOOK_DESTROY)
		373	{
		374	// handled later
		375	}
		376	else if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
		377	{
		378	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->self), "_overlay", 8, 0));
		379
		380	if (HvKEYS (hv))
		381	{
		382	hv_iterinit (hv);
		383
		384	while (HE *he = hv_iternext (hv))
		385	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
		386	}
		387	}
		388	else if (!should_invoke [htype])
		389	return false;
224		390
225	dSP;	391	dSP;
226	va_list ap;	392	va_list ap;
227		393
228	va_start (ap, htype);	394	va_start (ap, htype);
…		…
296	PROTOTYPES: ENABLE	462	PROTOTYPES: ENABLE
297		463
298	BOOT:	464	BOOT:
299	{	465	{
300	# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))	466	# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))
		467	# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name));
301	AV *hookname = get_av ("urxvt::HOOKNAME", 1);	468	AV *hookname = get_av ("urxvt::HOOKNAME", 1);
302	set_hookname (INIT);	469	set_hookname (INIT);
303	set_hookname (RESET);	470	set_hookname (RESET);
304	set_hookname (START);	471	set_hookname (START);
305	set_hookname (DESTROY);	472	set_hookname (DESTROY);
…		…
314	set_hookname (TTY_ACTIVITY);	481	set_hookname (TTY_ACTIVITY);
315	set_hookname (REFRESH_BEGIN);	482	set_hookname (REFRESH_BEGIN);
316	set_hookname (REFRESH_END);	483	set_hookname (REFRESH_END);
317	set_hookname (KEYBOARD_COMMAND);	484	set_hookname (KEYBOARD_COMMAND);
318		485
		486	export_const (DEFAULT_RSTYLE);
		487	export_const (OVERLAY_RSTYLE);
		488	export_const (RS_Bold);
		489	export_const (RS_Italic);
		490	export_const (RS_Blink);
		491	export_const (RS_RVid);
		492	export_const (RS_Uline);
		493
319	sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);	494	sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
320	}	495	}
321		496
322	void	497	void
323	set_should_invoke (int htype, int value)	498	set_should_invoke (int htype, int value)
…		…
337	NV	512	NV
338	NOW ()	513	NOW ()
339	CODE:	514	CODE:
340	RETVAL = NOW;	515	RETVAL = NOW;
341	OUTPUT:	516	OUTPUT:
		517	RETVAL
		518
		519	int
		520	GET_BASEFG (int rend)
		521	CODE:
		522	RETVAL = GET_BASEFG (rend);
		523	OUTPUT:
		524	RETVAL
		525
		526	int
		527	GET_BASEBG (int rend)
		528	CODE:
		529	RETVAL = GET_BASEBG (rend);
		530	OUTPUT:
		531	RETVAL
		532
		533	int
		534	SET_FGCOLOR (int rend, int new_color)
		535	CODE:
		536	RETVAL = SET_FGCOLOR (rend, new_color);
		537	OUTPUT:
		538	RETVAL
		539
		540	int
		541	SET_BGCOLOR (int rend, int new_color)
		542	CODE:
		543	RETVAL = SET_BGCOLOR (rend, new_color);
		544	OUTPUT:
		545	RETVAL
		546
		547	int
		548	GET_CUSTOM (int rend)
		549	CODE:
		550	RETVAL = (rend && RS_customMask) >> RS_customShift;
		551	OUTPUT:
		552	RETVAL
		553
		554	int
		555	SET_CUSTOM (int rend, int new_value)
		556	CODE:
		557	{
		558	if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
		559	croak ("custom value out of range, must be 0..%d", RS_customCount - 1);
		560
		561	RETVAL = (rend & ~RS_customMask)
		562	\| ((new_value << RS_customShift) & RS_customMask);
		563	}
		564	OUTPUT:
342	RETVAL	565	RETVAL
343		566
344	MODULE = urxvt PACKAGE = urxvt::term	567	MODULE = urxvt PACKAGE = urxvt::term
345		568
346	int	569	int
…		…
430	rxvt_term::ncol ()	653	rxvt_term::ncol ()
431	CODE:	654	CODE:
432	RETVAL = THIS->ncol;	655	RETVAL = THIS->ncol;
433	OUTPUT:	656	OUTPUT:
434	RETVAL	657	RETVAL
		658
		659	void
		660	rxvt_term::want_refresh ()
		661	CODE:
		662	THIS->want_refresh = 1;
435		663
436	void	664	void
437	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)	665	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)
438	PPCODE:	666	PPCODE:
439	{	667	{
…		…
458	free (str);	686	free (str);
459	}	687	}
460		688
461	if (new_text)	689	if (new_text)
462	{	690	{
463	STRLEN slen;
464	char *str = SvPVutf8 (new_text, slen);	691	wchar_t *wstr = sv2wcs (new_text);
465	wchar_t *wstr = rxvt_utf8towcs (str, slen);
466		692
467	int len = wcslen (wstr);	693	int len = wcslen (wstr);
468		694
469	if (start_col + len > THIS->ncol)	695	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
470	{	696	{
471	free (wstr);	697	free (wstr);
472	croak ("new_text extends beyond right margin");	698	croak ("new_text extends beyond horizontal margins");
473	}	699	}
474		700
475	for (int col = start_col; col < start_col + len; col++)	701	for (int col = start_col; col < start_col + len; col++)
476	{	702	{
477	l.t [col] = wstr [col];	703	l.t [col] = wstr [col - start_col];
478	l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));	704	l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
479	}	705	}
		706
		707	free (wstr);
480	}	708	}
481	}	709	}
482		710
483	void	711	void
484	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)	712	rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)
…		…
506	croak ("new_rend must be arrayref");	734	croak ("new_rend must be arrayref");
507		735
508	AV av = (AV )SvRV (new_rend);	736	AV av = (AV )SvRV (new_rend);
509	int len = av_len (av) + 1;	737	int len = av_len (av) + 1;
510		738
511	if (start_col + len > THIS->ncol)	739	if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
512	croak ("new_rend array extends beyond right margin");	740	croak ("new_rend array extends beyond horizontal margins");
513		741
514	for (int col = start_col; col < start_col + len; col++)	742	for (int col = start_col; col < start_col + len; col++)
515	{	743	{
516	rend_t r = SvIV (*av_fetch (av, col, 1)) & ~RS_fontMask;	744	rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask;
517		745
518	l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));	746	l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
519	}	747	}
520	}	748	}
521	}	749	}
…		…
639	THIS->selection.len = wcslen (THIS->selection.text);	867	THIS->selection.len = wcslen (THIS->selection.text);
640	}	868	}
641	}	869	}
642		870
643	void	871	void
644	rxvt_term::scr_overlay_new (int x, int y, int w, int h)
645
646	void
647	rxvt_term::scr_overlay_off ()
648
649	void
650	rxvt_term::scr_overlay_set_char (int x, int y, U32 text, U32 rend = OVERLAY_RSTYLE)
651	CODE:
652	THIS->scr_overlay_set (x, y, text, rend);
653
654	void
655	rxvt_term::scr_overlay_set (int x, int y, SV *text)
656	CODE:
657	{
658	wchar_t *wtext = sv2wcs (text);
659	THIS->scr_overlay_set (x, y, wtext);
660	free (wtext);
661	}
662
663	void
664	rxvt_term::tt_write (SV *octets)	872	rxvt_term::tt_write (SV *octets)
665	INIT:	873	INIT:
666	STRLEN len;	874	STRLEN len;
667	char *str = SvPVbyte (octets, len);	875	char *str = SvPVbyte (octets, len);
668	C_ARGS:	876	C_ARGS:
669	(unsigned char *)str, len	877	(unsigned char *)str, len
670		878
		879	SV *
		880	rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
		881	CODE:
		882	{
		883	overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
		884	RETVAL = newSVptr ((void *)o, "urxvt::overlay");
		885	o->self = (HV *)SvRV (RETVAL);
		886
		887	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)THIS->self), "_overlay", 8, 0));
		888	char key[33]; sprintf (key, "%32lx", (long)o);
		889	hv_store (hv, key, 32, newSViv ((long)o), 0);
		890	}
		891	OUTPUT:
		892	RETVAL
		893
		894	MODULE = urxvt PACKAGE = urxvt::overlay
		895
		896	void
		897	overlay::set (int x, int y, SV text, SV rend = 0)
		898
		899	void
		900	overlay::DESTROY ()
		901	CODE:
		902	{
		903	SV *ovs = hv_fetch ((HV )SvRV ((SV *)THIS->THIS->self), "_overlay", 8, 0);
		904	if (ovs)
		905	{
		906	HV hv = (HV )SvRV (*ovs);
		907	char key[33]; sprintf (key, "%32lx", (long)THIS);
		908	hv_delete (hv, key, 32, G_DISCARD);
		909	}
		910
		911	delete THIS;
		912	}
		913
671	MODULE = urxvt PACKAGE = urxvt::timer	914	MODULE = urxvt PACKAGE = urxvt::timer
672		915
673	SV *	916	SV *
674	timer::new ()	917	timer::new ()
675	CODE:	918	CODE:
676	timer *w = new timer;	919	timer *w = new timer;
		920	w->start (NOW);
677	RETVAL = newSVptr ((void *)w, "urxvt::timer");	921	RETVAL = newSVptr ((void *)w, "urxvt::timer");
678	w->self = (HV *)SvRV (RETVAL);	922	w->self = (HV *)SvRV (RETVAL);
679	OUTPUT:	923	OUTPUT:
680	RETVAL	924	RETVAL
681		925
…		…
689		933
690	NV	934	NV
691	timer::at ()	935	timer::at ()
692	CODE:	936	CODE:
693	RETVAL = THIS->at;	937	RETVAL = THIS->at;
		938	OUTPUT:
		939	RETVAL
		940
		941	timer *
		942	timer::interval (NV interval)
		943	CODE:
		944	THIS->interval = interval;
		945	RETVAL = THIS;
694	OUTPUT:	946	OUTPUT:
695	RETVAL	947	RETVAL
696		948
697	timer *	949	timer *
698	timer::set (NV tstamp)	950	timer::set (NV tstamp)

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.8 by root, Tue Jan 3 00:06:57 2006 UTC vs. Revision 1.14 by root, Tue Jan 3 04:45:03 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.8 by root, Tue Jan 3 00:06:57 2006 UTC vs.
Revision 1.14 by root, Tue Jan 3 04:45:03 2006 UTC