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.22 by root, Wed Jan 4 03:16:15 2006 UTC vs.
Revision 1.25 by root, Thu Jan 5 01:04:10 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
55static SV * 55static SV *
56wcs2sv (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
67static SV *
56new_ref (HV *hv, const char *klass) 68new_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)
… …
400bool 412bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 413rxvt_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_USTRING_LEN:
475 {
476 unicode_t *ustr = va_arg (ap, unicode_t *);
477 int ulen = va_arg (ap, int);
478 wchar_t *wstr = new wchar_t [ulen];
479
480 for (int i = ulen; i--; )
481 wstr [i] = ustr [i];
482
483 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
484
485 delete [] wstr;
486 }
487
462 case DT_END: 488 case DT_END:
463 { 489 {
464 va_end (ap); 490 va_end (ap);
465 491
466 PUTBACK; 492 PUTBACK;
… …
634 660
635 rxvt_push_locale (THIS->locale); 661 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 662 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 663 rxvt_pop_locale ();
638 664
639 char *str = rxvt_wcstoutf8 (wstr); 665 RETVAL = wcs2sv (wstr);
640 free (wstr); 666 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 667}
646 OUTPUT: 668 OUTPUT:
647 RETVAL 669 RETVAL
648 670
671# very portable, especially on objects as opposed to pods
672#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
673
674#define TERM_OFFSET_width TERM_OFFSET(width)
675#define TERM_OFFSET_height TERM_OFFSET(height)
676#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
677#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
678#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
679#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
680#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
681#define TERM_OFFSET_focus TERM_OFFSET(focus)
682#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
683#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
684#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
685#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
686
649int 687int
650rxvt_term::nsaved () 688rxvt_term::width ()
689 ALIAS:
690 width = TERM_OFFSET_width
691 height = TERM_OFFSET_height
692 fwidth = TERM_OFFSET_fwidth
693 fheight = TERM_OFFSET_fheight
694 fbase = TERM_OFFSET_fbase
695 nrow = TERM_OFFSET_nrow
696 ncol = TERM_OFFSET_ncol
697 focus = TERM_OFFSET_focus
698 mapped = TERM_OFFSET_mapped
699 saveLines = TERM_OFFSET_saveLines
700 total_rows = TERM_OFFSET_total_rows
701 nsaved = TERM_OFFSET_nsaved
651 CODE: 702 CODE:
703 RETVAL = *(int *)((char *)THIS + ix);
704 OUTPUT:
705 RETVAL
706
707U32
708rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
709 CODE:
710{
652 RETVAL = THIS->nsaved; 711 RETVAL = THIS->rstyle;
712 THIS->rstyle = new_rstyle;
713}
653 OUTPUT: 714 OUTPUT:
654 RETVAL 715 RETVAL
655 716
656int 717int
657rxvt_term::view_start (int newval = -1) 718rxvt_term::view_start (int newval = -1)
658 CODE: 719 CODE:
659{ 720{
… …
666 } 727 }
667} 728}
668 OUTPUT: 729 OUTPUT:
669 RETVAL 730 RETVAL
670 731
671int
672rxvt_term::nrow ()
673 CODE:
674 RETVAL = THIS->nrow;
675 OUTPUT:
676 RETVAL
677
678int
679rxvt_term::ncol ()
680 CODE:
681 RETVAL = THIS->ncol;
682 OUTPUT:
683 RETVAL
684
685void 732void
686rxvt_term::want_refresh () 733rxvt_term::want_refresh ()
687 CODE: 734 CODE:
688 THIS->want_refresh = 1; 735 THIS->want_refresh = 1;
689 736
… …
701 wchar_t *wstr = new wchar_t [THIS->ncol]; 748 wchar_t *wstr = new wchar_t [THIS->ncol];
702 749
703 for (int col = 0; col <THIS->ncol; col++) 750 for (int col = 0; col <THIS->ncol; col++)
704 wstr [col] = l.t [col]; 751 wstr [col] = l.t [col];
705 752
706 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
707 free (wstr);
708
709 SV *sv = newSVpv (str, 0);
710 SvUTF8_on (sv);
711 XPUSHs (sv_2mortal (sv)); 753 XPUSHs (sv_2mortal (wcs2sv (wstr)));
712 free (str); 754
755 delete [] wstr;
713 } 756 }
714 757
715 if (new_text) 758 if (new_text)
716 { 759 {
717 wchar_t *wstr = sv2wcs (new_text); 760 wchar_t *wstr = sv2wcs (new_text);
… …
852 THIS->rs [index] = 0; 895 THIS->rs [index] = 0;
853 } 896 }
854} 897}
855 898
856void 899void
857rxvt_term::selection_mark (...) 900rxvt_term::cur (...)
858 PROTOTYPE: $;$$ 901 PROTOTYPE: $;$$
859 ALIAS: 902 ALIAS:
903 screen_cur = 0
860 selection_beg = 1 904 selection_beg = 1
861 selection_end = 2 905 selection_end = 2
906 selection_mark = 3
862 PPCODE: 907 PPCODE:
863{ 908{
864 row_col_t &sel = ix == 1 ? THIS->selection.beg 909 row_col_t &rc = ix == 0 ? THIS->screen.cur
910 : ix == 1 ? THIS->selection.beg
865 : ix == 2 ? THIS->selection.end 911 : ix == 2 ? THIS->selection.end
866 : THIS->selection.mark; 912 : THIS->selection.mark;
867 913
868 if (GIMME_V != G_VOID) 914 if (GIMME_V != G_VOID)
869 { 915 {
870 EXTEND (SP, 2); 916 EXTEND (SP, 2);
871 PUSHs (sv_2mortal (newSViv (sel.row))); 917 PUSHs (sv_2mortal (newSViv (rc.row)));
872 PUSHs (sv_2mortal (newSViv (sel.col))); 918 PUSHs (sv_2mortal (newSViv (rc.col)));
873 } 919 }
874 920
875 if (items == 3) 921 if (items == 3)
876 { 922 {
877 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 923 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
878 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 924 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
879 925
880 if (ix) 926 if (ix)
881 THIS->want_refresh = 1; 927 THIS->want_refresh = 1;
882 } 928 }
883} 929}
… …
888void 934void
889rxvt_term::selection (SV *newtext = 0) 935rxvt_term::selection (SV *newtext = 0)
890 PPCODE: 936 PPCODE:
891{ 937{
892 if (GIMME_V != G_VOID) 938 if (GIMME_V != G_VOID)
893 { 939 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
894 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
895 SV *sv = newSVpv (sel, 0);
896 SvUTF8_on (sv);
897 free (sel);
898 XPUSHs (sv_2mortal (sv));
899 }
900 940
901 if (newtext) 941 if (newtext)
902 { 942 {
903 free (THIS->selection.text); 943 free (THIS->selection.text);
904 944
905 THIS->selection.text = sv2wcs (newtext); 945 THIS->selection.text = sv2wcs (newtext);
906 THIS->selection.len = wcslen (THIS->selection.text); 946 THIS->selection.len = wcslen (THIS->selection.text);
907 } 947 }
908} 948}
949
950void
951rxvt_term::scr_add_lines (SV *string)
952 CODE:
953{
954 wchar_t *wstr = sv2wcs (string);
955 int wlen = wcslen (wstr);
956 unicode_t *ustr = new unicode_t [wlen];
957 int nlines = 0;
958
959 for (int i = wlen; i--; )
909 960 {
961 ustr [i] = wstr [i];
962 nlines += ustr [i] == '\012';
963 }
964
965 THIS->scr_add_lines (ustr, nlines, wlen);
966
967 free (wstr);
968 delete [] ustr;
969}
970
910void 971void
911rxvt_term::tt_write (SV *octets) 972rxvt_term::tt_write (SV *octets)
912 INIT: 973 INIT:
913 STRLEN len; 974 STRLEN len;
914 char *str = SvPVbyte (octets, len); 975 char *str = SvPVbyte (octets, len);
915 C_ARGS: 976 C_ARGS:
916 (unsigned char *)str, len 977 str, len
917 978
918SV * 979SV *
919rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 980rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
920 CODE: 981 CODE:
921{ 982{

Diff Legend

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