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.171 by root, Tue Jun 5 22:23:07 2012 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
23#define line_t perl_line_t 23#define line_t perl_line_t
24#include <EXTERN.h> 24#include <EXTERN.h>
25#include <perl.h> 25#include <perl.h>
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28#undef bool // perl defines it's own bool type, except with g++... what a trap
28 29
29#include "../config.h" 30#include "../config.h"
30 31
31#include <cstddef> 32#include <stddef.h>
32#include <cstdarg> 33#include <stdarg.h>
33 34
34#include "unistd.h" 35#include "unistd.h"
35 36
36#include "iom.h" 37#include "ev_cpp.h"
37#include "rxvt.h" 38#include "rxvt.h"
38#include "keyboard.h" 39#include "keyboard.h"
39#include "rxvtutil.h" 40#include "rxvtutil.h"
40#include "rxvtperl.h" 41#include "rxvtperl.h"
41 42
42#include "perlxsi.c" 43#include "perlxsi.c"
43 44
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 46
50#undef LINENO 47#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 49#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
54 51
55#define ENABLE_PERL_FRILLS 1 52/////////////////////////////////////////////////////////////////////////////
53
54typedef char * octet_string;
55typedef char * utf8_string;
56
57typedef int render_repeat_mode;
58
59typedef GdkPixbuf * urxvt__pixbuf;
60typedef rxvt_img * urxvt__img;
61
62/////////////////////////////////////////////////////////////////////////////
63
64static void
65parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
66{
67 //TODO: support component stuff
68 c.set (s, SvPVbyte_nolen (sv));
69}
56 70
57///////////////////////////////////////////////////////////////////////////// 71/////////////////////////////////////////////////////////////////////////////
58 72
59static wchar_t * 73static wchar_t *
60sv2wcs (SV *sv) 74sv2wcs (SV *sv)
75 89
76 return sv; 90 return sv;
77} 91}
78 92
79static SV * 93static 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) 94newSVptr (void *ptr, const char *klass)
88{ 95{
89 HV *hv = newHV (); 96 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 97 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 98 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); 120 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 121
115 return (long)mg->mg_ptr; 122 return (long)mg->mg_ptr;
116} 123}
117 124
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 125#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 126#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 127
121///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
122 129
123struct perl_watcher 130#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
131
132class overlay : overlay_base
124{ 133{
125 SV *cbsv; 134 rxvt_term *THIS;
135 AV *overlay_av;
136 int border;
137
138public:
126 HV *self; 139 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 140
222 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 141 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
223 ~overlay (); 142 ~overlay ();
224 143
225 void show (); 144 void show ();
229 148
230 void set (int x, int y, SV *str, SV *rend); 149 void set (int x, int y, SV *str, SV *rend);
231}; 150};
232 151
233overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 152overlay::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) 153: THIS(THIS), border(border == 2), overlay_av (0)
235{ 154{
155 x = x_;
156 y = y_;
157 w = w_;
158 h = h_;
159
160 if (w < 0) w = 0;
161 if (h < 0) h = 0;
162
236 if (border == 2) 163 if (border == 2)
237 { 164 {
238 w += 2; 165 w += 2;
239 h += 2; 166 h += 2;
240 } 167 }
278 *rp++ = r; 205 *rp++ = r;
279 } 206 }
280 } 207 }
281 208
282 show (); 209 show ();
283 THIS->want_refresh = 1;
284} 210}
285 211
286overlay::~overlay () 212overlay::~overlay ()
287{ 213{
288 hide (); 214 hide ();
293 delete [] rend[y]; 219 delete [] rend[y];
294 } 220 }
295 221
296 delete [] text; 222 delete [] text;
297 delete [] rend; 223 delete [] rend;
224}
225
226void
227overlay::show ()
228{
229 if (overlay_av)
230 return;
231
232 overlay_av = (AV *)SvREFCNT_inc (SvRV (
233 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
234 ));
235 av_push (overlay_av, newSViv ((long)this));
298 236
299 THIS->want_refresh = 1; 237 THIS->want_refresh = 1;
300} 238 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} 239}
310 240
311void 241void
312overlay::hide () 242overlay::hide ()
313{ 243{
314 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 244 if (!overlay_av)
245 return;
315 246
316 if (ovs) 247 int i;
317 {
318 char key[33]; sprintf (key, "%32lx", (long)this);
319 248
320 HV *hv = (HV *)SvRV (*ovs); 249 for (i = AvFILL (overlay_av); i >= 0; i--)
321 hv_delete (hv, key, 32, G_DISCARD); 250 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
322 } 251 break;
252
253 for (; i < AvFILL (overlay_av); i++)
254 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
255
256 av_pop (overlay_av);
257
258 SvREFCNT_dec (overlay_av);
259 overlay_av = 0;
260
261 THIS->want_refresh = 1;
262 THIS->refresh_check ();
323} 263}
324 264
325void overlay::swap () 265void overlay::swap ()
326{ 266{
327 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 267 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)); 268 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
329 269
330 int ov_w = min (w, THIS->ncol - ov_x); 270 int ov_w = min (w, THIS->ncol - ov_x);
331 int ov_h = min (h, THIS->nrow - ov_y); 271 int ov_h = min (h, THIS->nrow - ov_y);
272
273 // hide cursor if it is within the overlay area
274 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
275 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
276 THIS->screen.flags &= ~Screen_VisibleCursor;
332 277
333 for (int y = ov_h; y--; ) 278 for (int y = ov_h; y--; )
334 { 279 {
335 text_t *t1 = text [y]; 280 text_t *t1 = text [y];
336 rend_t *r1 = rend [y]; 281 rend_t *r1 = rend [y];
367 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 312 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
368 croak ("rend must be arrayref"); 313 croak ("rend must be arrayref");
369 314
370 AV *av = (AV *)SvRV (rend); 315 AV *av = (AV *)SvRV (rend);
371 316
372 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 317 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
373 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 318 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
374 } 319 }
375 320
376 THIS->want_refresh = 1; 321 THIS->want_refresh = 1;
322 THIS->refresh_check ();
377} 323}
378 324
325/////////////////////////////////////////////////////////////////////////////
326
327#include "iom_perl.h"
379 328
380///////////////////////////////////////////////////////////////////////////// 329/////////////////////////////////////////////////////////////////////////////
381 330
382struct rxvt_perl_interp rxvt_perl; 331struct rxvt_perl_interp rxvt_perl;
383 332
387{ 336{
388 if (perl) 337 if (perl)
389 { 338 {
390 perl_destruct (perl); 339 perl_destruct (perl);
391 perl_free (perl); 340 perl_free (perl);
341 PERL_SYS_TERM ();
392 } 342 }
393} 343}
394 344
395void 345void
396rxvt_perl_interp::init (rxvt_term *term) 346rxvt_perl_interp::init (rxvt_term *term)
397{ 347{
398 if (!perl) 348 if (!perl)
399 { 349 {
400 rxvt_push_locale (""); // perl init destroys current locale 350 rxvt_push_locale (""); // perl init destroys current locale
401 351
352 {
402 perl_environ = rxvt_environ; 353 perl_environ = rxvt_environ;
403 swap (perl_environ, environ); 354 localise_env set_environ (perl_environ);
404 355
405 char *argv[] = { 356 char *args[] = {
406 "", 357 "",
407 "-e" 358 "-e"
408 "BEGIN {" 359 "BEGIN {"
409 " urxvt->bootstrap;" 360 " urxvt->bootstrap;"
410 " unshift @INC, '" LIBDIR "';" 361 " unshift @INC, '" LIBDIR "';"
411 "}" 362 "}"
412 "" 363 ""
413 "use urxvt;" 364 "use urxvt;"
414 }; 365 };
366 int argc = ecb_array_length (args);
367 char **argv = args;
415 368
369 PERL_SYS_INIT3 (&argc, &argv, &environ);
416 perl = perl_alloc (); 370 perl = perl_alloc ();
417 perl_construct (perl); 371 perl_construct (perl);
418 372
419 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 373 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
420 || perl_run (perl)) 374 || perl_run (perl))
421 { 375 {
422 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 376 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
423 377
424 perl_destruct (perl); 378 perl_destruct (perl);
425 perl_free (perl); 379 perl_free (perl);
426 perl = 0; 380 perl = 0;
427 } 381 }
428 382 }
429 swap (perl_environ, environ);
430 383
431 rxvt_pop_locale (); 384 rxvt_pop_locale ();
432 } 385 }
433 386
434 if (perl) 387 if (perl)
435 { 388 {
436 // runs outside of perls ENV 389 // runs outside of perls ENV
437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 390 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); 391 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
392 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
439 } 393 }
394}
395
396void
397rxvt_perl_interp::usage (rxvt_term *term, int type)
398{
399 localise_env set_environ (perl_environ);
400
401 ENTER;
402 SAVETMPS;
403
404 dSP;
405 EXTEND (SP, 2);
406 PUSHs (sv_2mortal (newSVterm (term)));
407 PUSHs (sv_2mortal (newSViv (type)));
408 PUTBACK;
409 call_pv ("urxvt::usage", G_VOID | G_DISCARD | G_EVAL);
410
411 FREETMPS;
412 LEAVE;
413}
414
415uint8_t
416rxvt_perl_interp::resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
417{
418 localise_env set_environ (perl_environ);
419
420 ENTER;
421 SAVETMPS;
422
423 dSP;
424 EXTEND (SP, 6);
425 PUSHs (sv_2mortal (newSVterm (term)));
426 PUSHs (sv_2mortal (newSVpv (name, 0)));
427 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
429 PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
430 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
431 PUTBACK;
432 call_pv ("urxvt::resource", G_SCALAR | G_EVAL);
433
434 uint8_t ret = POPi;
435
436 FREETMPS;
437 LEAVE;
438
439 return ret;
440} 440}
441 441
442static void 442static void
443ungrab (rxvt_term *THIS) 443ungrab (rxvt_term *THIS)
444{ 444{
445 if (THIS->perl.grabtime) 445 if (THIS->perl.grabtime)
446 { 446 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 447 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 448 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 449 THIS->perl.grabtime = 0;
450 } 450 }
451} 451}
452 452
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 453bool
468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
469{ 455{
470 if (!perl || !term->perl.self) 456 if (!perl || !term->perl.self)
471 return false; 457 return false;
472 458
459 localise_env set_environ (perl_environ);
460
473 // pre-handling of some events 461 // pre-handling of some events
474 if (htype == HOOK_REFRESH_END) 462 if (htype == HOOK_REFRESH_END)
475 swap_overlays (term); 463 {
464 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
476 465
477 swap (perl_environ, environ); 466 for (int i = 0; i <= AvFILL (av); i++)
467 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
468 }
469 else if (htype == HOOK_DESTROY)
470 {
471 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
472
473 for (int i = AvFILL (av); i >= 0; i--)
474 {
475 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
476 delete req;
477 }
478 }
478 479
479 bool event_consumed; 480 bool event_consumed;
480 481
481 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
482 || term->perl.should_invoke [htype]) 482 if (term->perl.should_invoke [htype])
483 try
484 { 483 {
485 dSP; 484 dSP;
486 va_list ap; 485 va_list ap;
487 486
488 va_start (ap, htype); 487 va_start (ap, htype);
489 488
490 ENTER; 489 ENTER;
491 SAVETMPS; 490 SAVETMPS;
492 491
493 PUSHMARK (SP); 492 PUSHMARK (SP);
494 493
494 EXTEND (SP, 2);
495 XPUSHs (sv_2mortal (newSVterm (term))); 495 PUSHs (sv_2mortal (newSVterm (term)));
496 XPUSHs (sv_2mortal (newSViv (htype))); 496 PUSHs (sv_2mortal (newSViv (htype)));
497 497
498 for (;;) { 498 for (;;) {
499 data_type dt = (data_type)va_arg (ap, int); 499 data_type dt = (data_type)va_arg (ap, int);
500 500
501 switch (dt) 501 switch (dt)
502 { 502 {
503 case DT_INT: 503 case DT_INT:
504 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 504 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
505 break; 505 break;
506 506
507 case DT_LONG: 507 case DT_LONG:
508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
509 break; 509 break;
510 510
511 case DT_STR: 511 case DT_STR:
512 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 512 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
513 break; 513 break;
514 514
515 case DT_STR_LEN: 515 case DT_STR_LEN:
516 { 516 {
517 char *str = va_arg (ap, char *); 517 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int); 518 int len = va_arg (ap, int);
519 519
520 XPUSHs (sv_2mortal (newSVpvn (str, len))); 520 XPUSHs (sv_2mortal (newSVpvn (str, len)));
521 } 521 }
522 break; 522 break;
523 523
524 case DT_WCS_LEN: 524 case DT_WCS_LEN:
525 { 525 {
526 wchar_t *wstr = va_arg (ap, wchar_t *); 526 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int); 527 int wlen = va_arg (ap, int);
528 528
529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
530 } 530 }
531 break; 531 break;
532 532
533 case DT_LCS_LEN:
534 {
535 long *lstr = va_arg (ap, long *);
536 int llen = va_arg (ap, int);
537
538 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
539 }
540 break;
541
533 case DT_XEVENT: 542 case DT_XEVENT:
534 { 543 {
535 XEvent *xe = va_arg (ap, XEvent *); 544 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV (); 545 HV *hv = newHV ();
537 546
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 547# 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) 548# 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) 549# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
541# undef set 550# undef set
542 551
543 setiv (type, xe->type); 552 setiv (type, xe->type);
544 setiv (send_event, xe->xany.send_event); 553 setiv (send_event, xe->xany.send_event);
545 setiv (serial, xe->xany.serial); 554 setiv (serial, xe->xany.serial);
546 555
547 switch (xe->type) 556 switch (xe->type)
548 { 557 {
549 case KeyPress: 558 case KeyPress:
550 case KeyRelease: 559 case KeyRelease:
551 case ButtonPress: 560 case ButtonPress:
552 case ButtonRelease: 561 case ButtonRelease:
553 case MotionNotify: 562 case MotionNotify:
554 setuv (window, xe->xmotion.window); 563 setuv (window, xe->xmotion.window);
555 setuv (root, xe->xmotion.root); 564 setuv (root, xe->xmotion.root);
556 setuv (subwindow, xe->xmotion.subwindow); 565 setuv (subwindow, xe->xmotion.subwindow);
557 setuv (time, xe->xmotion.time); 566 setuv (time, xe->xmotion.time);
558 setiv (x, xe->xmotion.x); 567 setiv (x, xe->xmotion.x);
559 setiv (y, xe->xmotion.y); 568 setiv (y, xe->xmotion.y);
560 setiv (row, xe->xmotion.y / term->fheight); 569 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
561 setiv (col, xe->xmotion.x / term->fwidth); 570 setiv (col, xe->xmotion.x / term->fwidth);
562 setiv (x_root, xe->xmotion.x_root); 571 setiv (x_root, xe->xmotion.x_root);
563 setiv (y_root, xe->xmotion.y_root); 572 setiv (y_root, xe->xmotion.y_root);
564 setuv (state, xe->xmotion.state); 573 setuv (state, xe->xmotion.state);
565 574
566 switch (xe->type) 575 switch (xe->type)
567 { 576 {
568 case KeyPress: 577 case KeyPress:
569 case KeyRelease: 578 case KeyRelease:
570 setuv (keycode, xe->xkey.keycode); 579 setuv (keycode, xe->xkey.keycode);
571 break; 580 break;
572 581
573 case ButtonPress: 582 case ButtonPress:
574 case ButtonRelease: 583 case ButtonRelease:
575 setuv (button, xe->xbutton.button); 584 setuv (button, xe->xbutton.button);
576 break; 585 break;
577 586
578 case MotionNotify: 587 case MotionNotify:
579 setiv (is_hint, xe->xmotion.is_hint); 588 setiv (is_hint, xe->xmotion.is_hint);
580 break; 589 break;
581 } 590 }
582 591
583 break; 592 break;
584 593
585 case MapNotify: 594 case MapNotify:
586 case UnmapNotify: 595 case UnmapNotify:
587 case ConfigureNotify: 596 case ConfigureNotify:
588 setuv (event, xe->xconfigure.event); 597 setuv (event, xe->xconfigure.event);
589 setuv (window, xe->xconfigure.window); 598 setuv (window, xe->xconfigure.window);
590 599
591 switch (xe->type) 600 switch (xe->type)
592 { 601 {
593 case ConfigureNotify: 602 case ConfigureNotify:
594 setiv (x, xe->xconfigure.x); 603 setiv (x, xe->xconfigure.x);
595 setiv (y, xe->xconfigure.y); 604 setiv (y, xe->xconfigure.y);
596 setiv (width, xe->xconfigure.width); 605 setiv (width, xe->xconfigure.width);
597 setiv (height, xe->xconfigure.height); 606 setiv (height, xe->xconfigure.height);
598 setuv (above, xe->xconfigure.above); 607 setuv (above, xe->xconfigure.above);
599 break; 608 break;
600 } 609 }
601 610
602 break; 611 break;
612
613 case PropertyNotify:
614 setuv (window, xe->xproperty.window);
615 setuv (atom, xe->xproperty.atom);
616 setuv (time, xe->xproperty.time);
617 setiv (state, xe->xproperty.state);
618 break;
619
620 case ClientMessage:
621 setuv (window, xe->xclient.window);
622 setuv (message_type, xe->xclient.message_type);
623 setuv (format, xe->xclient.format);
624 setuv (l0, xe->xclient.data.l[0]);
625 setuv (l1, xe->xclient.data.l[1]);
626 setuv (l2, xe->xclient.data.l[2]);
627 setuv (l3, xe->xclient.data.l[3]);
628 setuv (l4, xe->xclient.data.l[4]);
629 break;
603 } 630 }
604 631
605 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 632 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
606 } 633 }
607 break; 634 break;
608 635
609 case DT_END: 636 case DT_END:
610 goto call; 637 goto call;
611 638
612 default: 639 default:
613 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 640 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
614 } 641 }
642 }
643
644 call:
645 va_end (ap);
646
647 PUTBACK;
648 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
649 SPAGAIN;
650
651 if (count)
652 {
653 SV *status = POPs;
654 count = SvTRUE (status);
615 } 655 }
616 656
617 call:
618 va_end (ap);
619
620 PUTBACK; 657 PUTBACK;
621 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
622 SPAGAIN;
623
624 if (count)
625 {
626 SV *status = POPs;
627 count = SvTRUE (status);
628 }
629
630 PUTBACK;
631 FREETMPS; 658 FREETMPS;
632 LEAVE; 659 LEAVE;
633 660
634 if (SvTRUE (ERRSV)) 661 if (SvTRUE (ERRSV))
635 { 662 {
636 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 663 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
637 ungrab (term); // better lose the grab than the session 664 ungrab (term); // better lose the grab than the session
638 } 665 }
639 666
640 event_consumed = !!count; 667 event_consumed = !!count;
641 } 668 }
642 catch (...)
643 {
644 swap (perl_environ, environ);
645 throw;
646 }
647 else 669 else
648 event_consumed = false; 670 event_consumed = false;
649 671
650 // post-handling of some events 672 // post-handling of some events
651 if (htype == HOOK_REFRESH_BEGIN) 673 if (htype == HOOK_REFRESH_BEGIN)
652 swap_overlays (term); 674 {
675 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
676
677 for (int i = AvFILL (av); i >= 0; i--)
678 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
679 }
653 else if (htype == HOOK_DESTROY) 680 else if (htype == HOOK_DESTROY)
654 { 681 {
655 clearSVptr ((SV *)term->perl.self); 682 clearSVptr ((SV *)term->perl.self);
656 SvREFCNT_dec ((SV *)term->perl.self); 683 SvREFCNT_dec ((SV *)term->perl.self);
684
685 // don't allow further calls
686 term->perl.self = 0;
657 } 687 }
658 688
659 swap (perl_environ, environ);
660
661 return event_consumed; 689 return event_consumed;
690}
691
692void
693rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
694{
695 localise_env set_environ (perl_environ);
696
697 ENTER;
698 SAVETMPS;
699
700 dSP;
701 XPUSHs (sv_2mortal (newSVpvn (data, len)));
702 PUTBACK;
703 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
704
705 if (SvTRUE (ERRSV))
706 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
707
708 FREETMPS;
709 LEAVE;
662} 710}
663 711
664///////////////////////////////////////////////////////////////////////////// 712/////////////////////////////////////////////////////////////////////////////
665 713
666MODULE = urxvt PACKAGE = urxvt 714MODULE = urxvt PACKAGE = urxvt
678# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 726# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
679# include "hookinc.h" 727# include "hookinc.h"
680# undef def 728# undef def
681 729
682 HV *option = get_hv ("urxvt::OPTION", 1); 730 HV *option = get_hv ("urxvt::OPTION", 1);
683# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 731# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
684# define nodef(name) 732# define nodef(name)
685# include "optinc.h" 733# include "optinc.h"
686# undef nodef 734# undef nodef
687# undef def 735# undef def
688 736
689 HV *stash = gv_stashpv ("urxvt", 1); 737 HV *stash = gv_stashpv ("urxvt", 1);
690 struct { 738 static const struct {
691 const char *name; 739 const char *name;
692 IV iv; 740 IV iv;
693 } *civ, const_iv[] = { 741 } *civ, const_iv[] = {
694# define const_iv(name) { # name, (IV)name } 742# define const_iv(name) { # name, (IV)name }
743 const_iv (NUM_RESOURCES),
695 const_iv (DEFAULT_RSTYLE), 744 const_iv (DEFAULT_RSTYLE),
696 const_iv (OVERLAY_RSTYLE), 745 const_iv (OVERLAY_RSTYLE),
746 const_iv (Color_Bits),
747 const_iv (RS_bgShift), const_iv (RS_bgMask),
748 const_iv (RS_fgShift), const_iv (RS_fgMask),
749 const_iv (RS_Careful),
750 const_iv (RS_fontCount),
751 const_iv (RS_fontShift),
752 const_iv (RS_fontMask),
753 const_iv (RS_baseattrMask),
754 const_iv (RS_attrMask),
755 const_iv (RS_redraw),
756 const_iv (RS_Sel),
697 const_iv (RS_Bold), 757 const_iv (RS_Bold),
698 const_iv (RS_Italic), 758 const_iv (RS_Italic),
699 const_iv (RS_Blink), 759 const_iv (RS_Blink),
700 const_iv (RS_RVid), 760 const_iv (RS_RVid),
701 const_iv (RS_Uline), 761 const_iv (RS_Uline),
714 const_iv (Button3Mask), 774 const_iv (Button3Mask),
715 const_iv (Button4Mask), 775 const_iv (Button4Mask),
716 const_iv (Button5Mask), 776 const_iv (Button5Mask),
717 const_iv (AnyModifier), 777 const_iv (AnyModifier),
718 778
719 const_iv (EVENT_NONE), 779 const_iv (NoSymbol),
720 const_iv (EVENT_READ), 780 const_iv (GrabModeSync),
721 const_iv (EVENT_WRITE), 781 const_iv (GrabModeAsync),
722 782
723 const_iv (NoEventMask), 783 const_iv (NoEventMask),
724 const_iv (KeyPressMask), 784 const_iv (KeyPressMask),
725 const_iv (KeyReleaseMask), 785 const_iv (KeyReleaseMask),
726 const_iv (ButtonPressMask), 786 const_iv (ButtonPressMask),
778 const_iv (SelectionRequest), 838 const_iv (SelectionRequest),
779 const_iv (SelectionNotify), 839 const_iv (SelectionNotify),
780 const_iv (ColormapNotify), 840 const_iv (ColormapNotify),
781 const_iv (ClientMessage), 841 const_iv (ClientMessage),
782 const_iv (MappingNotify), 842 const_iv (MappingNotify),
843# if ENABLE_XIM_ONTHESPOT
844 const_iv (XIMReverse),
845 const_iv (XIMUnderline),
846 const_iv (XIMHighlight),
847 const_iv (XIMPrimary),
848 const_iv (XIMSecondary),
849 const_iv (XIMTertiary),
850 const_iv (XIMVisibleToForward),
851 const_iv (XIMVisibleToBackword),
852 const_iv (XIMVisibleToCenter),
853#if XRENDER
854 const_iv (PictStandardARGB32),
855 const_iv (PictStandardRGB24),
856 const_iv (PictStandardA8),
857 const_iv (PictStandardA4),
858 const_iv (PictStandardA1),
859 const_iv (RepeatNone),
860 const_iv (RepeatNormal),
861 const_iv (RepeatPad),
862 const_iv (RepeatReflect),
863#endif
864# if 0
865 const_iv (XIMForwardChar),
866 const_iv (XIMBackwardChar),
867 const_iv (XIMForwardWord),
868 const_iv (XIMBackwardWord),
869 const_iv (XIMCaretUp),
870 const_iv (XIMCaretDown),
871 const_iv (XIMNextLine),
872 const_iv (XIMPreviousLine),
873 const_iv (XIMLineStart),
874 const_iv (XIMLineEnd),
875 const_iv (XIMAbsolutePosition),
876 const_iv (XIMDontChange),
877# endif
878# endif
783 }; 879 };
784 880
785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 881 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
786 civ-- > const_iv; )
787 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 882 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
788} 883}
884
885void
886log (const char *msg)
887 CODE:
888 rxvt_log ("%s", msg);
789 889
790void 890void
791warn (const char *msg) 891warn (const char *msg)
792 CODE: 892 CODE:
793 rxvt_warn ("%s", msg); 893 rxvt_warn ("%s", msg);
797 CODE: 897 CODE:
798 rxvt_fatal ("%s", msg); 898 rxvt_fatal ("%s", msg);
799 899
800void 900void
801_exit (int status) 901_exit (int status)
902
903void
904catch_fatal (SV *block)
905 PROTOTYPE: &
906 CODE:
907 try
908 {
909 PUSHMARK (SP);
910 PUTBACK;
911 call_sv (block, G_VOID | G_DISCARD);
912 SPAGAIN;
913 }
914 catch (const rxvt_failure_exception &e)
915 {
916 croak ("rxvt_fatal exception caught, trying to continue.");
917 }
802 918
803NV 919NV
804NOW () 920NOW ()
805 CODE: 921 CODE:
806 RETVAL = NOW; 922 RETVAL = ev::now ();
807 OUTPUT: 923 OUTPUT:
808 RETVAL 924 RETVAL
809 925
810int 926int
811GET_BASEFG (int rend) 927GET_BASEFG (int rend)
822 RETVAL 938 RETVAL
823 939
824int 940int
825SET_FGCOLOR (int rend, int new_color) 941SET_FGCOLOR (int rend, int new_color)
826 CODE: 942 CODE:
827 RETVAL = SET_FGCOLOR (rend, new_color); 943 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
828 OUTPUT: 944 OUTPUT:
829 RETVAL 945 RETVAL
830 946
831int 947int
832SET_BGCOLOR (int rend, int new_color) 948SET_BGCOLOR (int rend, int new_color)
833 CODE: 949 CODE:
834 RETVAL = SET_BGCOLOR (rend, new_color); 950 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
835 OUTPUT: 951 OUTPUT:
836 RETVAL 952 RETVAL
837 953
838int 954int
839GET_CUSTOM (int rend) 955GET_CUSTOM (int rend)
840 CODE: 956 CODE:
841 RETVAL = (rend && RS_customMask) >> RS_customShift; 957 RETVAL = (rend & RS_customMask) >> RS_customShift;
842 OUTPUT: 958 OUTPUT:
843 RETVAL 959 RETVAL
844 960
845int 961int
846SET_CUSTOM (int rend, int new_value) 962SET_CUSTOM (int rend, int new_value)
853 | ((new_value << RS_customShift) & RS_customMask); 969 | ((new_value << RS_customShift) & RS_customMask);
854} 970}
855 OUTPUT: 971 OUTPUT:
856 RETVAL 972 RETVAL
857 973
974void
975termlist ()
976 PPCODE:
977{
978 EXTEND (SP, rxvt_term::termlist.size ());
979
980 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
981 if ((*t)->perl.self)
982 PUSHs (sv_2mortal (newSVterm (*t)));
983}
984
985IV
986_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
987 CODE:
988 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
989 req->cb_sv = newSVsv (cb);
990 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
991 av_push (av, newSViv ((IV)req));
992 RETVAL = (IV)req;
993 OUTPUT:
994 RETVAL
995
996void
997_delete_selection_request (IV req_)
998 CODE:
999 rxvt_selection *req = (rxvt_selection *)req_;
1000 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
1001 int i;
1002
1003 for (i = AvFILL (av); i >= 0; i--)
1004 if (SvIV (*av_fetch (av, i, 1)) == req_)
1005 break;
1006
1007 for (; i < AvFILL (av); i++)
1008 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
1009
1010 av_pop (av);
1011
1012 delete req;
1013
858MODULE = urxvt PACKAGE = urxvt::term 1014MODULE = urxvt PACKAGE = urxvt::term
859 1015
860SV * 1016SV *
861_new (...) 1017_new (AV *env, AV *arg)
862 CODE: 1018 CODE:
863{ 1019{
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; 1020 rxvt_term *term = new rxvt_term;
868 1021
869 term->argv = new stringvec; 1022 stringvec *argv = new stringvec;
870 term->envv = new stringvec; 1023 for (int i = 0; i <= AvFILL (arg); i++)
871
872 for (int i = 1; i < items; i++)
873 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 1024 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
874 1025
875 AV *envv = (AV *)SvRV (ST (0)); 1026 stringvec *envv = new stringvec;
876 for (int i = av_len (envv) + 1; i--; ) 1027 for (int i = AvFILL (env) + 1; i--; )
877 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 1028 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
878
879 term->envv->push_back (0);
880
881 bool success;
882 1029
883 try 1030 try
884 { 1031 {
885 success = term->init (term->argv->size (), term->argv->begin ()); 1032 term->init (argv, envv);
886 } 1033 }
887 catch (const class rxvt_failure_exception &e) 1034 catch (const class rxvt_failure_exception &e)
888 {
889 success = false;
890 }
891
892 if (!success)
893 { 1035 {
894 term->destroy (); 1036 term->destroy ();
895 croak ("error while initializing new terminal instance"); 1037 croak ("error while initializing new terminal instance");
896 } 1038 }
897 1039
902 RETVAL 1044 RETVAL
903 1045
904void 1046void
905rxvt_term::destroy () 1047rxvt_term::destroy ()
906 1048
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 1049void
997rxvt_term::set_should_invoke (int htype, int inc) 1050rxvt_term::set_should_invoke (int htype, int inc)
998 CODE: 1051 CODE:
999 THIS->perl.should_invoke [htype] += inc; 1052 uint8_t &count = THIS->perl.should_invoke [htype];
1053 uint8_t prev = count;
1054 count += inc;
1055 if (!prev != !count)
1056 {
1057 // hook status changed, react
1058 switch (htype)
1059 {
1060 case HOOK_POSITION_CHANGE:
1061 if (count)
1062 THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1063 }
1064 }
1000 1065
1001void 1066int
1002rxvt_term::grab_button (int button, U32 modifiers) 1067rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1003 CODE: 1068 CODE:
1004 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1069 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1005 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1070 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1006 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1071 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1072 OUTPUT: RETVAL
1073
1074int
1075rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1076 CODE:
1077 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
1078 OUTPUT: RETVAL
1079
1080void
1081rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1082 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1083 CODE:
1084 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1085
1086void
1087rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
1088 CODE:
1089 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1007 1090
1008bool 1091bool
1009rxvt_term::grab (U32 eventtime, int sync = 0) 1092rxvt_term::grab (Time eventtime, int sync = 0)
1010 CODE: 1093 CODE:
1011{ 1094{
1012 int mode = sync ? GrabModeSync : GrabModeAsync; 1095 int mode = sync ? GrabModeSync : GrabModeAsync;
1013 1096
1014 THIS->perl.grabtime = 0; 1097 THIS->perl.grabtime = 0;
1015 1098
1016 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1099 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1017 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1100 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1018 mode, mode, None, GRAB_CURSOR, eventtime)) 1101 mode, mode, None, GRAB_CURSOR, eventtime))
1019 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1102 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1020 THIS->perl.grabtime = eventtime; 1103 THIS->perl.grabtime = eventtime;
1021 else 1104 else
1022 XUngrabPointer (THIS->display->display, eventtime); 1105 XUngrabPointer (THIS->dpy, eventtime);
1023 1106
1024 RETVAL = !!THIS->perl.grabtime; 1107 RETVAL = !!THIS->perl.grabtime;
1025} 1108}
1026 OUTPUT: 1109 OUTPUT:
1027 RETVAL 1110 RETVAL
1028 1111
1029void 1112void
1030rxvt_term::allow_events_async () 1113rxvt_term::allow_events_async ()
1031 CODE: 1114 CODE:
1032 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1115 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1033 1116
1034void 1117void
1035rxvt_term::allow_events_sync () 1118rxvt_term::allow_events_sync ()
1036 CODE: 1119 CODE:
1037 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1120 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1038 1121
1039void 1122void
1040rxvt_term::allow_events_replay () 1123rxvt_term::allow_events_replay ()
1041 CODE: 1124 CODE:
1042 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1125 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1043 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1126 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1044 1127
1045void 1128void
1046rxvt_term::ungrab () 1129rxvt_term::ungrab ()
1047 CODE: 1130 CODE:
1048 ungrab (THIS); 1131 ungrab (THIS);
1132
1133int
1134rxvt_term::XStringToKeysym (char *string)
1135 CODE:
1136 RETVAL = XStringToKeysym (string);
1137 OUTPUT: RETVAL
1138
1139char *
1140rxvt_term::XKeysymToString (int sym)
1141 CODE:
1142 RETVAL = XKeysymToString (sym);
1143 OUTPUT: RETVAL
1144
1145int
1146rxvt_term::XKeysymToKeycode (int sym)
1147 CODE:
1148 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
1149 OUTPUT: RETVAL
1150
1151int
1152rxvt_term::XKeycodeToKeysym (int code, int index)
1153 CODE:
1154 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
1155 OUTPUT: RETVAL
1049 1156
1050int 1157int
1051rxvt_term::strwidth (SV *str) 1158rxvt_term::strwidth (SV *str)
1052 CODE: 1159 CODE:
1053{ 1160{
1054 wchar_t *wstr = sv2wcs (str); 1161 wchar_t *wstr = sv2wcs (str);
1055 1162
1056 rxvt_push_locale (THIS->locale); 1163 rxvt_push_locale (THIS->locale);
1057 RETVAL = wcswidth (wstr, wcslen (wstr)); 1164 RETVAL = 0;
1165 for (wchar_t *wc = wstr; *wc; wc++)
1166 {
1167 int w = WCWIDTH (*wc);
1168
1169 if (w)
1170 RETVAL += max (w, 1);
1171 }
1058 rxvt_pop_locale (); 1172 rxvt_pop_locale ();
1059 1173
1060 free (wstr); 1174 free (wstr);
1061} 1175}
1062 OUTPUT: 1176 OUTPUT:
1097 OUTPUT: 1211 OUTPUT:
1098 RETVAL 1212 RETVAL
1099 1213
1100#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1214#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1101 1215
1102#define TERM_OFFSET_width TERM_OFFSET(width) 1216#define TERM_OFFSET_width TERM_OFFSET(width)
1103#define TERM_OFFSET_height TERM_OFFSET(height) 1217#define TERM_OFFSET_height TERM_OFFSET(height)
1104#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1218#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1105#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1219#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1106#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1220#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1107#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1221#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1108#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1222#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1109#define TERM_OFFSET_focus TERM_OFFSET(focus) 1223#define TERM_OFFSET_focus TERM_OFFSET(focus)
1110#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1224#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1225#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1226#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1227#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1228#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1111#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1229#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1112#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1230#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1113#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1231#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1114 1232
1115int 1233int
1116rxvt_term::width () 1234rxvt_term::width ()
1117 ALIAS: 1235 ALIAS:
1118 width = TERM_OFFSET_width 1236 width = TERM_OFFSET_width
1119 height = TERM_OFFSET_height 1237 height = TERM_OFFSET_height
1120 fwidth = TERM_OFFSET_fwidth 1238 fwidth = TERM_OFFSET_fwidth
1121 fheight = TERM_OFFSET_fheight 1239 fheight = TERM_OFFSET_fheight
1122 fbase = TERM_OFFSET_fbase 1240 fbase = TERM_OFFSET_fbase
1123 nrow = TERM_OFFSET_nrow 1241 nrow = TERM_OFFSET_nrow
1124 ncol = TERM_OFFSET_ncol 1242 ncol = TERM_OFFSET_ncol
1125 focus = TERM_OFFSET_focus 1243 focus = TERM_OFFSET_focus
1126 mapped = TERM_OFFSET_mapped 1244 mapped = TERM_OFFSET_mapped
1245 int_bwidth = TERM_OFFSET_int_bwidth
1246 ext_bwidth = TERM_OFFSET_ext_bwidth
1247 lineSpace = TERM_OFFSET_lineSpace
1248 letterSpace = TERM_OFFSET_letterSpace
1127 saveLines = TERM_OFFSET_saveLines 1249 saveLines = TERM_OFFSET_saveLines
1128 total_rows = TERM_OFFSET_total_rows 1250 total_rows = TERM_OFFSET_total_rows
1129 top_row = TERM_OFFSET_top_row 1251 top_row = TERM_OFFSET_top_row
1130 CODE: 1252 CODE:
1131 RETVAL = *(int *)((char *)THIS + ix); 1253 RETVAL = *(int *)((char *)THIS + ix);
1132 OUTPUT: 1254 OUTPUT:
1133 RETVAL 1255 RETVAL
1134 1256
1136rxvt_term::ModLevel3Mask () 1258rxvt_term::ModLevel3Mask ()
1137 ALIAS: 1259 ALIAS:
1138 ModLevel3Mask = 0 1260 ModLevel3Mask = 0
1139 ModMetaMask = 1 1261 ModMetaMask = 1
1140 ModNumLockMask = 2 1262 ModNumLockMask = 2
1263 current_screen = 3
1264 hidden_cursor = 4
1141 CODE: 1265 CODE:
1142 switch (ix) 1266 switch (ix)
1143 { 1267 {
1144 case 0: RETVAL = THIS->ModLevel3Mask; break; 1268 case 0: RETVAL = THIS->ModLevel3Mask; break;
1145 case 1: RETVAL = THIS->ModMetaMask; break; 1269 case 1: RETVAL = THIS->ModMetaMask; break;
1146 case 2: RETVAL = THIS->ModNumLockMask; break; 1270 case 2: RETVAL = THIS->ModNumLockMask; break;
1271 case 3: RETVAL = THIS->current_screen; break;
1272#ifdef CURSOR_BLINK
1273 case 4: RETVAL = THIS->hidden_cursor; break;
1274#endif
1147 } 1275 }
1148 OUTPUT: 1276 OUTPUT:
1149 RETVAL 1277 RETVAL
1150 1278
1151char * 1279char *
1161 } 1289 }
1162 OUTPUT: 1290 OUTPUT:
1163 RETVAL 1291 RETVAL
1164 1292
1165SV * 1293SV *
1166rxvt_term::_env () 1294rxvt_term::envv ()
1295 ALIAS:
1296 argv = 1
1167 CODE: 1297 PPCODE:
1168{ 1298{
1169 if (THIS->envv) 1299 stringvec *vec = ix ? THIS->argv : THIS->envv;
1170 {
1171 AV *av = newAV ();
1172 1300
1301 EXTEND (SP, vec->size ());
1302
1173 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1303 for (char **i = vec->begin (); i != vec->end (); ++i)
1174 if (*i) 1304 if (*i)
1175 av_push (av, newSVpv (*i, 0)); 1305 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1176
1177 RETVAL = newRV_noinc ((SV *)av);
1178 }
1179 else
1180 RETVAL = &PL_sv_undef;
1181} 1306}
1307
1308int
1309rxvt_term::pty_ev_events (int events = ev::UNDEF)
1310 CODE:
1311 RETVAL = THIS->pty_ev.events;
1312 if (events != ev::UNDEF)
1313 THIS->pty_ev.set (events);
1314 OUTPUT:
1315 RETVAL
1316
1317int
1318rxvt_term::pty_fd ()
1319 CODE:
1320 RETVAL = THIS->pty->pty;
1321 OUTPUT:
1322 RETVAL
1323
1324Window
1325rxvt_term::parent ()
1326 CODE:
1327 RETVAL = THIS->parent;
1182 OUTPUT: 1328 OUTPUT:
1183 RETVAL 1329 RETVAL
1184 1330
1185int 1331int
1186rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1187 CODE:
1188 RETVAL = THIS->pty_ev.events;
1189 if (events != EVENT_UNDEF)
1190 THIS->pty_ev.set (events);
1191 OUTPUT:
1192 RETVAL
1193
1194U32
1195rxvt_term::parent () 1332rxvt_term::parent_x ()
1196 CODE: 1333 CODE:
1197 RETVAL = (U32)THIS->parent [0]; 1334 RETVAL = THIS->parent_x;
1198 OUTPUT: 1335 OUTPUT:
1199 RETVAL 1336 RETVAL
1200 1337
1201U32 1338int
1202rxvt_term::vt () 1339rxvt_term::parent_y ()
1203 CODE: 1340 CODE:
1204 RETVAL = (U32)THIS->vt; 1341 RETVAL = THIS->parent_y;
1205 OUTPUT: 1342 OUTPUT:
1206 RETVAL 1343 RETVAL
1207 1344
1208void 1345void
1209rxvt_term::vt_emask_add (U32 emask) 1346rxvt_term::vt_emask_add (U32 emask)
1231} 1368}
1232 OUTPUT: 1369 OUTPUT:
1233 RETVAL 1370 RETVAL
1234 1371
1235void 1372void
1373rxvt_term::set_urgency (bool enable)
1374
1375void
1376rxvt_term::focus_in ()
1377
1378void
1379rxvt_term::focus_out ()
1380
1381void
1382rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1383 ALIAS:
1384 key_release = 1
1385 CODE:
1386{
1387 XKeyEvent xkey;
1388
1389 memset (&xkey, 0, sizeof (xkey));
1390
1391 xkey.time = time;
1392 xkey.state = state;
1393 xkey.keycode = keycode;
1394
1395 xkey.type = ix ? KeyRelease : KeyPress;
1396 xkey.display = THIS->dpy;
1397 xkey.window = THIS->vt;
1398 xkey.root = THIS->display->root;
1399 xkey.subwindow = THIS->vt;
1400
1401 if (ix)
1402 THIS->key_release (xkey);
1403 else
1404 THIS->key_press (xkey);
1405}
1406
1407void
1236rxvt_term::want_refresh () 1408rxvt_term::want_refresh ()
1237 CODE: 1409 CODE:
1238 THIS->want_refresh = 1; 1410 THIS->want_refresh = 1;
1411 THIS->refresh_check ();
1239 1412
1240void 1413void
1241rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1414rxvt_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: 1415 PPCODE:
1243{ 1416{
1246 1419
1247 line_t &l = ROW(row_number); 1420 line_t &l = ROW(row_number);
1248 1421
1249 if (GIMME_V != G_VOID) 1422 if (GIMME_V != G_VOID)
1250 { 1423 {
1251 wchar_t *wstr = new wchar_t [THIS->ncol]; 1424 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1252 1425
1253 for (int col = 0; col < THIS->ncol; col++) 1426 for (int col = 0; col < THIS->ncol; col++)
1254 wstr [col] = l.t [col]; 1427 wstr [col] = l.t [col];
1255 1428
1256 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1429 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1257
1258 delete [] wstr;
1259 } 1430 }
1260 1431
1261 if (new_text) 1432 if (new_text)
1262 { 1433 {
1263 wchar_t *wstr = sv2wcs (new_text); 1434 wchar_t *wstr = sv2wcs (new_text);
1264 1435
1265 int len = min (wcslen (wstr) - start_ofs, max_len); 1436 int len = min (wcslen (wstr) - start_ofs, max_len);
1266 1437
1267 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1438 if (start_col < 0 || start_col + len > THIS->ncol)
1268 { 1439 {
1269 free (wstr); 1440 free (wstr);
1270 croak ("new_text extends beyond horizontal margins"); 1441 croak ("new_text extends beyond horizontal margins");
1271 } 1442 }
1272 1443
1304 { 1475 {
1305 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1476 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1306 croak ("new_rend must be arrayref"); 1477 croak ("new_rend must be arrayref");
1307 1478
1308 AV *av = (AV *)SvRV (new_rend); 1479 AV *av = (AV *)SvRV (new_rend);
1309 int len = min (av_len (av) + 1 - start_ofs, max_len); 1480 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1310 1481
1311 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1482 if (start_col < 0 || start_col + len > THIS->ncol)
1312 croak ("new_rend array extends beyond horizontal margins"); 1483 croak ("new_rend array extends beyond horizontal margins");
1313 1484
1314 for (int col = start_col; col < start_col + len; col++) 1485 for (int col = start_col; col < start_col + len; col++)
1315 { 1486 {
1316 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1487 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1356rxvt_term::special_encode (SV *string) 1527rxvt_term::special_encode (SV *string)
1357 CODE: 1528 CODE:
1358{ 1529{
1359 wchar_t *wstr = sv2wcs (string); 1530 wchar_t *wstr = sv2wcs (string);
1360 int wlen = wcslen (wstr); 1531 int wlen = wcslen (wstr);
1361 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1532 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1362 1533
1363 rxvt_push_locale (THIS->locale); 1534 rxvt_push_locale (THIS->locale);
1364 1535
1365 wchar_t *r = rstr; 1536 wchar_t *r = rstr;
1366 for (wchar_t *s = wstr; *s; s++) 1537 for (wchar_t *s = wstr; *s; s++)
1538 {
1539 int w = WCWIDTH (*s);
1540
1367 if (wcwidth (*s) == 0) 1541 if (w == 0)
1368 { 1542 {
1369 if (r == rstr) 1543 if (r == rstr)
1370 croak ("leading combining character unencodable"); 1544 croak ("leading combining character unencodable");
1371 1545
1372 unicode_t n = rxvt_compose (r[-1], *s); 1546 unicode_t n = rxvt_compose (r[-1], *s);
1373 if (n == NOCHAR) 1547 if (n == NOCHAR)
1374 n = rxvt_composite.compose (r[-1], *s); 1548 n = rxvt_composite.compose (r[-1], *s);
1375 1549
1376 r[-1] = n; 1550 r[-1] = n;
1377 } 1551 }
1378#if !UNICODE_3 1552#if !UNICODE_3
1379 else if (*s >= 0x10000) 1553 else if (*s >= 0x10000)
1380 *r++ = rxvt_composite.compose (*s); 1554 *r++ = rxvt_composite.compose (*s);
1381#endif 1555#endif
1382 else 1556 else
1383 *r++ = *s; 1557 *r++ = *s;
1558
1559 // the *2 above only allows wcwidth <= 2
1560 if (w > 1)
1561 *r++ = NOCHAR;
1562 }
1384 1563
1385 rxvt_pop_locale (); 1564 rxvt_pop_locale ();
1386 1565
1387 RETVAL = wcs2sv (rstr, r - rstr); 1566 RETVAL = wcs2sv (rstr, r - rstr);
1388
1389 delete [] rstr;
1390} 1567}
1391 OUTPUT: 1568 OUTPUT:
1392 RETVAL 1569 RETVAL
1393 1570
1394SV * 1571SV *
1395rxvt_term::special_decode (SV *text) 1572rxvt_term::special_decode (SV *text)
1396 CODE: 1573 CODE:
1397{ 1574{
1398 wchar_t *wstr = sv2wcs (text); 1575 wchar_t *wstr = sv2wcs (text);
1399 int wlen = wcslen (wstr);
1400 int dlen = 0; 1576 int dlen = 0;
1401 1577
1402 // find length 1578 // find length
1403 for (wchar_t *s = wstr; *s; s++) 1579 for (wchar_t *s = wstr; *s; s++)
1404 if (*s == NOCHAR) 1580 if (*s == NOCHAR)
1406 else if (IS_COMPOSE (*s)) 1582 else if (IS_COMPOSE (*s))
1407 dlen += rxvt_composite.expand (*s, 0); 1583 dlen += rxvt_composite.expand (*s, 0);
1408 else 1584 else
1409 dlen++; 1585 dlen++;
1410 1586
1411 wchar_t *rstr = new wchar_t [dlen]; 1587 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1412 1588
1413 // decode 1589 // decode
1414 wchar_t *r = rstr; 1590 wchar_t *r = rstr;
1415 for (wchar_t *s = wstr; *s; s++) 1591 for (wchar_t *s = wstr; *s; s++)
1416 if (*s == NOCHAR) 1592 if (*s == NOCHAR)
1419 r += rxvt_composite.expand (*s, r); 1595 r += rxvt_composite.expand (*s, r);
1420 else 1596 else
1421 *r++ = *s; 1597 *r++ = *s;
1422 1598
1423 RETVAL = wcs2sv (rstr, r - rstr); 1599 RETVAL = wcs2sv (rstr, r - rstr);
1424
1425 delete [] rstr;
1426} 1600}
1427 OUTPUT: 1601 OUTPUT:
1428 RETVAL 1602 RETVAL
1429 1603
1430void 1604void
1431rxvt_term::_resource (char *name, int index, SV *newval = 0) 1605rxvt_term::_resource (char *name, int index, SV *newval = 0)
1432 PPCODE: 1606 PPCODE:
1433{ 1607{
1434 struct resval { const char *name; int value; } rslist [] = { 1608 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1435# define def(name) { # name, Rs_ ## name }, 1609# define def(name) { # name, Rs_ ## name },
1436# define reserve(name,count) 1610# define reserve(name,count)
1437# include "rsinc.h" 1611# include "rsinc.h"
1438# undef def 1612# undef def
1439# undef reserve 1613# undef reserve
1440 }; 1614 };
1441 1615
1442 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1616 rs = rslist + ecb_array_length (rslist);
1443 1617
1618 if (*name)
1444 do { 1619 {
1620 do {
1445 if (rs-- == rslist) 1621 if (rs-- == rslist)
1446 croak ("no such resource '%s', requested", name); 1622 croak ("no such resource '%s', requested", name);
1447 } while (strcmp (name, rs->name)); 1623 } while (strcmp (name, rs->name));
1448 1624
1449 index += rs->value; 1625 index += rs->value;
1626 }
1627 else
1628 {
1629 --rs;
1630 name = "";
1631 }
1450 1632
1451 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1633 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1452 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1634 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1453 1635
1454 if (GIMME_V != G_VOID) 1636 if (GIMME_V != G_VOID)
1469 1651
1470const char * 1652const char *
1471rxvt_term::x_resource (const char *name) 1653rxvt_term::x_resource (const char *name)
1472 1654
1473bool 1655bool
1474rxvt_term::option (U32 optval, int set = -1) 1656rxvt_term::option (U8 optval, int set = -1)
1475 CODE: 1657 CODE:
1476{ 1658{
1477 RETVAL = THIS->options & optval; 1659 RETVAL = THIS->option (optval);
1478 1660
1479 if (set >= 0) 1661 if (set >= 0)
1480 { 1662 {
1481 if (set)
1482 THIS->options |= optval; 1663 THIS->set_option (optval, set);
1483 else
1484 THIS->options &= ~optval;
1485 1664
1665 if (THIS->init_done) // avoid doing this before START
1486 switch (optval) 1666 switch (optval)
1487 { 1667 {
1488 case Opt_skipBuiltinGlyphs: 1668 case Opt_skipBuiltinGlyphs:
1489 THIS->set_fonts (); 1669 THIS->set_fonts ();
1490 THIS->scr_remap_chars (); 1670 THIS->scr_remap_chars ();
1491 THIS->scr_touch (true); 1671 THIS->scr_touch (true);
1492 THIS->want_refresh = 1; 1672 THIS->want_refresh = 1;
1673 THIS->refresh_check ();
1493 break; 1674 break;
1675#ifdef CURSOR_BLINK
1676 case Opt_cursorBlink:
1677 THIS->cursor_blink_reset ();
1678 break;
1679#endif
1494 1680
1495 case Opt_cursorUnderline: 1681 case Opt_cursorUnderline:
1496 THIS->want_refresh = 1; 1682 THIS->want_refresh = 1;
1683 THIS->refresh_check ();
1497 break; 1684 break;
1498 1685
1499# case Opt_scrollBar_floating: 1686# case Opt_scrollBar_floating:
1500# case Opt_scrollBar_right: 1687# case Opt_scrollBar_right:
1501# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1688# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1502# break; 1689# break;
1503 } 1690 }
1504 } 1691 }
1505} 1692}
1506 OUTPUT: 1693 OUTPUT:
1507 RETVAL 1694 RETVAL
1508 1695
1511 CODE: 1698 CODE:
1512 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1699 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1513 THIS->keyboard->register_done (); 1700 THIS->keyboard->register_done ();
1514 OUTPUT: 1701 OUTPUT:
1515 RETVAL 1702 RETVAL
1703
1704void
1705rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1706 CODE:
1707 wchar_t *wstr = sv2wcs (str);
1708 THIS->keyboard->register_user_translation (keysym, state, wstr);
1709 free (wstr);
1516 1710
1517void 1711void
1518rxvt_term::screen_cur (...) 1712rxvt_term::screen_cur (...)
1519 PROTOTYPE: $;$$ 1713 PROTOTYPE: $;$$
1520 ALIAS: 1714 ALIAS:
1534 EXTEND (SP, 2); 1728 EXTEND (SP, 2);
1535 PUSHs (sv_2mortal (newSViv (rc.row))); 1729 PUSHs (sv_2mortal (newSViv (rc.row)));
1536 PUSHs (sv_2mortal (newSViv (rc.col))); 1730 PUSHs (sv_2mortal (newSViv (rc.col)));
1537 } 1731 }
1538 1732
1539 if (items == 3) 1733 if (items >= 3)
1540 { 1734 {
1541 rc.row = SvIV (ST (1)); 1735 rc.row = SvIV (ST (1));
1542 rc.col = SvIV (ST (2)); 1736 rc.col = SvIV (ST (2));
1543 1737
1544 if (ix == 2 && rc.col == 0) 1738 if (ix == 2)
1545 { 1739 {
1740 if (rc.col == 0)
1741 {
1742 // col == 0 means end of previous line
1546 rc.row--; 1743 rc.row--;
1547 rc.col = THIS->ncol; 1744 rc.col = THIS->ncol;
1745 }
1746 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1747 && rc.col > ROW(rc.row).l)
1748 {
1749 // col >= length means while line and add newline
1750 rc.col = THIS->ncol;
1751 }
1548 } 1752 }
1549 1753
1550 clamp_it (rc.col, 0, THIS->ncol); 1754 clamp_it (rc.col, 0, THIS->ncol);
1551 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1755 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1552 1756
1553 if (ix) 1757 if (ix)
1758 {
1759 THIS->selection.screen = THIS->current_screen;
1760
1554 THIS->want_refresh = 1; 1761 THIS->want_refresh = 1;
1762 THIS->refresh_check ();
1555 } 1763 }
1764 }
1556} 1765}
1557 1766
1558char 1767int
1559rxvt_term::cur_charset () 1768rxvt_term::selection_screen (int screen = -1)
1560 CODE: 1769 CODE:
1561 RETVAL = THIS->charsets [THIS->screen.charset]; 1770 RETVAL = THIS->selection.screen;
1562 OUTPUT: 1771 if (screen >= 0)
1772 THIS->selection.screen = screen;
1773 OUTPUT:
1563 RETVAL 1774 RETVAL
1564 1775
1565#void 1776void
1566#rxvt_term::selection_clear () 1777rxvt_term::selection_clear (bool clipboard = false)
1567 1778
1568void 1779void
1569rxvt_term::selection_make (U32 eventtime, bool rect = false) 1780rxvt_term::selection_make (Time eventtime, bool rect = false)
1570 CODE: 1781 CODE:
1571 THIS->selection.op = SELECTION_CONT; 1782 THIS->selection.op = SELECTION_CONT;
1572 THIS->selection.rect = rect; 1783 THIS->selection.rect = rect;
1573 THIS->selection_make (eventtime); 1784 THIS->selection_make (eventtime);
1574 1785
1575int 1786int
1576rxvt_term::selection_grab (U32 eventtime) 1787rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1577 1788
1578void 1789void
1579rxvt_term::selection (SV *newtext = 0) 1790rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1580 PPCODE: 1791 PPCODE:
1581{ 1792{
1793 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1794 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1795
1582 if (GIMME_V != G_VOID) 1796 if (GIMME_V != G_VOID)
1583 XPUSHs (THIS->selection.text 1797 XPUSHs (text
1584 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1798 ? sv_2mortal (wcs2sv (text, len))
1585 : &PL_sv_undef); 1799 : &PL_sv_undef);
1586 1800
1587 if (newtext) 1801 if (newtext)
1588 { 1802 {
1589 free (THIS->selection.text); 1803 free (text);
1590 1804
1591 THIS->selection.text = sv2wcs (newtext); 1805 text = sv2wcs (newtext);
1592 THIS->selection.len = wcslen (THIS->selection.text); 1806 len = wcslen (text);
1593 } 1807 }
1594} 1808}
1809
1810char
1811rxvt_term::cur_charset ()
1812 CODE:
1813 RETVAL = THIS->charsets [THIS->screen.charset];
1814 OUTPUT:
1815 RETVAL
1595 1816
1596void 1817void
1597rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1818rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1598 1819
1599void 1820void
1600rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1821rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1601 1822
1602void 1823void
1603rxvt_term::scr_bell () 1824rxvt_term::scr_bell ()
1825
1826void
1827rxvt_term::scr_recolour (bool refresh = true);
1828
1829void
1830rxvt_term::scr_change_screen (int screen)
1604 1831
1605void 1832void
1606rxvt_term::scr_add_lines (SV *string) 1833rxvt_term::scr_add_lines (SV *string)
1607 CODE: 1834 CODE:
1608{ 1835{
1618 char *str = SvPVbyte (octets, len); 1845 char *str = SvPVbyte (octets, len);
1619 C_ARGS: 1846 C_ARGS:
1620 str, len 1847 str, len
1621 1848
1622void 1849void
1850rxvt_term::tt_paste (SV *octets)
1851 INIT:
1852 STRLEN len;
1853 char *str = SvPVbyte (octets, len);
1854 C_ARGS:
1855 str, len
1856
1857void
1623rxvt_term::cmd_parse (SV *octets) 1858rxvt_term::cmd_parse (SV *octets)
1624 CODE: 1859 CODE:
1625{ 1860{
1626 STRLEN len; 1861 STRLEN len;
1627 char *str = SvPVbyte (octets, len); 1862 char *str = SvPVbyte (octets, len);
1649 o->self = (HV *)SvRV (RETVAL); 1884 o->self = (HV *)SvRV (RETVAL);
1650} 1885}
1651 OUTPUT: 1886 OUTPUT:
1652 RETVAL 1887 RETVAL
1653 1888
1889#############################################################################
1890# Various X Utility Functions
1891#############################################################################
1892
1893void
1894rxvt_term::XListProperties (Window window)
1895 PPCODE:
1896{
1897 int count;
1898 Atom *props = XListProperties (THIS->dpy, window, &count);
1899
1900 EXTEND (SP, count);
1901 while (count--)
1902 PUSHs (newSVuv ((U32)props [count]));
1903
1904 XFree (props);
1905}
1906
1907void
1908rxvt_term::XGetWindowProperty (Window window, Atom property)
1909 PPCODE:
1910{
1911 Atom type;
1912 int format;
1913 unsigned long nitems;
1914 unsigned long bytes_after;
1915 unsigned char *prop;
1916
1917 XGetWindowProperty (THIS->dpy, window, property,
1918 0, 1<<24, 0, AnyPropertyType,
1919 &type, &format, &nitems, &bytes_after, &prop);
1920
1921 if (type != None)
1922 {
1923 int elemsize = format == 16 ? sizeof (short)
1924 : format == 32 ? sizeof (long)
1925 : 1;
1926
1927 EXTEND (SP, 3);
1928 PUSHs (newSVuv ((U32)type));
1929 PUSHs (newSViv (format));
1930 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1931 XFree (prop);
1932 }
1933}
1934
1935void
1936rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1937 CODE:
1938{
1939 STRLEN len;
1940 char *data_ = SvPVbyte (data, len);
1941
1942 int elemsize = format == 16 ? sizeof (short)
1943 : format == 32 ? sizeof (long)
1944 : 1;
1945
1946 XChangeProperty (THIS->dpy, window, property,
1947 type, format, PropModeReplace,
1948 (unsigned char *)data_, len / elemsize);
1949}
1950
1951Atom
1952XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1953 C_ARGS: term->dpy, atom_name, only_if_exists
1954
1955char *
1956XGetAtomName (rxvt_term *term, Atom atom)
1957 C_ARGS: term->dpy, atom
1958 CLEANUP:
1959 XFree (RETVAL);
1960
1961void
1962XDeleteProperty (rxvt_term *term, Window window, Atom property)
1963 C_ARGS: term->dpy, window, property
1964
1965Window
1966rxvt_term::DefaultRootWindow ()
1967 CODE:
1968 RETVAL = THIS->display->root;
1969 OUTPUT:
1970 RETVAL
1971
1972#if 0
1973
1974Window
1975XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1976 C_ARGS: term->dpy, (Window)parent,
1977 x, y, width, height, 0,
1978 term->pix_colors_focused[Color_border],
1979 term->pix_colors_focused[Color_border]
1980
1981#endif
1982
1983void
1984XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1985 C_ARGS: term->dpy, window, parent, x, y
1986
1987void
1988XMapWindow (rxvt_term *term, Window window)
1989 C_ARGS: term->dpy, window
1990
1991void
1992XUnmapWindow (rxvt_term *term, Window window)
1993 C_ARGS: term->dpy, window
1994
1995void
1996XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1997 C_ARGS: term->dpy, window, x, y, width, height
1998
1999void
2000rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
2001 CODE:
2002{
2003 XWindowAttributes attr;
2004 XGetWindowAttributes (THIS->dpy, window, &attr);
2005 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
2006}
2007
2008void
2009rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
2010 PPCODE:
2011{
2012 int dx, dy;
2013 Window child;
2014
2015 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
2016 {
2017 EXTEND (SP, 3);
2018 PUSHs (newSViv (dx));
2019 PUSHs (newSViv (dy));
2020 PUSHs (newSVuv (child));
2021 }
2022}
2023
2024#############################################################################
2025# fancy bg bloatstuff (TODO: should be moved up somewhere)
2026
2027# TODO: ugly
2028void
2029rxvt_term::get_geometry ()
2030 PPCODE:
2031 EXTEND (SP, 4);
2032 PUSHs (sv_2mortal (newSViv (THIS->parent_x)));
2033 PUSHs (sv_2mortal (newSViv (THIS->parent_y)));
2034 PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));
2035 PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));
2036
2037#if HAVE_IMG
2038
2039rxvt_img *
2040rxvt_term::new_img (SV *format, int width, int height)
2041 CODE:
2042 XRenderPictFormat *f = SvOK (format)
2043 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2044 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2045 RETVAL = new rxvt_img (THIS, f, width, height);
2046 OUTPUT:
2047 RETVAL
2048
2049#if ENABLE_TRANSPARENCY
2050
2051#if 0
2052
2053rxvt_img *
2054rxvt_term::new_img_from_root ()
2055 CODE:
2056 RETVAL = rxvt_img::new_from_root (THIS);
2057 OUTPUT:
2058 RETVAL
2059
2060#endif
2061
2062#endif
2063
2064#if HAVE_PIXBUF
2065
2066rxvt_img *
2067rxvt_term::new_img_from_file (octet_string filename)
2068 CODE:
2069 try
2070 {
2071 RETVAL = rxvt_img::new_from_file (THIS, filename);
2072 }
2073 catch (const class rxvt_failure_exception &e)
2074 {
2075 croak ("new_img_from_file failed");
2076 }
2077 OUTPUT:
2078 RETVAL
2079
2080#endif
2081
2082#if HAVE_BG_PIXMAP
2083
2084void
2085rxvt_term::set_background (rxvt_img *img)
2086 CODE:
2087 THIS->bg_destroy ();
2088 THIS->bg_pixmap = None;
2089 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
2090
2091 if (img) // TODO: cannot be false
2092 {
2093 img->unshare ();
2094 THIS->bg_pixmap = img->steal ();
2095 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2096 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2097 }
2098
2099#endif
2100
2101#endif
2102
2103#############################################################################
2104# urxvt::overlay
2105#############################################################################
2106
1654MODULE = urxvt PACKAGE = urxvt::overlay 2107MODULE = urxvt PACKAGE = urxvt::overlay
1655 2108
1656void 2109void
1657overlay::set (int x, int y, SV *text, SV *rend = 0) 2110overlay::set (int x, int y, SV *text, SV *rend = 0)
1658 2111
1663overlay::hide () 2116overlay::hide ()
1664 2117
1665void 2118void
1666overlay::DESTROY () 2119overlay::DESTROY ()
1667 2120
2121INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
2122
2123MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
2124
2125#if HAVE_PIXBUF
2126
2127urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
2128 C_ARGS: filename, 0
2129
2130void
2131DESTROY (urxvt::pixbuf self)
2132 CODE:
2133 gdk_pixbuf_unref (self);
2134
2135#endif
2136
1668MODULE = urxvt PACKAGE = urxvt::timer 2137MODULE = urxvt PACKAGE = urxvt::img
1669 2138
1670SV * 2139#if HAVE_IMG
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 2140
1680timer * 2141# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
1681timer::cb (SV *cb) 2142# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1682 CODE:
1683 THIS->cb (cb);
1684 RETVAL = THIS;
1685 OUTPUT:
1686 RETVAL
1687 2143
1688NV 2144int
1689timer::at () 2145rxvt_img::w ()
1690 CODE: 2146 CODE:
1691 RETVAL = THIS->at; 2147 RETVAL = THIS->w;
1692 OUTPUT: 2148 OUTPUT:
1693 RETVAL 2149 RETVAL
1694 2150
1695timer * 2151int
1696timer::interval (NV interval) 2152rxvt_img::h ()
1697 CODE: 2153 CODE:
1698 THIS->interval = interval;
1699 RETVAL = THIS; 2154 RETVAL = THIS->h;
1700 OUTPUT: 2155 OUTPUT:
1701 RETVAL 2156 RETVAL
1702 2157
1703timer * 2158bool
1704timer::set (NV tstamp) 2159rxvt_img::shared ()
1705 CODE: 2160 CODE:
1706 THIS->set (tstamp); 2161 RETVAL = THIS->shared;
2162 OUTPUT:
2163 RETVAL
2164
2165Pixmap
2166rxvt_img::pm ()
2167 CODE:
1707 RETVAL = THIS; 2168 RETVAL = THIS->pm;
1708 OUTPUT: 2169 OUTPUT:
1709 RETVAL
1710
1711timer *
1712timer::start (NV tstamp = THIS->at)
1713 CODE:
1714 THIS->start (tstamp);
1715 RETVAL = THIS; 2170 RETVAL
1716 OUTPUT:
1717 RETVAL
1718 2171
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 2172void
2173rxvt_img::fill (SV *c)
2174 INIT:
2175 rxvt_color rc;
2176 parse_color (THIS->s, rc, c);
2177 C_ARGS: rc
2178
2179void
1735timer::DESTROY () 2180rxvt_img::DESTROY ()
1736
1737MODULE = urxvt PACKAGE = urxvt::iow
1738
1739SV *
1740iow::new ()
1741 CODE: 2181 CODE:
1742 iow *w = new iow; 2182 delete THIS;
1743 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1744 w->self = (HV *)SvRV (RETVAL);
1745 OUTPUT:
1746 RETVAL
1747 2183
1748iow * 2184rxvt_img *
1749iow::cb (SV *cb) 2185rxvt_img::blur (int rh, int rv)
1750 CODE:
1751 THIS->cb (cb);
1752 RETVAL = THIS;
1753 OUTPUT:
1754 RETVAL
1755 2186
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 2187void
1789iow::DESTROY () 2188rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
1790 2189
2190void
2191rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
1791 2192
2193void
2194rxvt_img::unshare ()
2195
2196rxvt_img *
2197rxvt_img::clone ()
2198
2199rxvt_img *
2200rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2201
2202rxvt_img *
2203rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, render_repeat_mode repeat = RepeatNormal)
2204 INIT:
2205 double matrix[9] = {
2206 p11, p12, p13,
2207 p21, p22, p23,
2208 p31, p32, p33
2209 };
2210 C_ARGS: new_width, new_height, matrix, repeat
2211
2212rxvt_img *
2213rxvt_img::scale (int new_width, int new_height)
2214
2215rxvt_img *
2216rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)
2217
2218#endif
2219

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines