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.63 by root, Fri Jan 13 05:06:44 2006 UTC vs.
Revision 1.93 by root, Wed Jan 25 15:02:47 2006 UTC

39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->leftptr_cursor
46#else 46#else
47# define GRAB_CURSOR None 47# define GRAB_CURSOR None
48#endif 48#endif
49 49
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55typedef int CHAINED UNUSED;
56
55///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
56
57static SV *
58taint (SV *sv)
59{
60 SvTAINT (sv);
61 return sv;
62}
63
64static SV *
65taint_if (SV *sv, SV *src)
66{
67 if (SvTAINTED (src))
68 SvTAINT (sv);
69
70 return sv;
71}
72 58
73static wchar_t * 59static wchar_t *
74sv2wcs (SV *sv) 60sv2wcs (SV *sv)
75{ 61{
76 STRLEN len; 62 STRLEN len;
132#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
133#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
134 120
135///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
136 122
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
137struct perl_watcher 125struct perl_watcher
138{ 126{
139 SV *cbsv; 127 SV *cbsv;
140 HV *self; 128 HV *self;
141 129
142 perl_watcher () 130 perl_watcher ()
143 : cbsv (newSV (0)) 131 : cbsv (0)
144 { 132 {
145 } 133 }
146 134
147 ~perl_watcher () 135 ~perl_watcher ()
148 { 136 {
149 SvREFCNT_dec (cbsv); 137 SvREFCNT_dec (cbsv);
150 } 138 }
151 139
152 void cb (SV *cb) 140 void cb (SV *cb)
153 { 141 {
154 sv_setsv (cbsv, cb); 142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
155 } 144 }
156 145
157 void invoke (const char *type, SV *self, int arg = -1); 146 void invoke (const char *type, SV *self, int arg = -1);
158}; 147};
159 148
183 if (SvTRUE (ERRSV)) 172 if (SvTRUE (ERRSV))
184 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
185} 174}
186 175
187#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
188#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
189 178
190struct timer : time_watcher, perl_watcher 179struct timer : perl_watcher, time_watcher
191{ 180{
192 tstamp interval; 181 tstamp interval;
193 182
194 timer () 183 timer ()
195 : time_watcher (this, &timer::execute) 184 : time_watcher (this, &timer::execute)
204 invoke ("urxvt::timer", newSVtimer (this)); 193 invoke ("urxvt::timer", newSVtimer (this));
205 } 194 }
206}; 195};
207 196
208#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
209#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
210 199
211struct iow : io_watcher, perl_watcher 200struct iow : perl_watcher, io_watcher
212{ 201{
213 iow () 202 iow ()
214 : io_watcher (this, &iow::execute) 203 : io_watcher (this, &iow::execute)
215 { 204 {
216 } 205 }
219 { 208 {
220 invoke ("urxvt::iow", newSViow (this), revents); 209 invoke ("urxvt::iow", newSViow (this), revents);
221 } 210 }
222}; 211};
223 212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216struct iw : perl_watcher, idle_watcher
217{
218 iw ()
219 : idle_watcher (this, &iw::execute)
220 {
221 }
222
223 void execute (idle_watcher &w)
224 {
225 invoke ("urxvt::iw", newSViw (this));
226 }
227};
228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232struct pw : perl_watcher, child_watcher
233{
234 pw ()
235 : child_watcher (this, &pw::execute)
236 {
237 }
238
239 void execute (child_watcher &w, int status)
240 {
241 invoke ("urxvt::pw", newSVpw (this), status);
242 }
243};
244
224///////////////////////////////////////////////////////////////////////////// 245/////////////////////////////////////////////////////////////////////////////
225 246
226#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
227 248
228struct overlay { 249class overlay {
229 HV *self;
230 rxvt_term *THIS; 250 rxvt_term *THIS;
251 AV *overlay_av;
231 int x, y, w, h; 252 int x, y, w, h;
232 int border; 253 int border;
233 text_t **text; 254 text_t **text;
234 rend_t **rend; 255 rend_t **rend;
235 256
257public:
258 HV *self;
259
236 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 260 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
237 ~overlay (); 261 ~overlay ();
238 262
239 void show (); 263 void show ();
240 void hide (); 264 void hide ();
243 267
244 void set (int x, int y, SV *str, SV *rend); 268 void set (int x, int y, SV *str, SV *rend);
245}; 269};
246 270
247overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 271overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
248: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) 272: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
249{ 273{
250 if (border == 2) 274 if (border == 2)
251 { 275 {
252 w += 2; 276 w += 2;
253 h += 2; 277 h += 2;
292 *rp++ = r; 316 *rp++ = r;
293 } 317 }
294 } 318 }
295 319
296 show (); 320 show ();
297 THIS->want_refresh = 1;
298} 321}
299 322
300overlay::~overlay () 323overlay::~overlay ()
301{ 324{
302 hide (); 325 hide ();
307 delete [] rend[y]; 330 delete [] rend[y];
308 } 331 }
309 332
310 delete [] text; 333 delete [] text;
311 delete [] rend; 334 delete [] rend;
335}
336
337void
338overlay::show ()
339{
340 if (overlay_av)
341 return;
342
343 overlay_av = (AV *)SvREFCNT_inc (SvRV (
344 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
345 ));
346 av_push (overlay_av, newSViv ((long)this));
312 347
313 THIS->want_refresh = 1; 348 THIS->want_refresh = 1;
314} 349}
315 350
316void 351void
317overlay::show ()
318{
319 char key[33]; sprintf (key, "%32lx", (long)this);
320
321 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
322 hv_store (hv, key, 32, newSViv ((long)this), 0);
323}
324
325void
326overlay::hide () 352overlay::hide ()
327{ 353{
328 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 354 if (!overlay_av)
355 return;
329 356
330 if (ovs) 357 int i;
358
359 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
331 { 361 {
332 char key[33]; sprintf (key, "%32lx", (long)this); 362 av_delete (overlay_av, i, G_DISCARD);
333 363 break;
334 HV *hv = (HV *)SvRV (*ovs);
335 hv_delete (hv, key, 32, G_DISCARD);
336 } 364 }
365
366 for (; i < AvFILL (overlay_av); i++)
367 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368
369 av_pop (overlay_av);
370
371 SvREFCNT_dec (overlay_av);
372 overlay_av = 0;
373
374 THIS->want_refresh = 1;
337} 375}
338 376
339void overlay::swap () 377void overlay::swap ()
340{ 378{
341 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 379 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
347 for (int y = ov_h; y--; ) 385 for (int y = ov_h; y--; )
348 { 386 {
349 text_t *t1 = text [y]; 387 text_t *t1 = text [y];
350 rend_t *r1 = rend [y]; 388 rend_t *r1 = rend [y];
351 389
352 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 390 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
353 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 391 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
354 392
355 for (int x = ov_w; x--; ) 393 for (int x = ov_w; x--; )
356 { 394 {
357 text_t t = *t1; *t1++ = *t2; *t2++ = t; 395 text_t t = *t1; *t1++ = *t2; *t2++ = t;
358 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 396 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
381 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 419 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
382 croak ("rend must be arrayref"); 420 croak ("rend must be arrayref");
383 421
384 AV *av = (AV *)SvRV (rend); 422 AV *av = (AV *)SvRV (rend);
385 423
386 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 424 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
387 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 425 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
388 } 426 }
389 427
390 THIS->want_refresh = 1; 428 THIS->want_refresh = 1;
391} 429}
405 perl_free (perl); 443 perl_free (perl);
406 } 444 }
407} 445}
408 446
409void 447void
410rxvt_perl_interp::init () 448rxvt_perl_interp::init (rxvt_term *term)
411{ 449{
412 if (!perl) 450 if (!perl)
413 { 451 {
452 rxvt_push_locale (""); // perl init destroys current locale
453
414 perl_environ = rxvt_environ; 454 perl_environ = rxvt_environ;
415 swap (perl_environ, environ); 455 swap (perl_environ, environ);
416 456
417 char *argv[] = { 457 char *argv[] = {
418 "", 458 "",
419 "-T", 459 "-e"
420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 460 "BEGIN {"
461 " urxvt->bootstrap;"
462 " unshift @INC, '" LIBDIR "';"
463 "}"
464 ""
465 "use urxvt;"
421 }; 466 };
422 467
423 perl = perl_alloc (); 468 perl = perl_alloc ();
424 perl_construct (perl); 469 perl_construct (perl);
425 470
426 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 471 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
427 || perl_run (perl)) 472 || perl_run (perl))
428 { 473 {
429 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 474 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
430 475
431 perl_destruct (perl); 476 perl_destruct (perl);
432 perl_free (perl); 477 perl_free (perl);
433 perl = 0; 478 perl = 0;
434 } 479 }
435 480
436 swap (perl_environ, environ); 481 swap (perl_environ, environ);
482
483 rxvt_pop_locale ();
484 }
485
486 if (perl)
487 {
488 // runs outside of perls ENV
489 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
490 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
437 } 491 }
438} 492}
439 493
440static void 494static void
441ungrab (rxvt_term *THIS) 495ungrab (rxvt_term *THIS)
449} 503}
450 504
451bool 505bool
452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 506rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
453{ 507{
454 if (!perl) 508 if (!perl || !term->perl.self)
455 return false; 509 return false;
456 510
457 if (htype == HOOK_INIT) // first hook ever called 511 // pre-handling of some events
512 if (htype == HOOK_REFRESH_END)
458 { 513 {
459 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 514 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
460 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 515
516 for (int i = 0; i <= AvFILL (av); i++)
517 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
461 } 518 }
462 else if (!term->perl.self) 519
463 return false; // perl not initialized for this instance 520 swap (perl_environ, environ);
521
522 bool event_consumed;
523
524 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
525 || term->perl.should_invoke [htype])
526 try
527 {
528 dSP;
529 va_list ap;
530
531 va_start (ap, htype);
532
533 ENTER;
534 SAVETMPS;
535
536 PUSHMARK (SP);
537
538 XPUSHs (sv_2mortal (newSVterm (term)));
539 XPUSHs (sv_2mortal (newSViv (htype)));
540
541 for (;;) {
542 data_type dt = (data_type)va_arg (ap, int);
543
544 switch (dt)
545 {
546 case DT_INT:
547 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
548 break;
549
550 case DT_LONG:
551 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
552 break;
553
554 case DT_STR:
555 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
556 break;
557
558 case DT_STR_LEN:
559 {
560 char *str = va_arg (ap, char *);
561 int len = va_arg (ap, int);
562
563 printf ("pushing str %p:%d\n", str,len);//D
564 XPUSHs (sv_2mortal (newSVpvn (str, len)));
565 }
566 break;
567
568 case DT_WCS_LEN:
569 {
570 wchar_t *wstr = va_arg (ap, wchar_t *);
571 int wlen = va_arg (ap, int);
572
573 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
574 }
575 break;
576
577 case DT_LCS_LEN:
578 {
579 long *lstr = va_arg (ap, long *);
580 int llen = va_arg (ap, int);
581
582 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
583 }
584 break;
585
586 case DT_XEVENT:
587 {
588 XEvent *xe = va_arg (ap, XEvent *);
589 HV *hv = newHV ();
590
591# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
592# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
593# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
594# undef set
595
596 setiv (type, xe->type);
597 setiv (send_event, xe->xany.send_event);
598 setiv (serial, xe->xany.serial);
599
600 switch (xe->type)
601 {
602 case KeyPress:
603 case KeyRelease:
604 case ButtonPress:
605 case ButtonRelease:
606 case MotionNotify:
607 setuv (window, xe->xmotion.window);
608 setuv (root, xe->xmotion.root);
609 setuv (subwindow, xe->xmotion.subwindow);
610 setuv (time, xe->xmotion.time);
611 setiv (x, xe->xmotion.x);
612 setiv (y, xe->xmotion.y);
613 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
614 setiv (col, xe->xmotion.x / term->fwidth);
615 setiv (x_root, xe->xmotion.x_root);
616 setiv (y_root, xe->xmotion.y_root);
617 setuv (state, xe->xmotion.state);
618
619 switch (xe->type)
620 {
621 case KeyPress:
622 case KeyRelease:
623 setuv (keycode, xe->xkey.keycode);
624 break;
625
626 case ButtonPress:
627 case ButtonRelease:
628 setuv (button, xe->xbutton.button);
629 break;
630
631 case MotionNotify:
632 setiv (is_hint, xe->xmotion.is_hint);
633 break;
634 }
635
636 break;
637
638 case MapNotify:
639 case UnmapNotify:
640 case ConfigureNotify:
641 setuv (event, xe->xconfigure.event);
642 setuv (window, xe->xconfigure.window);
643
644 switch (xe->type)
645 {
646 case ConfigureNotify:
647 setiv (x, xe->xconfigure.x);
648 setiv (y, xe->xconfigure.y);
649 setiv (width, xe->xconfigure.width);
650 setiv (height, xe->xconfigure.height);
651 setuv (above, xe->xconfigure.above);
652 break;
653 }
654
655 break;
656
657 case PropertyNotify:
658 setuv (window, xe->xproperty.window);
659 setuv (atom, xe->xproperty.atom);
660 setuv (time, xe->xproperty.time);
661 setiv (state, xe->xproperty.state);
662 break;
663
664 case ClientMessage:
665 setuv (window, xe->xclient.window);
666 setuv (message_type, xe->xclient.message_type);
667 setuv (format, xe->xclient.format);
668 setuv (l0, xe->xclient.data.l[0]);
669 setuv (l1, xe->xclient.data.l[1]);
670 setuv (l2, xe->xclient.data.l[2]);
671 setuv (l3, xe->xclient.data.l[3]);
672 setuv (l4, xe->xclient.data.l[4]);
673 break;
674 }
675
676 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
677 }
678 break;
679
680 case DT_END:
681 goto call;
682
683 default:
684 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
685 }
686 }
687
688 call:
689 va_end (ap);
690
691 PUTBACK;
692 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
693 SPAGAIN;
694
695 if (count)
696 {
697 SV *status = POPs;
698 count = SvTRUE (status);
699 }
700
701 PUTBACK;
702 FREETMPS;
703 LEAVE;
704
705 if (SvTRUE (ERRSV))
706 {
707 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
708 ungrab (term); // better lose the grab than the session
709 }
710
711 event_consumed = !!count;
712 }
713 catch (...)
714 {
715 swap (perl_environ, environ);
716 throw;
717 }
718 else
719 event_consumed = false;
720
721 // post-handling of some events
722 if (htype == HOOK_REFRESH_BEGIN)
723 {
724 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
725
726 for (int i = AvFILL (av); i >= 0; i--)
727 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
728 }
464 else if (htype == HOOK_DESTROY) 729 else if (htype == HOOK_DESTROY)
465 { 730 {
466 // handled later 731 clearSVptr ((SV *)term->perl.self);
732 SvREFCNT_dec ((SV *)term->perl.self);
733
734 // don't allow further calls
735 term->perl.self = 0;
467 } 736 }
468 else
469 {
470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
471 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473
474 if (HvKEYS (hv))
475 {
476 hv_iterinit (hv);
477
478 while (HE *he = hv_iternext (hv))
479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
482 }
483
484 if (!term->perl.should_invoke [htype])
485 return false;
486 }
487 737
488 swap (perl_environ, environ); 738 swap (perl_environ, environ);
489 739
490 try 740 return event_consumed;
491 {
492 dSP;
493 va_list ap;
494
495 va_start (ap, htype);
496
497 ENTER;
498 SAVETMPS;
499
500 PUSHMARK (SP);
501
502 XPUSHs (sv_2mortal (newSVterm (term)));
503 XPUSHs (sv_2mortal (newSViv (htype)));
504
505 for (;;) {
506 data_type dt = (data_type)va_arg (ap, int);
507
508 switch (dt)
509 {
510 case DT_INT:
511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
512 break;
513
514 case DT_LONG:
515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
516 break;
517
518 case DT_STR:
519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
520 break;
521
522 case DT_STR_LEN:
523 {
524 char *str = va_arg (ap, char *);
525 int len = va_arg (ap, int);
526
527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
528 }
529 break;
530
531 case DT_WCS_LEN:
532 {
533 wchar_t *wstr = va_arg (ap, wchar_t *);
534 int wlen = va_arg (ap, int);
535
536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
537 }
538 break;
539
540 case DT_XEVENT:
541 {
542 XEvent *xe = va_arg (ap, XEvent *);
543 HV *hv = newHV ();
544
545# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
546# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
547# undef set
548
549 setiv (type, xe->type);
550 setiv (send_event, xe->xany.send_event);
551 setiv (serial, xe->xany.serial);
552
553 switch (xe->type)
554 {
555 case KeyPress:
556 case KeyRelease:
557 case ButtonPress:
558 case ButtonRelease:
559 case MotionNotify:
560 setiv (time, xe->xmotion.time);
561 setiv (x, xe->xmotion.x);
562 setiv (y, xe->xmotion.y);
563 setiv (row, xe->xmotion.y / term->fheight);
564 setiv (col, xe->xmotion.x / term->fwidth);
565 setiv (x_root, xe->xmotion.x_root);
566 setiv (y_root, xe->xmotion.y_root);
567 setiv (state, xe->xmotion.state);
568 break;
569 }
570
571 switch (xe->type)
572 {
573 case KeyPress:
574 case KeyRelease:
575 setiv (keycode, xe->xkey.keycode);
576 break;
577
578 case ButtonPress:
579 case ButtonRelease:
580 setiv (button, xe->xbutton.button);
581 break;
582
583 case MotionNotify:
584 setiv (is_hint, xe->xmotion.is_hint);
585 break;
586 }
587
588 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
589 }
590 break;
591
592 case DT_END:
593 {
594 va_end (ap);
595
596 PUTBACK;
597 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
598 SPAGAIN;
599
600 if (count)
601 {
602 SV *status = POPs;
603 count = SvTRUE (status);
604 }
605
606 PUTBACK;
607 FREETMPS;
608 LEAVE;
609
610 if (SvTRUE (ERRSV))
611 {
612 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
613 ungrab (term); // better lose the grab than the session
614 }
615
616 if (htype == HOOK_DESTROY)
617 {
618 clearSVptr ((SV *)term->perl.self);
619 SvREFCNT_dec ((SV *)term->perl.self);
620 }
621
622 swap (perl_environ, environ);
623 return count;
624 }
625
626 default:
627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 }
629 }
630 }
631 catch (...)
632 {
633 swap (perl_environ, environ);
634 throw;
635 }
636} 741}
637 742
638///////////////////////////////////////////////////////////////////////////// 743/////////////////////////////////////////////////////////////////////////////
639 744
640MODULE = urxvt PACKAGE = urxvt 745MODULE = urxvt PACKAGE = urxvt
752 const_iv (SelectionRequest), 857 const_iv (SelectionRequest),
753 const_iv (SelectionNotify), 858 const_iv (SelectionNotify),
754 const_iv (ColormapNotify), 859 const_iv (ColormapNotify),
755 const_iv (ClientMessage), 860 const_iv (ClientMessage),
756 const_iv (MappingNotify), 861 const_iv (MappingNotify),
862# if ENABLE_XIM_ONTHESPOT
863 const_iv (XIMReverse),
864 const_iv (XIMUnderline),
865 const_iv (XIMHighlight),
866 const_iv (XIMPrimary),
867 const_iv (XIMSecondary),
868 const_iv (XIMTertiary),
869 const_iv (XIMVisibleToForward),
870 const_iv (XIMVisibleToBackword),
871 const_iv (XIMVisibleToCenter),
872# if 0
873 const_iv (XIMForwardChar),
874 const_iv (XIMBackwardChar),
875 const_iv (XIMForwardWord),
876 const_iv (XIMBackwardWord),
877 const_iv (XIMCaretUp),
878 const_iv (XIMCaretDown),
879 const_iv (XIMNextLine),
880 const_iv (XIMPreviousLine),
881 const_iv (XIMLineStart),
882 const_iv (XIMLineEnd),
883 const_iv (XIMAbsolutePosition),
884 const_iv (XIMDontChange),
885# endif
886# endif
757 }; 887 };
758 888
759 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 889 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
760 civ-- > const_iv; ) 890 civ-- > const_iv; )
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
769void 899void
770fatal (const char *msg) 900fatal (const char *msg)
771 CODE: 901 CODE:
772 rxvt_fatal ("%s", msg); 902 rxvt_fatal ("%s", msg);
773 903
774SV *
775untaint (SV *sv)
776 CODE:
777 RETVAL = newSVsv (sv);
778 SvTAINTED_off (RETVAL);
779 OUTPUT:
780 RETVAL
781
782void 904void
783_exit (int status) 905_exit (int status)
784
785bool
786safe ()
787 CODE:
788 RETVAL = !rxvt_tainted ();
789 OUTPUT:
790 RETVAL
791 906
792NV 907NV
793NOW () 908NOW ()
794 CODE: 909 CODE:
795 RETVAL = NOW; 910 RETVAL = NOW;
853 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 968 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
854 croak ("first argument to urxvt::term->_new must be arrayref"); 969 croak ("first argument to urxvt::term->_new must be arrayref");
855 970
856 rxvt_term *term = new rxvt_term; 971 rxvt_term *term = new rxvt_term;
857 972
858 term->argv = new stringvec; 973 stringvec *argv = new stringvec;
859 term->envv = new stringvec; 974 stringvec *envv = new stringvec;
860 975
861 for (int i = 1; i < items; i++) 976 for (int i = 1; i < items; i++)
862 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 977 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
863 978
864 AV *envv = (AV *)SvRV (ST (0)); 979 AV *env = (AV *)SvRV (ST (0));
865 for (int i = av_len (envv) + 1; i--; ) 980 for (int i = AvFILL (env) + 1; i--; )
866 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 981 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
867 982
868 term->envv->push_back (0); 983 envv->push_back (0);
869 984
870 bool success; 985 bool success;
871 986
872 try 987 try
873 { 988 {
874 success = term->init (term->argv->size (), term->argv->begin ()); 989 success = term->init (argv, envv);
875 } 990 }
876 catch (const class rxvt_failure_exception &e) 991 catch (const class rxvt_failure_exception &e)
877 { 992 {
878 success = false; 993 success = false;
879 } 994 }
904 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1019 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
905 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1020 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
906 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1021 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
907 1022
908bool 1023bool
909rxvt_term::grab (U32 eventtime, int sync = 0) 1024rxvt_term::grab (Time eventtime, int sync = 0)
910 CODE: 1025 CODE:
911{ 1026{
912 int mode = sync ? GrabModeSync : GrabModeAsync; 1027 int mode = sync ? GrabModeSync : GrabModeAsync;
913 1028
914 THIS->perl.grabtime = 0; 1029 THIS->perl.grabtime = 0;
972 char *mbstr = rxvt_wcstombs (wstr); 1087 char *mbstr = rxvt_wcstombs (wstr);
973 rxvt_pop_locale (); 1088 rxvt_pop_locale ();
974 1089
975 free (wstr); 1090 free (wstr);
976 1091
977 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1092 RETVAL = newSVpv (mbstr, 0);
978 free (mbstr); 1093 free (mbstr);
979} 1094}
980 OUTPUT: 1095 OUTPUT:
981 RETVAL 1096 RETVAL
982 1097
989 1104
990 rxvt_push_locale (THIS->locale); 1105 rxvt_push_locale (THIS->locale);
991 wchar_t *wstr = rxvt_mbstowcs (data, len); 1106 wchar_t *wstr = rxvt_mbstowcs (data, len);
992 rxvt_pop_locale (); 1107 rxvt_pop_locale ();
993 1108
994 RETVAL = taint_if (wcs2sv (wstr), octets); 1109 RETVAL = wcs2sv (wstr);
995 free (wstr); 1110 free (wstr);
996} 1111}
997 OUTPUT: 1112 OUTPUT:
998 RETVAL 1113 RETVAL
999 1114
1006#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1121#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1007#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1122#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1008#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1123#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1009#define TERM_OFFSET_focus TERM_OFFSET(focus) 1124#define TERM_OFFSET_focus TERM_OFFSET(focus)
1010#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1125#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1126#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1127#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1128#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1011#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1129#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1012#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1130#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1013#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1131#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1014 1132
1015int 1133int
1016rxvt_term::width () 1134rxvt_term::width ()
1017 ALIAS: 1135 ALIAS:
1018 width = TERM_OFFSET_width 1136 width = TERM_OFFSET_width
1022 fbase = TERM_OFFSET_fbase 1140 fbase = TERM_OFFSET_fbase
1023 nrow = TERM_OFFSET_nrow 1141 nrow = TERM_OFFSET_nrow
1024 ncol = TERM_OFFSET_ncol 1142 ncol = TERM_OFFSET_ncol
1025 focus = TERM_OFFSET_focus 1143 focus = TERM_OFFSET_focus
1026 mapped = TERM_OFFSET_mapped 1144 mapped = TERM_OFFSET_mapped
1145 int_bwidth = TERM_OFFSET_int_bwidth
1146 ext_bwidth = TERM_OFFSET_ext_bwidth
1147 lineSpace = TERM_OFFSET_lineSpace
1027 saveLines = TERM_OFFSET_saveLines 1148 saveLines = TERM_OFFSET_saveLines
1028 total_rows = TERM_OFFSET_total_rows 1149 total_rows = TERM_OFFSET_total_rows
1029 nsaved = TERM_OFFSET_nsaved 1150 top_row = TERM_OFFSET_top_row
1030 CODE: 1151 CODE:
1031 RETVAL = *(int *)((char *)THIS + ix); 1152 RETVAL = *(int *)((char *)THIS + ix);
1032 OUTPUT: 1153 OUTPUT:
1033 RETVAL 1154 RETVAL
1034 1155
1036rxvt_term::ModLevel3Mask () 1157rxvt_term::ModLevel3Mask ()
1037 ALIAS: 1158 ALIAS:
1038 ModLevel3Mask = 0 1159 ModLevel3Mask = 0
1039 ModMetaMask = 1 1160 ModMetaMask = 1
1040 ModNumLockMask = 2 1161 ModNumLockMask = 2
1162 current_screen = 3
1163 hidden_cursor = 4
1041 CODE: 1164 CODE:
1042 switch (ix) 1165 switch (ix)
1043 { 1166 {
1044 case 0: RETVAL = THIS->ModLevel3Mask; break; 1167 case 0: RETVAL = THIS->ModLevel3Mask; break;
1045 case 1: RETVAL = THIS->ModMetaMask; break; 1168 case 1: RETVAL = THIS->ModMetaMask; break;
1046 case 2: RETVAL = THIS->ModNumLockMask; break; 1169 case 2: RETVAL = THIS->ModNumLockMask; break;
1170 case 3: RETVAL = THIS->current_screen; break;
1171 case 4: RETVAL = THIS->hidden_cursor; break;
1047 } 1172 }
1048 OUTPUT: 1173 OUTPUT:
1049 RETVAL 1174 RETVAL
1050 1175
1051char * 1176char *
1089 if (events != EVENT_UNDEF) 1214 if (events != EVENT_UNDEF)
1090 THIS->pty_ev.set (events); 1215 THIS->pty_ev.set (events);
1091 OUTPUT: 1216 OUTPUT:
1092 RETVAL 1217 RETVAL
1093 1218
1094U32 1219int
1220rxvt_term::pty_fd ()
1221 CODE:
1222 RETVAL = THIS->pty->pty;
1223 OUTPUT:
1224 RETVAL
1225
1226Window
1095rxvt_term::parent () 1227rxvt_term::parent ()
1096 CODE: 1228 CODE:
1097 RETVAL = (U32)THIS->parent [0]; 1229 RETVAL = THIS->parent [0];
1098 OUTPUT: 1230 OUTPUT:
1099 RETVAL 1231 RETVAL
1100 1232
1101U32 1233Window
1102rxvt_term::vt () 1234rxvt_term::vt ()
1103 CODE: 1235 CODE:
1104 RETVAL = (U32)THIS->vt; 1236 RETVAL = THIS->vt;
1105 OUTPUT: 1237 OUTPUT:
1106 RETVAL 1238 RETVAL
1107 1239
1108void 1240void
1109rxvt_term::vt_emask_add (U32 emask) 1241rxvt_term::vt_emask_add (U32 emask)
1118 THIS->rstyle = new_rstyle; 1250 THIS->rstyle = new_rstyle;
1119 OUTPUT: 1251 OUTPUT:
1120 RETVAL 1252 RETVAL
1121 1253
1122int 1254int
1123rxvt_term::view_start (int newval = -1) 1255rxvt_term::view_start (int newval = 1)
1124 PROTOTYPE: $;$ 1256 PROTOTYPE: $;$
1125 CODE: 1257 CODE:
1126{ 1258{
1127 RETVAL = THIS->view_start; 1259 RETVAL = THIS->view_start;
1128 1260
1129 if (newval >= 0) 1261 if (newval <= 0)
1130 { 1262 THIS->scr_changeview (max (newval, THIS->top_row));
1131 THIS->view_start = min (newval, THIS->nsaved);
1132 THIS->scr_changeview (RETVAL);
1133 }
1134} 1263}
1135 OUTPUT: 1264 OUTPUT:
1136 RETVAL 1265 RETVAL
1266
1267void
1268rxvt_term::focus_in ()
1269
1270void
1271rxvt_term::focus_out ()
1137 1272
1138void 1273void
1139rxvt_term::want_refresh () 1274rxvt_term::want_refresh ()
1140 CODE: 1275 CODE:
1141 THIS->want_refresh = 1; 1276 THIS->want_refresh = 1;
1142 1277
1143void 1278void
1144rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1279rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1145 PPCODE: 1280 PPCODE:
1146{ 1281{
1147 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1282 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1148 XSRETURN_EMPTY; 1283 XSRETURN_EMPTY;
1149 1284
1150 line_t &l = ROW(row_number); 1285 line_t &l = ROW(row_number);
1151 1286
1152 if (GIMME_V != G_VOID) 1287 if (GIMME_V != G_VOID)
1153 { 1288 {
1154 wchar_t *wstr = new wchar_t [THIS->ncol]; 1289 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1155 1290
1156 for (int col = 0; col < THIS->ncol; col++) 1291 for (int col = 0; col < THIS->ncol; col++)
1157 wstr [col] = l.t [col]; 1292 wstr [col] = l.t [col];
1158 1293
1159 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1294 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1160
1161 delete [] wstr;
1162 } 1295 }
1163 1296
1164 if (new_text) 1297 if (new_text)
1165 { 1298 {
1166 wchar_t *wstr = sv2wcs (new_text); 1299 wchar_t *wstr = sv2wcs (new_text);
1167 1300
1168 int len = min (wcslen (wstr) - start_ofs, max_len); 1301 int len = min (wcslen (wstr) - start_ofs, max_len);
1169 1302
1170 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1303 if (start_col < 0 || start_col + len > THIS->ncol)
1171 { 1304 {
1172 free (wstr); 1305 free (wstr);
1173 croak ("new_text extends beyond horizontal margins"); 1306 croak ("new_text extends beyond horizontal margins");
1174 } 1307 }
1175 1308
1185 1318
1186void 1319void
1187rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1320rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1188 PPCODE: 1321 PPCODE:
1189{ 1322{
1190 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1323 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1191 XSRETURN_EMPTY; 1324 XSRETURN_EMPTY;
1192 1325
1193 line_t &l = ROW(row_number); 1326 line_t &l = ROW(row_number);
1194 1327
1195 if (GIMME_V != G_VOID) 1328 if (GIMME_V != G_VOID)
1207 { 1340 {
1208 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1341 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1209 croak ("new_rend must be arrayref"); 1342 croak ("new_rend must be arrayref");
1210 1343
1211 AV *av = (AV *)SvRV (new_rend); 1344 AV *av = (AV *)SvRV (new_rend);
1212 int len = min (av_len (av) + 1 - start_ofs, max_len); 1345 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1213 1346
1214 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1347 if (start_col < 0 || start_col + len > THIS->ncol)
1215 croak ("new_rend array extends beyond horizontal margins"); 1348 croak ("new_rend array extends beyond horizontal margins");
1216 1349
1217 for (int col = start_col; col < start_col + len; col++) 1350 for (int col = start_col; col < start_col + len; col++)
1218 { 1351 {
1219 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1352 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1225 1358
1226int 1359int
1227rxvt_term::ROW_l (int row_number, int new_length = -1) 1360rxvt_term::ROW_l (int row_number, int new_length = -1)
1228 CODE: 1361 CODE:
1229{ 1362{
1230 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1363 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1231 XSRETURN_EMPTY; 1364 XSRETURN_EMPTY;
1232 1365
1233 line_t &l = ROW(row_number); 1366 line_t &l = ROW(row_number);
1234 RETVAL = l.l; 1367 RETVAL = l.l;
1235 1368
1241 1374
1242bool 1375bool
1243rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1376rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1244 CODE: 1377 CODE:
1245{ 1378{
1246 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1379 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1247 XSRETURN_EMPTY; 1380 XSRETURN_EMPTY;
1248 1381
1249 line_t &l = ROW(row_number); 1382 line_t &l = ROW(row_number);
1250 RETVAL = l.is_longer (); 1383 RETVAL = l.is_longer ();
1251 1384
1259rxvt_term::special_encode (SV *string) 1392rxvt_term::special_encode (SV *string)
1260 CODE: 1393 CODE:
1261{ 1394{
1262 wchar_t *wstr = sv2wcs (string); 1395 wchar_t *wstr = sv2wcs (string);
1263 int wlen = wcslen (wstr); 1396 int wlen = wcslen (wstr);
1264 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1397 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1265 1398
1266 rxvt_push_locale (THIS->locale); 1399 rxvt_push_locale (THIS->locale);
1267 1400
1268 wchar_t *r = rstr; 1401 wchar_t *r = rstr;
1269 for (wchar_t *s = wstr; *s; s++) 1402 for (wchar_t *s = wstr; *s; s++)
1403 {
1404 int w = WCWIDTH (*s);
1405
1270 if (wcwidth (*s) == 0) 1406 if (w == 0)
1271 { 1407 {
1272 if (r == rstr) 1408 if (r == rstr)
1273 croak ("leading combining character unencodable"); 1409 croak ("leading combining character unencodable");
1274 1410
1275 unicode_t n = rxvt_compose (r[-1], *s); 1411 unicode_t n = rxvt_compose (r[-1], *s);
1276 if (n == NOCHAR) 1412 if (n == NOCHAR)
1277 n = rxvt_composite.compose (r[-1], *s); 1413 n = rxvt_composite.compose (r[-1], *s);
1278 1414
1279 r[-1] = n; 1415 r[-1] = n;
1280 } 1416 }
1281#if !UNICODE_3 1417#if !UNICODE_3
1282 else if (*s >= 0x10000) 1418 else if (*s >= 0x10000)
1283 *r++ = rxvt_composite.compose (*s); 1419 *r++ = rxvt_composite.compose (*s);
1284#endif 1420#endif
1285 else 1421 else
1286 *r++ = *s; 1422 *r++ = *s;
1423
1424 // the *2 above only allows wcwidth <= 2
1425 if (w > 1)
1426 *r++ = NOCHAR;
1427 }
1287 1428
1288 rxvt_pop_locale (); 1429 rxvt_pop_locale ();
1289 1430
1290 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1431 RETVAL = wcs2sv (rstr, r - rstr);
1291
1292 delete [] rstr;
1293} 1432}
1294 OUTPUT: 1433 OUTPUT:
1295 RETVAL 1434 RETVAL
1296 1435
1297SV * 1436SV *
1309 else if (IS_COMPOSE (*s)) 1448 else if (IS_COMPOSE (*s))
1310 dlen += rxvt_composite.expand (*s, 0); 1449 dlen += rxvt_composite.expand (*s, 0);
1311 else 1450 else
1312 dlen++; 1451 dlen++;
1313 1452
1314 wchar_t *rstr = new wchar_t [dlen]; 1453 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1315 1454
1316 // decode 1455 // decode
1317 wchar_t *r = rstr; 1456 wchar_t *r = rstr;
1318 for (wchar_t *s = wstr; *s; s++) 1457 for (wchar_t *s = wstr; *s; s++)
1319 if (*s == NOCHAR) 1458 if (*s == NOCHAR)
1321 else if (IS_COMPOSE (*s)) 1460 else if (IS_COMPOSE (*s))
1322 r += rxvt_composite.expand (*s, r); 1461 r += rxvt_composite.expand (*s, r);
1323 else 1462 else
1324 *r++ = *s; 1463 *r++ = *s;
1325 1464
1326 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1465 RETVAL = wcs2sv (rstr, r - rstr);
1327
1328 delete [] rstr;
1329} 1466}
1330 OUTPUT: 1467 OUTPUT:
1331 RETVAL 1468 RETVAL
1332 1469
1333void 1470void
1353 1490
1354 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1491 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1355 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1492 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1356 1493
1357 if (GIMME_V != G_VOID) 1494 if (GIMME_V != G_VOID)
1358 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1495 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1359 1496
1360 if (newval) 1497 if (newval)
1361 { 1498 {
1362 if (SvOK (newval)) 1499 if (SvOK (newval))
1363 { 1500 {
1370 } 1507 }
1371} 1508}
1372 1509
1373const char * 1510const char *
1374rxvt_term::x_resource (const char *name) 1511rxvt_term::x_resource (const char *name)
1375 CLEANUP:
1376 SvTAINTED_on (ST (0));
1377 1512
1378bool 1513bool
1379rxvt_term::option (U32 optval, int set = -1) 1514rxvt_term::option (U32 optval, int set = -1)
1380 CODE: 1515 CODE:
1381{ 1516{
1386 if (set) 1521 if (set)
1387 THIS->options |= optval; 1522 THIS->options |= optval;
1388 else 1523 else
1389 THIS->options &= ~optval; 1524 THIS->options &= ~optval;
1390 1525
1526 if (THIS->check_ev.is_active ()) // avoid doing this before START
1391 switch (optval) 1527 switch (optval)
1392 { 1528 {
1393 case Opt_skipBuiltinGlyphs: 1529 case Opt_skipBuiltinGlyphs:
1394 THIS->set_fonts (); 1530 THIS->set_fonts ();
1395 THIS->scr_remap_chars (); 1531 THIS->scr_remap_chars ();
1396 THIS->scr_touch (true); 1532 THIS->scr_touch (true);
1397 THIS->want_refresh = 1; 1533 THIS->want_refresh = 1;
1398 break; 1534 break;
1399 1535
1400 case Opt_cursorUnderline: 1536 case Opt_cursorUnderline:
1401 THIS->want_refresh = 1; 1537 THIS->want_refresh = 1;
1402 break; 1538 break;
1403 1539
1404# case Opt_scrollBar_floating: 1540# case Opt_scrollBar_floating:
1405# case Opt_scrollBar_right: 1541# case Opt_scrollBar_right:
1406# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1542# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1407# break; 1543# break;
1408 } 1544 }
1409 } 1545 }
1410} 1546}
1411 OUTPUT: 1547 OUTPUT:
1412 RETVAL 1548 RETVAL
1413 1549
1441 PUSHs (sv_2mortal (newSViv (rc.col))); 1577 PUSHs (sv_2mortal (newSViv (rc.col)));
1442 } 1578 }
1443 1579
1444 if (items == 3) 1580 if (items == 3)
1445 { 1581 {
1446 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1582 rc.row = SvIV (ST (1));
1447 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1583 rc.col = SvIV (ST (2));
1584
1585 if (ix == 2)
1586 {
1587 if (rc.col == 0)
1588 {
1589 // col == 0 means end of previous line
1590 rc.row--;
1591 rc.col = THIS->ncol;
1592 }
1593 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1594 && rc.col > ROW(rc.row).l)
1595 {
1596 // col >= length means while line and add newline
1597 rc.col = THIS->ncol;
1598 }
1599 }
1600
1601 clamp_it (rc.col, 0, THIS->ncol);
1602 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1448 1603
1449 if (ix) 1604 if (ix)
1450 THIS->want_refresh = 1; 1605 THIS->want_refresh = 1;
1451 } 1606 }
1452} 1607}
1456 CODE: 1611 CODE:
1457 RETVAL = THIS->charsets [THIS->screen.charset]; 1612 RETVAL = THIS->charsets [THIS->screen.charset];
1458 OUTPUT: 1613 OUTPUT:
1459 RETVAL 1614 RETVAL
1460 1615
1461#void 1616void
1462#rxvt_term::selection_clear () 1617rxvt_term::selection_clear ()
1463 1618
1464void 1619void
1465rxvt_term::selection_make (U32 eventtime, bool rect = false) 1620rxvt_term::selection_make (Time eventtime, bool rect = false)
1466 CODE: 1621 CODE:
1467 THIS->selection.op = SELECTION_CONT; 1622 THIS->selection.op = SELECTION_CONT;
1468 THIS->selection.rect = rect; 1623 THIS->selection.rect = rect;
1469 THIS->selection_make (eventtime); 1624 THIS->selection_make (eventtime);
1470 1625
1471int 1626int
1472rxvt_term::selection_grab (U32 eventtime) 1627rxvt_term::selection_grab (Time eventtime)
1473 1628
1474void 1629void
1475rxvt_term::selection (SV *newtext = 0) 1630rxvt_term::selection (SV *newtext = 0)
1476 PPCODE: 1631 PPCODE:
1477{ 1632{
1478 if (GIMME_V != G_VOID) 1633 if (GIMME_V != G_VOID)
1479 XPUSHs (THIS->selection.text 1634 XPUSHs (THIS->selection.text
1480 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1635 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1481 : &PL_sv_undef); 1636 : &PL_sv_undef);
1482 1637
1483 if (newtext) 1638 if (newtext)
1484 { 1639 {
1485 free (THIS->selection.text); 1640 free (THIS->selection.text);
1495void 1650void
1496rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1651rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1497 1652
1498void 1653void
1499rxvt_term::scr_bell () 1654rxvt_term::scr_bell ()
1655
1656void
1657rxvt_term::scr_change_screen (int screen)
1500 1658
1501void 1659void
1502rxvt_term::scr_add_lines (SV *string) 1660rxvt_term::scr_add_lines (SV *string)
1503 CODE: 1661 CODE:
1504{ 1662{
1545 o->self = (HV *)SvRV (RETVAL); 1703 o->self = (HV *)SvRV (RETVAL);
1546} 1704}
1547 OUTPUT: 1705 OUTPUT:
1548 RETVAL 1706 RETVAL
1549 1707
1708#############################################################################
1709# Various X Utility Functions
1710#############################################################################
1711
1712void
1713rxvt_term::XListProperties (Window window)
1714 PPCODE:
1715{
1716 int count;
1717 Atom *props = XListProperties (THIS->display->display, window, &count);
1718
1719 EXTEND (SP, count);
1720 while (count--)
1721 PUSHs (newSVuv ((U32)props [count]));
1722
1723 XFree (props);
1724}
1725
1726void
1727rxvt_term::XGetWindowProperty (Window window, Atom property)
1728 PPCODE:
1729{
1730 Atom type;
1731 int format;
1732 unsigned long nitems;
1733 unsigned long bytes_after;
1734 unsigned char *prop;
1735
1736 XGetWindowProperty (THIS->display->display, window, property,
1737 0, 1<<24, 0, AnyPropertyType,
1738 &type, &format, &nitems, &bytes_after, &prop);
1739
1740 if (type != None)
1741 {
1742 int elemsize = format == 16 ? sizeof (short)
1743 : format == 32 ? sizeof (long)
1744 : 1;
1745
1746 EXTEND (SP, 3);
1747 PUSHs (newSVuv ((U32)type));
1748 PUSHs (newSViv (format));
1749 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1750 XFree (prop);
1751 }
1752}
1753
1754void
1755rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1756 CODE:
1757{
1758 STRLEN len;
1759 char *data_ = SvPVbyte (data, len);
1760
1761 int elemsize = format == 16 ? sizeof (short)
1762 : format == 32 ? sizeof (long)
1763 : 1;
1764
1765 XChangeProperty (THIS->display->display, window, property,
1766 type, format, PropModeReplace,
1767 (unsigned char *)data_, len / elemsize);
1768 XSync (THIS->display->display, 0);
1769}
1770
1771Atom
1772XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1773 C_ARGS: term->display->display, atom_name, only_if_exists
1774
1775char *
1776XGetAtomName (rxvt_term *term, Atom atom)
1777 C_ARGS: term->display->display, atom
1778 CLEANUP:
1779 XFree (RETVAL);
1780
1781void
1782XDeleteProperty (rxvt_term *term, Window window, Atom property)
1783 C_ARGS: term->display->display, window, property
1784
1785Window
1786rxvt_term::DefaultRootWindow ()
1787 CODE:
1788 RETVAL = THIS->display->root;
1789 OUTPUT:
1790 RETVAL
1791
1792#if 0
1793
1794Window
1795XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1796 C_ARGS: term->display->display, (Window)parent,
1797 x, y, width, height, 0,
1798 term->pix_colors_focused[Color_border],
1799 term->pix_colors_focused[Color_border]
1800
1801#endif
1802
1803void
1804XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1805 C_ARGS: term->display->display, window, parent, x, y
1806
1807void
1808XMapWindow (rxvt_term *term, Window window)
1809 C_ARGS: term->display->display, window
1810
1811void
1812XUnmapWindow (rxvt_term *term, Window window)
1813 C_ARGS: term->display->display, window
1814
1815void
1816XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1817 C_ARGS: term->display->display, window, x, y, width, height
1818
1819void
1820rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1821 CODE:
1822{
1823 XWindowAttributes attr;
1824 XGetWindowAttributes (THIS->display->display, window, &attr);
1825 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1826}
1827
1828void
1829rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1830 PPCODE:
1831{
1832 int dx, dy;
1833 Window child;
1834
1835 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1836 {
1837 EXTEND (SP, 3);
1838 PUSHs (newSViv (dx));
1839 PUSHs (newSViv (dy));
1840 PUSHs (newSVuv (child));
1841 }
1842}
1843
1844#############################################################################
1845# urxvt::overlay
1846#############################################################################
1847
1550MODULE = urxvt PACKAGE = urxvt::overlay 1848MODULE = urxvt PACKAGE = urxvt::overlay
1551 1849
1552void 1850void
1553overlay::set (int x, int y, SV *text, SV *rend = 0) 1851overlay::set (int x, int y, SV *text, SV *rend = 0)
1554 1852
1558void 1856void
1559overlay::hide () 1857overlay::hide ()
1560 1858
1561void 1859void
1562overlay::DESTROY () 1860overlay::DESTROY ()
1861
1862#############################################################################
1863# urxvt::watcher
1864#############################################################################
1865
1866MODULE = urxvt PACKAGE = urxvt::watcher
1867
1868CHAINED
1869perl_watcher::cb (SV *cb)
1870 CODE:
1871 THIS->cb (cb);
1872 OUTPUT:
1873 RETVAL
1874
1875#############################################################################
1876# urxvt::timer
1877#############################################################################
1563 1878
1564MODULE = urxvt PACKAGE = urxvt::timer 1879MODULE = urxvt PACKAGE = urxvt::timer
1565 1880
1566SV * 1881SV *
1567timer::new () 1882timer::new ()
1568 CODE: 1883 CODE:
1569 timer *w = new timer; 1884 timer *w = new timer;
1570 w->start (NOW); 1885 w->start (NOW);
1571 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1886 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1572 w->self = (HV *)SvRV (RETVAL); 1887 w->self = (HV *)SvRV (RETVAL);
1573 OUTPUT:
1574 RETVAL
1575
1576timer *
1577timer::cb (SV *cb)
1578 CODE:
1579 THIS->cb (cb);
1580 RETVAL = THIS;
1581 OUTPUT: 1888 OUTPUT:
1582 RETVAL 1889 RETVAL
1583 1890
1584NV 1891NV
1585timer::at () 1892timer::at ()
1586 CODE: 1893 CODE:
1587 RETVAL = THIS->at; 1894 RETVAL = THIS->at;
1588 OUTPUT: 1895 OUTPUT:
1589 RETVAL 1896 RETVAL
1590 1897
1591timer * 1898CHAINED
1592timer::interval (NV interval) 1899timer::interval (NV interval)
1593 CODE: 1900 CODE:
1594 THIS->interval = interval; 1901 THIS->interval = interval;
1902 OUTPUT:
1595 RETVAL = THIS; 1903 RETVAL
1596 OUTPUT:
1597 RETVAL
1598 1904
1599timer * 1905CHAINED
1600timer::set (NV tstamp) 1906timer::set (NV tstamp)
1601 CODE: 1907 CODE:
1602 THIS->set (tstamp); 1908 THIS->set (tstamp);
1909 OUTPUT:
1603 RETVAL = THIS; 1910 RETVAL
1604 OUTPUT:
1605 RETVAL
1606 1911
1607timer * 1912CHAINED
1608timer::start (NV tstamp = THIS->at) 1913timer::start (NV tstamp = THIS->at)
1609 CODE: 1914 CODE:
1610 THIS->start (tstamp); 1915 THIS->start (tstamp);
1916 OUTPUT:
1611 RETVAL = THIS; 1917 RETVAL
1612 OUTPUT:
1613 RETVAL
1614 1918
1615timer * 1919CHAINED
1920timer::after (NV delay)
1921 CODE:
1922 THIS->start (NOW + delay);
1923 OUTPUT:
1924 RETVAL
1925
1926CHAINED
1616timer::stop () 1927timer::stop ()
1617 CODE: 1928 CODE:
1618 THIS->stop (); 1929 THIS->stop ();
1619 RETVAL = THIS;
1620 OUTPUT: 1930 OUTPUT:
1621 RETVAL 1931 RETVAL
1622 1932
1623void 1933void
1624timer::DESTROY () 1934timer::DESTROY ()
1935
1936#############################################################################
1937# urxvt::iow
1938#############################################################################
1625 1939
1626MODULE = urxvt PACKAGE = urxvt::iow 1940MODULE = urxvt PACKAGE = urxvt::iow
1627 1941
1628SV * 1942SV *
1629iow::new () 1943iow::new ()
1630 CODE: 1944 CODE:
1631 iow *w = new iow; 1945 iow *w = new iow;
1632 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1946 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1633 w->self = (HV *)SvRV (RETVAL); 1947 w->self = (HV *)SvRV (RETVAL);
1634 OUTPUT: 1948 OUTPUT:
1635 RETVAL 1949 RETVAL
1636 1950
1637iow * 1951CHAINED
1638iow::cb (SV *cb)
1639 CODE:
1640 THIS->cb (cb);
1641 RETVAL = THIS;
1642 OUTPUT:
1643 RETVAL
1644
1645iow *
1646iow::fd (int fd) 1952iow::fd (int fd)
1647 CODE: 1953 CODE:
1648 THIS->fd = fd; 1954 THIS->fd = fd;
1955 OUTPUT:
1649 RETVAL = THIS; 1956 RETVAL
1650 OUTPUT:
1651 RETVAL
1652 1957
1653iow * 1958CHAINED
1654iow::events (short events) 1959iow::events (short events)
1655 CODE: 1960 CODE:
1656 THIS->events = events; 1961 THIS->events = events;
1962 OUTPUT:
1657 RETVAL = THIS; 1963 RETVAL
1658 OUTPUT:
1659 RETVAL
1660 1964
1661iow * 1965CHAINED
1662iow::start () 1966iow::start ()
1663 CODE: 1967 CODE:
1664 THIS->start (); 1968 THIS->start ();
1969 OUTPUT:
1665 RETVAL = THIS; 1970 RETVAL
1666 OUTPUT:
1667 RETVAL
1668 1971
1669iow * 1972CHAINED
1670iow::stop () 1973iow::stop ()
1671 CODE: 1974 CODE:
1672 THIS->stop (); 1975 THIS->stop ();
1673 RETVAL = THIS;
1674 OUTPUT: 1976 OUTPUT:
1675 RETVAL 1977 RETVAL
1676 1978
1677void 1979void
1678iow::DESTROY () 1980iow::DESTROY ()
1679 1981
1982#############################################################################
1983# urxvt::iw
1984#############################################################################
1680 1985
1986MODULE = urxvt PACKAGE = urxvt::iw
1987
1988SV *
1989iw::new ()
1990 CODE:
1991 iw *w = new iw;
1992 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1993 w->self = (HV *)SvRV (RETVAL);
1994 OUTPUT:
1995 RETVAL
1996
1997CHAINED
1998iw::start ()
1999 CODE:
2000 THIS->start ();
2001 OUTPUT:
2002 RETVAL
2003
2004CHAINED
2005iw::stop ()
2006 CODE:
2007 THIS->stop ();
2008 OUTPUT:
2009 RETVAL
2010
2011void
2012iw::DESTROY ()
2013
2014#############################################################################
2015# urxvt::pw
2016#############################################################################
2017
2018MODULE = urxvt PACKAGE = urxvt::pw
2019
2020SV *
2021pw::new ()
2022 CODE:
2023 pw *w = new pw;
2024 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2025 w->self = (HV *)SvRV (RETVAL);
2026 OUTPUT:
2027 RETVAL
2028
2029CHAINED
2030pw::start (int pid)
2031 CODE:
2032 THIS->start (pid);
2033 OUTPUT:
2034 RETVAL
2035
2036CHAINED
2037pw::stop ()
2038 CODE:
2039 THIS->stop ();
2040 OUTPUT:
2041 RETVAL
2042
2043void
2044pw::DESTROY ()
2045
2046

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines