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.92 by root, Wed Jan 25 00:57:57 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# if 0
871 const_iv (XIMForwardChar),
872 const_iv (XIMBackwardChar),
873 const_iv (XIMForwardWord),
874 const_iv (XIMBackwardWord),
875 const_iv (XIMCaretUp),
876 const_iv (XIMCaretDown),
877 const_iv (XIMNextLine),
878 const_iv (XIMPreviousLine),
879 const_iv (XIMLineStart),
880 const_iv (XIMLineEnd),
881 const_iv (XIMAbsolutePosition),
882 const_iv (XIMDontChange),
883# endif
884# endif
770 }; 885 };
771 886
772 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
773 civ-- > const_iv; ) 888 civ-- > const_iv; )
774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
782void 897void
783fatal (const char *msg) 898fatal (const char *msg)
784 CODE: 899 CODE:
785 rxvt_fatal ("%s", msg); 900 rxvt_fatal ("%s", msg);
786 901
787SV *
788untaint (SV *sv)
789 CODE:
790 RETVAL = newSVsv (sv);
791 SvTAINTED_off (RETVAL);
792 OUTPUT:
793 RETVAL
794
795void 902void
796_exit (int status) 903_exit (int status)
797
798bool
799safe ()
800 CODE:
801 RETVAL = !rxvt_tainted ();
802 OUTPUT:
803 RETVAL
804 904
805NV 905NV
806NOW () 906NOW ()
807 CODE: 907 CODE:
808 RETVAL = NOW; 908 RETVAL = NOW;
… …
866 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 966 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
867 croak ("first argument to urxvt::term->_new must be arrayref"); 967 croak ("first argument to urxvt::term->_new must be arrayref");
868 968
869 rxvt_term *term = new rxvt_term; 969 rxvt_term *term = new rxvt_term;
870 970
871 term->argv = new stringvec; 971 stringvec *argv = new stringvec;
872 term->envv = new stringvec; 972 stringvec *envv = new stringvec;
873 973
874 for (int i = 1; i < items; i++) 974 for (int i = 1; i < items; i++)
875 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 975 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
876 976
877 AV *envv = (AV *)SvRV (ST (0)); 977 AV *env = (AV *)SvRV (ST (0));
878 for (int i = av_len (envv) + 1; i--; ) 978 for (int i = AvFILL (env) + 1; i--; )
879 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 979 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
880 980
881 term->envv->push_back (0); 981 envv->push_back (0);
882 982
883 bool success; 983 bool success;
884 984
885 try 985 try
886 { 986 {
887 success = term->init (term->argv->size (), term->argv->begin ()); 987 success = term->init (argv, envv);
888 } 988 }
889 catch (const class rxvt_failure_exception &e) 989 catch (const class rxvt_failure_exception &e)
890 { 990 {
891 success = false; 991 success = false;
892 } 992 }
… …
904 RETVAL 1004 RETVAL
905 1005
906void 1006void
907rxvt_term::destroy () 1007rxvt_term::destroy ()
908 1008
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 1009void
999rxvt_term::set_should_invoke (int htype, int inc) 1010rxvt_term::set_should_invoke (int htype, int inc)
1000 CODE: 1011 CODE:
1001 THIS->perl.should_invoke [htype] += inc; 1012 THIS->perl.should_invoke [htype] += inc;
1002 1013
… …
1006 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1017 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
1007 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1018 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1008 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1019 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1009 1020
1010bool 1021bool
1011rxvt_term::grab (U32 eventtime, int sync = 0) 1022rxvt_term::grab (Time eventtime, int sync = 0)
1012 CODE: 1023 CODE:
1013{ 1024{
1014 int mode = sync ? GrabModeSync : GrabModeAsync; 1025 int mode = sync ? GrabModeSync : GrabModeAsync;
1015 1026
1016 THIS->perl.grabtime = 0; 1027 THIS->perl.grabtime = 0;
… …
1074 char *mbstr = rxvt_wcstombs (wstr); 1085 char *mbstr = rxvt_wcstombs (wstr);
1075 rxvt_pop_locale (); 1086 rxvt_pop_locale ();
1076 1087
1077 free (wstr); 1088 free (wstr);
1078 1089
1079 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1090 RETVAL = newSVpv (mbstr, 0);
1080 free (mbstr); 1091 free (mbstr);
1081} 1092}
1082 OUTPUT: 1093 OUTPUT:
1083 RETVAL 1094 RETVAL
1084 1095
… …
1091 1102
1092 rxvt_push_locale (THIS->locale); 1103 rxvt_push_locale (THIS->locale);
1093 wchar_t *wstr = rxvt_mbstowcs (data, len); 1104 wchar_t *wstr = rxvt_mbstowcs (data, len);
1094 rxvt_pop_locale (); 1105 rxvt_pop_locale ();
1095 1106
1096 RETVAL = taint_if (wcs2sv (wstr), octets); 1107 RETVAL = wcs2sv (wstr);
1097 free (wstr); 1108 free (wstr);
1098} 1109}
1099 OUTPUT: 1110 OUTPUT:
1100 RETVAL 1111 RETVAL
1101 1112
… …
1108#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1119#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1109#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1120#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1110#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1121#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1111#define TERM_OFFSET_focus TERM_OFFSET(focus) 1122#define TERM_OFFSET_focus TERM_OFFSET(focus)
1112#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1123#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1124#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1125#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1126#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1113#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1127#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1114#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1128#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1115#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1129#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1116 1130
1117int 1131int
… …
1124 fbase = TERM_OFFSET_fbase 1138 fbase = TERM_OFFSET_fbase
1125 nrow = TERM_OFFSET_nrow 1139 nrow = TERM_OFFSET_nrow
1126 ncol = TERM_OFFSET_ncol 1140 ncol = TERM_OFFSET_ncol
1127 focus = TERM_OFFSET_focus 1141 focus = TERM_OFFSET_focus
1128 mapped = TERM_OFFSET_mapped 1142 mapped = TERM_OFFSET_mapped
1143 int_bwidth = TERM_OFFSET_int_bwidth
1144 ext_bwidth = TERM_OFFSET_ext_bwidth
1145 lineSpace = TERM_OFFSET_lineSpace
1129 saveLines = TERM_OFFSET_saveLines 1146 saveLines = TERM_OFFSET_saveLines
1130 total_rows = TERM_OFFSET_total_rows 1147 total_rows = TERM_OFFSET_total_rows
1131 top_row = TERM_OFFSET_top_row 1148 top_row = TERM_OFFSET_top_row
1132 CODE: 1149 CODE:
1133 RETVAL = *(int *)((char *)THIS + ix); 1150 RETVAL = *(int *)((char *)THIS + ix);
… …
1138rxvt_term::ModLevel3Mask () 1155rxvt_term::ModLevel3Mask ()
1139 ALIAS: 1156 ALIAS:
1140 ModLevel3Mask = 0 1157 ModLevel3Mask = 0
1141 ModMetaMask = 1 1158 ModMetaMask = 1
1142 ModNumLockMask = 2 1159 ModNumLockMask = 2
1160 current_screen = 3
1161 hidden_cursor = 4
1143 CODE: 1162 CODE:
1144 switch (ix) 1163 switch (ix)
1145 { 1164 {
1146 case 0: RETVAL = THIS->ModLevel3Mask; break; 1165 case 0: RETVAL = THIS->ModLevel3Mask; break;
1147 case 1: RETVAL = THIS->ModMetaMask; break; 1166 case 1: RETVAL = THIS->ModMetaMask; break;
1148 case 2: RETVAL = THIS->ModNumLockMask; break; 1167 case 2: RETVAL = THIS->ModNumLockMask; break;
1168 case 3: RETVAL = THIS->current_screen; break;
1169 case 4: RETVAL = THIS->hidden_cursor; break;
1149 } 1170 }
1150 OUTPUT: 1171 OUTPUT:
1151 RETVAL 1172 RETVAL
1152 1173
1153char * 1174char *
… …
1191 if (events != EVENT_UNDEF) 1212 if (events != EVENT_UNDEF)
1192 THIS->pty_ev.set (events); 1213 THIS->pty_ev.set (events);
1193 OUTPUT: 1214 OUTPUT:
1194 RETVAL 1215 RETVAL
1195 1216
1196U32 1217int
1218rxvt_term::pty_fd ()
1219 CODE:
1220 RETVAL = THIS->pty->pty;
1221 OUTPUT:
1222 RETVAL
1223
1224Window
1197rxvt_term::parent () 1225rxvt_term::parent ()
1198 CODE: 1226 CODE:
1199 RETVAL = (U32)THIS->parent [0]; 1227 RETVAL = THIS->parent [0];
1200 OUTPUT: 1228 OUTPUT:
1201 RETVAL 1229 RETVAL
1202 1230
1203U32 1231Window
1204rxvt_term::vt () 1232rxvt_term::vt ()
1205 CODE: 1233 CODE:
1206 RETVAL = (U32)THIS->vt; 1234 RETVAL = THIS->vt;
1207 OUTPUT: 1235 OUTPUT:
1208 RETVAL 1236 RETVAL
1209 1237
1210void 1238void
1211rxvt_term::vt_emask_add (U32 emask) 1239rxvt_term::vt_emask_add (U32 emask)
… …
1233} 1261}
1234 OUTPUT: 1262 OUTPUT:
1235 RETVAL 1263 RETVAL
1236 1264
1237void 1265void
1266rxvt_term::focus_in ()
1267
1268void
1269rxvt_term::focus_out ()
1270
1271void
1238rxvt_term::want_refresh () 1272rxvt_term::want_refresh ()
1239 CODE: 1273 CODE:
1240 THIS->want_refresh = 1; 1274 THIS->want_refresh = 1;
1241 1275
1242void 1276void
… …
1248 1282
1249 line_t &l = ROW(row_number); 1283 line_t &l = ROW(row_number);
1250 1284
1251 if (GIMME_V != G_VOID) 1285 if (GIMME_V != G_VOID)
1252 { 1286 {
1253 wchar_t *wstr = new wchar_t [THIS->ncol]; 1287 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1254 1288
1255 for (int col = 0; col < THIS->ncol; col++) 1289 for (int col = 0; col < THIS->ncol; col++)
1256 wstr [col] = l.t [col]; 1290 wstr [col] = l.t [col];
1257 1291
1258 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1292 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1259
1260 delete [] wstr;
1261 } 1293 }
1262 1294
1263 if (new_text) 1295 if (new_text)
1264 { 1296 {
1265 wchar_t *wstr = sv2wcs (new_text); 1297 wchar_t *wstr = sv2wcs (new_text);
1266 1298
1267 int len = min (wcslen (wstr) - start_ofs, max_len); 1299 int len = min (wcslen (wstr) - start_ofs, max_len);
1268 1300
1269 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1301 if (start_col < 0 || start_col + len > THIS->ncol)
1270 { 1302 {
1271 free (wstr); 1303 free (wstr);
1272 croak ("new_text extends beyond horizontal margins"); 1304 croak ("new_text extends beyond horizontal margins");
1273 } 1305 }
1274 1306
… …
1306 { 1338 {
1307 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1339 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1308 croak ("new_rend must be arrayref"); 1340 croak ("new_rend must be arrayref");
1309 1341
1310 AV *av = (AV *)SvRV (new_rend); 1342 AV *av = (AV *)SvRV (new_rend);
1311 int len = min (av_len (av) + 1 - start_ofs, max_len); 1343 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1312 1344
1313 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1345 if (start_col < 0 || start_col + len > THIS->ncol)
1314 croak ("new_rend array extends beyond horizontal margins"); 1346 croak ("new_rend array extends beyond horizontal margins");
1315 1347
1316 for (int col = start_col; col < start_col + len; col++) 1348 for (int col = start_col; col < start_col + len; col++)
1317 { 1349 {
1318 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1350 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1358rxvt_term::special_encode (SV *string) 1390rxvt_term::special_encode (SV *string)
1359 CODE: 1391 CODE:
1360{ 1392{
1361 wchar_t *wstr = sv2wcs (string); 1393 wchar_t *wstr = sv2wcs (string);
1362 int wlen = wcslen (wstr); 1394 int wlen = wcslen (wstr);
1363 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1395 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1364 1396
1365 rxvt_push_locale (THIS->locale); 1397 rxvt_push_locale (THIS->locale);
1366 1398
1367 wchar_t *r = rstr; 1399 wchar_t *r = rstr;
1368 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1401 {
1402 int w = WCWIDTH (*s);
1403
1369 if (wcwidth (*s) == 0) 1404 if (w == 0)
1370 { 1405 {
1371 if (r == rstr) 1406 if (r == rstr)
1372 croak ("leading combining character unencodable"); 1407 croak ("leading combining character unencodable");
1373 1408
1374 unicode_t n = rxvt_compose (r[-1], *s); 1409 unicode_t n = rxvt_compose (r[-1], *s);
1375 if (n == NOCHAR) 1410 if (n == NOCHAR)
1376 n = rxvt_composite.compose (r[-1], *s); 1411 n = rxvt_composite.compose (r[-1], *s);
1377 1412
1378 r[-1] = n; 1413 r[-1] = n;
1379 } 1414 }
1380#if !UNICODE_3 1415#if !UNICODE_3
1381 else if (*s >= 0x10000) 1416 else if (*s >= 0x10000)
1382 *r++ = rxvt_composite.compose (*s); 1417 *r++ = rxvt_composite.compose (*s);
1383#endif 1418#endif
1384 else 1419 else
1385 *r++ = *s; 1420 *r++ = *s;
1421
1422 // the *2 above only allows wcwidth <= 2
1423 if (w > 1)
1424 *r++ = NOCHAR;
1425 }
1386 1426
1387 rxvt_pop_locale (); 1427 rxvt_pop_locale ();
1388 1428
1389 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1429 RETVAL = wcs2sv (rstr, r - rstr);
1390
1391 delete [] rstr;
1392} 1430}
1393 OUTPUT: 1431 OUTPUT:
1394 RETVAL 1432 RETVAL
1395 1433
1396SV * 1434SV *
… …
1408 else if (IS_COMPOSE (*s)) 1446 else if (IS_COMPOSE (*s))
1409 dlen += rxvt_composite.expand (*s, 0); 1447 dlen += rxvt_composite.expand (*s, 0);
1410 else 1448 else
1411 dlen++; 1449 dlen++;
1412 1450
1413 wchar_t *rstr = new wchar_t [dlen]; 1451 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1414 1452
1415 // decode 1453 // decode
1416 wchar_t *r = rstr; 1454 wchar_t *r = rstr;
1417 for (wchar_t *s = wstr; *s; s++) 1455 for (wchar_t *s = wstr; *s; s++)
1418 if (*s == NOCHAR) 1456 if (*s == NOCHAR)
… …
1420 else if (IS_COMPOSE (*s)) 1458 else if (IS_COMPOSE (*s))
1421 r += rxvt_composite.expand (*s, r); 1459 r += rxvt_composite.expand (*s, r);
1422 else 1460 else
1423 *r++ = *s; 1461 *r++ = *s;
1424 1462
1425 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1463 RETVAL = wcs2sv (rstr, r - rstr);
1426
1427 delete [] rstr;
1428} 1464}
1429 OUTPUT: 1465 OUTPUT:
1430 RETVAL 1466 RETVAL
1431 1467
1432void 1468void
… …
1452 1488
1453 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1489 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1454 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1490 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1455 1491
1456 if (GIMME_V != G_VOID) 1492 if (GIMME_V != G_VOID)
1457 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1493 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1458 1494
1459 if (newval) 1495 if (newval)
1460 { 1496 {
1461 if (SvOK (newval)) 1497 if (SvOK (newval))
1462 { 1498 {
… …
1469 } 1505 }
1470} 1506}
1471 1507
1472const char * 1508const char *
1473rxvt_term::x_resource (const char *name) 1509rxvt_term::x_resource (const char *name)
1474 CLEANUP:
1475 SvTAINTED_on (ST (0));
1476 1510
1477bool 1511bool
1478rxvt_term::option (U32 optval, int set = -1) 1512rxvt_term::option (U32 optval, int set = -1)
1479 CODE: 1513 CODE:
1480{ 1514{
… …
1485 if (set) 1519 if (set)
1486 THIS->options |= optval; 1520 THIS->options |= optval;
1487 else 1521 else
1488 THIS->options &= ~optval; 1522 THIS->options &= ~optval;
1489 1523
1524 if (THIS->check_ev.is_active ()) // avoid doing this before START
1490 switch (optval) 1525 switch (optval)
1491 { 1526 {
1492 case Opt_skipBuiltinGlyphs: 1527 case Opt_skipBuiltinGlyphs:
1493 THIS->set_fonts (); 1528 THIS->set_fonts ();
1494 THIS->scr_remap_chars (); 1529 THIS->scr_remap_chars ();
1495 THIS->scr_touch (true); 1530 THIS->scr_touch (true);
1496 THIS->want_refresh = 1; 1531 THIS->want_refresh = 1;
1497 break; 1532 break;
1498 1533
1499 case Opt_cursorUnderline: 1534 case Opt_cursorUnderline:
1500 THIS->want_refresh = 1; 1535 THIS->want_refresh = 1;
1501 break; 1536 break;
1502 1537
1503# case Opt_scrollBar_floating: 1538# case Opt_scrollBar_floating:
1504# case Opt_scrollBar_right: 1539# case Opt_scrollBar_right:
1505# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1540# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1506# break; 1541# break;
1507 } 1542 }
1508 } 1543 }
1509} 1544}
1510 OUTPUT: 1545 OUTPUT:
1511 RETVAL 1546 RETVAL
1512 1547
… …
1540 PUSHs (sv_2mortal (newSViv (rc.col))); 1575 PUSHs (sv_2mortal (newSViv (rc.col)));
1541 } 1576 }
1542 1577
1543 if (items == 3) 1578 if (items == 3)
1544 { 1579 {
1580 rc.row = SvIV (ST (1));
1581 rc.col = SvIV (ST (2));
1582
1583 if (ix == 2)
1584 {
1585 if (rc.col == 0)
1586 {
1587 // col == 0 means end of previous line
1588 rc.row--;
1589 rc.col = THIS->ncol;
1590 }
1591 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1592 && rc.col > ROW(rc.row).l)
1593 {
1594 // col >= length means while line and add newline
1595 rc.col = THIS->ncol;
1596 }
1597 }
1598
1599 clamp_it (rc.col, 0, THIS->ncol);
1545 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); 1600 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1546 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1547 1601
1548 if (ix) 1602 if (ix)
1549 THIS->want_refresh = 1; 1603 THIS->want_refresh = 1;
1550 } 1604 }
1551} 1605}
… …
1559 1613
1560#void 1614#void
1561#rxvt_term::selection_clear () 1615#rxvt_term::selection_clear ()
1562 1616
1563void 1617void
1564rxvt_term::selection_make (U32 eventtime, bool rect = false) 1618rxvt_term::selection_make (Time eventtime, bool rect = false)
1565 CODE: 1619 CODE:
1566 THIS->selection.op = SELECTION_CONT; 1620 THIS->selection.op = SELECTION_CONT;
1567 THIS->selection.rect = rect; 1621 THIS->selection.rect = rect;
1568 THIS->selection_make (eventtime); 1622 THIS->selection_make (eventtime);
1569 1623
1570int 1624int
1571rxvt_term::selection_grab (U32 eventtime) 1625rxvt_term::selection_grab (Time eventtime)
1572 1626
1573void 1627void
1574rxvt_term::selection (SV *newtext = 0) 1628rxvt_term::selection (SV *newtext = 0)
1575 PPCODE: 1629 PPCODE:
1576{ 1630{
1577 if (GIMME_V != G_VOID) 1631 if (GIMME_V != G_VOID)
1578 XPUSHs (THIS->selection.text 1632 XPUSHs (THIS->selection.text
1579 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1633 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1580 : &PL_sv_undef); 1634 : &PL_sv_undef);
1581 1635
1582 if (newtext) 1636 if (newtext)
1583 { 1637 {
1584 free (THIS->selection.text); 1638 free (THIS->selection.text);
… …
1594void 1648void
1595rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1649rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1596 1650
1597void 1651void
1598rxvt_term::scr_bell () 1652rxvt_term::scr_bell ()
1653
1654void
1655rxvt_term::scr_change_screen (int screen)
1599 1656
1600void 1657void
1601rxvt_term::scr_add_lines (SV *string) 1658rxvt_term::scr_add_lines (SV *string)
1602 CODE: 1659 CODE:
1603{ 1660{
… …
1644 o->self = (HV *)SvRV (RETVAL); 1701 o->self = (HV *)SvRV (RETVAL);
1645} 1702}
1646 OUTPUT: 1703 OUTPUT:
1647 RETVAL 1704 RETVAL
1648 1705
1706#############################################################################
1707# Various X Utility Functions
1708#############################################################################
1709
1710void
1711rxvt_term::XListProperties (Window window)
1712 PPCODE:
1713{
1714 int count;
1715 Atom *props = XListProperties (THIS->display->display, window, &count);
1716
1717 EXTEND (SP, count);
1718 while (count--)
1719 PUSHs (newSVuv ((U32)props [count]));
1720
1721 XFree (props);
1722}
1723
1724void
1725rxvt_term::XGetWindowProperty (Window window, Atom property)
1726 PPCODE:
1727{
1728 Atom type;
1729 int format;
1730 unsigned long nitems;
1731 unsigned long bytes_after;
1732 unsigned char *prop;
1733
1734 XGetWindowProperty (THIS->display->display, window, property,
1735 0, 1<<24, 0, AnyPropertyType,
1736 &type, &format, &nitems, &bytes_after, &prop);
1737
1738 if (type != None)
1739 {
1740 int elemsize = format == 16 ? sizeof (short)
1741 : format == 32 ? sizeof (long)
1742 : 1;
1743
1744 EXTEND (SP, 3);
1745 PUSHs (newSVuv ((U32)type));
1746 PUSHs (newSViv (format));
1747 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1748 XFree (prop);
1749 }
1750}
1751
1752void
1753rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1754 CODE:
1755{
1756 STRLEN len;
1757 char *data_ = SvPVbyte (data, len);
1758
1759 int elemsize = format == 16 ? sizeof (short)
1760 : format == 32 ? sizeof (long)
1761 : 1;
1762
1763 XChangeProperty (THIS->display->display, window, property,
1764 type, format, PropModeReplace,
1765 (unsigned char *)data_, len / elemsize);
1766 XSync (THIS->display->display, 0);
1767}
1768
1769Atom
1770XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1771 C_ARGS: term->display->display, atom_name, only_if_exists
1772
1773char *
1774XGetAtomName (rxvt_term *term, Atom atom)
1775 C_ARGS: term->display->display, atom
1776 CLEANUP:
1777 XFree (RETVAL);
1778
1779void
1780XDeleteProperty (rxvt_term *term, Window window, Atom property)
1781 C_ARGS: term->display->display, window, property
1782
1783Window
1784rxvt_term::DefaultRootWindow ()
1785 CODE:
1786 RETVAL = THIS->display->root;
1787 OUTPUT:
1788 RETVAL
1789
1790#if 0
1791
1792Window
1793XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1794 C_ARGS: term->display->display, (Window)parent,
1795 x, y, width, height, 0,
1796 term->pix_colors_focused[Color_border],
1797 term->pix_colors_focused[Color_border]
1798
1799#endif
1800
1801void
1802XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1803 C_ARGS: term->display->display, window, parent, x, y
1804
1805void
1806XMapWindow (rxvt_term *term, Window window)
1807 C_ARGS: term->display->display, window
1808
1809void
1810XUnmapWindow (rxvt_term *term, Window window)
1811 C_ARGS: term->display->display, window
1812
1813void
1814XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1815 C_ARGS: term->display->display, window, x, y, width, height
1816
1817void
1818rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1819 CODE:
1820{
1821 XWindowAttributes attr;
1822 XGetWindowAttributes (THIS->display->display, window, &attr);
1823 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1824}
1825
1826void
1827rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1828 PPCODE:
1829{
1830 int dx, dy;
1831 Window child;
1832
1833 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1834 {
1835 EXTEND (SP, 3);
1836 PUSHs (newSViv (dx));
1837 PUSHs (newSViv (dy));
1838 PUSHs (newSVuv (child));
1839 }
1840}
1841
1842#############################################################################
1843# urxvt::overlay
1844#############################################################################
1845
1649MODULE = urxvt PACKAGE = urxvt::overlay 1846MODULE = urxvt PACKAGE = urxvt::overlay
1650 1847
1651void 1848void
1652overlay::set (int x, int y, SV *text, SV *rend = 0) 1849overlay::set (int x, int y, SV *text, SV *rend = 0)
1653 1850
… …
1657void 1854void
1658overlay::hide () 1855overlay::hide ()
1659 1856
1660void 1857void
1661overlay::DESTROY () 1858overlay::DESTROY ()
1859
1860#############################################################################
1861# urxvt::watcher
1862#############################################################################
1863
1864MODULE = urxvt PACKAGE = urxvt::watcher
1865
1866CHAINED
1867perl_watcher::cb (SV *cb)
1868 CODE:
1869 THIS->cb (cb);
1870 OUTPUT:
1871 RETVAL
1872
1873#############################################################################
1874# urxvt::timer
1875#############################################################################
1662 1876
1663MODULE = urxvt PACKAGE = urxvt::timer 1877MODULE = urxvt PACKAGE = urxvt::timer
1664 1878
1665SV * 1879SV *
1666timer::new () 1880timer::new ()
1667 CODE: 1881 CODE:
1668 timer *w = new timer; 1882 timer *w = new timer;
1669 w->start (NOW); 1883 w->start (NOW);
1670 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1884 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1671 w->self = (HV *)SvRV (RETVAL); 1885 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: 1886 OUTPUT:
1681 RETVAL 1887 RETVAL
1682 1888
1683NV 1889NV
1684timer::at () 1890timer::at ()
1685 CODE: 1891 CODE:
1686 RETVAL = THIS->at; 1892 RETVAL = THIS->at;
1687 OUTPUT: 1893 OUTPUT:
1688 RETVAL 1894 RETVAL
1689 1895
1690timer * 1896CHAINED
1691timer::interval (NV interval) 1897timer::interval (NV interval)
1692 CODE: 1898 CODE:
1693 THIS->interval = interval; 1899 THIS->interval = interval;
1900 OUTPUT:
1694 RETVAL = THIS; 1901 RETVAL
1695 OUTPUT:
1696 RETVAL
1697 1902
1698timer * 1903CHAINED
1699timer::set (NV tstamp) 1904timer::set (NV tstamp)
1700 CODE: 1905 CODE:
1701 THIS->set (tstamp); 1906 THIS->set (tstamp);
1907 OUTPUT:
1702 RETVAL = THIS; 1908 RETVAL
1703 OUTPUT:
1704 RETVAL
1705 1909
1706timer * 1910CHAINED
1707timer::start (NV tstamp = THIS->at) 1911timer::start (NV tstamp = THIS->at)
1708 CODE: 1912 CODE:
1709 THIS->start (tstamp); 1913 THIS->start (tstamp);
1914 OUTPUT:
1710 RETVAL = THIS; 1915 RETVAL
1711 OUTPUT:
1712 RETVAL
1713 1916
1714timer * 1917CHAINED
1918timer::after (NV delay)
1919 CODE:
1920 THIS->start (NOW + delay);
1921 OUTPUT:
1922 RETVAL
1923
1924CHAINED
1715timer::stop () 1925timer::stop ()
1716 CODE: 1926 CODE:
1717 THIS->stop (); 1927 THIS->stop ();
1718 RETVAL = THIS;
1719 OUTPUT: 1928 OUTPUT:
1720 RETVAL 1929 RETVAL
1721 1930
1722void 1931void
1723timer::DESTROY () 1932timer::DESTROY ()
1933
1934#############################################################################
1935# urxvt::iow
1936#############################################################################
1724 1937
1725MODULE = urxvt PACKAGE = urxvt::iow 1938MODULE = urxvt PACKAGE = urxvt::iow
1726 1939
1727SV * 1940SV *
1728iow::new () 1941iow::new ()
1729 CODE: 1942 CODE:
1730 iow *w = new iow; 1943 iow *w = new iow;
1731 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1944 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1732 w->self = (HV *)SvRV (RETVAL); 1945 w->self = (HV *)SvRV (RETVAL);
1733 OUTPUT: 1946 OUTPUT:
1734 RETVAL 1947 RETVAL
1735 1948
1736iow * 1949CHAINED
1737iow::cb (SV *cb)
1738 CODE:
1739 THIS->cb (cb);
1740 RETVAL = THIS;
1741 OUTPUT:
1742 RETVAL
1743
1744iow *
1745iow::fd (int fd) 1950iow::fd (int fd)
1746 CODE: 1951 CODE:
1747 THIS->fd = fd; 1952 THIS->fd = fd;
1953 OUTPUT:
1748 RETVAL = THIS; 1954 RETVAL
1749 OUTPUT:
1750 RETVAL
1751 1955
1752iow * 1956CHAINED
1753iow::events (short events) 1957iow::events (short events)
1754 CODE: 1958 CODE:
1755 THIS->events = events; 1959 THIS->events = events;
1960 OUTPUT:
1756 RETVAL = THIS; 1961 RETVAL
1757 OUTPUT:
1758 RETVAL
1759 1962
1760iow * 1963CHAINED
1761iow::start () 1964iow::start ()
1762 CODE: 1965 CODE:
1763 THIS->start (); 1966 THIS->start ();
1967 OUTPUT:
1764 RETVAL = THIS; 1968 RETVAL
1765 OUTPUT:
1766 RETVAL
1767 1969
1768iow * 1970CHAINED
1769iow::stop () 1971iow::stop ()
1770 CODE: 1972 CODE:
1771 THIS->stop (); 1973 THIS->stop ();
1772 RETVAL = THIS;
1773 OUTPUT: 1974 OUTPUT:
1774 RETVAL 1975 RETVAL
1775 1976
1776void 1977void
1777iow::DESTROY () 1978iow::DESTROY ()
1778 1979
1980#############################################################################
1981# urxvt::iw
1982#############################################################################
1779 1983
1984MODULE = urxvt PACKAGE = urxvt::iw
1985
1986SV *
1987iw::new ()
1988 CODE:
1989 iw *w = new iw;
1990 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1991 w->self = (HV *)SvRV (RETVAL);
1992 OUTPUT:
1993 RETVAL
1994
1995CHAINED
1996iw::start ()
1997 CODE:
1998 THIS->start ();
1999 OUTPUT:
2000 RETVAL
2001
2002CHAINED
2003iw::stop ()
2004 CODE:
2005 THIS->stop ();
2006 OUTPUT:
2007 RETVAL
2008
2009void
2010iw::DESTROY ()
2011
2012#############################################################################
2013# urxvt::pw
2014#############################################################################
2015
2016MODULE = urxvt PACKAGE = urxvt::pw
2017
2018SV *
2019pw::new ()
2020 CODE:
2021 pw *w = new pw;
2022 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2023 w->self = (HV *)SvRV (RETVAL);
2024 OUTPUT:
2025 RETVAL
2026
2027CHAINED
2028pw::start (int pid)
2029 CODE:
2030 THIS->start (pid);
2031 OUTPUT:
2032 RETVAL
2033
2034CHAINED
2035pw::stop ()
2036 CODE:
2037 THIS->stop ();
2038 OUTPUT:
2039 RETVAL
2040
2041void
2042pw::DESTROY ()
2043
2044

Diff Legend

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