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

Diff Legend

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