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.20 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.31 by root, Fri Jan 6 05:37:59 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.
… …
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_STRING_LEN:
475 {
476 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int);
478
479 XPUSHs (sv_2mortal (newSVpvn (str, len)));
480 }
481 break;
482
483 case DT_XEVENT:
484 {
485 XEvent *xe = va_arg (ap, XEvent *);
486 HV *hv = newHV ();
487
488# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
489# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
490# undef set
491
492 setiv (type, xe->type);
493 setiv (send_event, xe->xany.send_event);
494 setiv (serial, xe->xany.serial);
495
496 switch (xe->type)
497 {
498 case KeyPress:
499 case KeyRelease:
500 case ButtonPress:
501 case ButtonRelease:
502 case MotionNotify:
503 setiv (time, xe->xmotion.time);
504 setiv (x, xe->xmotion.x);
505 setiv (y, xe->xmotion.y);
506 setiv (row, xe->xmotion.y / term->fheight);
507 setiv (col, xe->xmotion.x / term->fwidth);
508 setiv (x_root, xe->xmotion.x_root);
509 setiv (y_root, xe->xmotion.y_root);
510 setiv (state, xe->xmotion.state);
511 break;
512 }
513
514 switch (xe->type)
515 {
516 case KeyPress:
517 case KeyRelease:
518 setiv (keycode, xe->xkey.keycode);
519 break;
520
521 case ButtonPress:
522 case ButtonRelease:
523 setiv (button, xe->xbutton.button);
524 break;
525
526 case MotionNotify:
527 setiv (is_hint, xe->xmotion.is_hint);
528 break;
529 }
530
531 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
532 }
533 break;
534
535 case DT_USTRING_LEN:
536 {
537 unicode_t *ustr = va_arg (ap, unicode_t *);
538 int ulen = va_arg (ap, int);
539 wchar_t *wstr = new wchar_t [ulen];
540
541 for (int i = ulen; i--; )
542 wstr [i] = ustr [i];
543
544 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
545
546 delete [] wstr;
547 }
548
462 case DT_END: 549 case DT_END:
463 { 550 {
464 va_end (ap); 551 va_end (ap);
465 552
466 PUTBACK; 553 PUTBACK;
… …
501 588
502PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
503 590
504BOOT: 591BOOT:
505{ 592{
506# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))
507# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name)); 593# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
508 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 594 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
509 set_hookname (INIT); 595# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
510 set_hookname (RESET); 596# include "hookinc.h"
511 set_hookname (START); 597# undef def
512 set_hookname (DESTROY);
513 set_hookname (SEL_BEGIN);
514 set_hookname (SEL_EXTEND);
515 set_hookname (SEL_MAKE);
516 set_hookname (SEL_GRAB);
517 set_hookname (FOCUS_IN);
518 set_hookname (FOCUS_OUT);
519 set_hookname (VIEW_CHANGE);
520 set_hookname (SCROLL_BACK);
521 set_hookname (TTY_ACTIVITY);
522 set_hookname (OSC_SEQ);
523 set_hookname (REFRESH_BEGIN);
524 set_hookname (REFRESH_END);
525 set_hookname (KEYBOARD_COMMAND);
526 598
527 export_const (DEFAULT_RSTYLE); 599 export_const (DEFAULT_RSTYLE);
528 export_const (OVERLAY_RSTYLE); 600 export_const (OVERLAY_RSTYLE);
529 export_const (RS_Bold); 601 export_const (RS_Bold);
530 export_const (RS_Italic); 602 export_const (RS_Italic);
… …
533 export_const (RS_Uline); 605 export_const (RS_Uline);
534 606
535 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 607 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
536} 608}
537 609
610SV *
611new (...)
612 CODE:
613{
614 stringvec *argv = new stringvec;
615 bool success;
616
617 for (int i = 0; i < items ;i++)
618 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
619
620 rxvt_term *term = new rxvt_term;
621
622 term->argv = argv;
623
624 try
625 {
626 if (!term->init (argv->size (), argv->begin ()))
627 term = 0;
628 }
629 catch (const class rxvt_failure_exception &e)
630 {
631 term->destroy ();
632 croak ("exception caught while initializing new terminal instance");
633 }
634
635 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
636}
637 OUTPUT:
638 RETVAL
639
538void 640void
539set_should_invoke (int htype, int value) 641set_should_invoke (int htype, int value)
540 CODE: 642 CODE:
541 rxvt_perl.should_invoke [htype] = value; 643 rxvt_perl.should_invoke [htype] = value;
542 644
… …
604} 706}
605 OUTPUT: 707 OUTPUT:
606 RETVAL 708 RETVAL
607 709
608MODULE = urxvt PACKAGE = urxvt::term 710MODULE = urxvt PACKAGE = urxvt::term
711
712void
713rxvt_term::destroy ()
609 714
610int 715int
611rxvt_term::strwidth (SV *str) 716rxvt_term::strwidth (SV *str)
612 CODE: 717 CODE:
613{ 718{
… …
649 754
650 rxvt_push_locale (THIS->locale); 755 rxvt_push_locale (THIS->locale);
651 wchar_t *wstr = rxvt_mbstowcs (data, len); 756 wchar_t *wstr = rxvt_mbstowcs (data, len);
652 rxvt_pop_locale (); 757 rxvt_pop_locale ();
653 758
654 char *str = rxvt_wcstoutf8 (wstr); 759 RETVAL = wcs2sv (wstr);
655 free (wstr); 760 free (wstr);
656
657 RETVAL = newSVpv (str, 0);
658 SvUTF8_on (RETVAL);
659 free (str);
660} 761}
661 OUTPUT: 762 OUTPUT:
662 RETVAL 763 RETVAL
663 764
765# very portable, especially on objects as opposed to pods
766#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
767
768#define TERM_OFFSET_width TERM_OFFSET(width)
769#define TERM_OFFSET_height TERM_OFFSET(height)
770#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
771#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
772#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
773#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
774#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
775#define TERM_OFFSET_focus TERM_OFFSET(focus)
776#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
777#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
778#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
779#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
780
664int 781int
782rxvt_term::width ()
783 ALIAS:
784 width = TERM_OFFSET_width
785 height = TERM_OFFSET_height
786 fwidth = TERM_OFFSET_fwidth
787 fheight = TERM_OFFSET_fheight
788 fbase = TERM_OFFSET_fbase
789 nrow = TERM_OFFSET_nrow
790 ncol = TERM_OFFSET_ncol
791 focus = TERM_OFFSET_focus
792 mapped = TERM_OFFSET_mapped
793 saveLines = TERM_OFFSET_saveLines
794 total_rows = TERM_OFFSET_total_rows
795 nsaved = TERM_OFFSET_nsaved
796 CODE:
797 RETVAL = *(int *)((char *)THIS + ix);
798 OUTPUT:
799 RETVAL
800
801U32
802rxvt_term::parent ()
803 CODE:
804 RETVAL = (U32)THIS->parent [0];
805 OUTPUT:
806 RETVAL
807
808U32
665rxvt_term::nsaved () 809rxvt_term::vt ()
666 CODE: 810 CODE:
811 RETVAL = (U32)THIS->vt;
812 OUTPUT:
813 RETVAL
814
815U32
816rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
817 CODE:
818{
667 RETVAL = THIS->nsaved; 819 RETVAL = THIS->rstyle;
820 THIS->rstyle = new_rstyle;
821}
668 OUTPUT: 822 OUTPUT:
669 RETVAL 823 RETVAL
670 824
671int 825int
672rxvt_term::view_start (int newval = -1) 826rxvt_term::view_start (int newval = -1)
673 CODE: 827 CODE:
674{ 828{
… …
681 } 835 }
682} 836}
683 OUTPUT: 837 OUTPUT:
684 RETVAL 838 RETVAL
685 839
686int
687rxvt_term::nrow ()
688 CODE:
689 RETVAL = THIS->nrow;
690 OUTPUT:
691 RETVAL
692
693int
694rxvt_term::ncol ()
695 CODE:
696 RETVAL = THIS->ncol;
697 OUTPUT:
698 RETVAL
699
700void 840void
701rxvt_term::want_refresh () 841rxvt_term::want_refresh ()
702 CODE: 842 CODE:
703 THIS->want_refresh = 1; 843 THIS->want_refresh = 1;
704 844
705void 845void
706rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 846rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
707 PPCODE: 847 PPCODE:
708{ 848{
709 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 849 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
710 XSRETURN_EMPTY; 850 XSRETURN_EMPTY;
711 851
… …
716 wchar_t *wstr = new wchar_t [THIS->ncol]; 856 wchar_t *wstr = new wchar_t [THIS->ncol];
717 857
718 for (int col = 0; col <THIS->ncol; col++) 858 for (int col = 0; col <THIS->ncol; col++)
719 wstr [col] = l.t [col]; 859 wstr [col] = l.t [col];
720 860
721 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
722 free (wstr);
723
724 SV *sv = newSVpv (str, 0);
725 SvUTF8_on (sv);
726 XPUSHs (sv_2mortal (sv)); 861 XPUSHs (sv_2mortal (wcs2sv (wstr)));
727 free (str); 862
863 delete [] wstr;
728 } 864 }
729 865
730 if (new_text) 866 if (new_text)
731 { 867 {
732 wchar_t *wstr = sv2wcs (new_text); 868 wchar_t *wstr = sv2wcs (new_text);
733 869
734 int len = wcslen (wstr); 870 int len = min (wcslen (wstr) - start_ofs, max_len);
735 871
736 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 872 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
737 { 873 {
738 free (wstr); 874 free (wstr);
739 croak ("new_text extends beyond horizontal margins"); 875 croak ("new_text extends beyond horizontal margins");
740 } 876 }
741 877
742 for (int col = start_col; col < start_col + len; col++) 878 for (int col = start_col; col < start_col + len; col++)
743 { 879 {
744 l.t [col] = wstr [col - start_col]; 880 l.t [col] = wstr [start_ofs + col - start_col];
745 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 881 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
746 } 882 }
747 883
748 free (wstr); 884 free (wstr);
749 } 885 }
750} 886}
751 887
752void 888void
753rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 889rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
754 PPCODE: 890 PPCODE:
755{ 891{
756 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 892 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
757 XSRETURN_EMPTY; 893 XSRETURN_EMPTY;
758 894
… …
773 { 909 {
774 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 910 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
775 croak ("new_rend must be arrayref"); 911 croak ("new_rend must be arrayref");
776 912
777 AV *av = (AV *)SvRV (new_rend); 913 AV *av = (AV *)SvRV (new_rend);
778 int len = av_len (av) + 1; 914 int len = min (av_len (av) + 1 - start_ofs, max_len);
779 915
780 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 916 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
781 croak ("new_rend array extends beyond horizontal margins"); 917 croak ("new_rend array extends beyond horizontal margins");
782 918
783 for (int col = start_col; col < start_col + len; col++) 919 for (int col = start_col; col < start_col + len; col++)
784 { 920 {
785 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 921 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
786 922
787 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 923 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
788 } 924 }
789 } 925 }
790} 926}
791 927
792int 928int
793rxvt_term::ROW_l (int row_number, int new_length = -2) 929rxvt_term::ROW_l (int row_number, int new_length = -1)
794 CODE: 930 CODE:
795{ 931{
796 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 932 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
797 XSRETURN_EMPTY; 933 XSRETURN_EMPTY;
798 934
799 line_t &l = ROW(row_number); 935 line_t &l = ROW(row_number);
800 RETVAL = l.l < 0 ? THIS->ncol : l.l; 936 RETVAL = l.l;
801 937
802 if (new_length >= -1) 938 if (new_length >= 0)
803 l.l = new_length; 939 l.l = new_length;
804} 940}
805 OUTPUT: 941 OUTPUT:
806 RETVAL 942 RETVAL
807 943
808bool 944bool
809rxvt_term::ROW_is_longer (int row_number) 945rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
810 CODE: 946 CODE:
811{ 947{
812 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 948 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
813 XSRETURN_EMPTY; 949 XSRETURN_EMPTY;
814 950
815 line_t &l = ROW(row_number); 951 line_t &l = ROW(row_number);
816 RETVAL = l.l < 0; 952 RETVAL = l.is_longer ();
953
954 if (new_is_longer >= 0)
955 l.is_longer (new_is_longer);
817} 956}
818 OUTPUT: 957 OUTPUT:
819 RETVAL 958 RETVAL
820 959
821SV * 960SV *
… …
831void 970void
832rxvt_term::_resource (char *name, int index, SV *newval = 0) 971rxvt_term::_resource (char *name, int index, SV *newval = 0)
833 PPCODE: 972 PPCODE:
834{ 973{
835 struct resval { const char *name; int value; } rslist [] = { 974 struct resval { const char *name; int value; } rslist [] = {
836# define Rs_def(name) { # name, Rs_ ## name }, 975# define def(name) { # name, Rs_ ## name },
837# define Rs_reserve(name,count) 976# define reserve(name,count)
838# include "rsinc.h" 977# include "rsinc.h"
839# undef Rs_def 978# undef def
840# undef Rs_reserve 979# undef reserve
841 }; 980 };
842 981
843 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 982 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
844 983
845 do { 984 do {
… …
867 THIS->rs [index] = 0; 1006 THIS->rs [index] = 0;
868 } 1007 }
869} 1008}
870 1009
871void 1010void
872rxvt_term::selection_mark (...) 1011rxvt_term::cur (...)
873 PROTOTYPE: $;$$ 1012 PROTOTYPE: $;$$
874 ALIAS: 1013 ALIAS:
1014 screen_cur = 0
875 selection_beg = 1 1015 selection_beg = 1
876 selection_end = 2 1016 selection_end = 2
1017 selection_mark = 3
877 PPCODE: 1018 PPCODE:
878{ 1019{
879 row_col_t &sel = ix == 1 ? THIS->selection.beg 1020 row_col_t &rc = ix == 0 ? THIS->screen.cur
1021 : ix == 1 ? THIS->selection.beg
880 : ix == 2 ? THIS->selection.end 1022 : ix == 2 ? THIS->selection.end
881 : THIS->selection.mark; 1023 : THIS->selection.mark;
882 1024
883 if (GIMME_V != G_VOID) 1025 if (GIMME_V != G_VOID)
884 { 1026 {
885 EXTEND (SP, 2); 1027 EXTEND (SP, 2);
886 PUSHs (sv_2mortal (newSViv (sel.row))); 1028 PUSHs (sv_2mortal (newSViv (rc.row)));
887 PUSHs (sv_2mortal (newSViv (sel.col))); 1029 PUSHs (sv_2mortal (newSViv (rc.col)));
888 } 1030 }
889 1031
890 if (items == 3) 1032 if (items == 3)
891 { 1033 {
892 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1034 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
893 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1035 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
894 1036
895 if (ix) 1037 if (ix)
896 THIS->want_refresh = 1; 1038 THIS->want_refresh = 1;
897 } 1039 }
898} 1040}
… …
903void 1045void
904rxvt_term::selection (SV *newtext = 0) 1046rxvt_term::selection (SV *newtext = 0)
905 PPCODE: 1047 PPCODE:
906{ 1048{
907 if (GIMME_V != G_VOID) 1049 if (GIMME_V != G_VOID)
908 { 1050 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
909 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
910 SV *sv = newSVpv (sel, 0);
911 SvUTF8_on (sv);
912 free (sel);
913 XPUSHs (sv_2mortal (sv));
914 }
915 1051
916 if (newtext) 1052 if (newtext)
917 { 1053 {
918 free (THIS->selection.text); 1054 free (THIS->selection.text);
919 1055
920 THIS->selection.text = sv2wcs (newtext); 1056 THIS->selection.text = sv2wcs (newtext);
921 THIS->selection.len = wcslen (THIS->selection.text); 1057 THIS->selection.len = wcslen (THIS->selection.text);
922 } 1058 }
923} 1059}
1060
1061void
1062rxvt_term::scr_add_lines (SV *string)
1063 CODE:
1064{
1065 wchar_t *wstr = sv2wcs (string);
1066 int wlen = wcslen (wstr);
1067 unicode_t *ustr = new unicode_t [wlen];
1068 int nlines = 0;
1069
1070 for (int i = wlen; i--; )
924 1071 {
1072 ustr [i] = wstr [i];
1073 nlines += ustr [i] == '\012';
1074 }
1075
1076 THIS->scr_add_lines (ustr, nlines, wlen);
1077
1078 free (wstr);
1079 delete [] ustr;
1080}
1081
925void 1082void
926rxvt_term::tt_write (SV *octets) 1083rxvt_term::tt_write (SV *octets)
927 INIT: 1084 INIT:
928 STRLEN len; 1085 STRLEN len;
929 char *str = SvPVbyte (octets, len); 1086 char *str = SvPVbyte (octets, len);
930 C_ARGS: 1087 C_ARGS:
931 (unsigned char *)str, len 1088 str, len
1089
1090void
1091rxvt_term::cmd_parse (SV *octets)
1092 CODE:
1093{
1094 STRLEN len;
1095 char *str = SvPVbyte (octets, len);
1096
1097 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1098 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1099
1100 THIS->cmdbuf_ptr = str;
1101 THIS->cmdbuf_endp = str + len;
1102
1103 THIS->cmd_parse ();
1104
1105 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1106 THIS->cmdbuf_endp = old_cmdbuf_endp;
1107}
932 1108
933SV * 1109SV *
934rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1110rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
935 CODE: 1111 CODE:
936{ 1112{

Diff Legend

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