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.64 by root, Fri Jan 13 15:42:50 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
55#define ENABLE_PERL_FRILLS 1
56
45///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58
59static SV *
60taint (SV *sv)
61{
62 SvTAINT (sv);
63 return sv;
64}
65
66static SV *
67taint_if (SV *sv, SV *src)
68{
69 if (SvTAINTED (src))
70 SvTAINT (sv);
71
72 return sv;
73}
46 74
47static wchar_t * 75static wchar_t *
48sv2wcs (SV *sv) 76sv2wcs (SV *sv)
49{ 77{
50 STRLEN len; 78 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 79 char *str = SvPVutf8 (sv, len);
52 return rxvt_utf8towcs (str, len); 80 return rxvt_utf8towcs (str, len);
53} 81}
54 82
55static SV * 83static SV *
84wcs2sv (wchar_t *wstr, int len = -1)
85{
86 char *str = rxvt_wcstoutf8 (wstr, len);
87
88 SV *sv = newSVpv (str, 0);
89 SvUTF8_on (sv);
90 free (str);
91
92 return sv;
93}
94
95static SV *
56new_ref (HV *hv, const char *klass) 96new_ref (HV *hv, const char *klass)
57{ 97{
58 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 98 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59} 99}
60 100
… …
89 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 129 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
90 130
91 return (long)mg->mg_ptr; 131 return (long)mg->mg_ptr;
92} 132}
93 133
94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 134#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 135#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
96 136
97///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
98 138
99struct perl_watcher 139struct perl_watcher
… …
215 h += 2; 255 h += 2;
216 } 256 }
217 257
218 text = new text_t *[h]; 258 text = new text_t *[h];
219 rend = new rend_t *[h]; 259 rend = new rend_t *[h];
220 260
221 for (int y = 0; y < h; y++) 261 for (int y = 0; y < h; y++)
222 { 262 {
223 text_t *tp = text[y] = new text_t[w]; 263 text_t *tp = text[y] = new text_t[w];
224 rend_t *rp = rend[y] = new rend_t[w]; 264 rend_t *rp = rend[y] = new rend_t[w];
225 265
226 text_t t0, t1, t2; 266 text_t t0, t1, t2;
227 rend_t r = rstyle; 267 rend_t r = rstyle;
228 268
229 if (border == 2) 269 if (border == 2)
230 { 270 {
231 if (y == 0) 271 if (y == 0)
232 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 272 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
233 else if (y < h - 1) 273 else if (y < h - 1)
234 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 274 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
235 else 275 else
236 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; 276 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
237 277
238 *tp++ = t0; 278 *tp++ = t0;
239 *rp++ = r; 279 *rp++ = r;
240 280
241 for (int x = w - 2; x-- > 0; ) 281 for (int x = w - 2; x-- > 0; )
242 { 282 {
243 *tp++ = t1; 283 *tp++ = t1;
244 *rp++ = r; 284 *rp++ = r;
245 } 285 }
246 286
247 *tp = t2; 287 *tp = t2;
248 *rp = r; 288 *rp = r;
249 } 289 }
250 else 290 else
251 for (int x = w; x-- > 0; ) 291 for (int x = w; x-- > 0; )
252 { 292 {
253 *tp++ = 0x0020; 293 *tp++ = 0x0020;
254 *rp++ = r; 294 *rp++ = r;
255 } 295 }
256 } 296 }
257 297
258 show (); 298 show ();
259 THIS->want_refresh = 1; 299 THIS->want_refresh = 1;
260} 300}
261 301
… …
278void 318void
279overlay::show () 319overlay::show ()
280{ 320{
281 char key[33]; sprintf (key, "%32lx", (long)this); 321 char key[33]; sprintf (key, "%32lx", (long)this);
282 322
283 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 323 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); 324 hv_store (hv, key, 32, newSViv ((long)this), 0);
285} 325}
286 326
287void 327void
288overlay::hide () 328overlay::hide ()
289{ 329{
290 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 330 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
291 331
292 if (ovs) 332 if (ovs)
293 { 333 {
294 char key[33]; sprintf (key, "%32lx", (long)this); 334 char key[33]; sprintf (key, "%32lx", (long)this);
295 335
… …
308 348
309 for (int y = ov_h; y--; ) 349 for (int y = ov_h; y--; )
310 { 350 {
311 text_t *t1 = text [y]; 351 text_t *t1 = text [y];
312 rend_t *r1 = rend [y]; 352 rend_t *r1 = rend [y];
313 353
314 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 354 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; 355 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
316 356
317 for (int x = ov_w; x--; ) 357 for (int x = ov_w; x--; )
318 { 358 {
319 text_t t = *t1; *t1++ = *t2; *t2++ = t; 359 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)); 360 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
321 } 361 }
322 } 362 }
323 363
… …
333 373
334 wchar_t *wtext = sv2wcs (text); 374 wchar_t *wtext = sv2wcs (text);
335 375
336 for (int col = min (wcslen (wtext), w - x - border); col--; ) 376 for (int col = min (wcslen (wtext), w - x - border); col--; )
337 this->text [y][x + col] = wtext [col]; 377 this->text [y][x + col] = wtext [col];
338 378
339 free (wtext); 379 free (wtext);
340 380
341 if (rend) 381 if (rend)
342 { 382 {
343 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 383 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
… …
356///////////////////////////////////////////////////////////////////////////// 396/////////////////////////////////////////////////////////////////////////////
357 397
358struct rxvt_perl_interp rxvt_perl; 398struct rxvt_perl_interp rxvt_perl;
359 399
360static PerlInterpreter *perl; 400static PerlInterpreter *perl;
361
362rxvt_perl_interp::rxvt_perl_interp ()
363{
364}
365 401
366rxvt_perl_interp::~rxvt_perl_interp () 402rxvt_perl_interp::~rxvt_perl_interp ()
367{ 403{
368 if (perl) 404 if (perl)
369 { 405 {
… …
375void 411void
376rxvt_perl_interp::init () 412rxvt_perl_interp::init ()
377{ 413{
378 if (!perl) 414 if (!perl)
379 { 415 {
416 perl_environ = rxvt_environ;
417 swap (perl_environ, environ);
418
380 char *argv[] = { 419 char *argv[] = {
381 "", 420 "",
421 "-T",
382 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 422 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
383 }; 423 };
384 424
385 perl = perl_alloc (); 425 perl = perl_alloc ();
386 perl_construct (perl); 426 perl_construct (perl);
387 427
388 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 428 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
389 || perl_run (perl)) 429 || perl_run (perl))
390 { 430 {
391 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 431 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
392 432
393 perl_destruct (perl); 433 perl_destruct (perl);
394 perl_free (perl); 434 perl_free (perl);
395 perl = 0; 435 perl = 0;
396 } 436 }
437
438 swap (perl_environ, environ);
439 }
440}
441
442static void
443ungrab (rxvt_term *THIS)
444{
445 if (THIS->perl.grabtime)
446 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0;
397 } 450 }
398} 451}
399 452
400bool 453bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
402{ 455{
403 if (!perl) 456 if (!perl)
404 return false; 457 return false;
405 458
406 if (htype == HOOK_INIT) // first hook ever called 459 if (htype == HOOK_INIT) // first hook ever called
407 { 460 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 462 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410 } 463 }
411 else if (!term->self) 464 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 465 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 466 else if (htype == HOOK_DESTROY)
414 { 467 {
415 // handled later 468 // handled later
416 } 469 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 470 else
418 { 471 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
420
421 if (HvKEYS (hv))
422 { 473 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
475
476 if (HvKEYS (hv))
477 {
423 hv_iterinit (hv); 478 hv_iterinit (hv);
424 479
425 while (HE *he = hv_iternext (hv)) 480 while (HE *he = hv_iternext (hv))
426 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 481 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482 }
483
427 } 484 }
485
486 if (!term->perl.should_invoke [htype])
487 return false;
428 } 488 }
429 else if (!should_invoke [htype])
430 return false;
431 489
490 swap (perl_environ, environ);
491
492 try
493 {
432 dSP; 494 dSP;
433 va_list ap; 495 va_list ap;
434 496
435 va_start (ap, htype); 497 va_start (ap, htype);
436 498
437 ENTER; 499 ENTER;
438 SAVETMPS; 500 SAVETMPS;
439 501
440 PUSHMARK (SP); 502 PUSHMARK (SP);
441 503
442 XPUSHs (sv_2mortal (newSVterm (term))); 504 XPUSHs (sv_2mortal (newSVterm (term)));
443 XPUSHs (sv_2mortal (newSViv (htype))); 505 XPUSHs (sv_2mortal (newSViv (htype)));
444 506
445 for (;;) { 507 for (;;) {
446 data_type dt = (data_type)va_arg (ap, int); 508 data_type dt = (data_type)va_arg (ap, int);
447 509
448 switch (dt) 510 switch (dt)
449 { 511 {
450 case DT_INT: 512 case DT_INT:
451 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
452 break; 514 break;
453 515
454 case DT_LONG: 516 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break; 518 break;
457 519
458 case DT_STRING: 520 case DT_STR:
459 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
460 break; 522 break;
461 523
462 case DT_END: 524 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 { 525 {
472 SV *status = POPs; 526 char *str = va_arg (ap, char *);
473 count = SvTRUE (status); 527 int len = va_arg (ap, int);
528
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
474 } 530 }
531 break;
475 532
476 PUTBACK; 533 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 { 534 {
485 clearSVptr ((SV *)term->self); 535 wchar_t *wstr = va_arg (ap, wchar_t *);
486 SvREFCNT_dec ((SV *)term->self); 536 int wlen = va_arg (ap, int);
537
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
487 } 539 }
540 break;
488 541
542 case DT_XEVENT:
543 {
544 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV ();
546
547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
548# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549# undef set
550
551 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial);
554
555 switch (xe->type)
556 {
557 case KeyPress:
558 case KeyRelease:
559 case ButtonPress:
560 case ButtonRelease:
561 case MotionNotify:
562 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state);
570 break;
571 }
572
573 switch (xe->type)
574 {
575 case KeyPress:
576 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode);
578 break;
579
580 case ButtonPress:
581 case ButtonRelease:
582 setiv (button, xe->xbutton.button);
583 break;
584
585 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint);
587 break;
588 }
589
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 }
592 break;
593
594 case DT_END:
595 {
596 va_end (ap);
597
598 PUTBACK;
599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
600 SPAGAIN;
601
602 if (count)
603 {
604 SV *status = POPs;
605 count = SvTRUE (status);
606 }
607
608 PUTBACK;
609 FREETMPS;
610 LEAVE;
611
612 if (SvTRUE (ERRSV))
613 {
614 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
615 ungrab (term); // better lose the grab than the session
616 }
617
618 if (htype == HOOK_DESTROY)
619 {
620 clearSVptr ((SV *)term->perl.self);
621 SvREFCNT_dec ((SV *)term->perl.self);
622 }
623
624 swap (perl_environ, environ);
489 return count; 625 return count;
490 } 626 }
491 627
492 default: 628 default:
493 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 }
494 } 631 }
495 } 632 }
633 catch (...)
634 {
635 swap (perl_environ, environ);
636 throw;
637 }
496} 638}
497 639
498///////////////////////////////////////////////////////////////////////////// 640/////////////////////////////////////////////////////////////////////////////
499 641
500MODULE = urxvt PACKAGE = urxvt 642MODULE = urxvt PACKAGE = urxvt
501 643
502PROTOTYPES: ENABLE 644PROTOTYPES: ENABLE
503 645
504BOOT: 646BOOT:
505{ 647{
506# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 648 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
649 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
650 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
651 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
652
507 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 653 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 654# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
509# include "hookinc.h" 655# include "hookinc.h"
510# undef def 656# undef def
511 657
658 HV *option = get_hv ("urxvt::OPTION", 1);
659# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
660# define nodef(name)
661# include "optinc.h"
662# undef nodef
663# undef def
664
665 HV *stash = gv_stashpv ("urxvt", 1);
666 struct {
667 const char *name;
668 IV iv;
669 } *civ, const_iv[] = {
670# define const_iv(name) { # name, (IV)name }
512 export_const (DEFAULT_RSTYLE); 671 const_iv (DEFAULT_RSTYLE),
513 export_const (OVERLAY_RSTYLE); 672 const_iv (OVERLAY_RSTYLE),
514 export_const (RS_Bold); 673 const_iv (RS_Bold),
515 export_const (RS_Italic); 674 const_iv (RS_Italic),
516 export_const (RS_Blink); 675 const_iv (RS_Blink),
517 export_const (RS_RVid); 676 const_iv (RS_RVid),
518 export_const (RS_Uline); 677 const_iv (RS_Uline),
519 678
520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 679 const_iv (CurrentTime),
521} 680 const_iv (ShiftMask),
681 const_iv (LockMask),
682 const_iv (ControlMask),
683 const_iv (Mod1Mask),
684 const_iv (Mod2Mask),
685 const_iv (Mod3Mask),
686 const_iv (Mod4Mask),
687 const_iv (Mod5Mask),
688 const_iv (Button1Mask),
689 const_iv (Button2Mask),
690 const_iv (Button3Mask),
691 const_iv (Button4Mask),
692 const_iv (Button5Mask),
693 const_iv (AnyModifier),
522 694
523void 695 const_iv (EVENT_NONE),
524set_should_invoke (int htype, int value) 696 const_iv (EVENT_READ),
525 CODE: 697 const_iv (EVENT_WRITE),
526 rxvt_perl.should_invoke [htype] = value; 698
699 const_iv (NoEventMask),
700 const_iv (KeyPressMask),
701 const_iv (KeyReleaseMask),
702 const_iv (ButtonPressMask),
703 const_iv (ButtonReleaseMask),
704 const_iv (EnterWindowMask),
705 const_iv (LeaveWindowMask),
706 const_iv (PointerMotionMask),
707 const_iv (PointerMotionHintMask),
708 const_iv (Button1MotionMask),
709 const_iv (Button2MotionMask),
710 const_iv (Button3MotionMask),
711 const_iv (Button4MotionMask),
712 const_iv (Button5MotionMask),
713 const_iv (ButtonMotionMask),
714 const_iv (KeymapStateMask),
715 const_iv (ExposureMask),
716 const_iv (VisibilityChangeMask),
717 const_iv (StructureNotifyMask),
718 const_iv (ResizeRedirectMask),
719 const_iv (SubstructureNotifyMask),
720 const_iv (SubstructureRedirectMask),
721 const_iv (FocusChangeMask),
722 const_iv (PropertyChangeMask),
723 const_iv (ColormapChangeMask),
724 const_iv (OwnerGrabButtonMask),
725
726 const_iv (KeyPress),
727 const_iv (KeyRelease),
728 const_iv (ButtonPress),
729 const_iv (ButtonRelease),
730 const_iv (MotionNotify),
731 const_iv (EnterNotify),
732 const_iv (LeaveNotify),
733 const_iv (FocusIn),
734 const_iv (FocusOut),
735 const_iv (KeymapNotify),
736 const_iv (Expose),
737 const_iv (GraphicsExpose),
738 const_iv (NoExpose),
739 const_iv (VisibilityNotify),
740 const_iv (CreateNotify),
741 const_iv (DestroyNotify),
742 const_iv (UnmapNotify),
743 const_iv (MapNotify),
744 const_iv (MapRequest),
745 const_iv (ReparentNotify),
746 const_iv (ConfigureNotify),
747 const_iv (ConfigureRequest),
748 const_iv (GravityNotify),
749 const_iv (ResizeRequest),
750 const_iv (CirculateNotify),
751 const_iv (CirculateRequest),
752 const_iv (PropertyNotify),
753 const_iv (SelectionClear),
754 const_iv (SelectionRequest),
755 const_iv (SelectionNotify),
756 const_iv (ColormapNotify),
757 const_iv (ClientMessage),
758 const_iv (MappingNotify),
759 };
760
761 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
762 civ-- > const_iv; )
763 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
764}
527 765
528void 766void
529warn (const char *msg) 767warn (const char *msg)
530 CODE: 768 CODE:
531 rxvt_warn ("%s", msg); 769 rxvt_warn ("%s", msg);
532 770
533void 771void
534fatal (const char *msg) 772fatal (const char *msg)
535 CODE: 773 CODE:
536 rxvt_fatal ("%s", msg); 774 rxvt_fatal ("%s", msg);
775
776SV *
777untaint (SV *sv)
778 CODE:
779 RETVAL = newSVsv (sv);
780 SvTAINTED_off (RETVAL);
781 OUTPUT:
782 RETVAL
783
784void
785_exit (int status)
786
787bool
788safe ()
789 CODE:
790 RETVAL = !rxvt_tainted ();
791 OUTPUT:
792 RETVAL
537 793
538NV 794NV
539NOW () 795NOW ()
540 CODE: 796 CODE:
541 RETVAL = NOW; 797 RETVAL = NOW;
… …
589} 845}
590 OUTPUT: 846 OUTPUT:
591 RETVAL 847 RETVAL
592 848
593MODULE = urxvt PACKAGE = urxvt::term 849MODULE = urxvt PACKAGE = urxvt::term
850
851SV *
852_new (...)
853 CODE:
854{
855 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
856 croak ("first argument to urxvt::term->_new must be arrayref");
857
858 rxvt_term *term = new rxvt_term;
859
860 term->argv = new stringvec;
861 term->envv = new stringvec;
862
863 for (int i = 1; i < items; i++)
864 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
865
866 AV *envv = (AV *)SvRV (ST (0));
867 for (int i = av_len (envv) + 1; i--; )
868 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
869
870 term->envv->push_back (0);
871
872 bool success;
873
874 try
875 {
876 success = term->init (term->argv->size (), term->argv->begin ());
877 }
878 catch (const class rxvt_failure_exception &e)
879 {
880 success = false;
881 }
882
883 if (!success)
884 {
885 term->destroy ();
886 croak ("error while initializing new terminal instance");
887 }
888
889 RETVAL = term && term->perl.self
890 ? newSVterm (term) : &PL_sv_undef;
891}
892 OUTPUT:
893 RETVAL
894
895void
896rxvt_term::destroy ()
897
898#if ENABLE_PERL_FRILLS
899
900void
901rxvt_term::XListProperties (U32 window)
902 PPCODE:
903{
904 int count;
905 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
906
907 EXTEND (SP, count);
908 while (count--)
909 PUSHs (newSVuv ((U32)props [count]));
910
911 XFree (props);
912}
913
914void
915rxvt_term::XGetWindowProperty (U32 window, U32 property)
916 PPCODE:
917{
918 Atom type;
919 int format;
920 unsigned long nitems;
921 unsigned long bytes_after;
922 unsigned char *prop;
923 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
924 0, 1<<30, 0, AnyPropertyType,
925 &type, &format, &nitems, &bytes_after, &prop);
926 if (type != None)
927 {
928 EXTEND (SP, 3);
929 PUSHs (newSVuv ((U32)type));
930 PUSHs (newSViv (format));
931 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
932 XFree (prop);
933 }
934}
935
936void
937rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
938 CODE:
939{
940 STRLEN len;
941 char *data_ = SvPVbyte (data, len);
942
943 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
944 type, format, PropModeReplace,
945 (unsigned char *)data, len * 8 / format);
946}
947
948void
949rxvt_term::XDeleteProperty (U32 window, U32 property)
950 CODE:
951 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
952
953U32
954rxvt_term::DefaultRootWindow ()
955 CODE:
956 RETVAL = (U32)THIS->display->root;
957 OUTPUT:
958 RETVAL
959
960U32
961rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
962 CODE:
963 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
964 x, y, width, height, 0,
965 THIS->pix_colors_focused[Color_border],
966 THIS->pix_colors_focused[Color_border]);
967 OUTPUT:
968 RETVAL
969
970void
971rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
972 CODE:
973 XReparentWindow (THIS->display->display, window, parent, x, y);
974
975#endif
976
977void
978rxvt_term::set_should_invoke (int htype, int inc)
979 CODE:
980 THIS->perl.should_invoke [htype] += inc;
981
982void
983rxvt_term::grab_button (int button, U32 modifiers)
984 CODE:
985 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
986 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
987 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
988
989bool
990rxvt_term::grab (U32 eventtime, int sync = 0)
991 CODE:
992{
993 int mode = sync ? GrabModeSync : GrabModeAsync;
994
995 THIS->perl.grabtime = 0;
996
997 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
998 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
999 mode, mode, None, GRAB_CURSOR, eventtime))
1000 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
1001 THIS->perl.grabtime = eventtime;
1002 else
1003 XUngrabPointer (THIS->display->display, eventtime);
1004
1005 RETVAL = !!THIS->perl.grabtime;
1006}
1007 OUTPUT:
1008 RETVAL
1009
1010void
1011rxvt_term::allow_events_async ()
1012 CODE:
1013 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
1014
1015void
1016rxvt_term::allow_events_sync ()
1017 CODE:
1018 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
1019
1020void
1021rxvt_term::allow_events_replay ()
1022 CODE:
1023 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
1024 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
1025
1026void
1027rxvt_term::ungrab ()
1028 CODE:
1029 ungrab (THIS);
594 1030
595int 1031int
596rxvt_term::strwidth (SV *str) 1032rxvt_term::strwidth (SV *str)
597 CODE: 1033 CODE:
598{ 1034{
… …
617 char *mbstr = rxvt_wcstombs (wstr); 1053 char *mbstr = rxvt_wcstombs (wstr);
618 rxvt_pop_locale (); 1054 rxvt_pop_locale ();
619 1055
620 free (wstr); 1056 free (wstr);
621 1057
622 RETVAL = newSVpv (mbstr, 0); 1058 RETVAL = taint_if (newSVpv (mbstr, 0), str);
623 free (mbstr); 1059 free (mbstr);
624} 1060}
625 OUTPUT: 1061 OUTPUT:
626 RETVAL 1062 RETVAL
627 1063
… …
634 1070
635 rxvt_push_locale (THIS->locale); 1071 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 1072 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 1073 rxvt_pop_locale ();
638 1074
639 char *str = rxvt_wcstoutf8 (wstr); 1075 RETVAL = taint_if (wcs2sv (wstr), octets);
640 free (wstr); 1076 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 1077}
646 OUTPUT: 1078 OUTPUT:
647 RETVAL 1079 RETVAL
648 1080
1081#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1082
1083#define TERM_OFFSET_width TERM_OFFSET(width)
1084#define TERM_OFFSET_height TERM_OFFSET(height)
1085#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1086#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1087#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1088#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1089#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1090#define TERM_OFFSET_focus TERM_OFFSET(focus)
1091#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1092#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1093#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1094#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
1095
649int 1096int
1097rxvt_term::width ()
1098 ALIAS:
1099 width = TERM_OFFSET_width
1100 height = TERM_OFFSET_height
1101 fwidth = TERM_OFFSET_fwidth
1102 fheight = TERM_OFFSET_fheight
1103 fbase = TERM_OFFSET_fbase
1104 nrow = TERM_OFFSET_nrow
1105 ncol = TERM_OFFSET_ncol
1106 focus = TERM_OFFSET_focus
1107 mapped = TERM_OFFSET_mapped
1108 saveLines = TERM_OFFSET_saveLines
1109 total_rows = TERM_OFFSET_total_rows
1110 nsaved = TERM_OFFSET_nsaved
1111 CODE:
1112 RETVAL = *(int *)((char *)THIS + ix);
1113 OUTPUT:
1114 RETVAL
1115
1116unsigned int
1117rxvt_term::ModLevel3Mask ()
1118 ALIAS:
1119 ModLevel3Mask = 0
1120 ModMetaMask = 1
1121 ModNumLockMask = 2
1122 CODE:
1123 switch (ix)
1124 {
1125 case 0: RETVAL = THIS->ModLevel3Mask; break;
1126 case 1: RETVAL = THIS->ModMetaMask; break;
1127 case 2: RETVAL = THIS->ModNumLockMask; break;
1128 }
1129 OUTPUT:
1130 RETVAL
1131
1132char *
1133rxvt_term::display_id ()
1134 ALIAS:
1135 display_id = 0
1136 locale = 1
1137 CODE:
1138 switch (ix)
1139 {
1140 case 0: RETVAL = THIS->display->id; break;
1141 case 1: RETVAL = THIS->locale; break;
1142 }
1143 OUTPUT:
1144 RETVAL
1145
1146SV *
650rxvt_term::nsaved () 1147rxvt_term::_env ()
651 CODE: 1148 CODE:
1149{
1150 if (THIS->envv)
1151 {
1152 AV *av = newAV ();
1153
1154 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1155 if (*i)
1156 av_push (av, newSVpv (*i, 0));
1157
1158 RETVAL = newRV_noinc ((SV *)av);
1159 }
1160 else
1161 RETVAL = &PL_sv_undef;
1162}
1163 OUTPUT:
1164 RETVAL
1165
1166int
1167rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1168 CODE:
1169 RETVAL = THIS->pty_ev.events;
1170 if (events != EVENT_UNDEF)
1171 THIS->pty_ev.set (events);
1172 OUTPUT:
1173 RETVAL
1174
1175U32
1176rxvt_term::parent ()
1177 CODE:
1178 RETVAL = (U32)THIS->parent [0];
1179 OUTPUT:
1180 RETVAL
1181
1182U32
1183rxvt_term::vt ()
1184 CODE:
1185 RETVAL = (U32)THIS->vt;
1186 OUTPUT:
1187 RETVAL
1188
1189void
1190rxvt_term::vt_emask_add (U32 emask)
1191 CODE:
1192 THIS->vt_emask_perl |= emask;
1193 THIS->vt_select_input ();
1194
1195U32
1196rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1197 CODE:
652 RETVAL = THIS->nsaved; 1198 RETVAL = THIS->rstyle;
1199 THIS->rstyle = new_rstyle;
653 OUTPUT: 1200 OUTPUT:
654 RETVAL 1201 RETVAL
655 1202
656int 1203int
657rxvt_term::view_start (int newval = -1) 1204rxvt_term::view_start (int newval = -1)
1205 PROTOTYPE: $;$
658 CODE: 1206 CODE:
659{ 1207{
660 RETVAL = THIS->view_start; 1208 RETVAL = THIS->view_start;
661 1209
662 if (newval >= 0) 1210 if (newval >= 0)
… …
666 } 1214 }
667} 1215}
668 OUTPUT: 1216 OUTPUT:
669 RETVAL 1217 RETVAL
670 1218
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 1219void
686rxvt_term::want_refresh () 1220rxvt_term::want_refresh ()
687 CODE: 1221 CODE:
688 THIS->want_refresh = 1; 1222 THIS->want_refresh = 1;
689 1223
690void 1224void
691rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1225rxvt_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: 1226 PPCODE:
693{ 1227{
694 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1228 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
695 XSRETURN_EMPTY; 1229 XSRETURN_EMPTY;
696 1230
… …
698 1232
699 if (GIMME_V != G_VOID) 1233 if (GIMME_V != G_VOID)
700 { 1234 {
701 wchar_t *wstr = new wchar_t [THIS->ncol]; 1235 wchar_t *wstr = new wchar_t [THIS->ncol];
702 1236
703 for (int col = 0; col <THIS->ncol; col++) 1237 for (int col = 0; col < THIS->ncol; col++)
704 wstr [col] = l.t [col]; 1238 wstr [col] = l.t [col];
705 1239
706 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1240 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
707 free (wstr);
708 1241
709 SV *sv = newSVpv (str, 0); 1242 delete [] wstr;
710 SvUTF8_on (sv);
711 XPUSHs (sv_2mortal (sv));
712 free (str);
713 } 1243 }
714 1244
715 if (new_text) 1245 if (new_text)
716 { 1246 {
717 wchar_t *wstr = sv2wcs (new_text); 1247 wchar_t *wstr = sv2wcs (new_text);
718 1248
719 int len = wcslen (wstr); 1249 int len = min (wcslen (wstr) - start_ofs, max_len);
720 1250
721 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1251 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
722 { 1252 {
723 free (wstr); 1253 free (wstr);
724 croak ("new_text extends beyond horizontal margins"); 1254 croak ("new_text extends beyond horizontal margins");
725 } 1255 }
726 1256
727 for (int col = start_col; col < start_col + len; col++) 1257 for (int col = start_col; col < start_col + len; col++)
728 { 1258 {
729 l.t [col] = wstr [col - start_col]; 1259 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])); 1260 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
731 } 1261 }
732 1262
733 free (wstr); 1263 free (wstr);
734 } 1264 }
735} 1265}
736 1266
737void 1267void
738rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1268rxvt_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: 1269 PPCODE:
740{ 1270{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1271 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 1272 XSRETURN_EMPTY;
743 1273
… …
758 { 1288 {
759 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1289 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
760 croak ("new_rend must be arrayref"); 1290 croak ("new_rend must be arrayref");
761 1291
762 AV *av = (AV *)SvRV (new_rend); 1292 AV *av = (AV *)SvRV (new_rend);
763 int len = av_len (av) + 1; 1293 int len = min (av_len (av) + 1 - start_ofs, max_len);
764 1294
765 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1295 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
766 croak ("new_rend array extends beyond horizontal margins"); 1296 croak ("new_rend array extends beyond horizontal margins");
767 1297
768 for (int col = start_col; col < start_col + len; col++) 1298 for (int col = start_col; col < start_col + len; col++)
769 { 1299 {
770 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1300 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
771 1301
772 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1302 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
773 } 1303 }
774 } 1304 }
775} 1305}
776 1306
777int 1307int
778rxvt_term::ROW_l (int row_number, int new_length = -2) 1308rxvt_term::ROW_l (int row_number, int new_length = -1)
779 CODE: 1309 CODE:
780{ 1310{
781 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1311 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
782 XSRETURN_EMPTY; 1312 XSRETURN_EMPTY;
783 1313
784 line_t &l = ROW(row_number); 1314 line_t &l = ROW(row_number);
785 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1315 RETVAL = l.l;
786 1316
787 if (new_length >= -1) 1317 if (new_length >= 0)
788 l.l = new_length; 1318 l.l = new_length;
789} 1319}
790 OUTPUT: 1320 OUTPUT:
791 RETVAL 1321 RETVAL
792 1322
793bool 1323bool
794rxvt_term::ROW_is_longer (int row_number) 1324rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
795 CODE: 1325 CODE:
796{ 1326{
797 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1327 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
798 XSRETURN_EMPTY; 1328 XSRETURN_EMPTY;
799 1329
800 line_t &l = ROW(row_number); 1330 line_t &l = ROW(row_number);
801 RETVAL = l.l < 0; 1331 RETVAL = l.is_longer ();
1332
1333 if (new_is_longer >= 0)
1334 l.is_longer (new_is_longer);
802} 1335}
803 OUTPUT: 1336 OUTPUT:
804 RETVAL 1337 RETVAL
805 1338
806SV * 1339SV *
807rxvt_term::special_encode (SV *str) 1340rxvt_term::special_encode (SV *string)
808 CODE: 1341 CODE:
809 abort ();//TODO 1342{
1343 wchar_t *wstr = sv2wcs (string);
1344 int wlen = wcslen (wstr);
1345 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1346
1347 rxvt_push_locale (THIS->locale);
1348
1349 wchar_t *r = rstr;
1350 for (wchar_t *s = wstr; *s; s++)
1351 if (wcwidth (*s) == 0)
1352 {
1353 if (r == rstr)
1354 croak ("leading combining character unencodable");
1355
1356 unicode_t n = rxvt_compose (r[-1], *s);
1357 if (n == NOCHAR)
1358 n = rxvt_composite.compose (r[-1], *s);
1359
1360 r[-1] = n;
1361 }
1362#if !UNICODE_3
1363 else if (*s >= 0x10000)
1364 *r++ = rxvt_composite.compose (*s);
1365#endif
1366 else
1367 *r++ = *s;
1368
1369 rxvt_pop_locale ();
1370
1371 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1372
1373 delete [] rstr;
1374}
1375 OUTPUT:
1376 RETVAL
810 1377
811SV * 1378SV *
812rxvt_term::special_decode (SV *str) 1379rxvt_term::special_decode (SV *text)
813 CODE: 1380 CODE:
814 abort ();//TODO 1381{
1382 wchar_t *wstr = sv2wcs (text);
1383 int wlen = wcslen (wstr);
1384 int dlen = 0;
1385
1386 // find length
1387 for (wchar_t *s = wstr; *s; s++)
1388 if (*s == NOCHAR)
1389 ;
1390 else if (IS_COMPOSE (*s))
1391 dlen += rxvt_composite.expand (*s, 0);
1392 else
1393 dlen++;
1394
1395 wchar_t *rstr = new wchar_t [dlen];
1396
1397 // decode
1398 wchar_t *r = rstr;
1399 for (wchar_t *s = wstr; *s; s++)
1400 if (*s == NOCHAR)
1401 ;
1402 else if (IS_COMPOSE (*s))
1403 r += rxvt_composite.expand (*s, r);
1404 else
1405 *r++ = *s;
1406
1407 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1408
1409 delete [] rstr;
1410}
1411 OUTPUT:
1412 RETVAL
815 1413
816void 1414void
817rxvt_term::_resource (char *name, int index, SV *newval = 0) 1415rxvt_term::_resource (char *name, int index, SV *newval = 0)
818 PPCODE: 1416 PPCODE:
819{ 1417{
… …
836 1434
837 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1435 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
838 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1436 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
839 1437
840 if (GIMME_V != G_VOID) 1438 if (GIMME_V != G_VOID)
841 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1439 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
842 1440
843 if (newval) 1441 if (newval)
844 { 1442 {
845 if (SvOK (newval)) 1443 if (SvOK (newval))
846 { 1444 {
… …
851 else 1449 else
852 THIS->rs [index] = 0; 1450 THIS->rs [index] = 0;
853 } 1451 }
854} 1452}
855 1453
1454const char *
1455rxvt_term::x_resource (const char *name)
1456 CLEANUP:
1457 SvTAINTED_on (ST (0));
1458
1459bool
1460rxvt_term::option (U32 optval, int set = -1)
1461 CODE:
1462{
1463 RETVAL = THIS->options & optval;
1464
1465 if (set >= 0)
1466 {
1467 if (set)
1468 THIS->options |= optval;
1469 else
1470 THIS->options &= ~optval;
1471
1472 switch (optval)
1473 {
1474 case Opt_skipBuiltinGlyphs:
1475 THIS->set_fonts ();
1476 THIS->scr_remap_chars ();
1477 THIS->scr_touch (true);
1478 THIS->want_refresh = 1;
1479 break;
1480
1481 case Opt_cursorUnderline:
1482 THIS->want_refresh = 1;
1483 break;
1484
1485# case Opt_scrollBar_floating:
1486# case Opt_scrollBar_right:
1487# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1488# break;
1489 }
1490 }
1491}
1492 OUTPUT:
1493 RETVAL
1494
1495bool
1496rxvt_term::parse_keysym (char *keysym, char *str)
1497 CODE:
1498 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1499 THIS->keyboard->register_done ();
1500 OUTPUT:
1501 RETVAL
1502
856void 1503void
857rxvt_term::selection_mark (...) 1504rxvt_term::screen_cur (...)
858 PROTOTYPE: $;$$ 1505 PROTOTYPE: $;$$
859 ALIAS: 1506 ALIAS:
1507 screen_cur = 0
860 selection_beg = 1 1508 selection_beg = 1
861 selection_end = 2 1509 selection_end = 2
1510 selection_mark = 3
862 PPCODE: 1511 PPCODE:
863{ 1512{
864 row_col_t &sel = ix == 1 ? THIS->selection.beg 1513 row_col_t &rc = ix == 0 ? THIS->screen.cur
1514 : ix == 1 ? THIS->selection.beg
865 : ix == 2 ? THIS->selection.end 1515 : ix == 2 ? THIS->selection.end
866 : THIS->selection.mark; 1516 : THIS->selection.mark;
867 1517
868 if (GIMME_V != G_VOID) 1518 if (GIMME_V != G_VOID)
869 { 1519 {
870 EXTEND (SP, 2); 1520 EXTEND (SP, 2);
871 PUSHs (sv_2mortal (newSViv (sel.row))); 1521 PUSHs (sv_2mortal (newSViv (rc.row)));
872 PUSHs (sv_2mortal (newSViv (sel.col))); 1522 PUSHs (sv_2mortal (newSViv (rc.col)));
873 } 1523 }
874 1524
875 if (items == 3) 1525 if (items == 3)
876 { 1526 {
877 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1527 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
878 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1528 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
879 1529
880 if (ix) 1530 if (ix)
881 THIS->want_refresh = 1; 1531 THIS->want_refresh = 1;
882 } 1532 }
883} 1533}
884 1534
1535char
1536rxvt_term::cur_charset ()
1537 CODE:
1538 RETVAL = THIS->charsets [THIS->screen.charset];
1539 OUTPUT:
1540 RETVAL
1541
1542#void
1543#rxvt_term::selection_clear ()
1544
1545void
1546rxvt_term::selection_make (U32 eventtime, bool rect = false)
1547 CODE:
1548 THIS->selection.op = SELECTION_CONT;
1549 THIS->selection.rect = rect;
1550 THIS->selection_make (eventtime);
1551
885int 1552int
886rxvt_term::selection_grab (int eventtime = CurrentTime) 1553rxvt_term::selection_grab (U32 eventtime)
887 1554
888void 1555void
889rxvt_term::selection (SV *newtext = 0) 1556rxvt_term::selection (SV *newtext = 0)
890 PPCODE: 1557 PPCODE:
891{ 1558{
892 if (GIMME_V != G_VOID) 1559 if (GIMME_V != G_VOID)
893 { 1560 XPUSHs (THIS->selection.text
894 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1561 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
895 SV *sv = newSVpv (sel, 0); 1562 : &PL_sv_undef);
896 SvUTF8_on (sv);
897 free (sel);
898 XPUSHs (sv_2mortal (sv));
899 }
900 1563
901 if (newtext) 1564 if (newtext)
902 { 1565 {
903 free (THIS->selection.text); 1566 free (THIS->selection.text);
904 1567
905 THIS->selection.text = sv2wcs (newtext); 1568 THIS->selection.text = sv2wcs (newtext);
906 THIS->selection.len = wcslen (THIS->selection.text); 1569 THIS->selection.len = wcslen (THIS->selection.text);
907 } 1570 }
908} 1571}
909 1572
1573void
1574rxvt_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)
1575
1576void
1577rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1578
1579void
1580rxvt_term::scr_bell ()
1581
1582void
1583rxvt_term::scr_add_lines (SV *string)
1584 CODE:
1585{
1586 wchar_t *wstr = sv2wcs (string);
1587 THIS->scr_add_lines (wstr, wcslen (wstr));
1588 free (wstr);
1589}
1590
910void 1591void
911rxvt_term::tt_write (SV *octets) 1592rxvt_term::tt_write (SV *octets)
912 INIT: 1593 INIT:
913 STRLEN len; 1594 STRLEN len;
914 char *str = SvPVbyte (octets, len); 1595 char *str = SvPVbyte (octets, len);
915 C_ARGS: 1596 C_ARGS:
916 str, len 1597 str, len
917 1598
1599void
1600rxvt_term::cmd_parse (SV *octets)
1601 CODE:
1602{
1603 STRLEN len;
1604 char *str = SvPVbyte (octets, len);
1605
1606 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1607 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1608
1609 THIS->cmdbuf_ptr = str;
1610 THIS->cmdbuf_endp = str + len;
1611
1612 rxvt_push_locale (THIS->locale);
1613 THIS->cmd_parse ();
1614 rxvt_pop_locale ();
1615
1616 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1617 THIS->cmdbuf_endp = old_cmdbuf_endp;
1618}
1619
918SV * 1620SV *
919rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1621rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
920 CODE: 1622 CODE:
921{ 1623{
922 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1624 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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