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.33 by root, Fri Jan 6 20:50:58 2006 UTC vs.
Revision 1.68 by root, Mon Jan 16 08:48:09 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 "unistd.h"
35
36#include "iom.h"
33#include "rxvt.h" 37#include "rxvt.h"
34#include "iom.h" 38#include "keyboard.h"
35#include "rxvtutil.h" 39#include "rxvtutil.h"
36#include "rxvtperl.h" 40#include "rxvtperl.h"
37 41
38#include "perlxsi.c" 42#include "perlxsi.c"
43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
45# define GRAB_CURSOR THIS->leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
39 49
40#undef LINENO 50#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 52#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
44 54
55#define ENABLE_PERL_FRILLS 1
56
45///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58
59static SV *
60taint (SV *sv)
61{
62 SvTAINT (sv);
63 return sv;
64}
65
66static SV *
67taint_if (SV *sv, SV *src)
68{
69 if (SvTAINTED (src))
70 SvTAINT (sv);
71
72 return sv;
73}
46 74
47static wchar_t * 75static wchar_t *
48sv2wcs (SV *sv) 76sv2wcs (SV *sv)
49{ 77{
50 STRLEN len; 78 STRLEN len;
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 129 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 130
103 return (long)mg->mg_ptr; 131 return (long)mg->mg_ptr;
104} 132}
105 133
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 134#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 135#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 136
109///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
110 138
111struct perl_watcher 139struct perl_watcher
290void 318void
291overlay::show () 319overlay::show ()
292{ 320{
293 char key[33]; sprintf (key, "%32lx", (long)this); 321 char key[33]; sprintf (key, "%32lx", (long)this);
294 322
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 323 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); 324 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 325}
298 326
299void 327void
300overlay::hide () 328overlay::hide ()
301{ 329{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 330 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 331
304 if (ovs) 332 if (ovs)
305 { 333 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 334 char key[33]; sprintf (key, "%32lx", (long)this);
307 335
321 for (int y = ov_h; y--; ) 349 for (int y = ov_h; y--; )
322 { 350 {
323 text_t *t1 = text [y]; 351 text_t *t1 = text [y];
324 rend_t *r1 = rend [y]; 352 rend_t *r1 = rend [y];
325 353
326 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 354 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
327 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 355 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
328 356
329 for (int x = ov_w; x--; ) 357 for (int x = ov_w; x--; )
330 { 358 {
331 text_t t = *t1; *t1++ = *t2; *t2++ = t; 359 text_t t = *t1; *t1++ = *t2; *t2++ = t;
332 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 360 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
369 397
370struct rxvt_perl_interp rxvt_perl; 398struct rxvt_perl_interp rxvt_perl;
371 399
372static PerlInterpreter *perl; 400static PerlInterpreter *perl;
373 401
374rxvt_perl_interp::rxvt_perl_interp ()
375{
376}
377
378rxvt_perl_interp::~rxvt_perl_interp () 402rxvt_perl_interp::~rxvt_perl_interp ()
379{ 403{
380 if (perl) 404 if (perl)
381 { 405 {
382 perl_destruct (perl); 406 perl_destruct (perl);
383 perl_free (perl); 407 perl_free (perl);
384 } 408 }
385} 409}
386 410
387void 411void
388rxvt_perl_interp::init () 412rxvt_perl_interp::init (rxvt_term *term)
389{ 413{
390 if (!perl) 414 if (!perl)
391 { 415 {
416 rxvt_push_locale (""); // perl init destroys current locale
417
418 perl_environ = rxvt_environ;
419 swap (perl_environ, environ);
420
392 char *argv[] = { 421 char *argv[] = {
393 "", 422 "",
423 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 424 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 425 };
396 426
397 perl = perl_alloc (); 427 perl = perl_alloc ();
398 perl_construct (perl); 428 perl_construct (perl);
399 429
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 430 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 431 || perl_run (perl))
402 { 432 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 433 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 434
405 perl_destruct (perl); 435 perl_destruct (perl);
406 perl_free (perl); 436 perl_free (perl);
407 perl = 0; 437 perl = 0;
408 } 438 }
439
440 swap (perl_environ, environ);
441
442 rxvt_pop_locale ();
443 }
444
445 // runs outside of perls ENV
446 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
447 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
448}
449
450static void
451ungrab (rxvt_term *THIS)
452{
453 if (THIS->perl.grabtime)
454 {
455 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
456 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
457 THIS->perl.grabtime = 0;
458 }
459}
460
461static void
462swap_overlays (rxvt_term *term)
463{
464 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
465
466 if (HvKEYS (hv))
467 {
468 hv_iterinit (hv);
469
470 while (HE *he = hv_iternext (hv))
471 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
409 } 472 }
410} 473}
411 474
412bool 475bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 476rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
414{ 477{
415 if (!perl) 478 if (!perl || !term->perl.self)
416 return false; 479 return false;
417 480
418 if (htype == HOOK_INIT) // first hook ever called 481 // pre-handling of some events
419 { 482 if (htype == HOOK_REFRESH_END)
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 483 swap_overlays (term);
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 }
423 else if (!term->self)
424 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY)
426 {
427 // handled later
428 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0));
432 484
433 if (HvKEYS (hv)) 485 swap (perl_environ, environ);
434 {
435 hv_iterinit (hv);
436 486
437 while (HE *he = hv_iternext (hv)) 487 bool event_consumed;
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
439 }
440 }
441 else if (!should_invoke [htype])
442 return false;
443 488
444 dSP; 489 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
445 va_list ap; 490 || term->perl.should_invoke [htype])
446 491 try
447 va_start (ap, htype);
448
449 ENTER;
450 SAVETMPS;
451
452 PUSHMARK (SP);
453
454 XPUSHs (sv_2mortal (newSVterm (term)));
455 XPUSHs (sv_2mortal (newSViv (htype)));
456
457 for (;;) {
458 data_type dt = (data_type)va_arg (ap, int);
459
460 switch (dt)
461 { 492 {
493 dSP;
494 va_list ap;
495
496 va_start (ap, htype);
497
498 ENTER;
499 SAVETMPS;
500
501 PUSHMARK (SP);
502
503 XPUSHs (sv_2mortal (newSVterm (term)));
504 XPUSHs (sv_2mortal (newSViv (htype)));
505
506 for (;;) {
507 data_type dt = (data_type)va_arg (ap, int);
508
509 switch (dt)
510 {
462 case DT_INT: 511 case DT_INT:
463 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 512 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
464 break; 513 break;
465 514
466 case DT_LONG: 515 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 516 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 517 break;
469 518
470 case DT_STR: 519 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 520 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 521 break;
473 522
474 case DT_STR_LEN: 523 case DT_STR_LEN:
475 { 524 {
476 char *str = va_arg (ap, char *); 525 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 526 int len = va_arg (ap, int);
478 527
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 528 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 529 }
481 break; 530 break;
482 531
483 case DT_WCS_LEN: 532 case DT_WCS_LEN:
484 { 533 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 534 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 535 int wlen = va_arg (ap, int);
487 536
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 537 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 538 }
539 break;
490 540
491 case DT_XEVENT: 541 case DT_XEVENT:
492 { 542 {
493 XEvent *xe = va_arg (ap, XEvent *); 543 XEvent *xe = va_arg (ap, XEvent *);
494 HV *hv = newHV (); 544 HV *hv = newHV ();
495 545
496# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 546# 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) 547# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
498# undef set 548# undef set
499 549
500 setiv (type, xe->type); 550 setiv (type, xe->type);
501 setiv (send_event, xe->xany.send_event); 551 setiv (send_event, xe->xany.send_event);
502 setiv (serial, xe->xany.serial); 552 setiv (serial, xe->xany.serial);
503 553
504 switch (xe->type) 554 switch (xe->type)
505 { 555 {
506 case KeyPress: 556 case KeyPress:
507 case KeyRelease: 557 case KeyRelease:
508 case ButtonPress: 558 case ButtonPress:
509 case ButtonRelease: 559 case ButtonRelease:
510 case MotionNotify: 560 case MotionNotify:
511 setiv (time, xe->xmotion.time); 561 setiv (time, xe->xmotion.time);
512 setiv (x, xe->xmotion.x); 562 setiv (x, xe->xmotion.x);
513 setiv (y, xe->xmotion.y); 563 setiv (y, xe->xmotion.y);
514 setiv (row, xe->xmotion.y / term->fheight); 564 setiv (row, xe->xmotion.y / term->fheight);
515 setiv (col, xe->xmotion.x / term->fwidth); 565 setiv (col, xe->xmotion.x / term->fwidth);
516 setiv (x_root, xe->xmotion.x_root); 566 setiv (x_root, xe->xmotion.x_root);
517 setiv (y_root, xe->xmotion.y_root); 567 setiv (y_root, xe->xmotion.y_root);
518 setiv (state, xe->xmotion.state); 568 setiv (state, xe->xmotion.state);
569 break;
570 }
571
572 switch (xe->type)
573 {
574 case KeyPress:
575 case KeyRelease:
576 setiv (keycode, xe->xkey.keycode);
577 break;
578
579 case ButtonPress:
580 case ButtonRelease:
581 setiv (button, xe->xbutton.button);
582 break;
583
584 case MotionNotify:
585 setiv (is_hint, xe->xmotion.is_hint);
586 break;
587 }
588
589 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
590 }
519 break; 591 break;
592
593 case DT_END:
594 goto call;
595
596 default:
597 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
520 } 598 }
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 } 599 }
541 break;
542 600
543 case DT_END: 601 call:
544 {
545 va_end (ap); 602 va_end (ap);
546 603
547 PUTBACK; 604 PUTBACK;
548 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL); 605 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
549 SPAGAIN; 606 SPAGAIN;
550 607
551 if (count) 608 if (count)
552 { 609 {
553 SV *status = POPs; 610 SV *status = POPs;
554 count = SvTRUE (status); 611 count = SvTRUE (status);
555 } 612 }
556 613
557 PUTBACK; 614 PUTBACK;
558 FREETMPS; 615 FREETMPS;
559 LEAVE; 616 LEAVE;
560 617
561 if (SvTRUE (ERRSV)) 618 if (SvTRUE (ERRSV))
619 {
562 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 620 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
563 621 ungrab (term); // better lose the grab than the session
564 if (htype == HOOK_DESTROY)
565 {
566 clearSVptr ((SV *)term->self);
567 SvREFCNT_dec ((SV *)term->self);
568 } 622 }
569 623
570 return count; 624 event_consumed = !!count;
571 }
572
573 default:
574 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
575 } 625 }
626 catch (...)
627 {
628 swap (perl_environ, environ);
629 throw;
630 }
631 else
632 event_consumed = false;
633
634 // post-handling of some events
635 if (htype == HOOK_REFRESH_BEGIN)
636 swap_overlays (term);
637 else if (htype == HOOK_DESTROY)
638 {
639 clearSVptr ((SV *)term->perl.self);
640 SvREFCNT_dec ((SV *)term->perl.self);
576 } 641 }
642
643 swap (perl_environ, environ);
644
645 return event_consumed;
577} 646}
578 647
579///////////////////////////////////////////////////////////////////////////// 648/////////////////////////////////////////////////////////////////////////////
580 649
581MODULE = urxvt PACKAGE = urxvt 650MODULE = urxvt PACKAGE = urxvt
582 651
583PROTOTYPES: ENABLE 652PROTOTYPES: ENABLE
584 653
585BOOT: 654BOOT:
586{ 655{
587# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 656 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
657 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
658 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
659 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
660
588 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 661 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
589# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 662# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
590# include "hookinc.h" 663# include "hookinc.h"
591# undef def 664# undef def
592 665
666 HV *option = get_hv ("urxvt::OPTION", 1);
667# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
668# define nodef(name)
669# include "optinc.h"
670# undef nodef
671# undef def
672
673 HV *stash = gv_stashpv ("urxvt", 1);
674 struct {
675 const char *name;
676 IV iv;
677 } *civ, const_iv[] = {
678# define const_iv(name) { # name, (IV)name }
593 export_const (DEFAULT_RSTYLE); 679 const_iv (DEFAULT_RSTYLE),
594 export_const (OVERLAY_RSTYLE); 680 const_iv (OVERLAY_RSTYLE),
595 export_const (RS_Bold); 681 const_iv (RS_Bold),
596 export_const (RS_Italic); 682 const_iv (RS_Italic),
597 export_const (RS_Blink); 683 const_iv (RS_Blink),
598 export_const (RS_RVid); 684 const_iv (RS_RVid),
599 export_const (RS_Uline); 685 const_iv (RS_Uline),
600 686
601 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 687 const_iv (CurrentTime),
688 const_iv (ShiftMask),
689 const_iv (LockMask),
690 const_iv (ControlMask),
691 const_iv (Mod1Mask),
692 const_iv (Mod2Mask),
693 const_iv (Mod3Mask),
694 const_iv (Mod4Mask),
695 const_iv (Mod5Mask),
696 const_iv (Button1Mask),
697 const_iv (Button2Mask),
698 const_iv (Button3Mask),
699 const_iv (Button4Mask),
700 const_iv (Button5Mask),
701 const_iv (AnyModifier),
702
703 const_iv (EVENT_NONE),
704 const_iv (EVENT_READ),
705 const_iv (EVENT_WRITE),
706
707 const_iv (NoEventMask),
708 const_iv (KeyPressMask),
709 const_iv (KeyReleaseMask),
710 const_iv (ButtonPressMask),
711 const_iv (ButtonReleaseMask),
712 const_iv (EnterWindowMask),
713 const_iv (LeaveWindowMask),
714 const_iv (PointerMotionMask),
715 const_iv (PointerMotionHintMask),
716 const_iv (Button1MotionMask),
717 const_iv (Button2MotionMask),
718 const_iv (Button3MotionMask),
719 const_iv (Button4MotionMask),
720 const_iv (Button5MotionMask),
721 const_iv (ButtonMotionMask),
722 const_iv (KeymapStateMask),
723 const_iv (ExposureMask),
724 const_iv (VisibilityChangeMask),
725 const_iv (StructureNotifyMask),
726 const_iv (ResizeRedirectMask),
727 const_iv (SubstructureNotifyMask),
728 const_iv (SubstructureRedirectMask),
729 const_iv (FocusChangeMask),
730 const_iv (PropertyChangeMask),
731 const_iv (ColormapChangeMask),
732 const_iv (OwnerGrabButtonMask),
733
734 const_iv (KeyPress),
735 const_iv (KeyRelease),
736 const_iv (ButtonPress),
737 const_iv (ButtonRelease),
738 const_iv (MotionNotify),
739 const_iv (EnterNotify),
740 const_iv (LeaveNotify),
741 const_iv (FocusIn),
742 const_iv (FocusOut),
743 const_iv (KeymapNotify),
744 const_iv (Expose),
745 const_iv (GraphicsExpose),
746 const_iv (NoExpose),
747 const_iv (VisibilityNotify),
748 const_iv (CreateNotify),
749 const_iv (DestroyNotify),
750 const_iv (UnmapNotify),
751 const_iv (MapNotify),
752 const_iv (MapRequest),
753 const_iv (ReparentNotify),
754 const_iv (ConfigureNotify),
755 const_iv (ConfigureRequest),
756 const_iv (GravityNotify),
757 const_iv (ResizeRequest),
758 const_iv (CirculateNotify),
759 const_iv (CirculateRequest),
760 const_iv (PropertyNotify),
761 const_iv (SelectionClear),
762 const_iv (SelectionRequest),
763 const_iv (SelectionNotify),
764 const_iv (ColormapNotify),
765 const_iv (ClientMessage),
766 const_iv (MappingNotify),
767 };
768
769 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
770 civ-- > const_iv; )
771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
602} 772}
773
774void
775warn (const char *msg)
776 CODE:
777 rxvt_warn ("%s", msg);
778
779void
780fatal (const char *msg)
781 CODE:
782 rxvt_fatal ("%s", msg);
603 783
604SV * 784SV *
605new (...) 785untaint (SV *sv)
606 CODE: 786 CODE:
607{ 787 RETVAL = newSVsv (sv);
608 stringvec *argv = new stringvec; 788 SvTAINTED_off (RETVAL);
609 bool success; 789 OUTPUT:
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 790 RETVAL
633 791
634void 792void
635set_should_invoke (int htype, int value) 793_exit (int status)
636 CODE:
637 rxvt_perl.should_invoke [htype] = value;
638 794
639void 795bool
640warn (const char *msg) 796safe ()
641 CODE: 797 CODE:
642 rxvt_warn ("%s", msg); 798 RETVAL = !rxvt_tainted ();
643 799 OUTPUT:
644void 800 RETVAL
645fatal (const char *msg)
646 CODE:
647 rxvt_fatal ("%s", msg);
648 801
649NV 802NV
650NOW () 803NOW ()
651 CODE: 804 CODE:
652 RETVAL = NOW; 805 RETVAL = NOW;
701 OUTPUT: 854 OUTPUT:
702 RETVAL 855 RETVAL
703 856
704MODULE = urxvt PACKAGE = urxvt::term 857MODULE = urxvt PACKAGE = urxvt::term
705 858
859SV *
860_new (...)
861 CODE:
862{
863 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
864 croak ("first argument to urxvt::term->_new must be arrayref");
865
866 rxvt_term *term = new rxvt_term;
867
868 term->argv = new stringvec;
869 term->envv = new stringvec;
870
871 for (int i = 1; i < items; i++)
872 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
873
874 AV *envv = (AV *)SvRV (ST (0));
875 for (int i = av_len (envv) + 1; i--; )
876 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
877
878 term->envv->push_back (0);
879
880 bool success;
881
882 try
883 {
884 success = term->init (term->argv->size (), term->argv->begin ());
885 }
886 catch (const class rxvt_failure_exception &e)
887 {
888 success = false;
889 }
890
891 if (!success)
892 {
893 term->destroy ();
894 croak ("error while initializing new terminal instance");
895 }
896
897 RETVAL = term && term->perl.self
898 ? newSVterm (term) : &PL_sv_undef;
899}
900 OUTPUT:
901 RETVAL
902
706void 903void
707rxvt_term::destroy () 904rxvt_term::destroy ()
905
906#if ENABLE_PERL_FRILLS
907
908void
909rxvt_term::XListProperties (U32 window)
910 PPCODE:
911{
912 int count;
913 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
914
915 EXTEND (SP, count);
916 while (count--)
917 PUSHs (newSVuv ((U32)props [count]));
918
919 XFree (props);
920}
921
922void
923rxvt_term::XGetWindowProperty (U32 window, U32 property)
924 PPCODE:
925{
926 Atom type;
927 int format;
928 unsigned long nitems;
929 unsigned long bytes_after;
930 unsigned char *prop;
931 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
932 0, 1<<30, 0, AnyPropertyType,
933 &type, &format, &nitems, &bytes_after, &prop);
934 if (type != None)
935 {
936 EXTEND (SP, 3);
937 PUSHs (newSVuv ((U32)type));
938 PUSHs (newSViv (format));
939 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
940 XFree (prop);
941 }
942}
943
944void
945rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
946 CODE:
947{
948 STRLEN len;
949 char *data_ = SvPVbyte (data, len);
950
951 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
952 type, format, PropModeReplace,
953 (unsigned char *)data, len * 8 / format);
954}
955
956void
957rxvt_term::XDeleteProperty (U32 window, U32 property)
958 CODE:
959 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
960
961U32
962rxvt_term::DefaultRootWindow ()
963 CODE:
964 RETVAL = (U32)THIS->display->root;
965 OUTPUT:
966 RETVAL
967
968U32
969rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
970 CODE:
971 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
972 x, y, width, height, 0,
973 THIS->pix_colors_focused[Color_border],
974 THIS->pix_colors_focused[Color_border]);
975 OUTPUT:
976 RETVAL
977
978void
979rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
980 CODE:
981 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
982
983void
984rxvt_term::XMapWindow (U32 window)
985 CODE:
986 XMapWindow (THIS->display->display, (Window)window);
987
988void
989rxvt_term::XUnmapWindow (U32 window)
990 CODE:
991 XUnmapWindow (THIS->display->display, (Window)window);
992
993#endif
994
995void
996rxvt_term::set_should_invoke (int htype, int inc)
997 CODE:
998 THIS->perl.should_invoke [htype] += inc;
999
1000void
1001rxvt_term::grab_button (int button, U32 modifiers)
1002 CODE:
1003 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
1004 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1005 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1006
1007bool
1008rxvt_term::grab (U32 eventtime, int sync = 0)
1009 CODE:
1010{
1011 int mode = sync ? GrabModeSync : GrabModeAsync;
1012
1013 THIS->perl.grabtime = 0;
1014
1015 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
1016 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1017 mode, mode, None, GRAB_CURSOR, eventtime))
1018 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
1019 THIS->perl.grabtime = eventtime;
1020 else
1021 XUngrabPointer (THIS->display->display, eventtime);
1022
1023 RETVAL = !!THIS->perl.grabtime;
1024}
1025 OUTPUT:
1026 RETVAL
1027
1028void
1029rxvt_term::allow_events_async ()
1030 CODE:
1031 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
1032
1033void
1034rxvt_term::allow_events_sync ()
1035 CODE:
1036 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
1037
1038void
1039rxvt_term::allow_events_replay ()
1040 CODE:
1041 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
1042 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
1043
1044void
1045rxvt_term::ungrab ()
1046 CODE:
1047 ungrab (THIS);
708 1048
709int 1049int
710rxvt_term::strwidth (SV *str) 1050rxvt_term::strwidth (SV *str)
711 CODE: 1051 CODE:
712{ 1052{
731 char *mbstr = rxvt_wcstombs (wstr); 1071 char *mbstr = rxvt_wcstombs (wstr);
732 rxvt_pop_locale (); 1072 rxvt_pop_locale ();
733 1073
734 free (wstr); 1074 free (wstr);
735 1075
736 RETVAL = newSVpv (mbstr, 0); 1076 RETVAL = taint_if (newSVpv (mbstr, 0), str);
737 free (mbstr); 1077 free (mbstr);
738} 1078}
739 OUTPUT: 1079 OUTPUT:
740 RETVAL 1080 RETVAL
741 1081
748 1088
749 rxvt_push_locale (THIS->locale); 1089 rxvt_push_locale (THIS->locale);
750 wchar_t *wstr = rxvt_mbstowcs (data, len); 1090 wchar_t *wstr = rxvt_mbstowcs (data, len);
751 rxvt_pop_locale (); 1091 rxvt_pop_locale ();
752 1092
753 RETVAL = wcs2sv (wstr); 1093 RETVAL = taint_if (wcs2sv (wstr), octets);
754 free (wstr); 1094 free (wstr);
755} 1095}
756 OUTPUT: 1096 OUTPUT:
757 RETVAL 1097 RETVAL
758 1098
759# very portable, especially on objects as opposed to pods 1099#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
760#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
761 1100
762#define TERM_OFFSET_width TERM_OFFSET(width) 1101#define TERM_OFFSET_width TERM_OFFSET(width)
763#define TERM_OFFSET_height TERM_OFFSET(height) 1102#define TERM_OFFSET_height TERM_OFFSET(height)
764#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1103#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
765#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1104#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
768#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1107#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
769#define TERM_OFFSET_focus TERM_OFFSET(focus) 1108#define TERM_OFFSET_focus TERM_OFFSET(focus)
770#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1109#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
771#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1110#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
772#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1111#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
773#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1112#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
774 1113
775int 1114int
776rxvt_term::width () 1115rxvt_term::width ()
777 ALIAS: 1116 ALIAS:
778 width = TERM_OFFSET_width 1117 width = TERM_OFFSET_width
784 ncol = TERM_OFFSET_ncol 1123 ncol = TERM_OFFSET_ncol
785 focus = TERM_OFFSET_focus 1124 focus = TERM_OFFSET_focus
786 mapped = TERM_OFFSET_mapped 1125 mapped = TERM_OFFSET_mapped
787 saveLines = TERM_OFFSET_saveLines 1126 saveLines = TERM_OFFSET_saveLines
788 total_rows = TERM_OFFSET_total_rows 1127 total_rows = TERM_OFFSET_total_rows
789 nsaved = TERM_OFFSET_nsaved 1128 top_row = TERM_OFFSET_top_row
790 CODE: 1129 CODE:
791 RETVAL = *(int *)((char *)THIS + ix); 1130 RETVAL = *(int *)((char *)THIS + ix);
792 OUTPUT: 1131 OUTPUT:
1132 RETVAL
1133
1134unsigned int
1135rxvt_term::ModLevel3Mask ()
1136 ALIAS:
1137 ModLevel3Mask = 0
1138 ModMetaMask = 1
1139 ModNumLockMask = 2
1140 CODE:
1141 switch (ix)
1142 {
1143 case 0: RETVAL = THIS->ModLevel3Mask; break;
1144 case 1: RETVAL = THIS->ModMetaMask; break;
1145 case 2: RETVAL = THIS->ModNumLockMask; break;
1146 }
1147 OUTPUT:
1148 RETVAL
1149
1150char *
1151rxvt_term::display_id ()
1152 ALIAS:
1153 display_id = 0
1154 locale = 1
1155 CODE:
1156 switch (ix)
1157 {
1158 case 0: RETVAL = THIS->display->id; break;
1159 case 1: RETVAL = THIS->locale; break;
1160 }
1161 OUTPUT:
1162 RETVAL
1163
1164SV *
1165rxvt_term::_env ()
1166 CODE:
1167{
1168 if (THIS->envv)
1169 {
1170 AV *av = newAV ();
1171
1172 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1173 if (*i)
1174 av_push (av, newSVpv (*i, 0));
1175
1176 RETVAL = newRV_noinc ((SV *)av);
1177 }
1178 else
1179 RETVAL = &PL_sv_undef;
1180}
1181 OUTPUT:
1182 RETVAL
1183
1184int
1185rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1186 CODE:
1187 RETVAL = THIS->pty_ev.events;
1188 if (events != EVENT_UNDEF)
1189 THIS->pty_ev.set (events);
1190 OUTPUT:
793 RETVAL 1191 RETVAL
794 1192
795U32 1193U32
796rxvt_term::parent () 1194rxvt_term::parent ()
797 CODE: 1195 CODE:
804 CODE: 1202 CODE:
805 RETVAL = (U32)THIS->vt; 1203 RETVAL = (U32)THIS->vt;
806 OUTPUT: 1204 OUTPUT:
807 RETVAL 1205 RETVAL
808 1206
1207void
1208rxvt_term::vt_emask_add (U32 emask)
1209 CODE:
1210 THIS->vt_emask_perl |= emask;
1211 THIS->vt_select_input ();
1212
809U32 1213U32
810rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1214rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
811 CODE: 1215 CODE:
812{
813 RETVAL = THIS->rstyle; 1216 RETVAL = THIS->rstyle;
814 THIS->rstyle = new_rstyle; 1217 THIS->rstyle = new_rstyle;
815}
816 OUTPUT: 1218 OUTPUT:
817 RETVAL 1219 RETVAL
818 1220
819int 1221int
820rxvt_term::view_start (int newval = -1) 1222rxvt_term::view_start (int newval = 1)
1223 PROTOTYPE: $;$
821 CODE: 1224 CODE:
822{ 1225{
823 RETVAL = THIS->view_start; 1226 RETVAL = THIS->view_start;
824 1227
825 if (newval >= 0) 1228 if (newval <= 0)
826 { 1229 THIS->scr_changeview (max (newval, THIS->top_row));
827 THIS->view_start = min (newval, THIS->nsaved);
828 THIS->scr_changeview (RETVAL);
829 }
830} 1230}
831 OUTPUT: 1231 OUTPUT:
832 RETVAL 1232 RETVAL
833 1233
834void 1234void
838 1238
839void 1239void
840rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1240rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
841 PPCODE: 1241 PPCODE:
842{ 1242{
843 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1243 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
844 XSRETURN_EMPTY; 1244 XSRETURN_EMPTY;
845 1245
846 line_t &l = ROW(row_number); 1246 line_t &l = ROW(row_number);
847 1247
848 if (GIMME_V != G_VOID) 1248 if (GIMME_V != G_VOID)
850 wchar_t *wstr = new wchar_t [THIS->ncol]; 1250 wchar_t *wstr = new wchar_t [THIS->ncol];
851 1251
852 for (int col = 0; col < THIS->ncol; col++) 1252 for (int col = 0; col < THIS->ncol; col++)
853 wstr [col] = l.t [col]; 1253 wstr [col] = l.t [col];
854 1254
855 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1255 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
856 1256
857 delete [] wstr; 1257 delete [] wstr;
858 } 1258 }
859 1259
860 if (new_text) 1260 if (new_text)
881 1281
882void 1282void
883rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1283rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
884 PPCODE: 1284 PPCODE:
885{ 1285{
886 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1286 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
887 XSRETURN_EMPTY; 1287 XSRETURN_EMPTY;
888 1288
889 line_t &l = ROW(row_number); 1289 line_t &l = ROW(row_number);
890 1290
891 if (GIMME_V != G_VOID) 1291 if (GIMME_V != G_VOID)
921 1321
922int 1322int
923rxvt_term::ROW_l (int row_number, int new_length = -1) 1323rxvt_term::ROW_l (int row_number, int new_length = -1)
924 CODE: 1324 CODE:
925{ 1325{
926 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1326 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
927 XSRETURN_EMPTY; 1327 XSRETURN_EMPTY;
928 1328
929 line_t &l = ROW(row_number); 1329 line_t &l = ROW(row_number);
930 RETVAL = l.l; 1330 RETVAL = l.l;
931 1331
937 1337
938bool 1338bool
939rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1339rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
940 CODE: 1340 CODE:
941{ 1341{
942 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1342 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
943 XSRETURN_EMPTY; 1343 XSRETURN_EMPTY;
944 1344
945 line_t &l = ROW(row_number); 1345 line_t &l = ROW(row_number);
946 RETVAL = l.is_longer (); 1346 RETVAL = l.is_longer ();
947 1347
981 else 1381 else
982 *r++ = *s; 1382 *r++ = *s;
983 1383
984 rxvt_pop_locale (); 1384 rxvt_pop_locale ();
985 1385
986 RETVAL = wcs2sv (rstr, r - rstr); 1386 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
987 1387
988 delete [] rstr; 1388 delete [] rstr;
989} 1389}
990 OUTPUT: 1390 OUTPUT:
991 RETVAL 1391 RETVAL
1017 else if (IS_COMPOSE (*s)) 1417 else if (IS_COMPOSE (*s))
1018 r += rxvt_composite.expand (*s, r); 1418 r += rxvt_composite.expand (*s, r);
1019 else 1419 else
1020 *r++ = *s; 1420 *r++ = *s;
1021 1421
1022 RETVAL = wcs2sv (rstr, r - rstr); 1422 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1023 1423
1024 delete [] rstr; 1424 delete [] rstr;
1025} 1425}
1026 OUTPUT: 1426 OUTPUT:
1027 RETVAL 1427 RETVAL
1049 1449
1050 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1450 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1051 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1451 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1052 1452
1053 if (GIMME_V != G_VOID) 1453 if (GIMME_V != G_VOID)
1054 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1454 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1055 1455
1056 if (newval) 1456 if (newval)
1057 { 1457 {
1058 if (SvOK (newval)) 1458 if (SvOK (newval))
1059 { 1459 {
1064 else 1464 else
1065 THIS->rs [index] = 0; 1465 THIS->rs [index] = 0;
1066 } 1466 }
1067} 1467}
1068 1468
1469const char *
1470rxvt_term::x_resource (const char *name)
1471 CLEANUP:
1472 SvTAINTED_on (ST (0));
1473
1474bool
1475rxvt_term::option (U32 optval, int set = -1)
1476 CODE:
1477{
1478 RETVAL = THIS->options & optval;
1479
1480 if (set >= 0)
1481 {
1482 if (set)
1483 THIS->options |= optval;
1484 else
1485 THIS->options &= ~optval;
1486
1487 switch (optval)
1488 {
1489 case Opt_skipBuiltinGlyphs:
1490 THIS->set_fonts ();
1491 THIS->scr_remap_chars ();
1492 THIS->scr_touch (true);
1493 THIS->want_refresh = 1;
1494 break;
1495
1496 case Opt_cursorUnderline:
1497 THIS->want_refresh = 1;
1498 break;
1499
1500# case Opt_scrollBar_floating:
1501# case Opt_scrollBar_right:
1502# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1503# break;
1504 }
1505 }
1506}
1507 OUTPUT:
1508 RETVAL
1509
1510bool
1511rxvt_term::parse_keysym (char *keysym, char *str)
1512 CODE:
1513 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1514 THIS->keyboard->register_done ();
1515 OUTPUT:
1516 RETVAL
1517
1069void 1518void
1070rxvt_term::cur (...) 1519rxvt_term::screen_cur (...)
1071 PROTOTYPE: $;$$ 1520 PROTOTYPE: $;$$
1072 ALIAS: 1521 ALIAS:
1073 screen_cur = 0 1522 screen_cur = 0
1074 selection_beg = 1 1523 selection_beg = 1
1075 selection_end = 2 1524 selection_end = 2
1088 PUSHs (sv_2mortal (newSViv (rc.col))); 1537 PUSHs (sv_2mortal (newSViv (rc.col)));
1089 } 1538 }
1090 1539
1091 if (items == 3) 1540 if (items == 3)
1092 { 1541 {
1093 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1542 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1094 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1543 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1095 1544
1096 if (ix) 1545 if (ix)
1097 THIS->want_refresh = 1; 1546 THIS->want_refresh = 1;
1098 } 1547 }
1099} 1548}
1100 1549
1550char
1551rxvt_term::cur_charset ()
1552 CODE:
1553 RETVAL = THIS->charsets [THIS->screen.charset];
1554 OUTPUT:
1555 RETVAL
1556
1557#void
1558#rxvt_term::selection_clear ()
1559
1560void
1561rxvt_term::selection_make (U32 eventtime, bool rect = false)
1562 CODE:
1563 THIS->selection.op = SELECTION_CONT;
1564 THIS->selection.rect = rect;
1565 THIS->selection_make (eventtime);
1566
1101int 1567int
1102rxvt_term::selection_grab (int eventtime = CurrentTime) 1568rxvt_term::selection_grab (U32 eventtime)
1103 1569
1104void 1570void
1105rxvt_term::selection (SV *newtext = 0) 1571rxvt_term::selection (SV *newtext = 0)
1106 PPCODE: 1572 PPCODE:
1107{ 1573{
1108 if (GIMME_V != G_VOID) 1574 if (GIMME_V != G_VOID)
1575 XPUSHs (THIS->selection.text
1109 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1576 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1577 : &PL_sv_undef);
1110 1578
1111 if (newtext) 1579 if (newtext)
1112 { 1580 {
1113 free (THIS->selection.text); 1581 free (THIS->selection.text);
1114 1582
1115 THIS->selection.text = sv2wcs (newtext); 1583 THIS->selection.text = sv2wcs (newtext);
1116 THIS->selection.len = wcslen (THIS->selection.text); 1584 THIS->selection.len = wcslen (THIS->selection.text);
1117 } 1585 }
1118} 1586}
1587
1588void
1589rxvt_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)
1590
1591void
1592rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1593
1594void
1595rxvt_term::scr_bell ()
1119 1596
1120void 1597void
1121rxvt_term::scr_add_lines (SV *string) 1598rxvt_term::scr_add_lines (SV *string)
1122 CODE: 1599 CODE:
1123{ 1600{
1145 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1622 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1146 1623
1147 THIS->cmdbuf_ptr = str; 1624 THIS->cmdbuf_ptr = str;
1148 THIS->cmdbuf_endp = str + len; 1625 THIS->cmdbuf_endp = str + len;
1149 1626
1627 rxvt_push_locale (THIS->locale);
1150 THIS->cmd_parse (); 1628 THIS->cmd_parse ();
1629 rxvt_pop_locale ();
1151 1630
1152 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1631 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1153 THIS->cmdbuf_endp = old_cmdbuf_endp; 1632 THIS->cmdbuf_endp = old_cmdbuf_endp;
1154} 1633}
1155 1634

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines