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.20 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.61 by root, Thu Jan 12 10:02:20 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 set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0)) 646 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
507# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name)); 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
508 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 651 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
509 set_hookname (INIT); 652# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
510 set_hookname (RESET); 653# include "hookinc.h"
511 set_hookname (START); 654# undef def
512 set_hookname (DESTROY);
513 set_hookname (SEL_BEGIN);
514 set_hookname (SEL_EXTEND);
515 set_hookname (SEL_MAKE);
516 set_hookname (SEL_GRAB);
517 set_hookname (FOCUS_IN);
518 set_hookname (FOCUS_OUT);
519 set_hookname (VIEW_CHANGE);
520 set_hookname (SCROLL_BACK);
521 set_hookname (TTY_ACTIVITY);
522 set_hookname (OSC_SEQ);
523 set_hookname (REFRESH_BEGIN);
524 set_hookname (REFRESH_END);
525 set_hookname (KEYBOARD_COMMAND);
526 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));
527 export_const (DEFAULT_RSTYLE); 665 export_const_iv (DEFAULT_RSTYLE);
528 export_const (OVERLAY_RSTYLE); 666 export_const_iv (OVERLAY_RSTYLE);
529 export_const (RS_Bold); 667 export_const_iv (RS_Bold);
530 export_const (RS_Italic); 668 export_const_iv (RS_Italic);
531 export_const (RS_Blink); 669 export_const_iv (RS_Blink);
532 export_const (RS_RVid); 670 export_const_iv (RS_RVid);
533 export_const (RS_Uline); 671 export_const_iv (RS_Uline);
534 672
535 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);
536} 692}
537 693
538void 694void
539set_should_invoke (int htype, int value) 695set_should_invoke (int htype, int value)
540 CODE: 696 CODE:
… …
547 703
548void 704void
549fatal (const char *msg) 705fatal (const char *msg)
550 CODE: 706 CODE:
551 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
552 726
553NV 727NV
554NOW () 728NOW ()
555 CODE: 729 CODE:
556 RETVAL = NOW; 730 RETVAL = NOW;
… …
604} 778}
605 OUTPUT: 779 OUTPUT:
606 RETVAL 780 RETVAL
607 781
608MODULE = 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);
609 879
610int 880int
611rxvt_term::strwidth (SV *str) 881rxvt_term::strwidth (SV *str)
612 CODE: 882 CODE:
613{ 883{
… …
632 char *mbstr = rxvt_wcstombs (wstr); 902 char *mbstr = rxvt_wcstombs (wstr);
633 rxvt_pop_locale (); 903 rxvt_pop_locale ();
634 904
635 free (wstr); 905 free (wstr);
636 906
637 RETVAL = newSVpv (mbstr, 0); 907 RETVAL = taint_if (newSVpv (mbstr, 0), str);
638 free (mbstr); 908 free (mbstr);
639} 909}
640 OUTPUT: 910 OUTPUT:
641 RETVAL 911 RETVAL
642 912
… …
649 919
650 rxvt_push_locale (THIS->locale); 920 rxvt_push_locale (THIS->locale);
651 wchar_t *wstr = rxvt_mbstowcs (data, len); 921 wchar_t *wstr = rxvt_mbstowcs (data, len);
652 rxvt_pop_locale (); 922 rxvt_pop_locale ();
653 923
654 char *str = rxvt_wcstoutf8 (wstr); 924 RETVAL = taint_if (wcs2sv (wstr), octets);
655 free (wstr); 925 free (wstr);
656
657 RETVAL = newSVpv (str, 0);
658 SvUTF8_on (RETVAL);
659 free (str);
660} 926}
661 OUTPUT: 927 OUTPUT:
662 RETVAL 928 RETVAL
663 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)
944
664int 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 *
665rxvt_term::nsaved () 996rxvt_term::_env ()
666 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{
667 RETVAL = THIS->nsaved; 1042 RETVAL = THIS->rstyle;
1043 THIS->rstyle = new_rstyle;
1044}
668 OUTPUT: 1045 OUTPUT:
669 RETVAL 1046 RETVAL
670 1047
671int 1048int
672rxvt_term::view_start (int newval = -1) 1049rxvt_term::view_start (int newval = -1)
1050 PROTOTYPE: $;$
673 CODE: 1051 CODE:
674{ 1052{
675 RETVAL = THIS->view_start; 1053 RETVAL = THIS->view_start;
676 1054
677 if (newval >= 0) 1055 if (newval >= 0)
… …
681 } 1059 }
682} 1060}
683 OUTPUT: 1061 OUTPUT:
684 RETVAL 1062 RETVAL
685 1063
686int
687rxvt_term::nrow ()
688 CODE:
689 RETVAL = THIS->nrow;
690 OUTPUT:
691 RETVAL
692
693int
694rxvt_term::ncol ()
695 CODE:
696 RETVAL = THIS->ncol;
697 OUTPUT:
698 RETVAL
699
700void 1064void
701rxvt_term::want_refresh () 1065rxvt_term::want_refresh ()
702 CODE: 1066 CODE:
703 THIS->want_refresh = 1; 1067 THIS->want_refresh = 1;
704 1068
705void 1069void
706rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1070rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
707 PPCODE: 1071 PPCODE:
708{ 1072{
709 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1073 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
710 XSRETURN_EMPTY; 1074 XSRETURN_EMPTY;
711 1075
… …
713 1077
714 if (GIMME_V != G_VOID) 1078 if (GIMME_V != G_VOID)
715 { 1079 {
716 wchar_t *wstr = new wchar_t [THIS->ncol]; 1080 wchar_t *wstr = new wchar_t [THIS->ncol];
717 1081
718 for (int col = 0; col <THIS->ncol; col++) 1082 for (int col = 0; col < THIS->ncol; col++)
719 wstr [col] = l.t [col]; 1083 wstr [col] = l.t [col];
720 1084
721 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1085 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
722 free (wstr);
723 1086
724 SV *sv = newSVpv (str, 0); 1087 delete [] wstr;
725 SvUTF8_on (sv);
726 XPUSHs (sv_2mortal (sv));
727 free (str);
728 } 1088 }
729 1089
730 if (new_text) 1090 if (new_text)
731 { 1091 {
732 wchar_t *wstr = sv2wcs (new_text); 1092 wchar_t *wstr = sv2wcs (new_text);
733 1093
734 int len = wcslen (wstr); 1094 int len = min (wcslen (wstr) - start_ofs, max_len);
735 1095
736 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1096 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
737 { 1097 {
738 free (wstr); 1098 free (wstr);
739 croak ("new_text extends beyond horizontal margins"); 1099 croak ("new_text extends beyond horizontal margins");
740 } 1100 }
741 1101
742 for (int col = start_col; col < start_col + len; col++) 1102 for (int col = start_col; col < start_col + len; col++)
743 { 1103 {
744 l.t [col] = wstr [col - start_col]; 1104 l.t [col] = wstr [start_ofs + col - start_col];
745 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 1105 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
746 } 1106 }
747 1107
748 free (wstr); 1108 free (wstr);
749 } 1109 }
750} 1110}
751 1111
752void 1112void
753rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1113rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
754 PPCODE: 1114 PPCODE:
755{ 1115{
756 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1116 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
757 XSRETURN_EMPTY; 1117 XSRETURN_EMPTY;
758 1118
… …
773 { 1133 {
774 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1134 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
775 croak ("new_rend must be arrayref"); 1135 croak ("new_rend must be arrayref");
776 1136
777 AV *av = (AV *)SvRV (new_rend); 1137 AV *av = (AV *)SvRV (new_rend);
778 int len = av_len (av) + 1; 1138 int len = min (av_len (av) + 1 - start_ofs, max_len);
779 1139
780 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1140 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
781 croak ("new_rend array extends beyond horizontal margins"); 1141 croak ("new_rend array extends beyond horizontal margins");
782 1142
783 for (int col = start_col; col < start_col + len; col++) 1143 for (int col = start_col; col < start_col + len; col++)
784 { 1144 {
785 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1145 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
786 1146
787 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1147 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
788 } 1148 }
789 } 1149 }
790} 1150}
791 1151
792int 1152int
793rxvt_term::ROW_l (int row_number, int new_length = -2) 1153rxvt_term::ROW_l (int row_number, int new_length = -1)
794 CODE: 1154 CODE:
795{ 1155{
796 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1156 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
797 XSRETURN_EMPTY; 1157 XSRETURN_EMPTY;
798 1158
799 line_t &l = ROW(row_number); 1159 line_t &l = ROW(row_number);
800 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1160 RETVAL = l.l;
801 1161
802 if (new_length >= -1) 1162 if (new_length >= 0)
803 l.l = new_length; 1163 l.l = new_length;
804} 1164}
805 OUTPUT: 1165 OUTPUT:
806 RETVAL 1166 RETVAL
807 1167
808bool 1168bool
809rxvt_term::ROW_is_longer (int row_number) 1169rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
810 CODE: 1170 CODE:
811{ 1171{
812 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1172 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
813 XSRETURN_EMPTY; 1173 XSRETURN_EMPTY;
814 1174
815 line_t &l = ROW(row_number); 1175 line_t &l = ROW(row_number);
816 RETVAL = l.l < 0; 1176 RETVAL = l.is_longer ();
1177
1178 if (new_is_longer >= 0)
1179 l.is_longer (new_is_longer);
817} 1180}
818 OUTPUT: 1181 OUTPUT:
819 RETVAL 1182 RETVAL
820 1183
821SV * 1184SV *
822rxvt_term::special_encode (SV *str) 1185rxvt_term::special_encode (SV *string)
823 CODE: 1186 CODE:
824 abort ();//TODO 1187{
1188 wchar_t *wstr = sv2wcs (string);
1189 int wlen = wcslen (wstr);
1190 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1191
1192 rxvt_push_locale (THIS->locale);
1193
1194 wchar_t *r = rstr;
1195 for (wchar_t *s = wstr; *s; s++)
1196 if (wcwidth (*s) == 0)
1197 {
1198 if (r == rstr)
1199 croak ("leading combining character unencodable");
1200
1201 unicode_t n = rxvt_compose (r[-1], *s);
1202 if (n == NOCHAR)
1203 n = rxvt_composite.compose (r[-1], *s);
1204
1205 r[-1] = n;
1206 }
1207#if !UNICODE_3
1208 else if (*s >= 0x10000)
1209 *r++ = rxvt_composite.compose (*s);
1210#endif
1211 else
1212 *r++ = *s;
1213
1214 rxvt_pop_locale ();
1215
1216 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1217
1218 delete [] rstr;
1219}
1220 OUTPUT:
1221 RETVAL
825 1222
826SV * 1223SV *
827rxvt_term::special_decode (SV *str) 1224rxvt_term::special_decode (SV *text)
828 CODE: 1225 CODE:
829 abort ();//TODO 1226{
1227 wchar_t *wstr = sv2wcs (text);
1228 int wlen = wcslen (wstr);
1229 int dlen = 0;
1230
1231 // find length
1232 for (wchar_t *s = wstr; *s; s++)
1233 if (*s == NOCHAR)
1234 ;
1235 else if (IS_COMPOSE (*s))
1236 dlen += rxvt_composite.expand (*s, 0);
1237 else
1238 dlen++;
1239
1240 wchar_t *rstr = new wchar_t [dlen];
1241
1242 // decode
1243 wchar_t *r = rstr;
1244 for (wchar_t *s = wstr; *s; s++)
1245 if (*s == NOCHAR)
1246 ;
1247 else if (IS_COMPOSE (*s))
1248 r += rxvt_composite.expand (*s, r);
1249 else
1250 *r++ = *s;
1251
1252 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1253
1254 delete [] rstr;
1255}
1256 OUTPUT:
1257 RETVAL
830 1258
831void 1259void
832rxvt_term::_resource (char *name, int index, SV *newval = 0) 1260rxvt_term::_resource (char *name, int index, SV *newval = 0)
833 PPCODE: 1261 PPCODE:
834{ 1262{
835 struct resval { const char *name; int value; } rslist [] = { 1263 struct resval { const char *name; int value; } rslist [] = {
836# define Rs_def(name) { # name, Rs_ ## name }, 1264# define def(name) { # name, Rs_ ## name },
837# define Rs_reserve(name,count) 1265# define reserve(name,count)
838# include "rsinc.h" 1266# include "rsinc.h"
839# undef Rs_def 1267# undef def
840# undef Rs_reserve 1268# undef reserve
841 }; 1269 };
842 1270
843 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1271 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
844 1272
845 do { 1273 do {
… …
851 1279
852 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1280 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
853 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1281 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
854 1282
855 if (GIMME_V != G_VOID) 1283 if (GIMME_V != G_VOID)
856 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1284 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
857 1285
858 if (newval) 1286 if (newval)
859 { 1287 {
860 if (SvOK (newval)) 1288 if (SvOK (newval))
861 { 1289 {
… …
866 else 1294 else
867 THIS->rs [index] = 0; 1295 THIS->rs [index] = 0;
868 } 1296 }
869} 1297}
870 1298
1299const char *
1300rxvt_term::x_resource (const char *name)
1301 CLEANUP:
1302 SvTAINTED_on (ST (0));
1303
1304bool
1305rxvt_term::option (U32 optval, int set = -1)
1306 CODE:
1307{
1308 RETVAL = THIS->options & optval;
1309
1310 if (set >= 0)
1311 {
1312 if (set)
1313 THIS->options |= optval;
1314 else
1315 THIS->options &= ~optval;
1316
1317 switch (optval)
1318 {
1319 case Opt_skipBuiltinGlyphs:
1320 THIS->set_fonts ();
1321 THIS->scr_remap_chars ();
1322 THIS->scr_touch (true);
1323 THIS->want_refresh = 1;
1324 break;
1325
1326 case Opt_cursorUnderline:
1327 THIS->want_refresh = 1;
1328 break;
1329
1330# case Opt_scrollBar_floating:
1331# case Opt_scrollBar_right:
1332# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1333# break;
1334 }
1335 }
1336}
1337 OUTPUT:
1338 RETVAL
1339
1340bool
1341rxvt_term::parse_keysym (char *keysym, char *str)
1342 CODE:
1343 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1344 THIS->keyboard->register_done ();
1345 OUTPUT:
1346 RETVAL
1347
871void 1348void
872rxvt_term::selection_mark (...) 1349rxvt_term::screen_cur (...)
873 PROTOTYPE: $;$$ 1350 PROTOTYPE: $;$$
874 ALIAS: 1351 ALIAS:
1352 screen_cur = 0
875 selection_beg = 1 1353 selection_beg = 1
876 selection_end = 2 1354 selection_end = 2
1355 selection_mark = 3
877 PPCODE: 1356 PPCODE:
878{ 1357{
879 row_col_t &sel = ix == 1 ? THIS->selection.beg 1358 row_col_t &rc = ix == 0 ? THIS->screen.cur
1359 : ix == 1 ? THIS->selection.beg
880 : ix == 2 ? THIS->selection.end 1360 : ix == 2 ? THIS->selection.end
881 : THIS->selection.mark; 1361 : THIS->selection.mark;
882 1362
883 if (GIMME_V != G_VOID) 1363 if (GIMME_V != G_VOID)
884 { 1364 {
885 EXTEND (SP, 2); 1365 EXTEND (SP, 2);
886 PUSHs (sv_2mortal (newSViv (sel.row))); 1366 PUSHs (sv_2mortal (newSViv (rc.row)));
887 PUSHs (sv_2mortal (newSViv (sel.col))); 1367 PUSHs (sv_2mortal (newSViv (rc.col)));
888 } 1368 }
889 1369
890 if (items == 3) 1370 if (items == 3)
891 { 1371 {
892 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1372 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
893 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1373 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
894 1374
895 if (ix) 1375 if (ix)
896 THIS->want_refresh = 1; 1376 THIS->want_refresh = 1;
897 } 1377 }
898} 1378}
899 1379
1380char
1381rxvt_term::cur_charset ()
1382 CODE:
1383 RETVAL = THIS->charsets [THIS->screen.charset];
1384 OUTPUT:
1385 RETVAL
1386
1387#void
1388#rxvt_term::selection_clear ()
1389
1390void
1391rxvt_term::selection_make (U32 eventtime, bool rect = false)
1392 CODE:
1393 THIS->selection.op = SELECTION_CONT;
1394 THIS->selection.rect = rect;
1395 THIS->selection_make (eventtime);
1396
900int 1397int
901rxvt_term::selection_grab (int eventtime = CurrentTime) 1398rxvt_term::selection_grab (U32 eventtime)
902 1399
903void 1400void
904rxvt_term::selection (SV *newtext = 0) 1401rxvt_term::selection (SV *newtext = 0)
905 PPCODE: 1402 PPCODE:
906{ 1403{
907 if (GIMME_V != G_VOID) 1404 if (GIMME_V != G_VOID)
908 { 1405 XPUSHs (THIS->selection.text
909 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1406 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
910 SV *sv = newSVpv (sel, 0); 1407 : &PL_sv_undef);
911 SvUTF8_on (sv);
912 free (sel);
913 XPUSHs (sv_2mortal (sv));
914 }
915 1408
916 if (newtext) 1409 if (newtext)
917 { 1410 {
918 free (THIS->selection.text); 1411 free (THIS->selection.text);
919 1412
920 THIS->selection.text = sv2wcs (newtext); 1413 THIS->selection.text = sv2wcs (newtext);
921 THIS->selection.len = wcslen (THIS->selection.text); 1414 THIS->selection.len = wcslen (THIS->selection.text);
922 } 1415 }
923} 1416}
924 1417
1418void
1419rxvt_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)
1420
1421void
1422rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1423
1424void
1425rxvt_term::scr_bell ()
1426
1427void
1428rxvt_term::scr_add_lines (SV *string)
1429 CODE:
1430{
1431 wchar_t *wstr = sv2wcs (string);
1432 THIS->scr_add_lines (wstr, wcslen (wstr));
1433 free (wstr);
1434}
1435
925void 1436void
926rxvt_term::tt_write (SV *octets) 1437rxvt_term::tt_write (SV *octets)
927 INIT: 1438 INIT:
928 STRLEN len; 1439 STRLEN len;
929 char *str = SvPVbyte (octets, len); 1440 char *str = SvPVbyte (octets, len);
930 C_ARGS: 1441 C_ARGS:
931 (unsigned char *)str, len 1442 str, len
1443
1444void
1445rxvt_term::cmd_parse (SV *octets)
1446 CODE:
1447{
1448 STRLEN len;
1449 char *str = SvPVbyte (octets, len);
1450
1451 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1452 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1453
1454 THIS->cmdbuf_ptr = str;
1455 THIS->cmdbuf_endp = str + len;
1456
1457 rxvt_push_locale (THIS->locale);
1458 THIS->cmd_parse ();
1459 rxvt_pop_locale ();
1460
1461 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1462 THIS->cmdbuf_endp = old_cmdbuf_endp;
1463}
932 1464
933SV * 1465SV *
934rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1466rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
935 CODE: 1467 CODE:
936{ 1468{

Diff Legend

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