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.24 by root, Wed Jan 4 21:37:55 2006 UTC vs.
Revision 1.58 by root, Thu Jan 12 01:38:37 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 "iom.h"
33#include "rxvt.h" 35#include "rxvt.h"
34#include "iom.h" 36#include "keyboard.h"
35#include "rxvtutil.h" 37#include "rxvtutil.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include "perlxsi.c" 40#include "perlxsi.c"
41
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
43# define GRAB_CURSOR THIS->leftptr_cursor
44#else
45# define GRAB_CURSOR None
46#endif
39 47
40#undef LINENO 48#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 49#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 50#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 51#define ROW(n) THIS->row_buf [LINENO (n)]
44 52
45///////////////////////////////////////////////////////////////////////////// 53/////////////////////////////////////////////////////////////////////////////
46 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
47static wchar_t * 71static wchar_t *
48sv2wcs (SV *sv) 72sv2wcs (SV *sv)
49{ 73{
50 STRLEN len; 74 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 75 char *str = SvPVutf8 (sv, len);
52 return rxvt_utf8towcs (str, len); 76 return rxvt_utf8towcs (str, len);
53} 77}
54 78
55static SV * 79static SV *
80wcs2sv (wchar_t *wstr, int len = -1)
81{
82 char *str = rxvt_wcstoutf8 (wstr, len);
83
84 SV *sv = newSVpv (str, 0);
85 SvUTF8_on (sv);
86 free (str);
87
88 return sv;
89}
90
91static SV *
56new_ref (HV *hv, const char *klass) 92new_ref (HV *hv, const char *klass)
57{ 93{
58 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 94 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59} 95}
60 96
… …
89 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 125 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
90 126
91 return (long)mg->mg_ptr; 127 return (long)mg->mg_ptr;
92} 128}
93 129
94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 130#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 131#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
96 132
97///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
98 134
99struct perl_watcher 135struct perl_watcher
… …
278void 314void
279overlay::show () 315overlay::show ()
280{ 316{
281 char key[33]; sprintf (key, "%32lx", (long)this); 317 char key[33]; sprintf (key, "%32lx", (long)this);
282 318
283 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 319 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
284 hv_store (hv, key, 32, newSViv ((long)this), 0); 320 hv_store (hv, key, 32, newSViv ((long)this), 0);
285} 321}
286 322
287void 323void
288overlay::hide () 324overlay::hide ()
289{ 325{
290 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 326 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
291 327
292 if (ovs) 328 if (ovs)
293 { 329 {
294 char key[33]; sprintf (key, "%32lx", (long)this); 330 char key[33]; sprintf (key, "%32lx", (long)this);
295 331
… …
357 393
358struct rxvt_perl_interp rxvt_perl; 394struct rxvt_perl_interp rxvt_perl;
359 395
360static PerlInterpreter *perl; 396static PerlInterpreter *perl;
361 397
362rxvt_perl_interp::rxvt_perl_interp ()
363{
364}
365
366rxvt_perl_interp::~rxvt_perl_interp () 398rxvt_perl_interp::~rxvt_perl_interp ()
367{ 399{
368 if (perl) 400 if (perl)
369 { 401 {
370 perl_destruct (perl); 402 perl_destruct (perl);
… …
375void 407void
376rxvt_perl_interp::init () 408rxvt_perl_interp::init ()
377{ 409{
378 if (!perl) 410 if (!perl)
379 { 411 {
412 perl_environ = rxvt_environ;
413 swap (perl_environ, environ);
414
380 char *argv[] = { 415 char *argv[] = {
381 "", 416 "",
417 "-T",
382 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
383 }; 419 };
384 420
385 perl = perl_alloc (); 421 perl = perl_alloc ();
386 perl_construct (perl); 422 perl_construct (perl);
387 423
388 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
389 || perl_run (perl)) 425 || perl_run (perl))
390 { 426 {
391 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
392 428
393 perl_destruct (perl); 429 perl_destruct (perl);
394 perl_free (perl); 430 perl_free (perl);
395 perl = 0; 431 perl = 0;
396 } 432 }
433
434 swap (perl_environ, environ);
435 }
436}
437
438static void
439ungrab (rxvt_term *THIS)
440{
441 if (THIS->perl.grabtime)
442 {
443 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
444 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
445 THIS->perl.grabtime = 0;
397 } 446 }
398} 447}
399 448
400bool 449bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 450rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
403 if (!perl) 452 if (!perl)
404 return false; 453 return false;
405 454
406 if (htype == HOOK_INIT) // first hook ever called 455 if (htype == HOOK_INIT) // first hook ever called
407 { 456 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 457 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 458 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410 } 459 }
411 else if (!term->self) 460 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 461 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 462 else if (htype == HOOK_DESTROY)
414 { 463 {
415 // handled later 464 // handled later
416 } 465 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 466 else
418 { 467 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 468 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
420
421 if (HvKEYS (hv))
422 { 469 {
470 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
471
472 if (HvKEYS (hv))
473 {
423 hv_iterinit (hv); 474 hv_iterinit (hv);
424 475
425 while (HE *he = hv_iternext (hv)) 476 while (HE *he = hv_iternext (hv))
426 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 477 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
478 }
479
427 } 480 }
481
482 if (!should_invoke [htype])
483 return false;
428 } 484 }
429 else if (!should_invoke [htype])
430 return false;
431 485
486 swap (perl_environ, environ);
487
488 try
489 {
432 dSP; 490 dSP;
433 va_list ap; 491 va_list ap;
434 492
435 va_start (ap, htype); 493 va_start (ap, htype);
436 494
437 ENTER; 495 ENTER;
438 SAVETMPS; 496 SAVETMPS;
439 497
440 PUSHMARK (SP); 498 PUSHMARK (SP);
441 499
442 XPUSHs (sv_2mortal (newSVterm (term))); 500 XPUSHs (sv_2mortal (newSVterm (term)));
443 XPUSHs (sv_2mortal (newSViv (htype))); 501 XPUSHs (sv_2mortal (newSViv (htype)));
444 502
445 for (;;) { 503 for (;;) {
446 data_type dt = (data_type)va_arg (ap, int); 504 data_type dt = (data_type)va_arg (ap, int);
447 505
448 switch (dt) 506 switch (dt)
449 { 507 {
450 case DT_INT: 508 case DT_INT:
451 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 509 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
452 break; 510 break;
453 511
454 case DT_LONG: 512 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break; 514 break;
457 515
458 case DT_STRING: 516 case DT_STR:
459 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 517 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
460 break; 518 break;
461 519
462 case DT_END: 520 case DT_STR_LEN:
463 {
464 va_end (ap);
465
466 PUTBACK;
467 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
468 SPAGAIN;
469
470 if (count)
471 { 521 {
472 SV *status = POPs; 522 char *str = va_arg (ap, char *);
473 count = SvTRUE (status); 523 int len = va_arg (ap, int);
524
525 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
474 } 526 }
527 break;
475 528
476 PUTBACK; 529 case DT_WCS_LEN:
477 FREETMPS;
478 LEAVE;
479
480 if (SvTRUE (ERRSV))
481 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
482
483 if (htype == HOOK_DESTROY)
484 { 530 {
485 clearSVptr ((SV *)term->self); 531 wchar_t *wstr = va_arg (ap, wchar_t *);
486 SvREFCNT_dec ((SV *)term->self); 532 int wlen = va_arg (ap, int);
533
534 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
487 } 535 }
536 break;
488 537
538 case DT_XEVENT:
539 {
540 XEvent *xe = va_arg (ap, XEvent *);
541 HV *hv = newHV ();
542
543# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
544# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
545# undef set
546
547 setiv (type, xe->type);
548 setiv (send_event, xe->xany.send_event);
549 setiv (serial, xe->xany.serial);
550
551 switch (xe->type)
552 {
553 case KeyPress:
554 case KeyRelease:
555 case ButtonPress:
556 case ButtonRelease:
557 case MotionNotify:
558 setiv (time, xe->xmotion.time);
559 setiv (x, xe->xmotion.x);
560 setiv (y, xe->xmotion.y);
561 setiv (row, xe->xmotion.y / term->fheight);
562 setiv (col, xe->xmotion.x / term->fwidth);
563 setiv (x_root, xe->xmotion.x_root);
564 setiv (y_root, xe->xmotion.y_root);
565 setiv (state, xe->xmotion.state);
566 break;
567 }
568
569 switch (xe->type)
570 {
571 case KeyPress:
572 case KeyRelease:
573 setiv (keycode, xe->xkey.keycode);
574 break;
575
576 case ButtonPress:
577 case ButtonRelease:
578 setiv (button, xe->xbutton.button);
579 break;
580
581 case MotionNotify:
582 setiv (is_hint, xe->xmotion.is_hint);
583 break;
584 }
585
586 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
587 }
588 break;
589
590 case DT_END:
591 {
592 va_end (ap);
593
594 PUTBACK;
595 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
596 SPAGAIN;
597
598 if (count)
599 {
600 SV *status = POPs;
601 count = SvTRUE (status);
602 }
603
604 PUTBACK;
605 FREETMPS;
606 LEAVE;
607
608 if (SvTRUE (ERRSV))
609 {
610 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
611 ungrab (term); // better lose the grab than the session
612 }
613
614 if (htype == HOOK_DESTROY)
615 {
616 clearSVptr ((SV *)term->perl.self);
617 SvREFCNT_dec ((SV *)term->perl.self);
618 }
619
620 swap (perl_environ, environ);
489 return count; 621 return count;
490 } 622 }
491 623
492 default: 624 default:
493 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 625 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
626 }
494 } 627 }
495 } 628 }
629 catch (...)
630 {
631 swap (perl_environ, environ);
632 throw;
633 }
496} 634}
497 635
498///////////////////////////////////////////////////////////////////////////// 636/////////////////////////////////////////////////////////////////////////////
499 637
500MODULE = urxvt PACKAGE = urxvt 638MODULE = urxvt PACKAGE = urxvt
501 639
502PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
503 641
504BOOT: 642BOOT:
505{ 643{
506# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 644 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
645 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
646 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
647 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
648
507 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 649 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 650# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
509# include "hookinc.h" 651# include "hookinc.h"
510# undef def 652# undef def
511 653
654 HV *option = get_hv ("urxvt::OPTION", 1);
655# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
656# define nodef(name)
657# include "optinc.h"
658# undef nodef
659# undef def
660
661 HV *stash = gv_stashpv ("urxvt", 1);
662# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
512 export_const (DEFAULT_RSTYLE); 663 export_const_iv (DEFAULT_RSTYLE);
513 export_const (OVERLAY_RSTYLE); 664 export_const_iv (OVERLAY_RSTYLE);
514 export_const (RS_Bold); 665 export_const_iv (RS_Bold);
515 export_const (RS_Italic); 666 export_const_iv (RS_Italic);
516 export_const (RS_Blink); 667 export_const_iv (RS_Blink);
517 export_const (RS_RVid); 668 export_const_iv (RS_RVid);
518 export_const (RS_Uline); 669 export_const_iv (RS_Uline);
519 670
520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 671 export_const_iv (CurrentTime);
672 export_const_iv (ShiftMask);
673 export_const_iv (LockMask);
674 export_const_iv (ControlMask);
675 export_const_iv (Mod1Mask);
676 export_const_iv (Mod2Mask);
677 export_const_iv (Mod3Mask);
678 export_const_iv (Mod4Mask);
679 export_const_iv (Mod5Mask);
680 export_const_iv (Button1Mask);
681 export_const_iv (Button2Mask);
682 export_const_iv (Button3Mask);
683 export_const_iv (Button4Mask);
684 export_const_iv (Button5Mask);
685 export_const_iv (AnyModifier);
686
687 export_const_iv (EVENT_NONE);
688 export_const_iv (EVENT_READ);
689 export_const_iv (EVENT_WRITE);
521} 690}
522 691
523void 692void
524set_should_invoke (int htype, int value) 693set_should_invoke (int htype, int value)
525 CODE: 694 CODE:
… …
532 701
533void 702void
534fatal (const char *msg) 703fatal (const char *msg)
535 CODE: 704 CODE:
536 rxvt_fatal ("%s", msg); 705 rxvt_fatal ("%s", msg);
706
707SV *
708untaint (SV *sv)
709 CODE:
710 RETVAL = newSVsv (sv);
711 SvTAINTED_off (RETVAL);
712 OUTPUT:
713 RETVAL
714
715bool
716safe ()
717 CODE:
718 RETVAL = !rxvt_tainted ();
719 OUTPUT:
720 RETVAL
537 721
538NV 722NV
539NOW () 723NOW ()
540 CODE: 724 CODE:
541 RETVAL = NOW; 725 RETVAL = NOW;
… …
589} 773}
590 OUTPUT: 774 OUTPUT:
591 RETVAL 775 RETVAL
592 776
593MODULE = urxvt PACKAGE = urxvt::term 777MODULE = urxvt PACKAGE = urxvt::term
778
779SV *
780_new (...)
781 CODE:
782{
783 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
784 croak ("first argument to urxvt::term->_new must be arrayref");
785
786 rxvt_term *term = new rxvt_term;
787
788 term->argv = new stringvec;
789 term->envv = new stringvec;
790
791 for (int i = 1; i < items; i++)
792 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
793
794 AV *envv = (AV *)SvRV (ST (0));
795 for (int i = av_len (envv) + 1; i--; )
796 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
797
798 term->envv->push_back (0);
799
800 bool success;
801
802 try
803 {
804 success = term->init (term->argv->size (), term->argv->begin ());
805 }
806 catch (const class rxvt_failure_exception &e)
807 {
808 success = false;
809 }
810
811 if (!success)
812 {
813 term->destroy ();
814 croak ("error while initializing new terminal instance");
815 }
816
817 RETVAL = term && term->perl.self
818 ? newSVterm (term) : &PL_sv_undef;
819}
820 OUTPUT:
821 RETVAL
822
823void
824rxvt_term::destroy ()
825
826void
827rxvt_term::grab_button (int button, U32 modifiers)
828 CODE:
829 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
830 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
831 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
832
833bool
834rxvt_term::grab (U32 eventtime, int sync = 0)
835 CODE:
836{
837 int mode = sync ? GrabModeSync : GrabModeAsync;
838
839 THIS->perl.grabtime = 0;
840
841 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
842 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
843 mode, mode, None, GRAB_CURSOR, eventtime))
844 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
845 THIS->perl.grabtime = eventtime;
846 else
847 XUngrabPointer (THIS->display->display, eventtime);
848
849 RETVAL = !!THIS->perl.grabtime;
850}
851 OUTPUT:
852 RETVAL
853
854void
855rxvt_term::allow_events_async ()
856 CODE:
857 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
858
859void
860rxvt_term::allow_events_sync ()
861 CODE:
862 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
863
864void
865rxvt_term::allow_events_replay ()
866 CODE:
867 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
868 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
869
870void
871rxvt_term::ungrab ()
872 CODE:
873 ungrab (THIS);
594 874
595int 875int
596rxvt_term::strwidth (SV *str) 876rxvt_term::strwidth (SV *str)
597 CODE: 877 CODE:
598{ 878{
… …
617 char *mbstr = rxvt_wcstombs (wstr); 897 char *mbstr = rxvt_wcstombs (wstr);
618 rxvt_pop_locale (); 898 rxvt_pop_locale ();
619 899
620 free (wstr); 900 free (wstr);
621 901
622 RETVAL = newSVpv (mbstr, 0); 902 RETVAL = taint_if (newSVpv (mbstr, 0), str);
623 free (mbstr); 903 free (mbstr);
624} 904}
625 OUTPUT: 905 OUTPUT:
626 RETVAL 906 RETVAL
627 907
… …
634 914
635 rxvt_push_locale (THIS->locale); 915 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 916 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 917 rxvt_pop_locale ();
638 918
639 char *str = rxvt_wcstoutf8 (wstr); 919 RETVAL = taint_if (wcs2sv (wstr), octets);
640 free (wstr); 920 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 921}
646 OUTPUT: 922 OUTPUT:
647 RETVAL 923 RETVAL
648 924
649# very portable, especially on objects as opposed to pods 925#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
650#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
651 926
652#define TERM_OFFSET_width TERM_OFFSET(width) 927#define TERM_OFFSET_width TERM_OFFSET(width)
653#define TERM_OFFSET_height TERM_OFFSET(height) 928#define TERM_OFFSET_height TERM_OFFSET(height)
654#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 929#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
655#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 930#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
680 CODE: 955 CODE:
681 RETVAL = *(int *)((char *)THIS + ix); 956 RETVAL = *(int *)((char *)THIS + ix);
682 OUTPUT: 957 OUTPUT:
683 RETVAL 958 RETVAL
684 959
960unsigned int
961rxvt_term::ModLevel3Mask ()
962 ALIAS:
963 ModLevel3Mask = 0
964 ModMetaMask = 1
965 ModNumLockMask = 2
966 CODE:
967 switch (ix)
968 {
969 case 0: RETVAL = THIS->ModLevel3Mask; break;
970 case 1: RETVAL = THIS->ModMetaMask; break;
971 case 2: RETVAL = THIS->ModNumLockMask; break;
972 }
973 OUTPUT:
974 RETVAL
975
976char *
977rxvt_term::display_id ()
978 ALIAS:
979 display_id = 0
980 locale = 1
981 CODE:
982 switch (ix)
983 {
984 case 0: RETVAL = THIS->display->id; break;
985 case 1: RETVAL = THIS->locale; break;
986 }
987 OUTPUT:
988 RETVAL
989
990SV *
991rxvt_term::_env ()
992 CODE:
993{
994 if (THIS->envv)
995 {
996 AV *av = newAV ();
997
998 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
999 if (*i)
1000 av_push (av, newSVpv (*i, 0));
1001
1002 RETVAL = newRV_noinc ((SV *)av);
1003 }
1004 else
1005 RETVAL = &PL_sv_undef;
1006}
1007 OUTPUT:
1008 RETVAL
1009
1010int
1011rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1012 CODE:
1013 RETVAL = THIS->pty_ev.events;
1014 if (events != EVENT_UNDEF)
1015 THIS->pty_ev.set (events);
1016 OUTPUT:
1017 RETVAL
1018
685U32 1019U32
1020rxvt_term::parent ()
1021 CODE:
1022 RETVAL = (U32)THIS->parent [0];
1023 OUTPUT:
1024 RETVAL
1025
1026U32
1027rxvt_term::vt ()
1028 CODE:
1029 RETVAL = (U32)THIS->vt;
1030 OUTPUT:
1031 RETVAL
1032
1033U32
686rxvt_term::screen_rstyle (U32 new_rstyle = THIS->screen.s_rstyle) 1034rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
687 CODE: 1035 CODE:
688{ 1036{
689 RETVAL = THIS->screen.s_rstyle; 1037 RETVAL = THIS->rstyle;
690 THIS->screen.s_rstyle = new_rstyle; 1038 THIS->rstyle = new_rstyle;
691} 1039}
692 OUTPUT: 1040 OUTPUT:
693 RETVAL 1041 RETVAL
694 1042
695int 1043int
… …
711rxvt_term::want_refresh () 1059rxvt_term::want_refresh ()
712 CODE: 1060 CODE:
713 THIS->want_refresh = 1; 1061 THIS->want_refresh = 1;
714 1062
715void 1063void
716rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1064rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
717 PPCODE: 1065 PPCODE:
718{ 1066{
719 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1067 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
720 XSRETURN_EMPTY; 1068 XSRETURN_EMPTY;
721 1069
… …
723 1071
724 if (GIMME_V != G_VOID) 1072 if (GIMME_V != G_VOID)
725 { 1073 {
726 wchar_t *wstr = new wchar_t [THIS->ncol]; 1074 wchar_t *wstr = new wchar_t [THIS->ncol];
727 1075
728 for (int col = 0; col <THIS->ncol; col++) 1076 for (int col = 0; col < THIS->ncol; col++)
729 wstr [col] = l.t [col]; 1077 wstr [col] = l.t [col];
730 1078
731 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1079 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
732 free (wstr);
733 1080
734 SV *sv = newSVpv (str, 0); 1081 delete [] wstr;
735 SvUTF8_on (sv);
736 XPUSHs (sv_2mortal (sv));
737 free (str);
738 } 1082 }
739 1083
740 if (new_text) 1084 if (new_text)
741 { 1085 {
742 wchar_t *wstr = sv2wcs (new_text); 1086 wchar_t *wstr = sv2wcs (new_text);
743 1087
744 int len = wcslen (wstr); 1088 int len = min (wcslen (wstr) - start_ofs, max_len);
745 1089
746 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1090 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
747 { 1091 {
748 free (wstr); 1092 free (wstr);
749 croak ("new_text extends beyond horizontal margins"); 1093 croak ("new_text extends beyond horizontal margins");
750 } 1094 }
751 1095
752 for (int col = start_col; col < start_col + len; col++) 1096 for (int col = start_col; col < start_col + len; col++)
753 { 1097 {
754 l.t [col] = wstr [col - start_col]; 1098 l.t [col] = wstr [start_ofs + col - start_col];
755 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 1099 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
756 } 1100 }
757 1101
758 free (wstr); 1102 free (wstr);
759 } 1103 }
760} 1104}
761 1105
762void 1106void
763rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1107rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
764 PPCODE: 1108 PPCODE:
765{ 1109{
766 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1110 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
767 XSRETURN_EMPTY; 1111 XSRETURN_EMPTY;
768 1112
… …
783 { 1127 {
784 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1128 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
785 croak ("new_rend must be arrayref"); 1129 croak ("new_rend must be arrayref");
786 1130
787 AV *av = (AV *)SvRV (new_rend); 1131 AV *av = (AV *)SvRV (new_rend);
788 int len = av_len (av) + 1; 1132 int len = min (av_len (av) + 1 - start_ofs, max_len);
789 1133
790 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1134 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
791 croak ("new_rend array extends beyond horizontal margins"); 1135 croak ("new_rend array extends beyond horizontal margins");
792 1136
793 for (int col = start_col; col < start_col + len; col++) 1137 for (int col = start_col; col < start_col + len; col++)
794 { 1138 {
795 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1139 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
796 1140
797 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1141 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
798 } 1142 }
799 } 1143 }
800} 1144}
801 1145
802int 1146int
803rxvt_term::ROW_l (int row_number, int new_length = -2) 1147rxvt_term::ROW_l (int row_number, int new_length = -1)
804 CODE: 1148 CODE:
805{ 1149{
806 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1150 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
807 XSRETURN_EMPTY; 1151 XSRETURN_EMPTY;
808 1152
809 line_t &l = ROW(row_number); 1153 line_t &l = ROW(row_number);
810 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1154 RETVAL = l.l;
811 1155
812 if (new_length >= -1) 1156 if (new_length >= 0)
813 l.l = new_length; 1157 l.l = new_length;
814} 1158}
815 OUTPUT: 1159 OUTPUT:
816 RETVAL 1160 RETVAL
817 1161
818bool 1162bool
819rxvt_term::ROW_is_longer (int row_number) 1163rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
820 CODE: 1164 CODE:
821{ 1165{
822 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1166 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
823 XSRETURN_EMPTY; 1167 XSRETURN_EMPTY;
824 1168
825 line_t &l = ROW(row_number); 1169 line_t &l = ROW(row_number);
826 RETVAL = l.l < 0; 1170 RETVAL = l.is_longer ();
1171
1172 if (new_is_longer >= 0)
1173 l.is_longer (new_is_longer);
827} 1174}
828 OUTPUT: 1175 OUTPUT:
829 RETVAL 1176 RETVAL
830 1177
831SV * 1178SV *
832rxvt_term::special_encode (SV *str) 1179rxvt_term::special_encode (SV *string)
833 CODE: 1180 CODE:
834 abort ();//TODO 1181{
1182 wchar_t *wstr = sv2wcs (string);
1183 int wlen = wcslen (wstr);
1184 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1185
1186 rxvt_push_locale (THIS->locale);
1187
1188 wchar_t *r = rstr;
1189 for (wchar_t *s = wstr; *s; s++)
1190 if (wcwidth (*s) == 0)
1191 {
1192 if (r == rstr)
1193 croak ("leading combining character unencodable");
1194
1195 unicode_t n = rxvt_compose (r[-1], *s);
1196 if (n == NOCHAR)
1197 n = rxvt_composite.compose (r[-1], *s);
1198
1199 r[-1] = n;
1200 }
1201#if !UNICODE_3
1202 else if (*s >= 0x10000)
1203 *r++ = rxvt_composite.compose (*s);
1204#endif
1205 else
1206 *r++ = *s;
1207
1208 rxvt_pop_locale ();
1209
1210 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1211
1212 delete [] rstr;
1213}
1214 OUTPUT:
1215 RETVAL
835 1216
836SV * 1217SV *
837rxvt_term::special_decode (SV *str) 1218rxvt_term::special_decode (SV *text)
838 CODE: 1219 CODE:
839 abort ();//TODO 1220{
1221 wchar_t *wstr = sv2wcs (text);
1222 int wlen = wcslen (wstr);
1223 int dlen = 0;
1224
1225 // find length
1226 for (wchar_t *s = wstr; *s; s++)
1227 if (*s == NOCHAR)
1228 ;
1229 else if (IS_COMPOSE (*s))
1230 dlen += rxvt_composite.expand (*s, 0);
1231 else
1232 dlen++;
1233
1234 wchar_t *rstr = new wchar_t [dlen];
1235
1236 // decode
1237 wchar_t *r = rstr;
1238 for (wchar_t *s = wstr; *s; s++)
1239 if (*s == NOCHAR)
1240 ;
1241 else if (IS_COMPOSE (*s))
1242 r += rxvt_composite.expand (*s, r);
1243 else
1244 *r++ = *s;
1245
1246 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1247
1248 delete [] rstr;
1249}
1250 OUTPUT:
1251 RETVAL
840 1252
841void 1253void
842rxvt_term::_resource (char *name, int index, SV *newval = 0) 1254rxvt_term::_resource (char *name, int index, SV *newval = 0)
843 PPCODE: 1255 PPCODE:
844{ 1256{
… …
861 1273
862 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1274 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
863 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1275 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
864 1276
865 if (GIMME_V != G_VOID) 1277 if (GIMME_V != G_VOID)
866 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1278 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
867 1279
868 if (newval) 1280 if (newval)
869 { 1281 {
870 if (SvOK (newval)) 1282 if (SvOK (newval))
871 { 1283 {
… …
876 else 1288 else
877 THIS->rs [index] = 0; 1289 THIS->rs [index] = 0;
878 } 1290 }
879} 1291}
880 1292
1293const char *
1294rxvt_term::x_resource (const char *name)
1295 CLEANUP:
1296 SvTAINTED_on (ST (0));
1297
1298bool
1299rxvt_term::option (U32 optval, int set = -1)
1300 CODE:
1301{
1302 RETVAL = THIS->options & optval;
1303
1304 if (set >= 0)
1305 {
1306 if (set)
1307 THIS->options |= optval;
1308 else
1309 THIS->options &= ~optval;
1310
1311 switch (optval)
1312 {
1313 case Opt_skipBuiltinGlyphs:
1314 THIS->set_fonts ();
1315 THIS->scr_remap_chars ();
1316 THIS->scr_touch (true);
1317 THIS->want_refresh = 1;
1318 break;
1319
1320 case Opt_cursorUnderline:
1321 THIS->want_refresh = 1;
1322 break;
1323
1324# case Opt_scrollBar_floating:
1325# case Opt_scrollBar_right:
1326# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1327# break;
1328 }
1329 }
1330}
1331 OUTPUT:
1332 RETVAL
1333
1334bool
1335rxvt_term::parse_keysym (char *keysym, char *str)
1336 CODE:
1337 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1338 THIS->keyboard->register_done ();
1339 OUTPUT:
1340 RETVAL
1341
881void 1342void
882rxvt_term::cur (...) 1343rxvt_term::screen_cur (...)
883 PROTOTYPE: $;$$ 1344 PROTOTYPE: $;$$
884 ALIAS: 1345 ALIAS:
885 screen_cur = 0 1346 screen_cur = 0
886 selection_beg = 1 1347 selection_beg = 1
887 selection_end = 2 1348 selection_end = 2
… …
908 if (ix) 1369 if (ix)
909 THIS->want_refresh = 1; 1370 THIS->want_refresh = 1;
910 } 1371 }
911} 1372}
912 1373
1374char
1375rxvt_term::cur_charset ()
1376 CODE:
1377 RETVAL = THIS->charsets [THIS->screen.charset];
1378 OUTPUT:
1379 RETVAL
1380
913int 1381int
914rxvt_term::selection_grab (int eventtime = CurrentTime) 1382rxvt_term::selection_grab (U32 eventtime)
915 1383
916void 1384void
917rxvt_term::selection (SV *newtext = 0) 1385rxvt_term::selection (SV *newtext = 0)
918 PPCODE: 1386 PPCODE:
919{ 1387{
920 if (GIMME_V != G_VOID) 1388 if (GIMME_V != G_VOID)
921 { 1389 XPUSHs (THIS->selection.text
922 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1390 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
923 SV *sv = newSVpv (sel, 0); 1391 : &PL_sv_undef);
924 SvUTF8_on (sv);
925 free (sel);
926 XPUSHs (sv_2mortal (sv));
927 }
928 1392
929 if (newtext) 1393 if (newtext)
930 { 1394 {
931 free (THIS->selection.text); 1395 free (THIS->selection.text);
932 1396
933 THIS->selection.text = sv2wcs (newtext); 1397 THIS->selection.text = sv2wcs (newtext);
934 THIS->selection.len = wcslen (THIS->selection.text); 1398 THIS->selection.len = wcslen (THIS->selection.text);
935 } 1399 }
1400}
1401
1402void
1403rxvt_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)
1404
1405void
1406rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1407
1408void
1409rxvt_term::scr_bell ()
1410
1411void
1412rxvt_term::scr_add_lines (SV *string)
1413 CODE:
1414{
1415 wchar_t *wstr = sv2wcs (string);
1416 THIS->scr_add_lines (wstr, wcslen (wstr));
1417 free (wstr);
936} 1418}
937 1419
938void 1420void
939rxvt_term::tt_write (SV *octets) 1421rxvt_term::tt_write (SV *octets)
940 INIT: 1422 INIT:
941 STRLEN len; 1423 STRLEN len;
942 char *str = SvPVbyte (octets, len); 1424 char *str = SvPVbyte (octets, len);
943 C_ARGS: 1425 C_ARGS:
944 str, len 1426 str, len
945 1427
1428void
1429rxvt_term::cmd_parse (SV *octets)
1430 CODE:
1431{
1432 STRLEN len;
1433 char *str = SvPVbyte (octets, len);
1434
1435 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1436 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1437
1438 THIS->cmdbuf_ptr = str;
1439 THIS->cmdbuf_endp = str + len;
1440
1441 rxvt_push_locale (THIS->locale);
1442 THIS->cmd_parse ();
1443 rxvt_pop_locale ();
1444
1445 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1446 THIS->cmdbuf_endp = old_cmdbuf_endp;
1447}
1448
946SV * 1449SV *
947rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1450rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
948 CODE: 1451 CODE:
949{ 1452{
950 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1453 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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