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.73 by root, Wed Jan 18 09:40:53 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
460 { 474 if (htype == HOOK_REFRESH_END)
461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 475 swap_overlays (term);
462 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 476
463 } 477 swap (perl_environ, environ);
464 else if (!term->perl.self) 478
465 return false; // perl not initialized for this instance 479 bool event_consumed;
466 else if (htype == HOOK_DESTROY) 480
467 { 481 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
468 // handled later 482 || term->perl.should_invoke [htype])
469 } 483 try
470 else
471 {
472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
473 { 484 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 485 dSP;
486 va_list ap;
475 487
476 if (HvKEYS (hv)) 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)
477 { 502 {
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
490 swap (perl_environ, environ);
491
492 try
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: 503 case DT_INT:
513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 504 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514 break; 505 break;
515 506
516 case DT_LONG: 507 case DT_LONG:
517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518 break; 509 break;
519 510
520 case DT_STR: 511 case DT_STR:
521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 512 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
522 break; 513 break;
523 514
524 case DT_STR_LEN: 515 case DT_STR_LEN:
525 { 516 {
526 char *str = va_arg (ap, char *); 517 char *str = va_arg (ap, char *);
527 int len = va_arg (ap, int); 518 int len = va_arg (ap, int);
528 519
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 520 XPUSHs (sv_2mortal (newSVpvn (str, len)));
530 } 521 }
531 break; 522 break;
532 523
533 case DT_WCS_LEN: 524 case DT_WCS_LEN:
534 { 525 {
535 wchar_t *wstr = va_arg (ap, wchar_t *); 526 wchar_t *wstr = va_arg (ap, wchar_t *);
536 int wlen = va_arg (ap, int); 527 int wlen = va_arg (ap, int);
537 528
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
539 } 530 }
540 break; 531 break;
541 532
542 case DT_XEVENT: 533 case DT_XEVENT:
543 { 534 {
544 XEvent *xe = va_arg (ap, XEvent *); 535 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV (); 536 HV *hv = newHV ();
546 537
547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 538# 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) 539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549# undef set 540# undef set
550 541
551 setiv (type, xe->type); 542 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event); 543 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial); 544 setiv (serial, xe->xany.serial);
554 545
555 switch (xe->type) 546 switch (xe->type)
556 { 547 {
557 case KeyPress: 548 case KeyPress:
558 case KeyRelease: 549 case KeyRelease:
559 case ButtonPress: 550 case ButtonPress:
560 case ButtonRelease: 551 case ButtonRelease:
561 case MotionNotify: 552 case MotionNotify:
562 setiv (time, xe->xmotion.time); 553 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x); 554 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y); 555 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight); 556 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth); 557 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root); 558 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root); 559 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state); 560 setiv (state, xe->xmotion.state);
570 break; 561 break;
571 } 562 }
572 563
573 switch (xe->type) 564 switch (xe->type)
574 { 565 {
575 case KeyPress: 566 case KeyPress:
576 case KeyRelease: 567 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode); 568 setiv (keycode, xe->xkey.keycode);
578 break; 569 break;
579 570
580 case ButtonPress: 571 case ButtonPress:
581 case ButtonRelease: 572 case ButtonRelease:
582 setiv (button, xe->xbutton.button); 573 setiv (button, xe->xbutton.button);
583 break; 574 break;
584 575
585 case MotionNotify: 576 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint); 577 setiv (is_hint, xe->xmotion.is_hint);
587 break; 578 break;
588 } 579 }
589 580
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 } 582 }
592 break; 583 break;
593 584
594 case DT_END: 585 case DT_END:
595 { 586 goto call;
596 va_end (ap);
597 587
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: 588 default:
629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 589 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 } 590 }
591 }
592
593 call:
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 event_consumed = !!count;
631 } 617 }
618 catch (...)
619 {
620 swap (perl_environ, environ);
621 throw;
622 }
623 else
624 event_consumed = false;
625
626 // post-handling of some events
627 if (htype == HOOK_REFRESH_BEGIN)
628 swap_overlays (term);
629 else if (htype == HOOK_DESTROY)
630 {
631 clearSVptr ((SV *)term->perl.self);
632 SvREFCNT_dec ((SV *)term->perl.self);
632 } 633 }
633 catch (...) 634
634 {
635 swap (perl_environ, environ); 635 swap (perl_environ, environ);
636 throw; 636
637 } 637 return event_consumed;
638} 638}
639 639
640///////////////////////////////////////////////////////////////////////////// 640/////////////////////////////////////////////////////////////////////////////
641 641
642MODULE = urxvt PACKAGE = urxvt 642MODULE = urxvt PACKAGE = urxvt
661# include "optinc.h" 661# include "optinc.h"
662# undef nodef 662# undef nodef
663# undef def 663# undef def
664 664
665 HV *stash = gv_stashpv ("urxvt", 1); 665 HV *stash = gv_stashpv ("urxvt", 1);
666# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); 666 struct {
667 const char *name;
668 IV iv;
669 } *civ, const_iv[] = {
670# define const_iv(name) { # name, (IV)name }
667 export_const_iv (DEFAULT_RSTYLE); 671 const_iv (DEFAULT_RSTYLE),
668 export_const_iv (OVERLAY_RSTYLE); 672 const_iv (OVERLAY_RSTYLE),
669 export_const_iv (RS_Bold); 673 const_iv (RS_Bold),
670 export_const_iv (RS_Italic); 674 const_iv (RS_Italic),
671 export_const_iv (RS_Blink); 675 const_iv (RS_Blink),
672 export_const_iv (RS_RVid); 676 const_iv (RS_RVid),
673 export_const_iv (RS_Uline); 677 const_iv (RS_Uline),
674 678
675 export_const_iv (CurrentTime); 679 const_iv (CurrentTime),
676 export_const_iv (ShiftMask); 680 const_iv (ShiftMask),
677 export_const_iv (LockMask); 681 const_iv (LockMask),
678 export_const_iv (ControlMask); 682 const_iv (ControlMask),
679 export_const_iv (Mod1Mask); 683 const_iv (Mod1Mask),
680 export_const_iv (Mod2Mask); 684 const_iv (Mod2Mask),
681 export_const_iv (Mod3Mask); 685 const_iv (Mod3Mask),
682 export_const_iv (Mod4Mask); 686 const_iv (Mod4Mask),
683 export_const_iv (Mod5Mask); 687 const_iv (Mod5Mask),
684 export_const_iv (Button1Mask); 688 const_iv (Button1Mask),
685 export_const_iv (Button2Mask); 689 const_iv (Button2Mask),
686 export_const_iv (Button3Mask); 690 const_iv (Button3Mask),
687 export_const_iv (Button4Mask); 691 const_iv (Button4Mask),
688 export_const_iv (Button5Mask); 692 const_iv (Button5Mask),
689 export_const_iv (AnyModifier); 693 const_iv (AnyModifier),
690 694
691 export_const_iv (EVENT_NONE); 695 const_iv (EVENT_NONE),
692 export_const_iv (EVENT_READ); 696 const_iv (EVENT_READ),
693 export_const_iv (EVENT_WRITE); 697 const_iv (EVENT_WRITE),
694}
695 698
696void 699 const_iv (NoEventMask),
697set_should_invoke (int htype, int value) 700 const_iv (KeyPressMask),
698 CODE: 701 const_iv (KeyReleaseMask),
699 rxvt_perl.should_invoke [htype] = value; 702 const_iv (ButtonPressMask),
703 const_iv (ButtonReleaseMask),
704 const_iv (EnterWindowMask),
705 const_iv (LeaveWindowMask),
706 const_iv (PointerMotionMask),
707 const_iv (PointerMotionHintMask),
708 const_iv (Button1MotionMask),
709 const_iv (Button2MotionMask),
710 const_iv (Button3MotionMask),
711 const_iv (Button4MotionMask),
712 const_iv (Button5MotionMask),
713 const_iv (ButtonMotionMask),
714 const_iv (KeymapStateMask),
715 const_iv (ExposureMask),
716 const_iv (VisibilityChangeMask),
717 const_iv (StructureNotifyMask),
718 const_iv (ResizeRedirectMask),
719 const_iv (SubstructureNotifyMask),
720 const_iv (SubstructureRedirectMask),
721 const_iv (FocusChangeMask),
722 const_iv (PropertyChangeMask),
723 const_iv (ColormapChangeMask),
724 const_iv (OwnerGrabButtonMask),
725
726 const_iv (KeyPress),
727 const_iv (KeyRelease),
728 const_iv (ButtonPress),
729 const_iv (ButtonRelease),
730 const_iv (MotionNotify),
731 const_iv (EnterNotify),
732 const_iv (LeaveNotify),
733 const_iv (FocusIn),
734 const_iv (FocusOut),
735 const_iv (KeymapNotify),
736 const_iv (Expose),
737 const_iv (GraphicsExpose),
738 const_iv (NoExpose),
739 const_iv (VisibilityNotify),
740 const_iv (CreateNotify),
741 const_iv (DestroyNotify),
742 const_iv (UnmapNotify),
743 const_iv (MapNotify),
744 const_iv (MapRequest),
745 const_iv (ReparentNotify),
746 const_iv (ConfigureNotify),
747 const_iv (ConfigureRequest),
748 const_iv (GravityNotify),
749 const_iv (ResizeRequest),
750 const_iv (CirculateNotify),
751 const_iv (CirculateRequest),
752 const_iv (PropertyNotify),
753 const_iv (SelectionClear),
754 const_iv (SelectionRequest),
755 const_iv (SelectionNotify),
756 const_iv (ColormapNotify),
757 const_iv (ClientMessage),
758 const_iv (MappingNotify),
759 };
760
761 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
762 civ-- > const_iv; )
763 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
764}
700 765
701void 766void
702warn (const char *msg) 767warn (const char *msg)
703 CODE: 768 CODE:
704 rxvt_warn ("%s", msg); 769 rxvt_warn ("%s", msg);
706void 771void
707fatal (const char *msg) 772fatal (const char *msg)
708 CODE: 773 CODE:
709 rxvt_fatal ("%s", msg); 774 rxvt_fatal ("%s", msg);
710 775
711SV * 776void
712untaint (SV *sv) 777_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 778
726NV 779NV
727NOW () 780NOW ()
728 CODE: 781 CODE:
729 RETVAL = NOW; 782 RETVAL = NOW;
824 OUTPUT: 877 OUTPUT:
825 RETVAL 878 RETVAL
826 879
827void 880void
828rxvt_term::destroy () 881rxvt_term::destroy ()
882
883#if ENABLE_PERL_FRILLS
884
885void
886rxvt_term::XListProperties (U32 window)
887 PPCODE:
888{
889 int count;
890 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
891
892 EXTEND (SP, count);
893 while (count--)
894 PUSHs (newSVuv ((U32)props [count]));
895
896 XFree (props);
897}
898
899void
900rxvt_term::XGetWindowProperty (U32 window, U32 property)
901 PPCODE:
902{
903 Atom type;
904 int format;
905 unsigned long nitems;
906 unsigned long bytes_after;
907 unsigned char *prop;
908 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
909 0, 1<<30, 0, AnyPropertyType,
910 &type, &format, &nitems, &bytes_after, &prop);
911 if (type != None)
912 {
913 EXTEND (SP, 3);
914 PUSHs (newSVuv ((U32)type));
915 PUSHs (newSViv (format));
916 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
917 XFree (prop);
918 }
919}
920
921void
922rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
923 CODE:
924{
925 STRLEN len;
926 char *data_ = SvPVbyte (data, len);
927
928 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
929 type, format, PropModeReplace,
930 (unsigned char *)data, len * 8 / format);
931}
932
933void
934rxvt_term::XDeleteProperty (U32 window, U32 property)
935 CODE:
936 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
937
938U32
939rxvt_term::DefaultRootWindow ()
940 CODE:
941 RETVAL = (U32)THIS->display->root;
942 OUTPUT:
943 RETVAL
944
945U32
946rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
947 CODE:
948 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
949 x, y, width, height, 0,
950 THIS->pix_colors_focused[Color_border],
951 THIS->pix_colors_focused[Color_border]);
952 OUTPUT:
953 RETVAL
954
955void
956rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
957 CODE:
958 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
959
960void
961rxvt_term::XMapWindow (U32 window)
962 CODE:
963 XMapWindow (THIS->display->display, (Window)window);
964
965void
966rxvt_term::XUnmapWindow (U32 window)
967 CODE:
968 XUnmapWindow (THIS->display->display, (Window)window);
969
970#endif
971
972void
973rxvt_term::set_should_invoke (int htype, int inc)
974 CODE:
975 THIS->perl.should_invoke [htype] += inc;
829 976
830void 977void
831rxvt_term::grab_button (int button, U32 modifiers) 978rxvt_term::grab_button (int button, U32 modifiers)
832 CODE: 979 CODE:
833 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 980 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
901 char *mbstr = rxvt_wcstombs (wstr); 1048 char *mbstr = rxvt_wcstombs (wstr);
902 rxvt_pop_locale (); 1049 rxvt_pop_locale ();
903 1050
904 free (wstr); 1051 free (wstr);
905 1052
906 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1053 RETVAL = newSVpv (mbstr, 0);
907 free (mbstr); 1054 free (mbstr);
908} 1055}
909 OUTPUT: 1056 OUTPUT:
910 RETVAL 1057 RETVAL
911 1058
918 1065
919 rxvt_push_locale (THIS->locale); 1066 rxvt_push_locale (THIS->locale);
920 wchar_t *wstr = rxvt_mbstowcs (data, len); 1067 wchar_t *wstr = rxvt_mbstowcs (data, len);
921 rxvt_pop_locale (); 1068 rxvt_pop_locale ();
922 1069
923 RETVAL = taint_if (wcs2sv (wstr), octets); 1070 RETVAL = wcs2sv (wstr);
924 free (wstr); 1071 free (wstr);
925} 1072}
926 OUTPUT: 1073 OUTPUT:
927 RETVAL 1074 RETVAL
928 1075
937#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1084#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
938#define TERM_OFFSET_focus TERM_OFFSET(focus) 1085#define TERM_OFFSET_focus TERM_OFFSET(focus)
939#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1086#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
940#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1087#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
941#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1088#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
942#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1089#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
943 1090
944int 1091int
945rxvt_term::width () 1092rxvt_term::width ()
946 ALIAS: 1093 ALIAS:
947 width = TERM_OFFSET_width 1094 width = TERM_OFFSET_width
953 ncol = TERM_OFFSET_ncol 1100 ncol = TERM_OFFSET_ncol
954 focus = TERM_OFFSET_focus 1101 focus = TERM_OFFSET_focus
955 mapped = TERM_OFFSET_mapped 1102 mapped = TERM_OFFSET_mapped
956 saveLines = TERM_OFFSET_saveLines 1103 saveLines = TERM_OFFSET_saveLines
957 total_rows = TERM_OFFSET_total_rows 1104 total_rows = TERM_OFFSET_total_rows
958 nsaved = TERM_OFFSET_nsaved 1105 top_row = TERM_OFFSET_top_row
959 CODE: 1106 CODE:
960 RETVAL = *(int *)((char *)THIS + ix); 1107 RETVAL = *(int *)((char *)THIS + ix);
961 OUTPUT: 1108 OUTPUT:
962 RETVAL 1109 RETVAL
963 1110
1032 CODE: 1179 CODE:
1033 RETVAL = (U32)THIS->vt; 1180 RETVAL = (U32)THIS->vt;
1034 OUTPUT: 1181 OUTPUT:
1035 RETVAL 1182 RETVAL
1036 1183
1184void
1185rxvt_term::vt_emask_add (U32 emask)
1186 CODE:
1187 THIS->vt_emask_perl |= emask;
1188 THIS->vt_select_input ();
1189
1037U32 1190U32
1038rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1191rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1039 CODE: 1192 CODE:
1040{
1041 RETVAL = THIS->rstyle; 1193 RETVAL = THIS->rstyle;
1042 THIS->rstyle = new_rstyle; 1194 THIS->rstyle = new_rstyle;
1043}
1044 OUTPUT: 1195 OUTPUT:
1045 RETVAL 1196 RETVAL
1046 1197
1047int 1198int
1048rxvt_term::view_start (int newval = -1) 1199rxvt_term::view_start (int newval = 1)
1200 PROTOTYPE: $;$
1049 CODE: 1201 CODE:
1050{ 1202{
1051 RETVAL = THIS->view_start; 1203 RETVAL = THIS->view_start;
1052 1204
1053 if (newval >= 0) 1205 if (newval <= 0)
1054 { 1206 THIS->scr_changeview (max (newval, THIS->top_row));
1055 THIS->view_start = min (newval, THIS->nsaved);
1056 THIS->scr_changeview (RETVAL);
1057 }
1058} 1207}
1059 OUTPUT: 1208 OUTPUT:
1060 RETVAL 1209 RETVAL
1061 1210
1062void 1211void
1066 1215
1067void 1216void
1068rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1217rxvt_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: 1218 PPCODE:
1070{ 1219{
1071 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1220 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1072 XSRETURN_EMPTY; 1221 XSRETURN_EMPTY;
1073 1222
1074 line_t &l = ROW(row_number); 1223 line_t &l = ROW(row_number);
1075 1224
1076 if (GIMME_V != G_VOID) 1225 if (GIMME_V != G_VOID)
1078 wchar_t *wstr = new wchar_t [THIS->ncol]; 1227 wchar_t *wstr = new wchar_t [THIS->ncol];
1079 1228
1080 for (int col = 0; col < THIS->ncol; col++) 1229 for (int col = 0; col < THIS->ncol; col++)
1081 wstr [col] = l.t [col]; 1230 wstr [col] = l.t [col];
1082 1231
1083 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1232 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1084 1233
1085 delete [] wstr; 1234 delete [] wstr;
1086 } 1235 }
1087 1236
1088 if (new_text) 1237 if (new_text)
1109 1258
1110void 1259void
1111rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1260rxvt_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: 1261 PPCODE:
1113{ 1262{
1114 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1263 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1115 XSRETURN_EMPTY; 1264 XSRETURN_EMPTY;
1116 1265
1117 line_t &l = ROW(row_number); 1266 line_t &l = ROW(row_number);
1118 1267
1119 if (GIMME_V != G_VOID) 1268 if (GIMME_V != G_VOID)
1149 1298
1150int 1299int
1151rxvt_term::ROW_l (int row_number, int new_length = -1) 1300rxvt_term::ROW_l (int row_number, int new_length = -1)
1152 CODE: 1301 CODE:
1153{ 1302{
1154 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1303 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1155 XSRETURN_EMPTY; 1304 XSRETURN_EMPTY;
1156 1305
1157 line_t &l = ROW(row_number); 1306 line_t &l = ROW(row_number);
1158 RETVAL = l.l; 1307 RETVAL = l.l;
1159 1308
1165 1314
1166bool 1315bool
1167rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1316rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1168 CODE: 1317 CODE:
1169{ 1318{
1170 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1319 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1171 XSRETURN_EMPTY; 1320 XSRETURN_EMPTY;
1172 1321
1173 line_t &l = ROW(row_number); 1322 line_t &l = ROW(row_number);
1174 RETVAL = l.is_longer (); 1323 RETVAL = l.is_longer ();
1175 1324
1209 else 1358 else
1210 *r++ = *s; 1359 *r++ = *s;
1211 1360
1212 rxvt_pop_locale (); 1361 rxvt_pop_locale ();
1213 1362
1214 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1363 RETVAL = wcs2sv (rstr, r - rstr);
1215 1364
1216 delete [] rstr; 1365 delete [] rstr;
1217} 1366}
1218 OUTPUT: 1367 OUTPUT:
1219 RETVAL 1368 RETVAL
1245 else if (IS_COMPOSE (*s)) 1394 else if (IS_COMPOSE (*s))
1246 r += rxvt_composite.expand (*s, r); 1395 r += rxvt_composite.expand (*s, r);
1247 else 1396 else
1248 *r++ = *s; 1397 *r++ = *s;
1249 1398
1250 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1399 RETVAL = wcs2sv (rstr, r - rstr);
1251 1400
1252 delete [] rstr; 1401 delete [] rstr;
1253} 1402}
1254 OUTPUT: 1403 OUTPUT:
1255 RETVAL 1404 RETVAL
1277 1426
1278 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1427 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1279 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1428 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1280 1429
1281 if (GIMME_V != G_VOID) 1430 if (GIMME_V != G_VOID)
1282 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1431 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1283 1432
1284 if (newval) 1433 if (newval)
1285 { 1434 {
1286 if (SvOK (newval)) 1435 if (SvOK (newval))
1287 { 1436 {
1294 } 1443 }
1295} 1444}
1296 1445
1297const char * 1446const char *
1298rxvt_term::x_resource (const char *name) 1447rxvt_term::x_resource (const char *name)
1299 CLEANUP:
1300 SvTAINTED_on (ST (0));
1301 1448
1302bool 1449bool
1303rxvt_term::option (U32 optval, int set = -1) 1450rxvt_term::option (U32 optval, int set = -1)
1304 CODE: 1451 CODE:
1305{ 1452{
1365 PUSHs (sv_2mortal (newSViv (rc.col))); 1512 PUSHs (sv_2mortal (newSViv (rc.col)));
1366 } 1513 }
1367 1514
1368 if (items == 3) 1515 if (items == 3)
1369 { 1516 {
1370 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1517 rc.row = SvIV (ST (1));
1371 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1518 rc.col = SvIV (ST (2));
1519
1520 if (ix == 2 && rc.col == 0)
1521 {
1522 rc.row--;
1523 rc.col = THIS->ncol;
1524 }
1525
1526 clamp_it (rc.col, 0, THIS->ncol);
1527 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1372 1528
1373 if (ix) 1529 if (ix)
1374 THIS->want_refresh = 1; 1530 THIS->want_refresh = 1;
1375 } 1531 }
1376} 1532}
1380 CODE: 1536 CODE:
1381 RETVAL = THIS->charsets [THIS->screen.charset]; 1537 RETVAL = THIS->charsets [THIS->screen.charset];
1382 OUTPUT: 1538 OUTPUT:
1383 RETVAL 1539 RETVAL
1384 1540
1541#void
1542#rxvt_term::selection_clear ()
1543
1544void
1545rxvt_term::selection_make (U32 eventtime, bool rect = false)
1546 CODE:
1547 THIS->selection.op = SELECTION_CONT;
1548 THIS->selection.rect = rect;
1549 THIS->selection_make (eventtime);
1550
1385int 1551int
1386rxvt_term::selection_grab (U32 eventtime) 1552rxvt_term::selection_grab (U32 eventtime)
1387 1553
1388void 1554void
1389rxvt_term::selection (SV *newtext = 0) 1555rxvt_term::selection (SV *newtext = 0)
1390 PPCODE: 1556 PPCODE:
1391{ 1557{
1392 if (GIMME_V != G_VOID) 1558 if (GIMME_V != G_VOID)
1393 XPUSHs (THIS->selection.text 1559 XPUSHs (THIS->selection.text
1394 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1560 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1395 : &PL_sv_undef); 1561 : &PL_sv_undef);
1396 1562
1397 if (newtext) 1563 if (newtext)
1398 { 1564 {
1399 free (THIS->selection.text); 1565 free (THIS->selection.text);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines