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.62 by root, Fri Jan 13 04:59:04 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);
52 return rxvt_utf8towcs (str, len); 78 return rxvt_utf8towcs (str, len);
53} 79}
54 80
55static SV * 81static SV *
82wcs2sv (wchar_t *wstr, int len = -1)
83{
84 char *str = rxvt_wcstoutf8 (wstr, len);
85
86 SV *sv = newSVpv (str, 0);
87 SvUTF8_on (sv);
88 free (str);
89
90 return sv;
91}
92
93static SV *
56new_ref (HV *hv, const char *klass) 94new_ref (HV *hv, const char *klass)
57{ 95{
58 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 96 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59} 97}
60 98
89 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);
90 128
91 return (long)mg->mg_ptr; 129 return (long)mg->mg_ptr;
92} 130}
93 131
94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 132#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 133#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
96 134
97///////////////////////////////////////////////////////////////////////////// 135/////////////////////////////////////////////////////////////////////////////
98 136
99struct perl_watcher 137struct perl_watcher
278void 316void
279overlay::show () 317overlay::show ()
280{ 318{
281 char key[33]; sprintf (key, "%32lx", (long)this); 319 char key[33]; sprintf (key, "%32lx", (long)this);
282 320
283 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));
284 hv_store (hv, key, 32, newSViv ((long)this), 0); 322 hv_store (hv, key, 32, newSViv ((long)this), 0);
285} 323}
286 324
287void 325void
288overlay::hide () 326overlay::hide ()
289{ 327{
290 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);
291 329
292 if (ovs) 330 if (ovs)
293 { 331 {
294 char key[33]; sprintf (key, "%32lx", (long)this); 332 char key[33]; sprintf (key, "%32lx", (long)this);
295 333
357 395
358struct rxvt_perl_interp rxvt_perl; 396struct rxvt_perl_interp rxvt_perl;
359 397
360static PerlInterpreter *perl; 398static PerlInterpreter *perl;
361 399
362rxvt_perl_interp::rxvt_perl_interp ()
363{
364}
365
366rxvt_perl_interp::~rxvt_perl_interp () 400rxvt_perl_interp::~rxvt_perl_interp ()
367{ 401{
368 if (perl) 402 if (perl)
369 { 403 {
370 perl_destruct (perl); 404 perl_destruct (perl);
375void 409void
376rxvt_perl_interp::init () 410rxvt_perl_interp::init ()
377{ 411{
378 if (!perl) 412 if (!perl)
379 { 413 {
414 perl_environ = rxvt_environ;
415 swap (perl_environ, environ);
416
380 char *argv[] = { 417 char *argv[] = {
381 "", 418 "",
419 "-T",
382 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
383 }; 421 };
384 422
385 perl = perl_alloc (); 423 perl = perl_alloc ();
386 perl_construct (perl); 424 perl_construct (perl);
387 425
388 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 426 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
389 || perl_run (perl)) 427 || perl_run (perl))
390 { 428 {
391 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 429 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
392 430
393 perl_destruct (perl); 431 perl_destruct (perl);
394 perl_free (perl); 432 perl_free (perl);
395 perl = 0; 433 perl = 0;
396 } 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;
397 } 448 }
398} 449}
399 450
400bool 451bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
403 if (!perl) 454 if (!perl)
404 return false; 455 return false;
405 456
406 if (htype == HOOK_INIT) // first hook ever called 457 if (htype == HOOK_INIT) // first hook ever called
407 { 458 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 459 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 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);
410 } 461 }
411 else if (!term->self) 462 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 463 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 464 else if (htype == HOOK_DESTROY)
414 { 465 {
415 // handled later 466 // handled later
416 } 467 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 468 else
418 { 469 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
420
421 if (HvKEYS (hv))
422 { 471 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473
474 if (HvKEYS (hv))
475 {
423 hv_iterinit (hv); 476 hv_iterinit (hv);
424 477
425 while (HE *he = hv_iternext (hv)) 478 while (HE *he = hv_iternext (hv))
426 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
427 } 482 }
483
484 if (!term->perl.should_invoke [htype])
485 return false;
428 } 486 }
429 else if (!should_invoke [htype])
430 return false;
431 487
488 swap (perl_environ, environ);
489
490 try
491 {
432 dSP; 492 dSP;
433 va_list ap; 493 va_list ap;
434 494
435 va_start (ap, htype); 495 va_start (ap, htype);
436 496
437 ENTER; 497 ENTER;
438 SAVETMPS; 498 SAVETMPS;
439 499
440 PUSHMARK (SP); 500 PUSHMARK (SP);
441 501
442 XPUSHs (sv_2mortal (newSVterm (term))); 502 XPUSHs (sv_2mortal (newSVterm (term)));
443 XPUSHs (sv_2mortal (newSViv (htype))); 503 XPUSHs (sv_2mortal (newSViv (htype)));
444 504
445 for (;;) { 505 for (;;) {
446 data_type dt = (data_type)va_arg (ap, int); 506 data_type dt = (data_type)va_arg (ap, int);
447 507
448 switch (dt) 508 switch (dt)
449 { 509 {
450 case DT_INT: 510 case DT_INT:
451 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
452 break; 512 break;
453 513
454 case DT_LONG: 514 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break; 516 break;
457 517
458 case DT_STRING: 518 case DT_STR:
459 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
460 break; 520 break;
461 521
462 case DT_END: 522 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 { 523 {
472 SV *status = POPs; 524 char *str = va_arg (ap, char *);
473 count = SvTRUE (status); 525 int len = va_arg (ap, int);
526
527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
474 } 528 }
529 break;
475 530
476 PUTBACK; 531 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 { 532 {
485 clearSVptr ((SV *)term->self); 533 wchar_t *wstr = va_arg (ap, wchar_t *);
486 SvREFCNT_dec ((SV *)term->self); 534 int wlen = va_arg (ap, int);
535
536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
487 } 537 }
538 break;
488 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);
489 return count; 623 return count;
490 } 624 }
491 625
492 default: 626 default:
493 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 }
494 } 629 }
495 } 630 }
631 catch (...)
632 {
633 swap (perl_environ, environ);
634 throw;
635 }
496} 636}
497 637
498///////////////////////////////////////////////////////////////////////////// 638/////////////////////////////////////////////////////////////////////////////
499 639
500MODULE = urxvt PACKAGE = urxvt 640MODULE = urxvt PACKAGE = urxvt
501 641
502PROTOTYPES: ENABLE 642PROTOTYPES: ENABLE
503 643
504BOOT: 644BOOT:
505{ 645{
506# 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
507 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 651 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 652# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
509# include "hookinc.h" 653# include "hookinc.h"
510# undef def 654# undef def
511 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 struct {
665 const char *name;
666 IV iv;
667 } *civ, const_iv[] = {
668# define const_iv(name) { # name, (IV)name }
512 export_const (DEFAULT_RSTYLE); 669 const_iv (DEFAULT_RSTYLE),
513 export_const (OVERLAY_RSTYLE); 670 const_iv (OVERLAY_RSTYLE),
514 export_const (RS_Bold); 671 const_iv (RS_Bold),
515 export_const (RS_Italic); 672 const_iv (RS_Italic),
516 export_const (RS_Blink); 673 const_iv (RS_Blink),
517 export_const (RS_RVid); 674 const_iv (RS_RVid),
518 export_const (RS_Uline); 675 const_iv (RS_Uline),
519 676
520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 677 const_iv (CurrentTime),
521} 678 const_iv (ShiftMask),
679 const_iv (LockMask),
680 const_iv (ControlMask),
681 const_iv (Mod1Mask),
682 const_iv (Mod2Mask),
683 const_iv (Mod3Mask),
684 const_iv (Mod4Mask),
685 const_iv (Mod5Mask),
686 const_iv (Button1Mask),
687 const_iv (Button2Mask),
688 const_iv (Button3Mask),
689 const_iv (Button4Mask),
690 const_iv (Button5Mask),
691 const_iv (AnyModifier),
522 692
523void 693 const_iv (EVENT_NONE),
524set_should_invoke (int htype, int value) 694 const_iv (EVENT_READ),
525 CODE: 695 const_iv (EVENT_WRITE),
526 rxvt_perl.should_invoke [htype] = value; 696
697 const_iv (NoEventMask),
698 const_iv (KeyPressMask),
699 const_iv (KeyReleaseMask),
700 const_iv (ButtonPressMask),
701 const_iv (ButtonReleaseMask),
702 const_iv (EnterWindowMask),
703 const_iv (LeaveWindowMask),
704 const_iv (PointerMotionMask),
705 const_iv (PointerMotionHintMask),
706 const_iv (Button1MotionMask),
707 const_iv (Button2MotionMask),
708 const_iv (Button3MotionMask),
709 const_iv (Button4MotionMask),
710 const_iv (Button5MotionMask),
711 const_iv (ButtonMotionMask),
712 const_iv (KeymapStateMask),
713 const_iv (ExposureMask),
714 const_iv (VisibilityChangeMask),
715 const_iv (StructureNotifyMask),
716 const_iv (ResizeRedirectMask),
717 const_iv (SubstructureNotifyMask),
718 const_iv (SubstructureRedirectMask),
719 const_iv (FocusChangeMask),
720 const_iv (PropertyChangeMask),
721 const_iv (ColormapChangeMask),
722 const_iv (OwnerGrabButtonMask),
723
724 const_iv (KeyPress),
725 const_iv (KeyRelease),
726 const_iv (ButtonPress),
727 const_iv (ButtonRelease),
728 const_iv (MotionNotify),
729 const_iv (EnterNotify),
730 const_iv (LeaveNotify),
731 const_iv (FocusIn),
732 const_iv (FocusOut),
733 const_iv (KeymapNotify),
734 const_iv (Expose),
735 const_iv (GraphicsExpose),
736 const_iv (NoExpose),
737 const_iv (VisibilityNotify),
738 const_iv (CreateNotify),
739 const_iv (DestroyNotify),
740 const_iv (UnmapNotify),
741 const_iv (MapNotify),
742 const_iv (MapRequest),
743 const_iv (ReparentNotify),
744 const_iv (ConfigureNotify),
745 const_iv (ConfigureRequest),
746 const_iv (GravityNotify),
747 const_iv (ResizeRequest),
748 const_iv (CirculateNotify),
749 const_iv (CirculateRequest),
750 const_iv (PropertyNotify),
751 const_iv (SelectionClear),
752 const_iv (SelectionRequest),
753 const_iv (SelectionNotify),
754 const_iv (ColormapNotify),
755 const_iv (ClientMessage),
756 const_iv (MappingNotify),
757 };
758
759 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
760 civ-- > const_iv; )
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
762}
527 763
528void 764void
529warn (const char *msg) 765warn (const char *msg)
530 CODE: 766 CODE:
531 rxvt_warn ("%s", msg); 767 rxvt_warn ("%s", msg);
532 768
533void 769void
534fatal (const char *msg) 770fatal (const char *msg)
535 CODE: 771 CODE:
536 rxvt_fatal ("%s", msg); 772 rxvt_fatal ("%s", msg);
773
774SV *
775untaint (SV *sv)
776 CODE:
777 RETVAL = newSVsv (sv);
778 SvTAINTED_off (RETVAL);
779 OUTPUT:
780 RETVAL
781
782void
783_exit (int status)
784
785bool
786safe ()
787 CODE:
788 RETVAL = !rxvt_tainted ();
789 OUTPUT:
790 RETVAL
537 791
538NV 792NV
539NOW () 793NOW ()
540 CODE: 794 CODE:
541 RETVAL = NOW; 795 RETVAL = NOW;
589} 843}
590 OUTPUT: 844 OUTPUT:
591 RETVAL 845 RETVAL
592 846
593MODULE = urxvt PACKAGE = urxvt::term 847MODULE = urxvt PACKAGE = urxvt::term
848
849SV *
850_new (...)
851 CODE:
852{
853 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
854 croak ("first argument to urxvt::term->_new must be arrayref");
855
856 rxvt_term *term = new rxvt_term;
857
858 term->argv = new stringvec;
859 term->envv = new stringvec;
860
861 for (int i = 1; i < items; i++)
862 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
863
864 AV *envv = (AV *)SvRV (ST (0));
865 for (int i = av_len (envv) + 1; i--; )
866 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
867
868 term->envv->push_back (0);
869
870 bool success;
871
872 try
873 {
874 success = term->init (term->argv->size (), term->argv->begin ());
875 }
876 catch (const class rxvt_failure_exception &e)
877 {
878 success = false;
879 }
880
881 if (!success)
882 {
883 term->destroy ();
884 croak ("error while initializing new terminal instance");
885 }
886
887 RETVAL = term && term->perl.self
888 ? newSVterm (term) : &PL_sv_undef;
889}
890 OUTPUT:
891 RETVAL
892
893void
894rxvt_term::destroy ()
895
896void
897rxvt_term::set_should_invoke (int htype, int inc)
898 CODE:
899 THIS->perl.should_invoke [htype] += inc;
900
901void
902rxvt_term::grab_button (int button, U32 modifiers)
903 CODE:
904 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
905 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
906 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
907
908bool
909rxvt_term::grab (U32 eventtime, int sync = 0)
910 CODE:
911{
912 int mode = sync ? GrabModeSync : GrabModeAsync;
913
914 THIS->perl.grabtime = 0;
915
916 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
917 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
918 mode, mode, None, GRAB_CURSOR, eventtime))
919 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
920 THIS->perl.grabtime = eventtime;
921 else
922 XUngrabPointer (THIS->display->display, eventtime);
923
924 RETVAL = !!THIS->perl.grabtime;
925}
926 OUTPUT:
927 RETVAL
928
929void
930rxvt_term::allow_events_async ()
931 CODE:
932 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
933
934void
935rxvt_term::allow_events_sync ()
936 CODE:
937 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
938
939void
940rxvt_term::allow_events_replay ()
941 CODE:
942 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
943 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
944
945void
946rxvt_term::ungrab ()
947 CODE:
948 ungrab (THIS);
594 949
595int 950int
596rxvt_term::strwidth (SV *str) 951rxvt_term::strwidth (SV *str)
597 CODE: 952 CODE:
598{ 953{
617 char *mbstr = rxvt_wcstombs (wstr); 972 char *mbstr = rxvt_wcstombs (wstr);
618 rxvt_pop_locale (); 973 rxvt_pop_locale ();
619 974
620 free (wstr); 975 free (wstr);
621 976
622 RETVAL = newSVpv (mbstr, 0); 977 RETVAL = taint_if (newSVpv (mbstr, 0), str);
623 free (mbstr); 978 free (mbstr);
624} 979}
625 OUTPUT: 980 OUTPUT:
626 RETVAL 981 RETVAL
627 982
634 989
635 rxvt_push_locale (THIS->locale); 990 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 991 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 992 rxvt_pop_locale ();
638 993
639 char *str = rxvt_wcstoutf8 (wstr); 994 RETVAL = taint_if (wcs2sv (wstr), octets);
640 free (wstr); 995 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 996}
646 OUTPUT: 997 OUTPUT:
647 RETVAL 998 RETVAL
648 999
649# very portable, especially on objects as opposed to pods 1000#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
650#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
651 1001
652#define TERM_OFFSET_width TERM_OFFSET(width) 1002#define TERM_OFFSET_width TERM_OFFSET(width)
653#define TERM_OFFSET_height TERM_OFFSET(height) 1003#define TERM_OFFSET_height TERM_OFFSET(height)
654#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1004#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
655#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1005#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
680 CODE: 1030 CODE:
681 RETVAL = *(int *)((char *)THIS + ix); 1031 RETVAL = *(int *)((char *)THIS + ix);
682 OUTPUT: 1032 OUTPUT:
683 RETVAL 1033 RETVAL
684 1034
1035unsigned int
1036rxvt_term::ModLevel3Mask ()
1037 ALIAS:
1038 ModLevel3Mask = 0
1039 ModMetaMask = 1
1040 ModNumLockMask = 2
1041 CODE:
1042 switch (ix)
1043 {
1044 case 0: RETVAL = THIS->ModLevel3Mask; break;
1045 case 1: RETVAL = THIS->ModMetaMask; break;
1046 case 2: RETVAL = THIS->ModNumLockMask; break;
1047 }
1048 OUTPUT:
1049 RETVAL
1050
1051char *
1052rxvt_term::display_id ()
1053 ALIAS:
1054 display_id = 0
1055 locale = 1
1056 CODE:
1057 switch (ix)
1058 {
1059 case 0: RETVAL = THIS->display->id; break;
1060 case 1: RETVAL = THIS->locale; break;
1061 }
1062 OUTPUT:
1063 RETVAL
1064
1065SV *
1066rxvt_term::_env ()
1067 CODE:
1068{
1069 if (THIS->envv)
1070 {
1071 AV *av = newAV ();
1072
1073 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1074 if (*i)
1075 av_push (av, newSVpv (*i, 0));
1076
1077 RETVAL = newRV_noinc ((SV *)av);
1078 }
1079 else
1080 RETVAL = &PL_sv_undef;
1081}
1082 OUTPUT:
1083 RETVAL
1084
1085int
1086rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1087 CODE:
1088 RETVAL = THIS->pty_ev.events;
1089 if (events != EVENT_UNDEF)
1090 THIS->pty_ev.set (events);
1091 OUTPUT:
1092 RETVAL
1093
685U32 1094U32
1095rxvt_term::parent ()
1096 CODE:
1097 RETVAL = (U32)THIS->parent [0];
1098 OUTPUT:
1099 RETVAL
1100
1101U32
1102rxvt_term::vt ()
1103 CODE:
1104 RETVAL = (U32)THIS->vt;
1105 OUTPUT:
1106 RETVAL
1107
1108void
1109rxvt_term::vt_emask_add (U32 emask)
1110 CODE:
1111 THIS->vt_emask_perl |= emask;
1112 THIS->vt_select_input ();
1113
1114U32
686rxvt_term::screen_rstyle (U32 new_rstyle = THIS->screen.s_rstyle) 1115rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
687 CODE: 1116 CODE:
688{ 1117{
689 RETVAL = THIS->screen.s_rstyle; 1118 RETVAL = THIS->rstyle;
690 THIS->screen.s_rstyle = new_rstyle; 1119 THIS->rstyle = new_rstyle;
691} 1120}
692 OUTPUT: 1121 OUTPUT:
693 RETVAL 1122 RETVAL
694 1123
695int 1124int
696rxvt_term::view_start (int newval = -1) 1125rxvt_term::view_start (int newval = -1)
1126 PROTOTYPE: $;$
697 CODE: 1127 CODE:
698{ 1128{
699 RETVAL = THIS->view_start; 1129 RETVAL = THIS->view_start;
700 1130
701 if (newval >= 0) 1131 if (newval >= 0)
711rxvt_term::want_refresh () 1141rxvt_term::want_refresh ()
712 CODE: 1142 CODE:
713 THIS->want_refresh = 1; 1143 THIS->want_refresh = 1;
714 1144
715void 1145void
716rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1146rxvt_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: 1147 PPCODE:
718{ 1148{
719 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1149 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
720 XSRETURN_EMPTY; 1150 XSRETURN_EMPTY;
721 1151
723 1153
724 if (GIMME_V != G_VOID) 1154 if (GIMME_V != G_VOID)
725 { 1155 {
726 wchar_t *wstr = new wchar_t [THIS->ncol]; 1156 wchar_t *wstr = new wchar_t [THIS->ncol];
727 1157
728 for (int col = 0; col <THIS->ncol; col++) 1158 for (int col = 0; col < THIS->ncol; col++)
729 wstr [col] = l.t [col]; 1159 wstr [col] = l.t [col];
730 1160
731 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1161 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
732 free (wstr);
733 1162
734 SV *sv = newSVpv (str, 0); 1163 delete [] wstr;
735 SvUTF8_on (sv);
736 XPUSHs (sv_2mortal (sv));
737 free (str);
738 } 1164 }
739 1165
740 if (new_text) 1166 if (new_text)
741 { 1167 {
742 wchar_t *wstr = sv2wcs (new_text); 1168 wchar_t *wstr = sv2wcs (new_text);
743 1169
744 int len = wcslen (wstr); 1170 int len = min (wcslen (wstr) - start_ofs, max_len);
745 1171
746 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1172 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
747 { 1173 {
748 free (wstr); 1174 free (wstr);
749 croak ("new_text extends beyond horizontal margins"); 1175 croak ("new_text extends beyond horizontal margins");
750 } 1176 }
751 1177
752 for (int col = start_col; col < start_col + len; col++) 1178 for (int col = start_col; col < start_col + len; col++)
753 { 1179 {
754 l.t [col] = wstr [col - start_col]; 1180 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])); 1181 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
756 } 1182 }
757 1183
758 free (wstr); 1184 free (wstr);
759 } 1185 }
760} 1186}
761 1187
762void 1188void
763rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1189rxvt_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: 1190 PPCODE:
765{ 1191{
766 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1192 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
767 XSRETURN_EMPTY; 1193 XSRETURN_EMPTY;
768 1194
783 { 1209 {
784 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1210 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
785 croak ("new_rend must be arrayref"); 1211 croak ("new_rend must be arrayref");
786 1212
787 AV *av = (AV *)SvRV (new_rend); 1213 AV *av = (AV *)SvRV (new_rend);
788 int len = av_len (av) + 1; 1214 int len = min (av_len (av) + 1 - start_ofs, max_len);
789 1215
790 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1216 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
791 croak ("new_rend array extends beyond horizontal margins"); 1217 croak ("new_rend array extends beyond horizontal margins");
792 1218
793 for (int col = start_col; col < start_col + len; col++) 1219 for (int col = start_col; col < start_col + len; col++)
794 { 1220 {
795 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1221 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
796 1222
797 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1223 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
798 } 1224 }
799 } 1225 }
800} 1226}
801 1227
802int 1228int
803rxvt_term::ROW_l (int row_number, int new_length = -2) 1229rxvt_term::ROW_l (int row_number, int new_length = -1)
804 CODE: 1230 CODE:
805{ 1231{
806 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1232 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
807 XSRETURN_EMPTY; 1233 XSRETURN_EMPTY;
808 1234
809 line_t &l = ROW(row_number); 1235 line_t &l = ROW(row_number);
810 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1236 RETVAL = l.l;
811 1237
812 if (new_length >= -1) 1238 if (new_length >= 0)
813 l.l = new_length; 1239 l.l = new_length;
814} 1240}
815 OUTPUT: 1241 OUTPUT:
816 RETVAL 1242 RETVAL
817 1243
818bool 1244bool
819rxvt_term::ROW_is_longer (int row_number) 1245rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
820 CODE: 1246 CODE:
821{ 1247{
822 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1248 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
823 XSRETURN_EMPTY; 1249 XSRETURN_EMPTY;
824 1250
825 line_t &l = ROW(row_number); 1251 line_t &l = ROW(row_number);
826 RETVAL = l.l < 0; 1252 RETVAL = l.is_longer ();
1253
1254 if (new_is_longer >= 0)
1255 l.is_longer (new_is_longer);
827} 1256}
828 OUTPUT: 1257 OUTPUT:
829 RETVAL 1258 RETVAL
830 1259
831SV * 1260SV *
832rxvt_term::special_encode (SV *str) 1261rxvt_term::special_encode (SV *string)
833 CODE: 1262 CODE:
834 abort ();//TODO 1263{
1264 wchar_t *wstr = sv2wcs (string);
1265 int wlen = wcslen (wstr);
1266 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1267
1268 rxvt_push_locale (THIS->locale);
1269
1270 wchar_t *r = rstr;
1271 for (wchar_t *s = wstr; *s; s++)
1272 if (wcwidth (*s) == 0)
1273 {
1274 if (r == rstr)
1275 croak ("leading combining character unencodable");
1276
1277 unicode_t n = rxvt_compose (r[-1], *s);
1278 if (n == NOCHAR)
1279 n = rxvt_composite.compose (r[-1], *s);
1280
1281 r[-1] = n;
1282 }
1283#if !UNICODE_3
1284 else if (*s >= 0x10000)
1285 *r++ = rxvt_composite.compose (*s);
1286#endif
1287 else
1288 *r++ = *s;
1289
1290 rxvt_pop_locale ();
1291
1292 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1293
1294 delete [] rstr;
1295}
1296 OUTPUT:
1297 RETVAL
835 1298
836SV * 1299SV *
837rxvt_term::special_decode (SV *str) 1300rxvt_term::special_decode (SV *text)
838 CODE: 1301 CODE:
839 abort ();//TODO 1302{
1303 wchar_t *wstr = sv2wcs (text);
1304 int wlen = wcslen (wstr);
1305 int dlen = 0;
1306
1307 // find length
1308 for (wchar_t *s = wstr; *s; s++)
1309 if (*s == NOCHAR)
1310 ;
1311 else if (IS_COMPOSE (*s))
1312 dlen += rxvt_composite.expand (*s, 0);
1313 else
1314 dlen++;
1315
1316 wchar_t *rstr = new wchar_t [dlen];
1317
1318 // decode
1319 wchar_t *r = rstr;
1320 for (wchar_t *s = wstr; *s; s++)
1321 if (*s == NOCHAR)
1322 ;
1323 else if (IS_COMPOSE (*s))
1324 r += rxvt_composite.expand (*s, r);
1325 else
1326 *r++ = *s;
1327
1328 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1329
1330 delete [] rstr;
1331}
1332 OUTPUT:
1333 RETVAL
840 1334
841void 1335void
842rxvt_term::_resource (char *name, int index, SV *newval = 0) 1336rxvt_term::_resource (char *name, int index, SV *newval = 0)
843 PPCODE: 1337 PPCODE:
844{ 1338{
861 1355
862 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1356 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
863 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1357 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
864 1358
865 if (GIMME_V != G_VOID) 1359 if (GIMME_V != G_VOID)
866 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1360 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
867 1361
868 if (newval) 1362 if (newval)
869 { 1363 {
870 if (SvOK (newval)) 1364 if (SvOK (newval))
871 { 1365 {
876 else 1370 else
877 THIS->rs [index] = 0; 1371 THIS->rs [index] = 0;
878 } 1372 }
879} 1373}
880 1374
1375const char *
1376rxvt_term::x_resource (const char *name)
1377 CLEANUP:
1378 SvTAINTED_on (ST (0));
1379
1380bool
1381rxvt_term::option (U32 optval, int set = -1)
1382 CODE:
1383{
1384 RETVAL = THIS->options & optval;
1385
1386 if (set >= 0)
1387 {
1388 if (set)
1389 THIS->options |= optval;
1390 else
1391 THIS->options &= ~optval;
1392
1393 switch (optval)
1394 {
1395 case Opt_skipBuiltinGlyphs:
1396 THIS->set_fonts ();
1397 THIS->scr_remap_chars ();
1398 THIS->scr_touch (true);
1399 THIS->want_refresh = 1;
1400 break;
1401
1402 case Opt_cursorUnderline:
1403 THIS->want_refresh = 1;
1404 break;
1405
1406# case Opt_scrollBar_floating:
1407# case Opt_scrollBar_right:
1408# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1409# break;
1410 }
1411 }
1412}
1413 OUTPUT:
1414 RETVAL
1415
1416bool
1417rxvt_term::parse_keysym (char *keysym, char *str)
1418 CODE:
1419 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1420 THIS->keyboard->register_done ();
1421 OUTPUT:
1422 RETVAL
1423
881void 1424void
882rxvt_term::cur (...) 1425rxvt_term::screen_cur (...)
883 PROTOTYPE: $;$$ 1426 PROTOTYPE: $;$$
884 ALIAS: 1427 ALIAS:
885 screen_cur = 0 1428 screen_cur = 0
886 selection_beg = 1 1429 selection_beg = 1
887 selection_end = 2 1430 selection_end = 2
908 if (ix) 1451 if (ix)
909 THIS->want_refresh = 1; 1452 THIS->want_refresh = 1;
910 } 1453 }
911} 1454}
912 1455
1456char
1457rxvt_term::cur_charset ()
1458 CODE:
1459 RETVAL = THIS->charsets [THIS->screen.charset];
1460 OUTPUT:
1461 RETVAL
1462
1463#void
1464#rxvt_term::selection_clear ()
1465
1466void
1467rxvt_term::selection_make (U32 eventtime, bool rect = false)
1468 CODE:
1469 THIS->selection.op = SELECTION_CONT;
1470 THIS->selection.rect = rect;
1471 THIS->selection_make (eventtime);
1472
913int 1473int
914rxvt_term::selection_grab (int eventtime = CurrentTime) 1474rxvt_term::selection_grab (U32 eventtime)
915 1475
916void 1476void
917rxvt_term::selection (SV *newtext = 0) 1477rxvt_term::selection (SV *newtext = 0)
918 PPCODE: 1478 PPCODE:
919{ 1479{
920 if (GIMME_V != G_VOID) 1480 if (GIMME_V != G_VOID)
921 { 1481 XPUSHs (THIS->selection.text
922 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1482 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
923 SV *sv = newSVpv (sel, 0); 1483 : &PL_sv_undef);
924 SvUTF8_on (sv);
925 free (sel);
926 XPUSHs (sv_2mortal (sv));
927 }
928 1484
929 if (newtext) 1485 if (newtext)
930 { 1486 {
931 free (THIS->selection.text); 1487 free (THIS->selection.text);
932 1488
933 THIS->selection.text = sv2wcs (newtext); 1489 THIS->selection.text = sv2wcs (newtext);
934 THIS->selection.len = wcslen (THIS->selection.text); 1490 THIS->selection.len = wcslen (THIS->selection.text);
935 } 1491 }
1492}
1493
1494void
1495rxvt_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)
1496
1497void
1498rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1499
1500void
1501rxvt_term::scr_bell ()
1502
1503void
1504rxvt_term::scr_add_lines (SV *string)
1505 CODE:
1506{
1507 wchar_t *wstr = sv2wcs (string);
1508 THIS->scr_add_lines (wstr, wcslen (wstr));
1509 free (wstr);
936} 1510}
937 1511
938void 1512void
939rxvt_term::tt_write (SV *octets) 1513rxvt_term::tt_write (SV *octets)
940 INIT: 1514 INIT:
941 STRLEN len; 1515 STRLEN len;
942 char *str = SvPVbyte (octets, len); 1516 char *str = SvPVbyte (octets, len);
943 C_ARGS: 1517 C_ARGS:
944 str, len 1518 str, len
945 1519
1520void
1521rxvt_term::cmd_parse (SV *octets)
1522 CODE:
1523{
1524 STRLEN len;
1525 char *str = SvPVbyte (octets, len);
1526
1527 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1528 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1529
1530 THIS->cmdbuf_ptr = str;
1531 THIS->cmdbuf_endp = str + len;
1532
1533 rxvt_push_locale (THIS->locale);
1534 THIS->cmd_parse ();
1535 rxvt_pop_locale ();
1536
1537 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1538 THIS->cmdbuf_endp = old_cmdbuf_endp;
1539}
1540
946SV * 1541SV *
947rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1542rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
948 CODE: 1543 CODE:
949{ 1544{
950 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1545 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines