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.64 by root, Fri Jan 13 15:42:50 2006 UTC vs.
Revision 1.91 by root, Wed Jan 25 00:42:21 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
55#define ENABLE_PERL_FRILLS 1 55typedef int CHAINED UNUSED;
56 56
57///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58
59static SV *
60taint (SV *sv)
61{
62 SvTAINT (sv);
63 return sv;
64}
65
66static SV *
67taint_if (SV *sv, SV *src)
68{
69 if (SvTAINTED (src))
70 SvTAINT (sv);
71
72 return sv;
73}
74 58
75static wchar_t * 59static wchar_t *
76sv2wcs (SV *sv) 60sv2wcs (SV *sv)
77{ 61{
78 STRLEN len; 62 STRLEN len;
134#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
135#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
136 120
137///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
138 122
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
139struct perl_watcher 125struct perl_watcher
140{ 126{
141 SV *cbsv; 127 SV *cbsv;
142 HV *self; 128 HV *self;
143 129
144 perl_watcher () 130 perl_watcher ()
145 : cbsv (newSV (0)) 131 : cbsv (0)
146 { 132 {
147 } 133 }
148 134
149 ~perl_watcher () 135 ~perl_watcher ()
150 { 136 {
151 SvREFCNT_dec (cbsv); 137 SvREFCNT_dec (cbsv);
152 } 138 }
153 139
154 void cb (SV *cb) 140 void cb (SV *cb)
155 { 141 {
156 sv_setsv (cbsv, cb); 142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
157 } 144 }
158 145
159 void invoke (const char *type, SV *self, int arg = -1); 146 void invoke (const char *type, SV *self, int arg = -1);
160}; 147};
161 148
185 if (SvTRUE (ERRSV)) 172 if (SvTRUE (ERRSV))
186 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
187} 174}
188 175
189#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
190#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
191 178
192struct timer : time_watcher, perl_watcher 179struct timer : perl_watcher, time_watcher
193{ 180{
194 tstamp interval; 181 tstamp interval;
195 182
196 timer () 183 timer ()
197 : time_watcher (this, &timer::execute) 184 : time_watcher (this, &timer::execute)
206 invoke ("urxvt::timer", newSVtimer (this)); 193 invoke ("urxvt::timer", newSVtimer (this));
207 } 194 }
208}; 195};
209 196
210#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
211#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
212 199
213struct iow : io_watcher, perl_watcher 200struct iow : perl_watcher, io_watcher
214{ 201{
215 iow () 202 iow ()
216 : io_watcher (this, &iow::execute) 203 : io_watcher (this, &iow::execute)
217 { 204 {
218 } 205 }
221 { 208 {
222 invoke ("urxvt::iow", newSViow (this), revents); 209 invoke ("urxvt::iow", newSViow (this), revents);
223 } 210 }
224}; 211};
225 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
226///////////////////////////////////////////////////////////////////////////// 245/////////////////////////////////////////////////////////////////////////////
227 246
228#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
229 248
230struct overlay { 249struct overlay {
231 HV *self; 250 HV *self;
251 bool visible;
232 rxvt_term *THIS; 252 rxvt_term *THIS;
233 int x, y, w, h; 253 int x, y, w, h;
234 int border; 254 int border;
235 text_t **text; 255 text_t **text;
236 rend_t **rend; 256 rend_t **rend;
245 265
246 void set (int x, int y, SV *str, SV *rend); 266 void set (int x, int y, SV *str, SV *rend);
247}; 267};
248 268
249overlay::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)
250: 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)
251{ 271{
252 if (border == 2) 272 if (border == 2)
253 { 273 {
254 w += 2; 274 w += 2;
255 h += 2; 275 h += 2;
316} 336}
317 337
318void 338void
319overlay::show () 339overlay::show ()
320{ 340{
321 char key[33]; sprintf (key, "%32lx", (long)this); 341 if (visible)
342 return;
322 343
344 visible = true;
345
323 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));
324 hv_store (hv, key, 32, newSViv ((long)this), 0); 347 av_push (av, newSViv ((long)this));
325} 348}
326 349
327void 350void
328overlay::hide () 351overlay::hide ()
329{ 352{
353 if (!visible)
354 return;
355
356 visible = false;
357
330 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));
331 359
332 if (ovs) 360 int i;
361
362 for (i = AvFILL (av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this)
333 { 364 {
334 char key[33]; sprintf (key, "%32lx", (long)this);
335
336 HV *hv = (HV *)SvRV (*ovs);
337 hv_delete (hv, key, 32, G_DISCARD); 365 av_delete (av, i, G_DISCARD);
366 break;
338 } 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);
339} 373}
340 374
341void overlay::swap () 375void overlay::swap ()
342{ 376{
343 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));
349 for (int y = ov_h; y--; ) 383 for (int y = ov_h; y--; )
350 { 384 {
351 text_t *t1 = text [y]; 385 text_t *t1 = text [y];
352 rend_t *r1 = rend [y]; 386 rend_t *r1 = rend [y];
353 387
354 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;
355 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;
356 390
357 for (int x = ov_w; x--; ) 391 for (int x = ov_w; x--; )
358 { 392 {
359 text_t t = *t1; *t1++ = *t2; *t2++ = t; 393 text_t t = *t1; *t1++ = *t2; *t2++ = t;
360 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));
383 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 417 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
384 croak ("rend must be arrayref"); 418 croak ("rend must be arrayref");
385 419
386 AV *av = (AV *)SvRV (rend); 420 AV *av = (AV *)SvRV (rend);
387 421
388 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 422 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
389 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 423 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
390 } 424 }
391 425
392 THIS->want_refresh = 1; 426 THIS->want_refresh = 1;
393} 427}
407 perl_free (perl); 441 perl_free (perl);
408 } 442 }
409} 443}
410 444
411void 445void
412rxvt_perl_interp::init () 446rxvt_perl_interp::init (rxvt_term *term)
413{ 447{
414 if (!perl) 448 if (!perl)
415 { 449 {
450 rxvt_push_locale (""); // perl init destroys current locale
451
416 perl_environ = rxvt_environ; 452 perl_environ = rxvt_environ;
417 swap (perl_environ, environ); 453 swap (perl_environ, environ);
418 454
419 char *argv[] = { 455 char *argv[] = {
420 "", 456 "",
421 "-T", 457 "-e"
422 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 458 "BEGIN {"
459 " urxvt->bootstrap;"
460 " unshift @INC, '" LIBDIR "';"
461 "}"
462 ""
463 "use urxvt;"
423 }; 464 };
424 465
425 perl = perl_alloc (); 466 perl = perl_alloc ();
426 perl_construct (perl); 467 perl_construct (perl);
427 468
428 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 469 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
429 || perl_run (perl)) 470 || perl_run (perl))
430 { 471 {
431 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 472 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
432 473
433 perl_destruct (perl); 474 perl_destruct (perl);
434 perl_free (perl); 475 perl_free (perl);
435 perl = 0; 476 perl = 0;
436 } 477 }
437 478
438 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);
439 } 489 }
440} 490}
441 491
442static void 492static void
443ungrab (rxvt_term *THIS) 493ungrab (rxvt_term *THIS)
451} 501}
452 502
453bool 503bool
454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 504rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
455{ 505{
456 if (!perl) 506 if (!perl || !term->perl.self)
457 return false; 507 return false;
458 508
459 if (htype == HOOK_INIT) // first hook ever called 509 // pre-handling of some events
510 if (htype == HOOK_REFRESH_END)
460 { 511 {
461 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));
462 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 ();
463 } 516 }
464 else if (!term->perl.self) 517
465 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 }
466 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
467 { 728 {
468 // 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;
469 } 734 }
470 else
471 {
472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
473 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
475
476 if (HvKEYS (hv))
477 {
478 hv_iterinit (hv);
479
480 while (HE *he = hv_iternext (hv))
481 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482 }
483
484 }
485
486 if (!term->perl.should_invoke [htype])
487 return false;
488 }
489 735
490 swap (perl_environ, environ); 736 swap (perl_environ, environ);
491 737
492 try 738 return event_consumed;
493 {
494 dSP;
495 va_list ap;
496
497 va_start (ap, htype);
498
499 ENTER;
500 SAVETMPS;
501
502 PUSHMARK (SP);
503
504 XPUSHs (sv_2mortal (newSVterm (term)));
505 XPUSHs (sv_2mortal (newSViv (htype)));
506
507 for (;;) {
508 data_type dt = (data_type)va_arg (ap, int);
509
510 switch (dt)
511 {
512 case DT_INT:
513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514 break;
515
516 case DT_LONG:
517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518 break;
519
520 case DT_STR:
521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
522 break;
523
524 case DT_STR_LEN:
525 {
526 char *str = va_arg (ap, char *);
527 int len = va_arg (ap, int);
528
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
530 }
531 break;
532
533 case DT_WCS_LEN:
534 {
535 wchar_t *wstr = va_arg (ap, wchar_t *);
536 int wlen = va_arg (ap, int);
537
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
539 }
540 break;
541
542 case DT_XEVENT:
543 {
544 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV ();
546
547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
548# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549# undef set
550
551 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial);
554
555 switch (xe->type)
556 {
557 case KeyPress:
558 case KeyRelease:
559 case ButtonPress:
560 case ButtonRelease:
561 case MotionNotify:
562 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state);
570 break;
571 }
572
573 switch (xe->type)
574 {
575 case KeyPress:
576 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode);
578 break;
579
580 case ButtonPress:
581 case ButtonRelease:
582 setiv (button, xe->xbutton.button);
583 break;
584
585 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint);
587 break;
588 }
589
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 }
592 break;
593
594 case DT_END:
595 {
596 va_end (ap);
597
598 PUTBACK;
599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
600 SPAGAIN;
601
602 if (count)
603 {
604 SV *status = POPs;
605 count = SvTRUE (status);
606 }
607
608 PUTBACK;
609 FREETMPS;
610 LEAVE;
611
612 if (SvTRUE (ERRSV))
613 {
614 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
615 ungrab (term); // better lose the grab than the session
616 }
617
618 if (htype == HOOK_DESTROY)
619 {
620 clearSVptr ((SV *)term->perl.self);
621 SvREFCNT_dec ((SV *)term->perl.self);
622 }
623
624 swap (perl_environ, environ);
625 return count;
626 }
627
628 default:
629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 }
631 }
632 }
633 catch (...)
634 {
635 swap (perl_environ, environ);
636 throw;
637 }
638} 739}
639 740
640///////////////////////////////////////////////////////////////////////////// 741/////////////////////////////////////////////////////////////////////////////
641 742
642MODULE = urxvt PACKAGE = urxvt 743MODULE = urxvt PACKAGE = urxvt
754 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
755 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
756 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
757 const_iv (ClientMessage), 858 const_iv (ClientMessage),
758 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
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
759 }; 884 };
760 885
761 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 886 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
762 civ-- > const_iv; ) 887 civ-- > const_iv; )
763 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
771void 896void
772fatal (const char *msg) 897fatal (const char *msg)
773 CODE: 898 CODE:
774 rxvt_fatal ("%s", msg); 899 rxvt_fatal ("%s", msg);
775 900
776SV *
777untaint (SV *sv)
778 CODE:
779 RETVAL = newSVsv (sv);
780 SvTAINTED_off (RETVAL);
781 OUTPUT:
782 RETVAL
783
784void 901void
785_exit (int status) 902_exit (int status)
786
787bool
788safe ()
789 CODE:
790 RETVAL = !rxvt_tainted ();
791 OUTPUT:
792 RETVAL
793 903
794NV 904NV
795NOW () 905NOW ()
796 CODE: 906 CODE:
797 RETVAL = NOW; 907 RETVAL = NOW;
855 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 965 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
856 croak ("first argument to urxvt::term->_new must be arrayref"); 966 croak ("first argument to urxvt::term->_new must be arrayref");
857 967
858 rxvt_term *term = new rxvt_term; 968 rxvt_term *term = new rxvt_term;
859 969
860 term->argv = new stringvec; 970 stringvec *argv = new stringvec;
861 term->envv = new stringvec; 971 stringvec *envv = new stringvec;
862 972
863 for (int i = 1; i < items; i++) 973 for (int i = 1; i < items; i++)
864 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 974 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
865 975
866 AV *envv = (AV *)SvRV (ST (0)); 976 AV *env = (AV *)SvRV (ST (0));
867 for (int i = av_len (envv) + 1; i--; ) 977 for (int i = AvFILL (env) + 1; i--; )
868 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 978 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
869 979
870 term->envv->push_back (0); 980 envv->push_back (0);
871 981
872 bool success; 982 bool success;
873 983
874 try 984 try
875 { 985 {
876 success = term->init (term->argv->size (), term->argv->begin ()); 986 success = term->init (argv, envv);
877 } 987 }
878 catch (const class rxvt_failure_exception &e) 988 catch (const class rxvt_failure_exception &e)
879 { 989 {
880 success = false; 990 success = false;
881 } 991 }
893 RETVAL 1003 RETVAL
894 1004
895void 1005void
896rxvt_term::destroy () 1006rxvt_term::destroy ()
897 1007
898#if ENABLE_PERL_FRILLS
899
900void
901rxvt_term::XListProperties (U32 window)
902 PPCODE:
903{
904 int count;
905 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
906
907 EXTEND (SP, count);
908 while (count--)
909 PUSHs (newSVuv ((U32)props [count]));
910
911 XFree (props);
912}
913
914void
915rxvt_term::XGetWindowProperty (U32 window, U32 property)
916 PPCODE:
917{
918 Atom type;
919 int format;
920 unsigned long nitems;
921 unsigned long bytes_after;
922 unsigned char *prop;
923 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
924 0, 1<<30, 0, AnyPropertyType,
925 &type, &format, &nitems, &bytes_after, &prop);
926 if (type != None)
927 {
928 EXTEND (SP, 3);
929 PUSHs (newSVuv ((U32)type));
930 PUSHs (newSViv (format));
931 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
932 XFree (prop);
933 }
934}
935
936void
937rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
938 CODE:
939{
940 STRLEN len;
941 char *data_ = SvPVbyte (data, len);
942
943 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
944 type, format, PropModeReplace,
945 (unsigned char *)data, len * 8 / format);
946}
947
948void
949rxvt_term::XDeleteProperty (U32 window, U32 property)
950 CODE:
951 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
952
953U32
954rxvt_term::DefaultRootWindow ()
955 CODE:
956 RETVAL = (U32)THIS->display->root;
957 OUTPUT:
958 RETVAL
959
960U32
961rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
962 CODE:
963 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
964 x, y, width, height, 0,
965 THIS->pix_colors_focused[Color_border],
966 THIS->pix_colors_focused[Color_border]);
967 OUTPUT:
968 RETVAL
969
970void
971rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
972 CODE:
973 XReparentWindow (THIS->display->display, window, parent, x, y);
974
975#endif
976
977void 1008void
978rxvt_term::set_should_invoke (int htype, int inc) 1009rxvt_term::set_should_invoke (int htype, int inc)
979 CODE: 1010 CODE:
980 THIS->perl.should_invoke [htype] += inc; 1011 THIS->perl.should_invoke [htype] += inc;
981 1012
985 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1016 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
986 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1017 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
987 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1018 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
988 1019
989bool 1020bool
990rxvt_term::grab (U32 eventtime, int sync = 0) 1021rxvt_term::grab (Time eventtime, int sync = 0)
991 CODE: 1022 CODE:
992{ 1023{
993 int mode = sync ? GrabModeSync : GrabModeAsync; 1024 int mode = sync ? GrabModeSync : GrabModeAsync;
994 1025
995 THIS->perl.grabtime = 0; 1026 THIS->perl.grabtime = 0;
1053 char *mbstr = rxvt_wcstombs (wstr); 1084 char *mbstr = rxvt_wcstombs (wstr);
1054 rxvt_pop_locale (); 1085 rxvt_pop_locale ();
1055 1086
1056 free (wstr); 1087 free (wstr);
1057 1088
1058 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1089 RETVAL = newSVpv (mbstr, 0);
1059 free (mbstr); 1090 free (mbstr);
1060} 1091}
1061 OUTPUT: 1092 OUTPUT:
1062 RETVAL 1093 RETVAL
1063 1094
1070 1101
1071 rxvt_push_locale (THIS->locale); 1102 rxvt_push_locale (THIS->locale);
1072 wchar_t *wstr = rxvt_mbstowcs (data, len); 1103 wchar_t *wstr = rxvt_mbstowcs (data, len);
1073 rxvt_pop_locale (); 1104 rxvt_pop_locale ();
1074 1105
1075 RETVAL = taint_if (wcs2sv (wstr), octets); 1106 RETVAL = wcs2sv (wstr);
1076 free (wstr); 1107 free (wstr);
1077} 1108}
1078 OUTPUT: 1109 OUTPUT:
1079 RETVAL 1110 RETVAL
1080 1111
1087#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1118#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1088#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1119#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1089#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1120#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1090#define TERM_OFFSET_focus TERM_OFFSET(focus) 1121#define TERM_OFFSET_focus TERM_OFFSET(focus)
1091#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1122#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1123#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1124#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1125#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1092#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1126#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1093#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1127#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1094#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1128#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1095 1129
1096int 1130int
1097rxvt_term::width () 1131rxvt_term::width ()
1098 ALIAS: 1132 ALIAS:
1099 width = TERM_OFFSET_width 1133 width = TERM_OFFSET_width
1103 fbase = TERM_OFFSET_fbase 1137 fbase = TERM_OFFSET_fbase
1104 nrow = TERM_OFFSET_nrow 1138 nrow = TERM_OFFSET_nrow
1105 ncol = TERM_OFFSET_ncol 1139 ncol = TERM_OFFSET_ncol
1106 focus = TERM_OFFSET_focus 1140 focus = TERM_OFFSET_focus
1107 mapped = TERM_OFFSET_mapped 1141 mapped = TERM_OFFSET_mapped
1142 int_bwidth = TERM_OFFSET_int_bwidth
1143 ext_bwidth = TERM_OFFSET_ext_bwidth
1144 lineSpace = TERM_OFFSET_lineSpace
1108 saveLines = TERM_OFFSET_saveLines 1145 saveLines = TERM_OFFSET_saveLines
1109 total_rows = TERM_OFFSET_total_rows 1146 total_rows = TERM_OFFSET_total_rows
1110 nsaved = TERM_OFFSET_nsaved 1147 top_row = TERM_OFFSET_top_row
1111 CODE: 1148 CODE:
1112 RETVAL = *(int *)((char *)THIS + ix); 1149 RETVAL = *(int *)((char *)THIS + ix);
1113 OUTPUT: 1150 OUTPUT:
1114 RETVAL 1151 RETVAL
1115 1152
1117rxvt_term::ModLevel3Mask () 1154rxvt_term::ModLevel3Mask ()
1118 ALIAS: 1155 ALIAS:
1119 ModLevel3Mask = 0 1156 ModLevel3Mask = 0
1120 ModMetaMask = 1 1157 ModMetaMask = 1
1121 ModNumLockMask = 2 1158 ModNumLockMask = 2
1159 current_screen = 3
1160 hidden_cursor = 4
1122 CODE: 1161 CODE:
1123 switch (ix) 1162 switch (ix)
1124 { 1163 {
1125 case 0: RETVAL = THIS->ModLevel3Mask; break; 1164 case 0: RETVAL = THIS->ModLevel3Mask; break;
1126 case 1: RETVAL = THIS->ModMetaMask; break; 1165 case 1: RETVAL = THIS->ModMetaMask; break;
1127 case 2: RETVAL = THIS->ModNumLockMask; break; 1166 case 2: RETVAL = THIS->ModNumLockMask; break;
1167 case 3: RETVAL = THIS->current_screen; break;
1168 case 4: RETVAL = THIS->hidden_cursor; break;
1128 } 1169 }
1129 OUTPUT: 1170 OUTPUT:
1130 RETVAL 1171 RETVAL
1131 1172
1132char * 1173char *
1170 if (events != EVENT_UNDEF) 1211 if (events != EVENT_UNDEF)
1171 THIS->pty_ev.set (events); 1212 THIS->pty_ev.set (events);
1172 OUTPUT: 1213 OUTPUT:
1173 RETVAL 1214 RETVAL
1174 1215
1175U32 1216int
1217rxvt_term::pty_fd ()
1218 CODE:
1219 RETVAL = THIS->pty->pty;
1220 OUTPUT:
1221 RETVAL
1222
1223Window
1176rxvt_term::parent () 1224rxvt_term::parent ()
1177 CODE: 1225 CODE:
1178 RETVAL = (U32)THIS->parent [0]; 1226 RETVAL = THIS->parent [0];
1179 OUTPUT: 1227 OUTPUT:
1180 RETVAL 1228 RETVAL
1181 1229
1182U32 1230Window
1183rxvt_term::vt () 1231rxvt_term::vt ()
1184 CODE: 1232 CODE:
1185 RETVAL = (U32)THIS->vt; 1233 RETVAL = THIS->vt;
1186 OUTPUT: 1234 OUTPUT:
1187 RETVAL 1235 RETVAL
1188 1236
1189void 1237void
1190rxvt_term::vt_emask_add (U32 emask) 1238rxvt_term::vt_emask_add (U32 emask)
1199 THIS->rstyle = new_rstyle; 1247 THIS->rstyle = new_rstyle;
1200 OUTPUT: 1248 OUTPUT:
1201 RETVAL 1249 RETVAL
1202 1250
1203int 1251int
1204rxvt_term::view_start (int newval = -1) 1252rxvt_term::view_start (int newval = 1)
1205 PROTOTYPE: $;$ 1253 PROTOTYPE: $;$
1206 CODE: 1254 CODE:
1207{ 1255{
1208 RETVAL = THIS->view_start; 1256 RETVAL = THIS->view_start;
1209 1257
1210 if (newval >= 0) 1258 if (newval <= 0)
1211 { 1259 THIS->scr_changeview (max (newval, THIS->top_row));
1212 THIS->view_start = min (newval, THIS->nsaved);
1213 THIS->scr_changeview (RETVAL);
1214 }
1215} 1260}
1216 OUTPUT: 1261 OUTPUT:
1217 RETVAL 1262 RETVAL
1263
1264void
1265rxvt_term::focus_in ()
1266
1267void
1268rxvt_term::focus_out ()
1218 1269
1219void 1270void
1220rxvt_term::want_refresh () 1271rxvt_term::want_refresh ()
1221 CODE: 1272 CODE:
1222 THIS->want_refresh = 1; 1273 THIS->want_refresh = 1;
1223 1274
1224void 1275void
1225rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1276rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1226 PPCODE: 1277 PPCODE:
1227{ 1278{
1228 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1279 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1229 XSRETURN_EMPTY; 1280 XSRETURN_EMPTY;
1230 1281
1231 line_t &l = ROW(row_number); 1282 line_t &l = ROW(row_number);
1232 1283
1233 if (GIMME_V != G_VOID) 1284 if (GIMME_V != G_VOID)
1234 { 1285 {
1235 wchar_t *wstr = new wchar_t [THIS->ncol]; 1286 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1236 1287
1237 for (int col = 0; col < THIS->ncol; col++) 1288 for (int col = 0; col < THIS->ncol; col++)
1238 wstr [col] = l.t [col]; 1289 wstr [col] = l.t [col];
1239 1290
1240 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1291 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1241
1242 delete [] wstr;
1243 } 1292 }
1244 1293
1245 if (new_text) 1294 if (new_text)
1246 { 1295 {
1247 wchar_t *wstr = sv2wcs (new_text); 1296 wchar_t *wstr = sv2wcs (new_text);
1248 1297
1249 int len = min (wcslen (wstr) - start_ofs, max_len); 1298 int len = min (wcslen (wstr) - start_ofs, max_len);
1250 1299
1251 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1300 if (start_col < 0 || start_col + len > THIS->ncol)
1252 { 1301 {
1253 free (wstr); 1302 free (wstr);
1254 croak ("new_text extends beyond horizontal margins"); 1303 croak ("new_text extends beyond horizontal margins");
1255 } 1304 }
1256 1305
1266 1315
1267void 1316void
1268rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1317rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1269 PPCODE: 1318 PPCODE:
1270{ 1319{
1271 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1320 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1272 XSRETURN_EMPTY; 1321 XSRETURN_EMPTY;
1273 1322
1274 line_t &l = ROW(row_number); 1323 line_t &l = ROW(row_number);
1275 1324
1276 if (GIMME_V != G_VOID) 1325 if (GIMME_V != G_VOID)
1288 { 1337 {
1289 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1338 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1290 croak ("new_rend must be arrayref"); 1339 croak ("new_rend must be arrayref");
1291 1340
1292 AV *av = (AV *)SvRV (new_rend); 1341 AV *av = (AV *)SvRV (new_rend);
1293 int len = min (av_len (av) + 1 - start_ofs, max_len); 1342 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1294 1343
1295 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1344 if (start_col < 0 || start_col + len > THIS->ncol)
1296 croak ("new_rend array extends beyond horizontal margins"); 1345 croak ("new_rend array extends beyond horizontal margins");
1297 1346
1298 for (int col = start_col; col < start_col + len; col++) 1347 for (int col = start_col; col < start_col + len; col++)
1299 { 1348 {
1300 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1349 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1306 1355
1307int 1356int
1308rxvt_term::ROW_l (int row_number, int new_length = -1) 1357rxvt_term::ROW_l (int row_number, int new_length = -1)
1309 CODE: 1358 CODE:
1310{ 1359{
1311 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1360 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1312 XSRETURN_EMPTY; 1361 XSRETURN_EMPTY;
1313 1362
1314 line_t &l = ROW(row_number); 1363 line_t &l = ROW(row_number);
1315 RETVAL = l.l; 1364 RETVAL = l.l;
1316 1365
1322 1371
1323bool 1372bool
1324rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1373rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1325 CODE: 1374 CODE:
1326{ 1375{
1327 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1376 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1328 XSRETURN_EMPTY; 1377 XSRETURN_EMPTY;
1329 1378
1330 line_t &l = ROW(row_number); 1379 line_t &l = ROW(row_number);
1331 RETVAL = l.is_longer (); 1380 RETVAL = l.is_longer ();
1332 1381
1340rxvt_term::special_encode (SV *string) 1389rxvt_term::special_encode (SV *string)
1341 CODE: 1390 CODE:
1342{ 1391{
1343 wchar_t *wstr = sv2wcs (string); 1392 wchar_t *wstr = sv2wcs (string);
1344 int wlen = wcslen (wstr); 1393 int wlen = wcslen (wstr);
1345 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1394 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1346 1395
1347 rxvt_push_locale (THIS->locale); 1396 rxvt_push_locale (THIS->locale);
1348 1397
1349 wchar_t *r = rstr; 1398 wchar_t *r = rstr;
1350 for (wchar_t *s = wstr; *s; s++) 1399 for (wchar_t *s = wstr; *s; s++)
1400 {
1401 int w = WCWIDTH (*s);
1402
1351 if (wcwidth (*s) == 0) 1403 if (w == 0)
1352 { 1404 {
1353 if (r == rstr) 1405 if (r == rstr)
1354 croak ("leading combining character unencodable"); 1406 croak ("leading combining character unencodable");
1355 1407
1356 unicode_t n = rxvt_compose (r[-1], *s); 1408 unicode_t n = rxvt_compose (r[-1], *s);
1357 if (n == NOCHAR) 1409 if (n == NOCHAR)
1358 n = rxvt_composite.compose (r[-1], *s); 1410 n = rxvt_composite.compose (r[-1], *s);
1359 1411
1360 r[-1] = n; 1412 r[-1] = n;
1361 } 1413 }
1362#if !UNICODE_3 1414#if !UNICODE_3
1363 else if (*s >= 0x10000) 1415 else if (*s >= 0x10000)
1364 *r++ = rxvt_composite.compose (*s); 1416 *r++ = rxvt_composite.compose (*s);
1365#endif 1417#endif
1366 else 1418 else
1367 *r++ = *s; 1419 *r++ = *s;
1420
1421 // the *2 above only allows wcwidth <= 2
1422 if (w > 1)
1423 *r++ = NOCHAR;
1424 }
1368 1425
1369 rxvt_pop_locale (); 1426 rxvt_pop_locale ();
1370 1427
1371 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1428 RETVAL = wcs2sv (rstr, r - rstr);
1372
1373 delete [] rstr;
1374} 1429}
1375 OUTPUT: 1430 OUTPUT:
1376 RETVAL 1431 RETVAL
1377 1432
1378SV * 1433SV *
1390 else if (IS_COMPOSE (*s)) 1445 else if (IS_COMPOSE (*s))
1391 dlen += rxvt_composite.expand (*s, 0); 1446 dlen += rxvt_composite.expand (*s, 0);
1392 else 1447 else
1393 dlen++; 1448 dlen++;
1394 1449
1395 wchar_t *rstr = new wchar_t [dlen]; 1450 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1396 1451
1397 // decode 1452 // decode
1398 wchar_t *r = rstr; 1453 wchar_t *r = rstr;
1399 for (wchar_t *s = wstr; *s; s++) 1454 for (wchar_t *s = wstr; *s; s++)
1400 if (*s == NOCHAR) 1455 if (*s == NOCHAR)
1402 else if (IS_COMPOSE (*s)) 1457 else if (IS_COMPOSE (*s))
1403 r += rxvt_composite.expand (*s, r); 1458 r += rxvt_composite.expand (*s, r);
1404 else 1459 else
1405 *r++ = *s; 1460 *r++ = *s;
1406 1461
1407 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1462 RETVAL = wcs2sv (rstr, r - rstr);
1408
1409 delete [] rstr;
1410} 1463}
1411 OUTPUT: 1464 OUTPUT:
1412 RETVAL 1465 RETVAL
1413 1466
1414void 1467void
1434 1487
1435 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1488 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1436 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1489 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1437 1490
1438 if (GIMME_V != G_VOID) 1491 if (GIMME_V != G_VOID)
1439 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1492 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1440 1493
1441 if (newval) 1494 if (newval)
1442 { 1495 {
1443 if (SvOK (newval)) 1496 if (SvOK (newval))
1444 { 1497 {
1451 } 1504 }
1452} 1505}
1453 1506
1454const char * 1507const char *
1455rxvt_term::x_resource (const char *name) 1508rxvt_term::x_resource (const char *name)
1456 CLEANUP:
1457 SvTAINTED_on (ST (0));
1458 1509
1459bool 1510bool
1460rxvt_term::option (U32 optval, int set = -1) 1511rxvt_term::option (U32 optval, int set = -1)
1461 CODE: 1512 CODE:
1462{ 1513{
1467 if (set) 1518 if (set)
1468 THIS->options |= optval; 1519 THIS->options |= optval;
1469 else 1520 else
1470 THIS->options &= ~optval; 1521 THIS->options &= ~optval;
1471 1522
1523 if (THIS->check_ev.is_active ()) // avoid doing this before START
1472 switch (optval) 1524 switch (optval)
1473 { 1525 {
1474 case Opt_skipBuiltinGlyphs: 1526 case Opt_skipBuiltinGlyphs:
1475 THIS->set_fonts (); 1527 THIS->set_fonts ();
1476 THIS->scr_remap_chars (); 1528 THIS->scr_remap_chars ();
1477 THIS->scr_touch (true); 1529 THIS->scr_touch (true);
1478 THIS->want_refresh = 1; 1530 THIS->want_refresh = 1;
1479 break; 1531 break;
1480 1532
1481 case Opt_cursorUnderline: 1533 case Opt_cursorUnderline:
1482 THIS->want_refresh = 1; 1534 THIS->want_refresh = 1;
1483 break; 1535 break;
1484 1536
1485# case Opt_scrollBar_floating: 1537# case Opt_scrollBar_floating:
1486# case Opt_scrollBar_right: 1538# case Opt_scrollBar_right:
1487# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1539# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1488# break; 1540# break;
1489 } 1541 }
1490 } 1542 }
1491} 1543}
1492 OUTPUT: 1544 OUTPUT:
1493 RETVAL 1545 RETVAL
1494 1546
1522 PUSHs (sv_2mortal (newSViv (rc.col))); 1574 PUSHs (sv_2mortal (newSViv (rc.col)));
1523 } 1575 }
1524 1576
1525 if (items == 3) 1577 if (items == 3)
1526 { 1578 {
1527 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1579 rc.row = SvIV (ST (1));
1528 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1580 rc.col = SvIV (ST (2));
1581
1582 if (ix == 2)
1583 {
1584 if (rc.col == 0)
1585 {
1586 // col == 0 means end of previous line
1587 rc.row--;
1588 rc.col = THIS->ncol;
1589 }
1590 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1591 && rc.col > ROW(rc.row).l)
1592 {
1593 // col >= length means while line and add newline
1594 rc.col = THIS->ncol;
1595 }
1596 }
1597
1598 clamp_it (rc.col, 0, THIS->ncol);
1599 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1529 1600
1530 if (ix) 1601 if (ix)
1531 THIS->want_refresh = 1; 1602 THIS->want_refresh = 1;
1532 } 1603 }
1533} 1604}
1541 1612
1542#void 1613#void
1543#rxvt_term::selection_clear () 1614#rxvt_term::selection_clear ()
1544 1615
1545void 1616void
1546rxvt_term::selection_make (U32 eventtime, bool rect = false) 1617rxvt_term::selection_make (Time eventtime, bool rect = false)
1547 CODE: 1618 CODE:
1548 THIS->selection.op = SELECTION_CONT; 1619 THIS->selection.op = SELECTION_CONT;
1549 THIS->selection.rect = rect; 1620 THIS->selection.rect = rect;
1550 THIS->selection_make (eventtime); 1621 THIS->selection_make (eventtime);
1551 1622
1552int 1623int
1553rxvt_term::selection_grab (U32 eventtime) 1624rxvt_term::selection_grab (Time eventtime)
1554 1625
1555void 1626void
1556rxvt_term::selection (SV *newtext = 0) 1627rxvt_term::selection (SV *newtext = 0)
1557 PPCODE: 1628 PPCODE:
1558{ 1629{
1559 if (GIMME_V != G_VOID) 1630 if (GIMME_V != G_VOID)
1560 XPUSHs (THIS->selection.text 1631 XPUSHs (THIS->selection.text
1561 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1632 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1562 : &PL_sv_undef); 1633 : &PL_sv_undef);
1563 1634
1564 if (newtext) 1635 if (newtext)
1565 { 1636 {
1566 free (THIS->selection.text); 1637 free (THIS->selection.text);
1576void 1647void
1577rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1648rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1578 1649
1579void 1650void
1580rxvt_term::scr_bell () 1651rxvt_term::scr_bell ()
1652
1653void
1654rxvt_term::scr_change_screen (int screen)
1581 1655
1582void 1656void
1583rxvt_term::scr_add_lines (SV *string) 1657rxvt_term::scr_add_lines (SV *string)
1584 CODE: 1658 CODE:
1585{ 1659{
1626 o->self = (HV *)SvRV (RETVAL); 1700 o->self = (HV *)SvRV (RETVAL);
1627} 1701}
1628 OUTPUT: 1702 OUTPUT:
1629 RETVAL 1703 RETVAL
1630 1704
1705#############################################################################
1706# Various X Utility Functions
1707#############################################################################
1708
1709void
1710rxvt_term::XListProperties (Window window)
1711 PPCODE:
1712{
1713 int count;
1714 Atom *props = XListProperties (THIS->display->display, window, &count);
1715
1716 EXTEND (SP, count);
1717 while (count--)
1718 PUSHs (newSVuv ((U32)props [count]));
1719
1720 XFree (props);
1721}
1722
1723void
1724rxvt_term::XGetWindowProperty (Window window, Atom property)
1725 PPCODE:
1726{
1727 Atom type;
1728 int format;
1729 unsigned long nitems;
1730 unsigned long bytes_after;
1731 unsigned char *prop;
1732
1733 XGetWindowProperty (THIS->display->display, window, property,
1734 0, 1<<24, 0, AnyPropertyType,
1735 &type, &format, &nitems, &bytes_after, &prop);
1736
1737 if (type != None)
1738 {
1739 int elemsize = format == 16 ? sizeof (short)
1740 : format == 32 ? sizeof (long)
1741 : 1;
1742
1743 EXTEND (SP, 3);
1744 PUSHs (newSVuv ((U32)type));
1745 PUSHs (newSViv (format));
1746 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1747 XFree (prop);
1748 }
1749}
1750
1751void
1752rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1753 CODE:
1754{
1755 STRLEN len;
1756 char *data_ = SvPVbyte (data, len);
1757
1758 int elemsize = format == 16 ? sizeof (short)
1759 : format == 32 ? sizeof (long)
1760 : 1;
1761
1762 XChangeProperty (THIS->display->display, window, property,
1763 type, format, PropModeReplace,
1764 (unsigned char *)data_, len / elemsize);
1765 XSync (THIS->display->display, 0);
1766}
1767
1768Atom
1769XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1770 C_ARGS: term->display->display, atom_name, only_if_exists
1771
1772char *
1773XGetAtomName (rxvt_term *term, Atom atom)
1774 C_ARGS: term->display->display, atom
1775 CLEANUP:
1776 XFree (RETVAL);
1777
1778void
1779XDeleteProperty (rxvt_term *term, Window window, Atom property)
1780 C_ARGS: term->display->display, window, property
1781
1782Window
1783rxvt_term::DefaultRootWindow ()
1784 CODE:
1785 RETVAL = THIS->display->root;
1786 OUTPUT:
1787 RETVAL
1788
1789#if 0
1790
1791Window
1792XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1793 C_ARGS: term->display->display, (Window)parent,
1794 x, y, width, height, 0,
1795 term->pix_colors_focused[Color_border],
1796 term->pix_colors_focused[Color_border]
1797
1798#endif
1799
1800void
1801XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1802 C_ARGS: term->display->display, window, parent, x, y
1803
1804void
1805XMapWindow (rxvt_term *term, Window window)
1806 C_ARGS: term->display->display, window
1807
1808void
1809XUnmapWindow (rxvt_term *term, Window window)
1810 C_ARGS: term->display->display, window
1811
1812void
1813XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1814 C_ARGS: term->display->display, window, x, y, width, height
1815
1816void
1817rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1818 CODE:
1819{
1820 XWindowAttributes attr;
1821 XGetWindowAttributes (THIS->display->display, window, &attr);
1822 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1823}
1824
1825void
1826rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1827 PPCODE:
1828{
1829 int dx, dy;
1830 Window child;
1831
1832 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1833 {
1834 EXTEND (SP, 3);
1835 PUSHs (newSViv (dx));
1836 PUSHs (newSViv (dy));
1837 PUSHs (newSVuv (child));
1838 }
1839}
1840
1841#############################################################################
1842# urxvt::overlay
1843#############################################################################
1844
1631MODULE = urxvt PACKAGE = urxvt::overlay 1845MODULE = urxvt PACKAGE = urxvt::overlay
1632 1846
1633void 1847void
1634overlay::set (int x, int y, SV *text, SV *rend = 0) 1848overlay::set (int x, int y, SV *text, SV *rend = 0)
1635 1849
1639void 1853void
1640overlay::hide () 1854overlay::hide ()
1641 1855
1642void 1856void
1643overlay::DESTROY () 1857overlay::DESTROY ()
1858
1859#############################################################################
1860# urxvt::watcher
1861#############################################################################
1862
1863MODULE = urxvt PACKAGE = urxvt::watcher
1864
1865CHAINED
1866perl_watcher::cb (SV *cb)
1867 CODE:
1868 THIS->cb (cb);
1869 OUTPUT:
1870 RETVAL
1871
1872#############################################################################
1873# urxvt::timer
1874#############################################################################
1644 1875
1645MODULE = urxvt PACKAGE = urxvt::timer 1876MODULE = urxvt PACKAGE = urxvt::timer
1646 1877
1647SV * 1878SV *
1648timer::new () 1879timer::new ()
1649 CODE: 1880 CODE:
1650 timer *w = new timer; 1881 timer *w = new timer;
1651 w->start (NOW); 1882 w->start (NOW);
1652 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1883 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1653 w->self = (HV *)SvRV (RETVAL); 1884 w->self = (HV *)SvRV (RETVAL);
1654 OUTPUT:
1655 RETVAL
1656
1657timer *
1658timer::cb (SV *cb)
1659 CODE:
1660 THIS->cb (cb);
1661 RETVAL = THIS;
1662 OUTPUT: 1885 OUTPUT:
1663 RETVAL 1886 RETVAL
1664 1887
1665NV 1888NV
1666timer::at () 1889timer::at ()
1667 CODE: 1890 CODE:
1668 RETVAL = THIS->at; 1891 RETVAL = THIS->at;
1669 OUTPUT: 1892 OUTPUT:
1670 RETVAL 1893 RETVAL
1671 1894
1672timer * 1895CHAINED
1673timer::interval (NV interval) 1896timer::interval (NV interval)
1674 CODE: 1897 CODE:
1675 THIS->interval = interval; 1898 THIS->interval = interval;
1899 OUTPUT:
1676 RETVAL = THIS; 1900 RETVAL
1677 OUTPUT:
1678 RETVAL
1679 1901
1680timer * 1902CHAINED
1681timer::set (NV tstamp) 1903timer::set (NV tstamp)
1682 CODE: 1904 CODE:
1683 THIS->set (tstamp); 1905 THIS->set (tstamp);
1906 OUTPUT:
1684 RETVAL = THIS; 1907 RETVAL
1685 OUTPUT:
1686 RETVAL
1687 1908
1688timer * 1909CHAINED
1689timer::start (NV tstamp = THIS->at) 1910timer::start (NV tstamp = THIS->at)
1690 CODE: 1911 CODE:
1691 THIS->start (tstamp); 1912 THIS->start (tstamp);
1913 OUTPUT:
1692 RETVAL = THIS; 1914 RETVAL
1693 OUTPUT:
1694 RETVAL
1695 1915
1696timer * 1916CHAINED
1917timer::after (NV delay)
1918 CODE:
1919 THIS->start (NOW + delay);
1920 OUTPUT:
1921 RETVAL
1922
1923CHAINED
1697timer::stop () 1924timer::stop ()
1698 CODE: 1925 CODE:
1699 THIS->stop (); 1926 THIS->stop ();
1700 RETVAL = THIS;
1701 OUTPUT: 1927 OUTPUT:
1702 RETVAL 1928 RETVAL
1703 1929
1704void 1930void
1705timer::DESTROY () 1931timer::DESTROY ()
1932
1933#############################################################################
1934# urxvt::iow
1935#############################################################################
1706 1936
1707MODULE = urxvt PACKAGE = urxvt::iow 1937MODULE = urxvt PACKAGE = urxvt::iow
1708 1938
1709SV * 1939SV *
1710iow::new () 1940iow::new ()
1711 CODE: 1941 CODE:
1712 iow *w = new iow; 1942 iow *w = new iow;
1713 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1943 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1714 w->self = (HV *)SvRV (RETVAL); 1944 w->self = (HV *)SvRV (RETVAL);
1715 OUTPUT: 1945 OUTPUT:
1716 RETVAL 1946 RETVAL
1717 1947
1718iow * 1948CHAINED
1719iow::cb (SV *cb)
1720 CODE:
1721 THIS->cb (cb);
1722 RETVAL = THIS;
1723 OUTPUT:
1724 RETVAL
1725
1726iow *
1727iow::fd (int fd) 1949iow::fd (int fd)
1728 CODE: 1950 CODE:
1729 THIS->fd = fd; 1951 THIS->fd = fd;
1952 OUTPUT:
1730 RETVAL = THIS; 1953 RETVAL
1731 OUTPUT:
1732 RETVAL
1733 1954
1734iow * 1955CHAINED
1735iow::events (short events) 1956iow::events (short events)
1736 CODE: 1957 CODE:
1737 THIS->events = events; 1958 THIS->events = events;
1959 OUTPUT:
1738 RETVAL = THIS; 1960 RETVAL
1739 OUTPUT:
1740 RETVAL
1741 1961
1742iow * 1962CHAINED
1743iow::start () 1963iow::start ()
1744 CODE: 1964 CODE:
1745 THIS->start (); 1965 THIS->start ();
1966 OUTPUT:
1746 RETVAL = THIS; 1967 RETVAL
1747 OUTPUT:
1748 RETVAL
1749 1968
1750iow * 1969CHAINED
1751iow::stop () 1970iow::stop ()
1752 CODE: 1971 CODE:
1753 THIS->stop (); 1972 THIS->stop ();
1754 RETVAL = THIS;
1755 OUTPUT: 1973 OUTPUT:
1756 RETVAL 1974 RETVAL
1757 1975
1758void 1976void
1759iow::DESTROY () 1977iow::DESTROY ()
1760 1978
1979#############################################################################
1980# urxvt::iw
1981#############################################################################
1761 1982
1983MODULE = urxvt PACKAGE = urxvt::iw
1984
1985SV *
1986iw::new ()
1987 CODE:
1988 iw *w = new iw;
1989 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1990 w->self = (HV *)SvRV (RETVAL);
1991 OUTPUT:
1992 RETVAL
1993
1994CHAINED
1995iw::start ()
1996 CODE:
1997 THIS->start ();
1998 OUTPUT:
1999 RETVAL
2000
2001CHAINED
2002iw::stop ()
2003 CODE:
2004 THIS->stop ();
2005 OUTPUT:
2006 RETVAL
2007
2008void
2009iw::DESTROY ()
2010
2011#############################################################################
2012# urxvt::pw
2013#############################################################################
2014
2015MODULE = urxvt PACKAGE = urxvt::pw
2016
2017SV *
2018pw::new ()
2019 CODE:
2020 pw *w = new pw;
2021 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2022 w->self = (HV *)SvRV (RETVAL);
2023 OUTPUT:
2024 RETVAL
2025
2026CHAINED
2027pw::start (int pid)
2028 CODE:
2029 THIS->start (pid);
2030 OUTPUT:
2031 RETVAL
2032
2033CHAINED
2034pw::stop ()
2035 CODE:
2036 THIS->stop ();
2037 OUTPUT:
2038 RETVAL
2039
2040void
2041pw::DESTROY ()
2042
2043

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines