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.6 by root, Mon Jan 2 21:17:01 2006 UTC vs.
Revision 1.93 by root, Wed Jan 25 15:02:47 2006 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-2005 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
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.
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28 28
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef>
31#include <cstdarg> 32#include <cstdarg>
32 33
34#include "unistd.h"
35
36#include "iom.h"
33#include "rxvt.h" 37#include "rxvt.h"
34#include "iom.h" 38#include "keyboard.h"
35#include "rxvtutil.h" 39#include "rxvtutil.h"
36#include "rxvtperl.h" 40#include "rxvtperl.h"
37 41
38#include "perlxsi.c" 42#include "perlxsi.c"
43
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49
50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)]
54
55typedef int CHAINED UNUSED;
39 56
40///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
41 58
42static wchar_t * 59static wchar_t *
43sv2wcs (SV *sv) 60sv2wcs (SV *sv)
46 char *str = SvPVutf8 (sv, len); 63 char *str = SvPVutf8 (sv, len);
47 return rxvt_utf8towcs (str, len); 64 return rxvt_utf8towcs (str, len);
48} 65}
49 66
50static SV * 67static SV *
68wcs2sv (wchar_t *wstr, int len = -1)
69{
70 char *str = rxvt_wcstoutf8 (wstr, len);
71
72 SV *sv = newSVpv (str, 0);
73 SvUTF8_on (sv);
74 free (str);
75
76 return sv;
77}
78
79static SV *
51new_ref (HV *hv, const char *klass) 80new_ref (HV *hv, const char *klass)
52{ 81{
53 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
54} 83}
55 84
56//TODO: use magic 85//TODO: use magic
57static SV * 86static SV *
58newSVptr (void *ptr, const char *klass) 87newSVptr (void *ptr, const char *klass)
59{ 88{
60 HV *hv = newHV (); 89 HV *hv = newHV ();
61 hv_store (hv, "_ptr", 4, newSViv ((long)ptr), 0); 90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
62 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
92}
93
94static void
95clearSVptr (SV *sv)
96{
97 if (SvROK (sv))
98 sv = SvRV (sv);
99
100 hv_clear ((HV *)sv);
101 sv_unmagic (sv, PERL_MAGIC_ext);
63} 102}
64 103
65static long 104static long
66SvPTR (SV *sv, const char *klass) 105SvPTR (SV *sv, const char *klass)
67{ 106{
68 if (!sv_derived_from (sv, klass)) 107 if (!sv_derived_from (sv, klass))
69 croak ("object of type %s expected", klass); 108 croak ("object of type %s expected", klass);
70 109
71 IV iv = SvIV (*hv_fetch ((HV *)SvRV (sv), "_ptr", 4, 1)); 110 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
72 111
73 if (!iv) 112 if (!mg)
74 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);
75 114
76 return (long)iv; 115 return (long)mg->mg_ptr;
77} 116}
78 117
79#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
80#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
81 120
82///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
122
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
83 124
84struct perl_watcher 125struct perl_watcher
85{ 126{
86 SV *cbsv; 127 SV *cbsv;
87 HV *self; 128 HV *self;
88 129
89 perl_watcher () 130 perl_watcher ()
90 : cbsv (newSV (0)) 131 : cbsv (0)
91 { 132 {
92 } 133 }
93 134
94 ~perl_watcher () 135 ~perl_watcher ()
95 { 136 {
96 SvREFCNT_dec (cbsv); 137 SvREFCNT_dec (cbsv);
97 } 138 }
98 139
99 void cb (SV *cb) 140 void cb (SV *cb)
100 { 141 {
101 sv_setsv (cbsv, cb); 142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
102 } 144 }
103 145
104 void invoke (const char *type, SV *self, int arg = -1); 146 void invoke (const char *type, SV *self, int arg = -1);
105}; 147};
106 148
130 if (SvTRUE (ERRSV)) 172 if (SvTRUE (ERRSV))
131 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
132} 174}
133 175
134#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
135#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
136 178
137struct timer : time_watcher, perl_watcher 179struct timer : perl_watcher, time_watcher
138{ 180{
181 tstamp interval;
182
139 timer () 183 timer ()
140 : time_watcher (this, &timer::execute) 184 : time_watcher (this, &timer::execute)
141 { 185 {
142 } 186 }
143 187
144 void execute (time_watcher &w) 188 void execute (time_watcher &w)
145 { 189 {
190 if (interval)
191 start (at + interval);
192
146 invoke ("urxvt::timer", newSVtimer (this)); 193 invoke ("urxvt::timer", newSVtimer (this));
147 } 194 }
148}; 195};
149 196
150#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
151#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
152 199
153struct iow : io_watcher, perl_watcher 200struct iow : perl_watcher, io_watcher
154{ 201{
155 iow () 202 iow ()
156 : io_watcher (this, &iow::execute) 203 : io_watcher (this, &iow::execute)
157 { 204 {
158 } 205 }
161 { 208 {
162 invoke ("urxvt::iow", newSViow (this), revents); 209 invoke ("urxvt::iow", newSViow (this), revents);
163 } 210 }
164}; 211};
165 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
166///////////////////////////////////////////////////////////////////////////// 245/////////////////////////////////////////////////////////////////////////////
167 246
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248
249class overlay {
250 rxvt_term *THIS;
251 AV *overlay_av;
252 int x, y, w, h;
253 int border;
254 text_t **text;
255 rend_t **rend;
256
257public:
258 HV *self;
259
260 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
261 ~overlay ();
262
263 void show ();
264 void hide ();
265
266 void swap ();
267
268 void set (int x, int y, SV *str, SV *rend);
269};
270
271overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
272: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
273{
274 if (border == 2)
275 {
276 w += 2;
277 h += 2;
278 }
279
280 text = new text_t *[h];
281 rend = new rend_t *[h];
282
283 for (int y = 0; y < h; y++)
284 {
285 text_t *tp = text[y] = new text_t[w];
286 rend_t *rp = rend[y] = new rend_t[w];
287
288 text_t t0, t1, t2;
289 rend_t r = rstyle;
290
291 if (border == 2)
292 {
293 if (y == 0)
294 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
295 else if (y < h - 1)
296 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
297 else
298 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
299
300 *tp++ = t0;
301 *rp++ = r;
302
303 for (int x = w - 2; x-- > 0; )
304 {
305 *tp++ = t1;
306 *rp++ = r;
307 }
308
309 *tp = t2;
310 *rp = r;
311 }
312 else
313 for (int x = w; x-- > 0; )
314 {
315 *tp++ = 0x0020;
316 *rp++ = r;
317 }
318 }
319
320 show ();
321}
322
323overlay::~overlay ()
324{
325 hide ();
326
327 for (int y = h; y--; )
328 {
329 delete [] text[y];
330 delete [] rend[y];
331 }
332
333 delete [] text;
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));
347
348 THIS->want_refresh = 1;
349}
350
351void
352overlay::hide ()
353{
354 if (!overlay_av)
355 return;
356
357 int i;
358
359 for (i = AvFILL (overlay_av); i >= 0; i--)
360 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361 {
362 av_delete (overlay_av, i, G_DISCARD);
363 break;
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;
375}
376
377void overlay::swap ()
378{
379 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
380 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
381
382 int ov_w = min (w, THIS->ncol - ov_x);
383 int ov_h = min (h, THIS->nrow - ov_y);
384
385 for (int y = ov_h; y--; )
386 {
387 text_t *t1 = text [y];
388 rend_t *r1 = rend [y];
389
390 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
391 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
392
393 for (int x = ov_w; x--; )
394 {
395 text_t t = *t1; *t1++ = *t2; *t2++ = t;
396 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
397 }
398 }
399
400}
401
402void overlay::set (int x, int y, SV *text, SV *rend)
403{
404 x += border;
405 y += border;
406
407 if (!IN_RANGE_EXC (y, 0, h - border))
408 return;
409
410 wchar_t *wtext = sv2wcs (text);
411
412 for (int col = min (wcslen (wtext), w - x - border); col--; )
413 this->text [y][x + col] = wtext [col];
414
415 free (wtext);
416
417 if (rend)
418 {
419 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
420 croak ("rend must be arrayref");
421
422 AV *av = (AV *)SvRV (rend);
423
424 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
425 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
426 }
427
428 THIS->want_refresh = 1;
429}
430
431
432/////////////////////////////////////////////////////////////////////////////
433
168struct rxvt_perl_interp rxvt_perl; 434struct rxvt_perl_interp rxvt_perl;
169 435
170static PerlInterpreter *perl; 436static PerlInterpreter *perl;
171
172rxvt_perl_interp::rxvt_perl_interp ()
173{
174}
175 437
176rxvt_perl_interp::~rxvt_perl_interp () 438rxvt_perl_interp::~rxvt_perl_interp ()
177{ 439{
178 if (perl) 440 if (perl)
179 { 441 {
181 perl_free (perl); 443 perl_free (perl);
182 } 444 }
183} 445}
184 446
185void 447void
186rxvt_perl_interp::init () 448rxvt_perl_interp::init (rxvt_term *term)
187{ 449{
188 if (!perl) 450 if (!perl)
189 { 451 {
452 rxvt_push_locale (""); // perl init destroys current locale
453
454 perl_environ = rxvt_environ;
455 swap (perl_environ, environ);
456
190 char *argv[] = { 457 char *argv[] = {
191 "", 458 "",
192 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 459 "-e"
460 "BEGIN {"
461 " urxvt->bootstrap;"
462 " unshift @INC, '" LIBDIR "';"
463 "}"
464 ""
465 "use urxvt;"
193 }; 466 };
194 467
195 perl = perl_alloc (); 468 perl = perl_alloc ();
196 perl_construct (perl); 469 perl_construct (perl);
197 470
202 475
203 perl_destruct (perl); 476 perl_destruct (perl);
204 perl_free (perl); 477 perl_free (perl);
205 perl = 0; 478 perl = 0;
206 } 479 }
480
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);
491 }
492}
493
494static void
495ungrab (rxvt_term *THIS)
496{
497 if (THIS->perl.grabtime)
498 {
499 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
500 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
501 THIS->perl.grabtime = 0;
207 } 502 }
208} 503}
209 504
210bool 505bool
211rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 506rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
212{ 507{
213 if (!perl 508 if (!perl || !term->perl.self)
214 || (!should_invoke [htype] && htype != HOOK_INIT && htype != HOOK_DESTROY))
215 return false; 509 return false;
216
217 if (htype == HOOK_INIT) // first hook ever called
218 term->self = (void *)newSVptr ((void *)term, "urxvt::term");
219 510
220 dSP; 511 // pre-handling of some events
221 va_list ap; 512 if (htype == HOOK_REFRESH_END)
513 {
514 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
515
516 for (int i = 0; i <= AvFILL (av); i++)
517 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
518 }
222 519
223 va_start (ap, htype); 520 swap (perl_environ, environ);
224 521
225 ENTER; 522 bool event_consumed;
226 SAVETMPS;
227 523
228 PUSHMARK (SP); 524 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
229 525 || term->perl.should_invoke [htype])
230 XPUSHs (sv_2mortal (newSVterm (term))); 526 try
231 XPUSHs (sv_2mortal (newSViv (htype)));
232
233 for (;;) {
234 data_type dt = (data_type)va_arg (ap, int);
235
236 switch (dt)
237 { 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 {
238 case DT_INT: 546 case DT_INT:
239 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 547 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
240 break; 548 break;
241 549
242 case DT_LONG: 550 case DT_LONG:
243 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 551 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
244 break; 552 break;
245 553
246 case DT_STRING: 554 case DT_STR:
247 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 555 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
556 break;
557
558 case DT_STR_LEN:
559 {
560 char *str = va_arg (ap, char *);
561 int len = va_arg (ap, int);
562
563 printf ("pushing str %p:%d\n", str,len);//D
564 XPUSHs (sv_2mortal (newSVpvn (str, len)));
565 }
566 break;
567
568 case DT_WCS_LEN:
569 {
570 wchar_t *wstr = va_arg (ap, wchar_t *);
571 int wlen = va_arg (ap, int);
572
573 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
574 }
248 break; 575 break;
249 576
577 case DT_LCS_LEN:
578 {
579 long *lstr = va_arg (ap, long *);
580 int llen = va_arg (ap, int);
581
582 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
583 }
584 break;
585
586 case DT_XEVENT:
587 {
588 XEvent *xe = va_arg (ap, XEvent *);
589 HV *hv = newHV ();
590
591# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
592# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
593# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
594# undef set
595
596 setiv (type, xe->type);
597 setiv (send_event, xe->xany.send_event);
598 setiv (serial, xe->xany.serial);
599
600 switch (xe->type)
601 {
602 case KeyPress:
603 case KeyRelease:
604 case ButtonPress:
605 case ButtonRelease:
606 case MotionNotify:
607 setuv (window, xe->xmotion.window);
608 setuv (root, xe->xmotion.root);
609 setuv (subwindow, xe->xmotion.subwindow);
610 setuv (time, xe->xmotion.time);
611 setiv (x, xe->xmotion.x);
612 setiv (y, xe->xmotion.y);
613 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
614 setiv (col, xe->xmotion.x / term->fwidth);
615 setiv (x_root, xe->xmotion.x_root);
616 setiv (y_root, xe->xmotion.y_root);
617 setuv (state, xe->xmotion.state);
618
619 switch (xe->type)
620 {
621 case KeyPress:
622 case KeyRelease:
623 setuv (keycode, xe->xkey.keycode);
624 break;
625
626 case ButtonPress:
627 case ButtonRelease:
628 setuv (button, xe->xbutton.button);
629 break;
630
631 case MotionNotify:
632 setiv (is_hint, xe->xmotion.is_hint);
633 break;
634 }
635
636 break;
637
638 case MapNotify:
639 case UnmapNotify:
640 case ConfigureNotify:
641 setuv (event, xe->xconfigure.event);
642 setuv (window, xe->xconfigure.window);
643
644 switch (xe->type)
645 {
646 case ConfigureNotify:
647 setiv (x, xe->xconfigure.x);
648 setiv (y, xe->xconfigure.y);
649 setiv (width, xe->xconfigure.width);
650 setiv (height, xe->xconfigure.height);
651 setuv (above, xe->xconfigure.above);
652 break;
653 }
654
655 break;
656
657 case PropertyNotify:
658 setuv (window, xe->xproperty.window);
659 setuv (atom, xe->xproperty.atom);
660 setuv (time, xe->xproperty.time);
661 setiv (state, xe->xproperty.state);
662 break;
663
664 case ClientMessage:
665 setuv (window, xe->xclient.window);
666 setuv (message_type, xe->xclient.message_type);
667 setuv (format, xe->xclient.format);
668 setuv (l0, xe->xclient.data.l[0]);
669 setuv (l1, xe->xclient.data.l[1]);
670 setuv (l2, xe->xclient.data.l[2]);
671 setuv (l3, xe->xclient.data.l[3]);
672 setuv (l4, xe->xclient.data.l[4]);
673 break;
674 }
675
676 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
677 }
678 break;
679
250 case DT_END: 680 case DT_END:
681 goto call;
682
683 default:
684 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
685 }
686 }
687
688 call:
689 va_end (ap);
690
691 PUTBACK;
692 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
693 SPAGAIN;
694
695 if (count)
251 { 696 {
252 va_end (ap);
253
254 PUTBACK;
255 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
256 SPAGAIN;
257
258 if (count)
259 {
260 SV *status = POPs; 697 SV *status = POPs;
261 count = SvTRUE (status); 698 count = SvTRUE (status);
262 }
263
264 PUTBACK;
265 FREETMPS;
266 LEAVE;
267
268 if (SvTRUE (ERRSV))
269 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
270
271 if (htype == HOOK_DESTROY)
272 {
273 // TODO: clear magic
274 hv_clear ((HV *)SvRV ((SV *)term->self));
275 SvREFCNT_dec ((SV *)term->self);
276 }
277
278 return count;
279 } 699 }
280 700
281 default: 701 PUTBACK;
282 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 702 FREETMPS;
703 LEAVE;
704
705 if (SvTRUE (ERRSV))
706 {
707 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
708 ungrab (term); // better lose the grab than the session
709 }
710
711 event_consumed = !!count;
283 } 712 }
713 catch (...)
714 {
715 swap (perl_environ, environ);
716 throw;
717 }
718 else
719 event_consumed = false;
720
721 // post-handling of some events
722 if (htype == HOOK_REFRESH_BEGIN)
723 {
724 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
725
726 for (int i = AvFILL (av); i >= 0; i--)
727 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
284 } 728 }
729 else if (htype == HOOK_DESTROY)
730 {
731 clearSVptr ((SV *)term->perl.self);
732 SvREFCNT_dec ((SV *)term->perl.self);
733
734 // don't allow further calls
735 term->perl.self = 0;
736 }
737
738 swap (perl_environ, environ);
739
740 return event_consumed;
285} 741}
286 742
287///////////////////////////////////////////////////////////////////////////// 743/////////////////////////////////////////////////////////////////////////////
288 744
289MODULE = urxvt PACKAGE = urxvt 745MODULE = urxvt PACKAGE = urxvt
290 746
291PROTOTYPES: ENABLE 747PROTOTYPES: ENABLE
292 748
293BOOT: 749BOOT:
294{ 750{
295# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0)) 751 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
752 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
753 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
754 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
755
296 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 756 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
297 set_hookname (INIT); 757# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
298 set_hookname (RESET); 758# include "hookinc.h"
299 set_hookname (START); 759# undef def
300 set_hookname (DESTROY);
301 set_hookname (SEL_BEGIN);
302 set_hookname (SEL_EXTEND);
303 set_hookname (SEL_MAKE);
304 set_hookname (SEL_GRAB);
305 set_hookname (FOCUS_IN);
306 set_hookname (FOCUS_OUT);
307 set_hookname (VIEW_CHANGE);
308 set_hookname (SCROLL_BACK);
309 set_hookname (TTY_ACTIVITY);
310 set_hookname (REFRESH_BEGIN);
311 set_hookname (REFRESH_END);
312 set_hookname (KEYBOARD_COMMAND);
313 760
314 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 761 HV *option = get_hv ("urxvt::OPTION", 1);
315} 762# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
763# define nodef(name)
764# include "optinc.h"
765# undef nodef
766# undef def
316 767
317void 768 HV *stash = gv_stashpv ("urxvt", 1);
318set_should_invoke (int htype, int value) 769 struct {
319 CODE: 770 const char *name;
320 rxvt_perl.should_invoke [htype] = value; 771 IV iv;
772 } *civ, const_iv[] = {
773# define const_iv(name) { # name, (IV)name }
774 const_iv (DEFAULT_RSTYLE),
775 const_iv (OVERLAY_RSTYLE),
776 const_iv (RS_Bold),
777 const_iv (RS_Italic),
778 const_iv (RS_Blink),
779 const_iv (RS_RVid),
780 const_iv (RS_Uline),
781
782 const_iv (CurrentTime),
783 const_iv (ShiftMask),
784 const_iv (LockMask),
785 const_iv (ControlMask),
786 const_iv (Mod1Mask),
787 const_iv (Mod2Mask),
788 const_iv (Mod3Mask),
789 const_iv (Mod4Mask),
790 const_iv (Mod5Mask),
791 const_iv (Button1Mask),
792 const_iv (Button2Mask),
793 const_iv (Button3Mask),
794 const_iv (Button4Mask),
795 const_iv (Button5Mask),
796 const_iv (AnyModifier),
797
798 const_iv (EVENT_NONE),
799 const_iv (EVENT_READ),
800 const_iv (EVENT_WRITE),
801
802 const_iv (NoEventMask),
803 const_iv (KeyPressMask),
804 const_iv (KeyReleaseMask),
805 const_iv (ButtonPressMask),
806 const_iv (ButtonReleaseMask),
807 const_iv (EnterWindowMask),
808 const_iv (LeaveWindowMask),
809 const_iv (PointerMotionMask),
810 const_iv (PointerMotionHintMask),
811 const_iv (Button1MotionMask),
812 const_iv (Button2MotionMask),
813 const_iv (Button3MotionMask),
814 const_iv (Button4MotionMask),
815 const_iv (Button5MotionMask),
816 const_iv (ButtonMotionMask),
817 const_iv (KeymapStateMask),
818 const_iv (ExposureMask),
819 const_iv (VisibilityChangeMask),
820 const_iv (StructureNotifyMask),
821 const_iv (ResizeRedirectMask),
822 const_iv (SubstructureNotifyMask),
823 const_iv (SubstructureRedirectMask),
824 const_iv (FocusChangeMask),
825 const_iv (PropertyChangeMask),
826 const_iv (ColormapChangeMask),
827 const_iv (OwnerGrabButtonMask),
828
829 const_iv (KeyPress),
830 const_iv (KeyRelease),
831 const_iv (ButtonPress),
832 const_iv (ButtonRelease),
833 const_iv (MotionNotify),
834 const_iv (EnterNotify),
835 const_iv (LeaveNotify),
836 const_iv (FocusIn),
837 const_iv (FocusOut),
838 const_iv (KeymapNotify),
839 const_iv (Expose),
840 const_iv (GraphicsExpose),
841 const_iv (NoExpose),
842 const_iv (VisibilityNotify),
843 const_iv (CreateNotify),
844 const_iv (DestroyNotify),
845 const_iv (UnmapNotify),
846 const_iv (MapNotify),
847 const_iv (MapRequest),
848 const_iv (ReparentNotify),
849 const_iv (ConfigureNotify),
850 const_iv (ConfigureRequest),
851 const_iv (GravityNotify),
852 const_iv (ResizeRequest),
853 const_iv (CirculateNotify),
854 const_iv (CirculateRequest),
855 const_iv (PropertyNotify),
856 const_iv (SelectionClear),
857 const_iv (SelectionRequest),
858 const_iv (SelectionNotify),
859 const_iv (ColormapNotify),
860 const_iv (ClientMessage),
861 const_iv (MappingNotify),
862# if ENABLE_XIM_ONTHESPOT
863 const_iv (XIMReverse),
864 const_iv (XIMUnderline),
865 const_iv (XIMHighlight),
866 const_iv (XIMPrimary),
867 const_iv (XIMSecondary),
868 const_iv (XIMTertiary),
869 const_iv (XIMVisibleToForward),
870 const_iv (XIMVisibleToBackword),
871 const_iv (XIMVisibleToCenter),
872# if 0
873 const_iv (XIMForwardChar),
874 const_iv (XIMBackwardChar),
875 const_iv (XIMForwardWord),
876 const_iv (XIMBackwardWord),
877 const_iv (XIMCaretUp),
878 const_iv (XIMCaretDown),
879 const_iv (XIMNextLine),
880 const_iv (XIMPreviousLine),
881 const_iv (XIMLineStart),
882 const_iv (XIMLineEnd),
883 const_iv (XIMAbsolutePosition),
884 const_iv (XIMDontChange),
885# endif
886# endif
887 };
888
889 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
890 civ-- > const_iv; )
891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
892}
321 893
322void 894void
323warn (const char *msg) 895warn (const char *msg)
324 CODE: 896 CODE:
325 rxvt_warn ("%s", msg); 897 rxvt_warn ("%s", msg);
326 898
327void 899void
328fatal (const char *msg) 900fatal (const char *msg)
329 CODE: 901 CODE:
330 rxvt_fatal ("%s", msg); 902 rxvt_fatal ("%s", msg);
903
904void
905_exit (int status)
331 906
332NV 907NV
333NOW () 908NOW ()
334 CODE: 909 CODE:
335 RETVAL = NOW; 910 RETVAL = NOW;
336 OUTPUT: 911 OUTPUT:
337 RETVAL 912 RETVAL
338 913
914int
915GET_BASEFG (int rend)
916 CODE:
917 RETVAL = GET_BASEFG (rend);
918 OUTPUT:
919 RETVAL
920
921int
922GET_BASEBG (int rend)
923 CODE:
924 RETVAL = GET_BASEBG (rend);
925 OUTPUT:
926 RETVAL
927
928int
929SET_FGCOLOR (int rend, int new_color)
930 CODE:
931 RETVAL = SET_FGCOLOR (rend, new_color);
932 OUTPUT:
933 RETVAL
934
935int
936SET_BGCOLOR (int rend, int new_color)
937 CODE:
938 RETVAL = SET_BGCOLOR (rend, new_color);
939 OUTPUT:
940 RETVAL
941
942int
943GET_CUSTOM (int rend)
944 CODE:
945 RETVAL = (rend && RS_customMask) >> RS_customShift;
946 OUTPUT:
947 RETVAL
948
949int
950SET_CUSTOM (int rend, int new_value)
951 CODE:
952{
953 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
954 croak ("custom value out of range, must be 0..%d", RS_customCount - 1);
955
956 RETVAL = (rend & ~RS_customMask)
957 | ((new_value << RS_customShift) & RS_customMask);
958}
959 OUTPUT:
960 RETVAL
961
339MODULE = urxvt PACKAGE = urxvt::term 962MODULE = urxvt PACKAGE = urxvt::term
963
964SV *
965_new (...)
966 CODE:
967{
968 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
969 croak ("first argument to urxvt::term->_new must be arrayref");
970
971 rxvt_term *term = new rxvt_term;
972
973 stringvec *argv = new stringvec;
974 stringvec *envv = new stringvec;
975
976 for (int i = 1; i < items; i++)
977 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
978
979 AV *env = (AV *)SvRV (ST (0));
980 for (int i = AvFILL (env) + 1; i--; )
981 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
982
983 envv->push_back (0);
984
985 bool success;
986
987 try
988 {
989 success = term->init (argv, envv);
990 }
991 catch (const class rxvt_failure_exception &e)
992 {
993 success = false;
994 }
995
996 if (!success)
997 {
998 term->destroy ();
999 croak ("error while initializing new terminal instance");
1000 }
1001
1002 RETVAL = term && term->perl.self
1003 ? newSVterm (term) : &PL_sv_undef;
1004}
1005 OUTPUT:
1006 RETVAL
1007
1008void
1009rxvt_term::destroy ()
1010
1011void
1012rxvt_term::set_should_invoke (int htype, int inc)
1013 CODE:
1014 THIS->perl.should_invoke [htype] += inc;
1015
1016void
1017rxvt_term::grab_button (int button, U32 modifiers)
1018 CODE:
1019 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
1020 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1021 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1022
1023bool
1024rxvt_term::grab (Time eventtime, int sync = 0)
1025 CODE:
1026{
1027 int mode = sync ? GrabModeSync : GrabModeAsync;
1028
1029 THIS->perl.grabtime = 0;
1030
1031 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
1032 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1033 mode, mode, None, GRAB_CURSOR, eventtime))
1034 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
1035 THIS->perl.grabtime = eventtime;
1036 else
1037 XUngrabPointer (THIS->display->display, eventtime);
1038
1039 RETVAL = !!THIS->perl.grabtime;
1040}
1041 OUTPUT:
1042 RETVAL
1043
1044void
1045rxvt_term::allow_events_async ()
1046 CODE:
1047 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
1048
1049void
1050rxvt_term::allow_events_sync ()
1051 CODE:
1052 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
1053
1054void
1055rxvt_term::allow_events_replay ()
1056 CODE:
1057 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
1058 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
1059
1060void
1061rxvt_term::ungrab ()
1062 CODE:
1063 ungrab (THIS);
340 1064
341int 1065int
342rxvt_term::strwidth (SV *str) 1066rxvt_term::strwidth (SV *str)
343 CODE: 1067 CODE:
344{ 1068{
380 1104
381 rxvt_push_locale (THIS->locale); 1105 rxvt_push_locale (THIS->locale);
382 wchar_t *wstr = rxvt_mbstowcs (data, len); 1106 wchar_t *wstr = rxvt_mbstowcs (data, len);
383 rxvt_pop_locale (); 1107 rxvt_pop_locale ();
384 1108
385 char *str = rxvt_wcstoutf8 (wstr); 1109 RETVAL = wcs2sv (wstr);
386 free (wstr); 1110 free (wstr);
1111}
1112 OUTPUT:
1113 RETVAL
387 1114
388 RETVAL = newSVpv (str, 0); 1115#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
389 SvUTF8_on (RETVAL); 1116
1117#define TERM_OFFSET_width TERM_OFFSET(width)
1118#define TERM_OFFSET_height TERM_OFFSET(height)
1119#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1120#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1121#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1122#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1123#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1124#define TERM_OFFSET_focus TERM_OFFSET(focus)
1125#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1126#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1127#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1128#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1129#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1130#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1131#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1132
1133int
1134rxvt_term::width ()
1135 ALIAS:
1136 width = TERM_OFFSET_width
1137 height = TERM_OFFSET_height
1138 fwidth = TERM_OFFSET_fwidth
1139 fheight = TERM_OFFSET_fheight
1140 fbase = TERM_OFFSET_fbase
1141 nrow = TERM_OFFSET_nrow
1142 ncol = TERM_OFFSET_ncol
1143 focus = TERM_OFFSET_focus
1144 mapped = TERM_OFFSET_mapped
1145 int_bwidth = TERM_OFFSET_int_bwidth
1146 ext_bwidth = TERM_OFFSET_ext_bwidth
1147 lineSpace = TERM_OFFSET_lineSpace
1148 saveLines = TERM_OFFSET_saveLines
1149 total_rows = TERM_OFFSET_total_rows
1150 top_row = TERM_OFFSET_top_row
1151 CODE:
1152 RETVAL = *(int *)((char *)THIS + ix);
1153 OUTPUT:
1154 RETVAL
1155
1156unsigned int
1157rxvt_term::ModLevel3Mask ()
1158 ALIAS:
1159 ModLevel3Mask = 0
1160 ModMetaMask = 1
1161 ModNumLockMask = 2
1162 current_screen = 3
1163 hidden_cursor = 4
1164 CODE:
1165 switch (ix)
1166 {
1167 case 0: RETVAL = THIS->ModLevel3Mask; break;
1168 case 1: RETVAL = THIS->ModMetaMask; break;
1169 case 2: RETVAL = THIS->ModNumLockMask; break;
1170 case 3: RETVAL = THIS->current_screen; break;
1171 case 4: RETVAL = THIS->hidden_cursor; break;
1172 }
1173 OUTPUT:
1174 RETVAL
1175
1176char *
1177rxvt_term::display_id ()
1178 ALIAS:
1179 display_id = 0
1180 locale = 1
1181 CODE:
1182 switch (ix)
1183 {
1184 case 0: RETVAL = THIS->display->id; break;
1185 case 1: RETVAL = THIS->locale; break;
1186 }
1187 OUTPUT:
1188 RETVAL
1189
1190SV *
1191rxvt_term::_env ()
1192 CODE:
1193{
1194 if (THIS->envv)
1195 {
1196 AV *av = newAV ();
1197
1198 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1199 if (*i)
1200 av_push (av, newSVpv (*i, 0));
1201
1202 RETVAL = newRV_noinc ((SV *)av);
1203 }
1204 else
1205 RETVAL = &PL_sv_undef;
1206}
1207 OUTPUT:
1208 RETVAL
1209
1210int
1211rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1212 CODE:
1213 RETVAL = THIS->pty_ev.events;
1214 if (events != EVENT_UNDEF)
1215 THIS->pty_ev.set (events);
1216 OUTPUT:
1217 RETVAL
1218
1219int
1220rxvt_term::pty_fd ()
1221 CODE:
1222 RETVAL = THIS->pty->pty;
1223 OUTPUT:
1224 RETVAL
1225
1226Window
1227rxvt_term::parent ()
1228 CODE:
1229 RETVAL = THIS->parent [0];
1230 OUTPUT:
1231 RETVAL
1232
1233Window
1234rxvt_term::vt ()
1235 CODE:
1236 RETVAL = THIS->vt;
1237 OUTPUT:
1238 RETVAL
1239
1240void
1241rxvt_term::vt_emask_add (U32 emask)
1242 CODE:
1243 THIS->vt_emask_perl |= emask;
1244 THIS->vt_select_input ();
1245
1246U32
1247rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1248 CODE:
1249 RETVAL = THIS->rstyle;
1250 THIS->rstyle = new_rstyle;
1251 OUTPUT:
1252 RETVAL
1253
1254int
1255rxvt_term::view_start (int newval = 1)
1256 PROTOTYPE: $;$
1257 CODE:
1258{
1259 RETVAL = THIS->view_start;
1260
1261 if (newval <= 0)
1262 THIS->scr_changeview (max (newval, THIS->top_row));
1263}
1264 OUTPUT:
1265 RETVAL
1266
1267void
1268rxvt_term::focus_in ()
1269
1270void
1271rxvt_term::focus_out ()
1272
1273void
1274rxvt_term::want_refresh ()
1275 CODE:
1276 THIS->want_refresh = 1;
1277
1278void
1279rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1280 PPCODE:
1281{
1282 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1283 XSRETURN_EMPTY;
1284
1285 line_t &l = ROW(row_number);
1286
1287 if (GIMME_V != G_VOID)
1288 {
1289 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1290
1291 for (int col = 0; col < THIS->ncol; col++)
1292 wstr [col] = l.t [col];
1293
1294 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1295 }
1296
1297 if (new_text)
1298 {
1299 wchar_t *wstr = sv2wcs (new_text);
1300
1301 int len = min (wcslen (wstr) - start_ofs, max_len);
1302
1303 if (start_col < 0 || start_col + len > THIS->ncol)
1304 {
1305 free (wstr);
1306 croak ("new_text extends beyond horizontal margins");
1307 }
1308
1309 for (int col = start_col; col < start_col + len; col++)
1310 {
1311 l.t [col] = wstr [start_ofs + col - start_col];
1312 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
1313 }
1314
390 free (str); 1315 free (wstr);
1316 }
1317}
1318
1319void
1320rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1321 PPCODE:
1322{
1323 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1324 XSRETURN_EMPTY;
1325
1326 line_t &l = ROW(row_number);
1327
1328 if (GIMME_V != G_VOID)
1329 {
1330 AV *av = newAV ();
1331
1332 av_extend (av, THIS->ncol - 1);
1333 for (int col = 0; col < THIS->ncol; col++)
1334 av_store (av, col, newSViv (l.r [col]));
1335
1336 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1337 }
1338
1339 if (new_rend)
1340 {
1341 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1342 croak ("new_rend must be arrayref");
1343
1344 AV *av = (AV *)SvRV (new_rend);
1345 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1346
1347 if (start_col < 0 || start_col + len > THIS->ncol)
1348 croak ("new_rend array extends beyond horizontal margins");
1349
1350 for (int col = start_col; col < start_col + len; col++)
1351 {
1352 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1353
1354 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
1355 }
1356 }
1357}
1358
1359int
1360rxvt_term::ROW_l (int row_number, int new_length = -1)
1361 CODE:
1362{
1363 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1364 XSRETURN_EMPTY;
1365
1366 line_t &l = ROW(row_number);
1367 RETVAL = l.l;
1368
1369 if (new_length >= 0)
1370 l.l = new_length;
1371}
1372 OUTPUT:
1373 RETVAL
1374
1375bool
1376rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1377 CODE:
1378{
1379 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1380 XSRETURN_EMPTY;
1381
1382 line_t &l = ROW(row_number);
1383 RETVAL = l.is_longer ();
1384
1385 if (new_is_longer >= 0)
1386 l.is_longer (new_is_longer);
1387}
1388 OUTPUT:
1389 RETVAL
1390
1391SV *
1392rxvt_term::special_encode (SV *string)
1393 CODE:
1394{
1395 wchar_t *wstr = sv2wcs (string);
1396 int wlen = wcslen (wstr);
1397 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1398
1399 rxvt_push_locale (THIS->locale);
1400
1401 wchar_t *r = rstr;
1402 for (wchar_t *s = wstr; *s; s++)
1403 {
1404 int w = WCWIDTH (*s);
1405
1406 if (w == 0)
1407 {
1408 if (r == rstr)
1409 croak ("leading combining character unencodable");
1410
1411 unicode_t n = rxvt_compose (r[-1], *s);
1412 if (n == NOCHAR)
1413 n = rxvt_composite.compose (r[-1], *s);
1414
1415 r[-1] = n;
1416 }
1417#if !UNICODE_3
1418 else if (*s >= 0x10000)
1419 *r++ = rxvt_composite.compose (*s);
1420#endif
1421 else
1422 *r++ = *s;
1423
1424 // the *2 above only allows wcwidth <= 2
1425 if (w > 1)
1426 *r++ = NOCHAR;
1427 }
1428
1429 rxvt_pop_locale ();
1430
1431 RETVAL = wcs2sv (rstr, r - rstr);
1432}
1433 OUTPUT:
1434 RETVAL
1435
1436SV *
1437rxvt_term::special_decode (SV *text)
1438 CODE:
1439{
1440 wchar_t *wstr = sv2wcs (text);
1441 int wlen = wcslen (wstr);
1442 int dlen = 0;
1443
1444 // find length
1445 for (wchar_t *s = wstr; *s; s++)
1446 if (*s == NOCHAR)
1447 ;
1448 else if (IS_COMPOSE (*s))
1449 dlen += rxvt_composite.expand (*s, 0);
1450 else
1451 dlen++;
1452
1453 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1454
1455 // decode
1456 wchar_t *r = rstr;
1457 for (wchar_t *s = wstr; *s; s++)
1458 if (*s == NOCHAR)
1459 ;
1460 else if (IS_COMPOSE (*s))
1461 r += rxvt_composite.expand (*s, r);
1462 else
1463 *r++ = *s;
1464
1465 RETVAL = wcs2sv (rstr, r - rstr);
391} 1466}
392 OUTPUT: 1467 OUTPUT:
393 RETVAL 1468 RETVAL
394 1469
395void 1470void
396rxvt_term::_resource (char *name, int index, SV *newval = 0) 1471rxvt_term::_resource (char *name, int index, SV *newval = 0)
397 PPCODE: 1472 PPCODE:
398{ 1473{
399 struct resval { const char *name; int value; } rslist [] = { 1474 struct resval { const char *name; int value; } rslist [] = {
400# define Rs_def(name) { # name, Rs_ ## name }, 1475# define def(name) { # name, Rs_ ## name },
401# define Rs_reserve(name,count) 1476# define reserve(name,count)
402# include "rsinc.h" 1477# include "rsinc.h"
403# undef Rs_def 1478# undef def
404# undef Rs_reserve 1479# undef reserve
405 }; 1480 };
406 1481
407 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1482 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
408 1483
409 do { 1484 do {
430 else 1505 else
431 THIS->rs [index] = 0; 1506 THIS->rs [index] = 0;
432 } 1507 }
433} 1508}
434 1509
1510const char *
1511rxvt_term::x_resource (const char *name)
1512
1513bool
1514rxvt_term::option (U32 optval, int set = -1)
1515 CODE:
1516{
1517 RETVAL = THIS->options & optval;
1518
1519 if (set >= 0)
1520 {
1521 if (set)
1522 THIS->options |= optval;
1523 else
1524 THIS->options &= ~optval;
1525
1526 if (THIS->check_ev.is_active ()) // avoid doing this before START
1527 switch (optval)
1528 {
1529 case Opt_skipBuiltinGlyphs:
1530 THIS->set_fonts ();
1531 THIS->scr_remap_chars ();
1532 THIS->scr_touch (true);
1533 THIS->want_refresh = 1;
1534 break;
1535
1536 case Opt_cursorUnderline:
1537 THIS->want_refresh = 1;
1538 break;
1539
1540# case Opt_scrollBar_floating:
1541# case Opt_scrollBar_right:
1542# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1543# break;
1544 }
1545 }
1546}
1547 OUTPUT:
1548 RETVAL
1549
1550bool
1551rxvt_term::parse_keysym (char *keysym, char *str)
1552 CODE:
1553 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1554 THIS->keyboard->register_done ();
1555 OUTPUT:
1556 RETVAL
1557
435void 1558void
436rxvt_term::selection_mark (...) 1559rxvt_term::screen_cur (...)
437 PROTOTYPE: $;$$ 1560 PROTOTYPE: $;$$
438 ALIAS: 1561 ALIAS:
1562 screen_cur = 0
439 selection_beg = 1 1563 selection_beg = 1
440 selection_end = 2 1564 selection_end = 2
1565 selection_mark = 3
441 PPCODE: 1566 PPCODE:
442{ 1567{
443 row_col_t &sel = ix == 1 ? THIS->selection.beg 1568 row_col_t &rc = ix == 0 ? THIS->screen.cur
1569 : ix == 1 ? THIS->selection.beg
444 : ix == 2 ? THIS->selection.end 1570 : ix == 2 ? THIS->selection.end
445 : THIS->selection.mark; 1571 : THIS->selection.mark;
446 1572
447 if (GIMME_V != G_VOID) 1573 if (GIMME_V != G_VOID)
448 { 1574 {
449 EXTEND (SP, 2); 1575 EXTEND (SP, 2);
450 PUSHs (sv_2mortal (newSViv (sel.row))); 1576 PUSHs (sv_2mortal (newSViv (rc.row)));
451 PUSHs (sv_2mortal (newSViv (sel.col))); 1577 PUSHs (sv_2mortal (newSViv (rc.col)));
452 } 1578 }
453 1579
454 if (items == 3) 1580 if (items == 3)
455 { 1581 {
456 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1582 rc.row = SvIV (ST (1));
457 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1583 rc.col = SvIV (ST (2));
1584
1585 if (ix == 2)
1586 {
1587 if (rc.col == 0)
1588 {
1589 // col == 0 means end of previous line
1590 rc.row--;
1591 rc.col = THIS->ncol;
1592 }
1593 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1594 && rc.col > ROW(rc.row).l)
1595 {
1596 // col >= length means while line and add newline
1597 rc.col = THIS->ncol;
1598 }
1599 }
1600
1601 clamp_it (rc.col, 0, THIS->ncol);
1602 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
458 1603
459 if (ix) 1604 if (ix)
460 THIS->want_refresh = 1; 1605 THIS->want_refresh = 1;
461 } 1606 }
462} 1607}
463 1608
1609char
1610rxvt_term::cur_charset ()
1611 CODE:
1612 RETVAL = THIS->charsets [THIS->screen.charset];
1613 OUTPUT:
1614 RETVAL
1615
1616void
1617rxvt_term::selection_clear ()
1618
1619void
1620rxvt_term::selection_make (Time eventtime, bool rect = false)
1621 CODE:
1622 THIS->selection.op = SELECTION_CONT;
1623 THIS->selection.rect = rect;
1624 THIS->selection_make (eventtime);
1625
464int 1626int
465rxvt_term::selection_grab (int eventtime) 1627rxvt_term::selection_grab (Time eventtime)
466 1628
467void 1629void
468rxvt_term::selection (SV *newtext = 0) 1630rxvt_term::selection (SV *newtext = 0)
469 PPCODE: 1631 PPCODE:
470{ 1632{
471 if (GIMME_V != G_VOID) 1633 if (GIMME_V != G_VOID)
472 { 1634 XPUSHs (THIS->selection.text
473 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1635 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
474 SV *sv = newSVpv (sel, 0); 1636 : &PL_sv_undef);
475 SvUTF8_on (sv);
476 free (sel);
477 XPUSHs (sv_2mortal (sv));
478 }
479 1637
480 if (newtext) 1638 if (newtext)
481 { 1639 {
482 free (THIS->selection.text); 1640 free (THIS->selection.text);
483 1641
484 THIS->selection.text = sv2wcs (newtext); 1642 THIS->selection.text = sv2wcs (newtext);
485 THIS->selection.len = wcslen (THIS->selection.text); 1643 THIS->selection.len = wcslen (THIS->selection.text);
486 } 1644 }
487} 1645}
488
489void
490rxvt_term::scr_overlay_new (int x, int y, int w, int h)
491 1646
492void 1647void
1648rxvt_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)
1649
1650void
1651rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1652
1653void
493rxvt_term::scr_overlay_off () 1654rxvt_term::scr_bell ()
494 1655
495void 1656void
496rxvt_term::scr_overlay_set_char (int x, int y, U32 text, U32 rend = OVERLAY_RSTYLE) 1657rxvt_term::scr_change_screen (int screen)
497 CODE:
498 THIS->scr_overlay_set (x, y, text, rend);
499 1658
500void 1659void
501rxvt_term::scr_overlay_set (int x, int y, SV *text) 1660rxvt_term::scr_add_lines (SV *string)
502 CODE: 1661 CODE:
503{ 1662{
504 wchar_t *wtext = sv2wcs (text); 1663 wchar_t *wstr = sv2wcs (string);
505 THIS->scr_overlay_set (x, y, wtext); 1664 THIS->scr_add_lines (wstr, wcslen (wstr));
506 free (wtext); 1665 free (wstr);
507} 1666}
508 1667
509void 1668void
510rxvt_term::tt_write (SV *octets) 1669rxvt_term::tt_write (SV *octets)
511 INIT: 1670 INIT:
512 STRLEN len; 1671 STRLEN len;
513 char *str = SvPVbyte (octets, len); 1672 char *str = SvPVbyte (octets, len);
514 C_ARGS: 1673 C_ARGS:
1674 str, len
1675
1676void
1677rxvt_term::cmd_parse (SV *octets)
1678 CODE:
1679{
1680 STRLEN len;
1681 char *str = SvPVbyte (octets, len);
1682
1683 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1684 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1685
1686 THIS->cmdbuf_ptr = str;
1687 THIS->cmdbuf_endp = str + len;
1688
1689 rxvt_push_locale (THIS->locale);
1690 THIS->cmd_parse ();
1691 rxvt_pop_locale ();
1692
1693 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1694 THIS->cmdbuf_endp = old_cmdbuf_endp;
1695}
1696
1697SV *
1698rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
1699 CODE:
1700{
1701 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
1702 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
1703 o->self = (HV *)SvRV (RETVAL);
1704}
1705 OUTPUT:
1706 RETVAL
1707
1708#############################################################################
1709# Various X Utility Functions
1710#############################################################################
1711
1712void
1713rxvt_term::XListProperties (Window window)
1714 PPCODE:
1715{
1716 int count;
1717 Atom *props = XListProperties (THIS->display->display, window, &count);
1718
1719 EXTEND (SP, count);
1720 while (count--)
1721 PUSHs (newSVuv ((U32)props [count]));
1722
1723 XFree (props);
1724}
1725
1726void
1727rxvt_term::XGetWindowProperty (Window window, Atom property)
1728 PPCODE:
1729{
1730 Atom type;
1731 int format;
1732 unsigned long nitems;
1733 unsigned long bytes_after;
515 (unsigned char *)str, len 1734 unsigned char *prop;
1735
1736 XGetWindowProperty (THIS->display->display, window, property,
1737 0, 1<<24, 0, AnyPropertyType,
1738 &type, &format, &nitems, &bytes_after, &prop);
1739
1740 if (type != None)
1741 {
1742 int elemsize = format == 16 ? sizeof (short)
1743 : format == 32 ? sizeof (long)
1744 : 1;
1745
1746 EXTEND (SP, 3);
1747 PUSHs (newSVuv ((U32)type));
1748 PUSHs (newSViv (format));
1749 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1750 XFree (prop);
1751 }
1752}
1753
1754void
1755rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1756 CODE:
1757{
1758 STRLEN len;
1759 char *data_ = SvPVbyte (data, len);
1760
1761 int elemsize = format == 16 ? sizeof (short)
1762 : format == 32 ? sizeof (long)
1763 : 1;
1764
1765 XChangeProperty (THIS->display->display, window, property,
1766 type, format, PropModeReplace,
1767 (unsigned char *)data_, len / elemsize);
1768 XSync (THIS->display->display, 0);
1769}
1770
1771Atom
1772XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1773 C_ARGS: term->display->display, atom_name, only_if_exists
1774
1775char *
1776XGetAtomName (rxvt_term *term, Atom atom)
1777 C_ARGS: term->display->display, atom
1778 CLEANUP:
1779 XFree (RETVAL);
1780
1781void
1782XDeleteProperty (rxvt_term *term, Window window, Atom property)
1783 C_ARGS: term->display->display, window, property
1784
1785Window
1786rxvt_term::DefaultRootWindow ()
1787 CODE:
1788 RETVAL = THIS->display->root;
1789 OUTPUT:
1790 RETVAL
1791
1792#if 0
1793
1794Window
1795XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1796 C_ARGS: term->display->display, (Window)parent,
1797 x, y, width, height, 0,
1798 term->pix_colors_focused[Color_border],
1799 term->pix_colors_focused[Color_border]
1800
1801#endif
1802
1803void
1804XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1805 C_ARGS: term->display->display, window, parent, x, y
1806
1807void
1808XMapWindow (rxvt_term *term, Window window)
1809 C_ARGS: term->display->display, window
1810
1811void
1812XUnmapWindow (rxvt_term *term, Window window)
1813 C_ARGS: term->display->display, window
1814
1815void
1816XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1817 C_ARGS: term->display->display, window, x, y, width, height
1818
1819void
1820rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1821 CODE:
1822{
1823 XWindowAttributes attr;
1824 XGetWindowAttributes (THIS->display->display, window, &attr);
1825 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1826}
1827
1828void
1829rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1830 PPCODE:
1831{
1832 int dx, dy;
1833 Window child;
1834
1835 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1836 {
1837 EXTEND (SP, 3);
1838 PUSHs (newSViv (dx));
1839 PUSHs (newSViv (dy));
1840 PUSHs (newSVuv (child));
1841 }
1842}
1843
1844#############################################################################
1845# urxvt::overlay
1846#############################################################################
1847
1848MODULE = urxvt PACKAGE = urxvt::overlay
1849
1850void
1851overlay::set (int x, int y, SV *text, SV *rend = 0)
1852
1853void
1854overlay::show ()
1855
1856void
1857overlay::hide ()
1858
1859void
1860overlay::DESTROY ()
1861
1862#############################################################################
1863# urxvt::watcher
1864#############################################################################
1865
1866MODULE = urxvt PACKAGE = urxvt::watcher
1867
1868CHAINED
1869perl_watcher::cb (SV *cb)
1870 CODE:
1871 THIS->cb (cb);
1872 OUTPUT:
1873 RETVAL
1874
1875#############################################################################
1876# urxvt::timer
1877#############################################################################
516 1878
517MODULE = urxvt PACKAGE = urxvt::timer 1879MODULE = urxvt PACKAGE = urxvt::timer
518 1880
519SV * 1881SV *
520timer::new () 1882timer::new ()
521 CODE: 1883 CODE:
522 timer *w = new timer; 1884 timer *w = new timer;
1885 w->start (NOW);
523 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1886 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
524 w->self = (HV *)SvRV (RETVAL); 1887 w->self = (HV *)SvRV (RETVAL);
525 OUTPUT:
526 RETVAL
527
528timer *
529timer::cb (SV *cb)
530 CODE:
531 THIS->cb (cb);
532 RETVAL = THIS;
533 OUTPUT: 1888 OUTPUT:
534 RETVAL 1889 RETVAL
535 1890
536NV 1891NV
537timer::at () 1892timer::at ()
538 CODE: 1893 CODE:
539 RETVAL = THIS->at; 1894 RETVAL = THIS->at;
540 OUTPUT: 1895 OUTPUT:
541 RETVAL 1896 RETVAL
542 1897
543timer * 1898CHAINED
1899timer::interval (NV interval)
1900 CODE:
1901 THIS->interval = interval;
1902 OUTPUT:
1903 RETVAL
1904
1905CHAINED
544timer::set (NV tstamp) 1906timer::set (NV tstamp)
545 CODE: 1907 CODE:
546 THIS->set (tstamp); 1908 THIS->set (tstamp);
1909 OUTPUT:
547 RETVAL = THIS; 1910 RETVAL
548 OUTPUT:
549 RETVAL
550 1911
551timer * 1912CHAINED
552timer::start (NV tstamp = THIS->at) 1913timer::start (NV tstamp = THIS->at)
553 CODE: 1914 CODE:
554 THIS->start (tstamp); 1915 THIS->start (tstamp);
1916 OUTPUT:
555 RETVAL = THIS; 1917 RETVAL
556 OUTPUT:
557 RETVAL
558 1918
559timer * 1919CHAINED
1920timer::after (NV delay)
1921 CODE:
1922 THIS->start (NOW + delay);
1923 OUTPUT:
1924 RETVAL
1925
1926CHAINED
560timer::stop () 1927timer::stop ()
561 CODE: 1928 CODE:
562 THIS->stop (); 1929 THIS->stop ();
563 RETVAL = THIS;
564 OUTPUT: 1930 OUTPUT:
565 RETVAL 1931 RETVAL
566 1932
567void 1933void
568timer::DESTROY () 1934timer::DESTROY ()
1935
1936#############################################################################
1937# urxvt::iow
1938#############################################################################
569 1939
570MODULE = urxvt PACKAGE = urxvt::iow 1940MODULE = urxvt PACKAGE = urxvt::iow
571 1941
572SV * 1942SV *
573iow::new () 1943iow::new ()
574 CODE: 1944 CODE:
575 iow *w = new iow; 1945 iow *w = new iow;
576 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1946 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
577 w->self = (HV *)SvRV (RETVAL); 1947 w->self = (HV *)SvRV (RETVAL);
578 OUTPUT: 1948 OUTPUT:
579 RETVAL 1949 RETVAL
580 1950
581iow * 1951CHAINED
582iow::cb (SV *cb)
583 CODE:
584 THIS->cb (cb);
585 RETVAL = THIS;
586 OUTPUT:
587 RETVAL
588
589iow *
590iow::fd (int fd) 1952iow::fd (int fd)
591 CODE: 1953 CODE:
592 THIS->fd = fd; 1954 THIS->fd = fd;
1955 OUTPUT:
593 RETVAL = THIS; 1956 RETVAL
594 OUTPUT:
595 RETVAL
596 1957
597iow * 1958CHAINED
598iow::events (short events) 1959iow::events (short events)
599 CODE: 1960 CODE:
600 THIS->events = events; 1961 THIS->events = events;
1962 OUTPUT:
601 RETVAL = THIS; 1963 RETVAL
602 OUTPUT:
603 RETVAL
604 1964
605iow * 1965CHAINED
606iow::start () 1966iow::start ()
607 CODE: 1967 CODE:
608 THIS->start (); 1968 THIS->start ();
1969 OUTPUT:
609 RETVAL = THIS; 1970 RETVAL
610 OUTPUT:
611 RETVAL
612 1971
613iow * 1972CHAINED
614iow::stop () 1973iow::stop ()
615 CODE: 1974 CODE:
616 THIS->stop (); 1975 THIS->stop ();
617 RETVAL = THIS;
618 OUTPUT: 1976 OUTPUT:
619 RETVAL 1977 RETVAL
620 1978
621void 1979void
622iow::DESTROY () 1980iow::DESTROY ()
623 1981
1982#############################################################################
1983# urxvt::iw
1984#############################################################################
624 1985
1986MODULE = urxvt PACKAGE = urxvt::iw
1987
1988SV *
1989iw::new ()
1990 CODE:
1991 iw *w = new iw;
1992 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1993 w->self = (HV *)SvRV (RETVAL);
1994 OUTPUT:
1995 RETVAL
1996
1997CHAINED
1998iw::start ()
1999 CODE:
2000 THIS->start ();
2001 OUTPUT:
2002 RETVAL
2003
2004CHAINED
2005iw::stop ()
2006 CODE:
2007 THIS->stop ();
2008 OUTPUT:
2009 RETVAL
2010
2011void
2012iw::DESTROY ()
2013
2014#############################################################################
2015# urxvt::pw
2016#############################################################################
2017
2018MODULE = urxvt PACKAGE = urxvt::pw
2019
2020SV *
2021pw::new ()
2022 CODE:
2023 pw *w = new pw;
2024 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2025 w->self = (HV *)SvRV (RETVAL);
2026 OUTPUT:
2027 RETVAL
2028
2029CHAINED
2030pw::start (int pid)
2031 CODE:
2032 THIS->start (pid);
2033 OUTPUT:
2034 RETVAL
2035
2036CHAINED
2037pw::stop ()
2038 CODE:
2039 THIS->stop ();
2040 OUTPUT:
2041 RETVAL
2042
2043void
2044pw::DESTROY ()
2045
2046

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines