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.67 by root, Sun Jan 15 06:02:41 2006 UTC vs.
Revision 1.95 by root, Sun Jan 29 20:51:28 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines