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.70 by root, Tue Jan 17 09:34:21 2006 UTC vs.
Revision 1.91 by root, Wed Jan 25 00:42:21 2006 UTC

… …
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));
… …
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}
… …
418 perl_environ = rxvt_environ; 452 perl_environ = rxvt_environ;
419 swap (perl_environ, environ); 453 swap (perl_environ, environ);
420 454
421 char *argv[] = { 455 char *argv[] = {
422 "", 456 "",
423 "-T", 457 "-e"
424 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 458 "BEGIN {"
459 " urxvt->bootstrap;"
460 " unshift @INC, '" LIBDIR "';"
461 "}"
462 ""
463 "use urxvt;"
425 }; 464 };
426 465
427 perl = perl_alloc (); 466 perl = perl_alloc ();
428 perl_construct (perl); 467 perl_construct (perl);
429 468
430 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 469 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
431 || perl_run (perl)) 470 || perl_run (perl))
432 { 471 {
433 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 472 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
434 473
435 perl_destruct (perl); 474 perl_destruct (perl);
… …
444 483
445 if (perl) 484 if (perl)
446 { 485 {
447 // runs outside of perls ENV 486 // runs outside of perls ENV
448 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 487 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
449 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 488 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
450 } 489 }
451} 490}
452 491
453static void 492static void
454ungrab (rxvt_term *THIS) 493ungrab (rxvt_term *THIS)
… …
459 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
460 THIS->perl.grabtime = 0; 499 THIS->perl.grabtime = 0;
461 } 500 }
462} 501}
463 502
464static void
465swap_overlays (rxvt_term *term)
466{
467 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
468
469 if (HvKEYS (hv))
470 {
471 hv_iterinit (hv);
472
473 while (HE *he = hv_iternext (hv))
474 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
475 }
476}
477
478bool 503bool
479rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 504rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
480{ 505{
481 if (!perl || !term->perl.self) 506 if (!perl || !term->perl.self)
482 return false; 507 return false;
483 508
484 // pre-handling of some events 509 // pre-handling of some events
485 if (htype == HOOK_REFRESH_END) 510 if (htype == HOOK_REFRESH_END)
486 swap_overlays (term); 511 {
512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
513
514 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
516 }
487 517
488 swap (perl_environ, environ); 518 swap (perl_environ, environ);
489 519
490 bool event_consumed; 520 bool event_consumed;
491 521
… …
518 case DT_LONG: 548 case DT_LONG:
519 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 549 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
520 break; 550 break;
521 551
522 case DT_STR: 552 case DT_STR:
523 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 553 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
524 break; 554 break;
525 555
526 case DT_STR_LEN: 556 case DT_STR_LEN:
527 { 557 {
528 char *str = va_arg (ap, char *); 558 char *str = va_arg (ap, char *);
529 int len = va_arg (ap, int); 559 int len = va_arg (ap, int);
530 560
561 printf ("pushing str %p:%d\n", str,len);//D
531 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
532 } 563 }
533 break; 564 break;
534 565
535 case DT_WCS_LEN: 566 case DT_WCS_LEN:
536 { 567 {
537 wchar_t *wstr = va_arg (ap, wchar_t *); 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 *);
538 int wlen = va_arg (ap, int); 578 int llen = va_arg (ap, int);
539 579
540 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
541 } 581 }
542 break; 582 break;
543 583
544 case DT_XEVENT: 584 case DT_XEVENT:
545 { 585 {
546 XEvent *xe = va_arg (ap, XEvent *); 586 XEvent *xe = va_arg (ap, XEvent *);
547 HV *hv = newHV (); 587 HV *hv = newHV ();
548 588
549# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 589# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
550# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 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)
551# undef set 592# undef set
552 593
553 setiv (type, xe->type); 594 setiv (type, xe->type);
554 setiv (send_event, xe->xany.send_event); 595 setiv (send_event, xe->xany.send_event);
555 setiv (serial, xe->xany.serial); 596 setiv (serial, xe->xany.serial);
556 597
… …
559 case KeyPress: 600 case KeyPress:
560 case KeyRelease: 601 case KeyRelease:
561 case ButtonPress: 602 case ButtonPress:
562 case ButtonRelease: 603 case ButtonRelease:
563 case MotionNotify: 604 case MotionNotify:
605 setuv (window, xe->xmotion.window);
606 setuv (root, xe->xmotion.root);
607 setuv (subwindow, xe->xmotion.subwindow);
564 setiv (time, xe->xmotion.time); 608 setuv (time, xe->xmotion.time);
565 setiv (x, xe->xmotion.x); 609 setiv (x, xe->xmotion.x);
566 setiv (y, xe->xmotion.y); 610 setiv (y, xe->xmotion.y);
567 setiv (row, xe->xmotion.y / term->fheight); 611 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
568 setiv (col, xe->xmotion.x / term->fwidth); 612 setiv (col, xe->xmotion.x / term->fwidth);
569 setiv (x_root, xe->xmotion.x_root); 613 setiv (x_root, xe->xmotion.x_root);
570 setiv (y_root, xe->xmotion.y_root); 614 setiv (y_root, xe->xmotion.y_root);
571 setiv (state, xe->xmotion.state); 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
572 break; 634 break;
573 }
574 635
636 case MapNotify:
637 case UnmapNotify:
638 case ConfigureNotify:
639 setuv (event, xe->xconfigure.event);
640 setuv (window, xe->xconfigure.window);
641
575 switch (xe->type) 642 switch (xe->type)
576 { 643 {
577 case KeyPress: 644 case ConfigureNotify:
578 case KeyRelease: 645 setiv (x, xe->xconfigure.x);
579 setiv (keycode, xe->xkey.keycode); 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
580 break; 653 break;
581 654
582 case ButtonPress: 655 case PropertyNotify:
583 case ButtonRelease: 656 setuv (window, xe->xproperty.window);
584 setiv (button, xe->xbutton.button); 657 setuv (atom, xe->xproperty.atom);
658 setuv (time, xe->xproperty.time);
659 setiv (state, xe->xproperty.state);
585 break; 660 break;
586 661
587 case MotionNotify: 662 case ClientMessage:
588 setiv (is_hint, xe->xmotion.is_hint); 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]);
589 break; 671 break;
590 } 672 }
591 673
592 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 674 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
593 } 675 }
… …
634 else 716 else
635 event_consumed = false; 717 event_consumed = false;
636 718
637 // post-handling of some events 719 // post-handling of some events
638 if (htype == HOOK_REFRESH_BEGIN) 720 if (htype == HOOK_REFRESH_BEGIN)
639 swap_overlays (term); 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 }
640 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
641 { 728 {
642 clearSVptr ((SV *)term->perl.self); 729 clearSVptr ((SV *)term->perl.self);
643 SvREFCNT_dec ((SV *)term->perl.self); 730 SvREFCNT_dec ((SV *)term->perl.self);
731
732 // don't allow further calls
733 term->perl.self = 0;
644 } 734 }
645 735
646 swap (perl_environ, environ); 736 swap (perl_environ, environ);
647 737
648 return event_consumed; 738 return event_consumed;
… …
765 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
766 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
767 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
768 const_iv (ClientMessage), 858 const_iv (ClientMessage),
769 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
770 }; 884 };
771 885
772 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 886 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
773 civ-- > const_iv; ) 887 civ-- > const_iv; )
774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
782void 896void
783fatal (const char *msg) 897fatal (const char *msg)
784 CODE: 898 CODE:
785 rxvt_fatal ("%s", msg); 899 rxvt_fatal ("%s", msg);
786 900
787SV *
788untaint (SV *sv)
789 CODE:
790 RETVAL = newSVsv (sv);
791 SvTAINTED_off (RETVAL);
792 OUTPUT:
793 RETVAL
794
795void 901void
796_exit (int status) 902_exit (int status)
797
798bool
799safe ()
800 CODE:
801 RETVAL = !rxvt_tainted ();
802 OUTPUT:
803 RETVAL
804 903
805NV 904NV
806NOW () 905NOW ()
807 CODE: 906 CODE:
808 RETVAL = NOW; 907 RETVAL = NOW;
… …
866 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)
867 croak ("first argument to urxvt::term->_new must be arrayref"); 966 croak ("first argument to urxvt::term->_new must be arrayref");
868 967
869 rxvt_term *term = new rxvt_term; 968 rxvt_term *term = new rxvt_term;
870 969
871 term->argv = new stringvec; 970 stringvec *argv = new stringvec;
872 term->envv = new stringvec; 971 stringvec *envv = new stringvec;
873 972
874 for (int i = 1; i < items; i++) 973 for (int i = 1; i < items; i++)
875 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 974 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
876 975
877 AV *envv = (AV *)SvRV (ST (0)); 976 AV *env = (AV *)SvRV (ST (0));
878 for (int i = av_len (envv) + 1; i--; ) 977 for (int i = AvFILL (env) + 1; i--; )
879 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 978 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
880 979
881 term->envv->push_back (0); 980 envv->push_back (0);
882 981
883 bool success; 982 bool success;
884 983
885 try 984 try
886 { 985 {
887 success = term->init (term->argv->size (), term->argv->begin ()); 986 success = term->init (argv, envv);
888 } 987 }
889 catch (const class rxvt_failure_exception &e) 988 catch (const class rxvt_failure_exception &e)
890 { 989 {
891 success = false; 990 success = false;
892 } 991 }
… …
904 RETVAL 1003 RETVAL
905 1004
906void 1005void
907rxvt_term::destroy () 1006rxvt_term::destroy ()
908 1007
909#if ENABLE_PERL_FRILLS
910
911void
912rxvt_term::XListProperties (U32 window)
913 PPCODE:
914{
915 int count;
916 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
917
918 EXTEND (SP, count);
919 while (count--)
920 PUSHs (newSVuv ((U32)props [count]));
921
922 XFree (props);
923}
924
925void
926rxvt_term::XGetWindowProperty (U32 window, U32 property)
927 PPCODE:
928{
929 Atom type;
930 int format;
931 unsigned long nitems;
932 unsigned long bytes_after;
933 unsigned char *prop;
934 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
935 0, 1<<30, 0, AnyPropertyType,
936 &type, &format, &nitems, &bytes_after, &prop);
937 if (type != None)
938 {
939 EXTEND (SP, 3);
940 PUSHs (newSVuv ((U32)type));
941 PUSHs (newSViv (format));
942 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
943 XFree (prop);
944 }
945}
946
947void
948rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
949 CODE:
950{
951 STRLEN len;
952 char *data_ = SvPVbyte (data, len);
953
954 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
955 type, format, PropModeReplace,
956 (unsigned char *)data, len * 8 / format);
957}
958
959void
960rxvt_term::XDeleteProperty (U32 window, U32 property)
961 CODE:
962 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
963
964U32
965rxvt_term::DefaultRootWindow ()
966 CODE:
967 RETVAL = (U32)THIS->display->root;
968 OUTPUT:
969 RETVAL
970
971U32
972rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
973 CODE:
974 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
975 x, y, width, height, 0,
976 THIS->pix_colors_focused[Color_border],
977 THIS->pix_colors_focused[Color_border]);
978 OUTPUT:
979 RETVAL
980
981void
982rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
983 CODE:
984 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
985
986void
987rxvt_term::XMapWindow (U32 window)
988 CODE:
989 XMapWindow (THIS->display->display, (Window)window);
990
991void
992rxvt_term::XUnmapWindow (U32 window)
993 CODE:
994 XUnmapWindow (THIS->display->display, (Window)window);
995
996#endif
997
998void 1008void
999rxvt_term::set_should_invoke (int htype, int inc) 1009rxvt_term::set_should_invoke (int htype, int inc)
1000 CODE: 1010 CODE:
1001 THIS->perl.should_invoke [htype] += inc; 1011 THIS->perl.should_invoke [htype] += inc;
1002 1012
… …
1006 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1016 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
1007 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1017 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1008 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1018 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1009 1019
1010bool 1020bool
1011rxvt_term::grab (U32 eventtime, int sync = 0) 1021rxvt_term::grab (Time eventtime, int sync = 0)
1012 CODE: 1022 CODE:
1013{ 1023{
1014 int mode = sync ? GrabModeSync : GrabModeAsync; 1024 int mode = sync ? GrabModeSync : GrabModeAsync;
1015 1025
1016 THIS->perl.grabtime = 0; 1026 THIS->perl.grabtime = 0;
… …
1074 char *mbstr = rxvt_wcstombs (wstr); 1084 char *mbstr = rxvt_wcstombs (wstr);
1075 rxvt_pop_locale (); 1085 rxvt_pop_locale ();
1076 1086
1077 free (wstr); 1087 free (wstr);
1078 1088
1079 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1089 RETVAL = newSVpv (mbstr, 0);
1080 free (mbstr); 1090 free (mbstr);
1081} 1091}
1082 OUTPUT: 1092 OUTPUT:
1083 RETVAL 1093 RETVAL
1084 1094
… …
1091 1101
1092 rxvt_push_locale (THIS->locale); 1102 rxvt_push_locale (THIS->locale);
1093 wchar_t *wstr = rxvt_mbstowcs (data, len); 1103 wchar_t *wstr = rxvt_mbstowcs (data, len);
1094 rxvt_pop_locale (); 1104 rxvt_pop_locale ();
1095 1105
1096 RETVAL = taint_if (wcs2sv (wstr), octets); 1106 RETVAL = wcs2sv (wstr);
1097 free (wstr); 1107 free (wstr);
1098} 1108}
1099 OUTPUT: 1109 OUTPUT:
1100 RETVAL 1110 RETVAL
1101 1111
… …
1108#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1118#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1109#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1119#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1110#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1120#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1111#define TERM_OFFSET_focus TERM_OFFSET(focus) 1121#define TERM_OFFSET_focus TERM_OFFSET(focus)
1112#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)
1113#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1126#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1114#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1127#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1115#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1128#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1116 1129
1117int 1130int
… …
1124 fbase = TERM_OFFSET_fbase 1137 fbase = TERM_OFFSET_fbase
1125 nrow = TERM_OFFSET_nrow 1138 nrow = TERM_OFFSET_nrow
1126 ncol = TERM_OFFSET_ncol 1139 ncol = TERM_OFFSET_ncol
1127 focus = TERM_OFFSET_focus 1140 focus = TERM_OFFSET_focus
1128 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
1129 saveLines = TERM_OFFSET_saveLines 1145 saveLines = TERM_OFFSET_saveLines
1130 total_rows = TERM_OFFSET_total_rows 1146 total_rows = TERM_OFFSET_total_rows
1131 top_row = TERM_OFFSET_top_row 1147 top_row = TERM_OFFSET_top_row
1132 CODE: 1148 CODE:
1133 RETVAL = *(int *)((char *)THIS + ix); 1149 RETVAL = *(int *)((char *)THIS + ix);
… …
1138rxvt_term::ModLevel3Mask () 1154rxvt_term::ModLevel3Mask ()
1139 ALIAS: 1155 ALIAS:
1140 ModLevel3Mask = 0 1156 ModLevel3Mask = 0
1141 ModMetaMask = 1 1157 ModMetaMask = 1
1142 ModNumLockMask = 2 1158 ModNumLockMask = 2
1159 current_screen = 3
1160 hidden_cursor = 4
1143 CODE: 1161 CODE:
1144 switch (ix) 1162 switch (ix)
1145 { 1163 {
1146 case 0: RETVAL = THIS->ModLevel3Mask; break; 1164 case 0: RETVAL = THIS->ModLevel3Mask; break;
1147 case 1: RETVAL = THIS->ModMetaMask; break; 1165 case 1: RETVAL = THIS->ModMetaMask; break;
1148 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;
1149 } 1169 }
1150 OUTPUT: 1170 OUTPUT:
1151 RETVAL 1171 RETVAL
1152 1172
1153char * 1173char *
… …
1191 if (events != EVENT_UNDEF) 1211 if (events != EVENT_UNDEF)
1192 THIS->pty_ev.set (events); 1212 THIS->pty_ev.set (events);
1193 OUTPUT: 1213 OUTPUT:
1194 RETVAL 1214 RETVAL
1195 1215
1196U32 1216int
1217rxvt_term::pty_fd ()
1218 CODE:
1219 RETVAL = THIS->pty->pty;
1220 OUTPUT:
1221 RETVAL
1222
1223Window
1197rxvt_term::parent () 1224rxvt_term::parent ()
1198 CODE: 1225 CODE:
1199 RETVAL = (U32)THIS->parent [0]; 1226 RETVAL = THIS->parent [0];
1200 OUTPUT: 1227 OUTPUT:
1201 RETVAL 1228 RETVAL
1202 1229
1203U32 1230Window
1204rxvt_term::vt () 1231rxvt_term::vt ()
1205 CODE: 1232 CODE:
1206 RETVAL = (U32)THIS->vt; 1233 RETVAL = THIS->vt;
1207 OUTPUT: 1234 OUTPUT:
1208 RETVAL 1235 RETVAL
1209 1236
1210void 1237void
1211rxvt_term::vt_emask_add (U32 emask) 1238rxvt_term::vt_emask_add (U32 emask)
… …
1233} 1260}
1234 OUTPUT: 1261 OUTPUT:
1235 RETVAL 1262 RETVAL
1236 1263
1237void 1264void
1265rxvt_term::focus_in ()
1266
1267void
1268rxvt_term::focus_out ()
1269
1270void
1238rxvt_term::want_refresh () 1271rxvt_term::want_refresh ()
1239 CODE: 1272 CODE:
1240 THIS->want_refresh = 1; 1273 THIS->want_refresh = 1;
1241 1274
1242void 1275void
… …
1248 1281
1249 line_t &l = ROW(row_number); 1282 line_t &l = ROW(row_number);
1250 1283
1251 if (GIMME_V != G_VOID) 1284 if (GIMME_V != G_VOID)
1252 { 1285 {
1253 wchar_t *wstr = new wchar_t [THIS->ncol]; 1286 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1254 1287
1255 for (int col = 0; col < THIS->ncol; col++) 1288 for (int col = 0; col < THIS->ncol; col++)
1256 wstr [col] = l.t [col]; 1289 wstr [col] = l.t [col];
1257 1290
1258 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1291 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1259
1260 delete [] wstr;
1261 } 1292 }
1262 1293
1263 if (new_text) 1294 if (new_text)
1264 { 1295 {
1265 wchar_t *wstr = sv2wcs (new_text); 1296 wchar_t *wstr = sv2wcs (new_text);
1266 1297
1267 int len = min (wcslen (wstr) - start_ofs, max_len); 1298 int len = min (wcslen (wstr) - start_ofs, max_len);
1268 1299
1269 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1300 if (start_col < 0 || start_col + len > THIS->ncol)
1270 { 1301 {
1271 free (wstr); 1302 free (wstr);
1272 croak ("new_text extends beyond horizontal margins"); 1303 croak ("new_text extends beyond horizontal margins");
1273 } 1304 }
1274 1305
… …
1306 { 1337 {
1307 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1338 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1308 croak ("new_rend must be arrayref"); 1339 croak ("new_rend must be arrayref");
1309 1340
1310 AV *av = (AV *)SvRV (new_rend); 1341 AV *av = (AV *)SvRV (new_rend);
1311 int len = min (av_len (av) + 1 - start_ofs, max_len); 1342 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1312 1343
1313 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1344 if (start_col < 0 || start_col + len > THIS->ncol)
1314 croak ("new_rend array extends beyond horizontal margins"); 1345 croak ("new_rend array extends beyond horizontal margins");
1315 1346
1316 for (int col = start_col; col < start_col + len; col++) 1347 for (int col = start_col; col < start_col + len; col++)
1317 { 1348 {
1318 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;
… …
1358rxvt_term::special_encode (SV *string) 1389rxvt_term::special_encode (SV *string)
1359 CODE: 1390 CODE:
1360{ 1391{
1361 wchar_t *wstr = sv2wcs (string); 1392 wchar_t *wstr = sv2wcs (string);
1362 int wlen = wcslen (wstr); 1393 int wlen = wcslen (wstr);
1363 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1394 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1364 1395
1365 rxvt_push_locale (THIS->locale); 1396 rxvt_push_locale (THIS->locale);
1366 1397
1367 wchar_t *r = rstr; 1398 wchar_t *r = rstr;
1368 for (wchar_t *s = wstr; *s; s++) 1399 for (wchar_t *s = wstr; *s; s++)
1400 {
1401 int w = WCWIDTH (*s);
1402
1369 if (wcwidth (*s) == 0) 1403 if (w == 0)
1370 { 1404 {
1371 if (r == rstr) 1405 if (r == rstr)
1372 croak ("leading combining character unencodable"); 1406 croak ("leading combining character unencodable");
1373 1407
1374 unicode_t n = rxvt_compose (r[-1], *s); 1408 unicode_t n = rxvt_compose (r[-1], *s);
1375 if (n == NOCHAR) 1409 if (n == NOCHAR)
1376 n = rxvt_composite.compose (r[-1], *s); 1410 n = rxvt_composite.compose (r[-1], *s);
1377 1411
1378 r[-1] = n; 1412 r[-1] = n;
1379 } 1413 }
1380#if !UNICODE_3 1414#if !UNICODE_3
1381 else if (*s >= 0x10000) 1415 else if (*s >= 0x10000)
1382 *r++ = rxvt_composite.compose (*s); 1416 *r++ = rxvt_composite.compose (*s);
1383#endif 1417#endif
1384 else 1418 else
1385 *r++ = *s; 1419 *r++ = *s;
1420
1421 // the *2 above only allows wcwidth <= 2
1422 if (w > 1)
1423 *r++ = NOCHAR;
1424 }
1386 1425
1387 rxvt_pop_locale (); 1426 rxvt_pop_locale ();
1388 1427
1389 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1428 RETVAL = wcs2sv (rstr, r - rstr);
1390
1391 delete [] rstr;
1392} 1429}
1393 OUTPUT: 1430 OUTPUT:
1394 RETVAL 1431 RETVAL
1395 1432
1396SV * 1433SV *
… …
1408 else if (IS_COMPOSE (*s)) 1445 else if (IS_COMPOSE (*s))
1409 dlen += rxvt_composite.expand (*s, 0); 1446 dlen += rxvt_composite.expand (*s, 0);
1410 else 1447 else
1411 dlen++; 1448 dlen++;
1412 1449
1413 wchar_t *rstr = new wchar_t [dlen]; 1450 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1414 1451
1415 // decode 1452 // decode
1416 wchar_t *r = rstr; 1453 wchar_t *r = rstr;
1417 for (wchar_t *s = wstr; *s; s++) 1454 for (wchar_t *s = wstr; *s; s++)
1418 if (*s == NOCHAR) 1455 if (*s == NOCHAR)
… …
1420 else if (IS_COMPOSE (*s)) 1457 else if (IS_COMPOSE (*s))
1421 r += rxvt_composite.expand (*s, r); 1458 r += rxvt_composite.expand (*s, r);
1422 else 1459 else
1423 *r++ = *s; 1460 *r++ = *s;
1424 1461
1425 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1462 RETVAL = wcs2sv (rstr, r - rstr);
1426
1427 delete [] rstr;
1428} 1463}
1429 OUTPUT: 1464 OUTPUT:
1430 RETVAL 1465 RETVAL
1431 1466
1432void 1467void
… …
1452 1487
1453 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1488 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1454 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);
1455 1490
1456 if (GIMME_V != G_VOID) 1491 if (GIMME_V != G_VOID)
1457 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);
1458 1493
1459 if (newval) 1494 if (newval)
1460 { 1495 {
1461 if (SvOK (newval)) 1496 if (SvOK (newval))
1462 { 1497 {
… …
1469 } 1504 }
1470} 1505}
1471 1506
1472const char * 1507const char *
1473rxvt_term::x_resource (const char *name) 1508rxvt_term::x_resource (const char *name)
1474 CLEANUP:
1475 SvTAINTED_on (ST (0));
1476 1509
1477bool 1510bool
1478rxvt_term::option (U32 optval, int set = -1) 1511rxvt_term::option (U32 optval, int set = -1)
1479 CODE: 1512 CODE:
1480{ 1513{
… …
1485 if (set) 1518 if (set)
1486 THIS->options |= optval; 1519 THIS->options |= optval;
1487 else 1520 else
1488 THIS->options &= ~optval; 1521 THIS->options &= ~optval;
1489 1522
1523 if (THIS->check_ev.is_active ()) // avoid doing this before START
1490 switch (optval) 1524 switch (optval)
1491 { 1525 {
1492 case Opt_skipBuiltinGlyphs: 1526 case Opt_skipBuiltinGlyphs:
1493 THIS->set_fonts (); 1527 THIS->set_fonts ();
1494 THIS->scr_remap_chars (); 1528 THIS->scr_remap_chars ();
1495 THIS->scr_touch (true); 1529 THIS->scr_touch (true);
1496 THIS->want_refresh = 1; 1530 THIS->want_refresh = 1;
1497 break; 1531 break;
1498 1532
1499 case Opt_cursorUnderline: 1533 case Opt_cursorUnderline:
1500 THIS->want_refresh = 1; 1534 THIS->want_refresh = 1;
1501 break; 1535 break;
1502 1536
1503# case Opt_scrollBar_floating: 1537# case Opt_scrollBar_floating:
1504# case Opt_scrollBar_right: 1538# case Opt_scrollBar_right:
1505# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1539# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1506# break; 1540# break;
1507 } 1541 }
1508 } 1542 }
1509} 1543}
1510 OUTPUT: 1544 OUTPUT:
1511 RETVAL 1545 RETVAL
1512 1546
… …
1540 PUSHs (sv_2mortal (newSViv (rc.col))); 1574 PUSHs (sv_2mortal (newSViv (rc.col)));
1541 } 1575 }
1542 1576
1543 if (items == 3) 1577 if (items == 3)
1544 { 1578 {
1579 rc.row = SvIV (ST (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);
1545 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); 1599 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1546 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1547 1600
1548 if (ix) 1601 if (ix)
1549 THIS->want_refresh = 1; 1602 THIS->want_refresh = 1;
1550 } 1603 }
1551} 1604}
… …
1559 1612
1560#void 1613#void
1561#rxvt_term::selection_clear () 1614#rxvt_term::selection_clear ()
1562 1615
1563void 1616void
1564rxvt_term::selection_make (U32 eventtime, bool rect = false) 1617rxvt_term::selection_make (Time eventtime, bool rect = false)
1565 CODE: 1618 CODE:
1566 THIS->selection.op = SELECTION_CONT; 1619 THIS->selection.op = SELECTION_CONT;
1567 THIS->selection.rect = rect; 1620 THIS->selection.rect = rect;
1568 THIS->selection_make (eventtime); 1621 THIS->selection_make (eventtime);
1569 1622
1570int 1623int
1571rxvt_term::selection_grab (U32 eventtime) 1624rxvt_term::selection_grab (Time eventtime)
1572 1625
1573void 1626void
1574rxvt_term::selection (SV *newtext = 0) 1627rxvt_term::selection (SV *newtext = 0)
1575 PPCODE: 1628 PPCODE:
1576{ 1629{
1577 if (GIMME_V != G_VOID) 1630 if (GIMME_V != G_VOID)
1578 XPUSHs (THIS->selection.text 1631 XPUSHs (THIS->selection.text
1579 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1632 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1580 : &PL_sv_undef); 1633 : &PL_sv_undef);
1581 1634
1582 if (newtext) 1635 if (newtext)
1583 { 1636 {
1584 free (THIS->selection.text); 1637 free (THIS->selection.text);
… …
1594void 1647void
1595rxvt_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)
1596 1649
1597void 1650void
1598rxvt_term::scr_bell () 1651rxvt_term::scr_bell ()
1652
1653void
1654rxvt_term::scr_change_screen (int screen)
1599 1655
1600void 1656void
1601rxvt_term::scr_add_lines (SV *string) 1657rxvt_term::scr_add_lines (SV *string)
1602 CODE: 1658 CODE:
1603{ 1659{
… …
1644 o->self = (HV *)SvRV (RETVAL); 1700 o->self = (HV *)SvRV (RETVAL);
1645} 1701}
1646 OUTPUT: 1702 OUTPUT:
1647 RETVAL 1703 RETVAL
1648 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
1649MODULE = urxvt PACKAGE = urxvt::overlay 1845MODULE = urxvt PACKAGE = urxvt::overlay
1650 1846
1651void 1847void
1652overlay::set (int x, int y, SV *text, SV *rend = 0) 1848overlay::set (int x, int y, SV *text, SV *rend = 0)
1653 1849
… …
1657void 1853void
1658overlay::hide () 1854overlay::hide ()
1659 1855
1660void 1856void
1661overlay::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#############################################################################
1662 1875
1663MODULE = urxvt PACKAGE = urxvt::timer 1876MODULE = urxvt PACKAGE = urxvt::timer
1664 1877
1665SV * 1878SV *
1666timer::new () 1879timer::new ()
1667 CODE: 1880 CODE:
1668 timer *w = new timer; 1881 timer *w = new timer;
1669 w->start (NOW); 1882 w->start (NOW);
1670 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1883 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1671 w->self = (HV *)SvRV (RETVAL); 1884 w->self = (HV *)SvRV (RETVAL);
1672 OUTPUT:
1673 RETVAL
1674
1675timer *
1676timer::cb (SV *cb)
1677 CODE:
1678 THIS->cb (cb);
1679 RETVAL = THIS;
1680 OUTPUT: 1885 OUTPUT:
1681 RETVAL 1886 RETVAL
1682 1887
1683NV 1888NV
1684timer::at () 1889timer::at ()
1685 CODE: 1890 CODE:
1686 RETVAL = THIS->at; 1891 RETVAL = THIS->at;
1687 OUTPUT: 1892 OUTPUT:
1688 RETVAL 1893 RETVAL
1689 1894
1690timer * 1895CHAINED
1691timer::interval (NV interval) 1896timer::interval (NV interval)
1692 CODE: 1897 CODE:
1693 THIS->interval = interval; 1898 THIS->interval = interval;
1899 OUTPUT:
1694 RETVAL = THIS; 1900 RETVAL
1695 OUTPUT:
1696 RETVAL
1697 1901
1698timer * 1902CHAINED
1699timer::set (NV tstamp) 1903timer::set (NV tstamp)
1700 CODE: 1904 CODE:
1701 THIS->set (tstamp); 1905 THIS->set (tstamp);
1906 OUTPUT:
1702 RETVAL = THIS; 1907 RETVAL
1703 OUTPUT:
1704 RETVAL
1705 1908
1706timer * 1909CHAINED
1707timer::start (NV tstamp = THIS->at) 1910timer::start (NV tstamp = THIS->at)
1708 CODE: 1911 CODE:
1709 THIS->start (tstamp); 1912 THIS->start (tstamp);
1913 OUTPUT:
1710 RETVAL = THIS; 1914 RETVAL
1711 OUTPUT:
1712 RETVAL
1713 1915
1714timer * 1916CHAINED
1917timer::after (NV delay)
1918 CODE:
1919 THIS->start (NOW + delay);
1920 OUTPUT:
1921 RETVAL
1922
1923CHAINED
1715timer::stop () 1924timer::stop ()
1716 CODE: 1925 CODE:
1717 THIS->stop (); 1926 THIS->stop ();
1718 RETVAL = THIS;
1719 OUTPUT: 1927 OUTPUT:
1720 RETVAL 1928 RETVAL
1721 1929
1722void 1930void
1723timer::DESTROY () 1931timer::DESTROY ()
1932
1933#############################################################################
1934# urxvt::iow
1935#############################################################################
1724 1936
1725MODULE = urxvt PACKAGE = urxvt::iow 1937MODULE = urxvt PACKAGE = urxvt::iow
1726 1938
1727SV * 1939SV *
1728iow::new () 1940iow::new ()
1729 CODE: 1941 CODE:
1730 iow *w = new iow; 1942 iow *w = new iow;
1731 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1943 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1732 w->self = (HV *)SvRV (RETVAL); 1944 w->self = (HV *)SvRV (RETVAL);
1733 OUTPUT: 1945 OUTPUT:
1734 RETVAL 1946 RETVAL
1735 1947
1736iow * 1948CHAINED
1737iow::cb (SV *cb)
1738 CODE:
1739 THIS->cb (cb);
1740 RETVAL = THIS;
1741 OUTPUT:
1742 RETVAL
1743
1744iow *
1745iow::fd (int fd) 1949iow::fd (int fd)
1746 CODE: 1950 CODE:
1747 THIS->fd = fd; 1951 THIS->fd = fd;
1952 OUTPUT:
1748 RETVAL = THIS; 1953 RETVAL
1749 OUTPUT:
1750 RETVAL
1751 1954
1752iow * 1955CHAINED
1753iow::events (short events) 1956iow::events (short events)
1754 CODE: 1957 CODE:
1755 THIS->events = events; 1958 THIS->events = events;
1959 OUTPUT:
1756 RETVAL = THIS; 1960 RETVAL
1757 OUTPUT:
1758 RETVAL
1759 1961
1760iow * 1962CHAINED
1761iow::start () 1963iow::start ()
1762 CODE: 1964 CODE:
1763 THIS->start (); 1965 THIS->start ();
1966 OUTPUT:
1764 RETVAL = THIS; 1967 RETVAL
1765 OUTPUT:
1766 RETVAL
1767 1968
1768iow * 1969CHAINED
1769iow::stop () 1970iow::stop ()
1770 CODE: 1971 CODE:
1771 THIS->stop (); 1972 THIS->stop ();
1772 RETVAL = THIS;
1773 OUTPUT: 1973 OUTPUT:
1774 RETVAL 1974 RETVAL
1775 1975
1776void 1976void
1777iow::DESTROY () 1977iow::DESTROY ()
1778 1978
1979#############################################################################
1980# urxvt::iw
1981#############################################################################
1779 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