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.59 by root, Thu Jan 12 02:20:56 2006 UTC vs.
Revision 1.74 by root, Wed Jan 18 10:31:37 2006 UTC

… …
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->leftptr_cursor
46#else 46#else
47# define GRAB_CURSOR None 47# define GRAB_CURSOR None
48#endif 48#endif
49 49
50#undef LINENO 50#undef LINENO
51#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)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55#define ENABLE_PERL_FRILLS 1
56
55///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
56
57static SV *
58taint (SV *sv)
59{
60 SvTAINT (sv);
61 return sv;
62}
63
64static SV *
65taint_if (SV *sv, SV *src)
66{
67 if (SvTAINTED (src))
68 SvTAINT (sv);
69
70 return sv;
71}
72 58
73static wchar_t * 59static wchar_t *
74sv2wcs (SV *sv) 60sv2wcs (SV *sv)
75{ 61{
76 STRLEN len; 62 STRLEN len;
… …
347 for (int y = ov_h; y--; ) 333 for (int y = ov_h; y--; )
348 { 334 {
349 text_t *t1 = text [y]; 335 text_t *t1 = text [y];
350 rend_t *r1 = rend [y]; 336 rend_t *r1 = rend [y];
351 337
352 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 338 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
353 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 339 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
354 340
355 for (int x = ov_w; x--; ) 341 for (int x = ov_w; x--; )
356 { 342 {
357 text_t t = *t1; *t1++ = *t2; *t2++ = t; 343 text_t t = *t1; *t1++ = *t2; *t2++ = t;
358 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 344 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
… …
405 perl_free (perl); 391 perl_free (perl);
406 } 392 }
407} 393}
408 394
409void 395void
410rxvt_perl_interp::init () 396rxvt_perl_interp::init (rxvt_term *term)
411{ 397{
412 if (!perl) 398 if (!perl)
413 { 399 {
400 rxvt_push_locale (""); // perl init destroys current locale
401
414 perl_environ = rxvt_environ; 402 perl_environ = rxvt_environ;
415 swap (perl_environ, environ); 403 swap (perl_environ, environ);
416 404
417 char *argv[] = { 405 char *argv[] = {
418 "", 406 "",
419 "-T", 407 "-e"
420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 408 "BEGIN {"
409 " urxvt->bootstrap;"
410 " unshift @INC, '" LIBDIR "';"
411 "}"
412 ""
413 "use urxvt;"
421 }; 414 };
422 415
423 perl = perl_alloc (); 416 perl = perl_alloc ();
424 perl_construct (perl); 417 perl_construct (perl);
425 418
426 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 419 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
427 || perl_run (perl)) 420 || perl_run (perl))
428 { 421 {
429 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 422 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
430 423
431 perl_destruct (perl); 424 perl_destruct (perl);
432 perl_free (perl); 425 perl_free (perl);
433 perl = 0; 426 perl = 0;
434 } 427 }
435 428
436 swap (perl_environ, environ); 429 swap (perl_environ, environ);
430
431 rxvt_pop_locale ();
432 }
433
434 if (perl)
435 {
436 // runs outside of perls ENV
437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
438 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
437 } 439 }
438} 440}
439 441
440static void 442static void
441ungrab (rxvt_term *THIS) 443ungrab (rxvt_term *THIS)
… …
446 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
447 THIS->perl.grabtime = 0; 449 THIS->perl.grabtime = 0;
448 } 450 }
449} 451}
450 452
453static void
454swap_overlays (rxvt_term *term)
455{
456 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
457
458 if (HvKEYS (hv))
459 {
460 hv_iterinit (hv);
461
462 while (HE *he = hv_iternext (hv))
463 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
464 }
465}
466
451bool 467bool
452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
453{ 469{
454 if (!perl) 470 if (!perl || !term->perl.self)
455 return false; 471 return false;
456 472
457 if (htype == HOOK_INIT) // first hook ever called 473 // pre-handling of some events
474 if (htype == HOOK_REFRESH_END)
475 swap_overlays (term);
476
477 swap (perl_environ, environ);
478
479 bool event_consumed;
480
481 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
482 || term->perl.should_invoke [htype])
483 try
458 { 484 {
459 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 485 dSP;
460 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 486 va_list ap;
487
488 va_start (ap, htype);
489
490 ENTER;
491 SAVETMPS;
492
493 PUSHMARK (SP);
494
495 XPUSHs (sv_2mortal (newSVterm (term)));
496 XPUSHs (sv_2mortal (newSViv (htype)));
497
498 for (;;) {
499 data_type dt = (data_type)va_arg (ap, int);
500
501 switch (dt)
502 {
503 case DT_INT:
504 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
505 break;
506
507 case DT_LONG:
508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
509 break;
510
511 case DT_STR:
512 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
513 break;
514
515 case DT_STR_LEN:
516 {
517 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int);
519
520 XPUSHs (sv_2mortal (newSVpvn (str, len)));
521 }
522 break;
523
524 case DT_WCS_LEN:
525 {
526 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int);
528
529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
530 }
531 break;
532
533 case DT_XEVENT:
534 {
535 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV ();
537
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
541# undef set
542
543 setiv (type, xe->type);
544 setiv (send_event, xe->xany.send_event);
545 setiv (serial, xe->xany.serial);
546
547 switch (xe->type)
548 {
549 case KeyPress:
550 case KeyRelease:
551 case ButtonPress:
552 case ButtonRelease:
553 case MotionNotify:
554 setuv (window, xe->xmotion.window);
555 setuv (root, xe->xmotion.root);
556 setuv (subwindow, xe->xmotion.subwindow);
557 setuv (time, xe->xmotion.time);
558 setiv (x, xe->xmotion.x);
559 setiv (y, xe->xmotion.y);
560 setiv (row, xe->xmotion.y / term->fheight);
561 setiv (col, xe->xmotion.x / term->fwidth);
562 setiv (x_root, xe->xmotion.x_root);
563 setiv (y_root, xe->xmotion.y_root);
564 setuv (state, xe->xmotion.state);
565
566 switch (xe->type)
567 {
568 case KeyPress:
569 case KeyRelease:
570 setuv (keycode, xe->xkey.keycode);
571 break;
572
573 case ButtonPress:
574 case ButtonRelease:
575 setuv (button, xe->xbutton.button);
576 break;
577
578 case MotionNotify:
579 setiv (is_hint, xe->xmotion.is_hint);
580 break;
581 }
582
583 break;
584
585 case MapNotify:
586 case UnmapNotify:
587 case ConfigureNotify:
588 setuv (event, xe->xconfigure.event);
589 setuv (window, xe->xconfigure.window);
590
591 switch (xe->type)
592 {
593 case ConfigureNotify:
594 setiv (x, xe->xconfigure.x);
595 setiv (y, xe->xconfigure.y);
596 setiv (width, xe->xconfigure.width);
597 setiv (height, xe->xconfigure.height);
598 setuv (above, xe->xconfigure.above);
599 break;
600 }
601
602 break;
603 }
604
605 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
606 }
607 break;
608
609 case DT_END:
610 goto call;
611
612 default:
613 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
614 }
615 }
616
617 call:
618 va_end (ap);
619
620 PUTBACK;
621 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
622 SPAGAIN;
623
624 if (count)
625 {
626 SV *status = POPs;
627 count = SvTRUE (status);
628 }
629
630 PUTBACK;
631 FREETMPS;
632 LEAVE;
633
634 if (SvTRUE (ERRSV))
635 {
636 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
637 ungrab (term); // better lose the grab than the session
638 }
639
640 event_consumed = !!count;
461 } 641 }
462 else if (!term->perl.self) 642 catch (...)
463 return false; // perl not initialized for this instance 643 {
644 swap (perl_environ, environ);
645 throw;
646 }
647 else
648 event_consumed = false;
649
650 // post-handling of some events
651 if (htype == HOOK_REFRESH_BEGIN)
652 swap_overlays (term);
464 else if (htype == HOOK_DESTROY) 653 else if (htype == HOOK_DESTROY)
465 { 654 {
466 // handled later 655 clearSVptr ((SV *)term->perl.self);
656 SvREFCNT_dec ((SV *)term->perl.self);
467 } 657 }
468 else
469 {
470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
471 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473
474 if (HvKEYS (hv))
475 {
476 hv_iterinit (hv);
477
478 while (HE *he = hv_iternext (hv))
479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
482 }
483
484 if (!should_invoke [htype])
485 return false;
486 }
487 658
488 swap (perl_environ, environ); 659 swap (perl_environ, environ);
489 660
490 try 661 return event_consumed;
491 {
492 dSP;
493 va_list ap;
494
495 va_start (ap, htype);
496
497 ENTER;
498 SAVETMPS;
499
500 PUSHMARK (SP);
501
502 XPUSHs (sv_2mortal (newSVterm (term)));
503 XPUSHs (sv_2mortal (newSViv (htype)));
504
505 for (;;) {
506 data_type dt = (data_type)va_arg (ap, int);
507
508 switch (dt)
509 {
510 case DT_INT:
511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
512 break;
513
514 case DT_LONG:
515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
516 break;
517
518 case DT_STR:
519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
520 break;
521
522 case DT_STR_LEN:
523 {
524 char *str = va_arg (ap, char *);
525 int len = va_arg (ap, int);
526
527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
528 }
529 break;
530
531 case DT_WCS_LEN:
532 {
533 wchar_t *wstr = va_arg (ap, wchar_t *);
534 int wlen = va_arg (ap, int);
535
536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
537 }
538 break;
539
540 case DT_XEVENT:
541 {
542 XEvent *xe = va_arg (ap, XEvent *);
543 HV *hv = newHV ();
544
545# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
546# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
547# undef set
548
549 setiv (type, xe->type);
550 setiv (send_event, xe->xany.send_event);
551 setiv (serial, xe->xany.serial);
552
553 switch (xe->type)
554 {
555 case KeyPress:
556 case KeyRelease:
557 case ButtonPress:
558 case ButtonRelease:
559 case MotionNotify:
560 setiv (time, xe->xmotion.time);
561 setiv (x, xe->xmotion.x);
562 setiv (y, xe->xmotion.y);
563 setiv (row, xe->xmotion.y / term->fheight);
564 setiv (col, xe->xmotion.x / term->fwidth);
565 setiv (x_root, xe->xmotion.x_root);
566 setiv (y_root, xe->xmotion.y_root);
567 setiv (state, xe->xmotion.state);
568 break;
569 }
570
571 switch (xe->type)
572 {
573 case KeyPress:
574 case KeyRelease:
575 setiv (keycode, xe->xkey.keycode);
576 break;
577
578 case ButtonPress:
579 case ButtonRelease:
580 setiv (button, xe->xbutton.button);
581 break;
582
583 case MotionNotify:
584 setiv (is_hint, xe->xmotion.is_hint);
585 break;
586 }
587
588 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
589 }
590 break;
591
592 case DT_END:
593 {
594 va_end (ap);
595
596 PUTBACK;
597 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
598 SPAGAIN;
599
600 if (count)
601 {
602 SV *status = POPs;
603 count = SvTRUE (status);
604 }
605
606 PUTBACK;
607 FREETMPS;
608 LEAVE;
609
610 if (SvTRUE (ERRSV))
611 {
612 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
613 ungrab (term); // better lose the grab than the session
614 }
615
616 if (htype == HOOK_DESTROY)
617 {
618 clearSVptr ((SV *)term->perl.self);
619 SvREFCNT_dec ((SV *)term->perl.self);
620 }
621
622 swap (perl_environ, environ);
623 return count;
624 }
625
626 default:
627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 }
629 }
630 }
631 catch (...)
632 {
633 swap (perl_environ, environ);
634 throw;
635 }
636} 662}
637 663
638///////////////////////////////////////////////////////////////////////////// 664/////////////////////////////////////////////////////////////////////////////
639 665
640MODULE = urxvt PACKAGE = urxvt 666MODULE = urxvt PACKAGE = urxvt
… …
659# include "optinc.h" 685# include "optinc.h"
660# undef nodef 686# undef nodef
661# undef def 687# undef def
662 688
663 HV *stash = gv_stashpv ("urxvt", 1); 689 HV *stash = gv_stashpv ("urxvt", 1);
664# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); 690 struct {
691 const char *name;
692 IV iv;
693 } *civ, const_iv[] = {
694# define const_iv(name) { # name, (IV)name }
665 export_const_iv (DEFAULT_RSTYLE); 695 const_iv (DEFAULT_RSTYLE),
666 export_const_iv (OVERLAY_RSTYLE); 696 const_iv (OVERLAY_RSTYLE),
667 export_const_iv (RS_Bold); 697 const_iv (RS_Bold),
668 export_const_iv (RS_Italic); 698 const_iv (RS_Italic),
669 export_const_iv (RS_Blink); 699 const_iv (RS_Blink),
670 export_const_iv (RS_RVid); 700 const_iv (RS_RVid),
671 export_const_iv (RS_Uline); 701 const_iv (RS_Uline),
672 702
673 export_const_iv (CurrentTime); 703 const_iv (CurrentTime),
674 export_const_iv (ShiftMask); 704 const_iv (ShiftMask),
675 export_const_iv (LockMask); 705 const_iv (LockMask),
676 export_const_iv (ControlMask); 706 const_iv (ControlMask),
677 export_const_iv (Mod1Mask); 707 const_iv (Mod1Mask),
678 export_const_iv (Mod2Mask); 708 const_iv (Mod2Mask),
679 export_const_iv (Mod3Mask); 709 const_iv (Mod3Mask),
680 export_const_iv (Mod4Mask); 710 const_iv (Mod4Mask),
681 export_const_iv (Mod5Mask); 711 const_iv (Mod5Mask),
682 export_const_iv (Button1Mask); 712 const_iv (Button1Mask),
683 export_const_iv (Button2Mask); 713 const_iv (Button2Mask),
684 export_const_iv (Button3Mask); 714 const_iv (Button3Mask),
685 export_const_iv (Button4Mask); 715 const_iv (Button4Mask),
686 export_const_iv (Button5Mask); 716 const_iv (Button5Mask),
687 export_const_iv (AnyModifier); 717 const_iv (AnyModifier),
688 718
689 export_const_iv (EVENT_NONE); 719 const_iv (EVENT_NONE),
690 export_const_iv (EVENT_READ); 720 const_iv (EVENT_READ),
691 export_const_iv (EVENT_WRITE); 721 const_iv (EVENT_WRITE),
692}
693 722
694void 723 const_iv (NoEventMask),
695set_should_invoke (int htype, int value) 724 const_iv (KeyPressMask),
696 CODE: 725 const_iv (KeyReleaseMask),
697 rxvt_perl.should_invoke [htype] = value; 726 const_iv (ButtonPressMask),
727 const_iv (ButtonReleaseMask),
728 const_iv (EnterWindowMask),
729 const_iv (LeaveWindowMask),
730 const_iv (PointerMotionMask),
731 const_iv (PointerMotionHintMask),
732 const_iv (Button1MotionMask),
733 const_iv (Button2MotionMask),
734 const_iv (Button3MotionMask),
735 const_iv (Button4MotionMask),
736 const_iv (Button5MotionMask),
737 const_iv (ButtonMotionMask),
738 const_iv (KeymapStateMask),
739 const_iv (ExposureMask),
740 const_iv (VisibilityChangeMask),
741 const_iv (StructureNotifyMask),
742 const_iv (ResizeRedirectMask),
743 const_iv (SubstructureNotifyMask),
744 const_iv (SubstructureRedirectMask),
745 const_iv (FocusChangeMask),
746 const_iv (PropertyChangeMask),
747 const_iv (ColormapChangeMask),
748 const_iv (OwnerGrabButtonMask),
749
750 const_iv (KeyPress),
751 const_iv (KeyRelease),
752 const_iv (ButtonPress),
753 const_iv (ButtonRelease),
754 const_iv (MotionNotify),
755 const_iv (EnterNotify),
756 const_iv (LeaveNotify),
757 const_iv (FocusIn),
758 const_iv (FocusOut),
759 const_iv (KeymapNotify),
760 const_iv (Expose),
761 const_iv (GraphicsExpose),
762 const_iv (NoExpose),
763 const_iv (VisibilityNotify),
764 const_iv (CreateNotify),
765 const_iv (DestroyNotify),
766 const_iv (UnmapNotify),
767 const_iv (MapNotify),
768 const_iv (MapRequest),
769 const_iv (ReparentNotify),
770 const_iv (ConfigureNotify),
771 const_iv (ConfigureRequest),
772 const_iv (GravityNotify),
773 const_iv (ResizeRequest),
774 const_iv (CirculateNotify),
775 const_iv (CirculateRequest),
776 const_iv (PropertyNotify),
777 const_iv (SelectionClear),
778 const_iv (SelectionRequest),
779 const_iv (SelectionNotify),
780 const_iv (ColormapNotify),
781 const_iv (ClientMessage),
782 const_iv (MappingNotify),
783 };
784
785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
786 civ-- > const_iv; )
787 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
788}
698 789
699void 790void
700warn (const char *msg) 791warn (const char *msg)
701 CODE: 792 CODE:
702 rxvt_warn ("%s", msg); 793 rxvt_warn ("%s", msg);
… …
704void 795void
705fatal (const char *msg) 796fatal (const char *msg)
706 CODE: 797 CODE:
707 rxvt_fatal ("%s", msg); 798 rxvt_fatal ("%s", msg);
708 799
709SV *
710untaint (SV *sv)
711 CODE:
712 RETVAL = newSVsv (sv);
713 SvTAINTED_off (RETVAL);
714 OUTPUT:
715 RETVAL
716
717void 800void
718_exit (int status) 801_exit (int status)
719
720bool
721safe ()
722 CODE:
723 RETVAL = !rxvt_tainted ();
724 OUTPUT:
725 RETVAL
726 802
727NV 803NV
728NOW () 804NOW ()
729 CODE: 805 CODE:
730 RETVAL = NOW; 806 RETVAL = NOW;
… …
825 OUTPUT: 901 OUTPUT:
826 RETVAL 902 RETVAL
827 903
828void 904void
829rxvt_term::destroy () 905rxvt_term::destroy ()
906
907#if ENABLE_PERL_FRILLS
908
909void
910rxvt_term::XListProperties (U32 window)
911 PPCODE:
912{
913 int count;
914 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
915
916 EXTEND (SP, count);
917 while (count--)
918 PUSHs (newSVuv ((U32)props [count]));
919
920 XFree (props);
921}
922
923void
924rxvt_term::XGetWindowProperty (U32 window, U32 property)
925 PPCODE:
926{
927 Atom type;
928 int format;
929 unsigned long nitems;
930 unsigned long bytes_after;
931 unsigned char *prop;
932 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
933 0, 1<<30, 0, AnyPropertyType,
934 &type, &format, &nitems, &bytes_after, &prop);
935 if (type != None)
936 {
937 EXTEND (SP, 3);
938 PUSHs (newSVuv ((U32)type));
939 PUSHs (newSViv (format));
940 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
941 XFree (prop);
942 }
943}
944
945void
946rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
947 CODE:
948{
949 STRLEN len;
950 char *data_ = SvPVbyte (data, len);
951
952 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
953 type, format, PropModeReplace,
954 (unsigned char *)data, len * 8 / format);
955}
956
957void
958rxvt_term::XDeleteProperty (U32 window, U32 property)
959 CODE:
960 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
961
962U32
963rxvt_term::DefaultRootWindow ()
964 CODE:
965 RETVAL = (U32)THIS->display->root;
966 OUTPUT:
967 RETVAL
968
969U32
970rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
971 CODE:
972 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
973 x, y, width, height, 0,
974 THIS->pix_colors_focused[Color_border],
975 THIS->pix_colors_focused[Color_border]);
976 OUTPUT:
977 RETVAL
978
979void
980rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
981 CODE:
982 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
983
984void
985rxvt_term::XMapWindow (U32 window)
986 CODE:
987 XMapWindow (THIS->display->display, (Window)window);
988
989void
990rxvt_term::XUnmapWindow (U32 window)
991 CODE:
992 XUnmapWindow (THIS->display->display, (Window)window);
993
994#endif
995
996void
997rxvt_term::set_should_invoke (int htype, int inc)
998 CODE:
999 THIS->perl.should_invoke [htype] += inc;
830 1000
831void 1001void
832rxvt_term::grab_button (int button, U32 modifiers) 1002rxvt_term::grab_button (int button, U32 modifiers)
833 CODE: 1003 CODE:
834 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1004 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
… …
902 char *mbstr = rxvt_wcstombs (wstr); 1072 char *mbstr = rxvt_wcstombs (wstr);
903 rxvt_pop_locale (); 1073 rxvt_pop_locale ();
904 1074
905 free (wstr); 1075 free (wstr);
906 1076
907 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1077 RETVAL = newSVpv (mbstr, 0);
908 free (mbstr); 1078 free (mbstr);
909} 1079}
910 OUTPUT: 1080 OUTPUT:
911 RETVAL 1081 RETVAL
912 1082
… …
919 1089
920 rxvt_push_locale (THIS->locale); 1090 rxvt_push_locale (THIS->locale);
921 wchar_t *wstr = rxvt_mbstowcs (data, len); 1091 wchar_t *wstr = rxvt_mbstowcs (data, len);
922 rxvt_pop_locale (); 1092 rxvt_pop_locale ();
923 1093
924 RETVAL = taint_if (wcs2sv (wstr), octets); 1094 RETVAL = wcs2sv (wstr);
925 free (wstr); 1095 free (wstr);
926} 1096}
927 OUTPUT: 1097 OUTPUT:
928 RETVAL 1098 RETVAL
929 1099
… …
938#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1108#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
939#define TERM_OFFSET_focus TERM_OFFSET(focus) 1109#define TERM_OFFSET_focus TERM_OFFSET(focus)
940#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1110#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
941#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1111#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
942#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1112#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
943#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1113#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
944 1114
945int 1115int
946rxvt_term::width () 1116rxvt_term::width ()
947 ALIAS: 1117 ALIAS:
948 width = TERM_OFFSET_width 1118 width = TERM_OFFSET_width
… …
954 ncol = TERM_OFFSET_ncol 1124 ncol = TERM_OFFSET_ncol
955 focus = TERM_OFFSET_focus 1125 focus = TERM_OFFSET_focus
956 mapped = TERM_OFFSET_mapped 1126 mapped = TERM_OFFSET_mapped
957 saveLines = TERM_OFFSET_saveLines 1127 saveLines = TERM_OFFSET_saveLines
958 total_rows = TERM_OFFSET_total_rows 1128 total_rows = TERM_OFFSET_total_rows
959 nsaved = TERM_OFFSET_nsaved 1129 top_row = TERM_OFFSET_top_row
960 CODE: 1130 CODE:
961 RETVAL = *(int *)((char *)THIS + ix); 1131 RETVAL = *(int *)((char *)THIS + ix);
962 OUTPUT: 1132 OUTPUT:
963 RETVAL 1133 RETVAL
964 1134
… …
1033 CODE: 1203 CODE:
1034 RETVAL = (U32)THIS->vt; 1204 RETVAL = (U32)THIS->vt;
1035 OUTPUT: 1205 OUTPUT:
1036 RETVAL 1206 RETVAL
1037 1207
1208void
1209rxvt_term::vt_emask_add (U32 emask)
1210 CODE:
1211 THIS->vt_emask_perl |= emask;
1212 THIS->vt_select_input ();
1213
1038U32 1214U32
1039rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1215rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1040 CODE: 1216 CODE:
1041{
1042 RETVAL = THIS->rstyle; 1217 RETVAL = THIS->rstyle;
1043 THIS->rstyle = new_rstyle; 1218 THIS->rstyle = new_rstyle;
1044}
1045 OUTPUT: 1219 OUTPUT:
1046 RETVAL 1220 RETVAL
1047 1221
1048int 1222int
1049rxvt_term::view_start (int newval = -1) 1223rxvt_term::view_start (int newval = 1)
1224 PROTOTYPE: $;$
1050 CODE: 1225 CODE:
1051{ 1226{
1052 RETVAL = THIS->view_start; 1227 RETVAL = THIS->view_start;
1053 1228
1054 if (newval >= 0) 1229 if (newval <= 0)
1055 { 1230 THIS->scr_changeview (max (newval, THIS->top_row));
1056 THIS->view_start = min (newval, THIS->nsaved);
1057 THIS->scr_changeview (RETVAL);
1058 }
1059} 1231}
1060 OUTPUT: 1232 OUTPUT:
1061 RETVAL 1233 RETVAL
1062 1234
1063void 1235void
… …
1067 1239
1068void 1240void
1069rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1241rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1070 PPCODE: 1242 PPCODE:
1071{ 1243{
1072 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1244 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1073 XSRETURN_EMPTY; 1245 XSRETURN_EMPTY;
1074 1246
1075 line_t &l = ROW(row_number); 1247 line_t &l = ROW(row_number);
1076 1248
1077 if (GIMME_V != G_VOID) 1249 if (GIMME_V != G_VOID)
… …
1079 wchar_t *wstr = new wchar_t [THIS->ncol]; 1251 wchar_t *wstr = new wchar_t [THIS->ncol];
1080 1252
1081 for (int col = 0; col < THIS->ncol; col++) 1253 for (int col = 0; col < THIS->ncol; col++)
1082 wstr [col] = l.t [col]; 1254 wstr [col] = l.t [col];
1083 1255
1084 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1256 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1085 1257
1086 delete [] wstr; 1258 delete [] wstr;
1087 } 1259 }
1088 1260
1089 if (new_text) 1261 if (new_text)
… …
1110 1282
1111void 1283void
1112rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1284rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1113 PPCODE: 1285 PPCODE:
1114{ 1286{
1115 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1287 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1116 XSRETURN_EMPTY; 1288 XSRETURN_EMPTY;
1117 1289
1118 line_t &l = ROW(row_number); 1290 line_t &l = ROW(row_number);
1119 1291
1120 if (GIMME_V != G_VOID) 1292 if (GIMME_V != G_VOID)
… …
1150 1322
1151int 1323int
1152rxvt_term::ROW_l (int row_number, int new_length = -1) 1324rxvt_term::ROW_l (int row_number, int new_length = -1)
1153 CODE: 1325 CODE:
1154{ 1326{
1155 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1327 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1156 XSRETURN_EMPTY; 1328 XSRETURN_EMPTY;
1157 1329
1158 line_t &l = ROW(row_number); 1330 line_t &l = ROW(row_number);
1159 RETVAL = l.l; 1331 RETVAL = l.l;
1160 1332
… …
1166 1338
1167bool 1339bool
1168rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1340rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1169 CODE: 1341 CODE:
1170{ 1342{
1171 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1343 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1172 XSRETURN_EMPTY; 1344 XSRETURN_EMPTY;
1173 1345
1174 line_t &l = ROW(row_number); 1346 line_t &l = ROW(row_number);
1175 RETVAL = l.is_longer (); 1347 RETVAL = l.is_longer ();
1176 1348
… …
1210 else 1382 else
1211 *r++ = *s; 1383 *r++ = *s;
1212 1384
1213 rxvt_pop_locale (); 1385 rxvt_pop_locale ();
1214 1386
1215 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1387 RETVAL = wcs2sv (rstr, r - rstr);
1216 1388
1217 delete [] rstr; 1389 delete [] rstr;
1218} 1390}
1219 OUTPUT: 1391 OUTPUT:
1220 RETVAL 1392 RETVAL
… …
1246 else if (IS_COMPOSE (*s)) 1418 else if (IS_COMPOSE (*s))
1247 r += rxvt_composite.expand (*s, r); 1419 r += rxvt_composite.expand (*s, r);
1248 else 1420 else
1249 *r++ = *s; 1421 *r++ = *s;
1250 1422
1251 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1423 RETVAL = wcs2sv (rstr, r - rstr);
1252 1424
1253 delete [] rstr; 1425 delete [] rstr;
1254} 1426}
1255 OUTPUT: 1427 OUTPUT:
1256 RETVAL 1428 RETVAL
… …
1278 1450
1279 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1451 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1280 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1452 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1281 1453
1282 if (GIMME_V != G_VOID) 1454 if (GIMME_V != G_VOID)
1283 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1455 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1284 1456
1285 if (newval) 1457 if (newval)
1286 { 1458 {
1287 if (SvOK (newval)) 1459 if (SvOK (newval))
1288 { 1460 {
… …
1295 } 1467 }
1296} 1468}
1297 1469
1298const char * 1470const char *
1299rxvt_term::x_resource (const char *name) 1471rxvt_term::x_resource (const char *name)
1300 CLEANUP:
1301 SvTAINTED_on (ST (0));
1302 1472
1303bool 1473bool
1304rxvt_term::option (U32 optval, int set = -1) 1474rxvt_term::option (U32 optval, int set = -1)
1305 CODE: 1475 CODE:
1306{ 1476{
… …
1366 PUSHs (sv_2mortal (newSViv (rc.col))); 1536 PUSHs (sv_2mortal (newSViv (rc.col)));
1367 } 1537 }
1368 1538
1369 if (items == 3) 1539 if (items == 3)
1370 { 1540 {
1371 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1541 rc.row = SvIV (ST (1));
1372 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1542 rc.col = SvIV (ST (2));
1543
1544 if (ix == 2 && rc.col == 0)
1545 {
1546 rc.row--;
1547 rc.col = THIS->ncol;
1548 }
1549
1550 clamp_it (rc.col, 0, THIS->ncol);
1551 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1373 1552
1374 if (ix) 1553 if (ix)
1375 THIS->want_refresh = 1; 1554 THIS->want_refresh = 1;
1376 } 1555 }
1377} 1556}
… …
1381 CODE: 1560 CODE:
1382 RETVAL = THIS->charsets [THIS->screen.charset]; 1561 RETVAL = THIS->charsets [THIS->screen.charset];
1383 OUTPUT: 1562 OUTPUT:
1384 RETVAL 1563 RETVAL
1385 1564
1565#void
1566#rxvt_term::selection_clear ()
1567
1568void
1569rxvt_term::selection_make (U32 eventtime, bool rect = false)
1570 CODE:
1571 THIS->selection.op = SELECTION_CONT;
1572 THIS->selection.rect = rect;
1573 THIS->selection_make (eventtime);
1574
1386int 1575int
1387rxvt_term::selection_grab (U32 eventtime) 1576rxvt_term::selection_grab (U32 eventtime)
1388 1577
1389void 1578void
1390rxvt_term::selection (SV *newtext = 0) 1579rxvt_term::selection (SV *newtext = 0)
1391 PPCODE: 1580 PPCODE:
1392{ 1581{
1393 if (GIMME_V != G_VOID) 1582 if (GIMME_V != G_VOID)
1394 XPUSHs (THIS->selection.text 1583 XPUSHs (THIS->selection.text
1395 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1584 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1396 : &PL_sv_undef); 1585 : &PL_sv_undef);
1397 1586
1398 if (newtext) 1587 if (newtext)
1399 { 1588 {
1400 free (THIS->selection.text); 1589 free (THIS->selection.text);

Diff Legend

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