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.44 by root, Sun Jan 8 22:58:13 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
33#include "rxvt.h" 34#include "rxvt.h"
34#include "iom.h" 35#include "iom.h"
35#include "rxvtutil.h" 36#include "rxvtutil.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include "perlxsi.c" 39#include "perlxsi.c"
39 40
41#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
42# define GRAB_CURSOR THIS->leftptr_cursor
43#else
44# define GRAB_CURSOR None
45#endif
46
40#undef LINENO 47#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 49#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
44 51
45///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
46 53
54static SV *
55taint (SV *sv)
56{
57 SvTAINT (sv);
58 return sv;
59}
60
61static SV *
62taint_if (SV *sv, SV *src)
63{
64 if (SvTAINTED (src))
65 SvTAINT (sv);
66
67 return sv;
68}
69
47static wchar_t * 70static wchar_t *
48sv2wcs (SV *sv) 71sv2wcs (SV *sv)
49{ 72{
50 STRLEN len; 73 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 74 char *str = SvPVutf8 (sv, len);
52 return rxvt_utf8towcs (str, len); 75 return rxvt_utf8towcs (str, len);
53} 76}
54 77
55static SV * 78static SV *
79wcs2sv (wchar_t *wstr, int len = -1)
80{
81 char *str = rxvt_wcstoutf8 (wstr, len);
82
83 SV *sv = newSVpv (str, 0);
84 SvUTF8_on (sv);
85 free (str);
86
87 return sv;
88}
89
90static SV *
56new_ref (HV *hv, const char *klass) 91new_ref (HV *hv, const char *klass)
57{ 92{
58 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 93 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59} 94}
60 95
… …
89 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 124 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
90 125
91 return (long)mg->mg_ptr; 126 return (long)mg->mg_ptr;
92} 127}
93 128
94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 129#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 130#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
96 131
97///////////////////////////////////////////////////////////////////////////// 132/////////////////////////////////////////////////////////////////////////////
98 133
99struct perl_watcher 134struct perl_watcher
… …
215 h += 2; 250 h += 2;
216 } 251 }
217 252
218 text = new text_t *[h]; 253 text = new text_t *[h];
219 rend = new rend_t *[h]; 254 rend = new rend_t *[h];
220 255
221 for (int y = 0; y < h; y++) 256 for (int y = 0; y < h; y++)
222 { 257 {
223 text_t *tp = text[y] = new text_t[w]; 258 text_t *tp = text[y] = new text_t[w];
224 rend_t *rp = rend[y] = new rend_t[w]; 259 rend_t *rp = rend[y] = new rend_t[w];
225 260
226 text_t t0, t1, t2; 261 text_t t0, t1, t2;
227 rend_t r = rstyle; 262 rend_t r = rstyle;
228 263
229 if (border == 2) 264 if (border == 2)
230 { 265 {
231 if (y == 0) 266 if (y == 0)
232 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 267 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
233 else if (y < h - 1) 268 else if (y < h - 1)
234 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 269 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
235 else 270 else
236 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; 271 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
237 272
238 *tp++ = t0; 273 *tp++ = t0;
239 *rp++ = r; 274 *rp++ = r;
240 275
241 for (int x = w - 2; x-- > 0; ) 276 for (int x = w - 2; x-- > 0; )
242 { 277 {
243 *tp++ = t1; 278 *tp++ = t1;
244 *rp++ = r; 279 *rp++ = r;
245 } 280 }
246 281
247 *tp = t2; 282 *tp = t2;
248 *rp = r; 283 *rp = r;
249 } 284 }
250 else 285 else
251 for (int x = w; x-- > 0; ) 286 for (int x = w; x-- > 0; )
252 { 287 {
253 *tp++ = 0x0020; 288 *tp++ = 0x0020;
254 *rp++ = r; 289 *rp++ = r;
255 } 290 }
256 } 291 }
257 292
258 show (); 293 show ();
259 THIS->want_refresh = 1; 294 THIS->want_refresh = 1;
260} 295}
261 296
… …
278void 313void
279overlay::show () 314overlay::show ()
280{ 315{
281 char key[33]; sprintf (key, "%32lx", (long)this); 316 char key[33]; sprintf (key, "%32lx", (long)this);
282 317
283 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 318 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); 319 hv_store (hv, key, 32, newSViv ((long)this), 0);
285} 320}
286 321
287void 322void
288overlay::hide () 323overlay::hide ()
289{ 324{
290 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 325 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
291 326
292 if (ovs) 327 if (ovs)
293 { 328 {
294 char key[33]; sprintf (key, "%32lx", (long)this); 329 char key[33]; sprintf (key, "%32lx", (long)this);
295 330
… …
308 343
309 for (int y = ov_h; y--; ) 344 for (int y = ov_h; y--; )
310 { 345 {
311 text_t *t1 = text [y]; 346 text_t *t1 = text [y];
312 rend_t *r1 = rend [y]; 347 rend_t *r1 = rend [y];
313 348
314 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 349 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; 350 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
316 351
317 for (int x = ov_w; x--; ) 352 for (int x = ov_w; x--; )
318 { 353 {
319 text_t t = *t1; *t1++ = *t2; *t2++ = t; 354 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)); 355 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
321 } 356 }
322 } 357 }
323 358
… …
333 368
334 wchar_t *wtext = sv2wcs (text); 369 wchar_t *wtext = sv2wcs (text);
335 370
336 for (int col = min (wcslen (wtext), w - x - border); col--; ) 371 for (int col = min (wcslen (wtext), w - x - border); col--; )
337 this->text [y][x + col] = wtext [col]; 372 this->text [y][x + col] = wtext [col];
338 373
339 free (wtext); 374 free (wtext);
340 375
341 if (rend) 376 if (rend)
342 { 377 {
343 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 378 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
… …
377{ 412{
378 if (!perl) 413 if (!perl)
379 { 414 {
380 char *argv[] = { 415 char *argv[] = {
381 "", 416 "",
417 "-T",
382 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
383 }; 419 };
384 420
385 perl = perl_alloc (); 421 perl = perl_alloc ();
386 perl_construct (perl); 422 perl_construct (perl);
387 423
388 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
389 || perl_run (perl)) 425 || perl_run (perl))
390 { 426 {
391 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
392 428
393 perl_destruct (perl); 429 perl_destruct (perl);
… …
400bool 436bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 437rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
402{ 438{
403 if (!perl) 439 if (!perl)
404 return false; 440 return false;
405 441
406 if (htype == HOOK_INIT) // first hook ever called 442 if (htype == HOOK_INIT) // first hook ever called
407 { 443 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 444 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 445 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410 } 446 }
411 else if (!term->self) 447 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 448 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 449 else if (htype == HOOK_DESTROY)
414 { 450 {
415 // handled later 451 // handled later
416 } 452 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 453 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
418 { 454 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 455 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
420 456
421 if (HvKEYS (hv)) 457 if (HvKEYS (hv))
422 { 458 {
423 hv_iterinit (hv); 459 hv_iterinit (hv);
424 460
… …
453 489
454 case DT_LONG: 490 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 491 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break; 492 break;
457 493
458 case DT_STRING: 494 case DT_STR:
459 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 495 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
496 break;
497
498 case DT_STR_LEN:
499 {
500 char *str = va_arg (ap, char *);
501 int len = va_arg (ap, int);
502
503 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
504 }
505 break;
506
507 case DT_WCS_LEN:
508 {
509 wchar_t *wstr = va_arg (ap, wchar_t *);
510 int wlen = va_arg (ap, int);
511
512 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
513 }
514 break;
515
516 case DT_XEVENT:
517 {
518 XEvent *xe = va_arg (ap, XEvent *);
519 HV *hv = newHV ();
520
521# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
522# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
523# undef set
524
525 setiv (type, xe->type);
526 setiv (send_event, xe->xany.send_event);
527 setiv (serial, xe->xany.serial);
528
529 switch (xe->type)
530 {
531 case KeyPress:
532 case KeyRelease:
533 case ButtonPress:
534 case ButtonRelease:
535 case MotionNotify:
536 setiv (time, xe->xmotion.time);
537 setiv (x, xe->xmotion.x);
538 setiv (y, xe->xmotion.y);
539 setiv (row, xe->xmotion.y / term->fheight);
540 setiv (col, xe->xmotion.x / term->fwidth);
541 setiv (x_root, xe->xmotion.x_root);
542 setiv (y_root, xe->xmotion.y_root);
543 setiv (state, xe->xmotion.state);
544 break;
545 }
546
547 switch (xe->type)
548 {
549 case KeyPress:
550 case KeyRelease:
551 setiv (keycode, xe->xkey.keycode);
552 break;
553
554 case ButtonPress:
555 case ButtonRelease:
556 setiv (button, xe->xbutton.button);
557 break;
558
559 case MotionNotify:
560 setiv (is_hint, xe->xmotion.is_hint);
561 break;
562 }
563
564 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
565 }
460 break; 566 break;
461 567
462 case DT_END: 568 case DT_END:
463 { 569 {
464 va_end (ap); 570 va_end (ap);
… …
480 if (SvTRUE (ERRSV)) 586 if (SvTRUE (ERRSV))
481 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 587 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
482 588
483 if (htype == HOOK_DESTROY) 589 if (htype == HOOK_DESTROY)
484 { 590 {
485 clearSVptr ((SV *)term->self); 591 clearSVptr ((SV *)term->perl.self);
486 SvREFCNT_dec ((SV *)term->self); 592 SvREFCNT_dec ((SV *)term->perl.self);
487 } 593 }
488 594
489 return count; 595 return count;
490 } 596 }
491 597
… …
501 607
502PROTOTYPES: ENABLE 608PROTOTYPES: ENABLE
503 609
504BOOT: 610BOOT:
505{ 611{
506# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0)) 612 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)); 613
508 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 614 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
509 set_hookname (INIT); 615# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
510 set_hookname (RESET); 616# include "hookinc.h"
511 set_hookname (START); 617# 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 618
619 HV *option = get_hv ("urxvt::OPTION", 1);
620# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
621# define nodef(name)
622# include "optinc.h"
623# undef nodef
624# undef def
625
626 HV *stash = gv_stashpv ("urxvt", 1);
627# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
527 export_const (DEFAULT_RSTYLE); 628 export_const_iv (DEFAULT_RSTYLE);
528 export_const (OVERLAY_RSTYLE); 629 export_const_iv (OVERLAY_RSTYLE);
529 export_const (RS_Bold); 630 export_const_iv (RS_Bold);
530 export_const (RS_Italic); 631 export_const_iv (RS_Italic);
531 export_const (RS_Blink); 632 export_const_iv (RS_Blink);
532 export_const (RS_RVid); 633 export_const_iv (RS_RVid);
533 export_const (RS_Uline); 634 export_const_iv (RS_Uline);
534 635
535 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 636 export_const_iv (CurrentTime);
637 export_const_iv (ShiftMask);
638 export_const_iv (LockMask);
639 export_const_iv (ControlMask);
640 export_const_iv (Mod1Mask);
641 export_const_iv (Mod2Mask);
642 export_const_iv (Mod3Mask);
643 export_const_iv (Mod4Mask);
644 export_const_iv (Mod5Mask);
645 export_const_iv (Button1Mask);
646 export_const_iv (Button2Mask);
647 export_const_iv (Button3Mask);
648 export_const_iv (Button4Mask);
649 export_const_iv (Button5Mask);
650 export_const_iv (AnyModifier);
536} 651}
652
653SV *
654new (...)
655 CODE:
656{
657 stringvec *argv = new stringvec;
658 bool success;
659
660 for (int i = 0; i < items ;i++)
661 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
662
663 rxvt_term *term = new rxvt_term;
664
665 term->argv = argv;
666
667 try
668 {
669 if (!term->init (argv->size (), argv->begin ()))
670 term = 0;
671 }
672 catch (const class rxvt_failure_exception &e)
673 {
674 term->destroy ();
675 croak ("exception caught while initializing new terminal instance");
676 }
677
678 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
679}
680 OUTPUT:
681 RETVAL
537 682
538void 683void
539set_should_invoke (int htype, int value) 684set_should_invoke (int htype, int value)
540 CODE: 685 CODE:
541 rxvt_perl.should_invoke [htype] = value; 686 rxvt_perl.should_invoke [htype] = value;
… …
604} 749}
605 OUTPUT: 750 OUTPUT:
606 RETVAL 751 RETVAL
607 752
608MODULE = urxvt PACKAGE = urxvt::term 753MODULE = urxvt PACKAGE = urxvt::term
754
755void
756rxvt_term::destroy ()
757
758void
759rxvt_term::grab_button (int button, U32 modifiers)
760 CODE:
761 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
762 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
763 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
764
765bool
766rxvt_term::grab (U32 eventtime, int sync = 0)
767 CODE:
768{
769 int mode = sync ? GrabModeSync : GrabModeAsync;
770
771 THIS->perl.grabtime = 0;
772
773 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
774 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
775 mode, mode, None, GRAB_CURSOR, eventtime))
776 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
777 THIS->perl.grabtime = eventtime;
778 else
779 XUngrabPointer (THIS->display->display, eventtime);
780
781 RETVAL = !!THIS->perl.grabtime;
782}
783 OUTPUT:
784 RETVAL
785
786void
787rxvt_term::allow_events_async ()
788 CODE:
789 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
790
791void
792rxvt_term::allow_events_sync ()
793 CODE:
794 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
795
796void
797rxvt_term::allow_events_replay ()
798 CODE:
799 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
800 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
801
802void
803rxvt_term::ungrab ()
804 CODE:
805{
806 if (THIS->perl.grabtime)
807 {
808 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
809 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
810 THIS->perl.grabtime = 0;
811 }
812}
609 813
610int 814int
611rxvt_term::strwidth (SV *str) 815rxvt_term::strwidth (SV *str)
612 CODE: 816 CODE:
613{ 817{
… …
632 char *mbstr = rxvt_wcstombs (wstr); 836 char *mbstr = rxvt_wcstombs (wstr);
633 rxvt_pop_locale (); 837 rxvt_pop_locale ();
634 838
635 free (wstr); 839 free (wstr);
636 840
637 RETVAL = newSVpv (mbstr, 0); 841 RETVAL = taint_if (newSVpv (mbstr, 0), str);
638 free (mbstr); 842 free (mbstr);
639} 843}
640 OUTPUT: 844 OUTPUT:
641 RETVAL 845 RETVAL
642 846
… …
649 853
650 rxvt_push_locale (THIS->locale); 854 rxvt_push_locale (THIS->locale);
651 wchar_t *wstr = rxvt_mbstowcs (data, len); 855 wchar_t *wstr = rxvt_mbstowcs (data, len);
652 rxvt_pop_locale (); 856 rxvt_pop_locale ();
653 857
654 char *str = rxvt_wcstoutf8 (wstr); 858 RETVAL = taint_if (wcs2sv (wstr), octets);
655 free (wstr); 859 free (wstr);
656
657 RETVAL = newSVpv (str, 0);
658 SvUTF8_on (RETVAL);
659 free (str);
660} 860}
661 OUTPUT: 861 OUTPUT:
662 RETVAL 862 RETVAL
663 863
864#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
865
866#define TERM_OFFSET_width TERM_OFFSET(width)
867#define TERM_OFFSET_height TERM_OFFSET(height)
868#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
869#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
870#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
871#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
872#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
873#define TERM_OFFSET_focus TERM_OFFSET(focus)
874#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
875#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
876#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
877#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
878
664int 879int
880rxvt_term::width ()
881 ALIAS:
882 width = TERM_OFFSET_width
883 height = TERM_OFFSET_height
884 fwidth = TERM_OFFSET_fwidth
885 fheight = TERM_OFFSET_fheight
886 fbase = TERM_OFFSET_fbase
887 nrow = TERM_OFFSET_nrow
888 ncol = TERM_OFFSET_ncol
889 focus = TERM_OFFSET_focus
890 mapped = TERM_OFFSET_mapped
891 saveLines = TERM_OFFSET_saveLines
892 total_rows = TERM_OFFSET_total_rows
893 nsaved = TERM_OFFSET_nsaved
894 CODE:
895 RETVAL = *(int *)((char *)THIS + ix);
896 OUTPUT:
897 RETVAL
898
899unsigned int
900rxvt_term::ModLevel3Mask ()
901 ALIAS:
902 ModLevel3Mask = 0
903 ModMetaMask = 1
904 ModNumLockMask = 2
905 CODE:
906 switch (ix)
907 {
908 case 0: RETVAL = THIS->ModLevel3Mask; break;
909 case 1: RETVAL = THIS->ModMetaMask; break;
910 case 2: RETVAL = THIS->ModNumLockMask; break;
911 }
912 OUTPUT:
913 RETVAL
914
915U32
916rxvt_term::parent ()
917 CODE:
918 RETVAL = (U32)THIS->parent [0];
919 OUTPUT:
920 RETVAL
921
922U32
665rxvt_term::nsaved () 923rxvt_term::vt ()
666 CODE: 924 CODE:
925 RETVAL = (U32)THIS->vt;
926 OUTPUT:
927 RETVAL
928
929U32
930rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
931 CODE:
932{
667 RETVAL = THIS->nsaved; 933 RETVAL = THIS->rstyle;
934 THIS->rstyle = new_rstyle;
935}
668 OUTPUT: 936 OUTPUT:
669 RETVAL 937 RETVAL
670 938
671int 939int
672rxvt_term::view_start (int newval = -1) 940rxvt_term::view_start (int newval = -1)
673 CODE: 941 CODE:
674{ 942{
… …
681 } 949 }
682} 950}
683 OUTPUT: 951 OUTPUT:
684 RETVAL 952 RETVAL
685 953
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 954void
701rxvt_term::want_refresh () 955rxvt_term::want_refresh ()
702 CODE: 956 CODE:
703 THIS->want_refresh = 1; 957 THIS->want_refresh = 1;
704 958
705void 959void
706rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 960rxvt_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: 961 PPCODE:
708{ 962{
709 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 963 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
710 XSRETURN_EMPTY; 964 XSRETURN_EMPTY;
711 965
… …
713 967
714 if (GIMME_V != G_VOID) 968 if (GIMME_V != G_VOID)
715 { 969 {
716 wchar_t *wstr = new wchar_t [THIS->ncol]; 970 wchar_t *wstr = new wchar_t [THIS->ncol];
717 971
718 for (int col = 0; col <THIS->ncol; col++) 972 for (int col = 0; col < THIS->ncol; col++)
719 wstr [col] = l.t [col]; 973 wstr [col] = l.t [col];
720 974
721 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 975 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
722 free (wstr);
723 976
724 SV *sv = newSVpv (str, 0); 977 delete [] wstr;
725 SvUTF8_on (sv);
726 XPUSHs (sv_2mortal (sv));
727 free (str);
728 } 978 }
729 979
730 if (new_text) 980 if (new_text)
731 { 981 {
732 wchar_t *wstr = sv2wcs (new_text); 982 wchar_t *wstr = sv2wcs (new_text);
733 983
734 int len = wcslen (wstr); 984 int len = min (wcslen (wstr) - start_ofs, max_len);
735 985
736 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 986 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
737 { 987 {
738 free (wstr); 988 free (wstr);
739 croak ("new_text extends beyond horizontal margins"); 989 croak ("new_text extends beyond horizontal margins");
740 } 990 }
741 991
742 for (int col = start_col; col < start_col + len; col++) 992 for (int col = start_col; col < start_col + len; col++)
743 { 993 {
744 l.t [col] = wstr [col - start_col]; 994 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])); 995 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
746 } 996 }
747 997
748 free (wstr); 998 free (wstr);
749 } 999 }
750} 1000}
751 1001
752void 1002void
753rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1003rxvt_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: 1004 PPCODE:
755{ 1005{
756 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1006 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
757 XSRETURN_EMPTY; 1007 XSRETURN_EMPTY;
758 1008
… …
773 { 1023 {
774 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1024 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
775 croak ("new_rend must be arrayref"); 1025 croak ("new_rend must be arrayref");
776 1026
777 AV *av = (AV *)SvRV (new_rend); 1027 AV *av = (AV *)SvRV (new_rend);
778 int len = av_len (av) + 1; 1028 int len = min (av_len (av) + 1 - start_ofs, max_len);
779 1029
780 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1030 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
781 croak ("new_rend array extends beyond horizontal margins"); 1031 croak ("new_rend array extends beyond horizontal margins");
782 1032
783 for (int col = start_col; col < start_col + len; col++) 1033 for (int col = start_col; col < start_col + len; col++)
784 { 1034 {
785 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1035 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
786 1036
787 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1037 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
788 } 1038 }
789 } 1039 }
790} 1040}
791 1041
792int 1042int
793rxvt_term::ROW_l (int row_number, int new_length = -2) 1043rxvt_term::ROW_l (int row_number, int new_length = -1)
794 CODE: 1044 CODE:
795{ 1045{
796 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1046 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
797 XSRETURN_EMPTY; 1047 XSRETURN_EMPTY;
798 1048
799 line_t &l = ROW(row_number); 1049 line_t &l = ROW(row_number);
800 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1050 RETVAL = l.l;
801 1051
802 if (new_length >= -1) 1052 if (new_length >= 0)
803 l.l = new_length; 1053 l.l = new_length;
804} 1054}
805 OUTPUT: 1055 OUTPUT:
806 RETVAL 1056 RETVAL
807 1057
808bool 1058bool
809rxvt_term::ROW_is_longer (int row_number) 1059rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
810 CODE: 1060 CODE:
811{ 1061{
812 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1062 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
813 XSRETURN_EMPTY; 1063 XSRETURN_EMPTY;
814 1064
815 line_t &l = ROW(row_number); 1065 line_t &l = ROW(row_number);
816 RETVAL = l.l < 0; 1066 RETVAL = l.is_longer ();
1067
1068 if (new_is_longer >= 0)
1069 l.is_longer (new_is_longer);
817} 1070}
818 OUTPUT: 1071 OUTPUT:
819 RETVAL 1072 RETVAL
820 1073
821SV * 1074SV *
822rxvt_term::special_encode (SV *str) 1075rxvt_term::special_encode (SV *string)
823 CODE: 1076 CODE:
824 abort ();//TODO 1077{
1078 wchar_t *wstr = sv2wcs (string);
1079 int wlen = wcslen (wstr);
1080 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1081
1082 rxvt_push_locale (THIS->locale);
1083
1084 wchar_t *r = rstr;
1085 for (wchar_t *s = wstr; *s; s++)
1086 if (wcwidth (*s) == 0)
1087 {
1088 if (r == rstr)
1089 croak ("leading combining character unencodable");
1090
1091 unicode_t n = rxvt_compose (r[-1], *s);
1092 if (n == NOCHAR)
1093 n = rxvt_composite.compose (r[-1], *s);
1094
1095 r[-1] = n;
1096 }
1097#if !UNICODE_3
1098 else if (*s >= 0x10000)
1099 *r++ = rxvt_composite.compose (*s);
1100#endif
1101 else
1102 *r++ = *s;
1103
1104 rxvt_pop_locale ();
1105
1106 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1107
1108 delete [] rstr;
1109}
1110 OUTPUT:
1111 RETVAL
825 1112
826SV * 1113SV *
827rxvt_term::special_decode (SV *str) 1114rxvt_term::special_decode (SV *text)
828 CODE: 1115 CODE:
829 abort ();//TODO 1116{
1117 wchar_t *wstr = sv2wcs (text);
1118 int wlen = wcslen (wstr);
1119 int dlen = 0;
1120
1121 // find length
1122 for (wchar_t *s = wstr; *s; s++)
1123 if (*s == NOCHAR)
1124 ;
1125 else if (IS_COMPOSE (*s))
1126 dlen += rxvt_composite.expand (*s, 0);
1127 else
1128 dlen++;
1129
1130 wchar_t *rstr = new wchar_t [dlen];
1131
1132 // decode
1133 wchar_t *r = rstr;
1134 for (wchar_t *s = wstr; *s; s++)
1135 if (*s == NOCHAR)
1136 ;
1137 else if (IS_COMPOSE (*s))
1138 r += rxvt_composite.expand (*s, r);
1139 else
1140 *r++ = *s;
1141
1142 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1143
1144 delete [] rstr;
1145}
1146 OUTPUT:
1147 RETVAL
830 1148
831void 1149void
832rxvt_term::_resource (char *name, int index, SV *newval = 0) 1150rxvt_term::_resource (char *name, int index, SV *newval = 0)
833 PPCODE: 1151 PPCODE:
834{ 1152{
835 struct resval { const char *name; int value; } rslist [] = { 1153 struct resval { const char *name; int value; } rslist [] = {
836# define Rs_def(name) { # name, Rs_ ## name }, 1154# define def(name) { # name, Rs_ ## name },
837# define Rs_reserve(name,count) 1155# define reserve(name,count)
838# include "rsinc.h" 1156# include "rsinc.h"
839# undef Rs_def 1157# undef def
840# undef Rs_reserve 1158# undef reserve
841 }; 1159 };
842 1160
843 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1161 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
844 1162
845 do { 1163 do {
… …
851 1169
852 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1170 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
853 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1171 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
854 1172
855 if (GIMME_V != G_VOID) 1173 if (GIMME_V != G_VOID)
856 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1174 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
857 1175
858 if (newval) 1176 if (newval)
859 { 1177 {
860 if (SvOK (newval)) 1178 if (SvOK (newval))
861 { 1179 {
… …
866 else 1184 else
867 THIS->rs [index] = 0; 1185 THIS->rs [index] = 0;
868 } 1186 }
869} 1187}
870 1188
1189bool
1190rxvt_term::option (U32 optval, int set = -1)
1191 CODE:
1192{
1193 RETVAL = THIS->options & optval;
1194
1195 if (set >= 0)
1196 {
1197 if (set)
1198 THIS->options |= optval;
1199 else
1200 THIS->options &= ~optval;
1201
1202 switch (optval)
1203 {
1204 case Opt_skipBuiltinGlyphs:
1205 THIS->set_fonts ();
1206 THIS->scr_remap_chars ();
1207 THIS->scr_touch (true);
1208 THIS->want_refresh = 1;
1209 break;
1210
1211 case Opt_cursorUnderline:
1212 THIS->want_refresh = 1;
1213 break;
1214
1215# case Opt_scrollBar_floating:
1216# case Opt_scrollBar_right:
1217# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1218# break;
1219 }
1220 }
1221}
1222 OUTPUT:
1223 RETVAL
1224
871void 1225void
872rxvt_term::selection_mark (...) 1226rxvt_term::cur (...)
873 PROTOTYPE: $;$$ 1227 PROTOTYPE: $;$$
874 ALIAS: 1228 ALIAS:
1229 screen_cur = 0
875 selection_beg = 1 1230 selection_beg = 1
876 selection_end = 2 1231 selection_end = 2
1232 selection_mark = 3
877 PPCODE: 1233 PPCODE:
878{ 1234{
879 row_col_t &sel = ix == 1 ? THIS->selection.beg 1235 row_col_t &rc = ix == 0 ? THIS->screen.cur
1236 : ix == 1 ? THIS->selection.beg
880 : ix == 2 ? THIS->selection.end 1237 : ix == 2 ? THIS->selection.end
881 : THIS->selection.mark; 1238 : THIS->selection.mark;
882 1239
883 if (GIMME_V != G_VOID) 1240 if (GIMME_V != G_VOID)
884 { 1241 {
885 EXTEND (SP, 2); 1242 EXTEND (SP, 2);
886 PUSHs (sv_2mortal (newSViv (sel.row))); 1243 PUSHs (sv_2mortal (newSViv (rc.row)));
887 PUSHs (sv_2mortal (newSViv (sel.col))); 1244 PUSHs (sv_2mortal (newSViv (rc.col)));
888 } 1245 }
889 1246
890 if (items == 3) 1247 if (items == 3)
891 { 1248 {
892 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1249 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
893 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1250 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
894 1251
895 if (ix) 1252 if (ix)
896 THIS->want_refresh = 1; 1253 THIS->want_refresh = 1;
897 } 1254 }
898} 1255}
899 1256
900int 1257int
901rxvt_term::selection_grab (int eventtime = CurrentTime) 1258rxvt_term::selection_grab (U32 eventtime)
902 1259
903void 1260void
904rxvt_term::selection (SV *newtext = 0) 1261rxvt_term::selection (SV *newtext = 0)
905 PPCODE: 1262 PPCODE:
906{ 1263{
907 if (GIMME_V != G_VOID) 1264 if (GIMME_V != G_VOID)
908 { 1265 XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))));
909 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
910 SV *sv = newSVpv (sel, 0);
911 SvUTF8_on (sv);
912 free (sel);
913 XPUSHs (sv_2mortal (sv));
914 }
915 1266
916 if (newtext) 1267 if (newtext)
917 { 1268 {
918 free (THIS->selection.text); 1269 free (THIS->selection.text);
919 1270
920 THIS->selection.text = sv2wcs (newtext); 1271 THIS->selection.text = sv2wcs (newtext);
921 THIS->selection.len = wcslen (THIS->selection.text); 1272 THIS->selection.len = wcslen (THIS->selection.text);
922 } 1273 }
923} 1274}
924 1275
1276void
1277rxvt_term::scr_add_lines (SV *string)
1278 CODE:
1279{
1280 wchar_t *wstr = sv2wcs (string);
1281 THIS->scr_add_lines (wstr, wcslen (wstr));
1282 free (wstr);
1283}
1284
925void 1285void
926rxvt_term::tt_write (SV *octets) 1286rxvt_term::tt_write (SV *octets)
927 INIT: 1287 INIT:
928 STRLEN len; 1288 STRLEN len;
929 char *str = SvPVbyte (octets, len); 1289 char *str = SvPVbyte (octets, len);
930 C_ARGS: 1290 C_ARGS:
931 (unsigned char *)str, len 1291 str, len
1292
1293void
1294rxvt_term::cmd_parse (SV *octets)
1295 CODE:
1296{
1297 STRLEN len;
1298 char *str = SvPVbyte (octets, len);
1299
1300 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1301 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1302
1303 THIS->cmdbuf_ptr = str;
1304 THIS->cmdbuf_endp = str + len;
1305
1306 rxvt_push_locale (THIS->locale);
1307 THIS->cmd_parse ();
1308 rxvt_pop_locale ();
1309
1310 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1311 THIS->cmdbuf_endp = old_cmdbuf_endp;
1312}
932 1313
933SV * 1314SV *
934rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1315rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
935 CODE: 1316 CODE:
936{ 1317{

Diff Legend

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