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.72 by root, Wed Jan 18 08:33:34 2006 UTC vs.
Revision 1.125 by root, Fri Aug 22 15:36:45 2008 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 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.
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h" 34#include "unistd.h"
35 35
36#include "iom.h" 36#include "ev_cpp.h"
37#include "rxvt.h" 37#include "rxvt.h"
38#include "keyboard.h" 38#include "keyboard.h"
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 44#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 45
50#undef LINENO 46#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 47#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 48#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 49#define ROW(n) THIS->row_buf [LINENO (n)]
54 50
55#define ENABLE_PERL_FRILLS 1
56
57///////////////////////////////////////////////////////////////////////////// 51/////////////////////////////////////////////////////////////////////////////
58 52
59static wchar_t * 53static wchar_t *
60sv2wcs (SV *sv) 54sv2wcs (SV *sv)
61{ 55{
75 69
76 return sv; 70 return sv;
77} 71}
78 72
79static SV * 73static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85//TODO: use magic
86static SV *
87newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
88{ 75{
89 HV *hv = newHV (); 76 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 100 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 101
115 return (long)mg->mg_ptr; 102 return (long)mg->mg_ptr;
116} 103}
117 104
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 105#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 106#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 107
121///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
122 109
123struct perl_watcher
124{
125 SV *cbsv;
126 HV *self;
127
128 perl_watcher ()
129 : cbsv (newSV (0))
130 {
131 }
132
133 ~perl_watcher ()
134 {
135 SvREFCNT_dec (cbsv);
136 }
137
138 void cb (SV *cb)
139 {
140 sv_setsv (cbsv, cb);
141 }
142
143 void invoke (const char *type, SV *self, int arg = -1);
144};
145
146void
147perl_watcher::invoke (const char *type, SV *self, int arg)
148{
149 dSP;
150
151 ENTER;
152 SAVETMPS;
153
154 PUSHMARK (SP);
155
156 XPUSHs (sv_2mortal (self));
157
158 if (arg >= 0)
159 XPUSHs (sv_2mortal (newSViv (arg)));
160
161 PUTBACK;
162 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
163 SPAGAIN;
164
165 PUTBACK;
166 FREETMPS;
167 LEAVE;
168
169 if (SvTRUE (ERRSV))
170 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
171}
172
173#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
174#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
175
176struct timer : time_watcher, perl_watcher
177{
178 tstamp interval;
179
180 timer ()
181 : time_watcher (this, &timer::execute)
182 {
183 }
184
185 void execute (time_watcher &w)
186 {
187 if (interval)
188 start (at + interval);
189
190 invoke ("urxvt::timer", newSVtimer (this));
191 }
192};
193
194#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
195#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow")
196
197struct iow : io_watcher, perl_watcher
198{
199 iow ()
200 : io_watcher (this, &iow::execute)
201 {
202 }
203
204 void execute (io_watcher &w, short revents)
205 {
206 invoke ("urxvt::iow", newSViow (this), revents);
207 }
208};
209
210/////////////////////////////////////////////////////////////////////////////
211
212#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
213 111
214struct overlay { 112class overlay {
215 HV *self;
216 rxvt_term *THIS; 113 rxvt_term *THIS;
114 AV *overlay_av;
217 int x, y, w, h; 115 int x, y, w, h;
218 int border; 116 int border;
219 text_t **text; 117 text_t **text;
220 rend_t **rend; 118 rend_t **rend;
221 119
120public:
121 HV *self;
122
222 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 123 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
223 ~overlay (); 124 ~overlay ();
224 125
225 void show (); 126 void show ();
226 void hide (); 127 void hide ();
229 130
230 void set (int x, int y, SV *str, SV *rend); 131 void set (int x, int y, SV *str, SV *rend);
231}; 132};
232 133
233overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
234: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) 135: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
235{ 136{
137 if (w < 0) w = 0;
138 if (h < 0) h = 0;
139
236 if (border == 2) 140 if (border == 2)
237 { 141 {
238 w += 2; 142 w += 2;
239 h += 2; 143 h += 2;
240 } 144 }
278 *rp++ = r; 182 *rp++ = r;
279 } 183 }
280 } 184 }
281 185
282 show (); 186 show ();
283 THIS->want_refresh = 1;
284} 187}
285 188
286overlay::~overlay () 189overlay::~overlay ()
287{ 190{
288 hide (); 191 hide ();
293 delete [] rend[y]; 196 delete [] rend[y];
294 } 197 }
295 198
296 delete [] text; 199 delete [] text;
297 delete [] rend; 200 delete [] rend;
201}
202
203void
204overlay::show ()
205{
206 if (overlay_av)
207 return;
208
209 overlay_av = (AV *)SvREFCNT_inc (SvRV (
210 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
211 ));
212 av_push (overlay_av, newSViv ((long)this));
298 213
299 THIS->want_refresh = 1; 214 THIS->want_refresh = 1;
300} 215 THIS->refresh_check ();
301
302void
303overlay::show ()
304{
305 char key[33]; sprintf (key, "%32lx", (long)this);
306
307 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
308 hv_store (hv, key, 32, newSViv ((long)this), 0);
309} 216}
310 217
311void 218void
312overlay::hide () 219overlay::hide ()
313{ 220{
314 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 221 if (!overlay_av)
222 return;
315 223
316 if (ovs) 224 int i;
317 {
318 char key[33]; sprintf (key, "%32lx", (long)this);
319 225
320 HV *hv = (HV *)SvRV (*ovs); 226 for (i = AvFILL (overlay_av); i >= 0; i--)
321 hv_delete (hv, key, 32, G_DISCARD); 227 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
322 } 228 break;
229
230 for (; i < AvFILL (overlay_av); i++)
231 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
232
233 av_pop (overlay_av);
234
235 SvREFCNT_dec (overlay_av);
236 overlay_av = 0;
237
238 THIS->want_refresh = 1;
239 THIS->refresh_check ();
323} 240}
324 241
325void overlay::swap () 242void overlay::swap ()
326{ 243{
327 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 244 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
367 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 284 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
368 croak ("rend must be arrayref"); 285 croak ("rend must be arrayref");
369 286
370 AV *av = (AV *)SvRV (rend); 287 AV *av = (AV *)SvRV (rend);
371 288
372 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 289 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
373 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 290 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
374 } 291 }
375 292
376 THIS->want_refresh = 1; 293 THIS->want_refresh = 1;
294 THIS->refresh_check ();
377} 295}
378 296
297/////////////////////////////////////////////////////////////////////////////
298
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h"
379 302
380///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
381 304
382struct rxvt_perl_interp rxvt_perl; 305struct rxvt_perl_interp rxvt_perl;
383 306
387{ 310{
388 if (perl) 311 if (perl)
389 { 312 {
390 perl_destruct (perl); 313 perl_destruct (perl);
391 perl_free (perl); 314 perl_free (perl);
315 PERL_SYS_TERM ();
392 } 316 }
393} 317}
394 318
395void 319void
396rxvt_perl_interp::init (rxvt_term *term) 320rxvt_perl_interp::init (rxvt_term *term)
400 rxvt_push_locale (""); // perl init destroys current locale 324 rxvt_push_locale (""); // perl init destroys current locale
401 325
402 perl_environ = rxvt_environ; 326 perl_environ = rxvt_environ;
403 swap (perl_environ, environ); 327 swap (perl_environ, environ);
404 328
405 char *argv[] = { 329 char *args[] = {
406 "", 330 "",
407 "-e" 331 "-e"
408 "BEGIN {" 332 "BEGIN {"
409 " urxvt->bootstrap;" 333 " urxvt->bootstrap;"
410 " unshift @INC, '" LIBDIR "';" 334 " unshift @INC, '" LIBDIR "';"
411 "}" 335 "}"
412 "" 336 ""
413 "use urxvt;" 337 "use urxvt;"
414 }; 338 };
339 int argc = sizeof (args) / sizeof (args[0]);
340 char **argv = args;
415 341
342 PERL_SYS_INIT3 (&argc, &argv, &environ);
416 perl = perl_alloc (); 343 perl = perl_alloc ();
417 perl_construct (perl); 344 perl_construct (perl);
418 345
419 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 346 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
420 || perl_run (perl)) 347 || perl_run (perl))
421 { 348 {
422 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 349 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
423 350
424 perl_destruct (perl); 351 perl_destruct (perl);
433 360
434 if (perl) 361 if (perl)
435 { 362 {
436 // runs outside of perls ENV 363 // runs outside of perls ENV
437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 364 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
438 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 365 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
439 } 366 }
440} 367}
441 368
442static void 369static void
443ungrab (rxvt_term *THIS) 370ungrab (rxvt_term *THIS)
444{ 371{
445 if (THIS->perl.grabtime) 372 if (THIS->perl.grabtime)
446 { 373 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 374 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 375 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 376 THIS->perl.grabtime = 0;
450 } 377 }
451} 378}
452 379
453static void
454swap_overlays (rxvt_term *term)
455{
456 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
457
458 if (HvKEYS (hv))
459 {
460 hv_iterinit (hv);
461
462 while (HE *he = hv_iternext (hv))
463 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
464 }
465}
466
467bool 380bool
468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 381rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
469{ 382{
470 if (!perl || !term->perl.self) 383 if (!perl || !term->perl.self)
471 return false; 384 return false;
472 385
473 // pre-handling of some events 386 // pre-handling of some events
474 if (htype == HOOK_REFRESH_END) 387 if (htype == HOOK_REFRESH_END)
475 swap_overlays (term); 388 {
389 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
390
391 for (int i = 0; i <= AvFILL (av); i++)
392 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
393 }
476 394
477 swap (perl_environ, environ); 395 swap (perl_environ, environ);
478 396
479 bool event_consumed; 397 bool event_consumed;
480 398
513 break; 431 break;
514 432
515 case DT_STR_LEN: 433 case DT_STR_LEN:
516 { 434 {
517 char *str = va_arg (ap, char *); 435 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int); 436 int len = va_arg (ap, int);
519 437
520 XPUSHs (sv_2mortal (newSVpvn (str, len))); 438 XPUSHs (sv_2mortal (newSVpvn (str, len)));
521 } 439 }
522 break; 440 break;
523 441
524 case DT_WCS_LEN: 442 case DT_WCS_LEN:
525 { 443 {
526 wchar_t *wstr = va_arg (ap, wchar_t *); 444 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int); 445 int wlen = va_arg (ap, int);
528 446
529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 447 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
448 }
449 break;
450
451 case DT_LCS_LEN:
452 {
453 long *lstr = va_arg (ap, long *);
454 int llen = va_arg (ap, int);
455
456 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
530 } 457 }
531 break; 458 break;
532 459
533 case DT_XEVENT: 460 case DT_XEVENT:
534 { 461 {
535 XEvent *xe = va_arg (ap, XEvent *); 462 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV (); 463 HV *hv = newHV ();
537 464
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 465# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 466# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
467# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
540# undef set 468# undef set
541 469
542 setiv (type, xe->type); 470 setiv (type, xe->type);
543 setiv (send_event, xe->xany.send_event); 471 setiv (send_event, xe->xany.send_event);
544 setiv (serial, xe->xany.serial); 472 setiv (serial, xe->xany.serial);
545 473
548 case KeyPress: 476 case KeyPress:
549 case KeyRelease: 477 case KeyRelease:
550 case ButtonPress: 478 case ButtonPress:
551 case ButtonRelease: 479 case ButtonRelease:
552 case MotionNotify: 480 case MotionNotify:
481 setuv (window, xe->xmotion.window);
482 setuv (root, xe->xmotion.root);
483 setuv (subwindow, xe->xmotion.subwindow);
553 setiv (time, xe->xmotion.time); 484 setuv (time, xe->xmotion.time);
554 setiv (x, xe->xmotion.x); 485 setiv (x, xe->xmotion.x);
555 setiv (y, xe->xmotion.y); 486 setiv (y, xe->xmotion.y);
556 setiv (row, xe->xmotion.y / term->fheight); 487 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
557 setiv (col, xe->xmotion.x / term->fwidth); 488 setiv (col, xe->xmotion.x / term->fwidth);
558 setiv (x_root, xe->xmotion.x_root); 489 setiv (x_root, xe->xmotion.x_root);
559 setiv (y_root, xe->xmotion.y_root); 490 setiv (y_root, xe->xmotion.y_root);
560 setiv (state, xe->xmotion.state); 491 setuv (state, xe->xmotion.state);
492
493 switch (xe->type)
494 {
495 case KeyPress:
496 case KeyRelease:
497 setuv (keycode, xe->xkey.keycode);
498 break;
499
500 case ButtonPress:
501 case ButtonRelease:
502 setuv (button, xe->xbutton.button);
503 break;
504
505 case MotionNotify:
506 setiv (is_hint, xe->xmotion.is_hint);
507 break;
508 }
509
561 break; 510 break;
562 }
563 511
512 case MapNotify:
513 case UnmapNotify:
514 case ConfigureNotify:
515 setuv (event, xe->xconfigure.event);
516 setuv (window, xe->xconfigure.window);
517
564 switch (xe->type) 518 switch (xe->type)
565 { 519 {
566 case KeyPress: 520 case ConfigureNotify:
567 case KeyRelease: 521 setiv (x, xe->xconfigure.x);
568 setiv (keycode, xe->xkey.keycode); 522 setiv (y, xe->xconfigure.y);
523 setiv (width, xe->xconfigure.width);
524 setiv (height, xe->xconfigure.height);
525 setuv (above, xe->xconfigure.above);
526 break;
527 }
528
569 break; 529 break;
570 530
571 case ButtonPress: 531 case PropertyNotify:
572 case ButtonRelease: 532 setuv (window, xe->xproperty.window);
573 setiv (button, xe->xbutton.button); 533 setuv (atom, xe->xproperty.atom);
534 setuv (time, xe->xproperty.time);
535 setiv (state, xe->xproperty.state);
574 break; 536 break;
575 537
576 case MotionNotify: 538 case ClientMessage:
577 setiv (is_hint, xe->xmotion.is_hint); 539 setuv (window, xe->xclient.window);
540 setuv (message_type, xe->xclient.message_type);
541 setuv (format, xe->xclient.format);
542 setuv (l0, xe->xclient.data.l[0]);
543 setuv (l1, xe->xclient.data.l[1]);
544 setuv (l2, xe->xclient.data.l[2]);
545 setuv (l3, xe->xclient.data.l[3]);
546 setuv (l4, xe->xclient.data.l[4]);
578 break; 547 break;
579 } 548 }
580 549
581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 550 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
582 } 551 }
623 else 592 else
624 event_consumed = false; 593 event_consumed = false;
625 594
626 // post-handling of some events 595 // post-handling of some events
627 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
628 swap_overlays (term); 597 {
598 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
599
600 for (int i = AvFILL (av); i >= 0; i--)
601 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
602 }
629 else if (htype == HOOK_DESTROY) 603 else if (htype == HOOK_DESTROY)
630 { 604 {
631 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
632 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
607
608 // don't allow further calls
609 term->perl.self = 0;
633 } 610 }
634 611
635 swap (perl_environ, environ); 612 swap (perl_environ, environ);
636 613
637 return event_consumed; 614 return event_consumed;
661# include "optinc.h" 638# include "optinc.h"
662# undef nodef 639# undef nodef
663# undef def 640# undef def
664 641
665 HV *stash = gv_stashpv ("urxvt", 1); 642 HV *stash = gv_stashpv ("urxvt", 1);
666 struct { 643 static const struct {
667 const char *name; 644 const char *name;
668 IV iv; 645 IV iv;
669 } *civ, const_iv[] = { 646 } *civ, const_iv[] = {
670# define const_iv(name) { # name, (IV)name } 647# define const_iv(name) { # name, (IV)name }
648 const_iv (NUM_RESOURCES),
671 const_iv (DEFAULT_RSTYLE), 649 const_iv (DEFAULT_RSTYLE),
672 const_iv (OVERLAY_RSTYLE), 650 const_iv (OVERLAY_RSTYLE),
673 const_iv (RS_Bold), 651 const_iv (RS_Bold),
674 const_iv (RS_Italic), 652 const_iv (RS_Italic),
675 const_iv (RS_Blink), 653 const_iv (RS_Blink),
690 const_iv (Button3Mask), 668 const_iv (Button3Mask),
691 const_iv (Button4Mask), 669 const_iv (Button4Mask),
692 const_iv (Button5Mask), 670 const_iv (Button5Mask),
693 const_iv (AnyModifier), 671 const_iv (AnyModifier),
694 672
695 const_iv (EVENT_NONE), 673 const_iv (NoSymbol),
696 const_iv (EVENT_READ), 674 const_iv (GrabModeSync),
697 const_iv (EVENT_WRITE), 675 const_iv (GrabModeAsync),
698 676
699 const_iv (NoEventMask), 677 const_iv (NoEventMask),
700 const_iv (KeyPressMask), 678 const_iv (KeyPressMask),
701 const_iv (KeyReleaseMask), 679 const_iv (KeyReleaseMask),
702 const_iv (ButtonPressMask), 680 const_iv (ButtonPressMask),
754 const_iv (SelectionRequest), 732 const_iv (SelectionRequest),
755 const_iv (SelectionNotify), 733 const_iv (SelectionNotify),
756 const_iv (ColormapNotify), 734 const_iv (ColormapNotify),
757 const_iv (ClientMessage), 735 const_iv (ClientMessage),
758 const_iv (MappingNotify), 736 const_iv (MappingNotify),
737# if ENABLE_XIM_ONTHESPOT
738 const_iv (XIMReverse),
739 const_iv (XIMUnderline),
740 const_iv (XIMHighlight),
741 const_iv (XIMPrimary),
742 const_iv (XIMSecondary),
743 const_iv (XIMTertiary),
744 const_iv (XIMVisibleToForward),
745 const_iv (XIMVisibleToBackword),
746 const_iv (XIMVisibleToCenter),
747# if 0
748 const_iv (XIMForwardChar),
749 const_iv (XIMBackwardChar),
750 const_iv (XIMForwardWord),
751 const_iv (XIMBackwardWord),
752 const_iv (XIMCaretUp),
753 const_iv (XIMCaretDown),
754 const_iv (XIMNextLine),
755 const_iv (XIMPreviousLine),
756 const_iv (XIMLineStart),
757 const_iv (XIMLineEnd),
758 const_iv (XIMAbsolutePosition),
759 const_iv (XIMDontChange),
760# endif
761# endif
759 }; 762 };
760 763
761 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 764 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
762 civ-- > const_iv; )
763 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 765 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
764} 766}
765 767
766void 768void
767warn (const char *msg) 769warn (const char *msg)
777_exit (int status) 779_exit (int status)
778 780
779NV 781NV
780NOW () 782NOW ()
781 CODE: 783 CODE:
782 RETVAL = NOW; 784 RETVAL = ev::now ();
783 OUTPUT: 785 OUTPUT:
784 RETVAL 786 RETVAL
785 787
786int 788int
787GET_BASEFG (int rend) 789GET_BASEFG (int rend)
798 RETVAL 800 RETVAL
799 801
800int 802int
801SET_FGCOLOR (int rend, int new_color) 803SET_FGCOLOR (int rend, int new_color)
802 CODE: 804 CODE:
803 RETVAL = SET_FGCOLOR (rend, new_color); 805 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
804 OUTPUT: 806 OUTPUT:
805 RETVAL 807 RETVAL
806 808
807int 809int
808SET_BGCOLOR (int rend, int new_color) 810SET_BGCOLOR (int rend, int new_color)
809 CODE: 811 CODE:
810 RETVAL = SET_BGCOLOR (rend, new_color); 812 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
811 OUTPUT: 813 OUTPUT:
812 RETVAL 814 RETVAL
813 815
814int 816int
815GET_CUSTOM (int rend) 817GET_CUSTOM (int rend)
816 CODE: 818 CODE:
817 RETVAL = (rend && RS_customMask) >> RS_customShift; 819 RETVAL = (rend & RS_customMask) >> RS_customShift;
818 OUTPUT: 820 OUTPUT:
819 RETVAL 821 RETVAL
820 822
821int 823int
822SET_CUSTOM (int rend, int new_value) 824SET_CUSTOM (int rend, int new_value)
829 | ((new_value << RS_customShift) & RS_customMask); 831 | ((new_value << RS_customShift) & RS_customMask);
830} 832}
831 OUTPUT: 833 OUTPUT:
832 RETVAL 834 RETVAL
833 835
836void
837termlist ()
838 PPCODE:
839{
840 EXTEND (SP, rxvt_term::termlist.size ());
841
842 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
843 if ((*t)->perl.self)
844 PUSHs (sv_2mortal (newSVterm (*t)));
845}
846
834MODULE = urxvt PACKAGE = urxvt::term 847MODULE = urxvt PACKAGE = urxvt::term
835 848
836SV * 849SV *
837_new (...) 850_new (AV *env, AV *arg)
838 CODE: 851 CODE:
839{ 852{
840 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
841 croak ("first argument to urxvt::term->_new must be arrayref");
842
843 rxvt_term *term = new rxvt_term; 853 rxvt_term *term = new rxvt_term;
844 854
845 term->argv = new stringvec; 855 stringvec *argv = new stringvec;
846 term->envv = new stringvec; 856 stringvec *envv = new stringvec;
847 857
848 for (int i = 1; i < items; i++) 858 for (int i = 0; i <= AvFILL (arg); i++)
849 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 859 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
850 860
851 AV *envv = (AV *)SvRV (ST (0));
852 for (int i = av_len (envv) + 1; i--; ) 861 for (int i = AvFILL (env) + 1; i--; )
853 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 862 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
854 863
855 term->envv->push_back (0); 864 envv->push_back (0);
856
857 bool success;
858 865
859 try 866 try
860 { 867 {
861 success = term->init (term->argv->size (), term->argv->begin ()); 868 term->init (argv, envv);
862 } 869 }
863 catch (const class rxvt_failure_exception &e) 870 catch (const class rxvt_failure_exception &e)
864 {
865 success = false;
866 }
867
868 if (!success)
869 { 871 {
870 term->destroy (); 872 term->destroy ();
871 croak ("error while initializing new terminal instance"); 873 croak ("error while initializing new terminal instance");
872 } 874 }
873 875
878 RETVAL 880 RETVAL
879 881
880void 882void
881rxvt_term::destroy () 883rxvt_term::destroy ()
882 884
883#if ENABLE_PERL_FRILLS
884
885void
886rxvt_term::XListProperties (U32 window)
887 PPCODE:
888{
889 int count;
890 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
891
892 EXTEND (SP, count);
893 while (count--)
894 PUSHs (newSVuv ((U32)props [count]));
895
896 XFree (props);
897}
898
899void
900rxvt_term::XGetWindowProperty (U32 window, U32 property)
901 PPCODE:
902{
903 Atom type;
904 int format;
905 unsigned long nitems;
906 unsigned long bytes_after;
907 unsigned char *prop;
908 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
909 0, 1<<30, 0, AnyPropertyType,
910 &type, &format, &nitems, &bytes_after, &prop);
911 if (type != None)
912 {
913 EXTEND (SP, 3);
914 PUSHs (newSVuv ((U32)type));
915 PUSHs (newSViv (format));
916 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
917 XFree (prop);
918 }
919}
920
921void
922rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
923 CODE:
924{
925 STRLEN len;
926 char *data_ = SvPVbyte (data, len);
927
928 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
929 type, format, PropModeReplace,
930 (unsigned char *)data, len * 8 / format);
931}
932
933void
934rxvt_term::XDeleteProperty (U32 window, U32 property)
935 CODE:
936 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
937
938U32
939rxvt_term::DefaultRootWindow ()
940 CODE:
941 RETVAL = (U32)THIS->display->root;
942 OUTPUT:
943 RETVAL
944
945U32
946rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
947 CODE:
948 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
949 x, y, width, height, 0,
950 THIS->pix_colors_focused[Color_border],
951 THIS->pix_colors_focused[Color_border]);
952 OUTPUT:
953 RETVAL
954
955void
956rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
957 CODE:
958 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
959
960void
961rxvt_term::XMapWindow (U32 window)
962 CODE:
963 XMapWindow (THIS->display->display, (Window)window);
964
965void
966rxvt_term::XUnmapWindow (U32 window)
967 CODE:
968 XUnmapWindow (THIS->display->display, (Window)window);
969
970#endif
971
972void 885void
973rxvt_term::set_should_invoke (int htype, int inc) 886rxvt_term::set_should_invoke (int htype, int inc)
974 CODE: 887 CODE:
975 THIS->perl.should_invoke [htype] += inc; 888 THIS->perl.should_invoke [htype] += inc;
976 889
977void 890int
978rxvt_term::grab_button (int button, U32 modifiers) 891rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
979 CODE: 892 CODE:
980 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 893 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
981 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 894 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
982 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 895 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
896 OUTPUT: RETVAL
897
898int
899rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
900 CODE:
901 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
902 OUTPUT: RETVAL
903
904void
905rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
906 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
907 CODE:
908 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
909
910void
911rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
912 CODE:
913 XUngrabKey (THIS->dpy, keycode, modifiers, window);
914
915void
916rxvt_term::XUngrabKeyboard (Time eventtime)
917 CODE:
918 XUngrabKeyboard (THIS->dpy, eventtime);
983 919
984bool 920bool
985rxvt_term::grab (U32 eventtime, int sync = 0) 921rxvt_term::grab (Time eventtime, int sync = 0)
986 CODE: 922 CODE:
987{ 923{
988 int mode = sync ? GrabModeSync : GrabModeAsync; 924 int mode = sync ? GrabModeSync : GrabModeAsync;
989 925
990 THIS->perl.grabtime = 0; 926 THIS->perl.grabtime = 0;
991 927
992 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 928 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
993 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 929 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
994 mode, mode, None, GRAB_CURSOR, eventtime)) 930 mode, mode, None, GRAB_CURSOR, eventtime))
995 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 931 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
996 THIS->perl.grabtime = eventtime; 932 THIS->perl.grabtime = eventtime;
997 else 933 else
998 XUngrabPointer (THIS->display->display, eventtime); 934 XUngrabPointer (THIS->dpy, eventtime);
999 935
1000 RETVAL = !!THIS->perl.grabtime; 936 RETVAL = !!THIS->perl.grabtime;
1001} 937}
1002 OUTPUT: 938 OUTPUT:
1003 RETVAL 939 RETVAL
1004 940
1005void 941void
1006rxvt_term::allow_events_async () 942rxvt_term::allow_events_async ()
1007 CODE: 943 CODE:
1008 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 944 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1009 945
1010void 946void
1011rxvt_term::allow_events_sync () 947rxvt_term::allow_events_sync ()
1012 CODE: 948 CODE:
1013 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 949 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1014 950
1015void 951void
1016rxvt_term::allow_events_replay () 952rxvt_term::allow_events_replay ()
1017 CODE: 953 CODE:
1018 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 954 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1019 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 955 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1020 956
1021void 957void
1022rxvt_term::ungrab () 958rxvt_term::ungrab ()
1023 CODE: 959 CODE:
1024 ungrab (THIS); 960 ungrab (THIS);
961
962int
963rxvt_term::XStringToKeysym (char *string)
964 CODE:
965 RETVAL = XStringToKeysym (string);
966 OUTPUT: RETVAL
967
968char *
969rxvt_term::XKeysymToString (int sym)
970 CODE:
971 RETVAL = XKeysymToString (sym);
972 OUTPUT: RETVAL
973
974int
975rxvt_term::XKeysymToKeycode (int sym)
976 CODE:
977 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
978 OUTPUT: RETVAL
979
980int
981rxvt_term::XKeycodeToKeysym (int code, int index)
982 CODE:
983 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
984 OUTPUT: RETVAL
1025 985
1026int 986int
1027rxvt_term::strwidth (SV *str) 987rxvt_term::strwidth (SV *str)
1028 CODE: 988 CODE:
1029{ 989{
1030 wchar_t *wstr = sv2wcs (str); 990 wchar_t *wstr = sv2wcs (str);
1031 991
1032 rxvt_push_locale (THIS->locale); 992 rxvt_push_locale (THIS->locale);
1033 RETVAL = wcswidth (wstr, wcslen (wstr)); 993 RETVAL = 0;
994 for (wchar_t *wc = wstr; *wc; wc++)
995 {
996 int w = WCWIDTH (*wc);
997
998 if (w)
999 RETVAL += max (w, 1);
1000 }
1034 rxvt_pop_locale (); 1001 rxvt_pop_locale ();
1035 1002
1036 free (wstr); 1003 free (wstr);
1037} 1004}
1038 OUTPUT: 1005 OUTPUT:
1068 rxvt_pop_locale (); 1035 rxvt_pop_locale ();
1069 1036
1070 RETVAL = wcs2sv (wstr); 1037 RETVAL = wcs2sv (wstr);
1071 free (wstr); 1038 free (wstr);
1072} 1039}
1040 OUTPUT:
1041 RETVAL
1042
1043char *
1044rxvt_term::locale ()
1045 CODE:
1046 RETVAL = THIS->locale;
1073 OUTPUT: 1047 OUTPUT:
1074 RETVAL 1048 RETVAL
1075 1049
1076#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1050#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1077 1051
1082#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1056#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1083#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1057#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1084#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1058#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1085#define TERM_OFFSET_focus TERM_OFFSET(focus) 1059#define TERM_OFFSET_focus TERM_OFFSET(focus)
1086#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1060#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1061#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1062#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1063#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1087#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1064#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1088#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1065#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1089#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1066#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1090 1067
1091int 1068int
1098 fbase = TERM_OFFSET_fbase 1075 fbase = TERM_OFFSET_fbase
1099 nrow = TERM_OFFSET_nrow 1076 nrow = TERM_OFFSET_nrow
1100 ncol = TERM_OFFSET_ncol 1077 ncol = TERM_OFFSET_ncol
1101 focus = TERM_OFFSET_focus 1078 focus = TERM_OFFSET_focus
1102 mapped = TERM_OFFSET_mapped 1079 mapped = TERM_OFFSET_mapped
1080 int_bwidth = TERM_OFFSET_int_bwidth
1081 ext_bwidth = TERM_OFFSET_ext_bwidth
1082 lineSpace = TERM_OFFSET_lineSpace
1103 saveLines = TERM_OFFSET_saveLines 1083 saveLines = TERM_OFFSET_saveLines
1104 total_rows = TERM_OFFSET_total_rows 1084 total_rows = TERM_OFFSET_total_rows
1105 top_row = TERM_OFFSET_top_row 1085 top_row = TERM_OFFSET_top_row
1106 CODE: 1086 CODE:
1107 RETVAL = *(int *)((char *)THIS + ix); 1087 RETVAL = *(int *)((char *)THIS + ix);
1112rxvt_term::ModLevel3Mask () 1092rxvt_term::ModLevel3Mask ()
1113 ALIAS: 1093 ALIAS:
1114 ModLevel3Mask = 0 1094 ModLevel3Mask = 0
1115 ModMetaMask = 1 1095 ModMetaMask = 1
1116 ModNumLockMask = 2 1096 ModNumLockMask = 2
1097 current_screen = 3
1098 hidden_cursor = 4
1117 CODE: 1099 CODE:
1118 switch (ix) 1100 switch (ix)
1119 { 1101 {
1120 case 0: RETVAL = THIS->ModLevel3Mask; break; 1102 case 0: RETVAL = THIS->ModLevel3Mask; break;
1121 case 1: RETVAL = THIS->ModMetaMask; break; 1103 case 1: RETVAL = THIS->ModMetaMask; break;
1122 case 2: RETVAL = THIS->ModNumLockMask; break; 1104 case 2: RETVAL = THIS->ModNumLockMask; break;
1105 case 3: RETVAL = THIS->current_screen; break;
1106#ifdef CURSOR_BLINK
1107 case 4: RETVAL = THIS->hidden_cursor; break;
1108#endif
1123 } 1109 }
1124 OUTPUT: 1110 OUTPUT:
1125 RETVAL 1111 RETVAL
1126 1112
1127char * 1113char *
1137 } 1123 }
1138 OUTPUT: 1124 OUTPUT:
1139 RETVAL 1125 RETVAL
1140 1126
1141SV * 1127SV *
1142rxvt_term::_env () 1128rxvt_term::envv ()
1129 ALIAS:
1130 argv = 1
1143 CODE: 1131 PPCODE:
1144{ 1132{
1145 if (THIS->envv) 1133 stringvec *vec = ix ? THIS->argv : THIS->envv;
1146 {
1147 AV *av = newAV ();
1148 1134
1135 EXTEND (SP, vec->size ());
1136
1149 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1137 for (char **i = vec->begin (); i != vec->end (); ++i)
1150 if (*i) 1138 if (*i)
1151 av_push (av, newSVpv (*i, 0)); 1139 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1152
1153 RETVAL = newRV_noinc ((SV *)av);
1154 }
1155 else
1156 RETVAL = &PL_sv_undef;
1157} 1140}
1158 OUTPUT:
1159 RETVAL
1160 1141
1161int 1142int
1162rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1143rxvt_term::pty_ev_events (int events = ev::UNDEF)
1163 CODE: 1144 CODE:
1164 RETVAL = THIS->pty_ev.events; 1145 RETVAL = THIS->pty_ev.events;
1165 if (events != EVENT_UNDEF) 1146 if (events != ev::UNDEF)
1166 THIS->pty_ev.set (events); 1147 THIS->pty_ev.set (events);
1167 OUTPUT: 1148 OUTPUT:
1168 RETVAL 1149 RETVAL
1169 1150
1170U32 1151int
1152rxvt_term::pty_fd ()
1153 CODE:
1154 RETVAL = THIS->pty->pty;
1155 OUTPUT:
1156 RETVAL
1157
1158Window
1171rxvt_term::parent () 1159rxvt_term::parent ()
1172 CODE: 1160 CODE:
1173 RETVAL = (U32)THIS->parent [0]; 1161 RETVAL = THIS->parent [0];
1174 OUTPUT: 1162 OUTPUT:
1175 RETVAL 1163 RETVAL
1176 1164
1177U32 1165Window
1178rxvt_term::vt () 1166rxvt_term::vt ()
1179 CODE: 1167 CODE:
1180 RETVAL = (U32)THIS->vt; 1168 RETVAL = THIS->vt;
1181 OUTPUT: 1169 OUTPUT:
1182 RETVAL 1170 RETVAL
1183 1171
1184void 1172void
1185rxvt_term::vt_emask_add (U32 emask) 1173rxvt_term::vt_emask_add (U32 emask)
1207} 1195}
1208 OUTPUT: 1196 OUTPUT:
1209 RETVAL 1197 RETVAL
1210 1198
1211void 1199void
1200rxvt_term::focus_in ()
1201
1202void
1203rxvt_term::focus_out ()
1204
1205void
1206rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1207 ALIAS:
1208 key_release = 1
1209 CODE:
1210{
1211 XKeyEvent xkey;
1212
1213 memset (&xkey, 0, sizeof (xkey));
1214
1215 xkey.time = time;
1216 xkey.state = state;
1217 xkey.keycode = keycode;
1218
1219 xkey.type = ix ? KeyRelease : KeyPress;
1220 xkey.display = THIS->dpy;
1221 xkey.window = THIS->vt;
1222 xkey.root = THIS->display->root;
1223 xkey.subwindow = THIS->vt;
1224
1225 if (ix)
1226 THIS->key_release (xkey);
1227 else
1228 THIS->key_press (xkey);
1229}
1230
1231void
1212rxvt_term::want_refresh () 1232rxvt_term::want_refresh ()
1213 CODE: 1233 CODE:
1214 THIS->want_refresh = 1; 1234 THIS->want_refresh = 1;
1235 THIS->refresh_check ();
1215 1236
1216void 1237void
1217rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1238rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1218 PPCODE: 1239 PPCODE:
1219{ 1240{
1222 1243
1223 line_t &l = ROW(row_number); 1244 line_t &l = ROW(row_number);
1224 1245
1225 if (GIMME_V != G_VOID) 1246 if (GIMME_V != G_VOID)
1226 { 1247 {
1227 wchar_t *wstr = new wchar_t [THIS->ncol]; 1248 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1228 1249
1229 for (int col = 0; col < THIS->ncol; col++) 1250 for (int col = 0; col < THIS->ncol; col++)
1230 wstr [col] = l.t [col]; 1251 wstr [col] = l.t [col];
1231 1252
1232 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1253 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1233
1234 delete [] wstr;
1235 } 1254 }
1236 1255
1237 if (new_text) 1256 if (new_text)
1238 { 1257 {
1239 wchar_t *wstr = sv2wcs (new_text); 1258 wchar_t *wstr = sv2wcs (new_text);
1240 1259
1241 int len = min (wcslen (wstr) - start_ofs, max_len); 1260 int len = min (wcslen (wstr) - start_ofs, max_len);
1242 1261
1243 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1262 if (start_col < 0 || start_col + len > THIS->ncol)
1244 { 1263 {
1245 free (wstr); 1264 free (wstr);
1246 croak ("new_text extends beyond horizontal margins"); 1265 croak ("new_text extends beyond horizontal margins");
1247 } 1266 }
1248 1267
1280 { 1299 {
1281 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1300 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1282 croak ("new_rend must be arrayref"); 1301 croak ("new_rend must be arrayref");
1283 1302
1284 AV *av = (AV *)SvRV (new_rend); 1303 AV *av = (AV *)SvRV (new_rend);
1285 int len = min (av_len (av) + 1 - start_ofs, max_len); 1304 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1286 1305
1287 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1306 if (start_col < 0 || start_col + len > THIS->ncol)
1288 croak ("new_rend array extends beyond horizontal margins"); 1307 croak ("new_rend array extends beyond horizontal margins");
1289 1308
1290 for (int col = start_col; col < start_col + len; col++) 1309 for (int col = start_col; col < start_col + len; col++)
1291 { 1310 {
1292 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1311 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1332rxvt_term::special_encode (SV *string) 1351rxvt_term::special_encode (SV *string)
1333 CODE: 1352 CODE:
1334{ 1353{
1335 wchar_t *wstr = sv2wcs (string); 1354 wchar_t *wstr = sv2wcs (string);
1336 int wlen = wcslen (wstr); 1355 int wlen = wcslen (wstr);
1337 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1356 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1338 1357
1339 rxvt_push_locale (THIS->locale); 1358 rxvt_push_locale (THIS->locale);
1340 1359
1341 wchar_t *r = rstr; 1360 wchar_t *r = rstr;
1342 for (wchar_t *s = wstr; *s; s++) 1361 for (wchar_t *s = wstr; *s; s++)
1362 {
1363 int w = WCWIDTH (*s);
1364
1343 if (wcwidth (*s) == 0) 1365 if (w == 0)
1344 { 1366 {
1345 if (r == rstr) 1367 if (r == rstr)
1346 croak ("leading combining character unencodable"); 1368 croak ("leading combining character unencodable");
1347 1369
1348 unicode_t n = rxvt_compose (r[-1], *s); 1370 unicode_t n = rxvt_compose (r[-1], *s);
1349 if (n == NOCHAR) 1371 if (n == NOCHAR)
1350 n = rxvt_composite.compose (r[-1], *s); 1372 n = rxvt_composite.compose (r[-1], *s);
1351 1373
1352 r[-1] = n; 1374 r[-1] = n;
1353 } 1375 }
1354#if !UNICODE_3 1376#if !UNICODE_3
1355 else if (*s >= 0x10000) 1377 else if (*s >= 0x10000)
1356 *r++ = rxvt_composite.compose (*s); 1378 *r++ = rxvt_composite.compose (*s);
1357#endif 1379#endif
1358 else 1380 else
1359 *r++ = *s; 1381 *r++ = *s;
1382
1383 // the *2 above only allows wcwidth <= 2
1384 if (w > 1)
1385 *r++ = NOCHAR;
1386 }
1360 1387
1361 rxvt_pop_locale (); 1388 rxvt_pop_locale ();
1362 1389
1363 RETVAL = wcs2sv (rstr, r - rstr); 1390 RETVAL = wcs2sv (rstr, r - rstr);
1364
1365 delete [] rstr;
1366} 1391}
1367 OUTPUT: 1392 OUTPUT:
1368 RETVAL 1393 RETVAL
1369 1394
1370SV * 1395SV *
1371rxvt_term::special_decode (SV *text) 1396rxvt_term::special_decode (SV *text)
1372 CODE: 1397 CODE:
1373{ 1398{
1374 wchar_t *wstr = sv2wcs (text); 1399 wchar_t *wstr = sv2wcs (text);
1375 int wlen = wcslen (wstr);
1376 int dlen = 0; 1400 int dlen = 0;
1377 1401
1378 // find length 1402 // find length
1379 for (wchar_t *s = wstr; *s; s++) 1403 for (wchar_t *s = wstr; *s; s++)
1380 if (*s == NOCHAR) 1404 if (*s == NOCHAR)
1382 else if (IS_COMPOSE (*s)) 1406 else if (IS_COMPOSE (*s))
1383 dlen += rxvt_composite.expand (*s, 0); 1407 dlen += rxvt_composite.expand (*s, 0);
1384 else 1408 else
1385 dlen++; 1409 dlen++;
1386 1410
1387 wchar_t *rstr = new wchar_t [dlen]; 1411 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1388 1412
1389 // decode 1413 // decode
1390 wchar_t *r = rstr; 1414 wchar_t *r = rstr;
1391 for (wchar_t *s = wstr; *s; s++) 1415 for (wchar_t *s = wstr; *s; s++)
1392 if (*s == NOCHAR) 1416 if (*s == NOCHAR)
1395 r += rxvt_composite.expand (*s, r); 1419 r += rxvt_composite.expand (*s, r);
1396 else 1420 else
1397 *r++ = *s; 1421 *r++ = *s;
1398 1422
1399 RETVAL = wcs2sv (rstr, r - rstr); 1423 RETVAL = wcs2sv (rstr, r - rstr);
1400
1401 delete [] rstr;
1402} 1424}
1403 OUTPUT: 1425 OUTPUT:
1404 RETVAL 1426 RETVAL
1405 1427
1406void 1428void
1407rxvt_term::_resource (char *name, int index, SV *newval = 0) 1429rxvt_term::_resource (char *name, int index, SV *newval = 0)
1408 PPCODE: 1430 PPCODE:
1409{ 1431{
1410 struct resval { const char *name; int value; } rslist [] = { 1432 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1411# define def(name) { # name, Rs_ ## name }, 1433# define def(name) { # name, Rs_ ## name },
1412# define reserve(name,count) 1434# define reserve(name,count)
1413# include "rsinc.h" 1435# include "rsinc.h"
1414# undef def 1436# undef def
1415# undef reserve 1437# undef reserve
1416 }; 1438 };
1417 1439
1418 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1440 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1419 1441
1442 if (*name)
1420 do { 1443 {
1444 do {
1421 if (rs-- == rslist) 1445 if (rs-- == rslist)
1422 croak ("no such resource '%s', requested", name); 1446 croak ("no such resource '%s', requested", name);
1423 } while (strcmp (name, rs->name)); 1447 } while (strcmp (name, rs->name));
1424 1448
1425 index += rs->value; 1449 index += rs->value;
1450 }
1451 else
1452 {
1453 --rs;
1454 name = "";
1455 }
1426 1456
1427 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1457 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1428 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1458 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1429 1459
1430 if (GIMME_V != G_VOID) 1460 if (GIMME_V != G_VOID)
1445 1475
1446const char * 1476const char *
1447rxvt_term::x_resource (const char *name) 1477rxvt_term::x_resource (const char *name)
1448 1478
1449bool 1479bool
1450rxvt_term::option (U32 optval, int set = -1) 1480rxvt_term::option (U8 optval, int set = -1)
1451 CODE: 1481 CODE:
1452{ 1482{
1453 RETVAL = THIS->options & optval; 1483 RETVAL = THIS->option (optval);
1454 1484
1455 if (set >= 0) 1485 if (set >= 0)
1456 { 1486 {
1457 if (set)
1458 THIS->options |= optval; 1487 THIS->set_option (optval, set);
1459 else
1460 THIS->options &= ~optval;
1461 1488
1489 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1462 switch (optval) 1490 switch (optval)
1463 { 1491 {
1464 case Opt_skipBuiltinGlyphs: 1492 case Opt_skipBuiltinGlyphs:
1465 THIS->set_fonts (); 1493 THIS->set_fonts ();
1466 THIS->scr_remap_chars (); 1494 THIS->scr_remap_chars ();
1467 THIS->scr_touch (true); 1495 THIS->scr_touch (true);
1468 THIS->want_refresh = 1; 1496 THIS->want_refresh = 1;
1497 THIS->refresh_check ();
1469 break; 1498 break;
1470 1499
1471 case Opt_cursorUnderline: 1500 case Opt_cursorUnderline:
1472 THIS->want_refresh = 1; 1501 THIS->want_refresh = 1;
1502 THIS->refresh_check ();
1473 break; 1503 break;
1474 1504
1475# case Opt_scrollBar_floating: 1505# case Opt_scrollBar_floating:
1476# case Opt_scrollBar_right: 1506# case Opt_scrollBar_right:
1477# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1507# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1478# break; 1508# break;
1479 } 1509 }
1480 } 1510 }
1481} 1511}
1482 OUTPUT: 1512 OUTPUT:
1483 RETVAL 1513 RETVAL
1484 1514
1512 PUSHs (sv_2mortal (newSViv (rc.col))); 1542 PUSHs (sv_2mortal (newSViv (rc.col)));
1513 } 1543 }
1514 1544
1515 if (items == 3) 1545 if (items == 3)
1516 { 1546 {
1547 rc.row = SvIV (ST (1));
1548 rc.col = SvIV (ST (2));
1549
1550 if (ix == 2)
1551 {
1552 if (rc.col == 0)
1553 {
1554 // col == 0 means end of previous line
1555 rc.row--;
1556 rc.col = THIS->ncol;
1557 }
1558 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1559 && rc.col > ROW(rc.row).l)
1560 {
1561 // col >= length means while line and add newline
1562 rc.col = THIS->ncol;
1563 }
1564 }
1565
1566 clamp_it (rc.col, 0, THIS->ncol);
1517 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); 1567 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1518 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1519 1568
1520 if (ix) 1569 if (ix)
1570 {
1521 THIS->want_refresh = 1; 1571 THIS->want_refresh = 1;
1572 THIS->refresh_check ();
1573 }
1522 } 1574 }
1523} 1575}
1524 1576
1525char 1577char
1526rxvt_term::cur_charset () 1578rxvt_term::cur_charset ()
1527 CODE: 1579 CODE:
1528 RETVAL = THIS->charsets [THIS->screen.charset]; 1580 RETVAL = THIS->charsets [THIS->screen.charset];
1529 OUTPUT: 1581 OUTPUT:
1530 RETVAL 1582 RETVAL
1531 1583
1532#void 1584void
1533#rxvt_term::selection_clear () 1585rxvt_term::selection_clear ()
1534 1586
1535void 1587void
1536rxvt_term::selection_make (U32 eventtime, bool rect = false) 1588rxvt_term::selection_make (Time eventtime, bool rect = false)
1537 CODE: 1589 CODE:
1538 THIS->selection.op = SELECTION_CONT; 1590 THIS->selection.op = SELECTION_CONT;
1539 THIS->selection.rect = rect; 1591 THIS->selection.rect = rect;
1540 THIS->selection_make (eventtime); 1592 THIS->selection_make (eventtime);
1541 1593
1542int 1594int
1543rxvt_term::selection_grab (U32 eventtime) 1595rxvt_term::selection_grab (Time eventtime)
1544 1596
1545void 1597void
1546rxvt_term::selection (SV *newtext = 0) 1598rxvt_term::selection (SV *newtext = 0)
1547 PPCODE: 1599 PPCODE:
1548{ 1600{
1566void 1618void
1567rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1619rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1568 1620
1569void 1621void
1570rxvt_term::scr_bell () 1622rxvt_term::scr_bell ()
1623
1624void
1625rxvt_term::scr_change_screen (int screen)
1571 1626
1572void 1627void
1573rxvt_term::scr_add_lines (SV *string) 1628rxvt_term::scr_add_lines (SV *string)
1574 CODE: 1629 CODE:
1575{ 1630{
1616 o->self = (HV *)SvRV (RETVAL); 1671 o->self = (HV *)SvRV (RETVAL);
1617} 1672}
1618 OUTPUT: 1673 OUTPUT:
1619 RETVAL 1674 RETVAL
1620 1675
1676#############################################################################
1677# Various X Utility Functions
1678#############################################################################
1679
1680void
1681rxvt_term::XListProperties (Window window)
1682 PPCODE:
1683{
1684 int count;
1685 Atom *props = XListProperties (THIS->dpy, window, &count);
1686
1687 EXTEND (SP, count);
1688 while (count--)
1689 PUSHs (newSVuv ((U32)props [count]));
1690
1691 XFree (props);
1692}
1693
1694void
1695rxvt_term::XGetWindowProperty (Window window, Atom property)
1696 PPCODE:
1697{
1698 Atom type;
1699 int format;
1700 unsigned long nitems;
1701 unsigned long bytes_after;
1702 unsigned char *prop;
1703
1704 XGetWindowProperty (THIS->dpy, window, property,
1705 0, 1<<24, 0, AnyPropertyType,
1706 &type, &format, &nitems, &bytes_after, &prop);
1707
1708 if (type != None)
1709 {
1710 int elemsize = format == 16 ? sizeof (short)
1711 : format == 32 ? sizeof (long)
1712 : 1;
1713
1714 EXTEND (SP, 3);
1715 PUSHs (newSVuv ((U32)type));
1716 PUSHs (newSViv (format));
1717 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1718 XFree (prop);
1719 }
1720}
1721
1722void
1723rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1724 CODE:
1725{
1726 STRLEN len;
1727 char *data_ = SvPVbyte (data, len);
1728
1729 int elemsize = format == 16 ? sizeof (short)
1730 : format == 32 ? sizeof (long)
1731 : 1;
1732
1733 XChangeProperty (THIS->dpy, window, property,
1734 type, format, PropModeReplace,
1735 (unsigned char *)data_, len / elemsize);
1736}
1737
1738Atom
1739XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1740 C_ARGS: term->dpy, atom_name, only_if_exists
1741
1742char *
1743XGetAtomName (rxvt_term *term, Atom atom)
1744 C_ARGS: term->dpy, atom
1745 CLEANUP:
1746 XFree (RETVAL);
1747
1748void
1749XDeleteProperty (rxvt_term *term, Window window, Atom property)
1750 C_ARGS: term->dpy, window, property
1751
1752Window
1753rxvt_term::DefaultRootWindow ()
1754 CODE:
1755 RETVAL = THIS->display->root;
1756 OUTPUT:
1757 RETVAL
1758
1759#if 0
1760
1761Window
1762XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1763 C_ARGS: term->dpy, (Window)parent,
1764 x, y, width, height, 0,
1765 term->pix_colors_focused[Color_border],
1766 term->pix_colors_focused[Color_border]
1767
1768#endif
1769
1770void
1771XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1772 C_ARGS: term->dpy, window, parent, x, y
1773
1774void
1775XMapWindow (rxvt_term *term, Window window)
1776 C_ARGS: term->dpy, window
1777
1778void
1779XUnmapWindow (rxvt_term *term, Window window)
1780 C_ARGS: term->dpy, window
1781
1782void
1783XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1784 C_ARGS: term->dpy, window, x, y, width, height
1785
1786void
1787rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1788 CODE:
1789{
1790 XWindowAttributes attr;
1791 XGetWindowAttributes (THIS->dpy, window, &attr);
1792 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1793}
1794
1795void
1796rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1797 PPCODE:
1798{
1799 int dx, dy;
1800 Window child;
1801
1802 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1803 {
1804 EXTEND (SP, 3);
1805 PUSHs (newSViv (dx));
1806 PUSHs (newSViv (dy));
1807 PUSHs (newSVuv (child));
1808 }
1809}
1810
1811#############################################################################
1812# urxvt::overlay
1813#############################################################################
1814
1621MODULE = urxvt PACKAGE = urxvt::overlay 1815MODULE = urxvt PACKAGE = urxvt::overlay
1622 1816
1623void 1817void
1624overlay::set (int x, int y, SV *text, SV *rend = 0) 1818overlay::set (int x, int y, SV *text, SV *rend = 0)
1625 1819
1630overlay::hide () 1824overlay::hide ()
1631 1825
1632void 1826void
1633overlay::DESTROY () 1827overlay::DESTROY ()
1634 1828
1635MODULE = urxvt PACKAGE = urxvt::timer 1829INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1636 1830
1637SV *
1638timer::new ()
1639 CODE:
1640 timer *w = new timer;
1641 w->start (NOW);
1642 RETVAL = newSVptr ((void *)w, "urxvt::timer");
1643 w->self = (HV *)SvRV (RETVAL);
1644 OUTPUT:
1645 RETVAL
1646
1647timer *
1648timer::cb (SV *cb)
1649 CODE:
1650 THIS->cb (cb);
1651 RETVAL = THIS;
1652 OUTPUT:
1653 RETVAL
1654
1655NV
1656timer::at ()
1657 CODE:
1658 RETVAL = THIS->at;
1659 OUTPUT:
1660 RETVAL
1661
1662timer *
1663timer::interval (NV interval)
1664 CODE:
1665 THIS->interval = interval;
1666 RETVAL = THIS;
1667 OUTPUT:
1668 RETVAL
1669
1670timer *
1671timer::set (NV tstamp)
1672 CODE:
1673 THIS->set (tstamp);
1674 RETVAL = THIS;
1675 OUTPUT:
1676 RETVAL
1677
1678timer *
1679timer::start (NV tstamp = THIS->at)
1680 CODE:
1681 THIS->start (tstamp);
1682 RETVAL = THIS;
1683 OUTPUT:
1684 RETVAL
1685
1686timer *
1687timer::stop ()
1688 CODE:
1689 THIS->stop ();
1690 RETVAL = THIS;
1691 OUTPUT:
1692 RETVAL
1693
1694void
1695timer::DESTROY ()
1696
1697MODULE = urxvt PACKAGE = urxvt::iow
1698
1699SV *
1700iow::new ()
1701 CODE:
1702 iow *w = new iow;
1703 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1704 w->self = (HV *)SvRV (RETVAL);
1705 OUTPUT:
1706 RETVAL
1707
1708iow *
1709iow::cb (SV *cb)
1710 CODE:
1711 THIS->cb (cb);
1712 RETVAL = THIS;
1713 OUTPUT:
1714 RETVAL
1715
1716iow *
1717iow::fd (int fd)
1718 CODE:
1719 THIS->fd = fd;
1720 RETVAL = THIS;
1721 OUTPUT:
1722 RETVAL
1723
1724iow *
1725iow::events (short events)
1726 CODE:
1727 THIS->events = events;
1728 RETVAL = THIS;
1729 OUTPUT:
1730 RETVAL
1731
1732iow *
1733iow::start ()
1734 CODE:
1735 THIS->start ();
1736 RETVAL = THIS;
1737 OUTPUT:
1738 RETVAL
1739
1740iow *
1741iow::stop ()
1742 CODE:
1743 THIS->stop ();
1744 RETVAL = THIS;
1745 OUTPUT:
1746 RETVAL
1747
1748void
1749iow::DESTROY ()
1750
1751

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines