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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.43 by root, Sun Jan 8 08:49:20 2006 UTC vs.
Revision 1.55 by root, Wed Jan 11 02:13:56 2006 UTC

…		…
29	#include "../config.h"	29	#include "../config.h"
30		30
31	#include <cstddef>	31	#include <cstddef>
32	#include <cstdarg>	32	#include <cstdarg>
33		33
		34	#include "iom.h"
34	#include "rxvt.h"	35	#include "rxvt.h"
35	#include "iom.h"	36	#include "keyboard.h"
36	#include "rxvtutil.h"	37	#include "rxvtutil.h"
37	#include "rxvtperl.h"	38	#include "rxvtperl.h"
38		39
39	#include "perlxsi.c"	40	#include "perlxsi.c"
40		41
…		…
428		429
429	perl_destruct (perl);	430	perl_destruct (perl);
430	perl_free (perl);	431	perl_free (perl);
431	perl = 0;	432	perl = 0;
432	}	433	}
		434	}
		435	}
		436
		437	static void
		438	ungrab (rxvt_term *THIS)
		439	{
		440	if (THIS->perl.grabtime)
		441	{
		442	XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
		443	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
		444	THIS->perl.grabtime = 0;
433	}	445	}
434	}	446	}
435		447
436	bool	448	bool
437	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	449	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
…		…
448	return false; // perl not initialized for this instance	460	return false; // perl not initialized for this instance
449	else if (htype == HOOK_DESTROY)	461	else if (htype == HOOK_DESTROY)
450	{	462	{
451	// handled later	463	// handled later
452	}	464	}
453	else if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)	465	else
454	{	466	{
455	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	467	if (htype == HOOK_REFRESH_BEGIN \|\| htype == HOOK_REFRESH_END)
456
457	if (HvKEYS (hv))
458	{	468	{
		469	HV hv = (HV )SvRV (hv_fetch ((HV )SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
		470
		471	if (HvKEYS (hv))
		472	{
459	hv_iterinit (hv);	473	hv_iterinit (hv);
460		474
461	while (HE *he = hv_iternext (hv))	475	while (HE *he = hv_iternext (hv))
462	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();	476	((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
		477	}
		478
463	}	479	}
		480
		481	if (!should_invoke [htype])
		482	return false;
464	}	483	}
465	else if (!should_invoke [htype])
466	return false;
467		484
468	dSP;	485	dSP;
469	va_list ap;	486	va_list ap;
470		487
471	va_start (ap, htype);	488	va_start (ap, htype);
…		…
582	PUTBACK;	599	PUTBACK;
583	FREETMPS;	600	FREETMPS;
584	LEAVE;	601	LEAVE;
585		602
586	if (SvTRUE (ERRSV))	603	if (SvTRUE (ERRSV))
		604	{
587	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));	605	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
		606	ungrab (term); // better lose the grab than the session
		607	}
588		608
589	if (htype == HOOK_DESTROY)	609	if (htype == HOOK_DESTROY)
590	{	610	{
591	clearSVptr ((SV *)term->perl.self);	611	clearSVptr ((SV *)term->perl.self);
592	SvREFCNT_dec ((SV *)term->perl.self);	612	SvREFCNT_dec ((SV *)term->perl.self);
…		…
607		627
608	PROTOTYPES: ENABLE	628	PROTOTYPES: ENABLE
609		629
610	BOOT:	630	BOOT:
611	{	631	{
612	sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));	632	sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
		633	sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
		634	sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
		635	sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
613		636
614	AV *hookname = get_av ("urxvt::HOOKNAME", 1);	637	AV *hookname = get_av ("urxvt::HOOKNAME", 1);
615	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));	638	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
616	# include "hookinc.h"	639	# include "hookinc.h"
617	# undef def	640	# undef def
…		…
646	export_const_iv (Button2Mask);	669	export_const_iv (Button2Mask);
647	export_const_iv (Button3Mask);	670	export_const_iv (Button3Mask);
648	export_const_iv (Button4Mask);	671	export_const_iv (Button4Mask);
649	export_const_iv (Button5Mask);	672	export_const_iv (Button5Mask);
650	export_const_iv (AnyModifier);	673	export_const_iv (AnyModifier);
		674
		675	export_const_iv (EVENT_NONE);
		676	export_const_iv (EVENT_READ);
		677	export_const_iv (EVENT_WRITE);
651	}	678	}
		679
		680	void
		681	set_should_invoke (int htype, int value)
		682	CODE:
		683	rxvt_perl.should_invoke [htype] = value;
		684
		685	void
		686	warn (const char *msg)
		687	CODE:
		688	rxvt_warn ("%s", msg);
		689
		690	void
		691	fatal (const char *msg)
		692	CODE:
		693	rxvt_fatal ("%s", msg);
652		694
653	SV *	695	SV *
654	new (...)	696	untaint (SV *sv)
655	CODE:	697	CODE:
656	{	698	RETVAL = newSVsv (sv);
657	stringvec *argv = new stringvec;	699	SvTAINTED_off (RETVAL);
658	bool success;	700	OUTPUT:
659
660	for (int i = 0; i < items ;i++)
661	argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
662
663	rxvt_term *term = new rxvt_term;
664
665	term->argv = argv;
666
667	try
668	{
669	if (!term->init (argv->size (), argv->begin ()))
670	term = 0;
671	}
672	catch (const class rxvt_failure_exception &e)
673	{
674	term->destroy ();
675	croak ("exception caught while initializing new terminal instance");
676	}
677
678	RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
679	}
680	OUTPUT:
681	RETVAL	701	RETVAL
682		702
683	void	703	bool
684	set_should_invoke (int htype, int value)	704	safe ()
685	CODE:	705	CODE:
686	rxvt_perl.should_invoke [htype] = value;	706	RETVAL = !rxvt_tainted ();
687		707	OUTPUT:
688	void	708	RETVAL
689	warn (const char *msg)
690	CODE:
691	rxvt_warn ("%s", msg);
692
693	void
694	fatal (const char *msg)
695	CODE:
696	rxvt_fatal ("%s", msg);
697		709
698	NV	710	NV
699	NOW ()	711	NOW ()
700	CODE:	712	CODE:
701	RETVAL = NOW;	713	RETVAL = NOW;
…		…
749	}	761	}
750	OUTPUT:	762	OUTPUT:
751	RETVAL	763	RETVAL
752		764
753	MODULE = urxvt PACKAGE = urxvt::term	765	MODULE = urxvt PACKAGE = urxvt::term
		766
		767	SV *
		768	_new (...)
		769	CODE:
		770	{
		771	if (items < 1 \|\| !SvROK (ST (0)) \|\| SvTYPE (SvRV (ST (0))) != SVt_PVAV)
		772	croak ("first argument to urxvt::term->_new must be arrayref");
		773
		774	rxvt_term *term = new rxvt_term;
		775
		776	term->argv = new stringvec;
		777	term->envv = new stringvec;
		778
		779	for (int i = 1; i < items; i++)
		780	term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
		781
		782	AV envv = (AV )SvRV (ST (0));
		783	for (int i = av_len (envv) + 1; i--; )
		784	term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
		785
		786	term->envv->push_back (0);
		787
		788	bool success;
		789
		790	try
		791	{
		792	success = term->init (term->argv->size (), term->argv->begin ());
		793	}
		794	catch (const class rxvt_failure_exception &e)
		795	{
		796	success = false;
		797	}
		798
		799	if (!success)
		800	{
		801	term->destroy ();
		802	croak ("error while initializing new terminal instance");
		803	}
		804
		805	RETVAL = term && term->perl.self
		806	? newSVterm (term) : &PL_sv_undef;
		807	}
		808	OUTPUT:
		809	RETVAL
754		810
755	void	811	void
756	rxvt_term::destroy ()	812	rxvt_term::destroy ()
757		813
758	void	814	void
…		…
782	}	838	}
783	OUTPUT:	839	OUTPUT:
784	RETVAL	840	RETVAL
785		841
786	void	842	void
787	rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)	843	rxvt_term::allow_events_async ()
788	CODE:	844	CODE:
789	XAllowEvents (THIS->display->display, AsyncBoth, eventtime);	845	XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
790		846
791	void	847	void
792	rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)	848	rxvt_term::allow_events_sync ()
793	CODE:	849	CODE:
794	XAllowEvents (THIS->display->display, SyncBoth, eventtime);	850	XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
795		851
796	void	852	void
797	rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)	853	rxvt_term::allow_events_replay ()
798	CODE:	854	CODE:
799	XAllowEvents (THIS->display->display, ReplayPointer, eventtime);	855	XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
800	XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);	856	XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
801		857
802	void	858	void
803	rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)	859	rxvt_term::ungrab ()
804	CODE:	860	CODE:
805	THIS->perl.grabtime = 0;	861	ungrab (THIS);
806	XUngrabKeyboard (THIS->display->display, eventtime);
807	XUngrabPointer (THIS->display->display, eventtime);
808		862
809	int	863	int
810	rxvt_term::strwidth (SV *str)	864	rxvt_term::strwidth (SV *str)
811	CODE:	865	CODE:
812	{	866	{
…		…
905	case 2: RETVAL = THIS->ModNumLockMask; break;	959	case 2: RETVAL = THIS->ModNumLockMask; break;
906	}	960	}
907	OUTPUT:	961	OUTPUT:
908	RETVAL	962	RETVAL
909		963
		964	char *
		965	rxvt_term::display_id ()
		966	ALIAS:
		967	display_id = 0
		968	locale = 1
		969	CODE:
		970	switch (ix)
		971	{
		972	case 0: RETVAL = THIS->display->id; break;
		973	case 1: RETVAL = THIS->locale; break;
		974	}
		975	OUTPUT:
		976	RETVAL
		977
		978	SV *
		979	rxvt_term::_env ()
		980	CODE:
		981	{
		982	if (THIS->envv)
		983	{
		984	AV *av = newAV ();
		985
		986	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
		987	if (*i)
		988	av_push (av, newSVpv (*i, 0));
		989
		990	RETVAL = newRV_noinc ((SV *)av);
		991	}
		992	else
		993	RETVAL = &PL_sv_undef;
		994	}
		995	OUTPUT:
		996	RETVAL
		997
		998	int
		999	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
		1000	CODE:
		1001	RETVAL = THIS->pty_ev.events;
		1002	if (events != EVENT_UNDEF)
		1003	THIS->pty_ev.set (events);
		1004	OUTPUT:
		1005	RETVAL
		1006
910	U32	1007	U32
911	rxvt_term::parent ()	1008	rxvt_term::parent ()
912	CODE:	1009	CODE:
913	RETVAL = (U32)THIS->parent [0];	1010	RETVAL = (U32)THIS->parent [0];
914	OUTPUT:	1011	OUTPUT:
…		…
1179	else	1276	else
1180	THIS->rs [index] = 0;	1277	THIS->rs [index] = 0;
1181	}	1278	}
1182	}	1279	}
1183		1280
		1281	const char *
		1282	rxvt_term::x_resource (const char *name)
		1283	CLEANUP:
		1284	SvTAINTED_on (ST (0));
		1285
1184	bool	1286	bool
1185	rxvt_term::option (U32 optval, int set = -1)	1287	rxvt_term::option (U32 optval, int set = -1)
1186	CODE:	1288	CODE:
1187	{	1289	{
1188	RETVAL = THIS->options & optval;	1290	RETVAL = THIS->options & optval;
…		…
1215	}	1317	}
1216	}	1318	}
1217	OUTPUT:	1319	OUTPUT:
1218	RETVAL	1320	RETVAL
1219		1321
		1322	bool
		1323	rxvt_term::parse_keysym (char keysym, char str)
		1324	CODE:
		1325	RETVAL = 0 < THIS->parse_keysym (keysym, str);
		1326	THIS->keyboard->register_done ();
		1327	OUTPUT:
		1328	RETVAL
		1329
1220	void	1330	void
1221	rxvt_term::cur (...)	1331	rxvt_term::screen_cur (...)
1222	PROTOTYPE: $;$$	1332	PROTOTYPE: $;$$
1223	ALIAS:	1333	ALIAS:
1224	screen_cur = 0	1334	screen_cur = 0
1225	selection_beg = 1	1335	selection_beg = 1
1226	selection_end = 2	1336	selection_end = 2
…		…
1247	if (ix)	1357	if (ix)
1248	THIS->want_refresh = 1;	1358	THIS->want_refresh = 1;
1249	}	1359	}
1250	}	1360	}
1251		1361
		1362	char
		1363	rxvt_term::cur_charset ()
		1364	CODE:
		1365	RETVAL = THIS->charsets [THIS->screen.charset];
		1366	OUTPUT:
		1367	RETVAL
		1368
1252	int	1369	int
1253	rxvt_term::selection_grab (U32 eventtime)	1370	rxvt_term::selection_grab (U32 eventtime)
1254		1371
1255	void	1372	void
1256	rxvt_term::selection (SV *newtext = 0)	1373	rxvt_term::selection (SV *newtext = 0)
1257	PPCODE:	1374	PPCODE:
1258	{	1375	{
1259	if (GIMME_V != G_VOID)	1376	if (GIMME_V != G_VOID)
		1377	XPUSHs (THIS->selection.text
1260	XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))));	1378	? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
		1379	: &PL_sv_undef);
1261		1380
1262	if (newtext)	1381	if (newtext)
1263	{	1382	{
1264	free (THIS->selection.text);	1383	free (THIS->selection.text);
1265		1384
1266	THIS->selection.text = sv2wcs (newtext);	1385	THIS->selection.text = sv2wcs (newtext);
1267	THIS->selection.len = wcslen (THIS->selection.text);	1386	THIS->selection.len = wcslen (THIS->selection.text);
1268	}	1387	}
1269	}	1388	}
		1389
		1390	void
		1391	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid \| RS_Uline)
		1392
		1393	void
		1394	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
		1395
		1396	void
		1397	rxvt_term::scr_bell ()
1270		1398
1271	void	1399	void
1272	rxvt_term::scr_add_lines (SV *string)	1400	rxvt_term::scr_add_lines (SV *string)
1273	CODE:	1401	CODE:
1274	{	1402	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.43 by root, Sun Jan 8 08:49:20 2006 UTC vs. Revision 1.55 by root, Wed Jan 11 02:13:56 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.43 by root, Sun Jan 8 08:49:20 2006 UTC vs.
Revision 1.55 by root, Wed Jan 11 02:13:56 2006 UTC