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.55 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.80 by root, Fri Jan 20 12:16:28 2006 UTC

29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h"
35
34#include "iom.h" 36#include "iom.h"
35#include "rxvt.h" 37#include "rxvt.h"
36#include "keyboard.h" 38#include "keyboard.h"
37#include "rxvtutil.h" 39#include "rxvtutil.h"
38#include "rxvtperl.h" 40#include "rxvtperl.h"
39 41
40#include "perlxsi.c" 42#include "perlxsi.c"
41 43
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 44#ifdef HAVE_SCROLLBARS
43# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->leftptr_cursor
44#else 46#else
45# define GRAB_CURSOR None 47# define GRAB_CURSOR None
46#endif 48#endif
47 49
48#undef LINENO 50#undef LINENO
49#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)
50#undef ROW 52#undef ROW
51#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
52 54
55typedef int CHAINED UNUSED;
56
53///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
54
55static SV *
56taint (SV *sv)
57{
58 SvTAINT (sv);
59 return sv;
60}
61
62static SV *
63taint_if (SV *sv, SV *src)
64{
65 if (SvTAINTED (src))
66 SvTAINT (sv);
67
68 return sv;
69}
70 58
71static wchar_t * 59static wchar_t *
72sv2wcs (SV *sv) 60sv2wcs (SV *sv)
73{ 61{
74 STRLEN len; 62 STRLEN len;
130#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
131#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
132 120
133///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
134 122
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
135struct perl_watcher 125struct perl_watcher
136{ 126{
137 SV *cbsv; 127 SV *cbsv;
138 HV *self; 128 HV *self;
139 129
140 perl_watcher () 130 perl_watcher ()
141 : cbsv (newSV (0)) 131 : cbsv (0)
142 { 132 {
143 } 133 }
144 134
145 ~perl_watcher () 135 ~perl_watcher ()
146 { 136 {
147 SvREFCNT_dec (cbsv); 137 SvREFCNT_dec (cbsv);
148 } 138 }
149 139
150 void cb (SV *cb) 140 void cb (SV *cb)
151 { 141 {
152 sv_setsv (cbsv, cb); 142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
153 } 144 }
154 145
155 void invoke (const char *type, SV *self, int arg = -1); 146 void invoke (const char *type, SV *self, int arg = -1);
156}; 147};
157 148
181 if (SvTRUE (ERRSV)) 172 if (SvTRUE (ERRSV))
182 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
183} 174}
184 175
185#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
186#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
187 178
188struct timer : time_watcher, perl_watcher 179struct timer : perl_watcher, time_watcher
189{ 180{
190 tstamp interval; 181 tstamp interval;
191 182
192 timer () 183 timer ()
193 : time_watcher (this, &timer::execute) 184 : time_watcher (this, &timer::execute)
202 invoke ("urxvt::timer", newSVtimer (this)); 193 invoke ("urxvt::timer", newSVtimer (this));
203 } 194 }
204}; 195};
205 196
206#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
207#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
208 199
209struct iow : io_watcher, perl_watcher 200struct iow : perl_watcher, io_watcher
210{ 201{
211 iow () 202 iow ()
212 : io_watcher (this, &iow::execute) 203 : io_watcher (this, &iow::execute)
213 { 204 {
214 } 205 }
217 { 208 {
218 invoke ("urxvt::iow", newSViow (this), revents); 209 invoke ("urxvt::iow", newSViow (this), revents);
219 } 210 }
220}; 211};
221 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
222///////////////////////////////////////////////////////////////////////////// 245/////////////////////////////////////////////////////////////////////////////
223 246
224#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
225 248
226struct overlay { 249struct overlay {
227 HV *self; 250 HV *self;
251 bool visible;
228 rxvt_term *THIS; 252 rxvt_term *THIS;
229 int x, y, w, h; 253 int x, y, w, h;
230 int border; 254 int border;
231 text_t **text; 255 text_t **text;
232 rend_t **rend; 256 rend_t **rend;
241 265
242 void set (int x, int y, SV *str, SV *rend); 266 void set (int x, int y, SV *str, SV *rend);
243}; 267};
244 268
245overlay::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)
246: 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)
247{ 271{
248 if (border == 2) 272 if (border == 2)
249 { 273 {
250 w += 2; 274 w += 2;
251 h += 2; 275 h += 2;
312} 336}
313 337
314void 338void
315overlay::show () 339overlay::show ()
316{ 340{
317 char key[33]; sprintf (key, "%32lx", (long)this); 341 if (visible)
342 return;
318 343
344 visible = true;
345
319 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));
320 hv_store (hv, key, 32, newSViv ((long)this), 0); 347 av_push (av, newSViv ((long)this));
321} 348}
322 349
323void 350void
324overlay::hide () 351overlay::hide ()
325{ 352{
353 if (!visible)
354 return;
355
356 visible = false;
357
326 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));
327 359
328 if (ovs) 360 int i;
361
362 for (i = AvFILL (av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this)
329 { 364 {
330 char key[33]; sprintf (key, "%32lx", (long)this);
331
332 HV *hv = (HV *)SvRV (*ovs);
333 hv_delete (hv, key, 32, G_DISCARD); 365 av_delete (av, i, G_DISCARD);
366 break;
334 } 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);
335} 373}
336 374
337void overlay::swap () 375void overlay::swap ()
338{ 376{
339 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));
345 for (int y = ov_h; y--; ) 383 for (int y = ov_h; y--; )
346 { 384 {
347 text_t *t1 = text [y]; 385 text_t *t1 = text [y];
348 rend_t *r1 = rend [y]; 386 rend_t *r1 = rend [y];
349 387
350 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 388 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
351 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 389 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
352 390
353 for (int x = ov_w; x--; ) 391 for (int x = ov_w; x--; )
354 { 392 {
355 text_t t = *t1; *t1++ = *t2; *t2++ = t; 393 text_t t = *t1; *t1++ = *t2; *t2++ = t;
356 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 394 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
379 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 417 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
380 croak ("rend must be arrayref"); 418 croak ("rend must be arrayref");
381 419
382 AV *av = (AV *)SvRV (rend); 420 AV *av = (AV *)SvRV (rend);
383 421
384 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 422 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
385 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 423 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
386 } 424 }
387 425
388 THIS->want_refresh = 1; 426 THIS->want_refresh = 1;
389} 427}
392///////////////////////////////////////////////////////////////////////////// 430/////////////////////////////////////////////////////////////////////////////
393 431
394struct rxvt_perl_interp rxvt_perl; 432struct rxvt_perl_interp rxvt_perl;
395 433
396static PerlInterpreter *perl; 434static PerlInterpreter *perl;
397
398rxvt_perl_interp::rxvt_perl_interp ()
399{
400}
401 435
402rxvt_perl_interp::~rxvt_perl_interp () 436rxvt_perl_interp::~rxvt_perl_interp ()
403{ 437{
404 if (perl) 438 if (perl)
405 { 439 {
407 perl_free (perl); 441 perl_free (perl);
408 } 442 }
409} 443}
410 444
411void 445void
412rxvt_perl_interp::init () 446rxvt_perl_interp::init (rxvt_term *term)
413{ 447{
414 if (!perl) 448 if (!perl)
415 { 449 {
450 rxvt_push_locale (""); // perl init destroys current locale
451
452 perl_environ = rxvt_environ;
453 swap (perl_environ, environ);
454
416 char *argv[] = { 455 char *argv[] = {
417 "", 456 "",
418 "-T", 457 "-e"
419 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 458 "BEGIN {"
459 " urxvt->bootstrap;"
460 " unshift @INC, '" LIBDIR "';"
461 "}"
462 ""
463 "use urxvt;"
420 }; 464 };
421 465
422 perl = perl_alloc (); 466 perl = perl_alloc ();
423 perl_construct (perl); 467 perl_construct (perl);
424 468
425 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 469 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
426 || perl_run (perl)) 470 || perl_run (perl))
427 { 471 {
428 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 472 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
429 473
430 perl_destruct (perl); 474 perl_destruct (perl);
431 perl_free (perl); 475 perl_free (perl);
432 perl = 0; 476 perl = 0;
433 } 477 }
478
479 swap (perl_environ, environ);
480
481 rxvt_pop_locale ();
482 }
483
484 if (perl)
485 {
486 // runs outside of perls ENV
487 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
488 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
434 } 489 }
435} 490}
436 491
437static void 492static void
438ungrab (rxvt_term *THIS) 493ungrab (rxvt_term *THIS)
446} 501}
447 502
448bool 503bool
449rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 504rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
450{ 505{
451 if (!perl) 506 if (!perl || !term->perl.self)
452 return false; 507 return false;
453 508
454 if (htype == HOOK_INIT) // first hook ever called 509 // pre-handling of some events
510 if (htype == HOOK_REFRESH_END)
455 { 511 {
456 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
457 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 513
514 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
458 } 516 }
459 else if (!term->perl.self) 517
460 return false; // perl not initialized for this instance 518 swap (perl_environ, environ);
519
520 bool event_consumed;
521
522 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
523 || term->perl.should_invoke [htype])
524 try
525 {
526 dSP;
527 va_list ap;
528
529 va_start (ap, htype);
530
531 ENTER;
532 SAVETMPS;
533
534 PUSHMARK (SP);
535
536 XPUSHs (sv_2mortal (newSVterm (term)));
537 XPUSHs (sv_2mortal (newSViv (htype)));
538
539 for (;;) {
540 data_type dt = (data_type)va_arg (ap, int);
541
542 switch (dt)
543 {
544 case DT_INT:
545 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
546 break;
547
548 case DT_LONG:
549 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
550 break;
551
552 case DT_STR:
553 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
554 break;
555
556 case DT_STR_LEN:
557 {
558 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int);
560
561 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 }
563 break;
564
565 case DT_WCS_LEN:
566 {
567 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int);
569
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
571 }
572 break;
573
574 case DT_XEVENT:
575 {
576 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV ();
578
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
580# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
581# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set
583
584 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial);
587
588 switch (xe->type)
589 {
590 case KeyPress:
591 case KeyRelease:
592 case ButtonPress:
593 case ButtonRelease:
594 case MotionNotify:
595 setuv (window, xe->xmotion.window);
596 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight);
602 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state);
606
607 switch (xe->type)
608 {
609 case KeyPress:
610 case KeyRelease:
611 setuv (keycode, xe->xkey.keycode);
612 break;
613
614 case ButtonPress:
615 case ButtonRelease:
616 setuv (button, xe->xbutton.button);
617 break;
618
619 case MotionNotify:
620 setiv (is_hint, xe->xmotion.is_hint);
621 break;
622 }
623
624 break;
625
626 case MapNotify:
627 case UnmapNotify:
628 case ConfigureNotify:
629 setuv (event, xe->xconfigure.event);
630 setuv (window, xe->xconfigure.window);
631
632 switch (xe->type)
633 {
634 case ConfigureNotify:
635 setiv (x, xe->xconfigure.x);
636 setiv (y, xe->xconfigure.y);
637 setiv (width, xe->xconfigure.width);
638 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above);
640 break;
641 }
642
643 break;
644
645 case ClientMessage:
646 setuv (window, xe->xclient.window);
647 setuv (message_type, xe->xclient.message_type);
648 setuv (format, xe->xclient.format);
649 setuv (l0, xe->xclient.data.l[0]);
650 setuv (l1, xe->xclient.data.l[1]);
651 setuv (l2, xe->xclient.data.l[2]);
652 setuv (l3, xe->xclient.data.l[3]);
653 setuv (l4, xe->xclient.data.l[4]);
654 }
655
656 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
657 }
658 break;
659
660 case DT_END:
661 goto call;
662
663 default:
664 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
665 }
666 }
667
668 call:
669 va_end (ap);
670
671 PUTBACK;
672 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
673 SPAGAIN;
674
675 if (count)
676 {
677 SV *status = POPs;
678 count = SvTRUE (status);
679 }
680
681 PUTBACK;
682 FREETMPS;
683 LEAVE;
684
685 if (SvTRUE (ERRSV))
686 {
687 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
688 ungrab (term); // better lose the grab than the session
689 }
690
691 event_consumed = !!count;
692 }
693 catch (...)
694 {
695 swap (perl_environ, environ);
696 throw;
697 }
698 else
699 event_consumed = false;
700
701 // post-handling of some events
702 if (htype == HOOK_REFRESH_BEGIN)
703 {
704 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
705
706 for (int i = AvFILL (av); i >= 0; i--)
707 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
708 }
461 else if (htype == HOOK_DESTROY) 709 else if (htype == HOOK_DESTROY)
462 { 710 {
463 // handled later 711 clearSVptr ((SV *)term->perl.self);
712 SvREFCNT_dec ((SV *)term->perl.self);
464 } 713 }
465 else
466 {
467 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
468 {
469 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
470 714
471 if (HvKEYS (hv)) 715 swap (perl_environ, environ);
472 {
473 hv_iterinit (hv);
474 716
475 while (HE *he = hv_iternext (hv)) 717 return event_consumed;
476 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
477 }
478
479 }
480
481 if (!should_invoke [htype])
482 return false;
483 }
484
485 dSP;
486 va_list ap;
487
488 va_start (ap, htype);
489
490 ENTER;
491 SAVETMPS;
492
493 PUSHMARK (SP);
494
495 XPUSHs (sv_2mortal (newSVterm (term)));
496 XPUSHs (sv_2mortal (newSViv (htype)));
497
498 for (;;) {
499 data_type dt = (data_type)va_arg (ap, int);
500
501 switch (dt)
502 {
503 case DT_INT:
504 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
505 break;
506
507 case DT_LONG:
508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
509 break;
510
511 case DT_STR:
512 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
513 break;
514
515 case DT_STR_LEN:
516 {
517 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int);
519
520 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
521 }
522 break;
523
524 case DT_WCS_LEN:
525 {
526 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int);
528
529 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
530 }
531 break;
532
533 case DT_XEVENT:
534 {
535 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV ();
537
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# undef set
541
542 setiv (type, xe->type);
543 setiv (send_event, xe->xany.send_event);
544 setiv (serial, xe->xany.serial);
545
546 switch (xe->type)
547 {
548 case KeyPress:
549 case KeyRelease:
550 case ButtonPress:
551 case ButtonRelease:
552 case MotionNotify:
553 setiv (time, xe->xmotion.time);
554 setiv (x, xe->xmotion.x);
555 setiv (y, xe->xmotion.y);
556 setiv (row, xe->xmotion.y / term->fheight);
557 setiv (col, xe->xmotion.x / term->fwidth);
558 setiv (x_root, xe->xmotion.x_root);
559 setiv (y_root, xe->xmotion.y_root);
560 setiv (state, xe->xmotion.state);
561 break;
562 }
563
564 switch (xe->type)
565 {
566 case KeyPress:
567 case KeyRelease:
568 setiv (keycode, xe->xkey.keycode);
569 break;
570
571 case ButtonPress:
572 case ButtonRelease:
573 setiv (button, xe->xbutton.button);
574 break;
575
576 case MotionNotify:
577 setiv (is_hint, xe->xmotion.is_hint);
578 break;
579 }
580
581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
582 }
583 break;
584
585 case DT_END:
586 {
587 va_end (ap);
588
589 PUTBACK;
590 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
591 SPAGAIN;
592
593 if (count)
594 {
595 SV *status = POPs;
596 count = SvTRUE (status);
597 }
598
599 PUTBACK;
600 FREETMPS;
601 LEAVE;
602
603 if (SvTRUE (ERRSV))
604 {
605 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
606 ungrab (term); // better lose the grab than the session
607 }
608
609 if (htype == HOOK_DESTROY)
610 {
611 clearSVptr ((SV *)term->perl.self);
612 SvREFCNT_dec ((SV *)term->perl.self);
613 }
614
615 return count;
616 }
617
618 default:
619 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
620 }
621 }
622} 718}
623 719
624///////////////////////////////////////////////////////////////////////////// 720/////////////////////////////////////////////////////////////////////////////
625 721
626MODULE = urxvt PACKAGE = urxvt 722MODULE = urxvt PACKAGE = urxvt
645# include "optinc.h" 741# include "optinc.h"
646# undef nodef 742# undef nodef
647# undef def 743# undef def
648 744
649 HV *stash = gv_stashpv ("urxvt", 1); 745 HV *stash = gv_stashpv ("urxvt", 1);
650# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); 746 struct {
747 const char *name;
748 IV iv;
749 } *civ, const_iv[] = {
750# define const_iv(name) { # name, (IV)name }
651 export_const_iv (DEFAULT_RSTYLE); 751 const_iv (DEFAULT_RSTYLE),
652 export_const_iv (OVERLAY_RSTYLE); 752 const_iv (OVERLAY_RSTYLE),
653 export_const_iv (RS_Bold); 753 const_iv (RS_Bold),
654 export_const_iv (RS_Italic); 754 const_iv (RS_Italic),
655 export_const_iv (RS_Blink); 755 const_iv (RS_Blink),
656 export_const_iv (RS_RVid); 756 const_iv (RS_RVid),
657 export_const_iv (RS_Uline); 757 const_iv (RS_Uline),
658 758
659 export_const_iv (CurrentTime); 759 const_iv (CurrentTime),
660 export_const_iv (ShiftMask); 760 const_iv (ShiftMask),
661 export_const_iv (LockMask); 761 const_iv (LockMask),
662 export_const_iv (ControlMask); 762 const_iv (ControlMask),
663 export_const_iv (Mod1Mask); 763 const_iv (Mod1Mask),
664 export_const_iv (Mod2Mask); 764 const_iv (Mod2Mask),
665 export_const_iv (Mod3Mask); 765 const_iv (Mod3Mask),
666 export_const_iv (Mod4Mask); 766 const_iv (Mod4Mask),
667 export_const_iv (Mod5Mask); 767 const_iv (Mod5Mask),
668 export_const_iv (Button1Mask); 768 const_iv (Button1Mask),
669 export_const_iv (Button2Mask); 769 const_iv (Button2Mask),
670 export_const_iv (Button3Mask); 770 const_iv (Button3Mask),
671 export_const_iv (Button4Mask); 771 const_iv (Button4Mask),
672 export_const_iv (Button5Mask); 772 const_iv (Button5Mask),
673 export_const_iv (AnyModifier); 773 const_iv (AnyModifier),
674 774
675 export_const_iv (EVENT_NONE); 775 const_iv (EVENT_NONE),
676 export_const_iv (EVENT_READ); 776 const_iv (EVENT_READ),
677 export_const_iv (EVENT_WRITE); 777 const_iv (EVENT_WRITE),
678}
679 778
680void 779 const_iv (NoEventMask),
681set_should_invoke (int htype, int value) 780 const_iv (KeyPressMask),
682 CODE: 781 const_iv (KeyReleaseMask),
683 rxvt_perl.should_invoke [htype] = value; 782 const_iv (ButtonPressMask),
783 const_iv (ButtonReleaseMask),
784 const_iv (EnterWindowMask),
785 const_iv (LeaveWindowMask),
786 const_iv (PointerMotionMask),
787 const_iv (PointerMotionHintMask),
788 const_iv (Button1MotionMask),
789 const_iv (Button2MotionMask),
790 const_iv (Button3MotionMask),
791 const_iv (Button4MotionMask),
792 const_iv (Button5MotionMask),
793 const_iv (ButtonMotionMask),
794 const_iv (KeymapStateMask),
795 const_iv (ExposureMask),
796 const_iv (VisibilityChangeMask),
797 const_iv (StructureNotifyMask),
798 const_iv (ResizeRedirectMask),
799 const_iv (SubstructureNotifyMask),
800 const_iv (SubstructureRedirectMask),
801 const_iv (FocusChangeMask),
802 const_iv (PropertyChangeMask),
803 const_iv (ColormapChangeMask),
804 const_iv (OwnerGrabButtonMask),
805
806 const_iv (KeyPress),
807 const_iv (KeyRelease),
808 const_iv (ButtonPress),
809 const_iv (ButtonRelease),
810 const_iv (MotionNotify),
811 const_iv (EnterNotify),
812 const_iv (LeaveNotify),
813 const_iv (FocusIn),
814 const_iv (FocusOut),
815 const_iv (KeymapNotify),
816 const_iv (Expose),
817 const_iv (GraphicsExpose),
818 const_iv (NoExpose),
819 const_iv (VisibilityNotify),
820 const_iv (CreateNotify),
821 const_iv (DestroyNotify),
822 const_iv (UnmapNotify),
823 const_iv (MapNotify),
824 const_iv (MapRequest),
825 const_iv (ReparentNotify),
826 const_iv (ConfigureNotify),
827 const_iv (ConfigureRequest),
828 const_iv (GravityNotify),
829 const_iv (ResizeRequest),
830 const_iv (CirculateNotify),
831 const_iv (CirculateRequest),
832 const_iv (PropertyNotify),
833 const_iv (SelectionClear),
834 const_iv (SelectionRequest),
835 const_iv (SelectionNotify),
836 const_iv (ColormapNotify),
837 const_iv (ClientMessage),
838 const_iv (MappingNotify),
839 };
840
841 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
842 civ-- > const_iv; )
843 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
844}
684 845
685void 846void
686warn (const char *msg) 847warn (const char *msg)
687 CODE: 848 CODE:
688 rxvt_warn ("%s", msg); 849 rxvt_warn ("%s", msg);
690void 851void
691fatal (const char *msg) 852fatal (const char *msg)
692 CODE: 853 CODE:
693 rxvt_fatal ("%s", msg); 854 rxvt_fatal ("%s", msg);
694 855
695SV * 856void
696untaint (SV *sv) 857_exit (int status)
697 CODE:
698 RETVAL = newSVsv (sv);
699 SvTAINTED_off (RETVAL);
700 OUTPUT:
701 RETVAL
702
703bool
704safe ()
705 CODE:
706 RETVAL = !rxvt_tainted ();
707 OUTPUT:
708 RETVAL
709 858
710NV 859NV
711NOW () 860NOW ()
712 CODE: 861 CODE:
713 RETVAL = NOW; 862 RETVAL = NOW;
778 927
779 for (int i = 1; i < items; i++) 928 for (int i = 1; i < items; i++)
780 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 929 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
781 930
782 AV *envv = (AV *)SvRV (ST (0)); 931 AV *envv = (AV *)SvRV (ST (0));
783 for (int i = av_len (envv) + 1; i--; ) 932 for (int i = AvFILL (envv) + 1; i--; )
784 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 933 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
785 934
786 term->envv->push_back (0); 935 term->envv->push_back (0);
787 936
788 bool success; 937 bool success;
810 959
811void 960void
812rxvt_term::destroy () 961rxvt_term::destroy ()
813 962
814void 963void
964rxvt_term::set_should_invoke (int htype, int inc)
965 CODE:
966 THIS->perl.should_invoke [htype] += inc;
967
968void
815rxvt_term::grab_button (int button, U32 modifiers) 969rxvt_term::grab_button (int button, U32 modifiers)
816 CODE: 970 CODE:
817 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 971 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
818 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 972 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
819 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 973 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
820 974
821bool 975bool
822rxvt_term::grab (U32 eventtime, int sync = 0) 976rxvt_term::grab (Time eventtime, int sync = 0)
823 CODE: 977 CODE:
824{ 978{
825 int mode = sync ? GrabModeSync : GrabModeAsync; 979 int mode = sync ? GrabModeSync : GrabModeAsync;
826 980
827 THIS->perl.grabtime = 0; 981 THIS->perl.grabtime = 0;
885 char *mbstr = rxvt_wcstombs (wstr); 1039 char *mbstr = rxvt_wcstombs (wstr);
886 rxvt_pop_locale (); 1040 rxvt_pop_locale ();
887 1041
888 free (wstr); 1042 free (wstr);
889 1043
890 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1044 RETVAL = newSVpv (mbstr, 0);
891 free (mbstr); 1045 free (mbstr);
892} 1046}
893 OUTPUT: 1047 OUTPUT:
894 RETVAL 1048 RETVAL
895 1049
902 1056
903 rxvt_push_locale (THIS->locale); 1057 rxvt_push_locale (THIS->locale);
904 wchar_t *wstr = rxvt_mbstowcs (data, len); 1058 wchar_t *wstr = rxvt_mbstowcs (data, len);
905 rxvt_pop_locale (); 1059 rxvt_pop_locale ();
906 1060
907 RETVAL = taint_if (wcs2sv (wstr), octets); 1061 RETVAL = wcs2sv (wstr);
908 free (wstr); 1062 free (wstr);
909} 1063}
910 OUTPUT: 1064 OUTPUT:
911 RETVAL 1065 RETVAL
912 1066
919#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1073#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
920#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1074#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
921#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1075#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
922#define TERM_OFFSET_focus TERM_OFFSET(focus) 1076#define TERM_OFFSET_focus TERM_OFFSET(focus)
923#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1077#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1078#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1079#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1080#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
924#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1081#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
925#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1082#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
926#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1083#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
927 1084
928int 1085int
929rxvt_term::width () 1086rxvt_term::width ()
930 ALIAS: 1087 ALIAS:
931 width = TERM_OFFSET_width 1088 width = TERM_OFFSET_width
935 fbase = TERM_OFFSET_fbase 1092 fbase = TERM_OFFSET_fbase
936 nrow = TERM_OFFSET_nrow 1093 nrow = TERM_OFFSET_nrow
937 ncol = TERM_OFFSET_ncol 1094 ncol = TERM_OFFSET_ncol
938 focus = TERM_OFFSET_focus 1095 focus = TERM_OFFSET_focus
939 mapped = TERM_OFFSET_mapped 1096 mapped = TERM_OFFSET_mapped
1097 int_bwidth = TERM_OFFSET_int_bwidth
1098 ext_bwidth = TERM_OFFSET_ext_bwidth
1099 lineSpace = TERM_OFFSET_lineSpace
940 saveLines = TERM_OFFSET_saveLines 1100 saveLines = TERM_OFFSET_saveLines
941 total_rows = TERM_OFFSET_total_rows 1101 total_rows = TERM_OFFSET_total_rows
942 nsaved = TERM_OFFSET_nsaved 1102 top_row = TERM_OFFSET_top_row
943 CODE: 1103 CODE:
944 RETVAL = *(int *)((char *)THIS + ix); 1104 RETVAL = *(int *)((char *)THIS + ix);
945 OUTPUT: 1105 OUTPUT:
946 RETVAL 1106 RETVAL
947 1107
1002 if (events != EVENT_UNDEF) 1162 if (events != EVENT_UNDEF)
1003 THIS->pty_ev.set (events); 1163 THIS->pty_ev.set (events);
1004 OUTPUT: 1164 OUTPUT:
1005 RETVAL 1165 RETVAL
1006 1166
1007U32 1167Window
1008rxvt_term::parent () 1168rxvt_term::parent ()
1009 CODE: 1169 CODE:
1010 RETVAL = (U32)THIS->parent [0]; 1170 RETVAL = THIS->parent [0];
1011 OUTPUT: 1171 OUTPUT:
1012 RETVAL 1172 RETVAL
1013 1173
1014U32 1174Window
1015rxvt_term::vt () 1175rxvt_term::vt ()
1016 CODE: 1176 CODE:
1017 RETVAL = (U32)THIS->vt; 1177 RETVAL = THIS->vt;
1018 OUTPUT: 1178 OUTPUT:
1019 RETVAL 1179 RETVAL
1180
1181void
1182rxvt_term::vt_emask_add (U32 emask)
1183 CODE:
1184 THIS->vt_emask_perl |= emask;
1185 THIS->vt_select_input ();
1020 1186
1021U32 1187U32
1022rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1188rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1023 CODE: 1189 CODE:
1024{
1025 RETVAL = THIS->rstyle; 1190 RETVAL = THIS->rstyle;
1026 THIS->rstyle = new_rstyle; 1191 THIS->rstyle = new_rstyle;
1027}
1028 OUTPUT: 1192 OUTPUT:
1029 RETVAL 1193 RETVAL
1030 1194
1031int 1195int
1032rxvt_term::view_start (int newval = -1) 1196rxvt_term::view_start (int newval = 1)
1197 PROTOTYPE: $;$
1033 CODE: 1198 CODE:
1034{ 1199{
1035 RETVAL = THIS->view_start; 1200 RETVAL = THIS->view_start;
1036 1201
1037 if (newval >= 0) 1202 if (newval <= 0)
1038 { 1203 THIS->scr_changeview (max (newval, THIS->top_row));
1039 THIS->view_start = min (newval, THIS->nsaved);
1040 THIS->scr_changeview (RETVAL);
1041 }
1042} 1204}
1043 OUTPUT: 1205 OUTPUT:
1044 RETVAL 1206 RETVAL
1045 1207
1046void 1208void
1050 1212
1051void 1213void
1052rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1214rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1053 PPCODE: 1215 PPCODE:
1054{ 1216{
1055 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1217 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1056 XSRETURN_EMPTY; 1218 XSRETURN_EMPTY;
1057 1219
1058 line_t &l = ROW(row_number); 1220 line_t &l = ROW(row_number);
1059 1221
1060 if (GIMME_V != G_VOID) 1222 if (GIMME_V != G_VOID)
1062 wchar_t *wstr = new wchar_t [THIS->ncol]; 1224 wchar_t *wstr = new wchar_t [THIS->ncol];
1063 1225
1064 for (int col = 0; col < THIS->ncol; col++) 1226 for (int col = 0; col < THIS->ncol; col++)
1065 wstr [col] = l.t [col]; 1227 wstr [col] = l.t [col];
1066 1228
1067 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1229 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1068 1230
1069 delete [] wstr; 1231 delete [] wstr;
1070 } 1232 }
1071 1233
1072 if (new_text) 1234 if (new_text)
1093 1255
1094void 1256void
1095rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1257rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1096 PPCODE: 1258 PPCODE:
1097{ 1259{
1098 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1260 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1099 XSRETURN_EMPTY; 1261 XSRETURN_EMPTY;
1100 1262
1101 line_t &l = ROW(row_number); 1263 line_t &l = ROW(row_number);
1102 1264
1103 if (GIMME_V != G_VOID) 1265 if (GIMME_V != G_VOID)
1115 { 1277 {
1116 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1278 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1117 croak ("new_rend must be arrayref"); 1279 croak ("new_rend must be arrayref");
1118 1280
1119 AV *av = (AV *)SvRV (new_rend); 1281 AV *av = (AV *)SvRV (new_rend);
1120 int len = min (av_len (av) + 1 - start_ofs, max_len); 1282 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1121 1283
1122 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1284 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
1123 croak ("new_rend array extends beyond horizontal margins"); 1285 croak ("new_rend array extends beyond horizontal margins");
1124 1286
1125 for (int col = start_col; col < start_col + len; col++) 1287 for (int col = start_col; col < start_col + len; col++)
1133 1295
1134int 1296int
1135rxvt_term::ROW_l (int row_number, int new_length = -1) 1297rxvt_term::ROW_l (int row_number, int new_length = -1)
1136 CODE: 1298 CODE:
1137{ 1299{
1138 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1300 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1139 XSRETURN_EMPTY; 1301 XSRETURN_EMPTY;
1140 1302
1141 line_t &l = ROW(row_number); 1303 line_t &l = ROW(row_number);
1142 RETVAL = l.l; 1304 RETVAL = l.l;
1143 1305
1149 1311
1150bool 1312bool
1151rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1313rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1152 CODE: 1314 CODE:
1153{ 1315{
1154 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1316 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1155 XSRETURN_EMPTY; 1317 XSRETURN_EMPTY;
1156 1318
1157 line_t &l = ROW(row_number); 1319 line_t &l = ROW(row_number);
1158 RETVAL = l.is_longer (); 1320 RETVAL = l.is_longer ();
1159 1321
1193 else 1355 else
1194 *r++ = *s; 1356 *r++ = *s;
1195 1357
1196 rxvt_pop_locale (); 1358 rxvt_pop_locale ();
1197 1359
1198 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1360 RETVAL = wcs2sv (rstr, r - rstr);
1199 1361
1200 delete [] rstr; 1362 delete [] rstr;
1201} 1363}
1202 OUTPUT: 1364 OUTPUT:
1203 RETVAL 1365 RETVAL
1229 else if (IS_COMPOSE (*s)) 1391 else if (IS_COMPOSE (*s))
1230 r += rxvt_composite.expand (*s, r); 1392 r += rxvt_composite.expand (*s, r);
1231 else 1393 else
1232 *r++ = *s; 1394 *r++ = *s;
1233 1395
1234 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1396 RETVAL = wcs2sv (rstr, r - rstr);
1235 1397
1236 delete [] rstr; 1398 delete [] rstr;
1237} 1399}
1238 OUTPUT: 1400 OUTPUT:
1239 RETVAL 1401 RETVAL
1261 1423
1262 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1424 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1263 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1425 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1264 1426
1265 if (GIMME_V != G_VOID) 1427 if (GIMME_V != G_VOID)
1266 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1428 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1267 1429
1268 if (newval) 1430 if (newval)
1269 { 1431 {
1270 if (SvOK (newval)) 1432 if (SvOK (newval))
1271 { 1433 {
1278 } 1440 }
1279} 1441}
1280 1442
1281const char * 1443const char *
1282rxvt_term::x_resource (const char *name) 1444rxvt_term::x_resource (const char *name)
1283 CLEANUP:
1284 SvTAINTED_on (ST (0));
1285 1445
1286bool 1446bool
1287rxvt_term::option (U32 optval, int set = -1) 1447rxvt_term::option (U32 optval, int set = -1)
1288 CODE: 1448 CODE:
1289{ 1449{
1294 if (set) 1454 if (set)
1295 THIS->options |= optval; 1455 THIS->options |= optval;
1296 else 1456 else
1297 THIS->options &= ~optval; 1457 THIS->options &= ~optval;
1298 1458
1459 if (THIS->check_ev.is_active ()) // avoid doing this before START
1299 switch (optval) 1460 switch (optval)
1300 { 1461 {
1301 case Opt_skipBuiltinGlyphs: 1462 case Opt_skipBuiltinGlyphs:
1302 THIS->set_fonts (); 1463 THIS->set_fonts ();
1303 THIS->scr_remap_chars (); 1464 THIS->scr_remap_chars ();
1304 THIS->scr_touch (true); 1465 THIS->scr_touch (true);
1305 THIS->want_refresh = 1; 1466 THIS->want_refresh = 1;
1306 break; 1467 break;
1307 1468
1308 case Opt_cursorUnderline: 1469 case Opt_cursorUnderline:
1309 THIS->want_refresh = 1; 1470 THIS->want_refresh = 1;
1310 break; 1471 break;
1311 1472
1312# case Opt_scrollBar_floating: 1473# case Opt_scrollBar_floating:
1313# case Opt_scrollBar_right: 1474# case Opt_scrollBar_right:
1314# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1475# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1315# break; 1476# break;
1316 } 1477 }
1317 } 1478 }
1318} 1479}
1319 OUTPUT: 1480 OUTPUT:
1320 RETVAL 1481 RETVAL
1321 1482
1349 PUSHs (sv_2mortal (newSViv (rc.col))); 1510 PUSHs (sv_2mortal (newSViv (rc.col)));
1350 } 1511 }
1351 1512
1352 if (items == 3) 1513 if (items == 3)
1353 { 1514 {
1354 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1515 rc.row = SvIV (ST (1));
1355 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1516 rc.col = SvIV (ST (2));
1517
1518 if (ix == 2 && rc.col == 0)
1519 {
1520 rc.row--;
1521 rc.col = THIS->ncol;
1522 }
1523
1524 clamp_it (rc.col, 0, THIS->ncol);
1525 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1356 1526
1357 if (ix) 1527 if (ix)
1358 THIS->want_refresh = 1; 1528 THIS->want_refresh = 1;
1359 } 1529 }
1360} 1530}
1364 CODE: 1534 CODE:
1365 RETVAL = THIS->charsets [THIS->screen.charset]; 1535 RETVAL = THIS->charsets [THIS->screen.charset];
1366 OUTPUT: 1536 OUTPUT:
1367 RETVAL 1537 RETVAL
1368 1538
1539#void
1540#rxvt_term::selection_clear ()
1541
1542void
1543rxvt_term::selection_make (Time eventtime, bool rect = false)
1544 CODE:
1545 THIS->selection.op = SELECTION_CONT;
1546 THIS->selection.rect = rect;
1547 THIS->selection_make (eventtime);
1548
1369int 1549int
1370rxvt_term::selection_grab (U32 eventtime) 1550rxvt_term::selection_grab (Time eventtime)
1371 1551
1372void 1552void
1373rxvt_term::selection (SV *newtext = 0) 1553rxvt_term::selection (SV *newtext = 0)
1374 PPCODE: 1554 PPCODE:
1375{ 1555{
1376 if (GIMME_V != G_VOID) 1556 if (GIMME_V != G_VOID)
1377 XPUSHs (THIS->selection.text 1557 XPUSHs (THIS->selection.text
1378 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1558 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1379 : &PL_sv_undef); 1559 : &PL_sv_undef);
1380 1560
1381 if (newtext) 1561 if (newtext)
1382 { 1562 {
1383 free (THIS->selection.text); 1563 free (THIS->selection.text);
1443 o->self = (HV *)SvRV (RETVAL); 1623 o->self = (HV *)SvRV (RETVAL);
1444} 1624}
1445 OUTPUT: 1625 OUTPUT:
1446 RETVAL 1626 RETVAL
1447 1627
1628#############################################################################
1629# Various X Utility Functions
1630#############################################################################
1631
1632void
1633rxvt_term::XListProperties (Window window)
1634 PPCODE:
1635{
1636 int count;
1637 Atom *props = XListProperties (THIS->display->display, window, &count);
1638
1639 EXTEND (SP, count);
1640 while (count--)
1641 PUSHs (newSVuv ((U32)props [count]));
1642
1643 XFree (props);
1644}
1645
1646void
1647rxvt_term::XGetWindowProperty (Window window, Atom property)
1648 PPCODE:
1649{
1650 Atom type;
1651 int format;
1652 unsigned long nitems;
1653 unsigned long bytes_after;
1654 unsigned char *prop;
1655 XGetWindowProperty (THIS->display->display, window, property,
1656 0, 1<<30, 0, AnyPropertyType,
1657 &type, &format, &nitems, &bytes_after, &prop);
1658 if (type != None)
1659 {
1660 EXTEND (SP, 3);
1661 PUSHs (newSVuv ((U32)type));
1662 PUSHs (newSViv (format));
1663 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
1664 XFree (prop);
1665 }
1666}
1667
1668void
1669rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1670 CODE:
1671{
1672 STRLEN len;
1673 char *data_ = SvPVbyte (data, len);
1674
1675 XChangeProperty (THIS->display->display, window, property,
1676 type, format, PropModeReplace,
1677 (unsigned char *)data, len * 8 / format);
1678}
1679
1680void
1681XDeleteProperty (rxvt_term *term, Window window, Atom property)
1682 C_ARGS: term->display->display, window, property
1683
1684Window
1685rxvt_term::DefaultRootWindow ()
1686 CODE:
1687 RETVAL = THIS->display->root;
1688 OUTPUT:
1689 RETVAL
1690
1691Window
1692XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1693 C_ARGS: term->display->display, (Window)parent,
1694 x, y, width, height, 0,
1695 term->pix_colors_focused[Color_border],
1696 term->pix_colors_focused[Color_border]
1697
1698void
1699XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1700 C_ARGS: term->display->display, window, parent, x, y
1701
1702void
1703XMapWindow (rxvt_term *term, Window window)
1704 C_ARGS: term->display->display, window
1705
1706void
1707XUnmapWindow (rxvt_term *term, Window window)
1708 C_ARGS: term->display->display, window
1709
1710void
1711XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1712 C_ARGS: term->display->display, (Window)window, x, y, width, height
1713
1714#############################################################################
1715# urxvt::overlay
1716#############################################################################
1717
1448MODULE = urxvt PACKAGE = urxvt::overlay 1718MODULE = urxvt PACKAGE = urxvt::overlay
1449 1719
1450void 1720void
1451overlay::set (int x, int y, SV *text, SV *rend = 0) 1721overlay::set (int x, int y, SV *text, SV *rend = 0)
1452 1722
1456void 1726void
1457overlay::hide () 1727overlay::hide ()
1458 1728
1459void 1729void
1460overlay::DESTROY () 1730overlay::DESTROY ()
1731
1732#############################################################################
1733# urxvt::watcher
1734#############################################################################
1735
1736MODULE = urxvt PACKAGE = urxvt::watcher
1737
1738CHAINED
1739perl_watcher::cb (SV *cb)
1740 CODE:
1741 THIS->cb (cb);
1742 OUTPUT:
1743 RETVAL
1744
1745#############################################################################
1746# urxvt::timer
1747#############################################################################
1461 1748
1462MODULE = urxvt PACKAGE = urxvt::timer 1749MODULE = urxvt PACKAGE = urxvt::timer
1463 1750
1464SV * 1751SV *
1465timer::new () 1752timer::new ()
1466 CODE: 1753 CODE:
1467 timer *w = new timer; 1754 timer *w = new timer;
1468 w->start (NOW); 1755 w->start (NOW);
1469 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1756 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1470 w->self = (HV *)SvRV (RETVAL); 1757 w->self = (HV *)SvRV (RETVAL);
1471 OUTPUT:
1472 RETVAL
1473
1474timer *
1475timer::cb (SV *cb)
1476 CODE:
1477 THIS->cb (cb);
1478 RETVAL = THIS;
1479 OUTPUT: 1758 OUTPUT:
1480 RETVAL 1759 RETVAL
1481 1760
1482NV 1761NV
1483timer::at () 1762timer::at ()
1484 CODE: 1763 CODE:
1485 RETVAL = THIS->at; 1764 RETVAL = THIS->at;
1486 OUTPUT: 1765 OUTPUT:
1487 RETVAL 1766 RETVAL
1488 1767
1489timer * 1768CHAINED
1490timer::interval (NV interval) 1769timer::interval (NV interval)
1491 CODE: 1770 CODE:
1492 THIS->interval = interval; 1771 THIS->interval = interval;
1772 OUTPUT:
1493 RETVAL = THIS; 1773 RETVAL
1494 OUTPUT:
1495 RETVAL
1496 1774
1497timer * 1775CHAINED
1498timer::set (NV tstamp) 1776timer::set (NV tstamp)
1499 CODE: 1777 CODE:
1500 THIS->set (tstamp); 1778 THIS->set (tstamp);
1779 OUTPUT:
1501 RETVAL = THIS; 1780 RETVAL
1502 OUTPUT:
1503 RETVAL
1504 1781
1505timer * 1782CHAINED
1506timer::start (NV tstamp = THIS->at) 1783timer::start (NV tstamp = THIS->at)
1507 CODE: 1784 CODE:
1508 THIS->start (tstamp); 1785 THIS->start (tstamp);
1786 OUTPUT:
1509 RETVAL = THIS; 1787 RETVAL
1510 OUTPUT:
1511 RETVAL
1512 1788
1513timer * 1789CHAINED
1790timer::after (NV delay)
1791 CODE:
1792 THIS->start (NOW + delay);
1793 OUTPUT:
1794 RETVAL
1795
1796CHAINED
1514timer::stop () 1797timer::stop ()
1515 CODE: 1798 CODE:
1516 THIS->stop (); 1799 THIS->stop ();
1517 RETVAL = THIS;
1518 OUTPUT: 1800 OUTPUT:
1519 RETVAL 1801 RETVAL
1520 1802
1521void 1803void
1522timer::DESTROY () 1804timer::DESTROY ()
1805
1806#############################################################################
1807# urxvt::iow
1808#############################################################################
1523 1809
1524MODULE = urxvt PACKAGE = urxvt::iow 1810MODULE = urxvt PACKAGE = urxvt::iow
1525 1811
1526SV * 1812SV *
1527iow::new () 1813iow::new ()
1528 CODE: 1814 CODE:
1529 iow *w = new iow; 1815 iow *w = new iow;
1530 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1816 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1531 w->self = (HV *)SvRV (RETVAL); 1817 w->self = (HV *)SvRV (RETVAL);
1532 OUTPUT: 1818 OUTPUT:
1533 RETVAL 1819 RETVAL
1534 1820
1535iow * 1821CHAINED
1536iow::cb (SV *cb)
1537 CODE:
1538 THIS->cb (cb);
1539 RETVAL = THIS;
1540 OUTPUT:
1541 RETVAL
1542
1543iow *
1544iow::fd (int fd) 1822iow::fd (int fd)
1545 CODE: 1823 CODE:
1546 THIS->fd = fd; 1824 THIS->fd = fd;
1825 OUTPUT:
1547 RETVAL = THIS; 1826 RETVAL
1548 OUTPUT:
1549 RETVAL
1550 1827
1551iow * 1828CHAINED
1552iow::events (short events) 1829iow::events (short events)
1553 CODE: 1830 CODE:
1554 THIS->events = events; 1831 THIS->events = events;
1832 OUTPUT:
1555 RETVAL = THIS; 1833 RETVAL
1556 OUTPUT:
1557 RETVAL
1558 1834
1559iow * 1835CHAINED
1560iow::start () 1836iow::start ()
1561 CODE: 1837 CODE:
1562 THIS->start (); 1838 THIS->start ();
1839 OUTPUT:
1563 RETVAL = THIS; 1840 RETVAL
1564 OUTPUT:
1565 RETVAL
1566 1841
1567iow * 1842CHAINED
1568iow::stop () 1843iow::stop ()
1569 CODE: 1844 CODE:
1570 THIS->stop (); 1845 THIS->stop ();
1571 RETVAL = THIS;
1572 OUTPUT: 1846 OUTPUT:
1573 RETVAL 1847 RETVAL
1574 1848
1575void 1849void
1576iow::DESTROY () 1850iow::DESTROY ()
1577 1851
1852#############################################################################
1853# urxvt::iw
1854#############################################################################
1578 1855
1856MODULE = urxvt PACKAGE = urxvt::iw
1857
1858SV *
1859iw::new ()
1860 CODE:
1861 iw *w = new iw;
1862 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1863 w->self = (HV *)SvRV (RETVAL);
1864 OUTPUT:
1865 RETVAL
1866
1867CHAINED
1868iw::start ()
1869 CODE:
1870 THIS->start ();
1871 OUTPUT:
1872 RETVAL
1873
1874CHAINED
1875iw::stop ()
1876 CODE:
1877 THIS->stop ();
1878 OUTPUT:
1879 RETVAL
1880
1881void
1882iw::DESTROY ()
1883
1884#############################################################################
1885# urxvt::pw
1886#############################################################################
1887
1888MODULE = urxvt PACKAGE = urxvt::pw
1889
1890SV *
1891pw::new ()
1892 CODE:
1893 pw *w = new pw;
1894 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1895 w->self = (HV *)SvRV (RETVAL);
1896 OUTPUT:
1897 RETVAL
1898
1899CHAINED
1900pw::start (int pid)
1901 CODE:
1902 THIS->start (pid);
1903 OUTPUT:
1904 RETVAL
1905
1906CHAINED
1907pw::stop ()
1908 CODE:
1909 THIS->stop ();
1910 OUTPUT:
1911 RETVAL
1912
1913void
1914pw::DESTROY ()
1915
1916

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines