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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.28 by root, Fri Jan 6 02:58:02 2006 UTC vs.
Revision 1.35 by root, Sat Jan 7 04:19:43 2006 UTC

…		…
1	/----------------------------------------------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtperl.xs	2	* File: rxvtperl.xs
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 2005-2005 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
465		465
466	case DT_LONG:	466	case DT_LONG:
467	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));	467	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468	break;	468	break;
469		469
470	case DT_STRING:	470	case DT_STR:
471	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));	471	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
472	break;	472	break;
473		473
474	case DT_USTRING_LEN:	474	case DT_STR_LEN:
475	{	475	{
476	unicode_t ustr = va_arg (ap, unicode_t );	476	char str = va_arg (ap, char );
477	int ulen = va_arg (ap, int);	477	int len = va_arg (ap, int);
		478
		479	XPUSHs (sv_2mortal (newSVpvn (str, len)));
		480	}
		481	break;
		482
		483	case DT_WCS_LEN:
		484	{
478	wchar_t *wstr = new wchar_t [ulen];	485	wchar_t wstr = va_arg (ap, wchar_t );
		486	int wlen = va_arg (ap, int);
479		487
480	for (int i = ulen; i--; )
481	wstr [i] = ustr [i];
482
483	XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));	488	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
		489	}
		490	break;
484		491
485	delete [] wstr;	492	case DT_XEVENT:
486	}	493	{
		494	XEvent xe = va_arg (ap, XEvent );
		495	HV *hv = newHV ();
		496
		497	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
		498	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
		499	# undef set
		500
		501	setiv (type, xe->type);
		502	setiv (send_event, xe->xany.send_event);
		503	setiv (serial, xe->xany.serial);
		504
		505	switch (xe->type)
		506	{
		507	case KeyPress:
		508	case KeyRelease:
		509	case ButtonPress:
		510	case ButtonRelease:
		511	case MotionNotify:
		512	setiv (time, xe->xmotion.time);
		513	setiv (x, xe->xmotion.x);
		514	setiv (y, xe->xmotion.y);
		515	setiv (row, xe->xmotion.y / term->fheight);
		516	setiv (col, xe->xmotion.x / term->fwidth);
		517	setiv (x_root, xe->xmotion.x_root);
		518	setiv (y_root, xe->xmotion.y_root);
		519	setiv (state, xe->xmotion.state);
		520	break;
		521	}
		522
		523	switch (xe->type)
		524	{
		525	case KeyPress:
		526	case KeyRelease:
		527	setiv (keycode, xe->xkey.keycode);
		528	break;
		529
		530	case ButtonPress:
		531	case ButtonRelease:
		532	setiv (button, xe->xbutton.button);
		533	break;
		534
		535	case MotionNotify:
		536	setiv (is_hint, xe->xmotion.is_hint);
		537	break;
		538	}
		539
		540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		541	}
		542	break;
487		543
488	case DT_END:	544	case DT_END:
489	{	545	{
490	va_end (ap);	546	va_end (ap);
491		547
…		…
648		704
649	MODULE = urxvt PACKAGE = urxvt::term	705	MODULE = urxvt PACKAGE = urxvt::term
650		706
651	void	707	void
652	rxvt_term::destroy ()	708	rxvt_term::destroy ()
		709
		710	void
		711	rxvt_term::grab (int eventtime)
		712	CODE:
		713	{
		714	return;
		715	XGrabPointer (THIS->display->display, THIS->vt, 0,
		716	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
		717	GrabModeAsync, GrabModeAsync, None, None, eventtime);
		718	XGrabKeyboard (THIS->display->display, THIS->vt, 0, GrabModeAsync, GrabModeAsync, eventtime);
		719	}
653		720
654	int	721	int
655	rxvt_term::strwidth (SV *str)	722	rxvt_term::strwidth (SV *str)
656	CODE:	723	CODE:
657	{	724	{
…		…
736	RETVAL = (int )((char *)THIS + ix);	803	RETVAL = (int )((char *)THIS + ix);
737	OUTPUT:	804	OUTPUT:
738	RETVAL	805	RETVAL
739		806
740	U32	807	U32
		808	rxvt_term::parent ()
		809	CODE:
		810	RETVAL = (U32)THIS->parent [0];
		811	OUTPUT:
		812	RETVAL
		813
		814	U32
		815	rxvt_term::vt ()
		816	CODE:
		817	RETVAL = (U32)THIS->vt;
		818	OUTPUT:
		819	RETVAL
		820
		821	U32
741	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)	822	rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
742	CODE:	823	CODE:
743	{	824	{
744	RETVAL = THIS->rstyle;	825	RETVAL = THIS->rstyle;
745	THIS->rstyle = new_rstyle;	826	THIS->rstyle = new_rstyle;
…		…
778		859
779	if (GIMME_V != G_VOID)	860	if (GIMME_V != G_VOID)
780	{	861	{
781	wchar_t *wstr = new wchar_t [THIS->ncol];	862	wchar_t *wstr = new wchar_t [THIS->ncol];
782		863
783	for (int col = 0; col <THIS->ncol; col++)	864	for (int col = 0; col < THIS->ncol; col++)
784	wstr [col] = l.t [col];	865	wstr [col] = l.t [col];
785		866
786	XPUSHs (sv_2mortal (wcs2sv (wstr)));	867	XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
787		868
788	delete [] wstr;	869	delete [] wstr;
789	}	870	}
790		871
791	if (new_text)	872	if (new_text)
…		…
881	}	962	}
882	OUTPUT:	963	OUTPUT:
883	RETVAL	964	RETVAL
884		965
885	SV *	966	SV *
886	rxvt_term::special_encode (SV *str)	967	rxvt_term::special_encode (SV *string)
887	CODE:	968	CODE:
888	abort ();//TODO	969	{
		970	wchar_t *wstr = sv2wcs (string);
		971	int wlen = wcslen (wstr);
		972	wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
		973
		974	rxvt_push_locale (THIS->locale);
		975
		976	wchar_t *r = rstr;
		977	for (wchar_t s = wstr; s; s++)
		978	if (wcwidth (*s) == 0)
		979	{
		980	if (r == rstr)
		981	croak ("leading combining character unencodable");
		982
		983	unicode_t n = rxvt_compose (r[-1], *s);
		984	if (n == NOCHAR)
		985	n = rxvt_composite.compose (r[-1], *s);
		986
		987	r[-1] = n;
		988	}
		989	#if !UNICODE_3
		990	else if (*s >= 0x10000)
		991	r++ = rxvt_composite.compose (s);
		992	#endif
		993	else
		994	r++ = s;
		995
		996	rxvt_pop_locale ();
		997
		998	RETVAL = wcs2sv (rstr, r - rstr);
		999
		1000	delete [] rstr;
		1001	}
		1002	OUTPUT:
		1003	RETVAL
889		1004
890	SV *	1005	SV *
891	rxvt_term::special_decode (SV *str)	1006	rxvt_term::special_decode (SV *text)
892	CODE:	1007	CODE:
893	abort ();//TODO	1008	{
		1009	wchar_t *wstr = sv2wcs (text);
		1010	int wlen = wcslen (wstr);
		1011	int dlen = 0;
		1012
		1013	// find length
		1014	for (wchar_t s = wstr; s; s++)
		1015	if (*s == NOCHAR)
		1016	;
		1017	else if (IS_COMPOSE (*s))
		1018	dlen += rxvt_composite.expand (*s, 0);
		1019	else
		1020	dlen++;
		1021
		1022	wchar_t *rstr = new wchar_t [dlen];
		1023
		1024	// decode
		1025	wchar_t *r = rstr;
		1026	for (wchar_t s = wstr; s; s++)
		1027	if (*s == NOCHAR)
		1028	;
		1029	else if (IS_COMPOSE (*s))
		1030	r += rxvt_composite.expand (*s, r);
		1031	else
		1032	r++ = s;
		1033
		1034	RETVAL = wcs2sv (rstr, r - rstr);
		1035
		1036	delete [] rstr;
		1037	}
		1038	OUTPUT:
		1039	RETVAL
894		1040
895	void	1041	void
896	rxvt_term::_resource (char name, int index, SV newval = 0)	1042	rxvt_term::_resource (char name, int index, SV newval = 0)
897	PPCODE:	1043	PPCODE:
898	{	1044	{
…		…
986	void	1132	void
987	rxvt_term::scr_add_lines (SV *string)	1133	rxvt_term::scr_add_lines (SV *string)
988	CODE:	1134	CODE:
989	{	1135	{
990	wchar_t *wstr = sv2wcs (string);	1136	wchar_t *wstr = sv2wcs (string);
991	int wlen = wcslen (wstr);
992	unicode_t *ustr = new unicode_t [wlen];
993	int nlines = 0;
994
995	for (int i = wlen; i--; )
996	{
997	ustr [i] = wstr [i];
998	nlines += ustr [i] == '\012';
999	}
1000
1001	THIS->scr_add_lines (ustr, nlines, wlen);	1137	THIS->scr_add_lines (wstr, wcslen (wstr));
1002
1003	free (wstr);	1138	free (wstr);
1004	delete [] ustr;
1005	}	1139	}
1006		1140
1007	void	1141	void
1008	rxvt_term::tt_write (SV *octets)	1142	rxvt_term::tt_write (SV *octets)
1009	INIT:	1143	INIT:
…		…
1023	char *old_cmdbuf_endp = THIS->cmdbuf_endp;	1157	char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1024		1158
1025	THIS->cmdbuf_ptr = str;	1159	THIS->cmdbuf_ptr = str;
1026	THIS->cmdbuf_endp = str + len;	1160	THIS->cmdbuf_endp = str + len;
1027		1161
		1162	rxvt_push_locale (THIS->locale);
1028	THIS->cmd_parse ();	1163	THIS->cmd_parse ();
		1164	rxvt_pop_locale ();
1029		1165
1030	THIS->cmdbuf_ptr = old_cmdbuf_ptr;	1166	THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1031	THIS->cmdbuf_endp = old_cmdbuf_endp;	1167	THIS->cmdbuf_endp = old_cmdbuf_endp;
1032	}	1168	}
1033		1169

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.28 by root, Fri Jan 6 02:58:02 2006 UTC vs. Revision 1.35 by root, Sat Jan 7 04:19:43 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.28 by root, Fri Jan 6 02:58:02 2006 UTC vs.
Revision 1.35 by root, Sat Jan 7 04:19:43 2006 UTC