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.27 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.59 by root, Thu Jan 12 02:20:56 2006 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2005 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28 28
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef>
31#include <cstdarg> 32#include <cstdarg>
32 33
34#include "unistd.h"
35
36#include "iom.h"
33#include "rxvt.h" 37#include "rxvt.h"
34#include "iom.h" 38#include "keyboard.h"
35#include "rxvtutil.h" 39#include "rxvtutil.h"
36#include "rxvtperl.h" 40#include "rxvtperl.h"
37 41
38#include "perlxsi.c" 42#include "perlxsi.c"
43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
45# define GRAB_CURSOR THIS->leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
39 49
40#undef LINENO 50#undef LINENO
41#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)
42#undef ROW 52#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
44 54
45///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
46 56
57static SV *
58taint (SV *sv)
59{
60 SvTAINT (sv);
61 return sv;
62}
63
64static SV *
65taint_if (SV *sv, SV *src)
66{
67 if (SvTAINTED (src))
68 SvTAINT (sv);
69
70 return sv;
71}
72
47static wchar_t * 73static wchar_t *
48sv2wcs (SV *sv) 74sv2wcs (SV *sv)
49{ 75{
50 STRLEN len; 76 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 77 char *str = SvPVutf8 (sv, len);
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 127 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 128
103 return (long)mg->mg_ptr; 129 return (long)mg->mg_ptr;
104} 130}
105 131
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 132#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 133#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 134
109///////////////////////////////////////////////////////////////////////////// 135/////////////////////////////////////////////////////////////////////////////
110 136
111struct perl_watcher 137struct perl_watcher
290void 316void
291overlay::show () 317overlay::show ()
292{ 318{
293 char key[33]; sprintf (key, "%32lx", (long)this); 319 char key[33]; sprintf (key, "%32lx", (long)this);
294 320
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 321 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
296 hv_store (hv, key, 32, newSViv ((long)this), 0); 322 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 323}
298 324
299void 325void
300overlay::hide () 326overlay::hide ()
301{ 327{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 328 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 329
304 if (ovs) 330 if (ovs)
305 { 331 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 332 char key[33]; sprintf (key, "%32lx", (long)this);
307 333
369 395
370struct rxvt_perl_interp rxvt_perl; 396struct rxvt_perl_interp rxvt_perl;
371 397
372static PerlInterpreter *perl; 398static PerlInterpreter *perl;
373 399
374rxvt_perl_interp::rxvt_perl_interp ()
375{
376}
377
378rxvt_perl_interp::~rxvt_perl_interp () 400rxvt_perl_interp::~rxvt_perl_interp ()
379{ 401{
380 if (perl) 402 if (perl)
381 { 403 {
382 perl_destruct (perl); 404 perl_destruct (perl);
387void 409void
388rxvt_perl_interp::init () 410rxvt_perl_interp::init ()
389{ 411{
390 if (!perl) 412 if (!perl)
391 { 413 {
414 perl_environ = rxvt_environ;
415 swap (perl_environ, environ);
416
392 char *argv[] = { 417 char *argv[] = {
393 "", 418 "",
419 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 421 };
396 422
397 perl = perl_alloc (); 423 perl = perl_alloc ();
398 perl_construct (perl); 424 perl_construct (perl);
399 425
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 426 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 427 || perl_run (perl))
402 { 428 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 429 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 430
405 perl_destruct (perl); 431 perl_destruct (perl);
406 perl_free (perl); 432 perl_free (perl);
407 perl = 0; 433 perl = 0;
408 } 434 }
435
436 swap (perl_environ, environ);
437 }
438}
439
440static void
441ungrab (rxvt_term *THIS)
442{
443 if (THIS->perl.grabtime)
444 {
445 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
446 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
447 THIS->perl.grabtime = 0;
409 } 448 }
410} 449}
411 450
412bool 451bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
415 if (!perl) 454 if (!perl)
416 return false; 455 return false;
417 456
418 if (htype == HOOK_INIT) // first hook ever called 457 if (htype == HOOK_INIT) // first hook ever called
419 { 458 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 459 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 460 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 461 }
423 else if (!term->self) 462 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 463 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 464 else if (htype == HOOK_DESTROY)
426 { 465 {
427 // handled later 466 // handled later
428 } 467 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 468 else
430 { 469 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
432
433 if (HvKEYS (hv))
434 { 471 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473
474 if (HvKEYS (hv))
475 {
435 hv_iterinit (hv); 476 hv_iterinit (hv);
436 477
437 while (HE *he = hv_iternext (hv)) 478 while (HE *he = hv_iternext (hv))
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
439 } 482 }
483
484 if (!should_invoke [htype])
485 return false;
440 } 486 }
441 else if (!should_invoke [htype])
442 return false;
443 487
488 swap (perl_environ, environ);
489
490 try
491 {
444 dSP; 492 dSP;
445 va_list ap; 493 va_list ap;
446 494
447 va_start (ap, htype); 495 va_start (ap, htype);
448 496
449 ENTER; 497 ENTER;
450 SAVETMPS; 498 SAVETMPS;
451 499
452 PUSHMARK (SP); 500 PUSHMARK (SP);
453 501
454 XPUSHs (sv_2mortal (newSVterm (term))); 502 XPUSHs (sv_2mortal (newSVterm (term)));
455 XPUSHs (sv_2mortal (newSViv (htype))); 503 XPUSHs (sv_2mortal (newSViv (htype)));
456 504
457 for (;;) { 505 for (;;) {
458 data_type dt = (data_type)va_arg (ap, int); 506 data_type dt = (data_type)va_arg (ap, int);
459 507
460 switch (dt) 508 switch (dt)
461 { 509 {
462 case DT_INT: 510 case DT_INT:
463 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
464 break; 512 break;
465 513
466 case DT_LONG: 514 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 516 break;
469 517
470 case DT_STRING: 518 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 520 break;
473 521
474 case DT_USTRING_LEN: 522 case DT_STR_LEN:
475 {
476 unicode_t *ustr = va_arg (ap, unicode_t *);
477 int ulen = va_arg (ap, int);
478 wchar_t *wstr = new wchar_t [ulen];
479
480 for (int i = ulen; i--; )
481 wstr [i] = ustr [i];
482
483 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
484
485 delete [] wstr;
486 }
487
488 case DT_END:
489 {
490 va_end (ap);
491
492 PUTBACK;
493 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
494 SPAGAIN;
495
496 if (count)
497 { 523 {
498 SV *status = POPs; 524 char *str = va_arg (ap, char *);
499 count = SvTRUE (status); 525 int len = va_arg (ap, int);
526
527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
500 } 528 }
529 break;
501 530
502 PUTBACK; 531 case DT_WCS_LEN:
503 FREETMPS;
504 LEAVE;
505
506 if (SvTRUE (ERRSV))
507 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
508
509 if (htype == HOOK_DESTROY)
510 { 532 {
511 clearSVptr ((SV *)term->self); 533 wchar_t *wstr = va_arg (ap, wchar_t *);
512 SvREFCNT_dec ((SV *)term->self); 534 int wlen = va_arg (ap, int);
535
536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
513 } 537 }
538 break;
514 539
540 case DT_XEVENT:
541 {
542 XEvent *xe = va_arg (ap, XEvent *);
543 HV *hv = newHV ();
544
545# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
546# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
547# undef set
548
549 setiv (type, xe->type);
550 setiv (send_event, xe->xany.send_event);
551 setiv (serial, xe->xany.serial);
552
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:
593 {
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 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);
515 return count; 623 return count;
516 } 624 }
517 625
518 default: 626 default:
519 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 }
520 } 629 }
521 } 630 }
631 catch (...)
632 {
633 swap (perl_environ, environ);
634 throw;
635 }
522} 636}
523 637
524///////////////////////////////////////////////////////////////////////////// 638/////////////////////////////////////////////////////////////////////////////
525 639
526MODULE = urxvt PACKAGE = urxvt 640MODULE = urxvt PACKAGE = urxvt
527 641
528PROTOTYPES: ENABLE 642PROTOTYPES: ENABLE
529 643
530BOOT: 644BOOT:
531{ 645{
532# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 646 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
647 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
648 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
649 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
650
533 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 651 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 652# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
535# include "hookinc.h" 653# include "hookinc.h"
536# undef def 654# undef def
537 655
656 HV *option = get_hv ("urxvt::OPTION", 1);
657# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
658# define nodef(name)
659# include "optinc.h"
660# undef nodef
661# undef def
662
663 HV *stash = gv_stashpv ("urxvt", 1);
664# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
538 export_const (DEFAULT_RSTYLE); 665 export_const_iv (DEFAULT_RSTYLE);
539 export_const (OVERLAY_RSTYLE); 666 export_const_iv (OVERLAY_RSTYLE);
540 export_const (RS_Bold); 667 export_const_iv (RS_Bold);
541 export_const (RS_Italic); 668 export_const_iv (RS_Italic);
542 export_const (RS_Blink); 669 export_const_iv (RS_Blink);
543 export_const (RS_RVid); 670 export_const_iv (RS_RVid);
544 export_const (RS_Uline); 671 export_const_iv (RS_Uline);
545 672
546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 673 export_const_iv (CurrentTime);
674 export_const_iv (ShiftMask);
675 export_const_iv (LockMask);
676 export_const_iv (ControlMask);
677 export_const_iv (Mod1Mask);
678 export_const_iv (Mod2Mask);
679 export_const_iv (Mod3Mask);
680 export_const_iv (Mod4Mask);
681 export_const_iv (Mod5Mask);
682 export_const_iv (Button1Mask);
683 export_const_iv (Button2Mask);
684 export_const_iv (Button3Mask);
685 export_const_iv (Button4Mask);
686 export_const_iv (Button5Mask);
687 export_const_iv (AnyModifier);
688
689 export_const_iv (EVENT_NONE);
690 export_const_iv (EVENT_READ);
691 export_const_iv (EVENT_WRITE);
547} 692}
548 693
549void 694void
550set_should_invoke (int htype, int value) 695set_should_invoke (int htype, int value)
551 CODE: 696 CODE:
558 703
559void 704void
560fatal (const char *msg) 705fatal (const char *msg)
561 CODE: 706 CODE:
562 rxvt_fatal ("%s", msg); 707 rxvt_fatal ("%s", msg);
708
709SV *
710untaint (SV *sv)
711 CODE:
712 RETVAL = newSVsv (sv);
713 SvTAINTED_off (RETVAL);
714 OUTPUT:
715 RETVAL
716
717void
718_exit (int status)
719
720bool
721safe ()
722 CODE:
723 RETVAL = !rxvt_tainted ();
724 OUTPUT:
725 RETVAL
563 726
564NV 727NV
565NOW () 728NOW ()
566 CODE: 729 CODE:
567 RETVAL = NOW; 730 RETVAL = NOW;
615} 778}
616 OUTPUT: 779 OUTPUT:
617 RETVAL 780 RETVAL
618 781
619MODULE = urxvt PACKAGE = urxvt::term 782MODULE = urxvt PACKAGE = urxvt::term
783
784SV *
785_new (...)
786 CODE:
787{
788 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
789 croak ("first argument to urxvt::term->_new must be arrayref");
790
791 rxvt_term *term = new rxvt_term;
792
793 term->argv = new stringvec;
794 term->envv = new stringvec;
795
796 for (int i = 1; i < items; i++)
797 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
798
799 AV *envv = (AV *)SvRV (ST (0));
800 for (int i = av_len (envv) + 1; i--; )
801 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
802
803 term->envv->push_back (0);
804
805 bool success;
806
807 try
808 {
809 success = term->init (term->argv->size (), term->argv->begin ());
810 }
811 catch (const class rxvt_failure_exception &e)
812 {
813 success = false;
814 }
815
816 if (!success)
817 {
818 term->destroy ();
819 croak ("error while initializing new terminal instance");
820 }
821
822 RETVAL = term && term->perl.self
823 ? newSVterm (term) : &PL_sv_undef;
824}
825 OUTPUT:
826 RETVAL
827
828void
829rxvt_term::destroy ()
830
831void
832rxvt_term::grab_button (int button, U32 modifiers)
833 CODE:
834 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
835 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
836 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
837
838bool
839rxvt_term::grab (U32 eventtime, int sync = 0)
840 CODE:
841{
842 int mode = sync ? GrabModeSync : GrabModeAsync;
843
844 THIS->perl.grabtime = 0;
845
846 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
847 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
848 mode, mode, None, GRAB_CURSOR, eventtime))
849 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
850 THIS->perl.grabtime = eventtime;
851 else
852 XUngrabPointer (THIS->display->display, eventtime);
853
854 RETVAL = !!THIS->perl.grabtime;
855}
856 OUTPUT:
857 RETVAL
858
859void
860rxvt_term::allow_events_async ()
861 CODE:
862 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
863
864void
865rxvt_term::allow_events_sync ()
866 CODE:
867 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
868
869void
870rxvt_term::allow_events_replay ()
871 CODE:
872 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
873 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
874
875void
876rxvt_term::ungrab ()
877 CODE:
878 ungrab (THIS);
620 879
621int 880int
622rxvt_term::strwidth (SV *str) 881rxvt_term::strwidth (SV *str)
623 CODE: 882 CODE:
624{ 883{
643 char *mbstr = rxvt_wcstombs (wstr); 902 char *mbstr = rxvt_wcstombs (wstr);
644 rxvt_pop_locale (); 903 rxvt_pop_locale ();
645 904
646 free (wstr); 905 free (wstr);
647 906
648 RETVAL = newSVpv (mbstr, 0); 907 RETVAL = taint_if (newSVpv (mbstr, 0), str);
649 free (mbstr); 908 free (mbstr);
650} 909}
651 OUTPUT: 910 OUTPUT:
652 RETVAL 911 RETVAL
653 912
660 919
661 rxvt_push_locale (THIS->locale); 920 rxvt_push_locale (THIS->locale);
662 wchar_t *wstr = rxvt_mbstowcs (data, len); 921 wchar_t *wstr = rxvt_mbstowcs (data, len);
663 rxvt_pop_locale (); 922 rxvt_pop_locale ();
664 923
665 RETVAL = wcs2sv (wstr); 924 RETVAL = taint_if (wcs2sv (wstr), octets);
666 free (wstr); 925 free (wstr);
667} 926}
668 OUTPUT: 927 OUTPUT:
669 RETVAL 928 RETVAL
670 929
671# very portable, especially on objects as opposed to pods 930#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
672#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
673 931
674#define TERM_OFFSET_width TERM_OFFSET(width) 932#define TERM_OFFSET_width TERM_OFFSET(width)
675#define TERM_OFFSET_height TERM_OFFSET(height) 933#define TERM_OFFSET_height TERM_OFFSET(height)
676#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 934#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
677#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 935#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
702 CODE: 960 CODE:
703 RETVAL = *(int *)((char *)THIS + ix); 961 RETVAL = *(int *)((char *)THIS + ix);
704 OUTPUT: 962 OUTPUT:
705 RETVAL 963 RETVAL
706 964
965unsigned int
966rxvt_term::ModLevel3Mask ()
967 ALIAS:
968 ModLevel3Mask = 0
969 ModMetaMask = 1
970 ModNumLockMask = 2
971 CODE:
972 switch (ix)
973 {
974 case 0: RETVAL = THIS->ModLevel3Mask; break;
975 case 1: RETVAL = THIS->ModMetaMask; break;
976 case 2: RETVAL = THIS->ModNumLockMask; break;
977 }
978 OUTPUT:
979 RETVAL
980
981char *
982rxvt_term::display_id ()
983 ALIAS:
984 display_id = 0
985 locale = 1
986 CODE:
987 switch (ix)
988 {
989 case 0: RETVAL = THIS->display->id; break;
990 case 1: RETVAL = THIS->locale; break;
991 }
992 OUTPUT:
993 RETVAL
994
995SV *
996rxvt_term::_env ()
997 CODE:
998{
999 if (THIS->envv)
1000 {
1001 AV *av = newAV ();
1002
1003 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1004 if (*i)
1005 av_push (av, newSVpv (*i, 0));
1006
1007 RETVAL = newRV_noinc ((SV *)av);
1008 }
1009 else
1010 RETVAL = &PL_sv_undef;
1011}
1012 OUTPUT:
1013 RETVAL
1014
1015int
1016rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1017 CODE:
1018 RETVAL = THIS->pty_ev.events;
1019 if (events != EVENT_UNDEF)
1020 THIS->pty_ev.set (events);
1021 OUTPUT:
1022 RETVAL
1023
1024U32
1025rxvt_term::parent ()
1026 CODE:
1027 RETVAL = (U32)THIS->parent [0];
1028 OUTPUT:
1029 RETVAL
1030
1031U32
1032rxvt_term::vt ()
1033 CODE:
1034 RETVAL = (U32)THIS->vt;
1035 OUTPUT:
1036 RETVAL
1037
707U32 1038U32
708rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1039rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
709 CODE: 1040 CODE:
710{ 1041{
711 RETVAL = THIS->rstyle; 1042 RETVAL = THIS->rstyle;
745 1076
746 if (GIMME_V != G_VOID) 1077 if (GIMME_V != G_VOID)
747 { 1078 {
748 wchar_t *wstr = new wchar_t [THIS->ncol]; 1079 wchar_t *wstr = new wchar_t [THIS->ncol];
749 1080
750 for (int col = 0; col <THIS->ncol; col++) 1081 for (int col = 0; col < THIS->ncol; col++)
751 wstr [col] = l.t [col]; 1082 wstr [col] = l.t [col];
752 1083
753 XPUSHs (sv_2mortal (wcs2sv (wstr))); 1084 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
754 1085
755 delete [] wstr; 1086 delete [] wstr;
756 } 1087 }
757 1088
758 if (new_text) 1089 if (new_text)
848} 1179}
849 OUTPUT: 1180 OUTPUT:
850 RETVAL 1181 RETVAL
851 1182
852SV * 1183SV *
853rxvt_term::special_encode (SV *str) 1184rxvt_term::special_encode (SV *string)
854 CODE: 1185 CODE:
855 abort ();//TODO 1186{
1187 wchar_t *wstr = sv2wcs (string);
1188 int wlen = wcslen (wstr);
1189 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1190
1191 rxvt_push_locale (THIS->locale);
1192
1193 wchar_t *r = rstr;
1194 for (wchar_t *s = wstr; *s; s++)
1195 if (wcwidth (*s) == 0)
1196 {
1197 if (r == rstr)
1198 croak ("leading combining character unencodable");
1199
1200 unicode_t n = rxvt_compose (r[-1], *s);
1201 if (n == NOCHAR)
1202 n = rxvt_composite.compose (r[-1], *s);
1203
1204 r[-1] = n;
1205 }
1206#if !UNICODE_3
1207 else if (*s >= 0x10000)
1208 *r++ = rxvt_composite.compose (*s);
1209#endif
1210 else
1211 *r++ = *s;
1212
1213 rxvt_pop_locale ();
1214
1215 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1216
1217 delete [] rstr;
1218}
1219 OUTPUT:
1220 RETVAL
856 1221
857SV * 1222SV *
858rxvt_term::special_decode (SV *str) 1223rxvt_term::special_decode (SV *text)
859 CODE: 1224 CODE:
860 abort ();//TODO 1225{
1226 wchar_t *wstr = sv2wcs (text);
1227 int wlen = wcslen (wstr);
1228 int dlen = 0;
1229
1230 // find length
1231 for (wchar_t *s = wstr; *s; s++)
1232 if (*s == NOCHAR)
1233 ;
1234 else if (IS_COMPOSE (*s))
1235 dlen += rxvt_composite.expand (*s, 0);
1236 else
1237 dlen++;
1238
1239 wchar_t *rstr = new wchar_t [dlen];
1240
1241 // decode
1242 wchar_t *r = rstr;
1243 for (wchar_t *s = wstr; *s; s++)
1244 if (*s == NOCHAR)
1245 ;
1246 else if (IS_COMPOSE (*s))
1247 r += rxvt_composite.expand (*s, r);
1248 else
1249 *r++ = *s;
1250
1251 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1252
1253 delete [] rstr;
1254}
1255 OUTPUT:
1256 RETVAL
861 1257
862void 1258void
863rxvt_term::_resource (char *name, int index, SV *newval = 0) 1259rxvt_term::_resource (char *name, int index, SV *newval = 0)
864 PPCODE: 1260 PPCODE:
865{ 1261{
882 1278
883 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1279 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
884 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1280 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
885 1281
886 if (GIMME_V != G_VOID) 1282 if (GIMME_V != G_VOID)
887 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1283 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
888 1284
889 if (newval) 1285 if (newval)
890 { 1286 {
891 if (SvOK (newval)) 1287 if (SvOK (newval))
892 { 1288 {
897 else 1293 else
898 THIS->rs [index] = 0; 1294 THIS->rs [index] = 0;
899 } 1295 }
900} 1296}
901 1297
1298const char *
1299rxvt_term::x_resource (const char *name)
1300 CLEANUP:
1301 SvTAINTED_on (ST (0));
1302
1303bool
1304rxvt_term::option (U32 optval, int set = -1)
1305 CODE:
1306{
1307 RETVAL = THIS->options & optval;
1308
1309 if (set >= 0)
1310 {
1311 if (set)
1312 THIS->options |= optval;
1313 else
1314 THIS->options &= ~optval;
1315
1316 switch (optval)
1317 {
1318 case Opt_skipBuiltinGlyphs:
1319 THIS->set_fonts ();
1320 THIS->scr_remap_chars ();
1321 THIS->scr_touch (true);
1322 THIS->want_refresh = 1;
1323 break;
1324
1325 case Opt_cursorUnderline:
1326 THIS->want_refresh = 1;
1327 break;
1328
1329# case Opt_scrollBar_floating:
1330# case Opt_scrollBar_right:
1331# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1332# break;
1333 }
1334 }
1335}
1336 OUTPUT:
1337 RETVAL
1338
1339bool
1340rxvt_term::parse_keysym (char *keysym, char *str)
1341 CODE:
1342 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1343 THIS->keyboard->register_done ();
1344 OUTPUT:
1345 RETVAL
1346
902void 1347void
903rxvt_term::cur (...) 1348rxvt_term::screen_cur (...)
904 PROTOTYPE: $;$$ 1349 PROTOTYPE: $;$$
905 ALIAS: 1350 ALIAS:
906 screen_cur = 0 1351 screen_cur = 0
907 selection_beg = 1 1352 selection_beg = 1
908 selection_end = 2 1353 selection_end = 2
929 if (ix) 1374 if (ix)
930 THIS->want_refresh = 1; 1375 THIS->want_refresh = 1;
931 } 1376 }
932} 1377}
933 1378
1379char
1380rxvt_term::cur_charset ()
1381 CODE:
1382 RETVAL = THIS->charsets [THIS->screen.charset];
1383 OUTPUT:
1384 RETVAL
1385
934int 1386int
935rxvt_term::selection_grab (int eventtime = CurrentTime) 1387rxvt_term::selection_grab (U32 eventtime)
936 1388
937void 1389void
938rxvt_term::selection (SV *newtext = 0) 1390rxvt_term::selection (SV *newtext = 0)
939 PPCODE: 1391 PPCODE:
940{ 1392{
941 if (GIMME_V != G_VOID) 1393 if (GIMME_V != G_VOID)
1394 XPUSHs (THIS->selection.text
942 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1395 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1396 : &PL_sv_undef);
943 1397
944 if (newtext) 1398 if (newtext)
945 { 1399 {
946 free (THIS->selection.text); 1400 free (THIS->selection.text);
947 1401
949 THIS->selection.len = wcslen (THIS->selection.text); 1403 THIS->selection.len = wcslen (THIS->selection.text);
950 } 1404 }
951} 1405}
952 1406
953void 1407void
1408rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1409
1410void
1411rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1412
1413void
1414rxvt_term::scr_bell ()
1415
1416void
954rxvt_term::scr_add_lines (SV *string) 1417rxvt_term::scr_add_lines (SV *string)
955 CODE: 1418 CODE:
956{ 1419{
957 wchar_t *wstr = sv2wcs (string); 1420 wchar_t *wstr = sv2wcs (string);
958 int wlen = wcslen (wstr);
959 unicode_t *ustr = new unicode_t [wlen];
960 int nlines = 0;
961
962 for (int i = wlen; i--; )
963 {
964 ustr [i] = wstr [i];
965 nlines += ustr [i] == '\012';
966 }
967
968 THIS->scr_add_lines (ustr, nlines, wlen); 1421 THIS->scr_add_lines (wstr, wcslen (wstr));
969
970 free (wstr); 1422 free (wstr);
971 delete [] ustr;
972} 1423}
973 1424
974void 1425void
975rxvt_term::tt_write (SV *octets) 1426rxvt_term::tt_write (SV *octets)
976 INIT: 1427 INIT:
977 STRLEN len; 1428 STRLEN len;
978 char *str = SvPVbyte (octets, len); 1429 char *str = SvPVbyte (octets, len);
979 C_ARGS: 1430 C_ARGS:
980 str, len 1431 str, len
981 1432
1433void
1434rxvt_term::cmd_parse (SV *octets)
1435 CODE:
1436{
1437 STRLEN len;
1438 char *str = SvPVbyte (octets, len);
1439
1440 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1441 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1442
1443 THIS->cmdbuf_ptr = str;
1444 THIS->cmdbuf_endp = str + len;
1445
1446 rxvt_push_locale (THIS->locale);
1447 THIS->cmd_parse ();
1448 rxvt_pop_locale ();
1449
1450 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1451 THIS->cmdbuf_endp = old_cmdbuf_endp;
1452}
1453
982SV * 1454SV *
983rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1455rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
984 CODE: 1456 CODE:
985{ 1457{
986 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1458 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines