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.137 by root, Mon Feb 21 07:41:03 2011 UTC vs.
Revision 1.142 by sf-exg, Fri Jul 1 19:07:08 2011 UTC

… …
341 " unshift @INC, '" LIBDIR "';" 341 " unshift @INC, '" LIBDIR "';"
342 "}" 342 "}"
343 "" 343 ""
344 "use urxvt;" 344 "use urxvt;"
345 }; 345 };
346 int argc = ARRAY_LENGTH(args); 346 int argc = ecb_array_length (args);
347 char **argv = args; 347 char **argv = args;
348 348
349 PERL_SYS_INIT3 (&argc, &argv, &environ); 349 PERL_SYS_INIT3 (&argc, &argv, &environ);
350 perl = perl_alloc (); 350 perl = perl_alloc ();
351 perl_construct (perl); 351 perl_construct (perl);
… …
367 if (perl) 367 if (perl)
368 { 368 {
369 // runs outside of perls ENV 369 // runs outside of perls ENV
370 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 370 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
371 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 371 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
372 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
372 } 373 }
373} 374}
374 375
375static void 376static void
376ungrab (rxvt_term *THIS) 377ungrab (rxvt_term *THIS)
… …
397 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 398 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
398 399
399 for (int i = 0; i <= AvFILL (av); i++) 400 for (int i = 0; i <= AvFILL (av); i++)
400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 401 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
401 } 402 }
403 else if (htype == HOOK_DESTROY)
404 {
405 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
406
407 for (int i = AvFILL (av); i >= 0; i--)
408 {
409 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
410 delete req;
411 }
412 }
402 413
403 bool event_consumed; 414 bool event_consumed;
404 415
405 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 416 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
406 || term->perl.should_invoke [htype]) 417 || term->perl.should_invoke [htype])
… …
413 ENTER; 424 ENTER;
414 SAVETMPS; 425 SAVETMPS;
415 426
416 PUSHMARK (SP); 427 PUSHMARK (SP);
417 428
429 EXTEND (SP, 2);
418 XPUSHs (sv_2mortal (newSVterm (term))); 430 PUSHs (sv_2mortal (newSVterm (term)));
419 XPUSHs (sv_2mortal (newSViv (htype))); 431 PUSHs (sv_2mortal (newSViv (htype)));
420 432
421 for (;;) { 433 for (;;) {
422 data_type dt = (data_type)va_arg (ap, int); 434 data_type dt = (data_type)va_arg (ap, int);
423 435
424 switch (dt) 436 switch (dt)
… …
581 FREETMPS; 593 FREETMPS;
582 LEAVE; 594 LEAVE;
583 595
584 if (SvTRUE (ERRSV)) 596 if (SvTRUE (ERRSV))
585 { 597 {
586 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 598 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
587 ungrab (term); // better lose the grab than the session 599 ungrab (term); // better lose the grab than the session
588 } 600 }
589 601
590 event_consumed = !!count; 602 event_consumed = !!count;
591 } 603 }
… …
608 // don't allow further calls 620 // don't allow further calls
609 term->perl.self = 0; 621 term->perl.self = 0;
610 } 622 }
611 623
612 return event_consumed; 624 return event_consumed;
625}
626
627void
628rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
629{
630 localise_env set_environ (perl_environ);
631
632 ENTER;
633 SAVETMPS;
634
635 dSP;
636 XPUSHs (sv_2mortal (newSVpvn (data, len)));
637 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
638
639 if (SvTRUE (ERRSV))
640 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
641
642 FREETMPS;
643 LEAVE;
613} 644}
614 645
615///////////////////////////////////////////////////////////////////////////// 646/////////////////////////////////////////////////////////////////////////////
616 647
617MODULE = urxvt PACKAGE = urxvt 648MODULE = urxvt PACKAGE = urxvt
… …
768 const_iv (XIMDontChange), 799 const_iv (XIMDontChange),
769# endif 800# endif
770# endif 801# endif
771 }; 802 };
772 803
773 for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; ) 804 for (civ = const_iv + ecb_array_length (const_iv); civ-- > const_iv; )
774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 805 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
775} 806}
776 807
777void 808void
778warn (const char *msg) 809warn (const char *msg)
… …
850 881
851 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 882 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
852 if ((*t)->perl.self) 883 if ((*t)->perl.self)
853 PUSHs (sv_2mortal (newSVterm (*t))); 884 PUSHs (sv_2mortal (newSVterm (*t)));
854} 885}
886
887IV
888_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
889 CODE:
890 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
891 req->cb_sv = newSVsv (cb);
892 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
893 av_push (av, newSViv ((IV)req));
894 RETVAL = (IV)req;
895 OUTPUT:
896 RETVAL
897
898void
899_delete_selection_request (IV req_)
900 CODE:
901 rxvt_selection *req = (rxvt_selection *)req_;
902 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
903 int i;
904
905 for (i = AvFILL (av); i >= 0; i--)
906 if (SvIV (*av_fetch (av, i, 1)) == req_)
907 break;
908
909 for (; i < AvFILL (av); i++)
910 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
911
912 av_pop (av);
913
914 delete req;
855 915
856MODULE = urxvt PACKAGE = urxvt::term 916MODULE = urxvt PACKAGE = urxvt::term
857 917
858SV * 918SV *
859_new (AV *env, AV *arg) 919_new (AV *env, AV *arg)
… …
1167 RETVAL 1227 RETVAL
1168 1228
1169Window 1229Window
1170rxvt_term::parent () 1230rxvt_term::parent ()
1171 CODE: 1231 CODE:
1172 RETVAL = THIS->parent [0]; 1232 RETVAL = THIS->parent;
1173 OUTPUT: 1233 OUTPUT:
1174 RETVAL 1234 RETVAL
1175 1235
1176Window 1236Window
1177rxvt_term::vt () 1237rxvt_term::vt ()
… …
1446# include "rsinc.h" 1506# include "rsinc.h"
1447# undef def 1507# undef def
1448# undef reserve 1508# undef reserve
1449 }; 1509 };
1450 1510
1451 rs = rslist + ARRAY_LENGTH(rslist); 1511 rs = rslist + ecb_array_length (rslist);
1452 1512
1453 if (*name) 1513 if (*name)
1454 { 1514 {
1455 do { 1515 do {
1456 if (rs-- == rslist) 1516 if (rs-- == rslist)

Diff Legend

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