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.61 by root, Thu Jan 12 10:02:20 2006 UTC vs.
Revision 1.86 by root, Fri Jan 20 22:49:34 2006 UTC

39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->leftptr_cursor
46#else 46#else
47# define GRAB_CURSOR None 47# define GRAB_CURSOR None
48#endif 48#endif
49 49
50#undef LINENO 50#undef LINENO
51#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)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55typedef int CHAINED UNUSED;
56
55///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
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 58
73static wchar_t * 59static wchar_t *
74sv2wcs (SV *sv) 60sv2wcs (SV *sv)
75{ 61{
76 STRLEN len; 62 STRLEN len;
132#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
133#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
134 120
135///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
136 122
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
137struct perl_watcher 125struct perl_watcher
138{ 126{
139 SV *cbsv; 127 SV *cbsv;
140 HV *self; 128 HV *self;
141 129
142 perl_watcher () 130 perl_watcher ()
143 : cbsv (newSV (0)) 131 : cbsv (0)
144 { 132 {
145 } 133 }
146 134
147 ~perl_watcher () 135 ~perl_watcher ()
148 { 136 {
149 SvREFCNT_dec (cbsv); 137 SvREFCNT_dec (cbsv);
150 } 138 }
151 139
152 void cb (SV *cb) 140 void cb (SV *cb)
153 { 141 {
154 sv_setsv (cbsv, cb); 142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
155 } 144 }
156 145
157 void invoke (const char *type, SV *self, int arg = -1); 146 void invoke (const char *type, SV *self, int arg = -1);
158}; 147};
159 148
183 if (SvTRUE (ERRSV)) 172 if (SvTRUE (ERRSV))
184 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
185} 174}
186 175
187#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
188#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
189 178
190struct timer : time_watcher, perl_watcher 179struct timer : perl_watcher, time_watcher
191{ 180{
192 tstamp interval; 181 tstamp interval;
193 182
194 timer () 183 timer ()
195 : time_watcher (this, &timer::execute) 184 : time_watcher (this, &timer::execute)
204 invoke ("urxvt::timer", newSVtimer (this)); 193 invoke ("urxvt::timer", newSVtimer (this));
205 } 194 }
206}; 195};
207 196
208#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
209#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
210 199
211struct iow : io_watcher, perl_watcher 200struct iow : perl_watcher, io_watcher
212{ 201{
213 iow () 202 iow ()
214 : io_watcher (this, &iow::execute) 203 : io_watcher (this, &iow::execute)
215 { 204 {
216 } 205 }
219 { 208 {
220 invoke ("urxvt::iow", newSViow (this), revents); 209 invoke ("urxvt::iow", newSViow (this), revents);
221 } 210 }
222}; 211};
223 212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216struct iw : perl_watcher, idle_watcher
217{
218 iw ()
219 : idle_watcher (this, &iw::execute)
220 {
221 }
222
223 void execute (idle_watcher &w)
224 {
225 invoke ("urxvt::iw", newSViw (this));
226 }
227};
228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232struct pw : perl_watcher, child_watcher
233{
234 pw ()
235 : child_watcher (this, &pw::execute)
236 {
237 }
238
239 void execute (child_watcher &w, int status)
240 {
241 invoke ("urxvt::pw", newSVpw (this), status);
242 }
243};
244
224///////////////////////////////////////////////////////////////////////////// 245/////////////////////////////////////////////////////////////////////////////
225 246
226#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
227 248
228struct overlay { 249struct overlay {
229 HV *self; 250 HV *self;
251 bool visible;
230 rxvt_term *THIS; 252 rxvt_term *THIS;
231 int x, y, w, h; 253 int x, y, w, h;
232 int border; 254 int border;
233 text_t **text; 255 text_t **text;
234 rend_t **rend; 256 rend_t **rend;
243 265
244 void set (int x, int y, SV *str, SV *rend); 266 void set (int x, int y, SV *str, SV *rend);
245}; 267};
246 268
247overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
248: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) 270: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false)
249{ 271{
250 if (border == 2) 272 if (border == 2)
251 { 273 {
252 w += 2; 274 w += 2;
253 h += 2; 275 h += 2;
314} 336}
315 337
316void 338void
317overlay::show () 339overlay::show ()
318{ 340{
319 char key[33]; sprintf (key, "%32lx", (long)this); 341 if (visible)
342 return;
320 343
344 visible = true;
345
321 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)); 346 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
322 hv_store (hv, key, 32, newSViv ((long)this), 0); 347 av_push (av, newSViv ((long)this));
323} 348}
324 349
325void 350void
326overlay::hide () 351overlay::hide ()
327{ 352{
353 if (!visible)
354 return;
355
356 visible = false;
357
328 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 358 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
329 359
330 if (ovs) 360 int i;
361
362 for (i = AvFILL (av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this)
331 { 364 {
332 char key[33]; sprintf (key, "%32lx", (long)this);
333
334 HV *hv = (HV *)SvRV (*ovs);
335 hv_delete (hv, key, 32, G_DISCARD); 365 av_delete (av, i, G_DISCARD);
366 break;
336 } 367 }
368
369 for (; i < AvFILL (av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
371
372 av_pop (av);
337} 373}
338 374
339void overlay::swap () 375void overlay::swap ()
340{ 376{
341 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
347 for (int y = ov_h; y--; ) 383 for (int y = ov_h; y--; )
348 { 384 {
349 text_t *t1 = text [y]; 385 text_t *t1 = text [y];
350 rend_t *r1 = rend [y]; 386 rend_t *r1 = rend [y];
351 387
352 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 388 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
353 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 389 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
354 390
355 for (int x = ov_w; x--; ) 391 for (int x = ov_w; x--; )
356 { 392 {
357 text_t t = *t1; *t1++ = *t2; *t2++ = t; 393 text_t t = *t1; *t1++ = *t2; *t2++ = t;
358 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 394 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
381 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 417 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
382 croak ("rend must be arrayref"); 418 croak ("rend must be arrayref");
383 419
384 AV *av = (AV *)SvRV (rend); 420 AV *av = (AV *)SvRV (rend);
385 421
386 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 422 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
387 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 423 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
388 } 424 }
389 425
390 THIS->want_refresh = 1; 426 THIS->want_refresh = 1;
391} 427}
405 perl_free (perl); 441 perl_free (perl);
406 } 442 }
407} 443}
408 444
409void 445void
410rxvt_perl_interp::init () 446rxvt_perl_interp::init (rxvt_term *term)
411{ 447{
412 if (!perl) 448 if (!perl)
413 { 449 {
450 rxvt_push_locale (""); // perl init destroys current locale
451
414 perl_environ = rxvt_environ; 452 perl_environ = rxvt_environ;
415 swap (perl_environ, environ); 453 swap (perl_environ, environ);
416 454
417 char *argv[] = { 455 char *argv[] = {
418 "", 456 "",
419 "-T", 457 "-e"
420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 458 "BEGIN {"
459 " urxvt->bootstrap;"
460 " unshift @INC, '" LIBDIR "';"
461 "}"
462 ""
463 "use urxvt;"
421 }; 464 };
422 465
423 perl = perl_alloc (); 466 perl = perl_alloc ();
424 perl_construct (perl); 467 perl_construct (perl);
425 468
426 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 469 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
427 || perl_run (perl)) 470 || perl_run (perl))
428 { 471 {
429 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 472 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
430 473
431 perl_destruct (perl); 474 perl_destruct (perl);
432 perl_free (perl); 475 perl_free (perl);
433 perl = 0; 476 perl = 0;
434 } 477 }
435 478
436 swap (perl_environ, environ); 479 swap (perl_environ, environ);
480
481 rxvt_pop_locale ();
482 }
483
484 if (perl)
485 {
486 // runs outside of perls ENV
487 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
488 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
437 } 489 }
438} 490}
439 491
440static void 492static void
441ungrab (rxvt_term *THIS) 493ungrab (rxvt_term *THIS)
449} 501}
450 502
451bool 503bool
452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 504rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
453{ 505{
454 if (!perl) 506 if (!perl || !term->perl.self)
455 return false; 507 return false;
456 508
457 if (htype == HOOK_INIT) // first hook ever called 509 // pre-handling of some events
510 if (htype == HOOK_REFRESH_END)
458 { 511 {
459 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
460 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 513
514 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
461 } 516 }
462 else if (!term->perl.self) 517
463 return false; // perl not initialized for this instance 518 swap (perl_environ, environ);
519
520 bool event_consumed;
521
522 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
523 || term->perl.should_invoke [htype])
524 try
525 {
526 dSP;
527 va_list ap;
528
529 va_start (ap, htype);
530
531 ENTER;
532 SAVETMPS;
533
534 PUSHMARK (SP);
535
536 XPUSHs (sv_2mortal (newSVterm (term)));
537 XPUSHs (sv_2mortal (newSViv (htype)));
538
539 for (;;) {
540 data_type dt = (data_type)va_arg (ap, int);
541
542 switch (dt)
543 {
544 case DT_INT:
545 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
546 break;
547
548 case DT_LONG:
549 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
550 break;
551
552 case DT_STR:
553 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
554 break;
555
556 case DT_STR_LEN:
557 {
558 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int);
560
561 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 }
563 break;
564
565 case DT_WCS_LEN:
566 {
567 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int);
569
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
571 }
572 break;
573
574 case DT_XEVENT:
575 {
576 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV ();
578
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
580# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
581# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set
583
584 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial);
587
588 switch (xe->type)
589 {
590 case KeyPress:
591 case KeyRelease:
592 case ButtonPress:
593 case ButtonRelease:
594 case MotionNotify:
595 setuv (window, xe->xmotion.window);
596 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state);
606
607 switch (xe->type)
608 {
609 case KeyPress:
610 case KeyRelease:
611 setuv (keycode, xe->xkey.keycode);
612 break;
613
614 case ButtonPress:
615 case ButtonRelease:
616 setuv (button, xe->xbutton.button);
617 break;
618
619 case MotionNotify:
620 setiv (is_hint, xe->xmotion.is_hint);
621 break;
622 }
623
624 break;
625
626 case MapNotify:
627 case UnmapNotify:
628 case ConfigureNotify:
629 setuv (event, xe->xconfigure.event);
630 setuv (window, xe->xconfigure.window);
631
632 switch (xe->type)
633 {
634 case ConfigureNotify:
635 setiv (x, xe->xconfigure.x);
636 setiv (y, xe->xconfigure.y);
637 setiv (width, xe->xconfigure.width);
638 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above);
640 break;
641 }
642
643 break;
644
645 case PropertyNotify:
646 setuv (window, xe->xproperty.window);
647 setuv (atom, xe->xproperty.atom);
648 setuv (time, xe->xproperty.time);
649 setiv (state, xe->xproperty.state);
650 break;
651
652 case ClientMessage:
653 setuv (window, xe->xclient.window);
654 setuv (message_type, xe->xclient.message_type);
655 setuv (format, xe->xclient.format);
656 setuv (l0, xe->xclient.data.l[0]);
657 setuv (l1, xe->xclient.data.l[1]);
658 setuv (l2, xe->xclient.data.l[2]);
659 setuv (l3, xe->xclient.data.l[3]);
660 setuv (l4, xe->xclient.data.l[4]);
661 break;
662 }
663
664 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
665 }
666 break;
667
668 case DT_END:
669 goto call;
670
671 default:
672 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
673 }
674 }
675
676 call:
677 va_end (ap);
678
679 PUTBACK;
680 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
681 SPAGAIN;
682
683 if (count)
684 {
685 SV *status = POPs;
686 count = SvTRUE (status);
687 }
688
689 PUTBACK;
690 FREETMPS;
691 LEAVE;
692
693 if (SvTRUE (ERRSV))
694 {
695 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
696 ungrab (term); // better lose the grab than the session
697 }
698
699 event_consumed = !!count;
700 }
701 catch (...)
702 {
703 swap (perl_environ, environ);
704 throw;
705 }
706 else
707 event_consumed = false;
708
709 // post-handling of some events
710 if (htype == HOOK_REFRESH_BEGIN)
711 {
712 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
713
714 for (int i = AvFILL (av); i >= 0; i--)
715 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
716 }
464 else if (htype == HOOK_DESTROY) 717 else if (htype == HOOK_DESTROY)
465 { 718 {
466 // handled later 719 clearSVptr ((SV *)term->perl.self);
720 SvREFCNT_dec ((SV *)term->perl.self);
467 } 721 }
468 else
469 {
470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
471 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473
474 if (HvKEYS (hv))
475 {
476 hv_iterinit (hv);
477
478 while (HE *he = hv_iternext (hv))
479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
482 }
483
484 if (!should_invoke [htype])
485 return false;
486 }
487 722
488 swap (perl_environ, environ); 723 swap (perl_environ, environ);
489 724
490 try 725 return event_consumed;
491 {
492 dSP;
493 va_list ap;
494
495 va_start (ap, htype);
496
497 ENTER;
498 SAVETMPS;
499
500 PUSHMARK (SP);
501
502 XPUSHs (sv_2mortal (newSVterm (term)));
503 XPUSHs (sv_2mortal (newSViv (htype)));
504
505 for (;;) {
506 data_type dt = (data_type)va_arg (ap, int);
507
508 switch (dt)
509 {
510 case DT_INT:
511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
512 break;
513
514 case DT_LONG:
515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
516 break;
517
518 case DT_STR:
519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
520 break;
521
522 case DT_STR_LEN:
523 {
524 char *str = va_arg (ap, char *);
525 int len = va_arg (ap, int);
526
527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
528 }
529 break;
530
531 case DT_WCS_LEN:
532 {
533 wchar_t *wstr = va_arg (ap, wchar_t *);
534 int wlen = va_arg (ap, int);
535
536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
537 }
538 break;
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);
623 return count;
624 }
625
626 default:
627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 }
629 }
630 }
631 catch (...)
632 {
633 swap (perl_environ, environ);
634 throw;
635 }
636} 726}
637 727
638///////////////////////////////////////////////////////////////////////////// 728/////////////////////////////////////////////////////////////////////////////
639 729
640MODULE = urxvt PACKAGE = urxvt 730MODULE = urxvt PACKAGE = urxvt
659# include "optinc.h" 749# include "optinc.h"
660# undef nodef 750# undef nodef
661# undef def 751# undef def
662 752
663 HV *stash = gv_stashpv ("urxvt", 1); 753 HV *stash = gv_stashpv ("urxvt", 1);
664# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); 754 struct {
755 const char *name;
756 IV iv;
757 } *civ, const_iv[] = {
758# define const_iv(name) { # name, (IV)name }
665 export_const_iv (DEFAULT_RSTYLE); 759 const_iv (DEFAULT_RSTYLE),
666 export_const_iv (OVERLAY_RSTYLE); 760 const_iv (OVERLAY_RSTYLE),
667 export_const_iv (RS_Bold); 761 const_iv (RS_Bold),
668 export_const_iv (RS_Italic); 762 const_iv (RS_Italic),
669 export_const_iv (RS_Blink); 763 const_iv (RS_Blink),
670 export_const_iv (RS_RVid); 764 const_iv (RS_RVid),
671 export_const_iv (RS_Uline); 765 const_iv (RS_Uline),
672 766
673 export_const_iv (CurrentTime); 767 const_iv (CurrentTime),
674 export_const_iv (ShiftMask); 768 const_iv (ShiftMask),
675 export_const_iv (LockMask); 769 const_iv (LockMask),
676 export_const_iv (ControlMask); 770 const_iv (ControlMask),
677 export_const_iv (Mod1Mask); 771 const_iv (Mod1Mask),
678 export_const_iv (Mod2Mask); 772 const_iv (Mod2Mask),
679 export_const_iv (Mod3Mask); 773 const_iv (Mod3Mask),
680 export_const_iv (Mod4Mask); 774 const_iv (Mod4Mask),
681 export_const_iv (Mod5Mask); 775 const_iv (Mod5Mask),
682 export_const_iv (Button1Mask); 776 const_iv (Button1Mask),
683 export_const_iv (Button2Mask); 777 const_iv (Button2Mask),
684 export_const_iv (Button3Mask); 778 const_iv (Button3Mask),
685 export_const_iv (Button4Mask); 779 const_iv (Button4Mask),
686 export_const_iv (Button5Mask); 780 const_iv (Button5Mask),
687 export_const_iv (AnyModifier); 781 const_iv (AnyModifier),
688 782
689 export_const_iv (EVENT_NONE); 783 const_iv (EVENT_NONE),
690 export_const_iv (EVENT_READ); 784 const_iv (EVENT_READ),
691 export_const_iv (EVENT_WRITE); 785 const_iv (EVENT_WRITE),
692}
693 786
694void 787 const_iv (NoEventMask),
695set_should_invoke (int htype, int value) 788 const_iv (KeyPressMask),
696 CODE: 789 const_iv (KeyReleaseMask),
697 rxvt_perl.should_invoke [htype] = value; 790 const_iv (ButtonPressMask),
791 const_iv (ButtonReleaseMask),
792 const_iv (EnterWindowMask),
793 const_iv (LeaveWindowMask),
794 const_iv (PointerMotionMask),
795 const_iv (PointerMotionHintMask),
796 const_iv (Button1MotionMask),
797 const_iv (Button2MotionMask),
798 const_iv (Button3MotionMask),
799 const_iv (Button4MotionMask),
800 const_iv (Button5MotionMask),
801 const_iv (ButtonMotionMask),
802 const_iv (KeymapStateMask),
803 const_iv (ExposureMask),
804 const_iv (VisibilityChangeMask),
805 const_iv (StructureNotifyMask),
806 const_iv (ResizeRedirectMask),
807 const_iv (SubstructureNotifyMask),
808 const_iv (SubstructureRedirectMask),
809 const_iv (FocusChangeMask),
810 const_iv (PropertyChangeMask),
811 const_iv (ColormapChangeMask),
812 const_iv (OwnerGrabButtonMask),
813
814 const_iv (KeyPress),
815 const_iv (KeyRelease),
816 const_iv (ButtonPress),
817 const_iv (ButtonRelease),
818 const_iv (MotionNotify),
819 const_iv (EnterNotify),
820 const_iv (LeaveNotify),
821 const_iv (FocusIn),
822 const_iv (FocusOut),
823 const_iv (KeymapNotify),
824 const_iv (Expose),
825 const_iv (GraphicsExpose),
826 const_iv (NoExpose),
827 const_iv (VisibilityNotify),
828 const_iv (CreateNotify),
829 const_iv (DestroyNotify),
830 const_iv (UnmapNotify),
831 const_iv (MapNotify),
832 const_iv (MapRequest),
833 const_iv (ReparentNotify),
834 const_iv (ConfigureNotify),
835 const_iv (ConfigureRequest),
836 const_iv (GravityNotify),
837 const_iv (ResizeRequest),
838 const_iv (CirculateNotify),
839 const_iv (CirculateRequest),
840 const_iv (PropertyNotify),
841 const_iv (SelectionClear),
842 const_iv (SelectionRequest),
843 const_iv (SelectionNotify),
844 const_iv (ColormapNotify),
845 const_iv (ClientMessage),
846 const_iv (MappingNotify),
847 };
848
849 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
850 civ-- > const_iv; )
851 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
852}
698 853
699void 854void
700warn (const char *msg) 855warn (const char *msg)
701 CODE: 856 CODE:
702 rxvt_warn ("%s", msg); 857 rxvt_warn ("%s", msg);
704void 859void
705fatal (const char *msg) 860fatal (const char *msg)
706 CODE: 861 CODE:
707 rxvt_fatal ("%s", msg); 862 rxvt_fatal ("%s", msg);
708 863
709SV *
710untaint (SV *sv)
711 CODE:
712 RETVAL = newSVsv (sv);
713 SvTAINTED_off (RETVAL);
714 OUTPUT:
715 RETVAL
716
717void 864void
718_exit (int status) 865_exit (int status)
719
720bool
721safe ()
722 CODE:
723 RETVAL = !rxvt_tainted ();
724 OUTPUT:
725 RETVAL
726 866
727NV 867NV
728NOW () 868NOW ()
729 CODE: 869 CODE:
730 RETVAL = NOW; 870 RETVAL = NOW;
795 935
796 for (int i = 1; i < items; i++) 936 for (int i = 1; i < items; i++)
797 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
798 938
799 AV *envv = (AV *)SvRV (ST (0)); 939 AV *envv = (AV *)SvRV (ST (0));
800 for (int i = av_len (envv) + 1; i--; ) 940 for (int i = AvFILL (envv) + 1; i--; )
801 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
802 942
803 term->envv->push_back (0); 943 term->envv->push_back (0);
804 944
805 bool success; 945 bool success;
827 967
828void 968void
829rxvt_term::destroy () 969rxvt_term::destroy ()
830 970
831void 971void
972rxvt_term::set_should_invoke (int htype, int inc)
973 CODE:
974 THIS->perl.should_invoke [htype] += inc;
975
976void
832rxvt_term::grab_button (int button, U32 modifiers) 977rxvt_term::grab_button (int button, U32 modifiers)
833 CODE: 978 CODE:
834 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
835 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
836 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
837 982
838bool 983bool
839rxvt_term::grab (U32 eventtime, int sync = 0) 984rxvt_term::grab (Time eventtime, int sync = 0)
840 CODE: 985 CODE:
841{ 986{
842 int mode = sync ? GrabModeSync : GrabModeAsync; 987 int mode = sync ? GrabModeSync : GrabModeAsync;
843 988
844 THIS->perl.grabtime = 0; 989 THIS->perl.grabtime = 0;
902 char *mbstr = rxvt_wcstombs (wstr); 1047 char *mbstr = rxvt_wcstombs (wstr);
903 rxvt_pop_locale (); 1048 rxvt_pop_locale ();
904 1049
905 free (wstr); 1050 free (wstr);
906 1051
907 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1052 RETVAL = newSVpv (mbstr, 0);
908 free (mbstr); 1053 free (mbstr);
909} 1054}
910 OUTPUT: 1055 OUTPUT:
911 RETVAL 1056 RETVAL
912 1057
919 1064
920 rxvt_push_locale (THIS->locale); 1065 rxvt_push_locale (THIS->locale);
921 wchar_t *wstr = rxvt_mbstowcs (data, len); 1066 wchar_t *wstr = rxvt_mbstowcs (data, len);
922 rxvt_pop_locale (); 1067 rxvt_pop_locale ();
923 1068
924 RETVAL = taint_if (wcs2sv (wstr), octets); 1069 RETVAL = wcs2sv (wstr);
925 free (wstr); 1070 free (wstr);
926} 1071}
927 OUTPUT: 1072 OUTPUT:
928 RETVAL 1073 RETVAL
929 1074
936#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1081#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
937#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1082#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
938#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1083#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
939#define TERM_OFFSET_focus TERM_OFFSET(focus) 1084#define TERM_OFFSET_focus TERM_OFFSET(focus)
940#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1085#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1086#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1087#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1088#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
941#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1089#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
942#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1090#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
943#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1091#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
944 1092
945int 1093int
946rxvt_term::width () 1094rxvt_term::width ()
947 ALIAS: 1095 ALIAS:
948 width = TERM_OFFSET_width 1096 width = TERM_OFFSET_width
952 fbase = TERM_OFFSET_fbase 1100 fbase = TERM_OFFSET_fbase
953 nrow = TERM_OFFSET_nrow 1101 nrow = TERM_OFFSET_nrow
954 ncol = TERM_OFFSET_ncol 1102 ncol = TERM_OFFSET_ncol
955 focus = TERM_OFFSET_focus 1103 focus = TERM_OFFSET_focus
956 mapped = TERM_OFFSET_mapped 1104 mapped = TERM_OFFSET_mapped
1105 int_bwidth = TERM_OFFSET_int_bwidth
1106 ext_bwidth = TERM_OFFSET_ext_bwidth
1107 lineSpace = TERM_OFFSET_lineSpace
957 saveLines = TERM_OFFSET_saveLines 1108 saveLines = TERM_OFFSET_saveLines
958 total_rows = TERM_OFFSET_total_rows 1109 total_rows = TERM_OFFSET_total_rows
959 nsaved = TERM_OFFSET_nsaved 1110 top_row = TERM_OFFSET_top_row
960 CODE: 1111 CODE:
961 RETVAL = *(int *)((char *)THIS + ix); 1112 RETVAL = *(int *)((char *)THIS + ix);
962 OUTPUT: 1113 OUTPUT:
963 RETVAL 1114 RETVAL
964 1115
966rxvt_term::ModLevel3Mask () 1117rxvt_term::ModLevel3Mask ()
967 ALIAS: 1118 ALIAS:
968 ModLevel3Mask = 0 1119 ModLevel3Mask = 0
969 ModMetaMask = 1 1120 ModMetaMask = 1
970 ModNumLockMask = 2 1121 ModNumLockMask = 2
1122 current_screen = 3
971 CODE: 1123 CODE:
972 switch (ix) 1124 switch (ix)
973 { 1125 {
974 case 0: RETVAL = THIS->ModLevel3Mask; break; 1126 case 0: RETVAL = THIS->ModLevel3Mask; break;
975 case 1: RETVAL = THIS->ModMetaMask; break; 1127 case 1: RETVAL = THIS->ModMetaMask; break;
976 case 2: RETVAL = THIS->ModNumLockMask; break; 1128 case 2: RETVAL = THIS->ModNumLockMask; break;
1129 case 3: RETVAL = THIS->current_screen; break;
977 } 1130 }
978 OUTPUT: 1131 OUTPUT:
979 RETVAL 1132 RETVAL
980 1133
981char * 1134char *
1019 if (events != EVENT_UNDEF) 1172 if (events != EVENT_UNDEF)
1020 THIS->pty_ev.set (events); 1173 THIS->pty_ev.set (events);
1021 OUTPUT: 1174 OUTPUT:
1022 RETVAL 1175 RETVAL
1023 1176
1024U32 1177Window
1025rxvt_term::parent () 1178rxvt_term::parent ()
1026 CODE: 1179 CODE:
1027 RETVAL = (U32)THIS->parent [0]; 1180 RETVAL = THIS->parent [0];
1028 OUTPUT: 1181 OUTPUT:
1029 RETVAL 1182 RETVAL
1030 1183
1031U32 1184Window
1032rxvt_term::vt () 1185rxvt_term::vt ()
1033 CODE: 1186 CODE:
1034 RETVAL = (U32)THIS->vt; 1187 RETVAL = THIS->vt;
1035 OUTPUT: 1188 OUTPUT:
1036 RETVAL 1189 RETVAL
1190
1191void
1192rxvt_term::vt_emask_add (U32 emask)
1193 CODE:
1194 THIS->vt_emask_perl |= emask;
1195 THIS->vt_select_input ();
1037 1196
1038U32 1197U32
1039rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1198rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1040 CODE: 1199 CODE:
1041{
1042 RETVAL = THIS->rstyle; 1200 RETVAL = THIS->rstyle;
1043 THIS->rstyle = new_rstyle; 1201 THIS->rstyle = new_rstyle;
1044}
1045 OUTPUT: 1202 OUTPUT:
1046 RETVAL 1203 RETVAL
1047 1204
1048int 1205int
1049rxvt_term::view_start (int newval = -1) 1206rxvt_term::view_start (int newval = 1)
1050 PROTOTYPE: $;$ 1207 PROTOTYPE: $;$
1051 CODE: 1208 CODE:
1052{ 1209{
1053 RETVAL = THIS->view_start; 1210 RETVAL = THIS->view_start;
1054 1211
1055 if (newval >= 0) 1212 if (newval <= 0)
1056 { 1213 THIS->scr_changeview (max (newval, THIS->top_row));
1057 THIS->view_start = min (newval, THIS->nsaved);
1058 THIS->scr_changeview (RETVAL);
1059 }
1060} 1214}
1061 OUTPUT: 1215 OUTPUT:
1062 RETVAL 1216 RETVAL
1217
1218void
1219rxvt_term::focus_in ()
1220
1221void
1222rxvt_term::focus_out ()
1063 1223
1064void 1224void
1065rxvt_term::want_refresh () 1225rxvt_term::want_refresh ()
1066 CODE: 1226 CODE:
1067 THIS->want_refresh = 1; 1227 THIS->want_refresh = 1;
1068 1228
1069void 1229void
1070rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1230rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1071 PPCODE: 1231 PPCODE:
1072{ 1232{
1073 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1233 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1074 XSRETURN_EMPTY; 1234 XSRETURN_EMPTY;
1075 1235
1076 line_t &l = ROW(row_number); 1236 line_t &l = ROW(row_number);
1077 1237
1078 if (GIMME_V != G_VOID) 1238 if (GIMME_V != G_VOID)
1080 wchar_t *wstr = new wchar_t [THIS->ncol]; 1240 wchar_t *wstr = new wchar_t [THIS->ncol];
1081 1241
1082 for (int col = 0; col < THIS->ncol; col++) 1242 for (int col = 0; col < THIS->ncol; col++)
1083 wstr [col] = l.t [col]; 1243 wstr [col] = l.t [col];
1084 1244
1085 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1245 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1086 1246
1087 delete [] wstr; 1247 delete [] wstr;
1088 } 1248 }
1089 1249
1090 if (new_text) 1250 if (new_text)
1091 { 1251 {
1092 wchar_t *wstr = sv2wcs (new_text); 1252 wchar_t *wstr = sv2wcs (new_text);
1093 1253
1094 int len = min (wcslen (wstr) - start_ofs, max_len); 1254 int len = min (wcslen (wstr) - start_ofs, max_len);
1095 1255
1096 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1256 if (start_col < 0 || start_col + len > THIS->ncol)
1097 { 1257 {
1098 free (wstr); 1258 free (wstr);
1099 croak ("new_text extends beyond horizontal margins"); 1259 croak ("new_text extends beyond horizontal margins");
1100 } 1260 }
1101 1261
1111 1271
1112void 1272void
1113rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1273rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1114 PPCODE: 1274 PPCODE:
1115{ 1275{
1116 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1276 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1117 XSRETURN_EMPTY; 1277 XSRETURN_EMPTY;
1118 1278
1119 line_t &l = ROW(row_number); 1279 line_t &l = ROW(row_number);
1120 1280
1121 if (GIMME_V != G_VOID) 1281 if (GIMME_V != G_VOID)
1133 { 1293 {
1134 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1294 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1135 croak ("new_rend must be arrayref"); 1295 croak ("new_rend must be arrayref");
1136 1296
1137 AV *av = (AV *)SvRV (new_rend); 1297 AV *av = (AV *)SvRV (new_rend);
1138 int len = min (av_len (av) + 1 - start_ofs, max_len); 1298 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1139 1299
1140 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1300 if (start_col < 0 || start_col + len > THIS->ncol)
1141 croak ("new_rend array extends beyond horizontal margins"); 1301 croak ("new_rend array extends beyond horizontal margins");
1142 1302
1143 for (int col = start_col; col < start_col + len; col++) 1303 for (int col = start_col; col < start_col + len; col++)
1144 { 1304 {
1145 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1305 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1151 1311
1152int 1312int
1153rxvt_term::ROW_l (int row_number, int new_length = -1) 1313rxvt_term::ROW_l (int row_number, int new_length = -1)
1154 CODE: 1314 CODE:
1155{ 1315{
1156 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1316 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1157 XSRETURN_EMPTY; 1317 XSRETURN_EMPTY;
1158 1318
1159 line_t &l = ROW(row_number); 1319 line_t &l = ROW(row_number);
1160 RETVAL = l.l; 1320 RETVAL = l.l;
1161 1321
1167 1327
1168bool 1328bool
1169rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1329rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1170 CODE: 1330 CODE:
1171{ 1331{
1172 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1332 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1173 XSRETURN_EMPTY; 1333 XSRETURN_EMPTY;
1174 1334
1175 line_t &l = ROW(row_number); 1335 line_t &l = ROW(row_number);
1176 RETVAL = l.is_longer (); 1336 RETVAL = l.is_longer ();
1177 1337
1211 else 1371 else
1212 *r++ = *s; 1372 *r++ = *s;
1213 1373
1214 rxvt_pop_locale (); 1374 rxvt_pop_locale ();
1215 1375
1216 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1376 RETVAL = wcs2sv (rstr, r - rstr);
1217 1377
1218 delete [] rstr; 1378 delete [] rstr;
1219} 1379}
1220 OUTPUT: 1380 OUTPUT:
1221 RETVAL 1381 RETVAL
1247 else if (IS_COMPOSE (*s)) 1407 else if (IS_COMPOSE (*s))
1248 r += rxvt_composite.expand (*s, r); 1408 r += rxvt_composite.expand (*s, r);
1249 else 1409 else
1250 *r++ = *s; 1410 *r++ = *s;
1251 1411
1252 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1412 RETVAL = wcs2sv (rstr, r - rstr);
1253 1413
1254 delete [] rstr; 1414 delete [] rstr;
1255} 1415}
1256 OUTPUT: 1416 OUTPUT:
1257 RETVAL 1417 RETVAL
1279 1439
1280 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1440 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1281 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1441 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1282 1442
1283 if (GIMME_V != G_VOID) 1443 if (GIMME_V != G_VOID)
1284 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1444 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1285 1445
1286 if (newval) 1446 if (newval)
1287 { 1447 {
1288 if (SvOK (newval)) 1448 if (SvOK (newval))
1289 { 1449 {
1296 } 1456 }
1297} 1457}
1298 1458
1299const char * 1459const char *
1300rxvt_term::x_resource (const char *name) 1460rxvt_term::x_resource (const char *name)
1301 CLEANUP:
1302 SvTAINTED_on (ST (0));
1303 1461
1304bool 1462bool
1305rxvt_term::option (U32 optval, int set = -1) 1463rxvt_term::option (U32 optval, int set = -1)
1306 CODE: 1464 CODE:
1307{ 1465{
1312 if (set) 1470 if (set)
1313 THIS->options |= optval; 1471 THIS->options |= optval;
1314 else 1472 else
1315 THIS->options &= ~optval; 1473 THIS->options &= ~optval;
1316 1474
1475 if (THIS->check_ev.is_active ()) // avoid doing this before START
1317 switch (optval) 1476 switch (optval)
1318 { 1477 {
1319 case Opt_skipBuiltinGlyphs: 1478 case Opt_skipBuiltinGlyphs:
1320 THIS->set_fonts (); 1479 THIS->set_fonts ();
1321 THIS->scr_remap_chars (); 1480 THIS->scr_remap_chars ();
1322 THIS->scr_touch (true); 1481 THIS->scr_touch (true);
1323 THIS->want_refresh = 1; 1482 THIS->want_refresh = 1;
1324 break; 1483 break;
1325 1484
1326 case Opt_cursorUnderline: 1485 case Opt_cursorUnderline:
1327 THIS->want_refresh = 1; 1486 THIS->want_refresh = 1;
1328 break; 1487 break;
1329 1488
1330# case Opt_scrollBar_floating: 1489# case Opt_scrollBar_floating:
1331# case Opt_scrollBar_right: 1490# case Opt_scrollBar_right:
1332# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1491# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1333# break; 1492# break;
1334 } 1493 }
1335 } 1494 }
1336} 1495}
1337 OUTPUT: 1496 OUTPUT:
1338 RETVAL 1497 RETVAL
1339 1498
1367 PUSHs (sv_2mortal (newSViv (rc.col))); 1526 PUSHs (sv_2mortal (newSViv (rc.col)));
1368 } 1527 }
1369 1528
1370 if (items == 3) 1529 if (items == 3)
1371 { 1530 {
1372 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1531 rc.row = SvIV (ST (1));
1373 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1532 rc.col = SvIV (ST (2));
1533
1534 if (ix == 2 && rc.col == 0)
1535 {
1536 rc.row--;
1537 rc.col = THIS->ncol;
1538 }
1539
1540 clamp_it (rc.col, 0, THIS->ncol);
1541 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1374 1542
1375 if (ix) 1543 if (ix)
1376 THIS->want_refresh = 1; 1544 THIS->want_refresh = 1;
1377 } 1545 }
1378} 1546}
1386 1554
1387#void 1555#void
1388#rxvt_term::selection_clear () 1556#rxvt_term::selection_clear ()
1389 1557
1390void 1558void
1391rxvt_term::selection_make (U32 eventtime, bool rect = false) 1559rxvt_term::selection_make (Time eventtime, bool rect = false)
1392 CODE: 1560 CODE:
1393 THIS->selection.op = SELECTION_CONT; 1561 THIS->selection.op = SELECTION_CONT;
1394 THIS->selection.rect = rect; 1562 THIS->selection.rect = rect;
1395 THIS->selection_make (eventtime); 1563 THIS->selection_make (eventtime);
1396 1564
1397int 1565int
1398rxvt_term::selection_grab (U32 eventtime) 1566rxvt_term::selection_grab (Time eventtime)
1399 1567
1400void 1568void
1401rxvt_term::selection (SV *newtext = 0) 1569rxvt_term::selection (SV *newtext = 0)
1402 PPCODE: 1570 PPCODE:
1403{ 1571{
1404 if (GIMME_V != G_VOID) 1572 if (GIMME_V != G_VOID)
1405 XPUSHs (THIS->selection.text 1573 XPUSHs (THIS->selection.text
1406 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1574 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1407 : &PL_sv_undef); 1575 : &PL_sv_undef);
1408 1576
1409 if (newtext) 1577 if (newtext)
1410 { 1578 {
1411 free (THIS->selection.text); 1579 free (THIS->selection.text);
1421void 1589void
1422rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1590rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1423 1591
1424void 1592void
1425rxvt_term::scr_bell () 1593rxvt_term::scr_bell ()
1594
1595void
1596rxvt_term::scr_change_screen (int screen)
1426 1597
1427void 1598void
1428rxvt_term::scr_add_lines (SV *string) 1599rxvt_term::scr_add_lines (SV *string)
1429 CODE: 1600 CODE:
1430{ 1601{
1471 o->self = (HV *)SvRV (RETVAL); 1642 o->self = (HV *)SvRV (RETVAL);
1472} 1643}
1473 OUTPUT: 1644 OUTPUT:
1474 RETVAL 1645 RETVAL
1475 1646
1647#############################################################################
1648# Various X Utility Functions
1649#############################################################################
1650
1651void
1652rxvt_term::XListProperties (Window window)
1653 PPCODE:
1654{
1655 int count;
1656 Atom *props = XListProperties (THIS->display->display, window, &count);
1657
1658 EXTEND (SP, count);
1659 while (count--)
1660 PUSHs (newSVuv ((U32)props [count]));
1661
1662 XFree (props);
1663}
1664
1665void
1666rxvt_term::XGetWindowProperty (Window window, Atom property)
1667 PPCODE:
1668{
1669 Atom type;
1670 int format;
1671 unsigned long nitems;
1672 unsigned long bytes_after;
1673 unsigned char *prop;
1674
1675 XGetWindowProperty (THIS->display->display, window, property,
1676 0, 1<<24, 0, AnyPropertyType,
1677 &type, &format, &nitems, &bytes_after, &prop);
1678
1679 if (type != None)
1680 {
1681 int elemsize = format == 16 ? sizeof (short)
1682 : format == 32 ? sizeof (long)
1683 : 1;
1684
1685 EXTEND (SP, 3);
1686 PUSHs (newSVuv ((U32)type));
1687 PUSHs (newSViv (format));
1688 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1689 XFree (prop);
1690 }
1691}
1692
1693void
1694rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1695 CODE:
1696{
1697 STRLEN len;
1698 char *data_ = SvPVbyte (data, len);
1699
1700 int elemsize = format == 16 ? sizeof (short)
1701 : format == 32 ? sizeof (long)
1702 : 1;
1703
1704 XChangeProperty (THIS->display->display, window, property,
1705 type, format, PropModeReplace,
1706 (unsigned char *)data_, len / elemsize);
1707 XSync (THIS->display->display, 0);
1708}
1709
1710Atom
1711XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1712 C_ARGS: term->display->display, atom_name, only_if_exists
1713
1714char *
1715XGetAtomName (rxvt_term *term, Atom atom)
1716 C_ARGS: term->display->display, atom
1717 CLEANUP:
1718 XFree (RETVAL);
1719
1720void
1721XDeleteProperty (rxvt_term *term, Window window, Atom property)
1722 C_ARGS: term->display->display, window, property
1723
1724Window
1725rxvt_term::DefaultRootWindow ()
1726 CODE:
1727 RETVAL = THIS->display->root;
1728 OUTPUT:
1729 RETVAL
1730
1731#if 0
1732
1733Window
1734XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1735 C_ARGS: term->display->display, (Window)parent,
1736 x, y, width, height, 0,
1737 term->pix_colors_focused[Color_border],
1738 term->pix_colors_focused[Color_border]
1739
1740#endif
1741
1742void
1743XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1744 C_ARGS: term->display->display, window, parent, x, y
1745
1746void
1747XMapWindow (rxvt_term *term, Window window)
1748 C_ARGS: term->display->display, window
1749
1750void
1751XUnmapWindow (rxvt_term *term, Window window)
1752 C_ARGS: term->display->display, window
1753
1754void
1755XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1756 C_ARGS: term->display->display, window, x, y, width, height
1757
1758void
1759rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1760 CODE:
1761{
1762 XWindowAttributes attr;
1763 XGetWindowAttributes (THIS->display->display, window, &attr);
1764 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1765}
1766
1767void
1768rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1769 PPCODE:
1770{
1771 int dx, dy;
1772 Window child;
1773
1774 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1775 {
1776 EXTEND (SP, 3);
1777 PUSHs (newSViv (dx));
1778 PUSHs (newSViv (dy));
1779 PUSHs (newSVuv (child));
1780 }
1781}
1782
1783#############################################################################
1784# urxvt::overlay
1785#############################################################################
1786
1476MODULE = urxvt PACKAGE = urxvt::overlay 1787MODULE = urxvt PACKAGE = urxvt::overlay
1477 1788
1478void 1789void
1479overlay::set (int x, int y, SV *text, SV *rend = 0) 1790overlay::set (int x, int y, SV *text, SV *rend = 0)
1480 1791
1484void 1795void
1485overlay::hide () 1796overlay::hide ()
1486 1797
1487void 1798void
1488overlay::DESTROY () 1799overlay::DESTROY ()
1800
1801#############################################################################
1802# urxvt::watcher
1803#############################################################################
1804
1805MODULE = urxvt PACKAGE = urxvt::watcher
1806
1807CHAINED
1808perl_watcher::cb (SV *cb)
1809 CODE:
1810 THIS->cb (cb);
1811 OUTPUT:
1812 RETVAL
1813
1814#############################################################################
1815# urxvt::timer
1816#############################################################################
1489 1817
1490MODULE = urxvt PACKAGE = urxvt::timer 1818MODULE = urxvt PACKAGE = urxvt::timer
1491 1819
1492SV * 1820SV *
1493timer::new () 1821timer::new ()
1494 CODE: 1822 CODE:
1495 timer *w = new timer; 1823 timer *w = new timer;
1496 w->start (NOW); 1824 w->start (NOW);
1497 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1825 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1498 w->self = (HV *)SvRV (RETVAL); 1826 w->self = (HV *)SvRV (RETVAL);
1499 OUTPUT:
1500 RETVAL
1501
1502timer *
1503timer::cb (SV *cb)
1504 CODE:
1505 THIS->cb (cb);
1506 RETVAL = THIS;
1507 OUTPUT: 1827 OUTPUT:
1508 RETVAL 1828 RETVAL
1509 1829
1510NV 1830NV
1511timer::at () 1831timer::at ()
1512 CODE: 1832 CODE:
1513 RETVAL = THIS->at; 1833 RETVAL = THIS->at;
1514 OUTPUT: 1834 OUTPUT:
1515 RETVAL 1835 RETVAL
1516 1836
1517timer * 1837CHAINED
1518timer::interval (NV interval) 1838timer::interval (NV interval)
1519 CODE: 1839 CODE:
1520 THIS->interval = interval; 1840 THIS->interval = interval;
1841 OUTPUT:
1521 RETVAL = THIS; 1842 RETVAL
1522 OUTPUT:
1523 RETVAL
1524 1843
1525timer * 1844CHAINED
1526timer::set (NV tstamp) 1845timer::set (NV tstamp)
1527 CODE: 1846 CODE:
1528 THIS->set (tstamp); 1847 THIS->set (tstamp);
1848 OUTPUT:
1529 RETVAL = THIS; 1849 RETVAL
1530 OUTPUT:
1531 RETVAL
1532 1850
1533timer * 1851CHAINED
1534timer::start (NV tstamp = THIS->at) 1852timer::start (NV tstamp = THIS->at)
1535 CODE: 1853 CODE:
1536 THIS->start (tstamp); 1854 THIS->start (tstamp);
1855 OUTPUT:
1537 RETVAL = THIS; 1856 RETVAL
1538 OUTPUT:
1539 RETVAL
1540 1857
1541timer * 1858CHAINED
1859timer::after (NV delay)
1860 CODE:
1861 THIS->start (NOW + delay);
1862 OUTPUT:
1863 RETVAL
1864
1865CHAINED
1542timer::stop () 1866timer::stop ()
1543 CODE: 1867 CODE:
1544 THIS->stop (); 1868 THIS->stop ();
1545 RETVAL = THIS;
1546 OUTPUT: 1869 OUTPUT:
1547 RETVAL 1870 RETVAL
1548 1871
1549void 1872void
1550timer::DESTROY () 1873timer::DESTROY ()
1874
1875#############################################################################
1876# urxvt::iow
1877#############################################################################
1551 1878
1552MODULE = urxvt PACKAGE = urxvt::iow 1879MODULE = urxvt PACKAGE = urxvt::iow
1553 1880
1554SV * 1881SV *
1555iow::new () 1882iow::new ()
1556 CODE: 1883 CODE:
1557 iow *w = new iow; 1884 iow *w = new iow;
1558 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1885 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1559 w->self = (HV *)SvRV (RETVAL); 1886 w->self = (HV *)SvRV (RETVAL);
1560 OUTPUT: 1887 OUTPUT:
1561 RETVAL 1888 RETVAL
1562 1889
1563iow * 1890CHAINED
1564iow::cb (SV *cb)
1565 CODE:
1566 THIS->cb (cb);
1567 RETVAL = THIS;
1568 OUTPUT:
1569 RETVAL
1570
1571iow *
1572iow::fd (int fd) 1891iow::fd (int fd)
1573 CODE: 1892 CODE:
1574 THIS->fd = fd; 1893 THIS->fd = fd;
1894 OUTPUT:
1575 RETVAL = THIS; 1895 RETVAL
1576 OUTPUT:
1577 RETVAL
1578 1896
1579iow * 1897CHAINED
1580iow::events (short events) 1898iow::events (short events)
1581 CODE: 1899 CODE:
1582 THIS->events = events; 1900 THIS->events = events;
1901 OUTPUT:
1583 RETVAL = THIS; 1902 RETVAL
1584 OUTPUT:
1585 RETVAL
1586 1903
1587iow * 1904CHAINED
1588iow::start () 1905iow::start ()
1589 CODE: 1906 CODE:
1590 THIS->start (); 1907 THIS->start ();
1908 OUTPUT:
1591 RETVAL = THIS; 1909 RETVAL
1592 OUTPUT:
1593 RETVAL
1594 1910
1595iow * 1911CHAINED
1596iow::stop () 1912iow::stop ()
1597 CODE: 1913 CODE:
1598 THIS->stop (); 1914 THIS->stop ();
1599 RETVAL = THIS;
1600 OUTPUT: 1915 OUTPUT:
1601 RETVAL 1916 RETVAL
1602 1917
1603void 1918void
1604iow::DESTROY () 1919iow::DESTROY ()
1605 1920
1921#############################################################################
1922# urxvt::iw
1923#############################################################################
1606 1924
1925MODULE = urxvt PACKAGE = urxvt::iw
1926
1927SV *
1928iw::new ()
1929 CODE:
1930 iw *w = new iw;
1931 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1932 w->self = (HV *)SvRV (RETVAL);
1933 OUTPUT:
1934 RETVAL
1935
1936CHAINED
1937iw::start ()
1938 CODE:
1939 THIS->start ();
1940 OUTPUT:
1941 RETVAL
1942
1943CHAINED
1944iw::stop ()
1945 CODE:
1946 THIS->stop ();
1947 OUTPUT:
1948 RETVAL
1949
1950void
1951iw::DESTROY ()
1952
1953#############################################################################
1954# urxvt::pw
1955#############################################################################
1956
1957MODULE = urxvt PACKAGE = urxvt::pw
1958
1959SV *
1960pw::new ()
1961 CODE:
1962 pw *w = new pw;
1963 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1964 w->self = (HV *)SvRV (RETVAL);
1965 OUTPUT:
1966 RETVAL
1967
1968CHAINED
1969pw::start (int pid)
1970 CODE:
1971 THIS->start (pid);
1972 OUTPUT:
1973 RETVAL
1974
1975CHAINED
1976pw::stop ()
1977 CODE:
1978 THIS->stop ();
1979 OUTPUT:
1980 RETVAL
1981
1982void
1983pw::DESTROY ()
1984
1985

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines