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.62 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.92 by root, Wed Jan 25 00:57:57 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 printf ("pushing str %p:%d\n", str,len);//D
562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
563 }
564 break;
565
566 case DT_WCS_LEN:
567 {
568 wchar_t *wstr = va_arg (ap, wchar_t *);
569 int wlen = va_arg (ap, int);
570
571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 }
573 break;
574
575 case DT_LCS_LEN:
576 {
577 long *lstr = va_arg (ap, long *);
578 int llen = va_arg (ap, int);
579
580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
581 }
582 break;
583
584 case DT_XEVENT:
585 {
586 XEvent *xe = va_arg (ap, XEvent *);
587 HV *hv = newHV ();
588
589# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
590# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
591# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
592# undef set
593
594 setiv (type, xe->type);
595 setiv (send_event, xe->xany.send_event);
596 setiv (serial, xe->xany.serial);
597
598 switch (xe->type)
599 {
600 case KeyPress:
601 case KeyRelease:
602 case ButtonPress:
603 case ButtonRelease:
604 case MotionNotify:
605 setuv (window, xe->xmotion.window);
606 setuv (root, xe->xmotion.root);
607 setuv (subwindow, xe->xmotion.subwindow);
608 setuv (time, xe->xmotion.time);
609 setiv (x, xe->xmotion.x);
610 setiv (y, xe->xmotion.y);
611 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
612 setiv (col, xe->xmotion.x / term->fwidth);
613 setiv (x_root, xe->xmotion.x_root);
614 setiv (y_root, xe->xmotion.y_root);
615 setuv (state, xe->xmotion.state);
616
617 switch (xe->type)
618 {
619 case KeyPress:
620 case KeyRelease:
621 setuv (keycode, xe->xkey.keycode);
622 break;
623
624 case ButtonPress:
625 case ButtonRelease:
626 setuv (button, xe->xbutton.button);
627 break;
628
629 case MotionNotify:
630 setiv (is_hint, xe->xmotion.is_hint);
631 break;
632 }
633
634 break;
635
636 case MapNotify:
637 case UnmapNotify:
638 case ConfigureNotify:
639 setuv (event, xe->xconfigure.event);
640 setuv (window, xe->xconfigure.window);
641
642 switch (xe->type)
643 {
644 case ConfigureNotify:
645 setiv (x, xe->xconfigure.x);
646 setiv (y, xe->xconfigure.y);
647 setiv (width, xe->xconfigure.width);
648 setiv (height, xe->xconfigure.height);
649 setuv (above, xe->xconfigure.above);
650 break;
651 }
652
653 break;
654
655 case PropertyNotify:
656 setuv (window, xe->xproperty.window);
657 setuv (atom, xe->xproperty.atom);
658 setuv (time, xe->xproperty.time);
659 setiv (state, xe->xproperty.state);
660 break;
661
662 case ClientMessage:
663 setuv (window, xe->xclient.window);
664 setuv (message_type, xe->xclient.message_type);
665 setuv (format, xe->xclient.format);
666 setuv (l0, xe->xclient.data.l[0]);
667 setuv (l1, xe->xclient.data.l[1]);
668 setuv (l2, xe->xclient.data.l[2]);
669 setuv (l3, xe->xclient.data.l[3]);
670 setuv (l4, xe->xclient.data.l[4]);
671 break;
672 }
673
674 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
675 }
676 break;
677
678 case DT_END:
679 goto call;
680
681 default:
682 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
683 }
684 }
685
686 call:
687 va_end (ap);
688
689 PUTBACK;
690 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
691 SPAGAIN;
692
693 if (count)
694 {
695 SV *status = POPs;
696 count = SvTRUE (status);
697 }
698
699 PUTBACK;
700 FREETMPS;
701 LEAVE;
702
703 if (SvTRUE (ERRSV))
704 {
705 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
706 ungrab (term); // better lose the grab than the session
707 }
708
709 event_consumed = !!count;
710 }
711 catch (...)
712 {
713 swap (perl_environ, environ);
714 throw;
715 }
716 else
717 event_consumed = false;
718
719 // post-handling of some events
720 if (htype == HOOK_REFRESH_BEGIN)
721 {
722 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
723
724 for (int i = AvFILL (av); i >= 0; i--)
725 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
726 }
464 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
465 { 728 {
466 // handled later 729 clearSVptr ((SV *)term->perl.self);
730 SvREFCNT_dec ((SV *)term->perl.self);
731
732 // don't allow further calls
733 term->perl.self = 0;
467 } 734 }
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 (!term->perl.should_invoke [htype])
485 return false;
486 }
487 735
488 swap (perl_environ, environ); 736 swap (perl_environ, environ);
489 737
490 try 738 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} 739}
637 740
638///////////////////////////////////////////////////////////////////////////// 741/////////////////////////////////////////////////////////////////////////////
639 742
640MODULE = urxvt PACKAGE = urxvt 743MODULE = urxvt PACKAGE = urxvt
752 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
753 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
754 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
755 const_iv (ClientMessage), 858 const_iv (ClientMessage),
756 const_iv (MappingNotify), 859 const_iv (MappingNotify),
860# if ENABLE_XIM_ONTHESPOT
861 const_iv (XIMReverse),
862 const_iv (XIMUnderline),
863 const_iv (XIMHighlight),
864 const_iv (XIMPrimary),
865 const_iv (XIMSecondary),
866 const_iv (XIMTertiary),
867 const_iv (XIMVisibleToForward),
868 const_iv (XIMVisibleToBackword),
869 const_iv (XIMVisibleToCenter),
870# if 0
871 const_iv (XIMForwardChar),
872 const_iv (XIMBackwardChar),
873 const_iv (XIMForwardWord),
874 const_iv (XIMBackwardWord),
875 const_iv (XIMCaretUp),
876 const_iv (XIMCaretDown),
877 const_iv (XIMNextLine),
878 const_iv (XIMPreviousLine),
879 const_iv (XIMLineStart),
880 const_iv (XIMLineEnd),
881 const_iv (XIMAbsolutePosition),
882 const_iv (XIMDontChange),
883# endif
884# endif
757 }; 885 };
758 886
759 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
760 civ-- > const_iv; ) 888 civ-- > const_iv; )
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
769void 897void
770fatal (const char *msg) 898fatal (const char *msg)
771 CODE: 899 CODE:
772 rxvt_fatal ("%s", msg); 900 rxvt_fatal ("%s", msg);
773 901
774SV *
775untaint (SV *sv)
776 CODE:
777 RETVAL = newSVsv (sv);
778 SvTAINTED_off (RETVAL);
779 OUTPUT:
780 RETVAL
781
782void 902void
783_exit (int status) 903_exit (int status)
784
785bool
786safe ()
787 CODE:
788 RETVAL = !rxvt_tainted ();
789 OUTPUT:
790 RETVAL
791 904
792NV 905NV
793NOW () 906NOW ()
794 CODE: 907 CODE:
795 RETVAL = NOW; 908 RETVAL = NOW;
853 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 966 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
854 croak ("first argument to urxvt::term->_new must be arrayref"); 967 croak ("first argument to urxvt::term->_new must be arrayref");
855 968
856 rxvt_term *term = new rxvt_term; 969 rxvt_term *term = new rxvt_term;
857 970
858 term->argv = new stringvec; 971 stringvec *argv = new stringvec;
859 term->envv = new stringvec; 972 stringvec *envv = new stringvec;
860 973
861 for (int i = 1; i < items; i++) 974 for (int i = 1; i < items; i++)
862 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 975 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
863 976
864 AV *envv = (AV *)SvRV (ST (0)); 977 AV *env = (AV *)SvRV (ST (0));
865 for (int i = av_len (envv) + 1; i--; ) 978 for (int i = AvFILL (env) + 1; i--; )
866 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 979 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
867 980
868 term->envv->push_back (0); 981 envv->push_back (0);
869 982
870 bool success; 983 bool success;
871 984
872 try 985 try
873 { 986 {
874 success = term->init (term->argv->size (), term->argv->begin ()); 987 success = term->init (argv, envv);
875 } 988 }
876 catch (const class rxvt_failure_exception &e) 989 catch (const class rxvt_failure_exception &e)
877 { 990 {
878 success = false; 991 success = false;
879 } 992 }
904 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1017 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
905 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1018 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
906 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1019 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
907 1020
908bool 1021bool
909rxvt_term::grab (U32 eventtime, int sync = 0) 1022rxvt_term::grab (Time eventtime, int sync = 0)
910 CODE: 1023 CODE:
911{ 1024{
912 int mode = sync ? GrabModeSync : GrabModeAsync; 1025 int mode = sync ? GrabModeSync : GrabModeAsync;
913 1026
914 THIS->perl.grabtime = 0; 1027 THIS->perl.grabtime = 0;
972 char *mbstr = rxvt_wcstombs (wstr); 1085 char *mbstr = rxvt_wcstombs (wstr);
973 rxvt_pop_locale (); 1086 rxvt_pop_locale ();
974 1087
975 free (wstr); 1088 free (wstr);
976 1089
977 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1090 RETVAL = newSVpv (mbstr, 0);
978 free (mbstr); 1091 free (mbstr);
979} 1092}
980 OUTPUT: 1093 OUTPUT:
981 RETVAL 1094 RETVAL
982 1095
989 1102
990 rxvt_push_locale (THIS->locale); 1103 rxvt_push_locale (THIS->locale);
991 wchar_t *wstr = rxvt_mbstowcs (data, len); 1104 wchar_t *wstr = rxvt_mbstowcs (data, len);
992 rxvt_pop_locale (); 1105 rxvt_pop_locale ();
993 1106
994 RETVAL = taint_if (wcs2sv (wstr), octets); 1107 RETVAL = wcs2sv (wstr);
995 free (wstr); 1108 free (wstr);
996} 1109}
997 OUTPUT: 1110 OUTPUT:
998 RETVAL 1111 RETVAL
999 1112
1006#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1119#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1007#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1120#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1008#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1121#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1009#define TERM_OFFSET_focus TERM_OFFSET(focus) 1122#define TERM_OFFSET_focus TERM_OFFSET(focus)
1010#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1123#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1124#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1125#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1126#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1011#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1127#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1012#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1128#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1013#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1129#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1014 1130
1015int 1131int
1016rxvt_term::width () 1132rxvt_term::width ()
1017 ALIAS: 1133 ALIAS:
1018 width = TERM_OFFSET_width 1134 width = TERM_OFFSET_width
1022 fbase = TERM_OFFSET_fbase 1138 fbase = TERM_OFFSET_fbase
1023 nrow = TERM_OFFSET_nrow 1139 nrow = TERM_OFFSET_nrow
1024 ncol = TERM_OFFSET_ncol 1140 ncol = TERM_OFFSET_ncol
1025 focus = TERM_OFFSET_focus 1141 focus = TERM_OFFSET_focus
1026 mapped = TERM_OFFSET_mapped 1142 mapped = TERM_OFFSET_mapped
1143 int_bwidth = TERM_OFFSET_int_bwidth
1144 ext_bwidth = TERM_OFFSET_ext_bwidth
1145 lineSpace = TERM_OFFSET_lineSpace
1027 saveLines = TERM_OFFSET_saveLines 1146 saveLines = TERM_OFFSET_saveLines
1028 total_rows = TERM_OFFSET_total_rows 1147 total_rows = TERM_OFFSET_total_rows
1029 nsaved = TERM_OFFSET_nsaved 1148 top_row = TERM_OFFSET_top_row
1030 CODE: 1149 CODE:
1031 RETVAL = *(int *)((char *)THIS + ix); 1150 RETVAL = *(int *)((char *)THIS + ix);
1032 OUTPUT: 1151 OUTPUT:
1033 RETVAL 1152 RETVAL
1034 1153
1036rxvt_term::ModLevel3Mask () 1155rxvt_term::ModLevel3Mask ()
1037 ALIAS: 1156 ALIAS:
1038 ModLevel3Mask = 0 1157 ModLevel3Mask = 0
1039 ModMetaMask = 1 1158 ModMetaMask = 1
1040 ModNumLockMask = 2 1159 ModNumLockMask = 2
1160 current_screen = 3
1161 hidden_cursor = 4
1041 CODE: 1162 CODE:
1042 switch (ix) 1163 switch (ix)
1043 { 1164 {
1044 case 0: RETVAL = THIS->ModLevel3Mask; break; 1165 case 0: RETVAL = THIS->ModLevel3Mask; break;
1045 case 1: RETVAL = THIS->ModMetaMask; break; 1166 case 1: RETVAL = THIS->ModMetaMask; break;
1046 case 2: RETVAL = THIS->ModNumLockMask; break; 1167 case 2: RETVAL = THIS->ModNumLockMask; break;
1168 case 3: RETVAL = THIS->current_screen; break;
1169 case 4: RETVAL = THIS->hidden_cursor; break;
1047 } 1170 }
1048 OUTPUT: 1171 OUTPUT:
1049 RETVAL 1172 RETVAL
1050 1173
1051char * 1174char *
1089 if (events != EVENT_UNDEF) 1212 if (events != EVENT_UNDEF)
1090 THIS->pty_ev.set (events); 1213 THIS->pty_ev.set (events);
1091 OUTPUT: 1214 OUTPUT:
1092 RETVAL 1215 RETVAL
1093 1216
1094U32 1217int
1218rxvt_term::pty_fd ()
1219 CODE:
1220 RETVAL = THIS->pty->pty;
1221 OUTPUT:
1222 RETVAL
1223
1224Window
1095rxvt_term::parent () 1225rxvt_term::parent ()
1096 CODE: 1226 CODE:
1097 RETVAL = (U32)THIS->parent [0]; 1227 RETVAL = THIS->parent [0];
1098 OUTPUT: 1228 OUTPUT:
1099 RETVAL 1229 RETVAL
1100 1230
1101U32 1231Window
1102rxvt_term::vt () 1232rxvt_term::vt ()
1103 CODE: 1233 CODE:
1104 RETVAL = (U32)THIS->vt; 1234 RETVAL = THIS->vt;
1105 OUTPUT: 1235 OUTPUT:
1106 RETVAL 1236 RETVAL
1107 1237
1108void 1238void
1109rxvt_term::vt_emask_add (U32 emask) 1239rxvt_term::vt_emask_add (U32 emask)
1112 THIS->vt_select_input (); 1242 THIS->vt_select_input ();
1113 1243
1114U32 1244U32
1115rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1245rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1116 CODE: 1246 CODE:
1117{
1118 RETVAL = THIS->rstyle; 1247 RETVAL = THIS->rstyle;
1119 THIS->rstyle = new_rstyle; 1248 THIS->rstyle = new_rstyle;
1120}
1121 OUTPUT: 1249 OUTPUT:
1122 RETVAL 1250 RETVAL
1123 1251
1124int 1252int
1125rxvt_term::view_start (int newval = -1) 1253rxvt_term::view_start (int newval = 1)
1126 PROTOTYPE: $;$ 1254 PROTOTYPE: $;$
1127 CODE: 1255 CODE:
1128{ 1256{
1129 RETVAL = THIS->view_start; 1257 RETVAL = THIS->view_start;
1130 1258
1131 if (newval >= 0) 1259 if (newval <= 0)
1132 { 1260 THIS->scr_changeview (max (newval, THIS->top_row));
1133 THIS->view_start = min (newval, THIS->nsaved);
1134 THIS->scr_changeview (RETVAL);
1135 }
1136} 1261}
1137 OUTPUT: 1262 OUTPUT:
1138 RETVAL 1263 RETVAL
1264
1265void
1266rxvt_term::focus_in ()
1267
1268void
1269rxvt_term::focus_out ()
1139 1270
1140void 1271void
1141rxvt_term::want_refresh () 1272rxvt_term::want_refresh ()
1142 CODE: 1273 CODE:
1143 THIS->want_refresh = 1; 1274 THIS->want_refresh = 1;
1144 1275
1145void 1276void
1146rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1277rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1147 PPCODE: 1278 PPCODE:
1148{ 1279{
1149 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1280 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1150 XSRETURN_EMPTY; 1281 XSRETURN_EMPTY;
1151 1282
1152 line_t &l = ROW(row_number); 1283 line_t &l = ROW(row_number);
1153 1284
1154 if (GIMME_V != G_VOID) 1285 if (GIMME_V != G_VOID)
1155 { 1286 {
1156 wchar_t *wstr = new wchar_t [THIS->ncol]; 1287 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1157 1288
1158 for (int col = 0; col < THIS->ncol; col++) 1289 for (int col = 0; col < THIS->ncol; col++)
1159 wstr [col] = l.t [col]; 1290 wstr [col] = l.t [col];
1160 1291
1161 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1292 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1162
1163 delete [] wstr;
1164 } 1293 }
1165 1294
1166 if (new_text) 1295 if (new_text)
1167 { 1296 {
1168 wchar_t *wstr = sv2wcs (new_text); 1297 wchar_t *wstr = sv2wcs (new_text);
1169 1298
1170 int len = min (wcslen (wstr) - start_ofs, max_len); 1299 int len = min (wcslen (wstr) - start_ofs, max_len);
1171 1300
1172 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1301 if (start_col < 0 || start_col + len > THIS->ncol)
1173 { 1302 {
1174 free (wstr); 1303 free (wstr);
1175 croak ("new_text extends beyond horizontal margins"); 1304 croak ("new_text extends beyond horizontal margins");
1176 } 1305 }
1177 1306
1187 1316
1188void 1317void
1189rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1318rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1190 PPCODE: 1319 PPCODE:
1191{ 1320{
1192 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1321 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1193 XSRETURN_EMPTY; 1322 XSRETURN_EMPTY;
1194 1323
1195 line_t &l = ROW(row_number); 1324 line_t &l = ROW(row_number);
1196 1325
1197 if (GIMME_V != G_VOID) 1326 if (GIMME_V != G_VOID)
1209 { 1338 {
1210 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1339 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1211 croak ("new_rend must be arrayref"); 1340 croak ("new_rend must be arrayref");
1212 1341
1213 AV *av = (AV *)SvRV (new_rend); 1342 AV *av = (AV *)SvRV (new_rend);
1214 int len = min (av_len (av) + 1 - start_ofs, max_len); 1343 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1215 1344
1216 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1345 if (start_col < 0 || start_col + len > THIS->ncol)
1217 croak ("new_rend array extends beyond horizontal margins"); 1346 croak ("new_rend array extends beyond horizontal margins");
1218 1347
1219 for (int col = start_col; col < start_col + len; col++) 1348 for (int col = start_col; col < start_col + len; col++)
1220 { 1349 {
1221 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1350 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1227 1356
1228int 1357int
1229rxvt_term::ROW_l (int row_number, int new_length = -1) 1358rxvt_term::ROW_l (int row_number, int new_length = -1)
1230 CODE: 1359 CODE:
1231{ 1360{
1232 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1361 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1233 XSRETURN_EMPTY; 1362 XSRETURN_EMPTY;
1234 1363
1235 line_t &l = ROW(row_number); 1364 line_t &l = ROW(row_number);
1236 RETVAL = l.l; 1365 RETVAL = l.l;
1237 1366
1243 1372
1244bool 1373bool
1245rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1374rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1246 CODE: 1375 CODE:
1247{ 1376{
1248 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1377 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1249 XSRETURN_EMPTY; 1378 XSRETURN_EMPTY;
1250 1379
1251 line_t &l = ROW(row_number); 1380 line_t &l = ROW(row_number);
1252 RETVAL = l.is_longer (); 1381 RETVAL = l.is_longer ();
1253 1382
1261rxvt_term::special_encode (SV *string) 1390rxvt_term::special_encode (SV *string)
1262 CODE: 1391 CODE:
1263{ 1392{
1264 wchar_t *wstr = sv2wcs (string); 1393 wchar_t *wstr = sv2wcs (string);
1265 int wlen = wcslen (wstr); 1394 int wlen = wcslen (wstr);
1266 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1395 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1267 1396
1268 rxvt_push_locale (THIS->locale); 1397 rxvt_push_locale (THIS->locale);
1269 1398
1270 wchar_t *r = rstr; 1399 wchar_t *r = rstr;
1271 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1401 {
1402 int w = WCWIDTH (*s);
1403
1272 if (wcwidth (*s) == 0) 1404 if (w == 0)
1273 { 1405 {
1274 if (r == rstr) 1406 if (r == rstr)
1275 croak ("leading combining character unencodable"); 1407 croak ("leading combining character unencodable");
1276 1408
1277 unicode_t n = rxvt_compose (r[-1], *s); 1409 unicode_t n = rxvt_compose (r[-1], *s);
1278 if (n == NOCHAR) 1410 if (n == NOCHAR)
1279 n = rxvt_composite.compose (r[-1], *s); 1411 n = rxvt_composite.compose (r[-1], *s);
1280 1412
1281 r[-1] = n; 1413 r[-1] = n;
1282 } 1414 }
1283#if !UNICODE_3 1415#if !UNICODE_3
1284 else if (*s >= 0x10000) 1416 else if (*s >= 0x10000)
1285 *r++ = rxvt_composite.compose (*s); 1417 *r++ = rxvt_composite.compose (*s);
1286#endif 1418#endif
1287 else 1419 else
1288 *r++ = *s; 1420 *r++ = *s;
1421
1422 // the *2 above only allows wcwidth <= 2
1423 if (w > 1)
1424 *r++ = NOCHAR;
1425 }
1289 1426
1290 rxvt_pop_locale (); 1427 rxvt_pop_locale ();
1291 1428
1292 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1429 RETVAL = wcs2sv (rstr, r - rstr);
1293
1294 delete [] rstr;
1295} 1430}
1296 OUTPUT: 1431 OUTPUT:
1297 RETVAL 1432 RETVAL
1298 1433
1299SV * 1434SV *
1311 else if (IS_COMPOSE (*s)) 1446 else if (IS_COMPOSE (*s))
1312 dlen += rxvt_composite.expand (*s, 0); 1447 dlen += rxvt_composite.expand (*s, 0);
1313 else 1448 else
1314 dlen++; 1449 dlen++;
1315 1450
1316 wchar_t *rstr = new wchar_t [dlen]; 1451 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1317 1452
1318 // decode 1453 // decode
1319 wchar_t *r = rstr; 1454 wchar_t *r = rstr;
1320 for (wchar_t *s = wstr; *s; s++) 1455 for (wchar_t *s = wstr; *s; s++)
1321 if (*s == NOCHAR) 1456 if (*s == NOCHAR)
1323 else if (IS_COMPOSE (*s)) 1458 else if (IS_COMPOSE (*s))
1324 r += rxvt_composite.expand (*s, r); 1459 r += rxvt_composite.expand (*s, r);
1325 else 1460 else
1326 *r++ = *s; 1461 *r++ = *s;
1327 1462
1328 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1463 RETVAL = wcs2sv (rstr, r - rstr);
1329
1330 delete [] rstr;
1331} 1464}
1332 OUTPUT: 1465 OUTPUT:
1333 RETVAL 1466 RETVAL
1334 1467
1335void 1468void
1355 1488
1356 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1489 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1357 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1490 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1358 1491
1359 if (GIMME_V != G_VOID) 1492 if (GIMME_V != G_VOID)
1360 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1493 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1361 1494
1362 if (newval) 1495 if (newval)
1363 { 1496 {
1364 if (SvOK (newval)) 1497 if (SvOK (newval))
1365 { 1498 {
1372 } 1505 }
1373} 1506}
1374 1507
1375const char * 1508const char *
1376rxvt_term::x_resource (const char *name) 1509rxvt_term::x_resource (const char *name)
1377 CLEANUP:
1378 SvTAINTED_on (ST (0));
1379 1510
1380bool 1511bool
1381rxvt_term::option (U32 optval, int set = -1) 1512rxvt_term::option (U32 optval, int set = -1)
1382 CODE: 1513 CODE:
1383{ 1514{
1388 if (set) 1519 if (set)
1389 THIS->options |= optval; 1520 THIS->options |= optval;
1390 else 1521 else
1391 THIS->options &= ~optval; 1522 THIS->options &= ~optval;
1392 1523
1524 if (THIS->check_ev.is_active ()) // avoid doing this before START
1393 switch (optval) 1525 switch (optval)
1394 { 1526 {
1395 case Opt_skipBuiltinGlyphs: 1527 case Opt_skipBuiltinGlyphs:
1396 THIS->set_fonts (); 1528 THIS->set_fonts ();
1397 THIS->scr_remap_chars (); 1529 THIS->scr_remap_chars ();
1398 THIS->scr_touch (true); 1530 THIS->scr_touch (true);
1399 THIS->want_refresh = 1; 1531 THIS->want_refresh = 1;
1400 break; 1532 break;
1401 1533
1402 case Opt_cursorUnderline: 1534 case Opt_cursorUnderline:
1403 THIS->want_refresh = 1; 1535 THIS->want_refresh = 1;
1404 break; 1536 break;
1405 1537
1406# case Opt_scrollBar_floating: 1538# case Opt_scrollBar_floating:
1407# case Opt_scrollBar_right: 1539# case Opt_scrollBar_right:
1408# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1540# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1409# break; 1541# break;
1410 } 1542 }
1411 } 1543 }
1412} 1544}
1413 OUTPUT: 1545 OUTPUT:
1414 RETVAL 1546 RETVAL
1415 1547
1443 PUSHs (sv_2mortal (newSViv (rc.col))); 1575 PUSHs (sv_2mortal (newSViv (rc.col)));
1444 } 1576 }
1445 1577
1446 if (items == 3) 1578 if (items == 3)
1447 { 1579 {
1448 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1580 rc.row = SvIV (ST (1));
1449 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1581 rc.col = SvIV (ST (2));
1582
1583 if (ix == 2)
1584 {
1585 if (rc.col == 0)
1586 {
1587 // col == 0 means end of previous line
1588 rc.row--;
1589 rc.col = THIS->ncol;
1590 }
1591 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1592 && rc.col > ROW(rc.row).l)
1593 {
1594 // col >= length means while line and add newline
1595 rc.col = THIS->ncol;
1596 }
1597 }
1598
1599 clamp_it (rc.col, 0, THIS->ncol);
1600 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1450 1601
1451 if (ix) 1602 if (ix)
1452 THIS->want_refresh = 1; 1603 THIS->want_refresh = 1;
1453 } 1604 }
1454} 1605}
1462 1613
1463#void 1614#void
1464#rxvt_term::selection_clear () 1615#rxvt_term::selection_clear ()
1465 1616
1466void 1617void
1467rxvt_term::selection_make (U32 eventtime, bool rect = false) 1618rxvt_term::selection_make (Time eventtime, bool rect = false)
1468 CODE: 1619 CODE:
1469 THIS->selection.op = SELECTION_CONT; 1620 THIS->selection.op = SELECTION_CONT;
1470 THIS->selection.rect = rect; 1621 THIS->selection.rect = rect;
1471 THIS->selection_make (eventtime); 1622 THIS->selection_make (eventtime);
1472 1623
1473int 1624int
1474rxvt_term::selection_grab (U32 eventtime) 1625rxvt_term::selection_grab (Time eventtime)
1475 1626
1476void 1627void
1477rxvt_term::selection (SV *newtext = 0) 1628rxvt_term::selection (SV *newtext = 0)
1478 PPCODE: 1629 PPCODE:
1479{ 1630{
1480 if (GIMME_V != G_VOID) 1631 if (GIMME_V != G_VOID)
1481 XPUSHs (THIS->selection.text 1632 XPUSHs (THIS->selection.text
1482 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1633 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1483 : &PL_sv_undef); 1634 : &PL_sv_undef);
1484 1635
1485 if (newtext) 1636 if (newtext)
1486 { 1637 {
1487 free (THIS->selection.text); 1638 free (THIS->selection.text);
1497void 1648void
1498rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1649rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1499 1650
1500void 1651void
1501rxvt_term::scr_bell () 1652rxvt_term::scr_bell ()
1653
1654void
1655rxvt_term::scr_change_screen (int screen)
1502 1656
1503void 1657void
1504rxvt_term::scr_add_lines (SV *string) 1658rxvt_term::scr_add_lines (SV *string)
1505 CODE: 1659 CODE:
1506{ 1660{
1547 o->self = (HV *)SvRV (RETVAL); 1701 o->self = (HV *)SvRV (RETVAL);
1548} 1702}
1549 OUTPUT: 1703 OUTPUT:
1550 RETVAL 1704 RETVAL
1551 1705
1706#############################################################################
1707# Various X Utility Functions
1708#############################################################################
1709
1710void
1711rxvt_term::XListProperties (Window window)
1712 PPCODE:
1713{
1714 int count;
1715 Atom *props = XListProperties (THIS->display->display, window, &count);
1716
1717 EXTEND (SP, count);
1718 while (count--)
1719 PUSHs (newSVuv ((U32)props [count]));
1720
1721 XFree (props);
1722}
1723
1724void
1725rxvt_term::XGetWindowProperty (Window window, Atom property)
1726 PPCODE:
1727{
1728 Atom type;
1729 int format;
1730 unsigned long nitems;
1731 unsigned long bytes_after;
1732 unsigned char *prop;
1733
1734 XGetWindowProperty (THIS->display->display, window, property,
1735 0, 1<<24, 0, AnyPropertyType,
1736 &type, &format, &nitems, &bytes_after, &prop);
1737
1738 if (type != None)
1739 {
1740 int elemsize = format == 16 ? sizeof (short)
1741 : format == 32 ? sizeof (long)
1742 : 1;
1743
1744 EXTEND (SP, 3);
1745 PUSHs (newSVuv ((U32)type));
1746 PUSHs (newSViv (format));
1747 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1748 XFree (prop);
1749 }
1750}
1751
1752void
1753rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1754 CODE:
1755{
1756 STRLEN len;
1757 char *data_ = SvPVbyte (data, len);
1758
1759 int elemsize = format == 16 ? sizeof (short)
1760 : format == 32 ? sizeof (long)
1761 : 1;
1762
1763 XChangeProperty (THIS->display->display, window, property,
1764 type, format, PropModeReplace,
1765 (unsigned char *)data_, len / elemsize);
1766 XSync (THIS->display->display, 0);
1767}
1768
1769Atom
1770XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1771 C_ARGS: term->display->display, atom_name, only_if_exists
1772
1773char *
1774XGetAtomName (rxvt_term *term, Atom atom)
1775 C_ARGS: term->display->display, atom
1776 CLEANUP:
1777 XFree (RETVAL);
1778
1779void
1780XDeleteProperty (rxvt_term *term, Window window, Atom property)
1781 C_ARGS: term->display->display, window, property
1782
1783Window
1784rxvt_term::DefaultRootWindow ()
1785 CODE:
1786 RETVAL = THIS->display->root;
1787 OUTPUT:
1788 RETVAL
1789
1790#if 0
1791
1792Window
1793XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1794 C_ARGS: term->display->display, (Window)parent,
1795 x, y, width, height, 0,
1796 term->pix_colors_focused[Color_border],
1797 term->pix_colors_focused[Color_border]
1798
1799#endif
1800
1801void
1802XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1803 C_ARGS: term->display->display, window, parent, x, y
1804
1805void
1806XMapWindow (rxvt_term *term, Window window)
1807 C_ARGS: term->display->display, window
1808
1809void
1810XUnmapWindow (rxvt_term *term, Window window)
1811 C_ARGS: term->display->display, window
1812
1813void
1814XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1815 C_ARGS: term->display->display, window, x, y, width, height
1816
1817void
1818rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1819 CODE:
1820{
1821 XWindowAttributes attr;
1822 XGetWindowAttributes (THIS->display->display, window, &attr);
1823 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1824}
1825
1826void
1827rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1828 PPCODE:
1829{
1830 int dx, dy;
1831 Window child;
1832
1833 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1834 {
1835 EXTEND (SP, 3);
1836 PUSHs (newSViv (dx));
1837 PUSHs (newSViv (dy));
1838 PUSHs (newSVuv (child));
1839 }
1840}
1841
1842#############################################################################
1843# urxvt::overlay
1844#############################################################################
1845
1552MODULE = urxvt PACKAGE = urxvt::overlay 1846MODULE = urxvt PACKAGE = urxvt::overlay
1553 1847
1554void 1848void
1555overlay::set (int x, int y, SV *text, SV *rend = 0) 1849overlay::set (int x, int y, SV *text, SV *rend = 0)
1556 1850
1560void 1854void
1561overlay::hide () 1855overlay::hide ()
1562 1856
1563void 1857void
1564overlay::DESTROY () 1858overlay::DESTROY ()
1859
1860#############################################################################
1861# urxvt::watcher
1862#############################################################################
1863
1864MODULE = urxvt PACKAGE = urxvt::watcher
1865
1866CHAINED
1867perl_watcher::cb (SV *cb)
1868 CODE:
1869 THIS->cb (cb);
1870 OUTPUT:
1871 RETVAL
1872
1873#############################################################################
1874# urxvt::timer
1875#############################################################################
1565 1876
1566MODULE = urxvt PACKAGE = urxvt::timer 1877MODULE = urxvt PACKAGE = urxvt::timer
1567 1878
1568SV * 1879SV *
1569timer::new () 1880timer::new ()
1570 CODE: 1881 CODE:
1571 timer *w = new timer; 1882 timer *w = new timer;
1572 w->start (NOW); 1883 w->start (NOW);
1573 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1884 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1574 w->self = (HV *)SvRV (RETVAL); 1885 w->self = (HV *)SvRV (RETVAL);
1575 OUTPUT:
1576 RETVAL
1577
1578timer *
1579timer::cb (SV *cb)
1580 CODE:
1581 THIS->cb (cb);
1582 RETVAL = THIS;
1583 OUTPUT: 1886 OUTPUT:
1584 RETVAL 1887 RETVAL
1585 1888
1586NV 1889NV
1587timer::at () 1890timer::at ()
1588 CODE: 1891 CODE:
1589 RETVAL = THIS->at; 1892 RETVAL = THIS->at;
1590 OUTPUT: 1893 OUTPUT:
1591 RETVAL 1894 RETVAL
1592 1895
1593timer * 1896CHAINED
1594timer::interval (NV interval) 1897timer::interval (NV interval)
1595 CODE: 1898 CODE:
1596 THIS->interval = interval; 1899 THIS->interval = interval;
1900 OUTPUT:
1597 RETVAL = THIS; 1901 RETVAL
1598 OUTPUT:
1599 RETVAL
1600 1902
1601timer * 1903CHAINED
1602timer::set (NV tstamp) 1904timer::set (NV tstamp)
1603 CODE: 1905 CODE:
1604 THIS->set (tstamp); 1906 THIS->set (tstamp);
1907 OUTPUT:
1605 RETVAL = THIS; 1908 RETVAL
1606 OUTPUT:
1607 RETVAL
1608 1909
1609timer * 1910CHAINED
1610timer::start (NV tstamp = THIS->at) 1911timer::start (NV tstamp = THIS->at)
1611 CODE: 1912 CODE:
1612 THIS->start (tstamp); 1913 THIS->start (tstamp);
1914 OUTPUT:
1613 RETVAL = THIS; 1915 RETVAL
1614 OUTPUT:
1615 RETVAL
1616 1916
1617timer * 1917CHAINED
1918timer::after (NV delay)
1919 CODE:
1920 THIS->start (NOW + delay);
1921 OUTPUT:
1922 RETVAL
1923
1924CHAINED
1618timer::stop () 1925timer::stop ()
1619 CODE: 1926 CODE:
1620 THIS->stop (); 1927 THIS->stop ();
1621 RETVAL = THIS;
1622 OUTPUT: 1928 OUTPUT:
1623 RETVAL 1929 RETVAL
1624 1930
1625void 1931void
1626timer::DESTROY () 1932timer::DESTROY ()
1933
1934#############################################################################
1935# urxvt::iow
1936#############################################################################
1627 1937
1628MODULE = urxvt PACKAGE = urxvt::iow 1938MODULE = urxvt PACKAGE = urxvt::iow
1629 1939
1630SV * 1940SV *
1631iow::new () 1941iow::new ()
1632 CODE: 1942 CODE:
1633 iow *w = new iow; 1943 iow *w = new iow;
1634 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1944 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1635 w->self = (HV *)SvRV (RETVAL); 1945 w->self = (HV *)SvRV (RETVAL);
1636 OUTPUT: 1946 OUTPUT:
1637 RETVAL 1947 RETVAL
1638 1948
1639iow * 1949CHAINED
1640iow::cb (SV *cb)
1641 CODE:
1642 THIS->cb (cb);
1643 RETVAL = THIS;
1644 OUTPUT:
1645 RETVAL
1646
1647iow *
1648iow::fd (int fd) 1950iow::fd (int fd)
1649 CODE: 1951 CODE:
1650 THIS->fd = fd; 1952 THIS->fd = fd;
1953 OUTPUT:
1651 RETVAL = THIS; 1954 RETVAL
1652 OUTPUT:
1653 RETVAL
1654 1955
1655iow * 1956CHAINED
1656iow::events (short events) 1957iow::events (short events)
1657 CODE: 1958 CODE:
1658 THIS->events = events; 1959 THIS->events = events;
1960 OUTPUT:
1659 RETVAL = THIS; 1961 RETVAL
1660 OUTPUT:
1661 RETVAL
1662 1962
1663iow * 1963CHAINED
1664iow::start () 1964iow::start ()
1665 CODE: 1965 CODE:
1666 THIS->start (); 1966 THIS->start ();
1967 OUTPUT:
1667 RETVAL = THIS; 1968 RETVAL
1668 OUTPUT:
1669 RETVAL
1670 1969
1671iow * 1970CHAINED
1672iow::stop () 1971iow::stop ()
1673 CODE: 1972 CODE:
1674 THIS->stop (); 1973 THIS->stop ();
1675 RETVAL = THIS;
1676 OUTPUT: 1974 OUTPUT:
1677 RETVAL 1975 RETVAL
1678 1976
1679void 1977void
1680iow::DESTROY () 1978iow::DESTROY ()
1681 1979
1980#############################################################################
1981# urxvt::iw
1982#############################################################################
1682 1983
1984MODULE = urxvt PACKAGE = urxvt::iw
1985
1986SV *
1987iw::new ()
1988 CODE:
1989 iw *w = new iw;
1990 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1991 w->self = (HV *)SvRV (RETVAL);
1992 OUTPUT:
1993 RETVAL
1994
1995CHAINED
1996iw::start ()
1997 CODE:
1998 THIS->start ();
1999 OUTPUT:
2000 RETVAL
2001
2002CHAINED
2003iw::stop ()
2004 CODE:
2005 THIS->stop ();
2006 OUTPUT:
2007 RETVAL
2008
2009void
2010iw::DESTROY ()
2011
2012#############################################################################
2013# urxvt::pw
2014#############################################################################
2015
2016MODULE = urxvt PACKAGE = urxvt::pw
2017
2018SV *
2019pw::new ()
2020 CODE:
2021 pw *w = new pw;
2022 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2023 w->self = (HV *)SvRV (RETVAL);
2024 OUTPUT:
2025 RETVAL
2026
2027CHAINED
2028pw::start (int pid)
2029 CODE:
2030 THIS->start (pid);
2031 OUTPUT:
2032 RETVAL
2033
2034CHAINED
2035pw::stop ()
2036 CODE:
2037 THIS->stop ();
2038 OUTPUT:
2039 RETVAL
2040
2041void
2042pw::DESTROY ()
2043
2044

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines