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.23 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.55 by root, Wed Jan 11 02:13: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 "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
… …
215 h += 2; 251 h += 2;
216 } 252 }
217 253
218 text = new text_t *[h]; 254 text = new text_t *[h];
219 rend = new rend_t *[h]; 255 rend = new rend_t *[h];
220 256
221 for (int y = 0; y < h; y++) 257 for (int y = 0; y < h; y++)
222 { 258 {
223 text_t *tp = text[y] = new text_t[w]; 259 text_t *tp = text[y] = new text_t[w];
224 rend_t *rp = rend[y] = new rend_t[w]; 260 rend_t *rp = rend[y] = new rend_t[w];
225 261
226 text_t t0, t1, t2; 262 text_t t0, t1, t2;
227 rend_t r = rstyle; 263 rend_t r = rstyle;
228 264
229 if (border == 2) 265 if (border == 2)
230 { 266 {
231 if (y == 0) 267 if (y == 0)
232 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 268 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
233 else if (y < h - 1) 269 else if (y < h - 1)
234 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 270 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
235 else 271 else
236 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; 272 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
237 273
238 *tp++ = t0; 274 *tp++ = t0;
239 *rp++ = r; 275 *rp++ = r;
240 276
241 for (int x = w - 2; x-- > 0; ) 277 for (int x = w - 2; x-- > 0; )
242 { 278 {
243 *tp++ = t1; 279 *tp++ = t1;
244 *rp++ = r; 280 *rp++ = r;
245 } 281 }
246 282
247 *tp = t2; 283 *tp = t2;
248 *rp = r; 284 *rp = r;
249 } 285 }
250 else 286 else
251 for (int x = w; x-- > 0; ) 287 for (int x = w; x-- > 0; )
252 { 288 {
253 *tp++ = 0x0020; 289 *tp++ = 0x0020;
254 *rp++ = r; 290 *rp++ = r;
255 } 291 }
256 } 292 }
257 293
258 show (); 294 show ();
259 THIS->want_refresh = 1; 295 THIS->want_refresh = 1;
260} 296}
261 297
… …
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
… …
308 344
309 for (int y = ov_h; y--; ) 345 for (int y = ov_h; y--; )
310 { 346 {
311 text_t *t1 = text [y]; 347 text_t *t1 = text [y];
312 rend_t *r1 = rend [y]; 348 rend_t *r1 = rend [y];
313 349
314 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 350 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;
315 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 351 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
316 352
317 for (int x = ov_w; x--; ) 353 for (int x = ov_w; x--; )
318 { 354 {
319 text_t t = *t1; *t1++ = *t2; *t2++ = t; 355 text_t t = *t1; *t1++ = *t2; *t2++ = t;
320 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 356 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
321 } 357 }
322 } 358 }
323 359
… …
333 369
334 wchar_t *wtext = sv2wcs (text); 370 wchar_t *wtext = sv2wcs (text);
335 371
336 for (int col = min (wcslen (wtext), w - x - border); col--; ) 372 for (int col = min (wcslen (wtext), w - x - border); col--; )
337 this->text [y][x + col] = wtext [col]; 373 this->text [y][x + col] = wtext [col];
338 374
339 free (wtext); 375 free (wtext);
340 376
341 if (rend) 377 if (rend)
342 { 378 {
343 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 379 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
… …
377{ 413{
378 if (!perl) 414 if (!perl)
379 { 415 {
380 char *argv[] = { 416 char *argv[] = {
381 "", 417 "",
418 "-T",
382 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 419 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
383 }; 420 };
384 421
385 perl = perl_alloc (); 422 perl = perl_alloc ();
386 perl_construct (perl); 423 perl_construct (perl);
387 424
388 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 425 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
389 || perl_run (perl)) 426 || perl_run (perl))
390 { 427 {
391 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 428 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
392 429
393 perl_destruct (perl); 430 perl_destruct (perl);
… …
395 perl = 0; 432 perl = 0;
396 } 433 }
397 } 434 }
398} 435}
399 436
437static void
438ungrab (rxvt_term *THIS)
439{
440 if (THIS->perl.grabtime)
441 {
442 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
443 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
444 THIS->perl.grabtime = 0;
445 }
446}
447
400bool 448bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 449rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
402{ 450{
403 if (!perl) 451 if (!perl)
404 return false; 452 return false;
405 453
406 if (htype == HOOK_INIT) // first hook ever called 454 if (htype == HOOK_INIT) // first hook ever called
407 { 455 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 456 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 457 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410 } 458 }
411 else if (!term->self) 459 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 460 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 461 else if (htype == HOOK_DESTROY)
414 { 462 {
415 // handled later 463 // handled later
416 } 464 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 465 else
418 { 466 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 467 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
420
421 if (HvKEYS (hv))
422 { 468 {
469 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
470
471 if (HvKEYS (hv))
472 {
423 hv_iterinit (hv); 473 hv_iterinit (hv);
424 474
425 while (HE *he = hv_iternext (hv)) 475 while (HE *he = hv_iternext (hv))
426 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 476 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
477 }
478
427 } 479 }
480
481 if (!should_invoke [htype])
482 return false;
428 } 483 }
429 else if (!should_invoke [htype])
430 return false;
431 484
432 dSP; 485 dSP;
433 va_list ap; 486 va_list ap;
434 487
435 va_start (ap, htype); 488 va_start (ap, htype);
… …
453 506
454 case DT_LONG: 507 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break; 509 break;
457 510
458 case DT_STRING: 511 case DT_STR:
459 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 512 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
513 break;
514
515 case DT_STR_LEN:
516 {
517 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int);
519
520 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
521 }
522 break;
523
524 case DT_WCS_LEN:
525 {
526 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int);
528
529 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
530 }
531 break;
532
533 case DT_XEVENT:
534 {
535 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV ();
537
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# undef set
541
542 setiv (type, xe->type);
543 setiv (send_event, xe->xany.send_event);
544 setiv (serial, xe->xany.serial);
545
546 switch (xe->type)
547 {
548 case KeyPress:
549 case KeyRelease:
550 case ButtonPress:
551 case ButtonRelease:
552 case MotionNotify:
553 setiv (time, xe->xmotion.time);
554 setiv (x, xe->xmotion.x);
555 setiv (y, xe->xmotion.y);
556 setiv (row, xe->xmotion.y / term->fheight);
557 setiv (col, xe->xmotion.x / term->fwidth);
558 setiv (x_root, xe->xmotion.x_root);
559 setiv (y_root, xe->xmotion.y_root);
560 setiv (state, xe->xmotion.state);
561 break;
562 }
563
564 switch (xe->type)
565 {
566 case KeyPress:
567 case KeyRelease:
568 setiv (keycode, xe->xkey.keycode);
569 break;
570
571 case ButtonPress:
572 case ButtonRelease:
573 setiv (button, xe->xbutton.button);
574 break;
575
576 case MotionNotify:
577 setiv (is_hint, xe->xmotion.is_hint);
578 break;
579 }
580
581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
582 }
460 break; 583 break;
461 584
462 case DT_END: 585 case DT_END:
463 { 586 {
464 va_end (ap); 587 va_end (ap);
… …
476 PUTBACK; 599 PUTBACK;
477 FREETMPS; 600 FREETMPS;
478 LEAVE; 601 LEAVE;
479 602
480 if (SvTRUE (ERRSV)) 603 if (SvTRUE (ERRSV))
604 {
481 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 605 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
606 ungrab (term); // better lose the grab than the session
607 }
482 608
483 if (htype == HOOK_DESTROY) 609 if (htype == HOOK_DESTROY)
484 { 610 {
485 clearSVptr ((SV *)term->self); 611 clearSVptr ((SV *)term->perl.self);
486 SvREFCNT_dec ((SV *)term->self); 612 SvREFCNT_dec ((SV *)term->perl.self);
487 } 613 }
488 614
489 return count; 615 return count;
490 } 616 }
491 617
… …
501 627
502PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
503 629
504BOOT: 630BOOT:
505{ 631{
506# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 632 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
633 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
634 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
635 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
636
507 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 637 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 638# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
509# include "hookinc.h" 639# include "hookinc.h"
510# undef def 640# undef def
511 641
642 HV *option = get_hv ("urxvt::OPTION", 1);
643# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
644# define nodef(name)
645# include "optinc.h"
646# undef nodef
647# undef def
648
649 HV *stash = gv_stashpv ("urxvt", 1);
650# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
512 export_const (DEFAULT_RSTYLE); 651 export_const_iv (DEFAULT_RSTYLE);
513 export_const (OVERLAY_RSTYLE); 652 export_const_iv (OVERLAY_RSTYLE);
514 export_const (RS_Bold); 653 export_const_iv (RS_Bold);
515 export_const (RS_Italic); 654 export_const_iv (RS_Italic);
516 export_const (RS_Blink); 655 export_const_iv (RS_Blink);
517 export_const (RS_RVid); 656 export_const_iv (RS_RVid);
518 export_const (RS_Uline); 657 export_const_iv (RS_Uline);
519 658
520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 659 export_const_iv (CurrentTime);
660 export_const_iv (ShiftMask);
661 export_const_iv (LockMask);
662 export_const_iv (ControlMask);
663 export_const_iv (Mod1Mask);
664 export_const_iv (Mod2Mask);
665 export_const_iv (Mod3Mask);
666 export_const_iv (Mod4Mask);
667 export_const_iv (Mod5Mask);
668 export_const_iv (Button1Mask);
669 export_const_iv (Button2Mask);
670 export_const_iv (Button3Mask);
671 export_const_iv (Button4Mask);
672 export_const_iv (Button5Mask);
673 export_const_iv (AnyModifier);
674
675 export_const_iv (EVENT_NONE);
676 export_const_iv (EVENT_READ);
677 export_const_iv (EVENT_WRITE);
521} 678}
522 679
523void 680void
524set_should_invoke (int htype, int value) 681set_should_invoke (int htype, int value)
525 CODE: 682 CODE:
… …
532 689
533void 690void
534fatal (const char *msg) 691fatal (const char *msg)
535 CODE: 692 CODE:
536 rxvt_fatal ("%s", msg); 693 rxvt_fatal ("%s", msg);
694
695SV *
696untaint (SV *sv)
697 CODE:
698 RETVAL = newSVsv (sv);
699 SvTAINTED_off (RETVAL);
700 OUTPUT:
701 RETVAL
702
703bool
704safe ()
705 CODE:
706 RETVAL = !rxvt_tainted ();
707 OUTPUT:
708 RETVAL
537 709
538NV 710NV
539NOW () 711NOW ()
540 CODE: 712 CODE:
541 RETVAL = NOW; 713 RETVAL = NOW;
… …
589} 761}
590 OUTPUT: 762 OUTPUT:
591 RETVAL 763 RETVAL
592 764
593MODULE = urxvt PACKAGE = urxvt::term 765MODULE = urxvt PACKAGE = urxvt::term
766
767SV *
768_new (...)
769 CODE:
770{
771 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
772 croak ("first argument to urxvt::term->_new must be arrayref");
773
774 rxvt_term *term = new rxvt_term;
775
776 term->argv = new stringvec;
777 term->envv = new stringvec;
778
779 for (int i = 1; i < items; i++)
780 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
781
782 AV *envv = (AV *)SvRV (ST (0));
783 for (int i = av_len (envv) + 1; i--; )
784 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
785
786 term->envv->push_back (0);
787
788 bool success;
789
790 try
791 {
792 success = term->init (term->argv->size (), term->argv->begin ());
793 }
794 catch (const class rxvt_failure_exception &e)
795 {
796 success = false;
797 }
798
799 if (!success)
800 {
801 term->destroy ();
802 croak ("error while initializing new terminal instance");
803 }
804
805 RETVAL = term && term->perl.self
806 ? newSVterm (term) : &PL_sv_undef;
807}
808 OUTPUT:
809 RETVAL
810
811void
812rxvt_term::destroy ()
813
814void
815rxvt_term::grab_button (int button, U32 modifiers)
816 CODE:
817 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
818 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
819 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
820
821bool
822rxvt_term::grab (U32 eventtime, int sync = 0)
823 CODE:
824{
825 int mode = sync ? GrabModeSync : GrabModeAsync;
826
827 THIS->perl.grabtime = 0;
828
829 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
830 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
831 mode, mode, None, GRAB_CURSOR, eventtime))
832 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
833 THIS->perl.grabtime = eventtime;
834 else
835 XUngrabPointer (THIS->display->display, eventtime);
836
837 RETVAL = !!THIS->perl.grabtime;
838}
839 OUTPUT:
840 RETVAL
841
842void
843rxvt_term::allow_events_async ()
844 CODE:
845 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
846
847void
848rxvt_term::allow_events_sync ()
849 CODE:
850 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
851
852void
853rxvt_term::allow_events_replay ()
854 CODE:
855 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
856 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
857
858void
859rxvt_term::ungrab ()
860 CODE:
861 ungrab (THIS);
594 862
595int 863int
596rxvt_term::strwidth (SV *str) 864rxvt_term::strwidth (SV *str)
597 CODE: 865 CODE:
598{ 866{
… …
617 char *mbstr = rxvt_wcstombs (wstr); 885 char *mbstr = rxvt_wcstombs (wstr);
618 rxvt_pop_locale (); 886 rxvt_pop_locale ();
619 887
620 free (wstr); 888 free (wstr);
621 889
622 RETVAL = newSVpv (mbstr, 0); 890 RETVAL = taint_if (newSVpv (mbstr, 0), str);
623 free (mbstr); 891 free (mbstr);
624} 892}
625 OUTPUT: 893 OUTPUT:
626 RETVAL 894 RETVAL
627 895
… …
634 902
635 rxvt_push_locale (THIS->locale); 903 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 904 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 905 rxvt_pop_locale ();
638 906
639 char *str = rxvt_wcstoutf8 (wstr); 907 RETVAL = taint_if (wcs2sv (wstr), octets);
640 free (wstr); 908 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 909}
646 OUTPUT: 910 OUTPUT:
647 RETVAL 911 RETVAL
912
913#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
914
915#define TERM_OFFSET_width TERM_OFFSET(width)
916#define TERM_OFFSET_height TERM_OFFSET(height)
917#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
918#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
919#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
920#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
921#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
922#define TERM_OFFSET_focus TERM_OFFSET(focus)
923#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
924#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
925#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
926#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
648 927
649int 928int
929rxvt_term::width ()
930 ALIAS:
931 width = TERM_OFFSET_width
932 height = TERM_OFFSET_height
933 fwidth = TERM_OFFSET_fwidth
934 fheight = TERM_OFFSET_fheight
935 fbase = TERM_OFFSET_fbase
936 nrow = TERM_OFFSET_nrow
937 ncol = TERM_OFFSET_ncol
938 focus = TERM_OFFSET_focus
939 mapped = TERM_OFFSET_mapped
940 saveLines = TERM_OFFSET_saveLines
941 total_rows = TERM_OFFSET_total_rows
942 nsaved = TERM_OFFSET_nsaved
943 CODE:
944 RETVAL = *(int *)((char *)THIS + ix);
945 OUTPUT:
946 RETVAL
947
948unsigned int
949rxvt_term::ModLevel3Mask ()
950 ALIAS:
951 ModLevel3Mask = 0
952 ModMetaMask = 1
953 ModNumLockMask = 2
954 CODE:
955 switch (ix)
956 {
957 case 0: RETVAL = THIS->ModLevel3Mask; break;
958 case 1: RETVAL = THIS->ModMetaMask; break;
959 case 2: RETVAL = THIS->ModNumLockMask; break;
960 }
961 OUTPUT:
962 RETVAL
963
964char *
965rxvt_term::display_id ()
966 ALIAS:
967 display_id = 0
968 locale = 1
969 CODE:
970 switch (ix)
971 {
972 case 0: RETVAL = THIS->display->id; break;
973 case 1: RETVAL = THIS->locale; break;
974 }
975 OUTPUT:
976 RETVAL
977
978SV *
650rxvt_term::nsaved () 979rxvt_term::_env ()
651 CODE: 980 CODE:
981{
982 if (THIS->envv)
983 {
984 AV *av = newAV ();
985
986 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
987 if (*i)
988 av_push (av, newSVpv (*i, 0));
989
990 RETVAL = newRV_noinc ((SV *)av);
991 }
992 else
993 RETVAL = &PL_sv_undef;
994}
995 OUTPUT:
996 RETVAL
997
998int
999rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1000 CODE:
1001 RETVAL = THIS->pty_ev.events;
1002 if (events != EVENT_UNDEF)
1003 THIS->pty_ev.set (events);
1004 OUTPUT:
1005 RETVAL
1006
1007U32
1008rxvt_term::parent ()
1009 CODE:
1010 RETVAL = (U32)THIS->parent [0];
1011 OUTPUT:
1012 RETVAL
1013
1014U32
1015rxvt_term::vt ()
1016 CODE:
1017 RETVAL = (U32)THIS->vt;
1018 OUTPUT:
1019 RETVAL
1020
1021U32
1022rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1023 CODE:
1024{
652 RETVAL = THIS->nsaved; 1025 RETVAL = THIS->rstyle;
1026 THIS->rstyle = new_rstyle;
1027}
653 OUTPUT: 1028 OUTPUT:
654 RETVAL 1029 RETVAL
655 1030
656int 1031int
657rxvt_term::view_start (int newval = -1) 1032rxvt_term::view_start (int newval = -1)
658 CODE: 1033 CODE:
659{ 1034{
… …
666 } 1041 }
667} 1042}
668 OUTPUT: 1043 OUTPUT:
669 RETVAL 1044 RETVAL
670 1045
671int
672rxvt_term::nrow ()
673 CODE:
674 RETVAL = THIS->nrow;
675 OUTPUT:
676 RETVAL
677
678int
679rxvt_term::ncol ()
680 CODE:
681 RETVAL = THIS->ncol;
682 OUTPUT:
683 RETVAL
684
685void 1046void
686rxvt_term::want_refresh () 1047rxvt_term::want_refresh ()
687 CODE: 1048 CODE:
688 THIS->want_refresh = 1; 1049 THIS->want_refresh = 1;
689 1050
690void 1051void
691rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1052rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
692 PPCODE: 1053 PPCODE:
693{ 1054{
694 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1055 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
695 XSRETURN_EMPTY; 1056 XSRETURN_EMPTY;
696 1057
… …
698 1059
699 if (GIMME_V != G_VOID) 1060 if (GIMME_V != G_VOID)
700 { 1061 {
701 wchar_t *wstr = new wchar_t [THIS->ncol]; 1062 wchar_t *wstr = new wchar_t [THIS->ncol];
702 1063
703 for (int col = 0; col <THIS->ncol; col++) 1064 for (int col = 0; col < THIS->ncol; col++)
704 wstr [col] = l.t [col]; 1065 wstr [col] = l.t [col];
705 1066
706 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1067 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
707 free (wstr);
708 1068
709 SV *sv = newSVpv (str, 0); 1069 delete [] wstr;
710 SvUTF8_on (sv);
711 XPUSHs (sv_2mortal (sv));
712 free (str);
713 } 1070 }
714 1071
715 if (new_text) 1072 if (new_text)
716 { 1073 {
717 wchar_t *wstr = sv2wcs (new_text); 1074 wchar_t *wstr = sv2wcs (new_text);
718 1075
719 int len = wcslen (wstr); 1076 int len = min (wcslen (wstr) - start_ofs, max_len);
720 1077
721 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1078 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
722 { 1079 {
723 free (wstr); 1080 free (wstr);
724 croak ("new_text extends beyond horizontal margins"); 1081 croak ("new_text extends beyond horizontal margins");
725 } 1082 }
726 1083
727 for (int col = start_col; col < start_col + len; col++) 1084 for (int col = start_col; col < start_col + len; col++)
728 { 1085 {
729 l.t [col] = wstr [col - start_col]; 1086 l.t [col] = wstr [start_ofs + col - start_col];
730 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 1087 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
731 } 1088 }
732 1089
733 free (wstr); 1090 free (wstr);
734 } 1091 }
735} 1092}
736 1093
737void 1094void
738rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1095rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
739 PPCODE: 1096 PPCODE:
740{ 1097{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1098 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 1099 XSRETURN_EMPTY;
743 1100
… …
758 { 1115 {
759 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1116 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
760 croak ("new_rend must be arrayref"); 1117 croak ("new_rend must be arrayref");
761 1118
762 AV *av = (AV *)SvRV (new_rend); 1119 AV *av = (AV *)SvRV (new_rend);
763 int len = av_len (av) + 1; 1120 int len = min (av_len (av) + 1 - start_ofs, max_len);
764 1121
765 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1122 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
766 croak ("new_rend array extends beyond horizontal margins"); 1123 croak ("new_rend array extends beyond horizontal margins");
767 1124
768 for (int col = start_col; col < start_col + len; col++) 1125 for (int col = start_col; col < start_col + len; col++)
769 { 1126 {
770 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1127 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
771 1128
772 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1129 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
773 } 1130 }
774 } 1131 }
775} 1132}
776 1133
777int 1134int
778rxvt_term::ROW_l (int row_number, int new_length = -2) 1135rxvt_term::ROW_l (int row_number, int new_length = -1)
779 CODE: 1136 CODE:
780{ 1137{
781 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1138 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
782 XSRETURN_EMPTY; 1139 XSRETURN_EMPTY;
783 1140
784 line_t &l = ROW(row_number); 1141 line_t &l = ROW(row_number);
785 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1142 RETVAL = l.l;
786 1143
787 if (new_length >= -1) 1144 if (new_length >= 0)
788 l.l = new_length; 1145 l.l = new_length;
789} 1146}
790 OUTPUT: 1147 OUTPUT:
791 RETVAL 1148 RETVAL
792 1149
793bool 1150bool
794rxvt_term::ROW_is_longer (int row_number) 1151rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
795 CODE: 1152 CODE:
796{ 1153{
797 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1154 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
798 XSRETURN_EMPTY; 1155 XSRETURN_EMPTY;
799 1156
800 line_t &l = ROW(row_number); 1157 line_t &l = ROW(row_number);
801 RETVAL = l.l < 0; 1158 RETVAL = l.is_longer ();
1159
1160 if (new_is_longer >= 0)
1161 l.is_longer (new_is_longer);
802} 1162}
803 OUTPUT: 1163 OUTPUT:
804 RETVAL 1164 RETVAL
805 1165
806SV * 1166SV *
807rxvt_term::special_encode (SV *str) 1167rxvt_term::special_encode (SV *string)
808 CODE: 1168 CODE:
809 abort ();//TODO 1169{
1170 wchar_t *wstr = sv2wcs (string);
1171 int wlen = wcslen (wstr);
1172 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1173
1174 rxvt_push_locale (THIS->locale);
1175
1176 wchar_t *r = rstr;
1177 for (wchar_t *s = wstr; *s; s++)
1178 if (wcwidth (*s) == 0)
1179 {
1180 if (r == rstr)
1181 croak ("leading combining character unencodable");
1182
1183 unicode_t n = rxvt_compose (r[-1], *s);
1184 if (n == NOCHAR)
1185 n = rxvt_composite.compose (r[-1], *s);
1186
1187 r[-1] = n;
1188 }
1189#if !UNICODE_3
1190 else if (*s >= 0x10000)
1191 *r++ = rxvt_composite.compose (*s);
1192#endif
1193 else
1194 *r++ = *s;
1195
1196 rxvt_pop_locale ();
1197
1198 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1199
1200 delete [] rstr;
1201}
1202 OUTPUT:
1203 RETVAL
810 1204
811SV * 1205SV *
812rxvt_term::special_decode (SV *str) 1206rxvt_term::special_decode (SV *text)
813 CODE: 1207 CODE:
814 abort ();//TODO 1208{
1209 wchar_t *wstr = sv2wcs (text);
1210 int wlen = wcslen (wstr);
1211 int dlen = 0;
1212
1213 // find length
1214 for (wchar_t *s = wstr; *s; s++)
1215 if (*s == NOCHAR)
1216 ;
1217 else if (IS_COMPOSE (*s))
1218 dlen += rxvt_composite.expand (*s, 0);
1219 else
1220 dlen++;
1221
1222 wchar_t *rstr = new wchar_t [dlen];
1223
1224 // decode
1225 wchar_t *r = rstr;
1226 for (wchar_t *s = wstr; *s; s++)
1227 if (*s == NOCHAR)
1228 ;
1229 else if (IS_COMPOSE (*s))
1230 r += rxvt_composite.expand (*s, r);
1231 else
1232 *r++ = *s;
1233
1234 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1235
1236 delete [] rstr;
1237}
1238 OUTPUT:
1239 RETVAL
815 1240
816void 1241void
817rxvt_term::_resource (char *name, int index, SV *newval = 0) 1242rxvt_term::_resource (char *name, int index, SV *newval = 0)
818 PPCODE: 1243 PPCODE:
819{ 1244{
… …
836 1261
837 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1262 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
838 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1263 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
839 1264
840 if (GIMME_V != G_VOID) 1265 if (GIMME_V != G_VOID)
841 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1266 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
842 1267
843 if (newval) 1268 if (newval)
844 { 1269 {
845 if (SvOK (newval)) 1270 if (SvOK (newval))
846 { 1271 {
… …
851 else 1276 else
852 THIS->rs [index] = 0; 1277 THIS->rs [index] = 0;
853 } 1278 }
854} 1279}
855 1280
1281const char *
1282rxvt_term::x_resource (const char *name)
1283 CLEANUP:
1284 SvTAINTED_on (ST (0));
1285
1286bool
1287rxvt_term::option (U32 optval, int set = -1)
1288 CODE:
1289{
1290 RETVAL = THIS->options & optval;
1291
1292 if (set >= 0)
1293 {
1294 if (set)
1295 THIS->options |= optval;
1296 else
1297 THIS->options &= ~optval;
1298
1299 switch (optval)
1300 {
1301 case Opt_skipBuiltinGlyphs:
1302 THIS->set_fonts ();
1303 THIS->scr_remap_chars ();
1304 THIS->scr_touch (true);
1305 THIS->want_refresh = 1;
1306 break;
1307
1308 case Opt_cursorUnderline:
1309 THIS->want_refresh = 1;
1310 break;
1311
1312# case Opt_scrollBar_floating:
1313# case Opt_scrollBar_right:
1314# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1315# break;
1316 }
1317 }
1318}
1319 OUTPUT:
1320 RETVAL
1321
1322bool
1323rxvt_term::parse_keysym (char *keysym, char *str)
1324 CODE:
1325 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1326 THIS->keyboard->register_done ();
1327 OUTPUT:
1328 RETVAL
1329
856void 1330void
857rxvt_term::selection_mark (...) 1331rxvt_term::screen_cur (...)
858 PROTOTYPE: $;$$ 1332 PROTOTYPE: $;$$
859 ALIAS: 1333 ALIAS:
1334 screen_cur = 0
860 selection_beg = 1 1335 selection_beg = 1
861 selection_end = 2 1336 selection_end = 2
1337 selection_mark = 3
862 PPCODE: 1338 PPCODE:
863{ 1339{
864 row_col_t &sel = ix == 1 ? THIS->selection.beg 1340 row_col_t &rc = ix == 0 ? THIS->screen.cur
1341 : ix == 1 ? THIS->selection.beg
865 : ix == 2 ? THIS->selection.end 1342 : ix == 2 ? THIS->selection.end
866 : THIS->selection.mark; 1343 : THIS->selection.mark;
867 1344
868 if (GIMME_V != G_VOID) 1345 if (GIMME_V != G_VOID)
869 { 1346 {
870 EXTEND (SP, 2); 1347 EXTEND (SP, 2);
871 PUSHs (sv_2mortal (newSViv (sel.row))); 1348 PUSHs (sv_2mortal (newSViv (rc.row)));
872 PUSHs (sv_2mortal (newSViv (sel.col))); 1349 PUSHs (sv_2mortal (newSViv (rc.col)));
873 } 1350 }
874 1351
875 if (items == 3) 1352 if (items == 3)
876 { 1353 {
877 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1354 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
878 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1355 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
879 1356
880 if (ix) 1357 if (ix)
881 THIS->want_refresh = 1; 1358 THIS->want_refresh = 1;
882 } 1359 }
883} 1360}
884 1361
1362char
1363rxvt_term::cur_charset ()
1364 CODE:
1365 RETVAL = THIS->charsets [THIS->screen.charset];
1366 OUTPUT:
1367 RETVAL
1368
885int 1369int
886rxvt_term::selection_grab (int eventtime = CurrentTime) 1370rxvt_term::selection_grab (U32 eventtime)
887 1371
888void 1372void
889rxvt_term::selection (SV *newtext = 0) 1373rxvt_term::selection (SV *newtext = 0)
890 PPCODE: 1374 PPCODE:
891{ 1375{
892 if (GIMME_V != G_VOID) 1376 if (GIMME_V != G_VOID)
893 { 1377 XPUSHs (THIS->selection.text
894 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1378 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
895 SV *sv = newSVpv (sel, 0); 1379 : &PL_sv_undef);
896 SvUTF8_on (sv);
897 free (sel);
898 XPUSHs (sv_2mortal (sv));
899 }
900 1380
901 if (newtext) 1381 if (newtext)
902 { 1382 {
903 free (THIS->selection.text); 1383 free (THIS->selection.text);
904 1384
905 THIS->selection.text = sv2wcs (newtext); 1385 THIS->selection.text = sv2wcs (newtext);
906 THIS->selection.len = wcslen (THIS->selection.text); 1386 THIS->selection.len = wcslen (THIS->selection.text);
907 } 1387 }
908} 1388}
909 1389
1390void
1391rxvt_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)
1392
1393void
1394rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1395
1396void
1397rxvt_term::scr_bell ()
1398
1399void
1400rxvt_term::scr_add_lines (SV *string)
1401 CODE:
1402{
1403 wchar_t *wstr = sv2wcs (string);
1404 THIS->scr_add_lines (wstr, wcslen (wstr));
1405 free (wstr);
1406}
1407
910void 1408void
911rxvt_term::tt_write (SV *octets) 1409rxvt_term::tt_write (SV *octets)
912 INIT: 1410 INIT:
913 STRLEN len; 1411 STRLEN len;
914 char *str = SvPVbyte (octets, len); 1412 char *str = SvPVbyte (octets, len);
915 C_ARGS: 1413 C_ARGS:
916 str, len 1414 str, len
917 1415
1416void
1417rxvt_term::cmd_parse (SV *octets)
1418 CODE:
1419{
1420 STRLEN len;
1421 char *str = SvPVbyte (octets, len);
1422
1423 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1424 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1425
1426 THIS->cmdbuf_ptr = str;
1427 THIS->cmdbuf_endp = str + len;
1428
1429 rxvt_push_locale (THIS->locale);
1430 THIS->cmd_parse ();
1431 rxvt_pop_locale ();
1432
1433 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1434 THIS->cmdbuf_endp = old_cmdbuf_endp;
1435}
1436
918SV * 1437SV *
919rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1438rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
920 CODE: 1439 CODE:
921{ 1440{
922 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1441 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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