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.59 by root, Thu Jan 12 02:20:56 2006 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2005 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28 28
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef>
31#include <cstdarg> 32#include <cstdarg>
32 33
34#include "unistd.h"
35
36#include "iom.h"
33#include "rxvt.h" 37#include "rxvt.h"
34#include "iom.h" 38#include "keyboard.h"
35#include "rxvtutil.h" 39#include "rxvtutil.h"
36#include "rxvtperl.h" 40#include "rxvtperl.h"
37 41
38#include "perlxsi.c" 42#include "perlxsi.c"
43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
45# define GRAB_CURSOR THIS->leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
39 49
40#undef LINENO 50#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 52#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
44 54
45///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
46 56
57static SV *
58taint (SV *sv)
59{
60 SvTAINT (sv);
61 return sv;
62}
63
64static SV *
65taint_if (SV *sv, SV *src)
66{
67 if (SvTAINTED (src))
68 SvTAINT (sv);
69
70 return sv;
71}
72
47static wchar_t * 73static wchar_t *
48sv2wcs (SV *sv) 74sv2wcs (SV *sv)
49{ 75{
50 STRLEN len; 76 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 77 char *str = SvPVutf8 (sv, len);
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
… …
215 h += 2; 253 h += 2;
216 } 254 }
217 255
218 text = new text_t *[h]; 256 text = new text_t *[h];
219 rend = new rend_t *[h]; 257 rend = new rend_t *[h];
220 258
221 for (int y = 0; y < h; y++) 259 for (int y = 0; y < h; y++)
222 { 260 {
223 text_t *tp = text[y] = new text_t[w]; 261 text_t *tp = text[y] = new text_t[w];
224 rend_t *rp = rend[y] = new rend_t[w]; 262 rend_t *rp = rend[y] = new rend_t[w];
225 263
226 text_t t0, t1, t2; 264 text_t t0, t1, t2;
227 rend_t r = rstyle; 265 rend_t r = rstyle;
228 266
229 if (border == 2) 267 if (border == 2)
230 { 268 {
231 if (y == 0) 269 if (y == 0)
232 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 270 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
233 else if (y < h - 1) 271 else if (y < h - 1)
234 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 272 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
235 else 273 else
236 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; 274 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
237 275
238 *tp++ = t0; 276 *tp++ = t0;
239 *rp++ = r; 277 *rp++ = r;
240 278
241 for (int x = w - 2; x-- > 0; ) 279 for (int x = w - 2; x-- > 0; )
242 { 280 {
243 *tp++ = t1; 281 *tp++ = t1;
244 *rp++ = r; 282 *rp++ = r;
245 } 283 }
246 284
247 *tp = t2; 285 *tp = t2;
248 *rp = r; 286 *rp = r;
249 } 287 }
250 else 288 else
251 for (int x = w; x-- > 0; ) 289 for (int x = w; x-- > 0; )
252 { 290 {
253 *tp++ = 0x0020; 291 *tp++ = 0x0020;
254 *rp++ = r; 292 *rp++ = r;
255 } 293 }
256 } 294 }
257 295
258 show (); 296 show ();
259 THIS->want_refresh = 1; 297 THIS->want_refresh = 1;
260} 298}
261 299
… …
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
… …
308 346
309 for (int y = ov_h; y--; ) 347 for (int y = ov_h; y--; )
310 { 348 {
311 text_t *t1 = text [y]; 349 text_t *t1 = text [y];
312 rend_t *r1 = rend [y]; 350 rend_t *r1 = rend [y];
313 351
314 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 352 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; 353 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
316 354
317 for (int x = ov_w; x--; ) 355 for (int x = ov_w; x--; )
318 { 356 {
319 text_t t = *t1; *t1++ = *t2; *t2++ = t; 357 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)); 358 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
321 } 359 }
322 } 360 }
323 361
… …
333 371
334 wchar_t *wtext = sv2wcs (text); 372 wchar_t *wtext = sv2wcs (text);
335 373
336 for (int col = min (wcslen (wtext), w - x - border); col--; ) 374 for (int col = min (wcslen (wtext), w - x - border); col--; )
337 this->text [y][x + col] = wtext [col]; 375 this->text [y][x + col] = wtext [col];
338 376
339 free (wtext); 377 free (wtext);
340 378
341 if (rend) 379 if (rend)
342 { 380 {
343 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 381 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
… …
356///////////////////////////////////////////////////////////////////////////// 394/////////////////////////////////////////////////////////////////////////////
357 395
358struct rxvt_perl_interp rxvt_perl; 396struct rxvt_perl_interp rxvt_perl;
359 397
360static PerlInterpreter *perl; 398static PerlInterpreter *perl;
361
362rxvt_perl_interp::rxvt_perl_interp ()
363{
364}
365 399
366rxvt_perl_interp::~rxvt_perl_interp () 400rxvt_perl_interp::~rxvt_perl_interp ()
367{ 401{
368 if (perl) 402 if (perl)
369 { 403 {
… …
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, ...)
402{ 453{
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 (!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# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
512 export_const (DEFAULT_RSTYLE); 665 export_const_iv (DEFAULT_RSTYLE);
513 export_const (OVERLAY_RSTYLE); 666 export_const_iv (OVERLAY_RSTYLE);
514 export_const (RS_Bold); 667 export_const_iv (RS_Bold);
515 export_const (RS_Italic); 668 export_const_iv (RS_Italic);
516 export_const (RS_Blink); 669 export_const_iv (RS_Blink);
517 export_const (RS_RVid); 670 export_const_iv (RS_RVid);
518 export_const (RS_Uline); 671 export_const_iv (RS_Uline);
519 672
520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 673 export_const_iv (CurrentTime);
674 export_const_iv (ShiftMask);
675 export_const_iv (LockMask);
676 export_const_iv (ControlMask);
677 export_const_iv (Mod1Mask);
678 export_const_iv (Mod2Mask);
679 export_const_iv (Mod3Mask);
680 export_const_iv (Mod4Mask);
681 export_const_iv (Mod5Mask);
682 export_const_iv (Button1Mask);
683 export_const_iv (Button2Mask);
684 export_const_iv (Button3Mask);
685 export_const_iv (Button4Mask);
686 export_const_iv (Button5Mask);
687 export_const_iv (AnyModifier);
688
689 export_const_iv (EVENT_NONE);
690 export_const_iv (EVENT_READ);
691 export_const_iv (EVENT_WRITE);
521} 692}
522 693
523void 694void
524set_should_invoke (int htype, int value) 695set_should_invoke (int htype, int value)
525 CODE: 696 CODE:
… …
532 703
533void 704void
534fatal (const char *msg) 705fatal (const char *msg)
535 CODE: 706 CODE:
536 rxvt_fatal ("%s", msg); 707 rxvt_fatal ("%s", msg);
708
709SV *
710untaint (SV *sv)
711 CODE:
712 RETVAL = newSVsv (sv);
713 SvTAINTED_off (RETVAL);
714 OUTPUT:
715 RETVAL
716
717void
718_exit (int status)
719
720bool
721safe ()
722 CODE:
723 RETVAL = !rxvt_tainted ();
724 OUTPUT:
725 RETVAL
537 726
538NV 727NV
539NOW () 728NOW ()
540 CODE: 729 CODE:
541 RETVAL = NOW; 730 RETVAL = NOW;
… …
589} 778}
590 OUTPUT: 779 OUTPUT:
591 RETVAL 780 RETVAL
592 781
593MODULE = urxvt PACKAGE = urxvt::term 782MODULE = urxvt PACKAGE = urxvt::term
783
784SV *
785_new (...)
786 CODE:
787{
788 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
789 croak ("first argument to urxvt::term->_new must be arrayref");
790
791 rxvt_term *term = new rxvt_term;
792
793 term->argv = new stringvec;
794 term->envv = new stringvec;
795
796 for (int i = 1; i < items; i++)
797 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
798
799 AV *envv = (AV *)SvRV (ST (0));
800 for (int i = av_len (envv) + 1; i--; )
801 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
802
803 term->envv->push_back (0);
804
805 bool success;
806
807 try
808 {
809 success = term->init (term->argv->size (), term->argv->begin ());
810 }
811 catch (const class rxvt_failure_exception &e)
812 {
813 success = false;
814 }
815
816 if (!success)
817 {
818 term->destroy ();
819 croak ("error while initializing new terminal instance");
820 }
821
822 RETVAL = term && term->perl.self
823 ? newSVterm (term) : &PL_sv_undef;
824}
825 OUTPUT:
826 RETVAL
827
828void
829rxvt_term::destroy ()
830
831void
832rxvt_term::grab_button (int button, U32 modifiers)
833 CODE:
834 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
835 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
836 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
837
838bool
839rxvt_term::grab (U32 eventtime, int sync = 0)
840 CODE:
841{
842 int mode = sync ? GrabModeSync : GrabModeAsync;
843
844 THIS->perl.grabtime = 0;
845
846 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
847 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
848 mode, mode, None, GRAB_CURSOR, eventtime))
849 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
850 THIS->perl.grabtime = eventtime;
851 else
852 XUngrabPointer (THIS->display->display, eventtime);
853
854 RETVAL = !!THIS->perl.grabtime;
855}
856 OUTPUT:
857 RETVAL
858
859void
860rxvt_term::allow_events_async ()
861 CODE:
862 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
863
864void
865rxvt_term::allow_events_sync ()
866 CODE:
867 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
868
869void
870rxvt_term::allow_events_replay ()
871 CODE:
872 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
873 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
874
875void
876rxvt_term::ungrab ()
877 CODE:
878 ungrab (THIS);
594 879
595int 880int
596rxvt_term::strwidth (SV *str) 881rxvt_term::strwidth (SV *str)
597 CODE: 882 CODE:
598{ 883{
… …
617 char *mbstr = rxvt_wcstombs (wstr); 902 char *mbstr = rxvt_wcstombs (wstr);
618 rxvt_pop_locale (); 903 rxvt_pop_locale ();
619 904
620 free (wstr); 905 free (wstr);
621 906
622 RETVAL = newSVpv (mbstr, 0); 907 RETVAL = taint_if (newSVpv (mbstr, 0), str);
623 free (mbstr); 908 free (mbstr);
624} 909}
625 OUTPUT: 910 OUTPUT:
626 RETVAL 911 RETVAL
627 912
… …
634 919
635 rxvt_push_locale (THIS->locale); 920 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 921 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 922 rxvt_pop_locale ();
638 923
639 char *str = rxvt_wcstoutf8 (wstr); 924 RETVAL = taint_if (wcs2sv (wstr), octets);
640 free (wstr); 925 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 926}
646 OUTPUT: 927 OUTPUT:
647 RETVAL 928 RETVAL
929
930#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
931
932#define TERM_OFFSET_width TERM_OFFSET(width)
933#define TERM_OFFSET_height TERM_OFFSET(height)
934#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
935#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
936#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
937#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
938#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
939#define TERM_OFFSET_focus TERM_OFFSET(focus)
940#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
941#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
942#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
943#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
648 944
649int 945int
946rxvt_term::width ()
947 ALIAS:
948 width = TERM_OFFSET_width
949 height = TERM_OFFSET_height
950 fwidth = TERM_OFFSET_fwidth
951 fheight = TERM_OFFSET_fheight
952 fbase = TERM_OFFSET_fbase
953 nrow = TERM_OFFSET_nrow
954 ncol = TERM_OFFSET_ncol
955 focus = TERM_OFFSET_focus
956 mapped = TERM_OFFSET_mapped
957 saveLines = TERM_OFFSET_saveLines
958 total_rows = TERM_OFFSET_total_rows
959 nsaved = TERM_OFFSET_nsaved
960 CODE:
961 RETVAL = *(int *)((char *)THIS + ix);
962 OUTPUT:
963 RETVAL
964
965unsigned int
966rxvt_term::ModLevel3Mask ()
967 ALIAS:
968 ModLevel3Mask = 0
969 ModMetaMask = 1
970 ModNumLockMask = 2
971 CODE:
972 switch (ix)
973 {
974 case 0: RETVAL = THIS->ModLevel3Mask; break;
975 case 1: RETVAL = THIS->ModMetaMask; break;
976 case 2: RETVAL = THIS->ModNumLockMask; break;
977 }
978 OUTPUT:
979 RETVAL
980
981char *
982rxvt_term::display_id ()
983 ALIAS:
984 display_id = 0
985 locale = 1
986 CODE:
987 switch (ix)
988 {
989 case 0: RETVAL = THIS->display->id; break;
990 case 1: RETVAL = THIS->locale; break;
991 }
992 OUTPUT:
993 RETVAL
994
995SV *
650rxvt_term::nsaved () 996rxvt_term::_env ()
651 CODE: 997 CODE:
998{
999 if (THIS->envv)
1000 {
1001 AV *av = newAV ();
1002
1003 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1004 if (*i)
1005 av_push (av, newSVpv (*i, 0));
1006
1007 RETVAL = newRV_noinc ((SV *)av);
1008 }
1009 else
1010 RETVAL = &PL_sv_undef;
1011}
1012 OUTPUT:
1013 RETVAL
1014
1015int
1016rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1017 CODE:
1018 RETVAL = THIS->pty_ev.events;
1019 if (events != EVENT_UNDEF)
1020 THIS->pty_ev.set (events);
1021 OUTPUT:
1022 RETVAL
1023
1024U32
1025rxvt_term::parent ()
1026 CODE:
1027 RETVAL = (U32)THIS->parent [0];
1028 OUTPUT:
1029 RETVAL
1030
1031U32
1032rxvt_term::vt ()
1033 CODE:
1034 RETVAL = (U32)THIS->vt;
1035 OUTPUT:
1036 RETVAL
1037
1038U32
1039rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1040 CODE:
1041{
652 RETVAL = THIS->nsaved; 1042 RETVAL = THIS->rstyle;
1043 THIS->rstyle = new_rstyle;
1044}
653 OUTPUT: 1045 OUTPUT:
654 RETVAL 1046 RETVAL
655 1047
656int 1048int
657rxvt_term::view_start (int newval = -1) 1049rxvt_term::view_start (int newval = -1)
658 CODE: 1050 CODE:
659{ 1051{
… …
666 } 1058 }
667} 1059}
668 OUTPUT: 1060 OUTPUT:
669 RETVAL 1061 RETVAL
670 1062
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 1063void
686rxvt_term::want_refresh () 1064rxvt_term::want_refresh ()
687 CODE: 1065 CODE:
688 THIS->want_refresh = 1; 1066 THIS->want_refresh = 1;
689 1067
690void 1068void
691rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1069rxvt_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: 1070 PPCODE:
693{ 1071{
694 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1072 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
695 XSRETURN_EMPTY; 1073 XSRETURN_EMPTY;
696 1074
… …
698 1076
699 if (GIMME_V != G_VOID) 1077 if (GIMME_V != G_VOID)
700 { 1078 {
701 wchar_t *wstr = new wchar_t [THIS->ncol]; 1079 wchar_t *wstr = new wchar_t [THIS->ncol];
702 1080
703 for (int col = 0; col <THIS->ncol; col++) 1081 for (int col = 0; col < THIS->ncol; col++)
704 wstr [col] = l.t [col]; 1082 wstr [col] = l.t [col];
705 1083
706 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1084 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
707 free (wstr);
708 1085
709 SV *sv = newSVpv (str, 0); 1086 delete [] wstr;
710 SvUTF8_on (sv);
711 XPUSHs (sv_2mortal (sv));
712 free (str);
713 } 1087 }
714 1088
715 if (new_text) 1089 if (new_text)
716 { 1090 {
717 wchar_t *wstr = sv2wcs (new_text); 1091 wchar_t *wstr = sv2wcs (new_text);
718 1092
719 int len = wcslen (wstr); 1093 int len = min (wcslen (wstr) - start_ofs, max_len);
720 1094
721 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1095 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
722 { 1096 {
723 free (wstr); 1097 free (wstr);
724 croak ("new_text extends beyond horizontal margins"); 1098 croak ("new_text extends beyond horizontal margins");
725 } 1099 }
726 1100
727 for (int col = start_col; col < start_col + len; col++) 1101 for (int col = start_col; col < start_col + len; col++)
728 { 1102 {
729 l.t [col] = wstr [col - start_col]; 1103 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])); 1104 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
731 } 1105 }
732 1106
733 free (wstr); 1107 free (wstr);
734 } 1108 }
735} 1109}
736 1110
737void 1111void
738rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1112rxvt_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: 1113 PPCODE:
740{ 1114{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1115 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 1116 XSRETURN_EMPTY;
743 1117
… …
758 { 1132 {
759 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1133 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
760 croak ("new_rend must be arrayref"); 1134 croak ("new_rend must be arrayref");
761 1135
762 AV *av = (AV *)SvRV (new_rend); 1136 AV *av = (AV *)SvRV (new_rend);
763 int len = av_len (av) + 1; 1137 int len = min (av_len (av) + 1 - start_ofs, max_len);
764 1138
765 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1139 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
766 croak ("new_rend array extends beyond horizontal margins"); 1140 croak ("new_rend array extends beyond horizontal margins");
767 1141
768 for (int col = start_col; col < start_col + len; col++) 1142 for (int col = start_col; col < start_col + len; col++)
769 { 1143 {
770 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1144 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
771 1145
772 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1146 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
773 } 1147 }
774 } 1148 }
775} 1149}
776 1150
777int 1151int
778rxvt_term::ROW_l (int row_number, int new_length = -2) 1152rxvt_term::ROW_l (int row_number, int new_length = -1)
779 CODE: 1153 CODE:
780{ 1154{
781 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1155 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
782 XSRETURN_EMPTY; 1156 XSRETURN_EMPTY;
783 1157
784 line_t &l = ROW(row_number); 1158 line_t &l = ROW(row_number);
785 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1159 RETVAL = l.l;
786 1160
787 if (new_length >= -1) 1161 if (new_length >= 0)
788 l.l = new_length; 1162 l.l = new_length;
789} 1163}
790 OUTPUT: 1164 OUTPUT:
791 RETVAL 1165 RETVAL
792 1166
793bool 1167bool
794rxvt_term::ROW_is_longer (int row_number) 1168rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
795 CODE: 1169 CODE:
796{ 1170{
797 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1171 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
798 XSRETURN_EMPTY; 1172 XSRETURN_EMPTY;
799 1173
800 line_t &l = ROW(row_number); 1174 line_t &l = ROW(row_number);
801 RETVAL = l.l < 0; 1175 RETVAL = l.is_longer ();
1176
1177 if (new_is_longer >= 0)
1178 l.is_longer (new_is_longer);
802} 1179}
803 OUTPUT: 1180 OUTPUT:
804 RETVAL 1181 RETVAL
805 1182
806SV * 1183SV *
807rxvt_term::special_encode (SV *str) 1184rxvt_term::special_encode (SV *string)
808 CODE: 1185 CODE:
809 abort ();//TODO 1186{
1187 wchar_t *wstr = sv2wcs (string);
1188 int wlen = wcslen (wstr);
1189 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1190
1191 rxvt_push_locale (THIS->locale);
1192
1193 wchar_t *r = rstr;
1194 for (wchar_t *s = wstr; *s; s++)
1195 if (wcwidth (*s) == 0)
1196 {
1197 if (r == rstr)
1198 croak ("leading combining character unencodable");
1199
1200 unicode_t n = rxvt_compose (r[-1], *s);
1201 if (n == NOCHAR)
1202 n = rxvt_composite.compose (r[-1], *s);
1203
1204 r[-1] = n;
1205 }
1206#if !UNICODE_3
1207 else if (*s >= 0x10000)
1208 *r++ = rxvt_composite.compose (*s);
1209#endif
1210 else
1211 *r++ = *s;
1212
1213 rxvt_pop_locale ();
1214
1215 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1216
1217 delete [] rstr;
1218}
1219 OUTPUT:
1220 RETVAL
810 1221
811SV * 1222SV *
812rxvt_term::special_decode (SV *str) 1223rxvt_term::special_decode (SV *text)
813 CODE: 1224 CODE:
814 abort ();//TODO 1225{
1226 wchar_t *wstr = sv2wcs (text);
1227 int wlen = wcslen (wstr);
1228 int dlen = 0;
1229
1230 // find length
1231 for (wchar_t *s = wstr; *s; s++)
1232 if (*s == NOCHAR)
1233 ;
1234 else if (IS_COMPOSE (*s))
1235 dlen += rxvt_composite.expand (*s, 0);
1236 else
1237 dlen++;
1238
1239 wchar_t *rstr = new wchar_t [dlen];
1240
1241 // decode
1242 wchar_t *r = rstr;
1243 for (wchar_t *s = wstr; *s; s++)
1244 if (*s == NOCHAR)
1245 ;
1246 else if (IS_COMPOSE (*s))
1247 r += rxvt_composite.expand (*s, r);
1248 else
1249 *r++ = *s;
1250
1251 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1252
1253 delete [] rstr;
1254}
1255 OUTPUT:
1256 RETVAL
815 1257
816void 1258void
817rxvt_term::_resource (char *name, int index, SV *newval = 0) 1259rxvt_term::_resource (char *name, int index, SV *newval = 0)
818 PPCODE: 1260 PPCODE:
819{ 1261{
… …
836 1278
837 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1279 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
838 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1280 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
839 1281
840 if (GIMME_V != G_VOID) 1282 if (GIMME_V != G_VOID)
841 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1283 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
842 1284
843 if (newval) 1285 if (newval)
844 { 1286 {
845 if (SvOK (newval)) 1287 if (SvOK (newval))
846 { 1288 {
… …
851 else 1293 else
852 THIS->rs [index] = 0; 1294 THIS->rs [index] = 0;
853 } 1295 }
854} 1296}
855 1297
1298const char *
1299rxvt_term::x_resource (const char *name)
1300 CLEANUP:
1301 SvTAINTED_on (ST (0));
1302
1303bool
1304rxvt_term::option (U32 optval, int set = -1)
1305 CODE:
1306{
1307 RETVAL = THIS->options & optval;
1308
1309 if (set >= 0)
1310 {
1311 if (set)
1312 THIS->options |= optval;
1313 else
1314 THIS->options &= ~optval;
1315
1316 switch (optval)
1317 {
1318 case Opt_skipBuiltinGlyphs:
1319 THIS->set_fonts ();
1320 THIS->scr_remap_chars ();
1321 THIS->scr_touch (true);
1322 THIS->want_refresh = 1;
1323 break;
1324
1325 case Opt_cursorUnderline:
1326 THIS->want_refresh = 1;
1327 break;
1328
1329# case Opt_scrollBar_floating:
1330# case Opt_scrollBar_right:
1331# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1332# break;
1333 }
1334 }
1335}
1336 OUTPUT:
1337 RETVAL
1338
1339bool
1340rxvt_term::parse_keysym (char *keysym, char *str)
1341 CODE:
1342 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1343 THIS->keyboard->register_done ();
1344 OUTPUT:
1345 RETVAL
1346
856void 1347void
857rxvt_term::selection_mark (...) 1348rxvt_term::screen_cur (...)
858 PROTOTYPE: $;$$ 1349 PROTOTYPE: $;$$
859 ALIAS: 1350 ALIAS:
1351 screen_cur = 0
860 selection_beg = 1 1352 selection_beg = 1
861 selection_end = 2 1353 selection_end = 2
1354 selection_mark = 3
862 PPCODE: 1355 PPCODE:
863{ 1356{
864 row_col_t &sel = ix == 1 ? THIS->selection.beg 1357 row_col_t &rc = ix == 0 ? THIS->screen.cur
1358 : ix == 1 ? THIS->selection.beg
865 : ix == 2 ? THIS->selection.end 1359 : ix == 2 ? THIS->selection.end
866 : THIS->selection.mark; 1360 : THIS->selection.mark;
867 1361
868 if (GIMME_V != G_VOID) 1362 if (GIMME_V != G_VOID)
869 { 1363 {
870 EXTEND (SP, 2); 1364 EXTEND (SP, 2);
871 PUSHs (sv_2mortal (newSViv (sel.row))); 1365 PUSHs (sv_2mortal (newSViv (rc.row)));
872 PUSHs (sv_2mortal (newSViv (sel.col))); 1366 PUSHs (sv_2mortal (newSViv (rc.col)));
873 } 1367 }
874 1368
875 if (items == 3) 1369 if (items == 3)
876 { 1370 {
877 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1371 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
878 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1372 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
879 1373
880 if (ix) 1374 if (ix)
881 THIS->want_refresh = 1; 1375 THIS->want_refresh = 1;
882 } 1376 }
883} 1377}
884 1378
1379char
1380rxvt_term::cur_charset ()
1381 CODE:
1382 RETVAL = THIS->charsets [THIS->screen.charset];
1383 OUTPUT:
1384 RETVAL
1385
885int 1386int
886rxvt_term::selection_grab (int eventtime = CurrentTime) 1387rxvt_term::selection_grab (U32 eventtime)
887 1388
888void 1389void
889rxvt_term::selection (SV *newtext = 0) 1390rxvt_term::selection (SV *newtext = 0)
890 PPCODE: 1391 PPCODE:
891{ 1392{
892 if (GIMME_V != G_VOID) 1393 if (GIMME_V != G_VOID)
893 { 1394 XPUSHs (THIS->selection.text
894 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1395 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
895 SV *sv = newSVpv (sel, 0); 1396 : &PL_sv_undef);
896 SvUTF8_on (sv);
897 free (sel);
898 XPUSHs (sv_2mortal (sv));
899 }
900 1397
901 if (newtext) 1398 if (newtext)
902 { 1399 {
903 free (THIS->selection.text); 1400 free (THIS->selection.text);
904 1401
905 THIS->selection.text = sv2wcs (newtext); 1402 THIS->selection.text = sv2wcs (newtext);
906 THIS->selection.len = wcslen (THIS->selection.text); 1403 THIS->selection.len = wcslen (THIS->selection.text);
907 } 1404 }
908} 1405}
909 1406
1407void
1408rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1409
1410void
1411rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1412
1413void
1414rxvt_term::scr_bell ()
1415
1416void
1417rxvt_term::scr_add_lines (SV *string)
1418 CODE:
1419{
1420 wchar_t *wstr = sv2wcs (string);
1421 THIS->scr_add_lines (wstr, wcslen (wstr));
1422 free (wstr);
1423}
1424
910void 1425void
911rxvt_term::tt_write (SV *octets) 1426rxvt_term::tt_write (SV *octets)
912 INIT: 1427 INIT:
913 STRLEN len; 1428 STRLEN len;
914 char *str = SvPVbyte (octets, len); 1429 char *str = SvPVbyte (octets, len);
915 C_ARGS: 1430 C_ARGS:
916 str, len 1431 str, len
917 1432
1433void
1434rxvt_term::cmd_parse (SV *octets)
1435 CODE:
1436{
1437 STRLEN len;
1438 char *str = SvPVbyte (octets, len);
1439
1440 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1441 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1442
1443 THIS->cmdbuf_ptr = str;
1444 THIS->cmdbuf_endp = str + len;
1445
1446 rxvt_push_locale (THIS->locale);
1447 THIS->cmd_parse ();
1448 rxvt_pop_locale ();
1449
1450 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1451 THIS->cmdbuf_endp = old_cmdbuf_endp;
1452}
1453
918SV * 1454SV *
919rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1455rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
920 CODE: 1456 CODE:
921{ 1457{
922 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1458 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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