ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtperl.xs
(Generate patch)

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.32 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.33 by root, Fri Jan 6 20:50:58 2006 UTC

847 847
848 if (GIMME_V != G_VOID) 848 if (GIMME_V != G_VOID)
849 { 849 {
850 wchar_t *wstr = new wchar_t [THIS->ncol]; 850 wchar_t *wstr = new wchar_t [THIS->ncol];
851 851
852 for (int col = 0; col <THIS->ncol; col++) 852 for (int col = 0; col < THIS->ncol; col++)
853 wstr [col] = l.t [col]; 853 wstr [col] = l.t [col];
854 854
855 XPUSHs (sv_2mortal (wcs2sv (wstr))); 855 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
856 856
857 delete [] wstr; 857 delete [] wstr;
858 } 858 }
859 859
860 if (new_text) 860 if (new_text)
950} 950}
951 OUTPUT: 951 OUTPUT:
952 RETVAL 952 RETVAL
953 953
954SV * 954SV *
955rxvt_term::special_encode (SV *str) 955rxvt_term::special_encode (SV *string)
956 CODE: 956 CODE:
957 abort ();//TODO 957{
958 wchar_t *wstr = sv2wcs (string);
959 int wlen = wcslen (wstr);
960 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
961
962 rxvt_push_locale (THIS->locale);
963
964 wchar_t *r = rstr;
965 for (wchar_t *s = wstr; *s; s++)
966 if (wcwidth (*s) == 0)
967 {
968 if (r == rstr)
969 croak ("leading combining character unencodable");
970
971 unicode_t n = rxvt_compose (r[-1], *s);
972 if (n == NOCHAR)
973 n = rxvt_composite.compose (r[-1], *s);
974
975 r[-1] = n;
976 }
977#if !UNICODE_3
978 else if (*s >= 0x10000)
979 *r++ = rxvt_composite.compose (*s);
980#endif
981 else
982 *r++ = *s;
983
984 rxvt_pop_locale ();
985
986 RETVAL = wcs2sv (rstr, r - rstr);
987
988 delete [] rstr;
989}
990 OUTPUT:
991 RETVAL
958 992
959SV * 993SV *
960rxvt_term::special_decode (SV *str) 994rxvt_term::special_decode (SV *text)
961 CODE: 995 CODE:
962 abort ();//TODO 996{
997 wchar_t *wstr = sv2wcs (text);
998 int wlen = wcslen (wstr);
999 int dlen = 0;
1000
1001 // find length
1002 for (wchar_t *s = wstr; *s; s++)
1003 if (*s == NOCHAR)
1004 ;
1005 else if (IS_COMPOSE (*s))
1006 dlen += rxvt_composite.expand (*s, 0);
1007 else
1008 dlen++;
1009
1010 wchar_t *rstr = new wchar_t [dlen];
1011
1012 // decode
1013 wchar_t *r = rstr;
1014 for (wchar_t *s = wstr; *s; s++)
1015 if (*s == NOCHAR)
1016 ;
1017 else if (IS_COMPOSE (*s))
1018 r += rxvt_composite.expand (*s, r);
1019 else
1020 *r++ = *s;
1021
1022 RETVAL = wcs2sv (rstr, r - rstr);
1023
1024 delete [] rstr;
1025}
1026 OUTPUT:
1027 RETVAL
963 1028
964void 1029void
965rxvt_term::_resource (char *name, int index, SV *newval = 0) 1030rxvt_term::_resource (char *name, int index, SV *newval = 0)
966 PPCODE: 1031 PPCODE:
967{ 1032{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines