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.67 by root, Sun Jan 15 06:02:41 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;
450 }
451}
452
453static void
454swap_overlays (rxvt_term *term)
455{
456 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
457
458 if (HvKEYS (hv))
459 {
460 hv_iterinit (hv);
461
462 while (HE *he = hv_iternext (hv))
463 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
397 } 464 }
398} 465}
399 466
400bool 467bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
402{ 469{
403 if (!perl) 470 if (!perl)
404 return false; 471 return false;
405 472
406 if (htype == HOOK_INIT) // first hook ever called 473 if (htype == HOOK_INIT) // first hook ever called
407 { 474 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 475 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 476 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410 } 477 }
411 else if (!term->self) 478 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 479 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 480 else if (htype == HOOK_DESTROY)
414 { 481 {
415 // handled later 482 // handled later
416 } 483 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 484 else
418 { 485 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 486 if (htype == HOOK_REFRESH_END)
487 swap_overlays (term);
420 488
421 if (HvKEYS (hv)) 489 if (!term->perl.should_invoke [htype])
422 { 490 {
423 hv_iterinit (hv); 491 if (htype == HOOK_REFRESH_BEGIN)
492 swap_overlays (term);
424 493
425 while (HE *he = hv_iternext (hv)) 494 return false;
426 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
427 } 495 }
428 } 496 }
429 else if (!should_invoke [htype])
430 return false;
431 497
498 swap (perl_environ, environ);
499
500 try
501 {
432 dSP; 502 dSP;
433 va_list ap; 503 va_list ap;
434 504
435 va_start (ap, htype); 505 va_start (ap, htype);
436 506
437 ENTER; 507 ENTER;
438 SAVETMPS; 508 SAVETMPS;
439 509
440 PUSHMARK (SP); 510 PUSHMARK (SP);
441 511
442 XPUSHs (sv_2mortal (newSVterm (term))); 512 XPUSHs (sv_2mortal (newSVterm (term)));
443 XPUSHs (sv_2mortal (newSViv (htype))); 513 XPUSHs (sv_2mortal (newSViv (htype)));
444 514
445 for (;;) { 515 for (;;) {
446 data_type dt = (data_type)va_arg (ap, int); 516 data_type dt = (data_type)va_arg (ap, int);
447 517
448 switch (dt) 518 switch (dt)
449 {
450 case DT_INT:
451 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
452 break;
453
454 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break;
457
458 case DT_STRING:
459 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
460 break;
461
462 case DT_END:
463 { 519 {
464 va_end (ap); 520 case DT_INT:
521 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
522 break;
465 523
466 PUTBACK; 524 case DT_LONG:
467 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL); 525 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 SPAGAIN; 526 break;
469 527
470 if (count) 528 case DT_STR:
529 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
530 break;
531
532 case DT_STR_LEN:
471 { 533 {
472 SV *status = POPs; 534 char *str = va_arg (ap, char *);
473 count = SvTRUE (status); 535 int len = va_arg (ap, int);
536
537 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
474 } 538 }
539 break;
475 540
476 PUTBACK; 541 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 { 542 {
485 clearSVptr ((SV *)term->self); 543 wchar_t *wstr = va_arg (ap, wchar_t *);
486 SvREFCNT_dec ((SV *)term->self); 544 int wlen = va_arg (ap, int);
545
546 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
487 } 547 }
548 break;
488 549
550 case DT_XEVENT:
551 {
552 XEvent *xe = va_arg (ap, XEvent *);
553 HV *hv = newHV ();
554
555# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
556# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
557# undef set
558
559 setiv (type, xe->type);
560 setiv (send_event, xe->xany.send_event);
561 setiv (serial, xe->xany.serial);
562
563 switch (xe->type)
564 {
565 case KeyPress:
566 case KeyRelease:
567 case ButtonPress:
568 case ButtonRelease:
569 case MotionNotify:
570 setiv (time, xe->xmotion.time);
571 setiv (x, xe->xmotion.x);
572 setiv (y, xe->xmotion.y);
573 setiv (row, xe->xmotion.y / term->fheight);
574 setiv (col, xe->xmotion.x / term->fwidth);
575 setiv (x_root, xe->xmotion.x_root);
576 setiv (y_root, xe->xmotion.y_root);
577 setiv (state, xe->xmotion.state);
578 break;
579 }
580
581 switch (xe->type)
582 {
583 case KeyPress:
584 case KeyRelease:
585 setiv (keycode, xe->xkey.keycode);
586 break;
587
588 case ButtonPress:
589 case ButtonRelease:
590 setiv (button, xe->xbutton.button);
591 break;
592
593 case MotionNotify:
594 setiv (is_hint, xe->xmotion.is_hint);
595 break;
596 }
597
598 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
599 }
600 break;
601
602 case DT_END:
603 {
604 va_end (ap);
605
606 PUTBACK;
607 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
608 SPAGAIN;
609
610 if (count)
611 {
612 SV *status = POPs;
613 count = SvTRUE (status);
614 }
615
616 PUTBACK;
617 FREETMPS;
618 LEAVE;
619
620 if (SvTRUE (ERRSV))
621 {
622 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
623 ungrab (term); // better lose the grab than the session
624 }
625
626 if (htype == HOOK_REFRESH_BEGIN)
627 swap_overlays (term);
628 else if (htype == HOOK_DESTROY)
629 {
630 clearSVptr ((SV *)term->perl.self);
631 SvREFCNT_dec ((SV *)term->perl.self);
632 }
633
634 swap (perl_environ, environ);
489 return count; 635 return count;
636 }
637
638 default:
639 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
490 } 640 }
491
492 default:
493 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
494 } 641 }
495 } 642 }
643 catch (...)
644 {
645 swap (perl_environ, environ);
646 throw;
647 }
496} 648}
497 649
498///////////////////////////////////////////////////////////////////////////// 650/////////////////////////////////////////////////////////////////////////////
499 651
500MODULE = urxvt PACKAGE = urxvt 652MODULE = urxvt PACKAGE = urxvt
501 653
502PROTOTYPES: ENABLE 654PROTOTYPES: ENABLE
503 655
504BOOT: 656BOOT:
505{ 657{
506# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 658 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
659 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
660 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
661 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
662
507 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 663 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 664# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
509# include "hookinc.h" 665# include "hookinc.h"
510# undef def 666# undef def
511 667
668 HV *option = get_hv ("urxvt::OPTION", 1);
669# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
670# define nodef(name)
671# include "optinc.h"
672# undef nodef
673# undef def
674
675 HV *stash = gv_stashpv ("urxvt", 1);
676 struct {
677 const char *name;
678 IV iv;
679 } *civ, const_iv[] = {
680# define const_iv(name) { # name, (IV)name }
512 export_const (DEFAULT_RSTYLE); 681 const_iv (DEFAULT_RSTYLE),
513 export_const (OVERLAY_RSTYLE); 682 const_iv (OVERLAY_RSTYLE),
514 export_const (RS_Bold); 683 const_iv (RS_Bold),
515 export_const (RS_Italic); 684 const_iv (RS_Italic),
516 export_const (RS_Blink); 685 const_iv (RS_Blink),
517 export_const (RS_RVid); 686 const_iv (RS_RVid),
518 export_const (RS_Uline); 687 const_iv (RS_Uline),
519 688
520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 689 const_iv (CurrentTime),
521} 690 const_iv (ShiftMask),
691 const_iv (LockMask),
692 const_iv (ControlMask),
693 const_iv (Mod1Mask),
694 const_iv (Mod2Mask),
695 const_iv (Mod3Mask),
696 const_iv (Mod4Mask),
697 const_iv (Mod5Mask),
698 const_iv (Button1Mask),
699 const_iv (Button2Mask),
700 const_iv (Button3Mask),
701 const_iv (Button4Mask),
702 const_iv (Button5Mask),
703 const_iv (AnyModifier),
522 704
523void 705 const_iv (EVENT_NONE),
524set_should_invoke (int htype, int value) 706 const_iv (EVENT_READ),
525 CODE: 707 const_iv (EVENT_WRITE),
526 rxvt_perl.should_invoke [htype] = value; 708
709 const_iv (NoEventMask),
710 const_iv (KeyPressMask),
711 const_iv (KeyReleaseMask),
712 const_iv (ButtonPressMask),
713 const_iv (ButtonReleaseMask),
714 const_iv (EnterWindowMask),
715 const_iv (LeaveWindowMask),
716 const_iv (PointerMotionMask),
717 const_iv (PointerMotionHintMask),
718 const_iv (Button1MotionMask),
719 const_iv (Button2MotionMask),
720 const_iv (Button3MotionMask),
721 const_iv (Button4MotionMask),
722 const_iv (Button5MotionMask),
723 const_iv (ButtonMotionMask),
724 const_iv (KeymapStateMask),
725 const_iv (ExposureMask),
726 const_iv (VisibilityChangeMask),
727 const_iv (StructureNotifyMask),
728 const_iv (ResizeRedirectMask),
729 const_iv (SubstructureNotifyMask),
730 const_iv (SubstructureRedirectMask),
731 const_iv (FocusChangeMask),
732 const_iv (PropertyChangeMask),
733 const_iv (ColormapChangeMask),
734 const_iv (OwnerGrabButtonMask),
735
736 const_iv (KeyPress),
737 const_iv (KeyRelease),
738 const_iv (ButtonPress),
739 const_iv (ButtonRelease),
740 const_iv (MotionNotify),
741 const_iv (EnterNotify),
742 const_iv (LeaveNotify),
743 const_iv (FocusIn),
744 const_iv (FocusOut),
745 const_iv (KeymapNotify),
746 const_iv (Expose),
747 const_iv (GraphicsExpose),
748 const_iv (NoExpose),
749 const_iv (VisibilityNotify),
750 const_iv (CreateNotify),
751 const_iv (DestroyNotify),
752 const_iv (UnmapNotify),
753 const_iv (MapNotify),
754 const_iv (MapRequest),
755 const_iv (ReparentNotify),
756 const_iv (ConfigureNotify),
757 const_iv (ConfigureRequest),
758 const_iv (GravityNotify),
759 const_iv (ResizeRequest),
760 const_iv (CirculateNotify),
761 const_iv (CirculateRequest),
762 const_iv (PropertyNotify),
763 const_iv (SelectionClear),
764 const_iv (SelectionRequest),
765 const_iv (SelectionNotify),
766 const_iv (ColormapNotify),
767 const_iv (ClientMessage),
768 const_iv (MappingNotify),
769 };
770
771 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
772 civ-- > const_iv; )
773 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
774}
527 775
528void 776void
529warn (const char *msg) 777warn (const char *msg)
530 CODE: 778 CODE:
531 rxvt_warn ("%s", msg); 779 rxvt_warn ("%s", msg);
532 780
533void 781void
534fatal (const char *msg) 782fatal (const char *msg)
535 CODE: 783 CODE:
536 rxvt_fatal ("%s", msg); 784 rxvt_fatal ("%s", msg);
785
786SV *
787untaint (SV *sv)
788 CODE:
789 RETVAL = newSVsv (sv);
790 SvTAINTED_off (RETVAL);
791 OUTPUT:
792 RETVAL
793
794void
795_exit (int status)
796
797bool
798safe ()
799 CODE:
800 RETVAL = !rxvt_tainted ();
801 OUTPUT:
802 RETVAL
537 803
538NV 804NV
539NOW () 805NOW ()
540 CODE: 806 CODE:
541 RETVAL = NOW; 807 RETVAL = NOW;
589} 855}
590 OUTPUT: 856 OUTPUT:
591 RETVAL 857 RETVAL
592 858
593MODULE = urxvt PACKAGE = urxvt::term 859MODULE = urxvt PACKAGE = urxvt::term
860
861SV *
862_new (...)
863 CODE:
864{
865 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
866 croak ("first argument to urxvt::term->_new must be arrayref");
867
868 rxvt_term *term = new rxvt_term;
869
870 term->argv = new stringvec;
871 term->envv = new stringvec;
872
873 for (int i = 1; i < items; i++)
874 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
875
876 AV *envv = (AV *)SvRV (ST (0));
877 for (int i = av_len (envv) + 1; i--; )
878 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
879
880 term->envv->push_back (0);
881
882 bool success;
883
884 try
885 {
886 success = term->init (term->argv->size (), term->argv->begin ());
887 }
888 catch (const class rxvt_failure_exception &e)
889 {
890 success = false;
891 }
892
893 if (!success)
894 {
895 term->destroy ();
896 croak ("error while initializing new terminal instance");
897 }
898
899 RETVAL = term && term->perl.self
900 ? newSVterm (term) : &PL_sv_undef;
901}
902 OUTPUT:
903 RETVAL
904
905void
906rxvt_term::destroy ()
907
908#if ENABLE_PERL_FRILLS
909
910void
911rxvt_term::XListProperties (U32 window)
912 PPCODE:
913{
914 int count;
915 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
916
917 EXTEND (SP, count);
918 while (count--)
919 PUSHs (newSVuv ((U32)props [count]));
920
921 XFree (props);
922}
923
924void
925rxvt_term::XGetWindowProperty (U32 window, U32 property)
926 PPCODE:
927{
928 Atom type;
929 int format;
930 unsigned long nitems;
931 unsigned long bytes_after;
932 unsigned char *prop;
933 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
934 0, 1<<30, 0, AnyPropertyType,
935 &type, &format, &nitems, &bytes_after, &prop);
936 if (type != None)
937 {
938 EXTEND (SP, 3);
939 PUSHs (newSVuv ((U32)type));
940 PUSHs (newSViv (format));
941 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
942 XFree (prop);
943 }
944}
945
946void
947rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
948 CODE:
949{
950 STRLEN len;
951 char *data_ = SvPVbyte (data, len);
952
953 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
954 type, format, PropModeReplace,
955 (unsigned char *)data, len * 8 / format);
956}
957
958void
959rxvt_term::XDeleteProperty (U32 window, U32 property)
960 CODE:
961 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
962
963U32
964rxvt_term::DefaultRootWindow ()
965 CODE:
966 RETVAL = (U32)THIS->display->root;
967 OUTPUT:
968 RETVAL
969
970U32
971rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
972 CODE:
973 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
974 x, y, width, height, 0,
975 THIS->pix_colors_focused[Color_border],
976 THIS->pix_colors_focused[Color_border]);
977 OUTPUT:
978 RETVAL
979
980void
981rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
982 CODE:
983 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
984
985void
986rxvt_term::XMapWindow (U32 window)
987 CODE:
988 XMapWindow (THIS->display->display, (Window)window);
989
990void
991rxvt_term::XUnmapWindow (U32 window)
992 CODE:
993 XUnmapWindow (THIS->display->display, (Window)window);
994
995#endif
996
997void
998rxvt_term::set_should_invoke (int htype, int inc)
999 CODE:
1000 THIS->perl.should_invoke [htype] += inc;
1001
1002void
1003rxvt_term::grab_button (int button, U32 modifiers)
1004 CODE:
1005 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
1006 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1007 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1008
1009bool
1010rxvt_term::grab (U32 eventtime, int sync = 0)
1011 CODE:
1012{
1013 int mode = sync ? GrabModeSync : GrabModeAsync;
1014
1015 THIS->perl.grabtime = 0;
1016
1017 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
1018 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1019 mode, mode, None, GRAB_CURSOR, eventtime))
1020 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
1021 THIS->perl.grabtime = eventtime;
1022 else
1023 XUngrabPointer (THIS->display->display, eventtime);
1024
1025 RETVAL = !!THIS->perl.grabtime;
1026}
1027 OUTPUT:
1028 RETVAL
1029
1030void
1031rxvt_term::allow_events_async ()
1032 CODE:
1033 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
1034
1035void
1036rxvt_term::allow_events_sync ()
1037 CODE:
1038 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
1039
1040void
1041rxvt_term::allow_events_replay ()
1042 CODE:
1043 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
1044 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
1045
1046void
1047rxvt_term::ungrab ()
1048 CODE:
1049 ungrab (THIS);
594 1050
595int 1051int
596rxvt_term::strwidth (SV *str) 1052rxvt_term::strwidth (SV *str)
597 CODE: 1053 CODE:
598{ 1054{
617 char *mbstr = rxvt_wcstombs (wstr); 1073 char *mbstr = rxvt_wcstombs (wstr);
618 rxvt_pop_locale (); 1074 rxvt_pop_locale ();
619 1075
620 free (wstr); 1076 free (wstr);
621 1077
622 RETVAL = newSVpv (mbstr, 0); 1078 RETVAL = taint_if (newSVpv (mbstr, 0), str);
623 free (mbstr); 1079 free (mbstr);
624} 1080}
625 OUTPUT: 1081 OUTPUT:
626 RETVAL 1082 RETVAL
627 1083
634 1090
635 rxvt_push_locale (THIS->locale); 1091 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 1092 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 1093 rxvt_pop_locale ();
638 1094
639 char *str = rxvt_wcstoutf8 (wstr); 1095 RETVAL = taint_if (wcs2sv (wstr), octets);
640 free (wstr); 1096 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 1097}
646 OUTPUT: 1098 OUTPUT:
647 RETVAL 1099 RETVAL
648 1100
1101#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1102
1103#define TERM_OFFSET_width TERM_OFFSET(width)
1104#define TERM_OFFSET_height TERM_OFFSET(height)
1105#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1106#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1107#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1108#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1109#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1110#define TERM_OFFSET_focus TERM_OFFSET(focus)
1111#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1112#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1113#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1114#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1115
649int 1116int
1117rxvt_term::width ()
1118 ALIAS:
1119 width = TERM_OFFSET_width
1120 height = TERM_OFFSET_height
1121 fwidth = TERM_OFFSET_fwidth
1122 fheight = TERM_OFFSET_fheight
1123 fbase = TERM_OFFSET_fbase
1124 nrow = TERM_OFFSET_nrow
1125 ncol = TERM_OFFSET_ncol
1126 focus = TERM_OFFSET_focus
1127 mapped = TERM_OFFSET_mapped
1128 saveLines = TERM_OFFSET_saveLines
1129 total_rows = TERM_OFFSET_total_rows
1130 top_row = TERM_OFFSET_top_row
1131 CODE:
1132 RETVAL = *(int *)((char *)THIS + ix);
1133 OUTPUT:
1134 RETVAL
1135
1136unsigned int
1137rxvt_term::ModLevel3Mask ()
1138 ALIAS:
1139 ModLevel3Mask = 0
1140 ModMetaMask = 1
1141 ModNumLockMask = 2
1142 CODE:
1143 switch (ix)
1144 {
1145 case 0: RETVAL = THIS->ModLevel3Mask; break;
1146 case 1: RETVAL = THIS->ModMetaMask; break;
1147 case 2: RETVAL = THIS->ModNumLockMask; break;
1148 }
1149 OUTPUT:
1150 RETVAL
1151
1152char *
1153rxvt_term::display_id ()
1154 ALIAS:
1155 display_id = 0
1156 locale = 1
1157 CODE:
1158 switch (ix)
1159 {
1160 case 0: RETVAL = THIS->display->id; break;
1161 case 1: RETVAL = THIS->locale; break;
1162 }
1163 OUTPUT:
1164 RETVAL
1165
1166SV *
650rxvt_term::nsaved () 1167rxvt_term::_env ()
651 CODE: 1168 CODE:
652 RETVAL = THIS->nsaved; 1169{
1170 if (THIS->envv)
1171 {
1172 AV *av = newAV ();
1173
1174 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1175 if (*i)
1176 av_push (av, newSVpv (*i, 0));
1177
1178 RETVAL = newRV_noinc ((SV *)av);
1179 }
1180 else
1181 RETVAL = &PL_sv_undef;
1182}
653 OUTPUT: 1183 OUTPUT:
654 RETVAL 1184 RETVAL
655 1185
656int 1186int
1187rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1188 CODE:
1189 RETVAL = THIS->pty_ev.events;
1190 if (events != EVENT_UNDEF)
1191 THIS->pty_ev.set (events);
1192 OUTPUT:
1193 RETVAL
1194
1195U32
1196rxvt_term::parent ()
1197 CODE:
1198 RETVAL = (U32)THIS->parent [0];
1199 OUTPUT:
1200 RETVAL
1201
1202U32
1203rxvt_term::vt ()
1204 CODE:
1205 RETVAL = (U32)THIS->vt;
1206 OUTPUT:
1207 RETVAL
1208
1209void
1210rxvt_term::vt_emask_add (U32 emask)
1211 CODE:
1212 THIS->vt_emask_perl |= emask;
1213 THIS->vt_select_input ();
1214
1215U32
1216rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1217 CODE:
1218 RETVAL = THIS->rstyle;
1219 THIS->rstyle = new_rstyle;
1220 OUTPUT:
1221 RETVAL
1222
1223int
657rxvt_term::view_start (int newval = -1) 1224rxvt_term::view_start (int newval = 1)
1225 PROTOTYPE: $;$
658 CODE: 1226 CODE:
659{ 1227{
660 RETVAL = THIS->view_start; 1228 RETVAL = THIS->view_start;
661 1229
662 if (newval >= 0) 1230 if (newval <= 0)
663 { 1231 THIS->scr_changeview (max (newval, THIS->top_row));
664 THIS->view_start = min (newval, THIS->nsaved);
665 THIS->scr_changeview (RETVAL);
666 }
667} 1232}
668 OUTPUT: 1233 OUTPUT:
669 RETVAL 1234 RETVAL
670 1235
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 1236void
686rxvt_term::want_refresh () 1237rxvt_term::want_refresh ()
687 CODE: 1238 CODE:
688 THIS->want_refresh = 1; 1239 THIS->want_refresh = 1;
689 1240
690void 1241void
691rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1242rxvt_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: 1243 PPCODE:
693{ 1244{
694 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1245 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
695 XSRETURN_EMPTY; 1246 XSRETURN_EMPTY;
696 1247
697 line_t &l = ROW(row_number); 1248 line_t &l = ROW(row_number);
698 1249
699 if (GIMME_V != G_VOID) 1250 if (GIMME_V != G_VOID)
700 { 1251 {
701 wchar_t *wstr = new wchar_t [THIS->ncol]; 1252 wchar_t *wstr = new wchar_t [THIS->ncol];
702 1253
703 for (int col = 0; col <THIS->ncol; col++) 1254 for (int col = 0; col < THIS->ncol; col++)
704 wstr [col] = l.t [col]; 1255 wstr [col] = l.t [col];
705 1256
706 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1257 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
707 free (wstr);
708 1258
709 SV *sv = newSVpv (str, 0); 1259 delete [] wstr;
710 SvUTF8_on (sv);
711 XPUSHs (sv_2mortal (sv));
712 free (str);
713 } 1260 }
714 1261
715 if (new_text) 1262 if (new_text)
716 { 1263 {
717 wchar_t *wstr = sv2wcs (new_text); 1264 wchar_t *wstr = sv2wcs (new_text);
718 1265
719 int len = wcslen (wstr); 1266 int len = min (wcslen (wstr) - start_ofs, max_len);
720 1267
721 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
722 { 1269 {
723 free (wstr); 1270 free (wstr);
724 croak ("new_text extends beyond horizontal margins"); 1271 croak ("new_text extends beyond horizontal margins");
725 } 1272 }
726 1273
727 for (int col = start_col; col < start_col + len; col++) 1274 for (int col = start_col; col < start_col + len; col++)
728 { 1275 {
729 l.t [col] = wstr [col - start_col]; 1276 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])); 1277 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
731 } 1278 }
732 1279
733 free (wstr); 1280 free (wstr);
734 } 1281 }
735} 1282}
736 1283
737void 1284void
738rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1285rxvt_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: 1286 PPCODE:
740{ 1287{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1288 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
742 XSRETURN_EMPTY; 1289 XSRETURN_EMPTY;
743 1290
744 line_t &l = ROW(row_number); 1291 line_t &l = ROW(row_number);
745 1292
746 if (GIMME_V != G_VOID) 1293 if (GIMME_V != G_VOID)
758 { 1305 {
759 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1306 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
760 croak ("new_rend must be arrayref"); 1307 croak ("new_rend must be arrayref");
761 1308
762 AV *av = (AV *)SvRV (new_rend); 1309 AV *av = (AV *)SvRV (new_rend);
763 int len = av_len (av) + 1; 1310 int len = min (av_len (av) + 1 - start_ofs, max_len);
764 1311
765 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1312 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
766 croak ("new_rend array extends beyond horizontal margins"); 1313 croak ("new_rend array extends beyond horizontal margins");
767 1314
768 for (int col = start_col; col < start_col + len; col++) 1315 for (int col = start_col; col < start_col + len; col++)
769 { 1316 {
770 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1317 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
771 1318
772 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1319 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
773 } 1320 }
774 } 1321 }
775} 1322}
776 1323
777int 1324int
778rxvt_term::ROW_l (int row_number, int new_length = -2) 1325rxvt_term::ROW_l (int row_number, int new_length = -1)
779 CODE: 1326 CODE:
780{ 1327{
781 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1328 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
782 XSRETURN_EMPTY; 1329 XSRETURN_EMPTY;
783 1330
784 line_t &l = ROW(row_number); 1331 line_t &l = ROW(row_number);
785 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1332 RETVAL = l.l;
786 1333
787 if (new_length >= -1) 1334 if (new_length >= 0)
788 l.l = new_length; 1335 l.l = new_length;
789} 1336}
790 OUTPUT: 1337 OUTPUT:
791 RETVAL 1338 RETVAL
792 1339
793bool 1340bool
794rxvt_term::ROW_is_longer (int row_number) 1341rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
795 CODE: 1342 CODE:
796{ 1343{
797 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1344 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
798 XSRETURN_EMPTY; 1345 XSRETURN_EMPTY;
799 1346
800 line_t &l = ROW(row_number); 1347 line_t &l = ROW(row_number);
801 RETVAL = l.l < 0; 1348 RETVAL = l.is_longer ();
1349
1350 if (new_is_longer >= 0)
1351 l.is_longer (new_is_longer);
802} 1352}
803 OUTPUT: 1353 OUTPUT:
804 RETVAL 1354 RETVAL
805 1355
806SV * 1356SV *
807rxvt_term::special_encode (SV *str) 1357rxvt_term::special_encode (SV *string)
808 CODE: 1358 CODE:
809 abort ();//TODO 1359{
1360 wchar_t *wstr = sv2wcs (string);
1361 int wlen = wcslen (wstr);
1362 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1363
1364 rxvt_push_locale (THIS->locale);
1365
1366 wchar_t *r = rstr;
1367 for (wchar_t *s = wstr; *s; s++)
1368 if (wcwidth (*s) == 0)
1369 {
1370 if (r == rstr)
1371 croak ("leading combining character unencodable");
1372
1373 unicode_t n = rxvt_compose (r[-1], *s);
1374 if (n == NOCHAR)
1375 n = rxvt_composite.compose (r[-1], *s);
1376
1377 r[-1] = n;
1378 }
1379#if !UNICODE_3
1380 else if (*s >= 0x10000)
1381 *r++ = rxvt_composite.compose (*s);
1382#endif
1383 else
1384 *r++ = *s;
1385
1386 rxvt_pop_locale ();
1387
1388 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1389
1390 delete [] rstr;
1391}
1392 OUTPUT:
1393 RETVAL
810 1394
811SV * 1395SV *
812rxvt_term::special_decode (SV *str) 1396rxvt_term::special_decode (SV *text)
813 CODE: 1397 CODE:
814 abort ();//TODO 1398{
1399 wchar_t *wstr = sv2wcs (text);
1400 int wlen = wcslen (wstr);
1401 int dlen = 0;
1402
1403 // find length
1404 for (wchar_t *s = wstr; *s; s++)
1405 if (*s == NOCHAR)
1406 ;
1407 else if (IS_COMPOSE (*s))
1408 dlen += rxvt_composite.expand (*s, 0);
1409 else
1410 dlen++;
1411
1412 wchar_t *rstr = new wchar_t [dlen];
1413
1414 // decode
1415 wchar_t *r = rstr;
1416 for (wchar_t *s = wstr; *s; s++)
1417 if (*s == NOCHAR)
1418 ;
1419 else if (IS_COMPOSE (*s))
1420 r += rxvt_composite.expand (*s, r);
1421 else
1422 *r++ = *s;
1423
1424 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1425
1426 delete [] rstr;
1427}
1428 OUTPUT:
1429 RETVAL
815 1430
816void 1431void
817rxvt_term::_resource (char *name, int index, SV *newval = 0) 1432rxvt_term::_resource (char *name, int index, SV *newval = 0)
818 PPCODE: 1433 PPCODE:
819{ 1434{
836 1451
837 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1452 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
838 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1453 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
839 1454
840 if (GIMME_V != G_VOID) 1455 if (GIMME_V != G_VOID)
841 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1456 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
842 1457
843 if (newval) 1458 if (newval)
844 { 1459 {
845 if (SvOK (newval)) 1460 if (SvOK (newval))
846 { 1461 {
851 else 1466 else
852 THIS->rs [index] = 0; 1467 THIS->rs [index] = 0;
853 } 1468 }
854} 1469}
855 1470
1471const char *
1472rxvt_term::x_resource (const char *name)
1473 CLEANUP:
1474 SvTAINTED_on (ST (0));
1475
1476bool
1477rxvt_term::option (U32 optval, int set = -1)
1478 CODE:
1479{
1480 RETVAL = THIS->options & optval;
1481
1482 if (set >= 0)
1483 {
1484 if (set)
1485 THIS->options |= optval;
1486 else
1487 THIS->options &= ~optval;
1488
1489 switch (optval)
1490 {
1491 case Opt_skipBuiltinGlyphs:
1492 THIS->set_fonts ();
1493 THIS->scr_remap_chars ();
1494 THIS->scr_touch (true);
1495 THIS->want_refresh = 1;
1496 break;
1497
1498 case Opt_cursorUnderline:
1499 THIS->want_refresh = 1;
1500 break;
1501
1502# case Opt_scrollBar_floating:
1503# case Opt_scrollBar_right:
1504# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1505# break;
1506 }
1507 }
1508}
1509 OUTPUT:
1510 RETVAL
1511
1512bool
1513rxvt_term::parse_keysym (char *keysym, char *str)
1514 CODE:
1515 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1516 THIS->keyboard->register_done ();
1517 OUTPUT:
1518 RETVAL
1519
856void 1520void
857rxvt_term::selection_mark (...) 1521rxvt_term::screen_cur (...)
858 PROTOTYPE: $;$$ 1522 PROTOTYPE: $;$$
859 ALIAS: 1523 ALIAS:
1524 screen_cur = 0
860 selection_beg = 1 1525 selection_beg = 1
861 selection_end = 2 1526 selection_end = 2
1527 selection_mark = 3
862 PPCODE: 1528 PPCODE:
863{ 1529{
864 row_col_t &sel = ix == 1 ? THIS->selection.beg 1530 row_col_t &rc = ix == 0 ? THIS->screen.cur
1531 : ix == 1 ? THIS->selection.beg
865 : ix == 2 ? THIS->selection.end 1532 : ix == 2 ? THIS->selection.end
866 : THIS->selection.mark; 1533 : THIS->selection.mark;
867 1534
868 if (GIMME_V != G_VOID) 1535 if (GIMME_V != G_VOID)
869 { 1536 {
870 EXTEND (SP, 2); 1537 EXTEND (SP, 2);
871 PUSHs (sv_2mortal (newSViv (sel.row))); 1538 PUSHs (sv_2mortal (newSViv (rc.row)));
872 PUSHs (sv_2mortal (newSViv (sel.col))); 1539 PUSHs (sv_2mortal (newSViv (rc.col)));
873 } 1540 }
874 1541
875 if (items == 3) 1542 if (items == 3)
876 { 1543 {
877 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1544 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
878 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1545 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
879 1546
880 if (ix) 1547 if (ix)
881 THIS->want_refresh = 1; 1548 THIS->want_refresh = 1;
882 } 1549 }
883} 1550}
884 1551
1552char
1553rxvt_term::cur_charset ()
1554 CODE:
1555 RETVAL = THIS->charsets [THIS->screen.charset];
1556 OUTPUT:
1557 RETVAL
1558
1559#void
1560#rxvt_term::selection_clear ()
1561
1562void
1563rxvt_term::selection_make (U32 eventtime, bool rect = false)
1564 CODE:
1565 THIS->selection.op = SELECTION_CONT;
1566 THIS->selection.rect = rect;
1567 THIS->selection_make (eventtime);
1568
885int 1569int
886rxvt_term::selection_grab (int eventtime = CurrentTime) 1570rxvt_term::selection_grab (U32 eventtime)
887 1571
888void 1572void
889rxvt_term::selection (SV *newtext = 0) 1573rxvt_term::selection (SV *newtext = 0)
890 PPCODE: 1574 PPCODE:
891{ 1575{
892 if (GIMME_V != G_VOID) 1576 if (GIMME_V != G_VOID)
893 { 1577 XPUSHs (THIS->selection.text
894 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1578 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
895 SV *sv = newSVpv (sel, 0); 1579 : &PL_sv_undef);
896 SvUTF8_on (sv);
897 free (sel);
898 XPUSHs (sv_2mortal (sv));
899 }
900 1580
901 if (newtext) 1581 if (newtext)
902 { 1582 {
903 free (THIS->selection.text); 1583 free (THIS->selection.text);
904 1584
905 THIS->selection.text = sv2wcs (newtext); 1585 THIS->selection.text = sv2wcs (newtext);
906 THIS->selection.len = wcslen (THIS->selection.text); 1586 THIS->selection.len = wcslen (THIS->selection.text);
907 } 1587 }
908} 1588}
909 1589
1590void
1591rxvt_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)
1592
1593void
1594rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1595
1596void
1597rxvt_term::scr_bell ()
1598
1599void
1600rxvt_term::scr_add_lines (SV *string)
1601 CODE:
1602{
1603 wchar_t *wstr = sv2wcs (string);
1604 THIS->scr_add_lines (wstr, wcslen (wstr));
1605 free (wstr);
1606}
1607
910void 1608void
911rxvt_term::tt_write (SV *octets) 1609rxvt_term::tt_write (SV *octets)
912 INIT: 1610 INIT:
913 STRLEN len; 1611 STRLEN len;
914 char *str = SvPVbyte (octets, len); 1612 char *str = SvPVbyte (octets, len);
915 C_ARGS: 1613 C_ARGS:
916 str, len 1614 str, len
917 1615
1616void
1617rxvt_term::cmd_parse (SV *octets)
1618 CODE:
1619{
1620 STRLEN len;
1621 char *str = SvPVbyte (octets, len);
1622
1623 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1624 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1625
1626 THIS->cmdbuf_ptr = str;
1627 THIS->cmdbuf_endp = str + len;
1628
1629 rxvt_push_locale (THIS->locale);
1630 THIS->cmd_parse ();
1631 rxvt_pop_locale ();
1632
1633 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1634 THIS->cmdbuf_endp = old_cmdbuf_endp;
1635}
1636
918SV * 1637SV *
919rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1638rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
920 CODE: 1639 CODE:
921{ 1640{
922 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1641 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines