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.57 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.74 by root, Wed Jan 18 10:31:37 2006 UTC

… …
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h"
35
34#include "iom.h" 36#include "iom.h"
35#include "rxvt.h" 37#include "rxvt.h"
36#include "keyboard.h" 38#include "keyboard.h"
37#include "rxvtutil.h" 39#include "rxvtutil.h"
38#include "rxvtperl.h" 40#include "rxvtperl.h"
39 41
40#include "perlxsi.c" 42#include "perlxsi.c"
41 43
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 44#ifdef HAVE_SCROLLBARS
43# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->leftptr_cursor
44#else 46#else
45# define GRAB_CURSOR None 47# define GRAB_CURSOR None
46#endif 48#endif
47 49
48#undef LINENO 50#undef LINENO
49#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)
50#undef ROW 52#undef ROW
51#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
52 54
55#define ENABLE_PERL_FRILLS 1
56
53///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
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 58
71static wchar_t * 59static wchar_t *
72sv2wcs (SV *sv) 60sv2wcs (SV *sv)
73{ 61{
74 STRLEN len; 62 STRLEN len;
… …
345 for (int y = ov_h; y--; ) 333 for (int y = ov_h; y--; )
346 { 334 {
347 text_t *t1 = text [y]; 335 text_t *t1 = text [y];
348 rend_t *r1 = rend [y]; 336 rend_t *r1 = rend [y];
349 337
350 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;
351 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;
352 340
353 for (int x = ov_w; x--; ) 341 for (int x = ov_w; x--; )
354 { 342 {
355 text_t t = *t1; *t1++ = *t2; *t2++ = t; 343 text_t t = *t1; *t1++ = *t2; *t2++ = t;
356 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));
… …
393 381
394struct rxvt_perl_interp rxvt_perl; 382struct rxvt_perl_interp rxvt_perl;
395 383
396static PerlInterpreter *perl; 384static PerlInterpreter *perl;
397 385
398rxvt_perl_interp::rxvt_perl_interp ()
399{
400}
401
402rxvt_perl_interp::~rxvt_perl_interp () 386rxvt_perl_interp::~rxvt_perl_interp ()
403{ 387{
404 if (perl) 388 if (perl)
405 { 389 {
406 perl_destruct (perl); 390 perl_destruct (perl);
407 perl_free (perl); 391 perl_free (perl);
408 } 392 }
409} 393}
410 394
411void 395void
412rxvt_perl_interp::init () 396rxvt_perl_interp::init (rxvt_term *term)
413{ 397{
414 if (!perl) 398 if (!perl)
415 { 399 {
400 rxvt_push_locale (""); // perl init destroys current locale
401
416 perl_environ = rxvt_environ; 402 perl_environ = rxvt_environ;
417 swap (perl_environ, environ); 403 swap (perl_environ, environ);
418 404
419 char *argv[] = { 405 char *argv[] = {
420 "", 406 "",
421 "-T", 407 "-e"
422 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 408 "BEGIN {"
409 " urxvt->bootstrap;"
410 " unshift @INC, '" LIBDIR "';"
411 "}"
412 ""
413 "use urxvt;"
423 }; 414 };
424 415
425 perl = perl_alloc (); 416 perl = perl_alloc ();
426 perl_construct (perl); 417 perl_construct (perl);
427 418
428 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 419 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
429 || perl_run (perl)) 420 || perl_run (perl))
430 { 421 {
431 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 422 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
432 423
433 perl_destruct (perl); 424 perl_destruct (perl);
434 perl_free (perl); 425 perl_free (perl);
435 perl = 0; 426 perl = 0;
436 } 427 }
437 428
438 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);
439 } 439 }
440} 440}
441 441
442static void 442static void
443ungrab (rxvt_term *THIS) 443ungrab (rxvt_term *THIS)
… …
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 449 THIS->perl.grabtime = 0;
450 } 450 }
451} 451}
452 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
453bool 467bool
454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
455{ 469{
456 if (!perl) 470 if (!perl || !term->perl.self)
457 return false; 471 return false;
458 472
459 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
460 { 484 {
461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 485 dSP;
462 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;
463 } 641 }
464 else if (!term->perl.self) 642 catch (...)
465 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);
466 else if (htype == HOOK_DESTROY) 653 else if (htype == HOOK_DESTROY)
467 { 654 {
468 // handled later 655 clearSVptr ((SV *)term->perl.self);
656 SvREFCNT_dec ((SV *)term->perl.self);
469 } 657 }
470 else
471 {
472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
473 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
475
476 if (HvKEYS (hv))
477 {
478 hv_iterinit (hv);
479
480 while (HE *he = hv_iternext (hv))
481 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482 }
483
484 }
485
486 if (!should_invoke [htype])
487 return false;
488 }
489 658
490 swap (perl_environ, environ); 659 swap (perl_environ, environ);
491 660
492 try 661 return event_consumed;
493 {
494 dSP;
495 va_list ap;
496
497 va_start (ap, htype);
498
499 ENTER;
500 SAVETMPS;
501
502 PUSHMARK (SP);
503
504 XPUSHs (sv_2mortal (newSVterm (term)));
505 XPUSHs (sv_2mortal (newSViv (htype)));
506
507 for (;;) {
508 data_type dt = (data_type)va_arg (ap, int);
509
510 switch (dt)
511 {
512 case DT_INT:
513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514 break;
515
516 case DT_LONG:
517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518 break;
519
520 case DT_STR:
521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
522 break;
523
524 case DT_STR_LEN:
525 {
526 char *str = va_arg (ap, char *);
527 int len = va_arg (ap, int);
528
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
530 }
531 break;
532
533 case DT_WCS_LEN:
534 {
535 wchar_t *wstr = va_arg (ap, wchar_t *);
536 int wlen = va_arg (ap, int);
537
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
539 }
540 break;
541
542 case DT_XEVENT:
543 {
544 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV ();
546
547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
548# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549# undef set
550
551 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial);
554
555 switch (xe->type)
556 {
557 case KeyPress:
558 case KeyRelease:
559 case ButtonPress:
560 case ButtonRelease:
561 case MotionNotify:
562 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state);
570 break;
571 }
572
573 switch (xe->type)
574 {
575 case KeyPress:
576 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode);
578 break;
579
580 case ButtonPress:
581 case ButtonRelease:
582 setiv (button, xe->xbutton.button);
583 break;
584
585 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint);
587 break;
588 }
589
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 }
592 break;
593
594 case DT_END:
595 {
596 va_end (ap);
597
598 PUTBACK;
599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
600 SPAGAIN;
601
602 if (count)
603 {
604 SV *status = POPs;
605 count = SvTRUE (status);
606 }
607
608 PUTBACK;
609 FREETMPS;
610 LEAVE;
611
612 if (SvTRUE (ERRSV))
613 {
614 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
615 ungrab (term); // better lose the grab than the session
616 }
617
618 if (htype == HOOK_DESTROY)
619 {
620 clearSVptr ((SV *)term->perl.self);
621 SvREFCNT_dec ((SV *)term->perl.self);
622 }
623
624 swap (perl_environ, environ);
625 return count;
626 }
627
628 default:
629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 }
631 }
632 }
633 catch (...)
634 {
635 swap (perl_environ, environ);
636 throw;
637 }
638} 662}
639 663
640///////////////////////////////////////////////////////////////////////////// 664/////////////////////////////////////////////////////////////////////////////
641 665
642MODULE = urxvt PACKAGE = urxvt 666MODULE = urxvt PACKAGE = urxvt
… …
661# include "optinc.h" 685# include "optinc.h"
662# undef nodef 686# undef nodef
663# undef def 687# undef def
664 688
665 HV *stash = gv_stashpv ("urxvt", 1); 689 HV *stash = gv_stashpv ("urxvt", 1);
666# 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 }
667 export_const_iv (DEFAULT_RSTYLE); 695 const_iv (DEFAULT_RSTYLE),
668 export_const_iv (OVERLAY_RSTYLE); 696 const_iv (OVERLAY_RSTYLE),
669 export_const_iv (RS_Bold); 697 const_iv (RS_Bold),
670 export_const_iv (RS_Italic); 698 const_iv (RS_Italic),
671 export_const_iv (RS_Blink); 699 const_iv (RS_Blink),
672 export_const_iv (RS_RVid); 700 const_iv (RS_RVid),
673 export_const_iv (RS_Uline); 701 const_iv (RS_Uline),
674 702
675 export_const_iv (CurrentTime); 703 const_iv (CurrentTime),
676 export_const_iv (ShiftMask); 704 const_iv (ShiftMask),
677 export_const_iv (LockMask); 705 const_iv (LockMask),
678 export_const_iv (ControlMask); 706 const_iv (ControlMask),
679 export_const_iv (Mod1Mask); 707 const_iv (Mod1Mask),
680 export_const_iv (Mod2Mask); 708 const_iv (Mod2Mask),
681 export_const_iv (Mod3Mask); 709 const_iv (Mod3Mask),
682 export_const_iv (Mod4Mask); 710 const_iv (Mod4Mask),
683 export_const_iv (Mod5Mask); 711 const_iv (Mod5Mask),
684 export_const_iv (Button1Mask); 712 const_iv (Button1Mask),
685 export_const_iv (Button2Mask); 713 const_iv (Button2Mask),
686 export_const_iv (Button3Mask); 714 const_iv (Button3Mask),
687 export_const_iv (Button4Mask); 715 const_iv (Button4Mask),
688 export_const_iv (Button5Mask); 716 const_iv (Button5Mask),
689 export_const_iv (AnyModifier); 717 const_iv (AnyModifier),
690 718
691 export_const_iv (EVENT_NONE); 719 const_iv (EVENT_NONE),
692 export_const_iv (EVENT_READ); 720 const_iv (EVENT_READ),
693 export_const_iv (EVENT_WRITE); 721 const_iv (EVENT_WRITE),
694}
695 722
696void 723 const_iv (NoEventMask),
697set_should_invoke (int htype, int value) 724 const_iv (KeyPressMask),
698 CODE: 725 const_iv (KeyReleaseMask),
699 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}
700 789
701void 790void
702warn (const char *msg) 791warn (const char *msg)
703 CODE: 792 CODE:
704 rxvt_warn ("%s", msg); 793 rxvt_warn ("%s", msg);
… …
706void 795void
707fatal (const char *msg) 796fatal (const char *msg)
708 CODE: 797 CODE:
709 rxvt_fatal ("%s", msg); 798 rxvt_fatal ("%s", msg);
710 799
711SV * 800void
712untaint (SV *sv) 801_exit (int status)
713 CODE:
714 RETVAL = newSVsv (sv);
715 SvTAINTED_off (RETVAL);
716 OUTPUT:
717 RETVAL
718
719bool
720safe ()
721 CODE:
722 RETVAL = !rxvt_tainted ();
723 OUTPUT:
724 RETVAL
725 802
726NV 803NV
727NOW () 804NOW ()
728 CODE: 805 CODE:
729 RETVAL = NOW; 806 RETVAL = NOW;
… …
824 OUTPUT: 901 OUTPUT:
825 RETVAL 902 RETVAL
826 903
827void 904void
828rxvt_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;
829 1000
830void 1001void
831rxvt_term::grab_button (int button, U32 modifiers) 1002rxvt_term::grab_button (int button, U32 modifiers)
832 CODE: 1003 CODE:
833 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1004 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
… …
901 char *mbstr = rxvt_wcstombs (wstr); 1072 char *mbstr = rxvt_wcstombs (wstr);
902 rxvt_pop_locale (); 1073 rxvt_pop_locale ();
903 1074
904 free (wstr); 1075 free (wstr);
905 1076
906 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1077 RETVAL = newSVpv (mbstr, 0);
907 free (mbstr); 1078 free (mbstr);
908} 1079}
909 OUTPUT: 1080 OUTPUT:
910 RETVAL 1081 RETVAL
911 1082
… …
918 1089
919 rxvt_push_locale (THIS->locale); 1090 rxvt_push_locale (THIS->locale);
920 wchar_t *wstr = rxvt_mbstowcs (data, len); 1091 wchar_t *wstr = rxvt_mbstowcs (data, len);
921 rxvt_pop_locale (); 1092 rxvt_pop_locale ();
922 1093
923 RETVAL = taint_if (wcs2sv (wstr), octets); 1094 RETVAL = wcs2sv (wstr);
924 free (wstr); 1095 free (wstr);
925} 1096}
926 OUTPUT: 1097 OUTPUT:
927 RETVAL 1098 RETVAL
928 1099
… …
937#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1108#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
938#define TERM_OFFSET_focus TERM_OFFSET(focus) 1109#define TERM_OFFSET_focus TERM_OFFSET(focus)
939#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1110#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
940#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1111#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
941#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1112#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
942#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1113#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
943 1114
944int 1115int
945rxvt_term::width () 1116rxvt_term::width ()
946 ALIAS: 1117 ALIAS:
947 width = TERM_OFFSET_width 1118 width = TERM_OFFSET_width
… …
953 ncol = TERM_OFFSET_ncol 1124 ncol = TERM_OFFSET_ncol
954 focus = TERM_OFFSET_focus 1125 focus = TERM_OFFSET_focus
955 mapped = TERM_OFFSET_mapped 1126 mapped = TERM_OFFSET_mapped
956 saveLines = TERM_OFFSET_saveLines 1127 saveLines = TERM_OFFSET_saveLines
957 total_rows = TERM_OFFSET_total_rows 1128 total_rows = TERM_OFFSET_total_rows
958 nsaved = TERM_OFFSET_nsaved 1129 top_row = TERM_OFFSET_top_row
959 CODE: 1130 CODE:
960 RETVAL = *(int *)((char *)THIS + ix); 1131 RETVAL = *(int *)((char *)THIS + ix);
961 OUTPUT: 1132 OUTPUT:
962 RETVAL 1133 RETVAL
963 1134
… …
1032 CODE: 1203 CODE:
1033 RETVAL = (U32)THIS->vt; 1204 RETVAL = (U32)THIS->vt;
1034 OUTPUT: 1205 OUTPUT:
1035 RETVAL 1206 RETVAL
1036 1207
1208void
1209rxvt_term::vt_emask_add (U32 emask)
1210 CODE:
1211 THIS->vt_emask_perl |= emask;
1212 THIS->vt_select_input ();
1213
1037U32 1214U32
1038rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1215rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1039 CODE: 1216 CODE:
1040{
1041 RETVAL = THIS->rstyle; 1217 RETVAL = THIS->rstyle;
1042 THIS->rstyle = new_rstyle; 1218 THIS->rstyle = new_rstyle;
1043}
1044 OUTPUT: 1219 OUTPUT:
1045 RETVAL 1220 RETVAL
1046 1221
1047int 1222int
1048rxvt_term::view_start (int newval = -1) 1223rxvt_term::view_start (int newval = 1)
1224 PROTOTYPE: $;$
1049 CODE: 1225 CODE:
1050{ 1226{
1051 RETVAL = THIS->view_start; 1227 RETVAL = THIS->view_start;
1052 1228
1053 if (newval >= 0) 1229 if (newval <= 0)
1054 { 1230 THIS->scr_changeview (max (newval, THIS->top_row));
1055 THIS->view_start = min (newval, THIS->nsaved);
1056 THIS->scr_changeview (RETVAL);
1057 }
1058} 1231}
1059 OUTPUT: 1232 OUTPUT:
1060 RETVAL 1233 RETVAL
1061 1234
1062void 1235void
… …
1066 1239
1067void 1240void
1068rxvt_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)
1069 PPCODE: 1242 PPCODE:
1070{ 1243{
1071 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1244 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1072 XSRETURN_EMPTY; 1245 XSRETURN_EMPTY;
1073 1246
1074 line_t &l = ROW(row_number); 1247 line_t &l = ROW(row_number);
1075 1248
1076 if (GIMME_V != G_VOID) 1249 if (GIMME_V != G_VOID)
… …
1078 wchar_t *wstr = new wchar_t [THIS->ncol]; 1251 wchar_t *wstr = new wchar_t [THIS->ncol];
1079 1252
1080 for (int col = 0; col < THIS->ncol; col++) 1253 for (int col = 0; col < THIS->ncol; col++)
1081 wstr [col] = l.t [col]; 1254 wstr [col] = l.t [col];
1082 1255
1083 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1256 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1084 1257
1085 delete [] wstr; 1258 delete [] wstr;
1086 } 1259 }
1087 1260
1088 if (new_text) 1261 if (new_text)
… …
1109 1282
1110void 1283void
1111rxvt_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)
1112 PPCODE: 1285 PPCODE:
1113{ 1286{
1114 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1287 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1115 XSRETURN_EMPTY; 1288 XSRETURN_EMPTY;
1116 1289
1117 line_t &l = ROW(row_number); 1290 line_t &l = ROW(row_number);
1118 1291
1119 if (GIMME_V != G_VOID) 1292 if (GIMME_V != G_VOID)
… …
1149 1322
1150int 1323int
1151rxvt_term::ROW_l (int row_number, int new_length = -1) 1324rxvt_term::ROW_l (int row_number, int new_length = -1)
1152 CODE: 1325 CODE:
1153{ 1326{
1154 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1327 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1155 XSRETURN_EMPTY; 1328 XSRETURN_EMPTY;
1156 1329
1157 line_t &l = ROW(row_number); 1330 line_t &l = ROW(row_number);
1158 RETVAL = l.l; 1331 RETVAL = l.l;
1159 1332
… …
1165 1338
1166bool 1339bool
1167rxvt_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)
1168 CODE: 1341 CODE:
1169{ 1342{
1170 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1343 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1171 XSRETURN_EMPTY; 1344 XSRETURN_EMPTY;
1172 1345
1173 line_t &l = ROW(row_number); 1346 line_t &l = ROW(row_number);
1174 RETVAL = l.is_longer (); 1347 RETVAL = l.is_longer ();
1175 1348
… …
1209 else 1382 else
1210 *r++ = *s; 1383 *r++ = *s;
1211 1384
1212 rxvt_pop_locale (); 1385 rxvt_pop_locale ();
1213 1386
1214 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1387 RETVAL = wcs2sv (rstr, r - rstr);
1215 1388
1216 delete [] rstr; 1389 delete [] rstr;
1217} 1390}
1218 OUTPUT: 1391 OUTPUT:
1219 RETVAL 1392 RETVAL
… …
1245 else if (IS_COMPOSE (*s)) 1418 else if (IS_COMPOSE (*s))
1246 r += rxvt_composite.expand (*s, r); 1419 r += rxvt_composite.expand (*s, r);
1247 else 1420 else
1248 *r++ = *s; 1421 *r++ = *s;
1249 1422
1250 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1423 RETVAL = wcs2sv (rstr, r - rstr);
1251 1424
1252 delete [] rstr; 1425 delete [] rstr;
1253} 1426}
1254 OUTPUT: 1427 OUTPUT:
1255 RETVAL 1428 RETVAL
… …
1277 1450
1278 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1451 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1279 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);
1280 1453
1281 if (GIMME_V != G_VOID) 1454 if (GIMME_V != G_VOID)
1282 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);
1283 1456
1284 if (newval) 1457 if (newval)
1285 { 1458 {
1286 if (SvOK (newval)) 1459 if (SvOK (newval))
1287 { 1460 {
… …
1294 } 1467 }
1295} 1468}
1296 1469
1297const char * 1470const char *
1298rxvt_term::x_resource (const char *name) 1471rxvt_term::x_resource (const char *name)
1299 CLEANUP:
1300 SvTAINTED_on (ST (0));
1301 1472
1302bool 1473bool
1303rxvt_term::option (U32 optval, int set = -1) 1474rxvt_term::option (U32 optval, int set = -1)
1304 CODE: 1475 CODE:
1305{ 1476{
… …
1365 PUSHs (sv_2mortal (newSViv (rc.col))); 1536 PUSHs (sv_2mortal (newSViv (rc.col)));
1366 } 1537 }
1367 1538
1368 if (items == 3) 1539 if (items == 3)
1369 { 1540 {
1370 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1541 rc.row = SvIV (ST (1));
1371 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);
1372 1552
1373 if (ix) 1553 if (ix)
1374 THIS->want_refresh = 1; 1554 THIS->want_refresh = 1;
1375 } 1555 }
1376} 1556}
… …
1380 CODE: 1560 CODE:
1381 RETVAL = THIS->charsets [THIS->screen.charset]; 1561 RETVAL = THIS->charsets [THIS->screen.charset];
1382 OUTPUT: 1562 OUTPUT:
1383 RETVAL 1563 RETVAL
1384 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
1385int 1575int
1386rxvt_term::selection_grab (U32 eventtime) 1576rxvt_term::selection_grab (U32 eventtime)
1387 1577
1388void 1578void
1389rxvt_term::selection (SV *newtext = 0) 1579rxvt_term::selection (SV *newtext = 0)
1390 PPCODE: 1580 PPCODE:
1391{ 1581{
1392 if (GIMME_V != G_VOID) 1582 if (GIMME_V != G_VOID)
1393 XPUSHs (THIS->selection.text 1583 XPUSHs (THIS->selection.text
1394 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1584 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1395 : &PL_sv_undef); 1585 : &PL_sv_undef);
1396 1586
1397 if (newtext) 1587 if (newtext)
1398 { 1588 {
1399 free (THIS->selection.text); 1589 free (THIS->selection.text);

Diff Legend

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