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.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.
… …
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 break;
491
492 case DT_XEVENT:
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 }
460 break; 542 break;
461 543
462 case DT_END: 544 case DT_END:
463 { 545 {
464 va_end (ap); 546 va_end (ap);
… …
501 583
502PROTOTYPES: ENABLE 584PROTOTYPES: ENABLE
503 585
504BOOT: 586BOOT:
505{ 587{
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)); 588# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
508 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 589 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
509 set_hookname (INIT); 590# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
510 set_hookname (RESET); 591# include "hookinc.h"
511 set_hookname (START); 592# 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 593
527 export_const (DEFAULT_RSTYLE); 594 export_const (DEFAULT_RSTYLE);
528 export_const (OVERLAY_RSTYLE); 595 export_const (OVERLAY_RSTYLE);
529 export_const (RS_Bold); 596 export_const (RS_Bold);
530 export_const (RS_Italic); 597 export_const (RS_Italic);
… …
533 export_const (RS_Uline); 600 export_const (RS_Uline);
534 601
535 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 602 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
536} 603}
537 604
605SV *
606new (...)
607 CODE:
608{
609 stringvec *argv = new stringvec;
610 bool success;
611
612 for (int i = 0; i < items ;i++)
613 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
614
615 rxvt_term *term = new rxvt_term;
616
617 term->argv = argv;
618
619 try
620 {
621 if (!term->init (argv->size (), argv->begin ()))
622 term = 0;
623 }
624 catch (const class rxvt_failure_exception &e)
625 {
626 term->destroy ();
627 croak ("exception caught while initializing new terminal instance");
628 }
629
630 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
631}
632 OUTPUT:
633 RETVAL
634
538void 635void
539set_should_invoke (int htype, int value) 636set_should_invoke (int htype, int value)
540 CODE: 637 CODE:
541 rxvt_perl.should_invoke [htype] = value; 638 rxvt_perl.should_invoke [htype] = value;
542 639
… …
604} 701}
605 OUTPUT: 702 OUTPUT:
606 RETVAL 703 RETVAL
607 704
608MODULE = urxvt PACKAGE = urxvt::term 705MODULE = urxvt PACKAGE = urxvt::term
706
707void
708rxvt_term::destroy ()
709
710void
711rxvt_term::grab (int eventtime)
712 CODE:
713{
714return;
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}
609 720
610int 721int
611rxvt_term::strwidth (SV *str) 722rxvt_term::strwidth (SV *str)
612 CODE: 723 CODE:
613{ 724{
… …
649 760
650 rxvt_push_locale (THIS->locale); 761 rxvt_push_locale (THIS->locale);
651 wchar_t *wstr = rxvt_mbstowcs (data, len); 762 wchar_t *wstr = rxvt_mbstowcs (data, len);
652 rxvt_pop_locale (); 763 rxvt_pop_locale ();
653 764
654 char *str = rxvt_wcstoutf8 (wstr); 765 RETVAL = wcs2sv (wstr);
655 free (wstr); 766 free (wstr);
656
657 RETVAL = newSVpv (str, 0);
658 SvUTF8_on (RETVAL);
659 free (str);
660} 767}
661 OUTPUT: 768 OUTPUT:
662 RETVAL 769 RETVAL
663 770
771# very portable, especially on objects as opposed to pods
772#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
773
774#define TERM_OFFSET_width TERM_OFFSET(width)
775#define TERM_OFFSET_height TERM_OFFSET(height)
776#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
777#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
778#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
779#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
780#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
781#define TERM_OFFSET_focus TERM_OFFSET(focus)
782#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
783#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
784#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
785#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
786
664int 787int
788rxvt_term::width ()
789 ALIAS:
790 width = TERM_OFFSET_width
791 height = TERM_OFFSET_height
792 fwidth = TERM_OFFSET_fwidth
793 fheight = TERM_OFFSET_fheight
794 fbase = TERM_OFFSET_fbase
795 nrow = TERM_OFFSET_nrow
796 ncol = TERM_OFFSET_ncol
797 focus = TERM_OFFSET_focus
798 mapped = TERM_OFFSET_mapped
799 saveLines = TERM_OFFSET_saveLines
800 total_rows = TERM_OFFSET_total_rows
801 nsaved = TERM_OFFSET_nsaved
802 CODE:
803 RETVAL = *(int *)((char *)THIS + ix);
804 OUTPUT:
805 RETVAL
806
807U32
808rxvt_term::parent ()
809 CODE:
810 RETVAL = (U32)THIS->parent [0];
811 OUTPUT:
812 RETVAL
813
814U32
665rxvt_term::nsaved () 815rxvt_term::vt ()
666 CODE: 816 CODE:
817 RETVAL = (U32)THIS->vt;
818 OUTPUT:
819 RETVAL
820
821U32
822rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
823 CODE:
824{
667 RETVAL = THIS->nsaved; 825 RETVAL = THIS->rstyle;
826 THIS->rstyle = new_rstyle;
827}
668 OUTPUT: 828 OUTPUT:
669 RETVAL 829 RETVAL
670 830
671int 831int
672rxvt_term::view_start (int newval = -1) 832rxvt_term::view_start (int newval = -1)
673 CODE: 833 CODE:
674{ 834{
… …
681 } 841 }
682} 842}
683 OUTPUT: 843 OUTPUT:
684 RETVAL 844 RETVAL
685 845
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 846void
701rxvt_term::want_refresh () 847rxvt_term::want_refresh ()
702 CODE: 848 CODE:
703 THIS->want_refresh = 1; 849 THIS->want_refresh = 1;
704 850
705void 851void
706rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 852rxvt_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: 853 PPCODE:
708{ 854{
709 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 855 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
710 XSRETURN_EMPTY; 856 XSRETURN_EMPTY;
711 857
… …
713 859
714 if (GIMME_V != G_VOID) 860 if (GIMME_V != G_VOID)
715 { 861 {
716 wchar_t *wstr = new wchar_t [THIS->ncol]; 862 wchar_t *wstr = new wchar_t [THIS->ncol];
717 863
718 for (int col = 0; col <THIS->ncol; col++) 864 for (int col = 0; col < THIS->ncol; col++)
719 wstr [col] = l.t [col]; 865 wstr [col] = l.t [col];
720 866
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)); 867 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
727 free (str); 868
869 delete [] wstr;
728 } 870 }
729 871
730 if (new_text) 872 if (new_text)
731 { 873 {
732 wchar_t *wstr = sv2wcs (new_text); 874 wchar_t *wstr = sv2wcs (new_text);
733 875
734 int len = wcslen (wstr); 876 int len = min (wcslen (wstr) - start_ofs, max_len);
735 877
736 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 878 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
737 { 879 {
738 free (wstr); 880 free (wstr);
739 croak ("new_text extends beyond horizontal margins"); 881 croak ("new_text extends beyond horizontal margins");
740 } 882 }
741 883
742 for (int col = start_col; col < start_col + len; col++) 884 for (int col = start_col; col < start_col + len; col++)
743 { 885 {
744 l.t [col] = wstr [col - start_col]; 886 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])); 887 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
746 } 888 }
747 889
748 free (wstr); 890 free (wstr);
749 } 891 }
750} 892}
751 893
752void 894void
753rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 895rxvt_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: 896 PPCODE:
755{ 897{
756 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 898 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
757 XSRETURN_EMPTY; 899 XSRETURN_EMPTY;
758 900
… …
773 { 915 {
774 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 916 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
775 croak ("new_rend must be arrayref"); 917 croak ("new_rend must be arrayref");
776 918
777 AV *av = (AV *)SvRV (new_rend); 919 AV *av = (AV *)SvRV (new_rend);
778 int len = av_len (av) + 1; 920 int len = min (av_len (av) + 1 - start_ofs, max_len);
779 921
780 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 922 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
781 croak ("new_rend array extends beyond horizontal margins"); 923 croak ("new_rend array extends beyond horizontal margins");
782 924
783 for (int col = start_col; col < start_col + len; col++) 925 for (int col = start_col; col < start_col + len; col++)
784 { 926 {
785 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 927 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
786 928
787 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 929 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
788 } 930 }
789 } 931 }
790} 932}
791 933
792int 934int
793rxvt_term::ROW_l (int row_number, int new_length = -2) 935rxvt_term::ROW_l (int row_number, int new_length = -1)
794 CODE: 936 CODE:
795{ 937{
796 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 938 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
797 XSRETURN_EMPTY; 939 XSRETURN_EMPTY;
798 940
799 line_t &l = ROW(row_number); 941 line_t &l = ROW(row_number);
800 RETVAL = l.l < 0 ? THIS->ncol : l.l; 942 RETVAL = l.l;
801 943
802 if (new_length >= -1) 944 if (new_length >= 0)
803 l.l = new_length; 945 l.l = new_length;
804} 946}
805 OUTPUT: 947 OUTPUT:
806 RETVAL 948 RETVAL
807 949
808bool 950bool
809rxvt_term::ROW_is_longer (int row_number) 951rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
810 CODE: 952 CODE:
811{ 953{
812 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 954 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
813 XSRETURN_EMPTY; 955 XSRETURN_EMPTY;
814 956
815 line_t &l = ROW(row_number); 957 line_t &l = ROW(row_number);
816 RETVAL = l.l < 0; 958 RETVAL = l.is_longer ();
959
960 if (new_is_longer >= 0)
961 l.is_longer (new_is_longer);
817} 962}
818 OUTPUT: 963 OUTPUT:
819 RETVAL 964 RETVAL
820 965
821SV * 966SV *
822rxvt_term::special_encode (SV *str) 967rxvt_term::special_encode (SV *string)
823 CODE: 968 CODE:
824 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
825 1004
826SV * 1005SV *
827rxvt_term::special_decode (SV *str) 1006rxvt_term::special_decode (SV *text)
828 CODE: 1007 CODE:
829 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
830 1040
831void 1041void
832rxvt_term::_resource (char *name, int index, SV *newval = 0) 1042rxvt_term::_resource (char *name, int index, SV *newval = 0)
833 PPCODE: 1043 PPCODE:
834{ 1044{
835 struct resval { const char *name; int value; } rslist [] = { 1045 struct resval { const char *name; int value; } rslist [] = {
836# define Rs_def(name) { # name, Rs_ ## name }, 1046# define def(name) { # name, Rs_ ## name },
837# define Rs_reserve(name,count) 1047# define reserve(name,count)
838# include "rsinc.h" 1048# include "rsinc.h"
839# undef Rs_def 1049# undef def
840# undef Rs_reserve 1050# undef reserve
841 }; 1051 };
842 1052
843 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1053 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
844 1054
845 do { 1055 do {
… …
867 THIS->rs [index] = 0; 1077 THIS->rs [index] = 0;
868 } 1078 }
869} 1079}
870 1080
871void 1081void
872rxvt_term::selection_mark (...) 1082rxvt_term::cur (...)
873 PROTOTYPE: $;$$ 1083 PROTOTYPE: $;$$
874 ALIAS: 1084 ALIAS:
1085 screen_cur = 0
875 selection_beg = 1 1086 selection_beg = 1
876 selection_end = 2 1087 selection_end = 2
1088 selection_mark = 3
877 PPCODE: 1089 PPCODE:
878{ 1090{
879 row_col_t &sel = ix == 1 ? THIS->selection.beg 1091 row_col_t &rc = ix == 0 ? THIS->screen.cur
1092 : ix == 1 ? THIS->selection.beg
880 : ix == 2 ? THIS->selection.end 1093 : ix == 2 ? THIS->selection.end
881 : THIS->selection.mark; 1094 : THIS->selection.mark;
882 1095
883 if (GIMME_V != G_VOID) 1096 if (GIMME_V != G_VOID)
884 { 1097 {
885 EXTEND (SP, 2); 1098 EXTEND (SP, 2);
886 PUSHs (sv_2mortal (newSViv (sel.row))); 1099 PUSHs (sv_2mortal (newSViv (rc.row)));
887 PUSHs (sv_2mortal (newSViv (sel.col))); 1100 PUSHs (sv_2mortal (newSViv (rc.col)));
888 } 1101 }
889 1102
890 if (items == 3) 1103 if (items == 3)
891 { 1104 {
892 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1105 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
893 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1106 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
894 1107
895 if (ix) 1108 if (ix)
896 THIS->want_refresh = 1; 1109 THIS->want_refresh = 1;
897 } 1110 }
898} 1111}
… …
903void 1116void
904rxvt_term::selection (SV *newtext = 0) 1117rxvt_term::selection (SV *newtext = 0)
905 PPCODE: 1118 PPCODE:
906{ 1119{
907 if (GIMME_V != G_VOID) 1120 if (GIMME_V != G_VOID)
908 { 1121 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 1122
916 if (newtext) 1123 if (newtext)
917 { 1124 {
918 free (THIS->selection.text); 1125 free (THIS->selection.text);
919 1126
920 THIS->selection.text = sv2wcs (newtext); 1127 THIS->selection.text = sv2wcs (newtext);
921 THIS->selection.len = wcslen (THIS->selection.text); 1128 THIS->selection.len = wcslen (THIS->selection.text);
922 } 1129 }
923} 1130}
924 1131
1132void
1133rxvt_term::scr_add_lines (SV *string)
1134 CODE:
1135{
1136 wchar_t *wstr = sv2wcs (string);
1137 THIS->scr_add_lines (wstr, wcslen (wstr));
1138 free (wstr);
1139}
1140
925void 1141void
926rxvt_term::tt_write (SV *octets) 1142rxvt_term::tt_write (SV *octets)
927 INIT: 1143 INIT:
928 STRLEN len; 1144 STRLEN len;
929 char *str = SvPVbyte (octets, len); 1145 char *str = SvPVbyte (octets, len);
930 C_ARGS: 1146 C_ARGS:
931 (unsigned char *)str, len 1147 str, len
1148
1149void
1150rxvt_term::cmd_parse (SV *octets)
1151 CODE:
1152{
1153 STRLEN len;
1154 char *str = SvPVbyte (octets, len);
1155
1156 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1157 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1158
1159 THIS->cmdbuf_ptr = str;
1160 THIS->cmdbuf_endp = str + len;
1161
1162 rxvt_push_locale (THIS->locale);
1163 THIS->cmd_parse ();
1164 rxvt_pop_locale ();
1165
1166 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1167 THIS->cmdbuf_endp = old_cmdbuf_endp;
1168}
932 1169
933SV * 1170SV *
934rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1171rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
935 CODE: 1172 CODE:
936{ 1173{

Diff Legend

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