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.35 by root, Sat Jan 7 04:19:43 2006 UTC vs.
Revision 1.51 by root, Mon Jan 9 23:00:07 2006 UTC

… …
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
34#include "iom.h"
33#include "rxvt.h" 35#include "rxvt.h"
34#include "iom.h" 36#include "keyboard.h"
35#include "rxvtutil.h" 37#include "rxvtutil.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include "perlxsi.c" 40#include "perlxsi.c"
41
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
43# define GRAB_CURSOR THIS->leftptr_cursor
44#else
45# define GRAB_CURSOR None
46#endif
39 47
40#undef LINENO 48#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 49#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 50#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 51#define ROW(n) THIS->row_buf [LINENO (n)]
44 52
45///////////////////////////////////////////////////////////////////////////// 53/////////////////////////////////////////////////////////////////////////////
46 54
55static SV *
56taint (SV *sv)
57{
58 SvTAINT (sv);
59 return sv;
60}
61
62static SV *
63taint_if (SV *sv, SV *src)
64{
65 if (SvTAINTED (src))
66 SvTAINT (sv);
67
68 return sv;
69}
70
47static wchar_t * 71static wchar_t *
48sv2wcs (SV *sv) 72sv2wcs (SV *sv)
49{ 73{
50 STRLEN len; 74 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 75 char *str = SvPVutf8 (sv, len);
… …
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 125 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 126
103 return (long)mg->mg_ptr; 127 return (long)mg->mg_ptr;
104} 128}
105 129
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 130#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 131#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 132
109///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
110 134
111struct perl_watcher 135struct perl_watcher
… …
290void 314void
291overlay::show () 315overlay::show ()
292{ 316{
293 char key[33]; sprintf (key, "%32lx", (long)this); 317 char key[33]; sprintf (key, "%32lx", (long)this);
294 318
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 319 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); 320 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 321}
298 322
299void 323void
300overlay::hide () 324overlay::hide ()
301{ 325{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 326 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 327
304 if (ovs) 328 if (ovs)
305 { 329 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 330 char key[33]; sprintf (key, "%32lx", (long)this);
307 331
… …
389{ 413{
390 if (!perl) 414 if (!perl)
391 { 415 {
392 char *argv[] = { 416 char *argv[] = {
393 "", 417 "",
418 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 419 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 420 };
396 421
397 perl = perl_alloc (); 422 perl = perl_alloc ();
398 perl_construct (perl); 423 perl_construct (perl);
399 424
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 425 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 426 || perl_run (perl))
402 { 427 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 428 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 429
405 perl_destruct (perl); 430 perl_destruct (perl);
… …
407 perl = 0; 432 perl = 0;
408 } 433 }
409 } 434 }
410} 435}
411 436
437static void
438ungrab (rxvt_term *THIS)
439{
440 if (THIS->perl.grabtime)
441 {
442 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
443 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
444 THIS->perl.grabtime = 0;
445 }
446}
447
412bool 448bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 449rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
414{ 450{
415 if (!perl) 451 if (!perl)
416 return false; 452 return false;
417 453
418 if (htype == HOOK_INIT) // first hook ever called 454 if (htype == HOOK_INIT) // first hook ever called
419 { 455 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 456 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 457 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 458 }
423 else if (!term->self) 459 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 460 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 461 else if (htype == HOOK_DESTROY)
426 { 462 {
427 // handled later 463 // handled later
428 } 464 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 465 else
430 { 466 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 467 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
432
433 if (HvKEYS (hv))
434 { 468 {
469 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
470
471 if (HvKEYS (hv))
472 {
435 hv_iterinit (hv); 473 hv_iterinit (hv);
436 474
437 while (HE *he = hv_iternext (hv)) 475 while (HE *he = hv_iternext (hv))
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 476 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
477 }
478
439 } 479 }
480
481 if (!should_invoke [htype])
482 return false;
440 } 483 }
441 else if (!should_invoke [htype])
442 return false;
443 484
444 dSP; 485 dSP;
445 va_list ap; 486 va_list ap;
446 487
447 va_start (ap, htype); 488 va_start (ap, htype);
… …
466 case DT_LONG: 507 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 509 break;
469 510
470 case DT_STR: 511 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 512 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 513 break;
473 514
474 case DT_STR_LEN: 515 case DT_STR_LEN:
475 { 516 {
476 char *str = va_arg (ap, char *); 517 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 518 int len = va_arg (ap, int);
478 519
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 520 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 521 }
481 break; 522 break;
482 523
483 case DT_WCS_LEN: 524 case DT_WCS_LEN:
484 { 525 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 526 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 527 int wlen = va_arg (ap, int);
487 528
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 529 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 530 }
490 break; 531 break;
491 532
492 case DT_XEVENT: 533 case DT_XEVENT:
493 { 534 {
… …
558 PUTBACK; 599 PUTBACK;
559 FREETMPS; 600 FREETMPS;
560 LEAVE; 601 LEAVE;
561 602
562 if (SvTRUE (ERRSV)) 603 if (SvTRUE (ERRSV))
604 {
563 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 605 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
606 ungrab (term); // better lose the grab than the session
607 }
564 608
565 if (htype == HOOK_DESTROY) 609 if (htype == HOOK_DESTROY)
566 { 610 {
567 clearSVptr ((SV *)term->self); 611 clearSVptr ((SV *)term->perl.self);
568 SvREFCNT_dec ((SV *)term->self); 612 SvREFCNT_dec ((SV *)term->perl.self);
569 } 613 }
570 614
571 return count; 615 return count;
572 } 616 }
573 617
… …
583 627
584PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
585 629
586BOOT: 630BOOT:
587{ 631{
588# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 632 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
633
589 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 634 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
590# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 635# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
591# include "hookinc.h" 636# include "hookinc.h"
592# undef def 637# undef def
593 638
639 HV *option = get_hv ("urxvt::OPTION", 1);
640# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
641# define nodef(name)
642# include "optinc.h"
643# undef nodef
644# undef def
645
646 HV *stash = gv_stashpv ("urxvt", 1);
647# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
594 export_const (DEFAULT_RSTYLE); 648 export_const_iv (DEFAULT_RSTYLE);
595 export_const (OVERLAY_RSTYLE); 649 export_const_iv (OVERLAY_RSTYLE);
596 export_const (RS_Bold); 650 export_const_iv (RS_Bold);
597 export_const (RS_Italic); 651 export_const_iv (RS_Italic);
598 export_const (RS_Blink); 652 export_const_iv (RS_Blink);
599 export_const (RS_RVid); 653 export_const_iv (RS_RVid);
600 export_const (RS_Uline); 654 export_const_iv (RS_Uline);
601 655
602 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 656 export_const_iv (CurrentTime);
657 export_const_iv (ShiftMask);
658 export_const_iv (LockMask);
659 export_const_iv (ControlMask);
660 export_const_iv (Mod1Mask);
661 export_const_iv (Mod2Mask);
662 export_const_iv (Mod3Mask);
663 export_const_iv (Mod4Mask);
664 export_const_iv (Mod5Mask);
665 export_const_iv (Button1Mask);
666 export_const_iv (Button2Mask);
667 export_const_iv (Button3Mask);
668 export_const_iv (Button4Mask);
669 export_const_iv (Button5Mask);
670 export_const_iv (AnyModifier);
671
672 export_const_iv (EVENT_NONE);
673 export_const_iv (EVENT_READ);
674 export_const_iv (EVENT_WRITE);
603} 675}
604 676
605SV * 677SV *
606new (...) 678new (...)
607 CODE: 679 CODE:
… …
625 { 697 {
626 term->destroy (); 698 term->destroy ();
627 croak ("exception caught while initializing new terminal instance"); 699 croak ("exception caught while initializing new terminal instance");
628 } 700 }
629 701
630 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef; 702 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
631} 703}
632 OUTPUT: 704 OUTPUT:
633 RETVAL 705 RETVAL
634 706
635void 707void
… …
644 716
645void 717void
646fatal (const char *msg) 718fatal (const char *msg)
647 CODE: 719 CODE:
648 rxvt_fatal ("%s", msg); 720 rxvt_fatal ("%s", msg);
721
722SV *
723untaint (SV *sv)
724 CODE:
725 RETVAL = newSVsv (sv);
726 SvTAINTED_off (RETVAL);
727 OUTPUT:
728 RETVAL
729
730bool
731safe ()
732 CODE:
733 RETVAL = !rxvt_tainted ();
734 OUTPUT:
735 RETVAL
649 736
650NV 737NV
651NOW () 738NOW ()
652 CODE: 739 CODE:
653 RETVAL = NOW; 740 RETVAL = NOW;
… …
706 793
707void 794void
708rxvt_term::destroy () 795rxvt_term::destroy ()
709 796
710void 797void
711rxvt_term::grab (int eventtime) 798rxvt_term::grab_button (int button, U32 modifiers)
712 CODE: 799 CODE:
713{ 800 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
714return;
715 XGrabPointer (THIS->display->display, THIS->vt, 0,
716 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 801 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
717 GrabModeAsync, GrabModeAsync, None, None, eventtime); 802 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
803
804bool
805rxvt_term::grab (U32 eventtime, int sync = 0)
806 CODE:
807{
808 int mode = sync ? GrabModeSync : GrabModeAsync;
809
810 THIS->perl.grabtime = 0;
811
812 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
813 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
814 mode, mode, None, GRAB_CURSOR, eventtime))
718 XGrabKeyboard (THIS->display->display, THIS->vt, 0, GrabModeAsync, GrabModeAsync, eventtime); 815 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
816 THIS->perl.grabtime = eventtime;
817 else
818 XUngrabPointer (THIS->display->display, eventtime);
819
820 RETVAL = !!THIS->perl.grabtime;
719} 821}
822 OUTPUT:
823 RETVAL
824
825void
826rxvt_term::allow_events_async ()
827 CODE:
828 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
829
830void
831rxvt_term::allow_events_sync ()
832 CODE:
833 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
834
835void
836rxvt_term::allow_events_replay ()
837 CODE:
838 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
839 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
840
841void
842rxvt_term::ungrab ()
843 CODE:
844 ungrab (THIS);
720 845
721int 846int
722rxvt_term::strwidth (SV *str) 847rxvt_term::strwidth (SV *str)
723 CODE: 848 CODE:
724{ 849{
… …
743 char *mbstr = rxvt_wcstombs (wstr); 868 char *mbstr = rxvt_wcstombs (wstr);
744 rxvt_pop_locale (); 869 rxvt_pop_locale ();
745 870
746 free (wstr); 871 free (wstr);
747 872
748 RETVAL = newSVpv (mbstr, 0); 873 RETVAL = taint_if (newSVpv (mbstr, 0), str);
749 free (mbstr); 874 free (mbstr);
750} 875}
751 OUTPUT: 876 OUTPUT:
752 RETVAL 877 RETVAL
753 878
… …
760 885
761 rxvt_push_locale (THIS->locale); 886 rxvt_push_locale (THIS->locale);
762 wchar_t *wstr = rxvt_mbstowcs (data, len); 887 wchar_t *wstr = rxvt_mbstowcs (data, len);
763 rxvt_pop_locale (); 888 rxvt_pop_locale ();
764 889
765 RETVAL = wcs2sv (wstr); 890 RETVAL = taint_if (wcs2sv (wstr), octets);
766 free (wstr); 891 free (wstr);
767} 892}
768 OUTPUT: 893 OUTPUT:
769 RETVAL 894 RETVAL
770 895
771# very portable, especially on objects as opposed to pods 896#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
772#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
773 897
774#define TERM_OFFSET_width TERM_OFFSET(width) 898#define TERM_OFFSET_width TERM_OFFSET(width)
775#define TERM_OFFSET_height TERM_OFFSET(height) 899#define TERM_OFFSET_height TERM_OFFSET(height)
776#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 900#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
777#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 901#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
802 CODE: 926 CODE:
803 RETVAL = *(int *)((char *)THIS + ix); 927 RETVAL = *(int *)((char *)THIS + ix);
804 OUTPUT: 928 OUTPUT:
805 RETVAL 929 RETVAL
806 930
931unsigned int
932rxvt_term::ModLevel3Mask ()
933 ALIAS:
934 ModLevel3Mask = 0
935 ModMetaMask = 1
936 ModNumLockMask = 2
937 CODE:
938 switch (ix)
939 {
940 case 0: RETVAL = THIS->ModLevel3Mask; break;
941 case 1: RETVAL = THIS->ModMetaMask; break;
942 case 2: RETVAL = THIS->ModNumLockMask; break;
943 }
944 OUTPUT:
945 RETVAL
946
947char *
948rxvt_term::display_id ()
949 ALIAS:
950 display_id = 0
951 locale = 1
952 CODE:
953 switch (ix)
954 {
955 case 0: RETVAL = THIS->display->id; break;
956 case 1: RETVAL = THIS->locale; break;
957 }
958 OUTPUT:
959 RETVAL
960
961int
962rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
963 CODE:
964 RETVAL = THIS->pty_ev.events;
965 if (events != EVENT_UNDEF)
966 THIS->pty_ev.set (events);
967 OUTPUT:
968 RETVAL
969
807U32 970U32
808rxvt_term::parent () 971rxvt_term::parent ()
809 CODE: 972 CODE:
810 RETVAL = (U32)THIS->parent [0]; 973 RETVAL = (U32)THIS->parent [0];
811 OUTPUT: 974 OUTPUT:
… …
862 wchar_t *wstr = new wchar_t [THIS->ncol]; 1025 wchar_t *wstr = new wchar_t [THIS->ncol];
863 1026
864 for (int col = 0; col < THIS->ncol; col++) 1027 for (int col = 0; col < THIS->ncol; col++)
865 wstr [col] = l.t [col]; 1028 wstr [col] = l.t [col];
866 1029
867 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1030 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
868 1031
869 delete [] wstr; 1032 delete [] wstr;
870 } 1033 }
871 1034
872 if (new_text) 1035 if (new_text)
… …
993 else 1156 else
994 *r++ = *s; 1157 *r++ = *s;
995 1158
996 rxvt_pop_locale (); 1159 rxvt_pop_locale ();
997 1160
998 RETVAL = wcs2sv (rstr, r - rstr); 1161 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
999 1162
1000 delete [] rstr; 1163 delete [] rstr;
1001} 1164}
1002 OUTPUT: 1165 OUTPUT:
1003 RETVAL 1166 RETVAL
… …
1029 else if (IS_COMPOSE (*s)) 1192 else if (IS_COMPOSE (*s))
1030 r += rxvt_composite.expand (*s, r); 1193 r += rxvt_composite.expand (*s, r);
1031 else 1194 else
1032 *r++ = *s; 1195 *r++ = *s;
1033 1196
1034 RETVAL = wcs2sv (rstr, r - rstr); 1197 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1035 1198
1036 delete [] rstr; 1199 delete [] rstr;
1037} 1200}
1038 OUTPUT: 1201 OUTPUT:
1039 RETVAL 1202 RETVAL
… …
1061 1224
1062 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1225 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1063 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1226 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1064 1227
1065 if (GIMME_V != G_VOID) 1228 if (GIMME_V != G_VOID)
1066 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1229 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1067 1230
1068 if (newval) 1231 if (newval)
1069 { 1232 {
1070 if (SvOK (newval)) 1233 if (SvOK (newval))
1071 { 1234 {
… …
1076 else 1239 else
1077 THIS->rs [index] = 0; 1240 THIS->rs [index] = 0;
1078 } 1241 }
1079} 1242}
1080 1243
1244bool
1245rxvt_term::option (U32 optval, int set = -1)
1246 CODE:
1247{
1248 RETVAL = THIS->options & optval;
1249
1250 if (set >= 0)
1251 {
1252 if (set)
1253 THIS->options |= optval;
1254 else
1255 THIS->options &= ~optval;
1256
1257 switch (optval)
1258 {
1259 case Opt_skipBuiltinGlyphs:
1260 THIS->set_fonts ();
1261 THIS->scr_remap_chars ();
1262 THIS->scr_touch (true);
1263 THIS->want_refresh = 1;
1264 break;
1265
1266 case Opt_cursorUnderline:
1267 THIS->want_refresh = 1;
1268 break;
1269
1270# case Opt_scrollBar_floating:
1271# case Opt_scrollBar_right:
1272# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1273# break;
1274 }
1275 }
1276}
1277 OUTPUT:
1278 RETVAL
1279
1280bool
1281rxvt_term::parse_keysym (char *keysym, char *str)
1282 CODE:
1283 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1284 THIS->keyboard->register_done ();
1285 OUTPUT:
1286 RETVAL
1287
1081void 1288void
1082rxvt_term::cur (...) 1289rxvt_term::screen_cur (...)
1083 PROTOTYPE: $;$$ 1290 PROTOTYPE: $;$$
1084 ALIAS: 1291 ALIAS:
1085 screen_cur = 0 1292 screen_cur = 0
1086 selection_beg = 1 1293 selection_beg = 1
1087 selection_end = 2 1294 selection_end = 2
… …
1109 THIS->want_refresh = 1; 1316 THIS->want_refresh = 1;
1110 } 1317 }
1111} 1318}
1112 1319
1113int 1320int
1114rxvt_term::selection_grab (int eventtime = CurrentTime) 1321rxvt_term::selection_grab (U32 eventtime)
1115 1322
1116void 1323void
1117rxvt_term::selection (SV *newtext = 0) 1324rxvt_term::selection (SV *newtext = 0)
1118 PPCODE: 1325 PPCODE:
1119{ 1326{
1120 if (GIMME_V != G_VOID) 1327 if (GIMME_V != G_VOID)
1328 XPUSHs (THIS->selection.text
1121 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1329 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1330 : &PL_sv_undef);
1122 1331
1123 if (newtext) 1332 if (newtext)
1124 { 1333 {
1125 free (THIS->selection.text); 1334 free (THIS->selection.text);
1126 1335
1127 THIS->selection.text = sv2wcs (newtext); 1336 THIS->selection.text = sv2wcs (newtext);
1128 THIS->selection.len = wcslen (THIS->selection.text); 1337 THIS->selection.len = wcslen (THIS->selection.text);
1129 } 1338 }
1130} 1339}
1340
1341void
1342rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1343
1344void
1345rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1346
1347void
1348rxvt_term::scr_bell ()
1131 1349
1132void 1350void
1133rxvt_term::scr_add_lines (SV *string) 1351rxvt_term::scr_add_lines (SV *string)
1134 CODE: 1352 CODE:
1135{ 1353{

Diff Legend

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