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.54 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.59 by root, Thu Jan 12 02:20:56 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"
… …
393 395
394struct rxvt_perl_interp rxvt_perl; 396struct rxvt_perl_interp rxvt_perl;
395 397
396static PerlInterpreter *perl; 398static PerlInterpreter *perl;
397 399
398rxvt_perl_interp::rxvt_perl_interp ()
399{
400}
401
402rxvt_perl_interp::~rxvt_perl_interp () 400rxvt_perl_interp::~rxvt_perl_interp ()
403{ 401{
404 if (perl) 402 if (perl)
405 { 403 {
406 perl_destruct (perl); 404 perl_destruct (perl);
… …
411void 409void
412rxvt_perl_interp::init () 410rxvt_perl_interp::init ()
413{ 411{
414 if (!perl) 412 if (!perl)
415 { 413 {
414 perl_environ = rxvt_environ;
415 swap (perl_environ, environ);
416
416 char *argv[] = { 417 char *argv[] = {
417 "", 418 "",
418 "-T", 419 "-T",
419 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
420 }; 421 };
… …
429 430
430 perl_destruct (perl); 431 perl_destruct (perl);
431 perl_free (perl); 432 perl_free (perl);
432 perl = 0; 433 perl = 0;
433 } 434 }
435
436 swap (perl_environ, environ);
434 } 437 }
435} 438}
436 439
437static void 440static void
438ungrab (rxvt_term *THIS) 441ungrab (rxvt_term *THIS)
… …
480 483
481 if (!should_invoke [htype]) 484 if (!should_invoke [htype])
482 return false; 485 return false;
483 } 486 }
484 487
488 swap (perl_environ, environ);
489
490 try
491 {
485 dSP; 492 dSP;
486 va_list ap; 493 va_list ap;
487 494
488 va_start (ap, htype); 495 va_start (ap, htype);
489 496
490 ENTER; 497 ENTER;
491 SAVETMPS; 498 SAVETMPS;
492 499
493 PUSHMARK (SP); 500 PUSHMARK (SP);
494 501
495 XPUSHs (sv_2mortal (newSVterm (term))); 502 XPUSHs (sv_2mortal (newSVterm (term)));
496 XPUSHs (sv_2mortal (newSViv (htype))); 503 XPUSHs (sv_2mortal (newSViv (htype)));
497 504
498 for (;;) { 505 for (;;) {
499 data_type dt = (data_type)va_arg (ap, int); 506 data_type dt = (data_type)va_arg (ap, int);
500 507
501 switch (dt) 508 switch (dt)
502 { 509 {
503 case DT_INT: 510 case DT_INT:
504 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
505 break; 512 break;
506 513
507 case DT_LONG: 514 case DT_LONG:
508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
509 break; 516 break;
510 517
511 case DT_STR: 518 case DT_STR:
512 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
513 break; 520 break;
514 521
515 case DT_STR_LEN: 522 case DT_STR_LEN:
516 { 523 {
517 char *str = va_arg (ap, char *); 524 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int); 525 int len = va_arg (ap, int);
519 526
520 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
521 } 528 }
522 break; 529 break;
523 530
524 case DT_WCS_LEN: 531 case DT_WCS_LEN:
525 { 532 {
526 wchar_t *wstr = va_arg (ap, wchar_t *); 533 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int); 534 int wlen = va_arg (ap, int);
528 535
529 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
530 } 537 }
531 break; 538 break;
532 539
533 case DT_XEVENT: 540 case DT_XEVENT:
534 { 541 {
535 XEvent *xe = va_arg (ap, XEvent *); 542 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV (); 543 HV *hv = newHV ();
537 544
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 545# 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) 546# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# undef set 547# undef set
541 548
542 setiv (type, xe->type); 549 setiv (type, xe->type);
543 setiv (send_event, xe->xany.send_event); 550 setiv (send_event, xe->xany.send_event);
544 setiv (serial, xe->xany.serial); 551 setiv (serial, xe->xany.serial);
545 552
546 switch (xe->type) 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:
547 { 593 {
548 case KeyPress: 594 va_end (ap);
549 case KeyRelease: 595
550 case ButtonPress: 596 PUTBACK;
551 case ButtonRelease: 597 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
552 case MotionNotify: 598 SPAGAIN;
553 setiv (time, xe->xmotion.time); 599
554 setiv (x, xe->xmotion.x); 600 if (count)
555 setiv (y, xe->xmotion.y);
556 setiv (row, xe->xmotion.y / term->fheight);
557 setiv (col, xe->xmotion.x / term->fwidth);
558 setiv (x_root, xe->xmotion.x_root);
559 setiv (y_root, xe->xmotion.y_root);
560 setiv (state, xe->xmotion.state);
561 break; 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;
562 } 624 }
563 625
564 switch (xe->type)
565 {
566 case KeyPress:
567 case KeyRelease:
568 setiv (keycode, xe->xkey.keycode);
569 break;
570
571 case ButtonPress:
572 case ButtonRelease:
573 setiv (button, xe->xbutton.button);
574 break;
575
576 case MotionNotify:
577 setiv (is_hint, xe->xmotion.is_hint);
578 break;
579 }
580
581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
582 }
583 break;
584
585 case DT_END:
586 {
587 va_end (ap);
588
589 PUTBACK;
590 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
591 SPAGAIN;
592
593 if (count)
594 {
595 SV *status = POPs;
596 count = SvTRUE (status);
597 }
598
599 PUTBACK;
600 FREETMPS;
601 LEAVE;
602
603 if (SvTRUE (ERRSV))
604 {
605 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
606 ungrab (term); // better lose the grab than the session
607 }
608
609 if (htype == HOOK_DESTROY)
610 {
611 clearSVptr ((SV *)term->perl.self);
612 SvREFCNT_dec ((SV *)term->perl.self);
613 }
614
615 return count;
616 }
617
618 default: 626 default:
619 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 }
620 } 629 }
621 } 630 }
631 catch (...)
632 {
633 swap (perl_environ, environ);
634 throw;
635 }
622} 636}
623 637
624///////////////////////////////////////////////////////////////////////////// 638/////////////////////////////////////////////////////////////////////////////
625 639
626MODULE = urxvt PACKAGE = urxvt 640MODULE = urxvt PACKAGE = urxvt
… …
698 RETVAL = newSVsv (sv); 712 RETVAL = newSVsv (sv);
699 SvTAINTED_off (RETVAL); 713 SvTAINTED_off (RETVAL);
700 OUTPUT: 714 OUTPUT:
701 RETVAL 715 RETVAL
702 716
717void
718_exit (int status)
719
703bool 720bool
704safe () 721safe ()
705 CODE: 722 CODE:
706 RETVAL = !rxvt_tainted (); 723 RETVAL = !rxvt_tainted ();
707 OUTPUT: 724 OUTPUT:
… …
1276 else 1293 else
1277 THIS->rs [index] = 0; 1294 THIS->rs [index] = 0;
1278 } 1295 }
1279} 1296}
1280 1297
1298const char *
1299rxvt_term::x_resource (const char *name)
1300 CLEANUP:
1301 SvTAINTED_on (ST (0));
1302
1281bool 1303bool
1282rxvt_term::option (U32 optval, int set = -1) 1304rxvt_term::option (U32 optval, int set = -1)
1283 CODE: 1305 CODE:
1284{ 1306{
1285 RETVAL = THIS->options & optval; 1307 RETVAL = THIS->options & optval;

Diff Legend

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