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.26 by root, Thu Jan 5 21:21:49 2006 UTC vs.
Revision 1.38 by root, Sat Jan 7 21:22:02 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.
… …
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28 28
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef>
31#include <cstdarg> 32#include <cstdarg>
32 33
33#include "rxvt.h" 34#include "rxvt.h"
34#include "iom.h" 35#include "iom.h"
35#include "rxvtutil.h" 36#include "rxvtutil.h"
… …
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 102 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 103
103 return (long)mg->mg_ptr; 104 return (long)mg->mg_ptr;
104} 105}
105 106
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 107#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 108#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 109
109///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
110 111
111struct perl_watcher 112struct perl_watcher
… …
290void 291void
291overlay::show () 292overlay::show ()
292{ 293{
293 char key[33]; sprintf (key, "%32lx", (long)this); 294 char key[33]; sprintf (key, "%32lx", (long)this);
294 295
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 296 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
296 hv_store (hv, key, 32, newSViv ((long)this), 0); 297 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 298}
298 299
299void 300void
300overlay::hide () 301overlay::hide ()
301{ 302{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 303 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 304
304 if (ovs) 305 if (ovs)
305 { 306 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 307 char key[33]; sprintf (key, "%32lx", (long)this);
307 308
… …
415 if (!perl) 416 if (!perl)
416 return false; 417 return false;
417 418
418 if (htype == HOOK_INIT) // first hook ever called 419 if (htype == HOOK_INIT) // first hook ever called
419 { 420 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 421 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 422 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 423 }
423 else if (!term->self) 424 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 425 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 426 else if (htype == HOOK_DESTROY)
426 { 427 {
427 // handled later 428 // handled later
428 } 429 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 430 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 { 431 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 432 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
432 433
433 if (HvKEYS (hv)) 434 if (HvKEYS (hv))
434 { 435 {
435 hv_iterinit (hv); 436 hv_iterinit (hv);
436 437
… …
465 466
466 case DT_LONG: 467 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 468 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 469 break;
469 470
470 case DT_STRING: 471 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 472 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
472 break; 473 break;
473 474
474 case DT_USTRING_LEN: 475 case DT_STR_LEN:
475 { 476 {
476 unicode_t *ustr = va_arg (ap, unicode_t *); 477 char *str = va_arg (ap, char *);
477 int ulen = va_arg (ap, int); 478 int len = va_arg (ap, int);
479
480 XPUSHs (sv_2mortal (newSVpvn (str, len)));
481 }
482 break;
483
484 case DT_WCS_LEN:
485 {
478 wchar_t *wstr = new wchar_t [ulen]; 486 wchar_t *wstr = va_arg (ap, wchar_t *);
487 int wlen = va_arg (ap, int);
479 488
480 for (int i = ulen; i--; )
481 wstr [i] = ustr [i];
482
483 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen))); 489 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
490 }
491 break;
484 492
485 delete [] wstr; 493 case DT_XEVENT:
486 } 494 {
495 XEvent *xe = va_arg (ap, XEvent *);
496 HV *hv = newHV ();
497
498# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
499# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
500# undef set
501
502 setiv (type, xe->type);
503 setiv (send_event, xe->xany.send_event);
504 setiv (serial, xe->xany.serial);
505
506 switch (xe->type)
507 {
508 case KeyPress:
509 case KeyRelease:
510 case ButtonPress:
511 case ButtonRelease:
512 case MotionNotify:
513 setiv (time, xe->xmotion.time);
514 setiv (x, xe->xmotion.x);
515 setiv (y, xe->xmotion.y);
516 setiv (row, xe->xmotion.y / term->fheight);
517 setiv (col, xe->xmotion.x / term->fwidth);
518 setiv (x_root, xe->xmotion.x_root);
519 setiv (y_root, xe->xmotion.y_root);
520 setiv (state, xe->xmotion.state);
521 break;
522 }
523
524 switch (xe->type)
525 {
526 case KeyPress:
527 case KeyRelease:
528 setiv (keycode, xe->xkey.keycode);
529 break;
530
531 case ButtonPress:
532 case ButtonRelease:
533 setiv (button, xe->xbutton.button);
534 break;
535
536 case MotionNotify:
537 setiv (is_hint, xe->xmotion.is_hint);
538 break;
539 }
540
541 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
542 }
543 break;
487 544
488 case DT_END: 545 case DT_END:
489 { 546 {
490 va_end (ap); 547 va_end (ap);
491 548
… …
506 if (SvTRUE (ERRSV)) 563 if (SvTRUE (ERRSV))
507 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 564 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
508 565
509 if (htype == HOOK_DESTROY) 566 if (htype == HOOK_DESTROY)
510 { 567 {
511 clearSVptr ((SV *)term->self); 568 clearSVptr ((SV *)term->perl.self);
512 SvREFCNT_dec ((SV *)term->self); 569 SvREFCNT_dec ((SV *)term->perl.self);
513 } 570 }
514 571
515 return count; 572 return count;
516 } 573 }
517 574
… …
527 584
528PROTOTYPES: ENABLE 585PROTOTYPES: ENABLE
529 586
530BOOT: 587BOOT:
531{ 588{
589 HV *stash = gv_stashpv ("urxvt", 1);
532# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 590# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
591
533 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 592 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 593# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
535# include "hookinc.h" 594# include "hookinc.h"
536# undef def 595# undef def
537 596
597
538 export_const (DEFAULT_RSTYLE); 598 export_const_iv (DEFAULT_RSTYLE);
539 export_const (OVERLAY_RSTYLE); 599 export_const_iv (OVERLAY_RSTYLE);
540 export_const (RS_Bold); 600 export_const_iv (RS_Bold);
541 export_const (RS_Italic); 601 export_const_iv (RS_Italic);
542 export_const (RS_Blink); 602 export_const_iv (RS_Blink);
543 export_const (RS_RVid); 603 export_const_iv (RS_RVid);
544 export_const (RS_Uline); 604 export_const_iv (RS_Uline);
545 605
546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 606 export_const_iv (CurrentTime);
607 export_const_iv (ShiftMask);
608 export_const_iv (LockMask);
609 export_const_iv (ControlMask);
610 export_const_iv (Mod1Mask);
611 export_const_iv (Mod2Mask);
612 export_const_iv (Mod3Mask);
613 export_const_iv (Mod4Mask);
614 export_const_iv (Mod5Mask);
615 export_const_iv (Button1Mask);
616 export_const_iv (Button2Mask);
617 export_const_iv (Button3Mask);
618 export_const_iv (Button4Mask);
619 export_const_iv (Button5Mask);
620 export_const_iv (AnyModifier);
621
622 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
547} 623}
624
625SV *
626new (...)
627 CODE:
628{
629 stringvec *argv = new stringvec;
630 bool success;
631
632 for (int i = 0; i < items ;i++)
633 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
634
635 rxvt_term *term = new rxvt_term;
636
637 term->argv = argv;
638
639 try
640 {
641 if (!term->init (argv->size (), argv->begin ()))
642 term = 0;
643 }
644 catch (const class rxvt_failure_exception &e)
645 {
646 term->destroy ();
647 croak ("exception caught while initializing new terminal instance");
648 }
649
650 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
651}
652 OUTPUT:
653 RETVAL
548 654
549void 655void
550set_should_invoke (int htype, int value) 656set_should_invoke (int htype, int value)
551 CODE: 657 CODE:
552 rxvt_perl.should_invoke [htype] = value; 658 rxvt_perl.should_invoke [htype] = value;
… …
615} 721}
616 OUTPUT: 722 OUTPUT:
617 RETVAL 723 RETVAL
618 724
619MODULE = urxvt PACKAGE = urxvt::term 725MODULE = urxvt PACKAGE = urxvt::term
726
727void
728rxvt_term::destroy ()
729
730void
731rxvt_term::grab_button (int button, U32 modifiers)
732 CODE:
733 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
734 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
735 GrabModeSync, GrabModeSync, None, None);
736
737bool
738rxvt_term::grab (U32 eventtime, int sync = 0)
739 CODE:
740{
741 int mode = sync ? GrabModeSync : GrabModeAsync;
742
743 THIS->perl.grabtime = 0;
744
745 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
746 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
747 mode, mode, None, None, eventtime))
748 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
749 THIS->perl.grabtime = eventtime;
750 else
751 XUngrabPointer (THIS->display->display, eventtime);
752
753 RETVAL = !!THIS->perl.grabtime;
754}
755 OUTPUT:
756 RETVAL
757
758void
759rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)
760 CODE:
761 XAllowEvents (THIS->display->display, AsyncBoth, eventtime);
762
763void
764rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)
765 CODE:
766 XAllowEvents (THIS->display->display, SyncBoth, eventtime);
767
768void
769rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)
770 CODE:
771 XAllowEvents (THIS->display->display, ReplayPointer, eventtime);
772 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);
773
774void
775rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)
776 CODE:
777 THIS->perl.grabtime = 0;
778 XUngrabKeyboard (THIS->display->display, eventtime);
779 XUngrabPointer (THIS->display->display, eventtime);
620 780
621int 781int
622rxvt_term::strwidth (SV *str) 782rxvt_term::strwidth (SV *str)
623 CODE: 783 CODE:
624{ 784{
… …
666 free (wstr); 826 free (wstr);
667} 827}
668 OUTPUT: 828 OUTPUT:
669 RETVAL 829 RETVAL
670 830
671# very portable, especially on objects as opposed to pods 831#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
672#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
673 832
674#define TERM_OFFSET_width TERM_OFFSET(width) 833#define TERM_OFFSET_width TERM_OFFSET(width)
675#define TERM_OFFSET_height TERM_OFFSET(height) 834#define TERM_OFFSET_height TERM_OFFSET(height)
676#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 835#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
677#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 836#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
702 CODE: 861 CODE:
703 RETVAL = *(int *)((char *)THIS + ix); 862 RETVAL = *(int *)((char *)THIS + ix);
704 OUTPUT: 863 OUTPUT:
705 RETVAL 864 RETVAL
706 865
866unsigned int
867rxvt_term::ModLevel3Mask ()
868 ALIAS:
869 ModLevel3Mask = 0
870 ModMetaMask = 1
871 ModNumLockMask = 2
872 CODE:
873 switch (ix)
874 {
875 case 0: RETVAL = THIS->ModLevel3Mask; break;
876 case 1: RETVAL = THIS->ModMetaMask; break;
877 case 2: RETVAL = THIS->ModNumLockMask; break;
878 }
879 OUTPUT:
880 RETVAL
881
882U32
883rxvt_term::parent ()
884 CODE:
885 RETVAL = (U32)THIS->parent [0];
886 OUTPUT:
887 RETVAL
888
889U32
890rxvt_term::vt ()
891 CODE:
892 RETVAL = (U32)THIS->vt;
893 OUTPUT:
894 RETVAL
895
707U32 896U32
708rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 897rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
709 CODE: 898 CODE:
710{ 899{
711 RETVAL = THIS->rstyle; 900 RETVAL = THIS->rstyle;
… …
733rxvt_term::want_refresh () 922rxvt_term::want_refresh ()
734 CODE: 923 CODE:
735 THIS->want_refresh = 1; 924 THIS->want_refresh = 1;
736 925
737void 926void
738rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 927rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
739 PPCODE: 928 PPCODE:
740{ 929{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 930 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 931 XSRETURN_EMPTY;
743 932
… …
745 934
746 if (GIMME_V != G_VOID) 935 if (GIMME_V != G_VOID)
747 { 936 {
748 wchar_t *wstr = new wchar_t [THIS->ncol]; 937 wchar_t *wstr = new wchar_t [THIS->ncol];
749 938
750 for (int col = 0; col <THIS->ncol; col++) 939 for (int col = 0; col < THIS->ncol; col++)
751 wstr [col] = l.t [col]; 940 wstr [col] = l.t [col];
752 941
753 XPUSHs (sv_2mortal (wcs2sv (wstr))); 942 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
754 943
755 delete [] wstr; 944 delete [] wstr;
756 } 945 }
757 946
758 if (new_text) 947 if (new_text)
759 { 948 {
760 wchar_t *wstr = sv2wcs (new_text); 949 wchar_t *wstr = sv2wcs (new_text);
761 950
762 int len = wcslen (wstr); 951 int len = min (wcslen (wstr) - start_ofs, max_len);
763 952
764 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 953 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
765 { 954 {
766 free (wstr); 955 free (wstr);
767 croak ("new_text extends beyond horizontal margins"); 956 croak ("new_text extends beyond horizontal margins");
768 } 957 }
769 958
770 for (int col = start_col; col < start_col + len; col++) 959 for (int col = start_col; col < start_col + len; col++)
771 { 960 {
772 l.t [col] = wstr [col - start_col]; 961 l.t [col] = wstr [start_ofs + col - start_col];
773 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 962 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
774 } 963 }
775 964
776 free (wstr); 965 free (wstr);
777 } 966 }
778} 967}
779 968
780void 969void
781rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 970rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
782 PPCODE: 971 PPCODE:
783{ 972{
784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 973 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
785 XSRETURN_EMPTY; 974 XSRETURN_EMPTY;
786 975
… …
801 { 990 {
802 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 991 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
803 croak ("new_rend must be arrayref"); 992 croak ("new_rend must be arrayref");
804 993
805 AV *av = (AV *)SvRV (new_rend); 994 AV *av = (AV *)SvRV (new_rend);
806 int len = av_len (av) + 1; 995 int len = min (av_len (av) + 1 - start_ofs, max_len);
807 996
808 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 997 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
809 croak ("new_rend array extends beyond horizontal margins"); 998 croak ("new_rend array extends beyond horizontal margins");
810 999
811 for (int col = start_col; col < start_col + len; col++) 1000 for (int col = start_col; col < start_col + len; col++)
812 { 1001 {
813 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1002 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
814 1003
815 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1004 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
816 } 1005 }
817 } 1006 }
818} 1007}
… …
848} 1037}
849 OUTPUT: 1038 OUTPUT:
850 RETVAL 1039 RETVAL
851 1040
852SV * 1041SV *
853rxvt_term::special_encode (SV *str) 1042rxvt_term::special_encode (SV *string)
854 CODE: 1043 CODE:
855 abort ();//TODO 1044{
1045 wchar_t *wstr = sv2wcs (string);
1046 int wlen = wcslen (wstr);
1047 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1048
1049 rxvt_push_locale (THIS->locale);
1050
1051 wchar_t *r = rstr;
1052 for (wchar_t *s = wstr; *s; s++)
1053 if (wcwidth (*s) == 0)
1054 {
1055 if (r == rstr)
1056 croak ("leading combining character unencodable");
1057
1058 unicode_t n = rxvt_compose (r[-1], *s);
1059 if (n == NOCHAR)
1060 n = rxvt_composite.compose (r[-1], *s);
1061
1062 r[-1] = n;
1063 }
1064#if !UNICODE_3
1065 else if (*s >= 0x10000)
1066 *r++ = rxvt_composite.compose (*s);
1067#endif
1068 else
1069 *r++ = *s;
1070
1071 rxvt_pop_locale ();
1072
1073 RETVAL = wcs2sv (rstr, r - rstr);
1074
1075 delete [] rstr;
1076}
1077 OUTPUT:
1078 RETVAL
856 1079
857SV * 1080SV *
858rxvt_term::special_decode (SV *str) 1081rxvt_term::special_decode (SV *text)
859 CODE: 1082 CODE:
860 abort ();//TODO 1083{
1084 wchar_t *wstr = sv2wcs (text);
1085 int wlen = wcslen (wstr);
1086 int dlen = 0;
1087
1088 // find length
1089 for (wchar_t *s = wstr; *s; s++)
1090 if (*s == NOCHAR)
1091 ;
1092 else if (IS_COMPOSE (*s))
1093 dlen += rxvt_composite.expand (*s, 0);
1094 else
1095 dlen++;
1096
1097 wchar_t *rstr = new wchar_t [dlen];
1098
1099 // decode
1100 wchar_t *r = rstr;
1101 for (wchar_t *s = wstr; *s; s++)
1102 if (*s == NOCHAR)
1103 ;
1104 else if (IS_COMPOSE (*s))
1105 r += rxvt_composite.expand (*s, r);
1106 else
1107 *r++ = *s;
1108
1109 RETVAL = wcs2sv (rstr, r - rstr);
1110
1111 delete [] rstr;
1112}
1113 OUTPUT:
1114 RETVAL
861 1115
862void 1116void
863rxvt_term::_resource (char *name, int index, SV *newval = 0) 1117rxvt_term::_resource (char *name, int index, SV *newval = 0)
864 PPCODE: 1118 PPCODE:
865{ 1119{
… …
930 THIS->want_refresh = 1; 1184 THIS->want_refresh = 1;
931 } 1185 }
932} 1186}
933 1187
934int 1188int
935rxvt_term::selection_grab (int eventtime = CurrentTime) 1189rxvt_term::selection_grab (U32 eventtime)
936 1190
937void 1191void
938rxvt_term::selection (SV *newtext = 0) 1192rxvt_term::selection (SV *newtext = 0)
939 PPCODE: 1193 PPCODE:
940{ 1194{
… …
953void 1207void
954rxvt_term::scr_add_lines (SV *string) 1208rxvt_term::scr_add_lines (SV *string)
955 CODE: 1209 CODE:
956{ 1210{
957 wchar_t *wstr = sv2wcs (string); 1211 wchar_t *wstr = sv2wcs (string);
958 int wlen = wcslen (wstr);
959 unicode_t *ustr = new unicode_t [wlen];
960 int nlines = 0;
961
962 for (int i = wlen; i--; )
963 {
964 ustr [i] = wstr [i];
965 nlines += ustr [i] == '\012';
966 }
967
968 THIS->scr_add_lines (ustr, nlines, wlen); 1212 THIS->scr_add_lines (wstr, wcslen (wstr));
969
970 free (wstr); 1213 free (wstr);
971 delete [] ustr;
972} 1214}
973 1215
974void 1216void
975rxvt_term::tt_write (SV *octets) 1217rxvt_term::tt_write (SV *octets)
976 INIT: 1218 INIT:
977 STRLEN len; 1219 STRLEN len;
978 char *str = SvPVbyte (octets, len); 1220 char *str = SvPVbyte (octets, len);
979 C_ARGS: 1221 C_ARGS:
980 str, len 1222 str, len
981 1223
1224void
1225rxvt_term::cmd_parse (SV *octets)
1226 CODE:
1227{
1228 STRLEN len;
1229 char *str = SvPVbyte (octets, len);
1230
1231 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1232 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1233
1234 THIS->cmdbuf_ptr = str;
1235 THIS->cmdbuf_endp = str + len;
1236
1237 rxvt_push_locale (THIS->locale);
1238 THIS->cmd_parse ();
1239 rxvt_pop_locale ();
1240
1241 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1242 THIS->cmdbuf_endp = old_cmdbuf_endp;
1243}
1244
982SV * 1245SV *
983rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1246rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
984 CODE: 1247 CODE:
985{ 1248{
986 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1249 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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