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.75 by root, Wed Jan 18 11:05:09 2006 UTC vs.
Revision 1.126 by root, Wed Nov 5 14:43:54 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 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
111
112class overlay : overlay_base
124{ 113{
125 SV *cbsv; 114 rxvt_term *THIS;
115 AV *overlay_av;
116 int border;
117
118public:
126 HV *self; 119 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")
213
214struct overlay {
215 HV *self;
216 rxvt_term *THIS;
217 int x, y, w, h;
218 int border;
219 text_t **text;
220 rend_t **rend;
221 120
222 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 121 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
223 ~overlay (); 122 ~overlay ();
224 123
225 void show (); 124 void show ();
229 128
230 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
231}; 130};
232 131
233overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 132overlay::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) 133: THIS(THIS), border(border == 2), overlay_av (0)
235{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
140 if (w < 0) w = 0;
141 if (h < 0) h = 0;
142
236 if (border == 2) 143 if (border == 2)
237 { 144 {
238 w += 2; 145 w += 2;
239 h += 2; 146 h += 2;
240 } 147 }
278 *rp++ = r; 185 *rp++ = r;
279 } 186 }
280 } 187 }
281 188
282 show (); 189 show ();
283 THIS->want_refresh = 1;
284} 190}
285 191
286overlay::~overlay () 192overlay::~overlay ()
287{ 193{
288 hide (); 194 hide ();
293 delete [] rend[y]; 199 delete [] rend[y];
294 } 200 }
295 201
296 delete [] text; 202 delete [] text;
297 delete [] rend; 203 delete [] rend;
204}
205
206void
207overlay::show ()
208{
209 if (overlay_av)
210 return;
211
212 overlay_av = (AV *)SvREFCNT_inc (SvRV (
213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
214 ));
215 av_push (overlay_av, newSViv ((long)this));
298 216
299 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
300} 218 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} 219}
310 220
311void 221void
312overlay::hide () 222overlay::hide ()
313{ 223{
314 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 224 if (!overlay_av)
225 return;
315 226
316 if (ovs) 227 int i;
317 {
318 char key[33]; sprintf (key, "%32lx", (long)this);
319 228
320 HV *hv = (HV *)SvRV (*ovs); 229 for (i = AvFILL (overlay_av); i >= 0; i--)
321 hv_delete (hv, key, 32, G_DISCARD); 230 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
322 } 231 break;
232
233 for (; i < AvFILL (overlay_av); i++)
234 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
235
236 av_pop (overlay_av);
237
238 SvREFCNT_dec (overlay_av);
239 overlay_av = 0;
240
241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
323} 243}
324 244
325void overlay::swap () 245void overlay::swap ()
326{ 246{
327 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 247 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
328 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 248 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
329 249
330 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
331 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
252
253 // hide cursor if it is within the overlay area
254 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
255 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
256 THIS->screen.flags &= ~Screen_VisibleCursor;
332 257
333 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
334 { 259 {
335 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
336 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
367 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 292 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
368 croak ("rend must be arrayref"); 293 croak ("rend must be arrayref");
369 294
370 AV *av = (AV *)SvRV (rend); 295 AV *av = (AV *)SvRV (rend);
371 296
372 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
373 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
374 } 299 }
375 300
376 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
377} 303}
378 304
305/////////////////////////////////////////////////////////////////////////////
306
307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
309#include "iom_perl.h"
379 310
380///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
381 312
382struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
383 314
387{ 318{
388 if (perl) 319 if (perl)
389 { 320 {
390 perl_destruct (perl); 321 perl_destruct (perl);
391 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
392 } 324 }
393} 325}
394 326
395void 327void
396rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
400 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
401 333
402 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
403 swap (perl_environ, environ); 335 swap (perl_environ, environ);
404 336
405 char *argv[] = { 337 char *args[] = {
406 "", 338 "",
407 "-e" 339 "-e"
408 "BEGIN {" 340 "BEGIN {"
409 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
410 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
411 "}" 343 "}"
412 "" 344 ""
413 "use urxvt;" 345 "use urxvt;"
414 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
415 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
416 perl = perl_alloc (); 351 perl = perl_alloc ();
417 perl_construct (perl); 352 perl_construct (perl);
418 353
419 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
420 || perl_run (perl)) 355 || perl_run (perl))
421 { 356 {
422 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
423 358
424 perl_destruct (perl); 359 perl_destruct (perl);
433 368
434 if (perl) 369 if (perl)
435 { 370 {
436 // runs outside of perls ENV 371 // runs outside of perls ENV
437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 372 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); 373 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
439 } 374 }
440} 375}
441 376
442static void 377static void
443ungrab (rxvt_term *THIS) 378ungrab (rxvt_term *THIS)
444{ 379{
445 if (THIS->perl.grabtime) 380 if (THIS->perl.grabtime)
446 { 381 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 382 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 383 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 384 THIS->perl.grabtime = 0;
450 } 385 }
451} 386}
452 387
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 388bool
468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 389rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
469{ 390{
470 if (!perl || !term->perl.self) 391 if (!perl || !term->perl.self)
471 return false; 392 return false;
472 393
473 // pre-handling of some events 394 // pre-handling of some events
474 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
475 swap_overlays (term); 396 {
397 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
398
399 for (int i = 0; i <= AvFILL (av); i++)
400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
401 }
476 402
477 swap (perl_environ, environ); 403 swap (perl_environ, environ);
478 404
479 bool event_consumed; 405 bool event_consumed;
480 406
513 break; 439 break;
514 440
515 case DT_STR_LEN: 441 case DT_STR_LEN:
516 { 442 {
517 char *str = va_arg (ap, char *); 443 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int); 444 int len = va_arg (ap, int);
519 445
520 XPUSHs (sv_2mortal (newSVpvn (str, len))); 446 XPUSHs (sv_2mortal (newSVpvn (str, len)));
521 } 447 }
522 break; 448 break;
523 449
524 case DT_WCS_LEN: 450 case DT_WCS_LEN:
525 { 451 {
526 wchar_t *wstr = va_arg (ap, wchar_t *); 452 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int); 453 int wlen = va_arg (ap, int);
528 454
529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 455 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
456 }
457 break;
458
459 case DT_LCS_LEN:
460 {
461 long *lstr = va_arg (ap, long *);
462 int llen = va_arg (ap, int);
463
464 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
530 } 465 }
531 break; 466 break;
532 467
533 case DT_XEVENT: 468 case DT_XEVENT:
534 { 469 {
535 XEvent *xe = va_arg (ap, XEvent *); 470 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV (); 471 HV *hv = newHV ();
537 472
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 473# 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) 474# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 475# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
541# undef set 476# undef set
542 477
543 setiv (type, xe->type); 478 setiv (type, xe->type);
544 setiv (send_event, xe->xany.send_event); 479 setiv (send_event, xe->xany.send_event);
545 setiv (serial, xe->xany.serial); 480 setiv (serial, xe->xany.serial);
546 481
555 setuv (root, xe->xmotion.root); 490 setuv (root, xe->xmotion.root);
556 setuv (subwindow, xe->xmotion.subwindow); 491 setuv (subwindow, xe->xmotion.subwindow);
557 setuv (time, xe->xmotion.time); 492 setuv (time, xe->xmotion.time);
558 setiv (x, xe->xmotion.x); 493 setiv (x, xe->xmotion.x);
559 setiv (y, xe->xmotion.y); 494 setiv (y, xe->xmotion.y);
560 setiv (row, xe->xmotion.y / term->fheight); 495 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
561 setiv (col, xe->xmotion.x / term->fwidth); 496 setiv (col, xe->xmotion.x / term->fwidth);
562 setiv (x_root, xe->xmotion.x_root); 497 setiv (x_root, xe->xmotion.x_root);
563 setiv (y_root, xe->xmotion.y_root); 498 setiv (y_root, xe->xmotion.y_root);
564 setuv (state, xe->xmotion.state); 499 setuv (state, xe->xmotion.state);
565 500
598 setuv (above, xe->xconfigure.above); 533 setuv (above, xe->xconfigure.above);
599 break; 534 break;
600 } 535 }
601 536
602 break; 537 break;
538
539 case PropertyNotify:
540 setuv (window, xe->xproperty.window);
541 setuv (atom, xe->xproperty.atom);
542 setuv (time, xe->xproperty.time);
543 setiv (state, xe->xproperty.state);
544 break;
545
546 case ClientMessage:
547 setuv (window, xe->xclient.window);
548 setuv (message_type, xe->xclient.message_type);
549 setuv (format, xe->xclient.format);
550 setuv (l0, xe->xclient.data.l[0]);
551 setuv (l1, xe->xclient.data.l[1]);
552 setuv (l2, xe->xclient.data.l[2]);
553 setuv (l3, xe->xclient.data.l[3]);
554 setuv (l4, xe->xclient.data.l[4]);
555 break;
603 } 556 }
604 557
605 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
606 } 559 }
607 break; 560 break;
647 else 600 else
648 event_consumed = false; 601 event_consumed = false;
649 602
650 // post-handling of some events 603 // post-handling of some events
651 if (htype == HOOK_REFRESH_BEGIN) 604 if (htype == HOOK_REFRESH_BEGIN)
652 swap_overlays (term); 605 {
606 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
607
608 for (int i = AvFILL (av); i >= 0; i--)
609 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
610 }
653 else if (htype == HOOK_DESTROY) 611 else if (htype == HOOK_DESTROY)
654 { 612 {
655 clearSVptr ((SV *)term->perl.self); 613 clearSVptr ((SV *)term->perl.self);
656 SvREFCNT_dec ((SV *)term->perl.self); 614 SvREFCNT_dec ((SV *)term->perl.self);
615
616 // don't allow further calls
617 term->perl.self = 0;
657 } 618 }
658 619
659 swap (perl_environ, environ); 620 swap (perl_environ, environ);
660 621
661 return event_consumed; 622 return event_consumed;
685# include "optinc.h" 646# include "optinc.h"
686# undef nodef 647# undef nodef
687# undef def 648# undef def
688 649
689 HV *stash = gv_stashpv ("urxvt", 1); 650 HV *stash = gv_stashpv ("urxvt", 1);
690 struct { 651 static const struct {
691 const char *name; 652 const char *name;
692 IV iv; 653 IV iv;
693 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
694# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
695 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
696 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
697 const_iv (RS_Bold), 659 const_iv (RS_Bold),
698 const_iv (RS_Italic), 660 const_iv (RS_Italic),
699 const_iv (RS_Blink), 661 const_iv (RS_Blink),
714 const_iv (Button3Mask), 676 const_iv (Button3Mask),
715 const_iv (Button4Mask), 677 const_iv (Button4Mask),
716 const_iv (Button5Mask), 678 const_iv (Button5Mask),
717 const_iv (AnyModifier), 679 const_iv (AnyModifier),
718 680
719 const_iv (EVENT_NONE), 681 const_iv (NoSymbol),
720 const_iv (EVENT_READ), 682 const_iv (GrabModeSync),
721 const_iv (EVENT_WRITE), 683 const_iv (GrabModeAsync),
722 684
723 const_iv (NoEventMask), 685 const_iv (NoEventMask),
724 const_iv (KeyPressMask), 686 const_iv (KeyPressMask),
725 const_iv (KeyReleaseMask), 687 const_iv (KeyReleaseMask),
726 const_iv (ButtonPressMask), 688 const_iv (ButtonPressMask),
778 const_iv (SelectionRequest), 740 const_iv (SelectionRequest),
779 const_iv (SelectionNotify), 741 const_iv (SelectionNotify),
780 const_iv (ColormapNotify), 742 const_iv (ColormapNotify),
781 const_iv (ClientMessage), 743 const_iv (ClientMessage),
782 const_iv (MappingNotify), 744 const_iv (MappingNotify),
745# if ENABLE_XIM_ONTHESPOT
746 const_iv (XIMReverse),
747 const_iv (XIMUnderline),
748 const_iv (XIMHighlight),
749 const_iv (XIMPrimary),
750 const_iv (XIMSecondary),
751 const_iv (XIMTertiary),
752 const_iv (XIMVisibleToForward),
753 const_iv (XIMVisibleToBackword),
754 const_iv (XIMVisibleToCenter),
755# if 0
756 const_iv (XIMForwardChar),
757 const_iv (XIMBackwardChar),
758 const_iv (XIMForwardWord),
759 const_iv (XIMBackwardWord),
760 const_iv (XIMCaretUp),
761 const_iv (XIMCaretDown),
762 const_iv (XIMNextLine),
763 const_iv (XIMPreviousLine),
764 const_iv (XIMLineStart),
765 const_iv (XIMLineEnd),
766 const_iv (XIMAbsolutePosition),
767 const_iv (XIMDontChange),
768# endif
769# endif
783 }; 770 };
784 771
785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 772 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
786 civ-- > const_iv; )
787 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 773 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
788} 774}
789 775
790void 776void
791warn (const char *msg) 777warn (const char *msg)
801_exit (int status) 787_exit (int status)
802 788
803NV 789NV
804NOW () 790NOW ()
805 CODE: 791 CODE:
806 RETVAL = NOW; 792 RETVAL = ev::now ();
807 OUTPUT: 793 OUTPUT:
808 RETVAL 794 RETVAL
809 795
810int 796int
811GET_BASEFG (int rend) 797GET_BASEFG (int rend)
822 RETVAL 808 RETVAL
823 809
824int 810int
825SET_FGCOLOR (int rend, int new_color) 811SET_FGCOLOR (int rend, int new_color)
826 CODE: 812 CODE:
827 RETVAL = SET_FGCOLOR (rend, new_color); 813 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
828 OUTPUT: 814 OUTPUT:
829 RETVAL 815 RETVAL
830 816
831int 817int
832SET_BGCOLOR (int rend, int new_color) 818SET_BGCOLOR (int rend, int new_color)
833 CODE: 819 CODE:
834 RETVAL = SET_BGCOLOR (rend, new_color); 820 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
835 OUTPUT: 821 OUTPUT:
836 RETVAL 822 RETVAL
837 823
838int 824int
839GET_CUSTOM (int rend) 825GET_CUSTOM (int rend)
840 CODE: 826 CODE:
841 RETVAL = (rend && RS_customMask) >> RS_customShift; 827 RETVAL = (rend & RS_customMask) >> RS_customShift;
842 OUTPUT: 828 OUTPUT:
843 RETVAL 829 RETVAL
844 830
845int 831int
846SET_CUSTOM (int rend, int new_value) 832SET_CUSTOM (int rend, int new_value)
853 | ((new_value << RS_customShift) & RS_customMask); 839 | ((new_value << RS_customShift) & RS_customMask);
854} 840}
855 OUTPUT: 841 OUTPUT:
856 RETVAL 842 RETVAL
857 843
844void
845termlist ()
846 PPCODE:
847{
848 EXTEND (SP, rxvt_term::termlist.size ());
849
850 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
851 if ((*t)->perl.self)
852 PUSHs (sv_2mortal (newSVterm (*t)));
853}
854
858MODULE = urxvt PACKAGE = urxvt::term 855MODULE = urxvt PACKAGE = urxvt::term
859 856
860SV * 857SV *
861_new (...) 858_new (AV *env, AV *arg)
862 CODE: 859 CODE:
863{ 860{
864 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
865 croak ("first argument to urxvt::term->_new must be arrayref");
866
867 rxvt_term *term = new rxvt_term; 861 rxvt_term *term = new rxvt_term;
868 862
869 term->argv = new stringvec; 863 stringvec *argv = new stringvec;
870 term->envv = new stringvec; 864 stringvec *envv = new stringvec;
871 865
872 for (int i = 1; i < items; i++) 866 for (int i = 0; i <= AvFILL (arg); i++)
873 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 867 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
874 868
875 AV *envv = (AV *)SvRV (ST (0));
876 for (int i = av_len (envv) + 1; i--; ) 869 for (int i = AvFILL (env) + 1; i--; )
877 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 870 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
878 871
879 term->envv->push_back (0); 872 envv->push_back (0);
880
881 bool success;
882 873
883 try 874 try
884 { 875 {
885 success = term->init (term->argv->size (), term->argv->begin ()); 876 term->init (argv, envv);
886 } 877 }
887 catch (const class rxvt_failure_exception &e) 878 catch (const class rxvt_failure_exception &e)
888 {
889 success = false;
890 }
891
892 if (!success)
893 { 879 {
894 term->destroy (); 880 term->destroy ();
895 croak ("error while initializing new terminal instance"); 881 croak ("error while initializing new terminal instance");
896 } 882 }
897 883
902 RETVAL 888 RETVAL
903 889
904void 890void
905rxvt_term::destroy () 891rxvt_term::destroy ()
906 892
907#if ENABLE_PERL_FRILLS
908
909void
910rxvt_term::XListProperties (U32 window)
911 PPCODE:
912{
913 int count;
914 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
915
916 EXTEND (SP, count);
917 while (count--)
918 PUSHs (newSVuv ((U32)props [count]));
919
920 XFree (props);
921}
922
923void
924rxvt_term::XGetWindowProperty (U32 window, U32 property)
925 PPCODE:
926{
927 Atom type;
928 int format;
929 unsigned long nitems;
930 unsigned long bytes_after;
931 unsigned char *prop;
932 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
933 0, 1<<30, 0, AnyPropertyType,
934 &type, &format, &nitems, &bytes_after, &prop);
935 if (type != None)
936 {
937 EXTEND (SP, 3);
938 PUSHs (newSVuv ((U32)type));
939 PUSHs (newSViv (format));
940 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
941 XFree (prop);
942 }
943}
944
945void
946rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
947 CODE:
948{
949 STRLEN len;
950 char *data_ = SvPVbyte (data, len);
951
952 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
953 type, format, PropModeReplace,
954 (unsigned char *)data, len * 8 / format);
955}
956
957void
958rxvt_term::XDeleteProperty (U32 window, U32 property)
959 CODE:
960 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
961
962U32
963rxvt_term::DefaultRootWindow ()
964 CODE:
965 RETVAL = (U32)THIS->display->root;
966 OUTPUT:
967 RETVAL
968
969U32
970rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
971 CODE:
972 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
973 x, y, width, height, 0,
974 THIS->pix_colors_focused[Color_border],
975 THIS->pix_colors_focused[Color_border]);
976 OUTPUT:
977 RETVAL
978
979void
980rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
981 CODE:
982 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
983
984void
985rxvt_term::XMapWindow (U32 window)
986 CODE:
987 XMapWindow (THIS->display->display, (Window)window);
988
989void
990rxvt_term::XUnmapWindow (U32 window)
991 CODE:
992 XUnmapWindow (THIS->display->display, (Window)window);
993
994#endif
995
996void 893void
997rxvt_term::set_should_invoke (int htype, int inc) 894rxvt_term::set_should_invoke (int htype, int inc)
998 CODE: 895 CODE:
999 THIS->perl.should_invoke [htype] += inc; 896 THIS->perl.should_invoke [htype] += inc;
1000 897
1001void 898int
1002rxvt_term::grab_button (int button, U32 modifiers) 899rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1003 CODE: 900 CODE:
1004 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 901 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1005 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 902 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1006 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 903 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
904 OUTPUT: RETVAL
905
906int
907rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
908 CODE:
909 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
910 OUTPUT: RETVAL
911
912void
913rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
914 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
915 CODE:
916 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
917
918void
919rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
920 CODE:
921 XUngrabKey (THIS->dpy, keycode, modifiers, window);
922
923void
924rxvt_term::XUngrabKeyboard (Time eventtime)
925 CODE:
926 XUngrabKeyboard (THIS->dpy, eventtime);
1007 927
1008bool 928bool
1009rxvt_term::grab (U32 eventtime, int sync = 0) 929rxvt_term::grab (Time eventtime, int sync = 0)
1010 CODE: 930 CODE:
1011{ 931{
1012 int mode = sync ? GrabModeSync : GrabModeAsync; 932 int mode = sync ? GrabModeSync : GrabModeAsync;
1013 933
1014 THIS->perl.grabtime = 0; 934 THIS->perl.grabtime = 0;
1015 935
1016 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 936 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1017 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 937 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1018 mode, mode, None, GRAB_CURSOR, eventtime)) 938 mode, mode, None, GRAB_CURSOR, eventtime))
1019 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 939 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1020 THIS->perl.grabtime = eventtime; 940 THIS->perl.grabtime = eventtime;
1021 else 941 else
1022 XUngrabPointer (THIS->display->display, eventtime); 942 XUngrabPointer (THIS->dpy, eventtime);
1023 943
1024 RETVAL = !!THIS->perl.grabtime; 944 RETVAL = !!THIS->perl.grabtime;
1025} 945}
1026 OUTPUT: 946 OUTPUT:
1027 RETVAL 947 RETVAL
1028 948
1029void 949void
1030rxvt_term::allow_events_async () 950rxvt_term::allow_events_async ()
1031 CODE: 951 CODE:
1032 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 952 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1033 953
1034void 954void
1035rxvt_term::allow_events_sync () 955rxvt_term::allow_events_sync ()
1036 CODE: 956 CODE:
1037 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 957 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1038 958
1039void 959void
1040rxvt_term::allow_events_replay () 960rxvt_term::allow_events_replay ()
1041 CODE: 961 CODE:
1042 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 962 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1043 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1044 964
1045void 965void
1046rxvt_term::ungrab () 966rxvt_term::ungrab ()
1047 CODE: 967 CODE:
1048 ungrab (THIS); 968 ungrab (THIS);
969
970int
971rxvt_term::XStringToKeysym (char *string)
972 CODE:
973 RETVAL = XStringToKeysym (string);
974 OUTPUT: RETVAL
975
976char *
977rxvt_term::XKeysymToString (int sym)
978 CODE:
979 RETVAL = XKeysymToString (sym);
980 OUTPUT: RETVAL
981
982int
983rxvt_term::XKeysymToKeycode (int sym)
984 CODE:
985 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
986 OUTPUT: RETVAL
987
988int
989rxvt_term::XKeycodeToKeysym (int code, int index)
990 CODE:
991 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
992 OUTPUT: RETVAL
1049 993
1050int 994int
1051rxvt_term::strwidth (SV *str) 995rxvt_term::strwidth (SV *str)
1052 CODE: 996 CODE:
1053{ 997{
1054 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1055 999
1056 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1057 RETVAL = wcswidth (wstr, wcslen (wstr)); 1001 RETVAL = 0;
1002 for (wchar_t *wc = wstr; *wc; wc++)
1003 {
1004 int w = WCWIDTH (*wc);
1005
1006 if (w)
1007 RETVAL += max (w, 1);
1008 }
1058 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1059 1010
1060 free (wstr); 1011 free (wstr);
1061} 1012}
1062 OUTPUT: 1013 OUTPUT:
1092 rxvt_pop_locale (); 1043 rxvt_pop_locale ();
1093 1044
1094 RETVAL = wcs2sv (wstr); 1045 RETVAL = wcs2sv (wstr);
1095 free (wstr); 1046 free (wstr);
1096} 1047}
1048 OUTPUT:
1049 RETVAL
1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1097 OUTPUT: 1055 OUTPUT:
1098 RETVAL 1056 RETVAL
1099 1057
1100#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1101 1059
1106#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1107#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1108#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1109#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1110#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1111#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1072#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1112#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1073#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1113#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1074#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1114 1075
1115int 1076int
1122 fbase = TERM_OFFSET_fbase 1083 fbase = TERM_OFFSET_fbase
1123 nrow = TERM_OFFSET_nrow 1084 nrow = TERM_OFFSET_nrow
1124 ncol = TERM_OFFSET_ncol 1085 ncol = TERM_OFFSET_ncol
1125 focus = TERM_OFFSET_focus 1086 focus = TERM_OFFSET_focus
1126 mapped = TERM_OFFSET_mapped 1087 mapped = TERM_OFFSET_mapped
1088 int_bwidth = TERM_OFFSET_int_bwidth
1089 ext_bwidth = TERM_OFFSET_ext_bwidth
1090 lineSpace = TERM_OFFSET_lineSpace
1127 saveLines = TERM_OFFSET_saveLines 1091 saveLines = TERM_OFFSET_saveLines
1128 total_rows = TERM_OFFSET_total_rows 1092 total_rows = TERM_OFFSET_total_rows
1129 top_row = TERM_OFFSET_top_row 1093 top_row = TERM_OFFSET_top_row
1130 CODE: 1094 CODE:
1131 RETVAL = *(int *)((char *)THIS + ix); 1095 RETVAL = *(int *)((char *)THIS + ix);
1136rxvt_term::ModLevel3Mask () 1100rxvt_term::ModLevel3Mask ()
1137 ALIAS: 1101 ALIAS:
1138 ModLevel3Mask = 0 1102 ModLevel3Mask = 0
1139 ModMetaMask = 1 1103 ModMetaMask = 1
1140 ModNumLockMask = 2 1104 ModNumLockMask = 2
1105 current_screen = 3
1106 hidden_cursor = 4
1141 CODE: 1107 CODE:
1142 switch (ix) 1108 switch (ix)
1143 { 1109 {
1144 case 0: RETVAL = THIS->ModLevel3Mask; break; 1110 case 0: RETVAL = THIS->ModLevel3Mask; break;
1145 case 1: RETVAL = THIS->ModMetaMask; break; 1111 case 1: RETVAL = THIS->ModMetaMask; break;
1146 case 2: RETVAL = THIS->ModNumLockMask; break; 1112 case 2: RETVAL = THIS->ModNumLockMask; break;
1113 case 3: RETVAL = THIS->current_screen; break;
1114#ifdef CURSOR_BLINK
1115 case 4: RETVAL = THIS->hidden_cursor; break;
1116#endif
1147 } 1117 }
1148 OUTPUT: 1118 OUTPUT:
1149 RETVAL 1119 RETVAL
1150 1120
1151char * 1121char *
1161 } 1131 }
1162 OUTPUT: 1132 OUTPUT:
1163 RETVAL 1133 RETVAL
1164 1134
1165SV * 1135SV *
1166rxvt_term::_env () 1136rxvt_term::envv ()
1137 ALIAS:
1138 argv = 1
1167 CODE: 1139 PPCODE:
1168{ 1140{
1169 if (THIS->envv) 1141 stringvec *vec = ix ? THIS->argv : THIS->envv;
1170 {
1171 AV *av = newAV ();
1172 1142
1143 EXTEND (SP, vec->size ());
1144
1173 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1145 for (char **i = vec->begin (); i != vec->end (); ++i)
1174 if (*i) 1146 if (*i)
1175 av_push (av, newSVpv (*i, 0)); 1147 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1176
1177 RETVAL = newRV_noinc ((SV *)av);
1178 }
1179 else
1180 RETVAL = &PL_sv_undef;
1181} 1148}
1182 OUTPUT:
1183 RETVAL
1184 1149
1185int 1150int
1186rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1151rxvt_term::pty_ev_events (int events = ev::UNDEF)
1187 CODE: 1152 CODE:
1188 RETVAL = THIS->pty_ev.events; 1153 RETVAL = THIS->pty_ev.events;
1189 if (events != EVENT_UNDEF) 1154 if (events != ev::UNDEF)
1190 THIS->pty_ev.set (events); 1155 THIS->pty_ev.set (events);
1191 OUTPUT: 1156 OUTPUT:
1192 RETVAL 1157 RETVAL
1193 1158
1194U32 1159int
1160rxvt_term::pty_fd ()
1161 CODE:
1162 RETVAL = THIS->pty->pty;
1163 OUTPUT:
1164 RETVAL
1165
1166Window
1195rxvt_term::parent () 1167rxvt_term::parent ()
1196 CODE: 1168 CODE:
1197 RETVAL = (U32)THIS->parent [0]; 1169 RETVAL = THIS->parent [0];
1198 OUTPUT: 1170 OUTPUT:
1199 RETVAL 1171 RETVAL
1200 1172
1201U32 1173Window
1202rxvt_term::vt () 1174rxvt_term::vt ()
1203 CODE: 1175 CODE:
1204 RETVAL = (U32)THIS->vt; 1176 RETVAL = THIS->vt;
1205 OUTPUT: 1177 OUTPUT:
1206 RETVAL 1178 RETVAL
1207 1179
1208void 1180void
1209rxvt_term::vt_emask_add (U32 emask) 1181rxvt_term::vt_emask_add (U32 emask)
1231} 1203}
1232 OUTPUT: 1204 OUTPUT:
1233 RETVAL 1205 RETVAL
1234 1206
1235void 1207void
1208rxvt_term::focus_in ()
1209
1210void
1211rxvt_term::focus_out ()
1212
1213void
1214rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1215 ALIAS:
1216 key_release = 1
1217 CODE:
1218{
1219 XKeyEvent xkey;
1220
1221 memset (&xkey, 0, sizeof (xkey));
1222
1223 xkey.time = time;
1224 xkey.state = state;
1225 xkey.keycode = keycode;
1226
1227 xkey.type = ix ? KeyRelease : KeyPress;
1228 xkey.display = THIS->dpy;
1229 xkey.window = THIS->vt;
1230 xkey.root = THIS->display->root;
1231 xkey.subwindow = THIS->vt;
1232
1233 if (ix)
1234 THIS->key_release (xkey);
1235 else
1236 THIS->key_press (xkey);
1237}
1238
1239void
1236rxvt_term::want_refresh () 1240rxvt_term::want_refresh ()
1237 CODE: 1241 CODE:
1238 THIS->want_refresh = 1; 1242 THIS->want_refresh = 1;
1243 THIS->refresh_check ();
1239 1244
1240void 1245void
1241rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1246rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1242 PPCODE: 1247 PPCODE:
1243{ 1248{
1246 1251
1247 line_t &l = ROW(row_number); 1252 line_t &l = ROW(row_number);
1248 1253
1249 if (GIMME_V != G_VOID) 1254 if (GIMME_V != G_VOID)
1250 { 1255 {
1251 wchar_t *wstr = new wchar_t [THIS->ncol]; 1256 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1252 1257
1253 for (int col = 0; col < THIS->ncol; col++) 1258 for (int col = 0; col < THIS->ncol; col++)
1254 wstr [col] = l.t [col]; 1259 wstr [col] = l.t [col];
1255 1260
1256 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1261 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1257
1258 delete [] wstr;
1259 } 1262 }
1260 1263
1261 if (new_text) 1264 if (new_text)
1262 { 1265 {
1263 wchar_t *wstr = sv2wcs (new_text); 1266 wchar_t *wstr = sv2wcs (new_text);
1264 1267
1265 int len = min (wcslen (wstr) - start_ofs, max_len); 1268 int len = min (wcslen (wstr) - start_ofs, max_len);
1266 1269
1267 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1270 if (start_col < 0 || start_col + len > THIS->ncol)
1268 { 1271 {
1269 free (wstr); 1272 free (wstr);
1270 croak ("new_text extends beyond horizontal margins"); 1273 croak ("new_text extends beyond horizontal margins");
1271 } 1274 }
1272 1275
1304 { 1307 {
1305 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1308 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1306 croak ("new_rend must be arrayref"); 1309 croak ("new_rend must be arrayref");
1307 1310
1308 AV *av = (AV *)SvRV (new_rend); 1311 AV *av = (AV *)SvRV (new_rend);
1309 int len = min (av_len (av) + 1 - start_ofs, max_len); 1312 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1310 1313
1311 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1314 if (start_col < 0 || start_col + len > THIS->ncol)
1312 croak ("new_rend array extends beyond horizontal margins"); 1315 croak ("new_rend array extends beyond horizontal margins");
1313 1316
1314 for (int col = start_col; col < start_col + len; col++) 1317 for (int col = start_col; col < start_col + len; col++)
1315 { 1318 {
1316 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1319 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1356rxvt_term::special_encode (SV *string) 1359rxvt_term::special_encode (SV *string)
1357 CODE: 1360 CODE:
1358{ 1361{
1359 wchar_t *wstr = sv2wcs (string); 1362 wchar_t *wstr = sv2wcs (string);
1360 int wlen = wcslen (wstr); 1363 int wlen = wcslen (wstr);
1361 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1364 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1362 1365
1363 rxvt_push_locale (THIS->locale); 1366 rxvt_push_locale (THIS->locale);
1364 1367
1365 wchar_t *r = rstr; 1368 wchar_t *r = rstr;
1366 for (wchar_t *s = wstr; *s; s++) 1369 for (wchar_t *s = wstr; *s; s++)
1370 {
1371 int w = WCWIDTH (*s);
1372
1367 if (wcwidth (*s) == 0) 1373 if (w == 0)
1368 { 1374 {
1369 if (r == rstr) 1375 if (r == rstr)
1370 croak ("leading combining character unencodable"); 1376 croak ("leading combining character unencodable");
1371 1377
1372 unicode_t n = rxvt_compose (r[-1], *s); 1378 unicode_t n = rxvt_compose (r[-1], *s);
1373 if (n == NOCHAR) 1379 if (n == NOCHAR)
1374 n = rxvt_composite.compose (r[-1], *s); 1380 n = rxvt_composite.compose (r[-1], *s);
1375 1381
1376 r[-1] = n; 1382 r[-1] = n;
1377 } 1383 }
1378#if !UNICODE_3 1384#if !UNICODE_3
1379 else if (*s >= 0x10000) 1385 else if (*s >= 0x10000)
1380 *r++ = rxvt_composite.compose (*s); 1386 *r++ = rxvt_composite.compose (*s);
1381#endif 1387#endif
1382 else 1388 else
1383 *r++ = *s; 1389 *r++ = *s;
1390
1391 // the *2 above only allows wcwidth <= 2
1392 if (w > 1)
1393 *r++ = NOCHAR;
1394 }
1384 1395
1385 rxvt_pop_locale (); 1396 rxvt_pop_locale ();
1386 1397
1387 RETVAL = wcs2sv (rstr, r - rstr); 1398 RETVAL = wcs2sv (rstr, r - rstr);
1388
1389 delete [] rstr;
1390} 1399}
1391 OUTPUT: 1400 OUTPUT:
1392 RETVAL 1401 RETVAL
1393 1402
1394SV * 1403SV *
1395rxvt_term::special_decode (SV *text) 1404rxvt_term::special_decode (SV *text)
1396 CODE: 1405 CODE:
1397{ 1406{
1398 wchar_t *wstr = sv2wcs (text); 1407 wchar_t *wstr = sv2wcs (text);
1399 int wlen = wcslen (wstr);
1400 int dlen = 0; 1408 int dlen = 0;
1401 1409
1402 // find length 1410 // find length
1403 for (wchar_t *s = wstr; *s; s++) 1411 for (wchar_t *s = wstr; *s; s++)
1404 if (*s == NOCHAR) 1412 if (*s == NOCHAR)
1406 else if (IS_COMPOSE (*s)) 1414 else if (IS_COMPOSE (*s))
1407 dlen += rxvt_composite.expand (*s, 0); 1415 dlen += rxvt_composite.expand (*s, 0);
1408 else 1416 else
1409 dlen++; 1417 dlen++;
1410 1418
1411 wchar_t *rstr = new wchar_t [dlen]; 1419 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1412 1420
1413 // decode 1421 // decode
1414 wchar_t *r = rstr; 1422 wchar_t *r = rstr;
1415 for (wchar_t *s = wstr; *s; s++) 1423 for (wchar_t *s = wstr; *s; s++)
1416 if (*s == NOCHAR) 1424 if (*s == NOCHAR)
1419 r += rxvt_composite.expand (*s, r); 1427 r += rxvt_composite.expand (*s, r);
1420 else 1428 else
1421 *r++ = *s; 1429 *r++ = *s;
1422 1430
1423 RETVAL = wcs2sv (rstr, r - rstr); 1431 RETVAL = wcs2sv (rstr, r - rstr);
1424
1425 delete [] rstr;
1426} 1432}
1427 OUTPUT: 1433 OUTPUT:
1428 RETVAL 1434 RETVAL
1429 1435
1430void 1436void
1431rxvt_term::_resource (char *name, int index, SV *newval = 0) 1437rxvt_term::_resource (char *name, int index, SV *newval = 0)
1432 PPCODE: 1438 PPCODE:
1433{ 1439{
1434 struct resval { const char *name; int value; } rslist [] = { 1440 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1435# define def(name) { # name, Rs_ ## name }, 1441# define def(name) { # name, Rs_ ## name },
1436# define reserve(name,count) 1442# define reserve(name,count)
1437# include "rsinc.h" 1443# include "rsinc.h"
1438# undef def 1444# undef def
1439# undef reserve 1445# undef reserve
1440 }; 1446 };
1441 1447
1442 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1448 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1443 1449
1450 if (*name)
1444 do { 1451 {
1452 do {
1445 if (rs-- == rslist) 1453 if (rs-- == rslist)
1446 croak ("no such resource '%s', requested", name); 1454 croak ("no such resource '%s', requested", name);
1447 } while (strcmp (name, rs->name)); 1455 } while (strcmp (name, rs->name));
1448 1456
1449 index += rs->value; 1457 index += rs->value;
1458 }
1459 else
1460 {
1461 --rs;
1462 name = "";
1463 }
1450 1464
1451 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1465 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1452 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1466 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1453 1467
1454 if (GIMME_V != G_VOID) 1468 if (GIMME_V != G_VOID)
1469 1483
1470const char * 1484const char *
1471rxvt_term::x_resource (const char *name) 1485rxvt_term::x_resource (const char *name)
1472 1486
1473bool 1487bool
1474rxvt_term::option (U32 optval, int set = -1) 1488rxvt_term::option (U8 optval, int set = -1)
1475 CODE: 1489 CODE:
1476{ 1490{
1477 RETVAL = THIS->options & optval; 1491 RETVAL = THIS->option (optval);
1478 1492
1479 if (set >= 0) 1493 if (set >= 0)
1480 { 1494 {
1481 if (set)
1482 THIS->options |= optval; 1495 THIS->set_option (optval, set);
1483 else
1484 THIS->options &= ~optval;
1485 1496
1497 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1486 switch (optval) 1498 switch (optval)
1487 { 1499 {
1488 case Opt_skipBuiltinGlyphs: 1500 case Opt_skipBuiltinGlyphs:
1489 THIS->set_fonts (); 1501 THIS->set_fonts ();
1490 THIS->scr_remap_chars (); 1502 THIS->scr_remap_chars ();
1491 THIS->scr_touch (true); 1503 THIS->scr_touch (true);
1492 THIS->want_refresh = 1; 1504 THIS->want_refresh = 1;
1505 THIS->refresh_check ();
1493 break; 1506 break;
1494 1507
1495 case Opt_cursorUnderline: 1508 case Opt_cursorUnderline:
1496 THIS->want_refresh = 1; 1509 THIS->want_refresh = 1;
1510 THIS->refresh_check ();
1497 break; 1511 break;
1498 1512
1499# case Opt_scrollBar_floating: 1513# case Opt_scrollBar_floating:
1500# case Opt_scrollBar_right: 1514# case Opt_scrollBar_right:
1501# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1515# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1502# break; 1516# break;
1503 } 1517 }
1504 } 1518 }
1505} 1519}
1506 OUTPUT: 1520 OUTPUT:
1507 RETVAL 1521 RETVAL
1508 1522
1539 if (items == 3) 1553 if (items == 3)
1540 { 1554 {
1541 rc.row = SvIV (ST (1)); 1555 rc.row = SvIV (ST (1));
1542 rc.col = SvIV (ST (2)); 1556 rc.col = SvIV (ST (2));
1543 1557
1544 if (ix == 2 && rc.col == 0) 1558 if (ix == 2)
1545 { 1559 {
1560 if (rc.col == 0)
1561 {
1562 // col == 0 means end of previous line
1546 rc.row--; 1563 rc.row--;
1547 rc.col = THIS->ncol; 1564 rc.col = THIS->ncol;
1565 }
1566 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1567 && rc.col > ROW(rc.row).l)
1568 {
1569 // col >= length means while line and add newline
1570 rc.col = THIS->ncol;
1571 }
1548 } 1572 }
1549 1573
1550 clamp_it (rc.col, 0, THIS->ncol); 1574 clamp_it (rc.col, 0, THIS->ncol);
1551 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1575 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1552 1576
1553 if (ix) 1577 if (ix)
1578 {
1554 THIS->want_refresh = 1; 1579 THIS->want_refresh = 1;
1580 THIS->refresh_check ();
1581 }
1555 } 1582 }
1556} 1583}
1557 1584
1558char 1585char
1559rxvt_term::cur_charset () 1586rxvt_term::cur_charset ()
1560 CODE: 1587 CODE:
1561 RETVAL = THIS->charsets [THIS->screen.charset]; 1588 RETVAL = THIS->charsets [THIS->screen.charset];
1562 OUTPUT: 1589 OUTPUT:
1563 RETVAL 1590 RETVAL
1564 1591
1565#void 1592void
1566#rxvt_term::selection_clear () 1593rxvt_term::selection_clear ()
1567 1594
1568void 1595void
1569rxvt_term::selection_make (U32 eventtime, bool rect = false) 1596rxvt_term::selection_make (Time eventtime, bool rect = false)
1570 CODE: 1597 CODE:
1571 THIS->selection.op = SELECTION_CONT; 1598 THIS->selection.op = SELECTION_CONT;
1572 THIS->selection.rect = rect; 1599 THIS->selection.rect = rect;
1573 THIS->selection_make (eventtime); 1600 THIS->selection_make (eventtime);
1574 1601
1575int 1602int
1576rxvt_term::selection_grab (U32 eventtime) 1603rxvt_term::selection_grab (Time eventtime)
1577 1604
1578void 1605void
1579rxvt_term::selection (SV *newtext = 0) 1606rxvt_term::selection (SV *newtext = 0)
1580 PPCODE: 1607 PPCODE:
1581{ 1608{
1599void 1626void
1600rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1627rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1601 1628
1602void 1629void
1603rxvt_term::scr_bell () 1630rxvt_term::scr_bell ()
1631
1632void
1633rxvt_term::scr_change_screen (int screen)
1604 1634
1605void 1635void
1606rxvt_term::scr_add_lines (SV *string) 1636rxvt_term::scr_add_lines (SV *string)
1607 CODE: 1637 CODE:
1608{ 1638{
1649 o->self = (HV *)SvRV (RETVAL); 1679 o->self = (HV *)SvRV (RETVAL);
1650} 1680}
1651 OUTPUT: 1681 OUTPUT:
1652 RETVAL 1682 RETVAL
1653 1683
1684#############################################################################
1685# Various X Utility Functions
1686#############################################################################
1687
1688void
1689rxvt_term::XListProperties (Window window)
1690 PPCODE:
1691{
1692 int count;
1693 Atom *props = XListProperties (THIS->dpy, window, &count);
1694
1695 EXTEND (SP, count);
1696 while (count--)
1697 PUSHs (newSVuv ((U32)props [count]));
1698
1699 XFree (props);
1700}
1701
1702void
1703rxvt_term::XGetWindowProperty (Window window, Atom property)
1704 PPCODE:
1705{
1706 Atom type;
1707 int format;
1708 unsigned long nitems;
1709 unsigned long bytes_after;
1710 unsigned char *prop;
1711
1712 XGetWindowProperty (THIS->dpy, window, property,
1713 0, 1<<24, 0, AnyPropertyType,
1714 &type, &format, &nitems, &bytes_after, &prop);
1715
1716 if (type != None)
1717 {
1718 int elemsize = format == 16 ? sizeof (short)
1719 : format == 32 ? sizeof (long)
1720 : 1;
1721
1722 EXTEND (SP, 3);
1723 PUSHs (newSVuv ((U32)type));
1724 PUSHs (newSViv (format));
1725 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1726 XFree (prop);
1727 }
1728}
1729
1730void
1731rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1732 CODE:
1733{
1734 STRLEN len;
1735 char *data_ = SvPVbyte (data, len);
1736
1737 int elemsize = format == 16 ? sizeof (short)
1738 : format == 32 ? sizeof (long)
1739 : 1;
1740
1741 XChangeProperty (THIS->dpy, window, property,
1742 type, format, PropModeReplace,
1743 (unsigned char *)data_, len / elemsize);
1744}
1745
1746Atom
1747XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1748 C_ARGS: term->dpy, atom_name, only_if_exists
1749
1750char *
1751XGetAtomName (rxvt_term *term, Atom atom)
1752 C_ARGS: term->dpy, atom
1753 CLEANUP:
1754 XFree (RETVAL);
1755
1756void
1757XDeleteProperty (rxvt_term *term, Window window, Atom property)
1758 C_ARGS: term->dpy, window, property
1759
1760Window
1761rxvt_term::DefaultRootWindow ()
1762 CODE:
1763 RETVAL = THIS->display->root;
1764 OUTPUT:
1765 RETVAL
1766
1767#if 0
1768
1769Window
1770XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1771 C_ARGS: term->dpy, (Window)parent,
1772 x, y, width, height, 0,
1773 term->pix_colors_focused[Color_border],
1774 term->pix_colors_focused[Color_border]
1775
1776#endif
1777
1778void
1779XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1780 C_ARGS: term->dpy, window, parent, x, y
1781
1782void
1783XMapWindow (rxvt_term *term, Window window)
1784 C_ARGS: term->dpy, window
1785
1786void
1787XUnmapWindow (rxvt_term *term, Window window)
1788 C_ARGS: term->dpy, window
1789
1790void
1791XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1792 C_ARGS: term->dpy, window, x, y, width, height
1793
1794void
1795rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1796 CODE:
1797{
1798 XWindowAttributes attr;
1799 XGetWindowAttributes (THIS->dpy, window, &attr);
1800 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1801}
1802
1803void
1804rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1805 PPCODE:
1806{
1807 int dx, dy;
1808 Window child;
1809
1810 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1811 {
1812 EXTEND (SP, 3);
1813 PUSHs (newSViv (dx));
1814 PUSHs (newSViv (dy));
1815 PUSHs (newSVuv (child));
1816 }
1817}
1818
1819#############################################################################
1820# urxvt::overlay
1821#############################################################################
1822
1654MODULE = urxvt PACKAGE = urxvt::overlay 1823MODULE = urxvt PACKAGE = urxvt::overlay
1655 1824
1656void 1825void
1657overlay::set (int x, int y, SV *text, SV *rend = 0) 1826overlay::set (int x, int y, SV *text, SV *rend = 0)
1658 1827
1663overlay::hide () 1832overlay::hide ()
1664 1833
1665void 1834void
1666overlay::DESTROY () 1835overlay::DESTROY ()
1667 1836
1668MODULE = urxvt PACKAGE = urxvt::timer 1837INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1669 1838
1670SV *
1671timer::new ()
1672 CODE:
1673 timer *w = new timer;
1674 w->start (NOW);
1675 RETVAL = newSVptr ((void *)w, "urxvt::timer");
1676 w->self = (HV *)SvRV (RETVAL);
1677 OUTPUT:
1678 RETVAL
1679
1680timer *
1681timer::cb (SV *cb)
1682 CODE:
1683 THIS->cb (cb);
1684 RETVAL = THIS;
1685 OUTPUT:
1686 RETVAL
1687
1688NV
1689timer::at ()
1690 CODE:
1691 RETVAL = THIS->at;
1692 OUTPUT:
1693 RETVAL
1694
1695timer *
1696timer::interval (NV interval)
1697 CODE:
1698 THIS->interval = interval;
1699 RETVAL = THIS;
1700 OUTPUT:
1701 RETVAL
1702
1703timer *
1704timer::set (NV tstamp)
1705 CODE:
1706 THIS->set (tstamp);
1707 RETVAL = THIS;
1708 OUTPUT:
1709 RETVAL
1710
1711timer *
1712timer::start (NV tstamp = THIS->at)
1713 CODE:
1714 THIS->start (tstamp);
1715 RETVAL = THIS;
1716 OUTPUT:
1717 RETVAL
1718
1719timer *
1720timer::after (NV delay)
1721 CODE:
1722 THIS->start (NOW + delay);
1723 OUTPUT:
1724 RETVAL
1725
1726timer *
1727timer::stop ()
1728 CODE:
1729 THIS->stop ();
1730 RETVAL = THIS;
1731 OUTPUT:
1732 RETVAL
1733
1734void
1735timer::DESTROY ()
1736
1737MODULE = urxvt PACKAGE = urxvt::iow
1738
1739SV *
1740iow::new ()
1741 CODE:
1742 iow *w = new iow;
1743 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1744 w->self = (HV *)SvRV (RETVAL);
1745 OUTPUT:
1746 RETVAL
1747
1748iow *
1749iow::cb (SV *cb)
1750 CODE:
1751 THIS->cb (cb);
1752 RETVAL = THIS;
1753 OUTPUT:
1754 RETVAL
1755
1756iow *
1757iow::fd (int fd)
1758 CODE:
1759 THIS->fd = fd;
1760 RETVAL = THIS;
1761 OUTPUT:
1762 RETVAL
1763
1764iow *
1765iow::events (short events)
1766 CODE:
1767 THIS->events = events;
1768 RETVAL = THIS;
1769 OUTPUT:
1770 RETVAL
1771
1772iow *
1773iow::start ()
1774 CODE:
1775 THIS->start ();
1776 RETVAL = THIS;
1777 OUTPUT:
1778 RETVAL
1779
1780iow *
1781iow::stop ()
1782 CODE:
1783 THIS->stop ();
1784 RETVAL = THIS;
1785 OUTPUT:
1786 RETVAL
1787
1788void
1789iow::DESTROY ()
1790
1791

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines