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.44 by root, Sun Jan 8 22:58:13 2006 UTC vs.
Revision 1.50 by root, Mon Jan 9 22:41:41 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 "iom.h"
34#include "rxvt.h" 35#include "rxvt.h"
35#include "iom.h" 36#include "keyboard.h"
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "rxvtperl.h" 38#include "rxvtperl.h"
38 39
39#include "perlxsi.c" 40#include "perlxsi.c"
40 41
… …
428 429
429 perl_destruct (perl); 430 perl_destruct (perl);
430 perl_free (perl); 431 perl_free (perl);
431 perl = 0; 432 perl = 0;
432 } 433 }
434 }
435}
436
437static void
438ungrab (rxvt_term *THIS)
439{
440 if (THIS->perl.grabtime)
441 {
442 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
443 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
444 THIS->perl.grabtime = 0;
433 } 445 }
434} 446}
435 447
436bool 448bool
437rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 449rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
448 return false; // perl not initialized for this instance 460 return false; // perl not initialized for this instance
449 else if (htype == HOOK_DESTROY) 461 else if (htype == HOOK_DESTROY)
450 { 462 {
451 // handled later 463 // handled later
452 } 464 }
453 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 465 else
454 { 466 {
455 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 467 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
456
457 if (HvKEYS (hv))
458 { 468 {
469 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
470
471 if (HvKEYS (hv))
472 {
459 hv_iterinit (hv); 473 hv_iterinit (hv);
460 474
461 while (HE *he = hv_iternext (hv)) 475 while (HE *he = hv_iternext (hv))
462 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 476 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
477 }
478
463 } 479 }
480
481 if (!should_invoke [htype])
482 return false;
464 } 483 }
465 else if (!should_invoke [htype])
466 return false;
467 484
468 dSP; 485 dSP;
469 va_list ap; 486 va_list ap;
470 487
471 va_start (ap, htype); 488 va_start (ap, htype);
… …
582 PUTBACK; 599 PUTBACK;
583 FREETMPS; 600 FREETMPS;
584 LEAVE; 601 LEAVE;
585 602
586 if (SvTRUE (ERRSV)) 603 if (SvTRUE (ERRSV))
604 {
587 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 605 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
606 ungrab (term); // better lose the grab than the session
607 }
588 608
589 if (htype == HOOK_DESTROY) 609 if (htype == HOOK_DESTROY)
590 { 610 {
591 clearSVptr ((SV *)term->perl.self); 611 clearSVptr ((SV *)term->perl.self);
592 SvREFCNT_dec ((SV *)term->perl.self); 612 SvREFCNT_dec ((SV *)term->perl.self);
… …
646 export_const_iv (Button2Mask); 666 export_const_iv (Button2Mask);
647 export_const_iv (Button3Mask); 667 export_const_iv (Button3Mask);
648 export_const_iv (Button4Mask); 668 export_const_iv (Button4Mask);
649 export_const_iv (Button5Mask); 669 export_const_iv (Button5Mask);
650 export_const_iv (AnyModifier); 670 export_const_iv (AnyModifier);
671
672 export_const_iv (EVENT_NONE);
673 export_const_iv (EVENT_READ);
674 export_const_iv (EVENT_WRITE);
651} 675}
652 676
653SV * 677SV *
654new (...) 678new (...)
655 CODE: 679 CODE:
… …
692 716
693void 717void
694fatal (const char *msg) 718fatal (const char *msg)
695 CODE: 719 CODE:
696 rxvt_fatal ("%s", msg); 720 rxvt_fatal ("%s", msg);
721
722SV *
723untaint (SV *sv)
724 CODE:
725 RETVAL = newSVsv (sv);
726 SvTAINTED_off (RETVAL);
727 OUTPUT:
728 RETVAL
729
730bool
731safe ()
732 CODE:
733 RETVAL = !rxvt_tainted ();
734 OUTPUT:
735 RETVAL
697 736
698NV 737NV
699NOW () 738NOW ()
700 CODE: 739 CODE:
701 RETVAL = NOW; 740 RETVAL = NOW;
… …
800 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 839 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
801 840
802void 841void
803rxvt_term::ungrab () 842rxvt_term::ungrab ()
804 CODE: 843 CODE:
805{ 844 ungrab (THIS);
806 if (THIS->perl.grabtime)
807 {
808 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
809 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
810 THIS->perl.grabtime = 0;
811 }
812}
813 845
814int 846int
815rxvt_term::strwidth (SV *str) 847rxvt_term::strwidth (SV *str)
816 CODE: 848 CODE:
817{ 849{
… …
910 case 2: RETVAL = THIS->ModNumLockMask; break; 942 case 2: RETVAL = THIS->ModNumLockMask; break;
911 } 943 }
912 OUTPUT: 944 OUTPUT:
913 RETVAL 945 RETVAL
914 946
947char *
948rxvt_term::display_id ()
949 ALIAS:
950 display_id = 0
951 locale = 1
952 CODE:
953 switch (ix)
954 {
955 case 0: RETVAL = THIS->display->id; break;
956 case 1: RETVAL = THIS->locale; break;
957 }
958 OUTPUT:
959 RETVAL
960
961int
962rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
963 CODE:
964 RETVAL = THIS->pty_ev.events;
965 if (events != EVENT_UNDEF)
966 THIS->pty_ev.set (events);
967 OUTPUT:
968 RETVAL
969
915U32 970U32
916rxvt_term::parent () 971rxvt_term::parent ()
917 CODE: 972 CODE:
918 RETVAL = (U32)THIS->parent [0]; 973 RETVAL = (U32)THIS->parent [0];
919 OUTPUT: 974 OUTPUT:
… …
1220 } 1275 }
1221} 1276}
1222 OUTPUT: 1277 OUTPUT:
1223 RETVAL 1278 RETVAL
1224 1279
1280bool
1281rxvt_term::parse_keysym (char *keysym, char *str)
1282 CODE:
1283 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1284 THIS->keyboard->register_done ();
1285 OUTPUT:
1286 RETVAL
1287
1225void 1288void
1226rxvt_term::cur (...) 1289rxvt_term::screen_cur (...)
1227 PROTOTYPE: $;$$ 1290 PROTOTYPE: $;$$
1228 ALIAS: 1291 ALIAS:
1229 screen_cur = 0 1292 screen_cur = 0
1230 selection_beg = 1 1293 selection_beg = 1
1231 selection_end = 2 1294 selection_end = 2
… …
1260void 1323void
1261rxvt_term::selection (SV *newtext = 0) 1324rxvt_term::selection (SV *newtext = 0)
1262 PPCODE: 1325 PPCODE:
1263{ 1326{
1264 if (GIMME_V != G_VOID) 1327 if (GIMME_V != G_VOID)
1328 XPUSHs (THIS->selection.text
1265 XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))); 1329 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1330 : &PL_sv_undef);
1266 1331
1267 if (newtext) 1332 if (newtext)
1268 { 1333 {
1269 free (THIS->selection.text); 1334 free (THIS->selection.text);
1270 1335
1271 THIS->selection.text = sv2wcs (newtext); 1336 THIS->selection.text = sv2wcs (newtext);
1272 THIS->selection.len = wcslen (THIS->selection.text); 1337 THIS->selection.len = wcslen (THIS->selection.text);
1273 } 1338 }
1274} 1339}
1340
1341void
1342rxvt_term::scr_bell ()
1275 1343
1276void 1344void
1277rxvt_term::scr_add_lines (SV *string) 1345rxvt_term::scr_add_lines (SV *string)
1278 CODE: 1346 CODE:
1279{ 1347{

Diff Legend

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