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.115 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.216 by root, Thu Oct 3 01:11:38 2013 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
23#define line_t perl_line_t 23#define line_t perl_line_t
24#include <EXTERN.h> 24#include <EXTERN.h>
25#include <perl.h> 25#include <perl.h>
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28#undef bool // perl defines it's own bool type, except with g++... what a trap
28 29
29#include "../config.h" 30#include "../config.h"
30 31
31#include <cstddef> 32#include <stddef.h>
32#include <cstdarg> 33#include <stdarg.h>
33 34
34#include "unistd.h" 35#include "unistd.h"
35 36
36#include "iom.h" 37#include "ev_cpp.h"
37#include "rxvt.h" 38#include "rxvt.h"
38#include "keyboard.h" 39#include "keyboard.h"
39#include "rxvtutil.h" 40#include "rxvtutil.h"
40#include "rxvtperl.h" 41#include "rxvtperl.h"
41 42
42#include "perlxsi.c" 43#include "perlxsi.c"
43 44
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 46
50#undef LINENO 47#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 49#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
54 51
55///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
56 53
54typedef char * octet_string;
55typedef char * utf8_string;
56
57typedef int render_repeat_mode;
58
59#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf;
61#endif
62#if HAVE_IMG
63typedef rxvt_img * urxvt__img;
64typedef rxvt_img::nv rxvt_img__nv;
65
66/////////////////////////////////////////////////////////////////////////////
67
68static rgba
69parse_rgba (SV *sv, rxvt_screen *s = 0)
70{
71 rgba c;
72
73 if (SvROK (sv))
74 {
75 AV *av = (AV *)SvRV (sv);
76
77 if (SvTYPE ((SV *)av) != SVt_PVAV)
78 croak ("colour must be either a colour string, or an array,");
79
80 int len = av_len (av) + 1;
81
82 if (len != 1 && len != 3 && len != 4)
83 croak ("component colour array must have 1, 3 or 4 components,");
84
85 c.a = rgba::MAX_CC;
86
87 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
88
89 if (len >= 3)
90 {
91 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
92 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
93
94 if (len >= 4)
95 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
96 }
97 }
98 else if (s)
99 {
100 rxvt_color rc;
101 rc.set (s, SvPVbyte_nolen (sv));
102 rc.get (c);
103 }
104 else
105 croak ("unable to parse colour,");
106
107 return c;
108}
109
110/////////////////////////////////////////////////////////////////////////////
111#endif
112
57static wchar_t * 113static wchar_t *
58sv2wcs (SV *sv) 114sv2wcs (SV *sv)
59{ 115{
60 STRLEN len; 116 STRLEN len;
61 char *str = SvPVutf8 (sv, len); 117 char *str = SvPVutf8 (sv, len);
111 167
112///////////////////////////////////////////////////////////////////////////// 168/////////////////////////////////////////////////////////////////////////////
113 169
114#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 170#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
115 171
116class overlay { 172class overlay : overlay_base
173{
117 rxvt_term *THIS; 174 rxvt_term *THIS;
118 AV *overlay_av; 175 AV *overlay_av;
119 int x, y, w, h;
120 int border; 176 int border;
121 text_t **text;
122 rend_t **rend;
123 177
124public: 178public:
125 HV *self; 179 HV *self;
126 180
127 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 181 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
134 188
135 void set (int x, int y, SV *str, SV *rend); 189 void set (int x, int y, SV *str, SV *rend);
136}; 190};
137 191
138overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 192overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
139: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 193: THIS(THIS), border(border == 2), overlay_av (0)
140{ 194{
195 x = x_;
196 y = y_;
197 w = w_;
198 h = h_;
199
141 if (w < 0) w = 0; 200 if (w < 0) w = 0;
142 if (h < 0) h = 0; 201 if (h < 0) h = 0;
143 202
144 if (border == 2) 203 if (border == 2)
145 { 204 {
214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 273 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
215 )); 274 ));
216 av_push (overlay_av, newSViv ((long)this)); 275 av_push (overlay_av, newSViv ((long)this));
217 276
218 THIS->want_refresh = 1; 277 THIS->want_refresh = 1;
278 THIS->refresh_check ();
219} 279}
220 280
221void 281void
222overlay::hide () 282overlay::hide ()
223{ 283{
237 297
238 SvREFCNT_dec (overlay_av); 298 SvREFCNT_dec (overlay_av);
239 overlay_av = 0; 299 overlay_av = 0;
240 300
241 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
242} 303}
243 304
244void overlay::swap () 305void overlay::swap ()
245{ 306{
246 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 307 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
247 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 308 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
248 309
249 int ov_w = min (w, THIS->ncol - ov_x); 310 int ov_w = min (w, THIS->ncol - ov_x);
250 int ov_h = min (h, THIS->nrow - ov_y); 311 int ov_h = min (h, THIS->nrow - ov_y);
312
313 // hide cursor if it is within the overlay area
314 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
315 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
316 THIS->screen.flags &= ~Screen_VisibleCursor;
251 317
252 for (int y = ov_h; y--; ) 318 for (int y = ov_h; y--; )
253 { 319 {
254 text_t *t1 = text [y]; 320 text_t *t1 = text [y];
255 rend_t *r1 = rend [y]; 321 rend_t *r1 = rend [y];
291 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 357 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
292 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 358 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
293 } 359 }
294 360
295 THIS->want_refresh = 1; 361 THIS->want_refresh = 1;
362 THIS->refresh_check ();
296} 363}
297 364
298///////////////////////////////////////////////////////////////////////////// 365/////////////////////////////////////////////////////////////////////////////
299 366
300#define IOM_CLASS "urxvt"
301#define IOM_WARN rxvt_warn
302#include <iom_perl.h> 367#include "iom_perl.h"
303 368
304///////////////////////////////////////////////////////////////////////////// 369/////////////////////////////////////////////////////////////////////////////
305 370
306struct rxvt_perl_interp rxvt_perl; 371struct rxvt_perl_interp rxvt_perl;
307 372
311{ 376{
312 if (perl) 377 if (perl)
313 { 378 {
314 perl_destruct (perl); 379 perl_destruct (perl);
315 perl_free (perl); 380 perl_free (perl);
381 PERL_SYS_TERM ();
316 } 382 }
317} 383}
318 384
319void 385void
320rxvt_perl_interp::init (rxvt_term *term) 386rxvt_perl_interp::init ()
321{ 387{
322 if (!perl) 388 if (!perl)
323 { 389 {
324 rxvt_push_locale (""); // perl init destroys current locale 390 rxvt_push_locale (""); // perl init destroys current locale
325 391
392 {
326 perl_environ = rxvt_environ; 393 perl_environ = rxvt_environ;
327 swap (perl_environ, environ); 394 localise_env set_environ (perl_environ);
328 395
329 char *argv[] = { 396 char *args[] = {
330 "", 397 "",
331 "-e" 398 "-e"
332 "BEGIN {" 399 "BEGIN {"
333 " urxvt->bootstrap;" 400 " urxvt->bootstrap;"
334 " unshift @INC, '" LIBDIR "';" 401 " unshift @INC, '" LIBDIR "';"
335 "}" 402 "}"
336 "" 403 ""
337 "use urxvt;" 404 "use urxvt;"
338 }; 405 };
406 int argc = ecb_array_length (args);
407 char **argv = args;
339 408
409 PERL_SYS_INIT3 (&argc, &argv, &environ);
340 perl = perl_alloc (); 410 perl = perl_alloc ();
341 perl_construct (perl); 411 perl_construct (perl);
342 412
343 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 413 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
344 || perl_run (perl)) 414 || perl_run (perl))
345 { 415 {
346 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 416 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
347 417
348 perl_destruct (perl); 418 perl_destruct (perl);
349 perl_free (perl); 419 perl_free (perl);
350 perl = 0; 420 perl = 0;
351 } 421 }
352 422 }
353 swap (perl_environ, environ);
354 423
355 rxvt_pop_locale (); 424 rxvt_pop_locale ();
356 } 425 }
426}
357 427
358 if (perl) 428void
429rxvt_perl_interp::init (rxvt_term *term)
430{
431 init ();
432
433 if (perl && !term->perl.self)
359 { 434 {
360 // runs outside of perls ENV 435 // runs outside of perls ENV
361 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 436 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
362 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 437 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
438 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
363 } 439 }
440}
441
442void
443rxvt_perl_interp::eval (const char *str)
444{
445 eval_pv (str, 1);
446}
447
448void
449rxvt_perl_interp::usage (rxvt_term *term, int type)
450{
451 localise_env set_environ (perl_environ);
452
453 ENTER;
454 SAVETMPS;
455
456 dSP;
457 PUSHMARK (SP);
458 EXTEND (SP, 2);
459 PUSHs (sv_2mortal (newSVterm (term)));
460 PUSHs (sv_2mortal (newSViv (type)));
461 PUTBACK;
462 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
463
464 FREETMPS;
465 LEAVE;
466}
467
468uint8_t
469rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
470{
471 localise_env set_environ (perl_environ);
472
473 ENTER;
474 SAVETMPS;
475
476 dSP;
477 PUSHMARK (SP);
478 EXTEND (SP, 6);
479 PUSHs (sv_2mortal (newSVterm (term)));
480 PUSHs (sv_2mortal (newSVpv (name, 0)));
481 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
482 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
483 PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
484 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
485 PUTBACK;
486 call_pv ("urxvt::parse_resource", G_SCALAR);
487 SPAGAIN;
488
489 uint8_t ret = POPi;
490
491 FREETMPS;
492 LEAVE;
493
494 return ret;
364} 495}
365 496
366static void 497static void
367ungrab (rxvt_term *THIS) 498ungrab (rxvt_term *THIS)
368{ 499{
378rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 509rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
379{ 510{
380 if (!perl || !term->perl.self) 511 if (!perl || !term->perl.self)
381 return false; 512 return false;
382 513
514 localise_env set_environ (perl_environ);
515
383 // pre-handling of some events 516 // pre-handling of some events
384 if (htype == HOOK_REFRESH_END) 517 if (htype == HOOK_REFRESH_END)
385 { 518 {
386 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 519 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
387 520
388 for (int i = 0; i <= AvFILL (av); i++) 521 for (int i = 0; i <= AvFILL (av); i++)
389 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 522 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
390 } 523 }
524 else if (htype == HOOK_DESTROY)
525 {
526 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
391 527
392 swap (perl_environ, environ); 528 for (int i = AvFILL (av); i >= 0; i--)
529 {
530 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
531 delete req;
532 }
533 }
393 534
394 bool event_consumed; 535 bool event_consumed;
395 536
396 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
397 || term->perl.should_invoke [htype]) 537 if (term->perl.should_invoke [htype])
398 try
399 { 538 {
400 dSP; 539 dSP;
401 va_list ap; 540 va_list ap;
402 541
403 va_start (ap, htype); 542 va_start (ap, htype);
404 543
405 ENTER; 544 ENTER;
406 SAVETMPS; 545 SAVETMPS;
407 546
408 PUSHMARK (SP); 547 PUSHMARK (SP);
409 548
549 EXTEND (SP, 2);
410 XPUSHs (sv_2mortal (newSVterm (term))); 550 PUSHs (sv_2mortal (newSVterm (term)));
411 XPUSHs (sv_2mortal (newSViv (htype))); 551 PUSHs (sv_2mortal (newSViv (htype)));
412 552
413 for (;;) { 553 for (;;) {
414 data_type dt = (data_type)va_arg (ap, int); 554 data_type dt = (data_type)va_arg (ap, int);
415 555
416 switch (dt) 556 switch (dt)
417 { 557 {
418 case DT_INT: 558 case DT_INT:
419 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 559 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
420 break; 560 break;
421 561
422 case DT_LONG: 562 case DT_LONG:
423 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 563 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
424 break; 564 break;
425 565
426 case DT_STR: 566 case DT_STR:
427 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 567 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
428 break; 568 break;
429 569
430 case DT_STR_LEN: 570 case DT_STR_LEN:
431 { 571 {
432 char *str = va_arg (ap, char *); 572 char *str = va_arg (ap, char *);
433 int len = va_arg (ap, int); 573 int len = va_arg (ap, int);
434 574
435 XPUSHs (sv_2mortal (newSVpvn (str, len))); 575 XPUSHs (sv_2mortal (newSVpvn (str, len)));
436 } 576 }
437 break; 577 break;
438 578
439 case DT_WCS_LEN: 579 case DT_WCS_LEN:
440 { 580 {
441 wchar_t *wstr = va_arg (ap, wchar_t *); 581 wchar_t *wstr = va_arg (ap, wchar_t *);
442 int wlen = va_arg (ap, int); 582 int wlen = va_arg (ap, int);
443 583
444 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 584 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
445 } 585 }
446 break; 586 break;
447 587
448 case DT_LCS_LEN: 588 case DT_LCS_LEN:
449 { 589 {
450 long *lstr = va_arg (ap, long *); 590 long *lstr = va_arg (ap, long *);
451 int llen = va_arg (ap, int); 591 int llen = va_arg (ap, int);
452 592
453 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 593 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
454 } 594 }
455 break; 595 break;
456 596
457 case DT_XEVENT: 597 case DT_XEVENT:
458 { 598 {
459 XEvent *xe = va_arg (ap, XEvent *); 599 XEvent *xe = va_arg (ap, XEvent *);
460 HV *hv = newHV (); 600 HV *hv = newHV ();
461 601
462# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 602# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
463# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 603# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
464# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 604# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
465# undef set 605# undef set
466 606
467 setiv (type, xe->type); 607 setiv (type, xe->type);
468 setiv (send_event, xe->xany.send_event); 608 setiv (send_event, xe->xany.send_event);
469 setiv (serial, xe->xany.serial); 609 setiv (serial, xe->xany.serial);
470 610
471 switch (xe->type) 611 switch (xe->type)
472 { 612 {
473 case KeyPress: 613 case KeyPress:
474 case KeyRelease: 614 case KeyRelease:
475 case ButtonPress: 615 case ButtonPress:
476 case ButtonRelease: 616 case ButtonRelease:
477 case MotionNotify: 617 case MotionNotify:
478 setuv (window, xe->xmotion.window); 618 setuv (window, xe->xmotion.window);
479 setuv (root, xe->xmotion.root); 619 setuv (root, xe->xmotion.root);
480 setuv (subwindow, xe->xmotion.subwindow); 620 setuv (subwindow, xe->xmotion.subwindow);
481 setuv (time, xe->xmotion.time); 621 setuv (time, xe->xmotion.time);
482 setiv (x, xe->xmotion.x); 622 setiv (x, xe->xmotion.x);
483 setiv (y, xe->xmotion.y); 623 setiv (y, xe->xmotion.y);
484 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 624 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
485 setiv (col, xe->xmotion.x / term->fwidth); 625 setiv (col, xe->xmotion.x / term->fwidth);
486 setiv (x_root, xe->xmotion.x_root); 626 setiv (x_root, xe->xmotion.x_root);
487 setiv (y_root, xe->xmotion.y_root); 627 setiv (y_root, xe->xmotion.y_root);
488 setuv (state, xe->xmotion.state); 628 setuv (state, xe->xmotion.state);
489 629
490 switch (xe->type) 630 switch (xe->type)
491 { 631 {
492 case KeyPress: 632 case KeyPress:
493 case KeyRelease: 633 case KeyRelease:
494 setuv (keycode, xe->xkey.keycode); 634 setuv (keycode, xe->xkey.keycode);
495 break; 635 break;
496 636
497 case ButtonPress: 637 case ButtonPress:
498 case ButtonRelease: 638 case ButtonRelease:
499 setuv (button, xe->xbutton.button); 639 setuv (button, xe->xbutton.button);
500 break; 640 break;
501 641
502 case MotionNotify: 642 case MotionNotify:
503 setiv (is_hint, xe->xmotion.is_hint); 643 setiv (is_hint, xe->xmotion.is_hint);
504 break; 644 break;
505 } 645 }
506 646
507 break; 647 break;
508 648
509 case MapNotify: 649 case MapNotify:
510 case UnmapNotify: 650 case UnmapNotify:
511 case ConfigureNotify: 651 case ConfigureNotify:
512 setuv (event, xe->xconfigure.event); 652 setuv (event, xe->xconfigure.event);
513 setuv (window, xe->xconfigure.window); 653 setuv (window, xe->xconfigure.window);
514 654
515 switch (xe->type) 655 switch (xe->type)
516 { 656 {
517 case ConfigureNotify: 657 case ConfigureNotify:
518 setiv (x, xe->xconfigure.x); 658 setiv (x, xe->xconfigure.x);
519 setiv (y, xe->xconfigure.y); 659 setiv (y, xe->xconfigure.y);
520 setiv (width, xe->xconfigure.width); 660 setiv (width, xe->xconfigure.width);
521 setiv (height, xe->xconfigure.height); 661 setiv (height, xe->xconfigure.height);
522 setuv (above, xe->xconfigure.above); 662 setuv (above, xe->xconfigure.above);
523 break; 663 break;
524 } 664 }
525 665
526 break; 666 break;
527 667
528 case PropertyNotify: 668 case PropertyNotify:
529 setuv (window, xe->xproperty.window); 669 setuv (window, xe->xproperty.window);
530 setuv (atom, xe->xproperty.atom); 670 setuv (atom, xe->xproperty.atom);
531 setuv (time, xe->xproperty.time); 671 setuv (time, xe->xproperty.time);
532 setiv (state, xe->xproperty.state); 672 setiv (state, xe->xproperty.state);
533 break; 673 break;
534 674
535 case ClientMessage: 675 case ClientMessage:
536 setuv (window, xe->xclient.window); 676 setuv (window, xe->xclient.window);
537 setuv (message_type, xe->xclient.message_type); 677 setuv (message_type, xe->xclient.message_type);
538 setuv (format, xe->xclient.format); 678 setuv (format, xe->xclient.format);
539 setuv (l0, xe->xclient.data.l[0]); 679 setuv (l0, xe->xclient.data.l[0]);
540 setuv (l1, xe->xclient.data.l[1]); 680 setuv (l1, xe->xclient.data.l[1]);
541 setuv (l2, xe->xclient.data.l[2]); 681 setuv (l2, xe->xclient.data.l[2]);
542 setuv (l3, xe->xclient.data.l[3]); 682 setuv (l3, xe->xclient.data.l[3]);
543 setuv (l4, xe->xclient.data.l[4]); 683 setuv (l4, xe->xclient.data.l[4]);
544 break; 684 break;
545 } 685 }
546 686
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 687 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
548 } 688 }
549 break; 689 break;
550 690
551 case DT_END: 691 case DT_END:
552 goto call; 692 goto call;
553 693
554 default: 694 default:
555 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 695 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
556 } 696 }
697 }
698
699 call:
700 va_end (ap);
701
702 PUTBACK;
703 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
704 SPAGAIN;
705
706 if (count)
707 {
708 SV *status = POPs;
709 count = SvTRUE (status);
557 } 710 }
558 711
559 call:
560 va_end (ap);
561
562 PUTBACK; 712 PUTBACK;
563 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
564 SPAGAIN;
565
566 if (count)
567 {
568 SV *status = POPs;
569 count = SvTRUE (status);
570 }
571
572 PUTBACK;
573 FREETMPS; 713 FREETMPS;
574 LEAVE; 714 LEAVE;
575 715
576 if (SvTRUE (ERRSV)) 716 if (SvTRUE (ERRSV))
577 { 717 {
578 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 718 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
579 ungrab (term); // better lose the grab than the session 719 ungrab (term); // better lose the grab than the session
580 } 720 }
581 721
582 event_consumed = !!count; 722 event_consumed = !!count;
583 } 723 }
584 catch (...)
585 {
586 swap (perl_environ, environ);
587 throw;
588 }
589 else 724 else
590 event_consumed = false; 725 event_consumed = false;
591 726
592 // post-handling of some events 727 // post-handling of some events
593 if (htype == HOOK_REFRESH_BEGIN) 728 if (htype == HOOK_REFRESH_BEGIN)
604 739
605 // don't allow further calls 740 // don't allow further calls
606 term->perl.self = 0; 741 term->perl.self = 0;
607 } 742 }
608 743
609 swap (perl_environ, environ);
610
611 return event_consumed; 744 return event_consumed;
745}
746
747void
748rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
749{
750 localise_env set_environ (perl_environ);
751
752 ENTER;
753 SAVETMPS;
754
755 dSP;
756 XPUSHs (sv_2mortal (newSVpvn (data, len)));
757 PUTBACK;
758 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
759
760 if (SvTRUE (ERRSV))
761 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
762
763 FREETMPS;
764 LEAVE;
612} 765}
613 766
614///////////////////////////////////////////////////////////////////////////// 767/////////////////////////////////////////////////////////////////////////////
615 768
616MODULE = urxvt PACKAGE = urxvt 769MODULE = urxvt PACKAGE = urxvt
628# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 781# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
629# include "hookinc.h" 782# include "hookinc.h"
630# undef def 783# undef def
631 784
632 HV *option = get_hv ("urxvt::OPTION", 1); 785 HV *option = get_hv ("urxvt::OPTION", 1);
633# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 786# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
634# define nodef(name) 787# define nodef(name)
635# include "optinc.h" 788# include "optinc.h"
636# undef nodef 789# undef nodef
637# undef def 790# undef def
638 791
640 static const struct { 793 static const struct {
641 const char *name; 794 const char *name;
642 IV iv; 795 IV iv;
643 } *civ, const_iv[] = { 796 } *civ, const_iv[] = {
644# define const_iv(name) { # name, (IV)name } 797# define const_iv(name) { # name, (IV)name }
798 const_iv (NUM_RESOURCES),
645 const_iv (DEFAULT_RSTYLE), 799 const_iv (DEFAULT_RSTYLE),
646 const_iv (OVERLAY_RSTYLE), 800 const_iv (OVERLAY_RSTYLE),
801 const_iv (Color_Bits),
802 const_iv (RS_bgShift), const_iv (RS_bgMask),
803 const_iv (RS_fgShift), const_iv (RS_fgMask),
804 const_iv (RS_Careful),
805 const_iv (RS_fontCount),
806 const_iv (RS_fontShift),
807 const_iv (RS_fontMask),
808 const_iv (RS_baseattrMask),
809 const_iv (RS_attrMask),
810 const_iv (RS_redraw),
811 const_iv (RS_Sel),
647 const_iv (RS_Bold), 812 const_iv (RS_Bold),
648 const_iv (RS_Italic), 813 const_iv (RS_Italic),
649 const_iv (RS_Blink), 814 const_iv (RS_Blink),
650 const_iv (RS_RVid), 815 const_iv (RS_RVid),
651 const_iv (RS_Uline), 816 const_iv (RS_Uline),
817
818 // TODO: should support all colour constants, create colorinc.h &c
819 const_iv (Color_fg),
820 const_iv (Color_bg),
821 const_iv (Color_fade),
822 const_iv (Color_pointer_fg),
823 const_iv (Color_pointer_bg),
824 const_iv (Color_border),
825 const_iv (NRS_COLORS),
826 const_iv (TOTAL_COLORS),
652 827
653 const_iv (CurrentTime), 828 const_iv (CurrentTime),
654 const_iv (ShiftMask), 829 const_iv (ShiftMask),
655 const_iv (LockMask), 830 const_iv (LockMask),
656 const_iv (ControlMask), 831 const_iv (ControlMask),
738 const_iv (XIMSecondary), 913 const_iv (XIMSecondary),
739 const_iv (XIMTertiary), 914 const_iv (XIMTertiary),
740 const_iv (XIMVisibleToForward), 915 const_iv (XIMVisibleToForward),
741 const_iv (XIMVisibleToBackword), 916 const_iv (XIMVisibleToBackword),
742 const_iv (XIMVisibleToCenter), 917 const_iv (XIMVisibleToCenter),
918#if XRENDER
919 const_iv (PictStandardARGB32),
920 const_iv (PictStandardRGB24),
921 const_iv (PictStandardA8),
922 const_iv (PictStandardA4),
923 const_iv (PictStandardA1),
924 const_iv (RepeatNone),
925 const_iv (RepeatNormal),
926 const_iv (RepeatPad),
927 const_iv (RepeatReflect),
928 // all versions
929 const_iv (PictOpClear),
930 const_iv (PictOpSrc),
931 const_iv (PictOpDst),
932 const_iv (PictOpOver),
933 const_iv (PictOpOverReverse),
934 const_iv (PictOpIn),
935 const_iv (PictOpInReverse),
936 const_iv (PictOpOut),
937 const_iv (PictOpOutReverse),
938 const_iv (PictOpAtop),
939 const_iv (PictOpAtopReverse),
940 const_iv (PictOpXor),
941 const_iv (PictOpAdd),
942 const_iv (PictOpSaturate),
943 // 0.2+
944 const_iv (PictOpDisjointClear),
945 const_iv (PictOpDisjointSrc),
946 const_iv (PictOpDisjointDst),
947 const_iv (PictOpDisjointOver),
948 const_iv (PictOpDisjointOverReverse),
949 const_iv (PictOpDisjointIn),
950 const_iv (PictOpDisjointInReverse),
951 const_iv (PictOpDisjointOut),
952 const_iv (PictOpDisjointOutReverse),
953 const_iv (PictOpDisjointAtop),
954 const_iv (PictOpDisjointAtopReverse),
955 const_iv (PictOpDisjointXor),
956 const_iv (PictOpConjointClear),
957 const_iv (PictOpConjointSrc),
958 const_iv (PictOpConjointDst),
959 const_iv (PictOpConjointOver),
960 const_iv (PictOpConjointOverReverse),
961 const_iv (PictOpConjointIn),
962 const_iv (PictOpConjointInReverse),
963 const_iv (PictOpConjointOut),
964 const_iv (PictOpConjointOutReverse),
965 const_iv (PictOpConjointAtop),
966 const_iv (PictOpConjointAtopReverse),
967 const_iv (PictOpConjointXor),
968 // 0.11+
969 const_iv (PictOpMultiply),
970 const_iv (PictOpScreen),
971 const_iv (PictOpOverlay),
972 const_iv (PictOpDarken),
973 const_iv (PictOpLighten),
974 const_iv (PictOpColorDodge),
975 const_iv (PictOpColorBurn),
976 const_iv (PictOpHardLight),
977 const_iv (PictOpSoftLight),
978 const_iv (PictOpDifference),
979 const_iv (PictOpExclusion),
980 const_iv (PictOpHSLHue),
981 const_iv (PictOpHSLSaturation),
982 const_iv (PictOpHSLColor),
983 const_iv (PictOpHSLLuminosity),
984#endif
743# if 0 985# if 0
744 const_iv (XIMForwardChar), 986 const_iv (XIMForwardChar),
745 const_iv (XIMBackwardChar), 987 const_iv (XIMBackwardChar),
746 const_iv (XIMForwardWord), 988 const_iv (XIMForwardWord),
747 const_iv (XIMBackwardWord), 989 const_iv (XIMBackwardWord),
755 const_iv (XIMDontChange), 997 const_iv (XIMDontChange),
756# endif 998# endif
757# endif 999# endif
758 }; 1000 };
759 1001
760 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1002 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1003 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
762} 1004}
1005
1006void
1007log (const char *msg)
1008 CODE:
1009 rxvt_log ("%s", msg);
763 1010
764void 1011void
765warn (const char *msg) 1012warn (const char *msg)
766 CODE: 1013 CODE:
767 rxvt_warn ("%s", msg); 1014 rxvt_warn ("%s", msg);
771 CODE: 1018 CODE:
772 rxvt_fatal ("%s", msg); 1019 rxvt_fatal ("%s", msg);
773 1020
774void 1021void
775_exit (int status) 1022_exit (int status)
1023
1024void
1025catch_fatal (SV *block)
1026 PROTOTYPE: &
1027 CODE:
1028 try
1029 {
1030 PUSHMARK (SP);
1031 PUTBACK;
1032 call_sv (block, G_VOID | G_DISCARD);
1033 SPAGAIN;
1034 }
1035 catch (const rxvt_failure_exception &e)
1036 {
1037 croak ("rxvt_fatal exception caught, trying to continue.");
1038 }
776 1039
777NV 1040NV
778NOW () 1041NOW ()
779 CODE: 1042 CODE:
780 RETVAL = NOW; 1043 RETVAL = ev::now ();
781 OUTPUT: 1044 OUTPUT:
782 RETVAL 1045 RETVAL
783 1046
784int 1047int
785GET_BASEFG (int rend) 1048GET_BASEFG (int rend)
838 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 1101 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
839 if ((*t)->perl.self) 1102 if ((*t)->perl.self)
840 PUSHs (sv_2mortal (newSVterm (*t))); 1103 PUSHs (sv_2mortal (newSVterm (*t)));
841} 1104}
842 1105
1106IV
1107_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
1108 CODE:
1109 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
1110 req->cb_sv = newSVsv (cb);
1111 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
1112 av_push (av, newSViv ((IV)req));
1113 RETVAL = (IV)req;
1114 OUTPUT:
1115 RETVAL
1116
1117void
1118_delete_selection_request (IV req_)
1119 CODE:
1120 rxvt_selection *req = (rxvt_selection *)req_;
1121 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
1122 int i;
1123
1124 for (i = AvFILL (av); i >= 0; i--)
1125 if (SvIV (*av_fetch (av, i, 1)) == req_)
1126 break;
1127
1128 for (; i < AvFILL (av); i++)
1129 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
1130
1131 av_pop (av);
1132
1133 delete req;
1134
843MODULE = urxvt PACKAGE = urxvt::term 1135MODULE = urxvt PACKAGE = urxvt::term
844 1136
845SV * 1137SV *
846_new (AV *env, AV *arg) 1138_new (AV *env, AV *arg)
847 CODE: 1139 CODE:
848{ 1140{
849 rxvt_term *term = new rxvt_term; 1141 rxvt_term *term = new rxvt_term;
850 1142
851 stringvec *argv = new stringvec; 1143 stringvec *argv = new stringvec;
852 stringvec *envv = new stringvec;
853
854 for (int i = 0; i <= AvFILL (arg); i++) 1144 for (int i = 0; i <= AvFILL (arg); i++)
855 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 1145 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
856 1146
1147 stringvec *envv = new stringvec;
857 for (int i = AvFILL (env) + 1; i--; ) 1148 for (int i = AvFILL (env) + 1; i--; )
858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 1149 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
859 1150
860 envv->push_back (0);
861
862 bool success;
863
864 try 1151 try
865 { 1152 {
866 success = term->init (argv, envv); 1153 term->init (argv, envv);
867 } 1154 }
868 catch (const class rxvt_failure_exception &e) 1155 catch (const class rxvt_failure_exception &e)
869 {
870 success = false;
871 }
872
873 if (!success)
874 { 1156 {
875 term->destroy (); 1157 term->destroy ();
876 croak ("error while initializing new terminal instance"); 1158 croak ("error while initializing new terminal instance");
877 } 1159 }
878 1160
886rxvt_term::destroy () 1168rxvt_term::destroy ()
887 1169
888void 1170void
889rxvt_term::set_should_invoke (int htype, int inc) 1171rxvt_term::set_should_invoke (int htype, int inc)
890 CODE: 1172 CODE:
891 THIS->perl.should_invoke [htype] += inc; 1173 uint8_t &count = THIS->perl.should_invoke [htype];
1174 uint8_t prev = count;
1175 count += inc;
1176 if (!prev != !count)
1177 {
1178 // hook status changed, react
1179 switch (htype)
1180 {
1181 case HOOK_POSITION_CHANGE:
1182 if (count)
1183 THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1184 }
1185 }
1186
1187void
1188rxvt_term::put_option_db (octet_string specifier, octet_string value)
1189 CODE:
1190 XrmPutStringResource (&THIS->option_db, specifier, value);
892 1191
893int 1192int
894rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1193rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
895 CODE: 1194 CODE:
896 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1195 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
912 1211
913void 1212void
914rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 1213rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
915 CODE: 1214 CODE:
916 XUngrabKey (THIS->dpy, keycode, modifiers, window); 1215 XUngrabKey (THIS->dpy, keycode, modifiers, window);
917
918void
919rxvt_term::XUngrabKeyboard (Time eventtime)
920 CODE:
921 XUngrabKeyboard (THIS->dpy, eventtime);
922 1216
923bool 1217bool
924rxvt_term::grab (Time eventtime, int sync = 0) 1218rxvt_term::grab (Time eventtime, int sync = 0)
925 CODE: 1219 CODE:
926{ 1220{
1041 free (wstr); 1335 free (wstr);
1042} 1336}
1043 OUTPUT: 1337 OUTPUT:
1044 RETVAL 1338 RETVAL
1045 1339
1046char *
1047rxvt_term::locale ()
1048 CODE:
1049 RETVAL = THIS->locale;
1050 OUTPUT:
1051 RETVAL
1052
1053#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1340#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1054 1341
1055#define TERM_OFFSET_width TERM_OFFSET(width) 1342#define TERM_OFFSET_width TERM_OFFSET(width)
1056#define TERM_OFFSET_height TERM_OFFSET(height) 1343#define TERM_OFFSET_height TERM_OFFSET(height)
1057#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1344#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1058#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1345#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1059#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1346#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1060#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1347#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1061#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1348#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1062#define TERM_OFFSET_focus TERM_OFFSET(focus) 1349#define TERM_OFFSET_focus TERM_OFFSET(focus)
1063#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1350#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1064#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1351#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1065#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1352#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1066#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1353#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1354#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1067#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1355#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1068#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1356#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1069#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1357#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1070 1358
1071int 1359int
1072rxvt_term::width () 1360rxvt_term::width ()
1073 ALIAS: 1361 ALIAS:
1074 width = TERM_OFFSET_width 1362 width = TERM_OFFSET_width
1075 height = TERM_OFFSET_height 1363 height = TERM_OFFSET_height
1076 fwidth = TERM_OFFSET_fwidth 1364 fwidth = TERM_OFFSET_fwidth
1077 fheight = TERM_OFFSET_fheight 1365 fheight = TERM_OFFSET_fheight
1078 fbase = TERM_OFFSET_fbase 1366 fbase = TERM_OFFSET_fbase
1079 nrow = TERM_OFFSET_nrow 1367 nrow = TERM_OFFSET_nrow
1080 ncol = TERM_OFFSET_ncol 1368 ncol = TERM_OFFSET_ncol
1081 focus = TERM_OFFSET_focus 1369 focus = TERM_OFFSET_focus
1082 mapped = TERM_OFFSET_mapped 1370 mapped = TERM_OFFSET_mapped
1083 int_bwidth = TERM_OFFSET_int_bwidth 1371 int_bwidth = TERM_OFFSET_int_bwidth
1084 ext_bwidth = TERM_OFFSET_ext_bwidth 1372 ext_bwidth = TERM_OFFSET_ext_bwidth
1085 lineSpace = TERM_OFFSET_lineSpace 1373 lineSpace = TERM_OFFSET_lineSpace
1374 letterSpace = TERM_OFFSET_letterSpace
1086 saveLines = TERM_OFFSET_saveLines 1375 saveLines = TERM_OFFSET_saveLines
1087 total_rows = TERM_OFFSET_total_rows 1376 total_rows = TERM_OFFSET_total_rows
1088 top_row = TERM_OFFSET_top_row 1377 top_row = TERM_OFFSET_top_row
1089 CODE: 1378 CODE:
1090 RETVAL = *(int *)((char *)THIS + ix); 1379 RETVAL = *(int *)((char *)THIS + ix);
1091 OUTPUT: 1380 OUTPUT:
1092 RETVAL 1381 RETVAL
1093 1382
1104 { 1393 {
1105 case 0: RETVAL = THIS->ModLevel3Mask; break; 1394 case 0: RETVAL = THIS->ModLevel3Mask; break;
1106 case 1: RETVAL = THIS->ModMetaMask; break; 1395 case 1: RETVAL = THIS->ModMetaMask; break;
1107 case 2: RETVAL = THIS->ModNumLockMask; break; 1396 case 2: RETVAL = THIS->ModNumLockMask; break;
1108 case 3: RETVAL = THIS->current_screen; break; 1397 case 3: RETVAL = THIS->current_screen; break;
1398#ifdef CURSOR_BLINK
1109 case 4: RETVAL = THIS->hidden_cursor; break; 1399 case 4: RETVAL = THIS->hidden_cursor; break;
1400#endif
1110 } 1401 }
1111 OUTPUT: 1402 OUTPUT:
1112 RETVAL 1403 RETVAL
1113 1404
1114char * 1405char *
1139 if (*i) 1430 if (*i)
1140 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1431 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1141} 1432}
1142 1433
1143int 1434int
1144rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1435rxvt_term::pty_ev_events (int events = ev::UNDEF)
1145 CODE: 1436 CODE:
1146 RETVAL = THIS->pty_ev.events; 1437 RETVAL = THIS->pty_ev.events;
1147 if (events != EVENT_UNDEF) 1438 if (events != ev::UNDEF)
1148 THIS->pty_ev.set (events); 1439 THIS->pty_ev.set (events);
1149 OUTPUT: 1440 OUTPUT:
1150 RETVAL 1441 RETVAL
1151 1442
1152int 1443int
1157 RETVAL 1448 RETVAL
1158 1449
1159Window 1450Window
1160rxvt_term::parent () 1451rxvt_term::parent ()
1161 CODE: 1452 CODE:
1162 RETVAL = THIS->parent [0]; 1453 RETVAL = THIS->parent;
1454 OUTPUT:
1455 RETVAL
1456
1457int
1458rxvt_term::parent_x ()
1459 CODE:
1460 RETVAL = THIS->parent_x;
1461 OUTPUT:
1462 RETVAL
1463
1464int
1465rxvt_term::parent_y ()
1466 CODE:
1467 RETVAL = THIS->parent_y;
1163 OUTPUT: 1468 OUTPUT:
1164 RETVAL 1469 RETVAL
1165 1470
1166Window 1471Window
1167rxvt_term::vt () 1472rxvt_term::vt ()
1194 if (newval <= 0) 1499 if (newval <= 0)
1195 THIS->scr_changeview (max (newval, THIS->top_row)); 1500 THIS->scr_changeview (max (newval, THIS->top_row));
1196} 1501}
1197 OUTPUT: 1502 OUTPUT:
1198 RETVAL 1503 RETVAL
1504
1505void
1506rxvt_term::set_urgency (bool enable)
1199 1507
1200void 1508void
1201rxvt_term::focus_in () 1509rxvt_term::focus_in ()
1202 1510
1203void 1511void
1231 1539
1232void 1540void
1233rxvt_term::want_refresh () 1541rxvt_term::want_refresh ()
1234 CODE: 1542 CODE:
1235 THIS->want_refresh = 1; 1543 THIS->want_refresh = 1;
1544 THIS->refresh_check ();
1236 1545
1237void 1546void
1238rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1547rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1239 PPCODE: 1548 PPCODE:
1240{ 1549{
1435# include "rsinc.h" 1744# include "rsinc.h"
1436# undef def 1745# undef def
1437# undef reserve 1746# undef reserve
1438 }; 1747 };
1439 1748
1440 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1749 rs = rslist + ecb_array_length (rslist);
1441 1750
1751 if (*name)
1442 do { 1752 {
1753 do {
1443 if (rs-- == rslist) 1754 if (rs-- == rslist)
1444 croak ("no such resource '%s', requested", name); 1755 croak ("no such resource '%s', requested", name);
1445 } while (strcmp (name, rs->name)); 1756 } while (strcmp (name, rs->name));
1446 1757
1447 index += rs->value; 1758 index += rs->value;
1759 }
1760 else
1761 {
1762 --rs;
1763 name = "";
1764 }
1448 1765
1449 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1766 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1450 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1767 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1451 1768
1452 if (GIMME_V != G_VOID) 1769 if (GIMME_V != G_VOID)
1476 1793
1477 if (set >= 0) 1794 if (set >= 0)
1478 { 1795 {
1479 THIS->set_option (optval, set); 1796 THIS->set_option (optval, set);
1480 1797
1481 if (THIS->check_ev.is_active ()) // avoid doing this before START 1798 if (THIS->init_done) // avoid doing this before START
1482 switch (optval) 1799 switch (optval)
1483 { 1800 {
1484 case Opt_skipBuiltinGlyphs: 1801 case Opt_skipBuiltinGlyphs:
1485 THIS->set_fonts (); 1802 THIS->set_fonts ();
1486 THIS->scr_remap_chars (); 1803 THIS->scr_remap_chars ();
1487 THIS->scr_touch (true); 1804 THIS->scr_touch (true);
1488 THIS->want_refresh = 1; 1805 THIS->want_refresh = 1;
1806 THIS->refresh_check ();
1489 break; 1807 break;
1808#ifdef CURSOR_BLINK
1809 case Opt_cursorBlink:
1810 THIS->cursor_blink_reset ();
1811 break;
1812#endif
1490 1813
1491 case Opt_cursorUnderline: 1814 case Opt_cursorUnderline:
1492 THIS->want_refresh = 1; 1815 THIS->want_refresh = 1;
1816 THIS->refresh_check ();
1493 break; 1817 break;
1494 1818
1495# case Opt_scrollBar_floating: 1819# case Opt_scrollBar_floating:
1496# case Opt_scrollBar_right: 1820# case Opt_scrollBar_right:
1497# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1821# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1507 CODE: 1831 CODE:
1508 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1832 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1509 THIS->keyboard->register_done (); 1833 THIS->keyboard->register_done ();
1510 OUTPUT: 1834 OUTPUT:
1511 RETVAL 1835 RETVAL
1836
1837void
1838rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1839 CODE:
1840 wchar_t *wstr = sv2wcs (str);
1841 THIS->keyboard->register_user_translation (keysym, state, wstr);
1842 free (wstr);
1512 1843
1513void 1844void
1514rxvt_term::screen_cur (...) 1845rxvt_term::screen_cur (...)
1515 PROTOTYPE: $;$$ 1846 PROTOTYPE: $;$$
1516 ALIAS: 1847 ALIAS:
1530 EXTEND (SP, 2); 1861 EXTEND (SP, 2);
1531 PUSHs (sv_2mortal (newSViv (rc.row))); 1862 PUSHs (sv_2mortal (newSViv (rc.row)));
1532 PUSHs (sv_2mortal (newSViv (rc.col))); 1863 PUSHs (sv_2mortal (newSViv (rc.col)));
1533 } 1864 }
1534 1865
1535 if (items == 3) 1866 if (items >= 3)
1536 { 1867 {
1537 rc.row = SvIV (ST (1)); 1868 rc.row = SvIV (ST (1));
1538 rc.col = SvIV (ST (2)); 1869 rc.col = SvIV (ST (2));
1539 1870
1540 if (ix == 2) 1871 if (ix == 2)
1555 1886
1556 clamp_it (rc.col, 0, THIS->ncol); 1887 clamp_it (rc.col, 0, THIS->ncol);
1557 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1888 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1558 1889
1559 if (ix) 1890 if (ix)
1560 THIS->want_refresh = 1; 1891 {
1892 THIS->selection.screen = THIS->current_screen;
1893
1894 THIS->selection_changed ();
1895 THIS->refresh_check ();
1561 } 1896 }
1897 }
1562} 1898}
1563 1899
1564char 1900int
1565rxvt_term::cur_charset () 1901rxvt_term::selection_screen (int screen = -1)
1566 CODE: 1902 CODE:
1567 RETVAL = THIS->charsets [THIS->screen.charset]; 1903 RETVAL = THIS->selection.screen;
1568 OUTPUT: 1904 if (screen >= 0)
1905 THIS->selection.screen = screen;
1906 OUTPUT:
1569 RETVAL 1907 RETVAL
1570 1908
1571void 1909void
1572rxvt_term::selection_clear () 1910rxvt_term::selection_request (Time tm, int selnum)
1911
1912void
1913rxvt_term::selection_clear (bool clipboard = false)
1573 1914
1574void 1915void
1575rxvt_term::selection_make (Time eventtime, bool rect = false) 1916rxvt_term::selection_make (Time eventtime, bool rect = false)
1576 CODE: 1917 CODE:
1577 THIS->selection.op = SELECTION_CONT; 1918 THIS->selection.op = SELECTION_CONT;
1578 THIS->selection.rect = rect; 1919 THIS->selection.rect = rect;
1579 THIS->selection_make (eventtime); 1920 THIS->selection_make (eventtime);
1580 1921
1581int 1922int
1582rxvt_term::selection_grab (Time eventtime) 1923rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1583 1924
1584void 1925void
1585rxvt_term::selection (SV *newtext = 0) 1926rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1586 PPCODE: 1927 PPCODE:
1587{ 1928{
1929 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1930 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1931
1588 if (GIMME_V != G_VOID) 1932 if (GIMME_V != G_VOID)
1589 XPUSHs (THIS->selection.text 1933 XPUSHs (text
1590 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1934 ? sv_2mortal (wcs2sv (text, len))
1591 : &PL_sv_undef); 1935 : &PL_sv_undef);
1592 1936
1593 if (newtext) 1937 if (newtext)
1594 { 1938 {
1595 free (THIS->selection.text); 1939 free (text);
1596 1940
1597 THIS->selection.text = sv2wcs (newtext); 1941 text = sv2wcs (newtext);
1598 THIS->selection.len = wcslen (THIS->selection.text); 1942 len = wcslen (text);
1599 } 1943 }
1600} 1944}
1945
1946char
1947rxvt_term::cur_charset ()
1948 CODE:
1949 RETVAL = THIS->charsets [THIS->screen.charset];
1950 OUTPUT:
1951 RETVAL
1601 1952
1602void 1953void
1603rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1954rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1604 1955
1605void 1956void
1606rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1957rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1607 1958
1608void 1959void
1609rxvt_term::scr_bell () 1960rxvt_term::scr_bell ()
1961
1962void
1963rxvt_term::scr_recolour (bool refresh = true);
1610 1964
1611void 1965void
1612rxvt_term::scr_change_screen (int screen) 1966rxvt_term::scr_change_screen (int screen)
1613 1967
1614void 1968void
1627 char *str = SvPVbyte (octets, len); 1981 char *str = SvPVbyte (octets, len);
1628 C_ARGS: 1982 C_ARGS:
1629 str, len 1983 str, len
1630 1984
1631void 1985void
1986rxvt_term::tt_paste (SV *octets)
1987 INIT:
1988 STRLEN len;
1989 char *str = SvPVbyte (octets, len);
1990 C_ARGS:
1991 str, len
1992
1993void
1632rxvt_term::cmd_parse (SV *octets) 1994rxvt_term::cmd_parse (SV *octets)
1633 CODE: 1995 CODE:
1634{ 1996{
1635 STRLEN len; 1997 STRLEN len;
1636 char *str = SvPVbyte (octets, len); 1998 char *str = SvPVbyte (octets, len);
1705 XFree (prop); 2067 XFree (prop);
1706 } 2068 }
1707} 2069}
1708 2070
1709void 2071void
1710rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 2072rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1711 CODE: 2073 CODE:
1712{ 2074{
1713 STRLEN len; 2075 STRLEN len;
1714 char *data_ = SvPVbyte (data, len); 2076 char *data_ = SvPVbyte (data, len);
1715 2077
1721 type, format, PropModeReplace, 2083 type, format, PropModeReplace,
1722 (unsigned char *)data_, len / elemsize); 2084 (unsigned char *)data_, len / elemsize);
1723} 2085}
1724 2086
1725Atom 2087Atom
1726XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 2088XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1727 C_ARGS: term->dpy, atom_name, only_if_exists 2089 C_ARGS: term->dpy, atom_name, only_if_exists
1728 2090
1729char * 2091char *
1730XGetAtomName (rxvt_term *term, Atom atom) 2092XGetAtomName (rxvt_term *term, Atom atom)
1731 C_ARGS: term->dpy, atom 2093 C_ARGS: term->dpy, atom
1732 CLEANUP: 2094 CLEANUP:
1733 XFree (RETVAL); 2095 XFree (RETVAL);
1734 2096
1735void 2097void
1736XDeleteProperty (rxvt_term *term, Window window, Atom property) 2098XDeleteProperty (rxvt_term *term, Window window, Atom property)
1737 C_ARGS: term->dpy, window, property 2099 C_ARGS: term->dpy, window, property
1738 2100
1739Window 2101Window
1740rxvt_term::DefaultRootWindow () 2102rxvt_term::DefaultRootWindow ()
1741 CODE: 2103 CODE:
1742 RETVAL = THIS->display->root; 2104 RETVAL = THIS->display->root;
1794 PUSHs (newSVuv (child)); 2156 PUSHs (newSVuv (child));
1795 } 2157 }
1796} 2158}
1797 2159
1798############################################################################# 2160#############################################################################
2161# fancy bg bloatstuff (TODO: should be moved up somewhere)
2162
2163bool
2164rxvt_term::has_render ()
2165 CODE:
2166 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2167 OUTPUT:
2168 RETVAL
2169
2170void
2171rxvt_term::background_geometry (bool border = false)
2172 PPCODE:
2173 EXTEND (SP, 4);
2174 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2175 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2176 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2177 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2178
2179#if HAVE_IMG
2180
2181rxvt_img *
2182rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2183 CODE:
2184 XRenderPictFormat *f = SvOK (format)
2185 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2186 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2187 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2188 RETVAL->alloc ();
2189 OUTPUT:
2190 RETVAL
2191
2192#if ENABLE_TRANSPARENCY
2193
2194rxvt_img *
2195rxvt_term::new_img_from_root ()
2196 CODE:
2197 RETVAL = rxvt_img::new_from_root (THIS);
2198 OUTPUT:
2199 RETVAL
2200
2201#endif
2202
2203#if HAVE_PIXBUF
2204
2205rxvt_img *
2206rxvt_term::new_img_from_file (octet_string filename)
2207 CODE:
2208 try
2209 {
2210 RETVAL = rxvt_img::new_from_file (THIS, filename);
2211 }
2212 catch (const class rxvt_failure_exception &e)
2213 {
2214 croak ("new_img_from_file failed");
2215 }
2216 OUTPUT:
2217 RETVAL
2218
2219#endif
2220
2221void
2222rxvt_term::set_background (rxvt_img *img, bool border = false)
2223 CODE:
2224 delete THIS->bg_img;
2225 THIS->bg_img = 0;
2226 THIS->bg_flags = 0;
2227
2228 if (img) // TODO: cannot be false
2229 {
2230 img = img->clone (); // own the img
2231
2232 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2233 img->sub_rect (0, 0,
2234 border ? THIS->vt_width : THIS->szHint.width,
2235 border ? THIS->vt_height : THIS->szHint.height)
2236 ->replace (img);
2237
2238 // just in case, should usually be a nop
2239 img->reify ()
2240 ->replace (img);
2241
2242 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2243 ->replace (img);
2244
2245 THIS->bg_img = img;
2246 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2247
2248 if (!border)
2249 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2250 }
2251
2252#endif
2253
2254#############################################################################
1799# urxvt::overlay 2255# urxvt::overlay
1800############################################################################# 2256#############################################################################
1801 2257
1802MODULE = urxvt PACKAGE = urxvt::overlay 2258MODULE = urxvt PACKAGE = urxvt::overlay
1803 2259
1813void 2269void
1814overlay::DESTROY () 2270overlay::DESTROY ()
1815 2271
1816INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 2272INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1817 2273
2274MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
2275
2276#if HAVE_PIXBUF
2277
2278urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
2279 C_ARGS: filename, 0
2280
2281void
2282DESTROY (urxvt::pixbuf self)
2283 CODE:
2284 g_object_unref (self);
2285
2286#endif
2287
2288MODULE = urxvt PACKAGE = urxvt::img
2289
2290#if HAVE_IMG
2291
2292# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2293# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2294
2295void
2296rxvt_img::geometry ()
2297 PPCODE:
2298 EXTEND (SP, 4);
2299 PUSHs (sv_2mortal (newSViv (THIS->x)));
2300 PUSHs (sv_2mortal (newSViv (THIS->y)));
2301 PUSHs (sv_2mortal (newSViv (THIS->w)));
2302 PUSHs (sv_2mortal (newSViv (THIS->h)));
2303
2304int
2305rxvt_img::x ()
2306 ALIAS:
2307 x = 0
2308 y = 1
2309 w = 2
2310 h = 3
2311 CODE:
2312 switch (ix)
2313 {
2314 case 0: RETVAL = THIS->x; break;
2315 case 1: RETVAL = THIS->y; break;
2316 case 2: RETVAL = THIS->w; break;
2317 case 3: RETVAL = THIS->h; break;
2318 }
2319 OUTPUT:
2320 RETVAL
2321
2322Pixmap
2323rxvt_img::pm ()
2324 CODE:
2325 RETVAL = THIS->pm;
2326 OUTPUT:
2327 RETVAL
2328
2329void
2330rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2331 PROTOTYPE: $;$$$$
2332 INIT:
2333 rgba cc = parse_rgba (c, THIS->s);
2334 C_ARGS: cc, x, y, w, h
2335
2336void
2337rxvt_img::DESTROY ()
2338 CODE:
2339 delete THIS;
2340
2341void
2342rxvt_img::add_alpha ()
2343
2344void
2345rxvt_img::unshare ()
2346
2347void
2348rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2349 PPCODE:
2350 if (items >= 2)
2351 THIS->repeat_mode (repeat);
2352 if (GIMME_V != G_VOID)
2353 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2354
2355void
2356rxvt_img::move (int dx, int dy)
2357
2358void
2359rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2360
2361void
2362rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2363
2364void
2365rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2366
2367rxvt_img *
2368rxvt_img::clone ()
2369
2370rxvt_img *
2371rxvt_img::reify ()
2372
2373rxvt_img *
2374rxvt_img::sub_rect (int x, int y, int width, int height)
2375
2376rxvt_img *
2377rxvt_img::blur (int rh, int rv)
2378
2379rxvt_img *
2380rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2381
2382rxvt_img *
2383rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33)
2384 INIT:
2385 rxvt_img::nv matrix[3][3] = {
2386 { p11, p12, p13 },
2387 { p21, p22, p23 },
2388 { p31, p32, p33 }
2389 };
2390 C_ARGS: matrix
2391
2392rxvt_img *
2393rxvt_img::scale (int new_width, int new_height)
2394
2395rxvt_img *
2396rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2397
2398rxvt_img *
2399rxvt_img::tint (SV *c)
2400 INIT:
2401 rgba cc = parse_rgba (c, THIS->s);
2402 C_ARGS: cc
2403
2404rxvt_img *
2405rxvt_img::shade (rxvt_img::nv factor)
2406
2407rxvt_img *
2408rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2409 CODE:
2410 rxvt_img::nv *vparams = 0;
2411 int nparams = 0;
2412
2413 if (SvOK (params))
2414 {
2415 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2416 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2417
2418 nparams = av_len ((AV *)SvRV (params)) + 1;
2419 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2420
2421 for (int i = 0; i < nparams; ++i)
2422 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2423 }
2424
2425 RETVAL = THIS->filter (name, nparams, vparams);
2426 free (vparams);
2427 OUTPUT:
2428 RETVAL
2429
2430#endif
2431

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines